occam-verify-cli 1.0.947 → 1.0.948

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -17,8 +17,8 @@ _export(exports, {
17
17
  }
18
18
  });
19
19
  const _occamlanguages = require("occam-languages");
20
- const _element = require("../utilities/element");
21
20
  const _context = require("../utilities/context");
21
+ const _element = require("../utilities/element");
22
22
  const { nodeQuery } = _occamlanguages.queryUtilities;
23
23
  const termNodeQuery = nodeQuery("/term"), typeNodeQuery = nodeQuery("/type"), statementNodeQuery = nodeQuery("/statement");
24
24
  class CombinatorPass extends _occamlanguages.SimplePass {
@@ -132,4 +132,4 @@ function validateStatementAsCombinator(statement, context) {
132
132
  return statementValidatesAsCombinator;
133
133
  }
134
134
 
135
- //# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/process/validate.js"],"sourcesContent":["\"use strict\";\n\nimport { SimplePass } from \"occam-languages\";\nimport { queryUtilities } from \"occam-languages\";\n\nimport { termFromTermNode, statementFromStatementNode } from \"../utilities/element\";\nimport {descend} from \"../utilities/context\";\n\nconst { nodeQuery } = queryUtilities;\n\nconst termNodeQuery = nodeQuery(\"/term\"),\n      typeNodeQuery = nodeQuery(\"/type\"),\n      statementNodeQuery = nodeQuery(\"/statement\");\n\nclass CombinatorPass extends SimplePass {\n  run(statementNode, context) {\n    let success = false;\n\n    const nonTerminalNode = statementNode,  ///\n          childNodes = nonTerminalNode.getChildNodes(), ///\n          descended = this.descend(childNodes, context);\n\n    if (descended) {\n      success = true;\n    }\n\n    return success;\n  }\n\n  static maps = [\n    {\n      nodeQuery: statementNodeQuery,\n      run: (statementNode, context) => {\n        let success = false;\n\n        descend((context) => {\n          let statement;\n\n          statement = statementFromStatementNode(statementNode, context);\n\n          statement = statement.validate(context);  ///\n\n          if (statement !== null) {\n            success = true;\n          }\n        }, context);\n\n        return success;\n      }\n    },\n    {\n      nodeQuery: termNodeQuery,\n      run: (termNode, context) => {\n        let success = false;\n\n        let term;\n\n        term = termFromTermNode(termNode, context);\n\n        term = term.validate(context, (term) => { ///\n          const validatesForwards = true;\n\n          return validatesForwards;\n        });\n\n        if (term !== null) {\n          success = true;\n        }\n\n        return success;\n      }\n    },\n    {\n      nodeQuery: typeNodeQuery,\n      run: (typeNode, context) => {\n        let success = false;\n\n        const nominalTypeName = typeNode.getNominalTypeName(),\n              typePresent = context.isTypePresentByNominalTypeName(nominalTypeName);\n\n        if (typePresent) {\n          success = true;\n        }\n\n        return success;\n      }\n    }\n  ];\n}\n\nclass ConstructorPass extends SimplePass {\n  run(termNode, context) {\n    let success = false;\n\n    const nonTerminalNode = termNode,  ///\n          childNodes = nonTerminalNode.getChildNodes(), ///\n          descended = this.descend(childNodes, context);\n\n    if (descended) {\n      success = true;\n    }\n\n    return success;\n  }\n\n  static maps = [\n    {\n      nodeQuery: termNodeQuery,\n      run: (termNode, context) => {\n        let success = false;\n\n        let term;\n\n        term = termFromTermNode(termNode, context);\n\n        term = term.validate(context, (term) => { ///\n          const validatesForwards = true;\n\n          return validatesForwards;\n        });\n\n        if (term !== null) {\n          success = true;\n        }\n\n        return success;\n      }\n    },\n    {\n      nodeQuery: typeNodeQuery,\n      run: (typeNode, context) => {\n        let success = false;\n\n        const nominalTypeName = typeNode.getNominalTypeName(),\n              typePresent = context.isTypePresentByNominalTypeName(nominalTypeName);\n\n        if (typePresent) {\n          success = true;\n        }\n\n        return success;\n      }\n    }\n  ];\n}\n\nconst combinatorPass = new CombinatorPass(),\n      constructorPass = new ConstructorPass();\n\nexport function validateTermAsConstructor(term, context) {\n  let termValidatesAsConstructor = false;\n\n  const termNode = term.getNode(),\n        success = constructorPass.run(termNode, context);\n\n  if (success) {\n    termValidatesAsConstructor = true;\n  }\n\n  return termValidatesAsConstructor;\n}\n\nexport function validateStatementAsCombinator(statement, context) {\n  let statementValidatesAsCombinator = false;\n\n  const statementNode = statement.getNode(),\n        success = combinatorPass.run(statementNode, context);\n\n  if (success) {\n    statementValidatesAsCombinator = true;\n  }\n\n  return statementValidatesAsCombinator;\n}\n"],"names":["validateStatementAsCombinator","validateTermAsConstructor","nodeQuery","queryUtilities","termNodeQuery","typeNodeQuery","statementNodeQuery","CombinatorPass","SimplePass","run","statementNode","context","success","nonTerminalNode","childNodes","getChildNodes","descended","descend","maps","statement","statementFromStatementNode","validate","termNode","term","termFromTermNode","validatesForwards","typeNode","nominalTypeName","getNominalTypeName","typePresent","isTypePresentByNominalTypeName","ConstructorPass","combinatorPass","constructorPass","termValidatesAsConstructor","getNode","statementValidatesAsCombinator"],"mappings":"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"}
135
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/process/validate.js"],"sourcesContent":["\"use strict\";\n\nimport { SimplePass } from \"occam-languages\";\nimport { queryUtilities } from \"occam-languages\";\n\nimport { descend } from \"../utilities/context\";\nimport { termFromTermNode, statementFromStatementNode } from \"../utilities/element\";\n\nconst { nodeQuery } = queryUtilities;\n\nconst termNodeQuery = nodeQuery(\"/term\"),\n      typeNodeQuery = nodeQuery(\"/type\"),\n      statementNodeQuery = nodeQuery(\"/statement\");\n\nclass CombinatorPass extends SimplePass {\n  run(statementNode, context) {\n    let success = false;\n\n    const nonTerminalNode = statementNode,  ///\n          childNodes = nonTerminalNode.getChildNodes(), ///\n          descended = this.descend(childNodes, context);\n\n    if (descended) {\n      success = true;\n    }\n\n    return success;\n  }\n\n  static maps = [\n    {\n      nodeQuery: statementNodeQuery,\n      run: (statementNode, context) => {\n        let success = false;\n\n        descend((context) => {\n          let statement;\n\n          statement = statementFromStatementNode(statementNode, context);\n\n          statement = statement.validate(context);  ///\n\n          if (statement !== null) {\n            success = true;\n          }\n        }, context);\n\n        return success;\n      }\n    },\n    {\n      nodeQuery: termNodeQuery,\n      run: (termNode, context) => {\n        let success = false;\n\n        let term;\n\n        term = termFromTermNode(termNode, context);\n\n        term = term.validate(context, (term) => { ///\n          const validatesForwards = true;\n\n          return validatesForwards;\n        });\n\n        if (term !== null) {\n          success = true;\n        }\n\n        return success;\n      }\n    },\n    {\n      nodeQuery: typeNodeQuery,\n      run: (typeNode, context) => {\n        let success = false;\n\n        const nominalTypeName = typeNode.getNominalTypeName(),\n              typePresent = context.isTypePresentByNominalTypeName(nominalTypeName);\n\n        if (typePresent) {\n          success = true;\n        }\n\n        return success;\n      }\n    }\n  ];\n}\n\nclass ConstructorPass extends SimplePass {\n  run(termNode, context) {\n    let success = false;\n\n    const nonTerminalNode = termNode,  ///\n          childNodes = nonTerminalNode.getChildNodes(), ///\n          descended = this.descend(childNodes, context);\n\n    if (descended) {\n      success = true;\n    }\n\n    return success;\n  }\n\n  static maps = [\n    {\n      nodeQuery: termNodeQuery,\n      run: (termNode, context) => {\n        let success = false;\n\n        let term;\n\n        term = termFromTermNode(termNode, context);\n\n        term = term.validate(context, (term) => { ///\n          const validatesForwards = true;\n\n          return validatesForwards;\n        });\n\n        if (term !== null) {\n          success = true;\n        }\n\n        return success;\n      }\n    },\n    {\n      nodeQuery: typeNodeQuery,\n      run: (typeNode, context) => {\n        let success = false;\n\n        const nominalTypeName = typeNode.getNominalTypeName(),\n              typePresent = context.isTypePresentByNominalTypeName(nominalTypeName);\n\n        if (typePresent) {\n          success = true;\n        }\n\n        return success;\n      }\n    }\n  ];\n}\n\nconst combinatorPass = new CombinatorPass(),\n      constructorPass = new ConstructorPass();\n\nexport function validateTermAsConstructor(term, context) {\n  let termValidatesAsConstructor = false;\n\n  const termNode = term.getNode(),\n        success = constructorPass.run(termNode, context);\n\n  if (success) {\n    termValidatesAsConstructor = true;\n  }\n\n  return termValidatesAsConstructor;\n}\n\nexport function validateStatementAsCombinator(statement, context) {\n  let statementValidatesAsCombinator = false;\n\n  const statementNode = statement.getNode(),\n        success = combinatorPass.run(statementNode, context);\n\n  if (success) {\n    statementValidatesAsCombinator = true;\n  }\n\n  return statementValidatesAsCombinator;\n}\n"],"names":["validateStatementAsCombinator","validateTermAsConstructor","nodeQuery","queryUtilities","termNodeQuery","typeNodeQuery","statementNodeQuery","CombinatorPass","SimplePass","run","statementNode","context","success","nonTerminalNode","childNodes","getChildNodes","descended","descend","maps","statement","statementFromStatementNode","validate","termNode","term","termFromTermNode","validatesForwards","typeNode","nominalTypeName","getNominalTypeName","typePresent","isTypePresentByNominalTypeName","ConstructorPass","combinatorPass","constructorPass","termValidatesAsConstructor","getNode","statementValidatesAsCombinator"],"mappings":"AAAA;;;;;;;;;;;QAkKgBA;eAAAA;;QAbAC;eAAAA;;;gCAnJW;yBAGH;yBACqC;AAE7D,MAAM,EAAEC,SAAS,EAAE,GAAGC,8BAAc;AAEpC,MAAMC,gBAAgBF,UAAU,UAC1BG,gBAAgBH,UAAU,UAC1BI,qBAAqBJ,UAAU;AAErC,MAAMK,uBAAuBC,0BAAU;IACrCC,IAAIC,aAAa,EAAEC,OAAO,EAAE;QAC1B,IAAIC,UAAU;QAEd,MAAMC,kBAAkBH,eAClBI,aAAaD,gBAAgBE,aAAa,IAC1CC,YAAY,IAAI,CAACC,OAAO,CAACH,YAAYH;QAE3C,IAAIK,WAAW;YACbJ,UAAU;QACZ;QAEA,OAAOA;IACT;IAEA,OAAOM,OAAO;QACZ;YACEhB,WAAWI;YACXG,KAAK,CAACC,eAAeC;gBACnB,IAAIC,UAAU;gBAEdK,IAAAA,gBAAO,EAAC,CAACN;oBACP,IAAIQ;oBAEJA,YAAYC,IAAAA,mCAA0B,EAACV,eAAeC;oBAEtDQ,YAAYA,UAAUE,QAAQ,CAACV,UAAW,GAAG;oBAE7C,IAAIQ,cAAc,MAAM;wBACtBP,UAAU;oBACZ;gBACF,GAAGD;gBAEH,OAAOC;YACT;QACF;QACA;YACEV,WAAWE;YACXK,KAAK,CAACa,UAAUX;gBACd,IAAIC,UAAU;gBAEd,IAAIW;gBAEJA,OAAOC,IAAAA,yBAAgB,EAACF,UAAUX;gBAElCY,OAAOA,KAAKF,QAAQ,CAACV,SAAS,CAACY;oBAC7B,MAAME,oBAAoB;oBAE1B,OAAOA;gBACT;gBAEA,IAAIF,SAAS,MAAM;oBACjBX,UAAU;gBACZ;gBAEA,OAAOA;YACT;QACF;QACA;YACEV,WAAWG;YACXI,KAAK,CAACiB,UAAUf;gBACd,IAAIC,UAAU;gBAEd,MAAMe,kBAAkBD,SAASE,kBAAkB,IAC7CC,cAAclB,QAAQmB,8BAA8B,CAACH;gBAE3D,IAAIE,aAAa;oBACfjB,UAAU;gBACZ;gBAEA,OAAOA;YACT;QACF;KACD,CAAC;AACJ;AAEA,MAAMmB,wBAAwBvB,0BAAU;IACtCC,IAAIa,QAAQ,EAAEX,OAAO,EAAE;QACrB,IAAIC,UAAU;QAEd,MAAMC,kBAAkBS,UAClBR,aAAaD,gBAAgBE,aAAa,IAC1CC,YAAY,IAAI,CAACC,OAAO,CAACH,YAAYH;QAE3C,IAAIK,WAAW;YACbJ,UAAU;QACZ;QAEA,OAAOA;IACT;IAEA,OAAOM,OAAO;QACZ;YACEhB,WAAWE;YACXK,KAAK,CAACa,UAAUX;gBACd,IAAIC,UAAU;gBAEd,IAAIW;gBAEJA,OAAOC,IAAAA,yBAAgB,EAACF,UAAUX;gBAElCY,OAAOA,KAAKF,QAAQ,CAACV,SAAS,CAACY;oBAC7B,MAAME,oBAAoB;oBAE1B,OAAOA;gBACT;gBAEA,IAAIF,SAAS,MAAM;oBACjBX,UAAU;gBACZ;gBAEA,OAAOA;YACT;QACF;QACA;YACEV,WAAWG;YACXI,KAAK,CAACiB,UAAUf;gBACd,IAAIC,UAAU;gBAEd,MAAMe,kBAAkBD,SAASE,kBAAkB,IAC7CC,cAAclB,QAAQmB,8BAA8B,CAACH;gBAE3D,IAAIE,aAAa;oBACfjB,UAAU;gBACZ;gBAEA,OAAOA;YACT;QACF;KACD,CAAC;AACJ;AAEA,MAAMoB,iBAAiB,IAAIzB,kBACrB0B,kBAAkB,IAAIF;AAErB,SAAS9B,0BAA0BsB,IAAI,EAAEZ,OAAO;IACrD,IAAIuB,6BAA6B;IAEjC,MAAMZ,WAAWC,KAAKY,OAAO,IACvBvB,UAAUqB,gBAAgBxB,GAAG,CAACa,UAAUX;IAE9C,IAAIC,SAAS;QACXsB,6BAA6B;IAC/B;IAEA,OAAOA;AACT;AAEO,SAASlC,8BAA8BmB,SAAS,EAAER,OAAO;IAC9D,IAAIyB,iCAAiC;IAErC,MAAM1B,gBAAgBS,UAAUgB,OAAO,IACjCvB,UAAUoB,eAAevB,GAAG,CAACC,eAAeC;IAElD,IAAIC,SAAS;QACXwB,iCAAiC;IACnC;IAEA,OAAOA;AACT"}
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "occam-verify-cli",
3
3
  "author": "James Smith",
4
- "version": "1.0.947",
4
+ "version": "1.0.948",
5
5
  "license": "MIT, Anti-996",
6
6
  "homepage": "https://github.com/djalbat/occam-verify-cli",
7
7
  "description": "Occam's Verifier",
@@ -12,12 +12,12 @@
12
12
  "dependencies": {
13
13
  "argumentative": "^2.0.47",
14
14
  "necessary": "^17.1.7",
15
- "occam-furtle": "^3.0.204",
15
+ "occam-furtle": "^3.0.205",
16
16
  "occam-grammars": "^1.3.524",
17
- "occam-languages": "^0.0.208",
17
+ "occam-languages": "^0.0.210",
18
18
  "occam-lexers": "^23.1.44",
19
19
  "occam-model": "^1.0.506",
20
- "occam-nominal": "^1.0.108",
20
+ "occam-nominal": "^1.0.109",
21
21
  "occam-parsers": "^23.1.50",
22
22
  "occam-server": "^7.0.7"
23
23
  },
@@ -3,8 +3,8 @@
3
3
  import { SimplePass } from "occam-languages";
4
4
  import { queryUtilities } from "occam-languages";
5
5
 
6
+ import { descend } from "../utilities/context";
6
7
  import { termFromTermNode, statementFromStatementNode } from "../utilities/element";
7
- import {descend} from "../utilities/context";
8
8
 
9
9
  const { nodeQuery } = queryUtilities;
10
10