occam-verify-cli 1.0.678 → 1.0.680

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.
@@ -64,21 +64,20 @@ const _default = (0, _elements.define)(class ProcedureCall extends _occamlanguag
64
64
  const procedureCallString = this.getString(); ///
65
65
  context.trace(`Unifying the '${procedureCallString}' procedure call independently...`);
66
66
  const procedureName = this.getProcedureName(), procedure = context.findProcedureByProcedureName(procedureName);
67
- // try {
68
- const primitives = this.findPrimitives(context), terms = termsFromPrimitives(primitives), term = await procedure.call(terms, context), boolean = term.isBoolean();
69
- if (!boolean) {
70
- context.info(`The '${procedureCallString}' procedure call did not return a boolean.`);
71
- } else {
72
- const primitiveValue = term.getPrimitiveValue();
73
- if (primitiveValue) {
74
- unifiesIndependently = true;
67
+ try {
68
+ const primitives = this.findPrimitives(context), terms = termsFromPrimitives(primitives), term = await procedure.call(terms, context), boolean = term.isBoolean();
69
+ if (!boolean) {
70
+ context.info(`The '${procedureCallString}' procedure call did not return a boolean.`);
71
+ } else {
72
+ const primitiveValue = term.getPrimitiveValue();
73
+ if (primitiveValue) {
74
+ unifiesIndependently = true;
75
+ }
75
76
  }
77
+ } catch (exception) {
78
+ const message = exception.getMessage();
79
+ context.info(message);
76
80
  }
77
- // } catch (exception) {
78
- // const message = exception.getMessage();
79
- //
80
- // context.info(message);
81
- // }
82
81
  if (unifiesIndependently) {
83
82
  context.debug(`...unified the '${procedureCallString}' procedure call independently.`);
84
83
  }
@@ -97,4 +96,4 @@ const _default = (0, _elements.define)(class ProcedureCall extends _occamlanguag
97
96
  }
98
97
  });
99
98
 
100
- //# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/element/procedureCall.js"],"sourcesContent":["\"use strict\";\n\nimport { Element } from \"occam-languages\";\nimport { termsUtilities } from \"occam-furtle\";\n\nimport { define } from \"../elements\";\nimport { parametersFromJSON, procedureReferenceFromJSON, parametersToParametersJSON, procedureReferenceToProcedureReferenceJSON } from \"../utilities/json\";\n\nconst { termsFromPrimitives } = termsUtilities;\n\nexport default define(class ProcedureCall extends Element {\n  constructor(context, string, node, parameters, procedureReference) {\n    super(context, string, node);\n\n    this.parameters = parameters;\n    this.procedureReference = procedureReference;\n  }\n\n  getParameters() {\n    return this.parameters;\n  }\n\n  getProcedureReference() {\n    return this.procedureReference;\n  }\n\n  getProcedureCallNode() {\n    const node = this.getNode(),\n          procedureCallNode = node;\n\n    return procedureCallNode;\n  }\n\n  getProcedureName() { return this.procedureReference.getProcedureName(); }\n\n  findPrimitives(context) {\n    const substitutions = context.getSubstitutions(),\n          primitives = this.parameters.map((parameter) => {\n            const primitive = parameter.findPrimitive(substitutions);\n\n            return primitive;\n          });\n\n    return primitives;\n  }\n\n  validate(context) {\n    let validates = false;\n\n    const procedureCallString = this.getString(); ///\n\n    context.trace(`Validating the '${procedureCallString}' procedure call...`);\n\n    const procedureName = this.getProcedureName(),\n          procedure = context.findProcedureByProcedureName(procedureName);\n\n    if (procedure !== null) {\n      const procedureBoolean = procedure.isBoolean();\n\n      if (procedureBoolean) {\n        validates = true;\n      } else {\n        context.debug(`The '${procedureCallString}' procedure is not boolean.`);\n      }\n    } else {\n      context.debug(`The '${procedureCallString}' procedure is not present.`);\n    }\n\n    if (validates) {\n      context.debug(`...validated the '${procedureCallString}' procedure call.`);\n    }\n\n    return validates;\n  }\n\n  async unifyIndependently(context) {\n    let unifiesIndependently = false;\n\n    const procedureCallString = this.getString(); ///\n\n    context.trace(`Unifying the '${procedureCallString}' procedure call independently...`);\n\n    const procedureName = this.getProcedureName(),\n          procedure = context.findProcedureByProcedureName(procedureName);\n\n    // try {\n      const primitives = this.findPrimitives(context),\n            terms = termsFromPrimitives(primitives),\n            term = await procedure.call(terms, context),\n            boolean = term.isBoolean();\n\n      if (!boolean) {\n        context.info(`The '${procedureCallString}' procedure call did not return a boolean.`);\n      } else {\n        const primitiveValue = term.getPrimitiveValue();\n\n        if (primitiveValue) {\n          unifiesIndependently = true;\n        }\n      }\n    // } catch (exception) {\n    //   const message = exception.getMessage();\n    //\n    //   context.info(message);\n    // }\n\n    if (unifiesIndependently) {\n      context.debug(`...unified the '${procedureCallString}' procedure call independently.`);\n    }\n\n    return unifiesIndependently;\n  }\n\n  toJSON() {\n    const parametersJSON = parametersToParametersJSON(this.parameters),\n          procedureReference = procedureReferenceToProcedureReferenceJSON(this.procedureReference),\n          parameters = parametersJSON,  ///\n          json = {\n            procedureReference,\n            parameters\n          };\n\n    return json;\n  }\n\n  static name = \"ProcedureCall\";\n\n  static fromJSON(json, context) {\n    debugger\n  }\n});\n"],"names":["termsFromPrimitives","termsUtilities","define","ProcedureCall","Element","context","string","node","parameters","procedureReference","getParameters","getProcedureReference","getProcedureCallNode","getNode","procedureCallNode","getProcedureName","findPrimitives","substitutions","getSubstitutions","primitives","map","parameter","primitive","findPrimitive","validate","validates","procedureCallString","getString","trace","procedureName","procedure","findProcedureByProcedureName","procedureBoolean","isBoolean","debug","unifyIndependently","unifiesIndependently","terms","term","call","boolean","info","primitiveValue","getPrimitiveValue","toJSON","parametersJSON","parametersToParametersJSON","procedureReferenceToProcedureReferenceJSON","json","name","fromJSON"],"mappings":"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"}
99
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/element/procedureCall.js"],"sourcesContent":["\"use strict\";\n\nimport { Element } from \"occam-languages\";\nimport { termsUtilities } from \"occam-furtle\";\n\nimport { define } from \"../elements\";\nimport { parametersFromJSON, procedureReferenceFromJSON, parametersToParametersJSON, procedureReferenceToProcedureReferenceJSON } from \"../utilities/json\";\n\nconst { termsFromPrimitives } = termsUtilities;\n\nexport default define(class ProcedureCall extends Element {\n  constructor(context, string, node, parameters, procedureReference) {\n    super(context, string, node);\n\n    this.parameters = parameters;\n    this.procedureReference = procedureReference;\n  }\n\n  getParameters() {\n    return this.parameters;\n  }\n\n  getProcedureReference() {\n    return this.procedureReference;\n  }\n\n  getProcedureCallNode() {\n    const node = this.getNode(),\n          procedureCallNode = node;\n\n    return procedureCallNode;\n  }\n\n  getProcedureName() { return this.procedureReference.getProcedureName(); }\n\n  findPrimitives(context) {\n    const substitutions = context.getSubstitutions(),\n          primitives = this.parameters.map((parameter) => {\n            const primitive = parameter.findPrimitive(substitutions);\n\n            return primitive;\n          });\n\n    return primitives;\n  }\n\n  validate(context) {\n    let validates = false;\n\n    const procedureCallString = this.getString(); ///\n\n    context.trace(`Validating the '${procedureCallString}' procedure call...`);\n\n    const procedureName = this.getProcedureName(),\n          procedure = context.findProcedureByProcedureName(procedureName);\n\n    if (procedure !== null) {\n      const procedureBoolean = procedure.isBoolean();\n\n      if (procedureBoolean) {\n        validates = true;\n      } else {\n        context.debug(`The '${procedureCallString}' procedure is not boolean.`);\n      }\n    } else {\n      context.debug(`The '${procedureCallString}' procedure is not present.`);\n    }\n\n    if (validates) {\n      context.debug(`...validated the '${procedureCallString}' procedure call.`);\n    }\n\n    return validates;\n  }\n\n  async unifyIndependently(context) {\n    let unifiesIndependently = false;\n\n    const procedureCallString = this.getString(); ///\n\n    context.trace(`Unifying the '${procedureCallString}' procedure call independently...`);\n\n    const procedureName = this.getProcedureName(),\n          procedure = context.findProcedureByProcedureName(procedureName);\n\n    try {\n      const primitives = this.findPrimitives(context),\n            terms = termsFromPrimitives(primitives),\n            term = await procedure.call(terms, context),\n            boolean = term.isBoolean();\n\n      if (!boolean) {\n        context.info(`The '${procedureCallString}' procedure call did not return a boolean.`);\n      } else {\n        const primitiveValue = term.getPrimitiveValue();\n\n        if (primitiveValue) {\n          unifiesIndependently = true;\n        }\n      }\n    } catch (exception) {\n      const message = exception.getMessage();\n\n      context.info(message);\n    }\n\n    if (unifiesIndependently) {\n      context.debug(`...unified the '${procedureCallString}' procedure call independently.`);\n    }\n\n    return unifiesIndependently;\n  }\n\n  toJSON() {\n    const parametersJSON = parametersToParametersJSON(this.parameters),\n          procedureReference = procedureReferenceToProcedureReferenceJSON(this.procedureReference),\n          parameters = parametersJSON,  ///\n          json = {\n            procedureReference,\n            parameters\n          };\n\n    return json;\n  }\n\n  static name = \"ProcedureCall\";\n\n  static fromJSON(json, context) {\n    debugger\n  }\n});\n"],"names":["termsFromPrimitives","termsUtilities","define","ProcedureCall","Element","context","string","node","parameters","procedureReference","getParameters","getProcedureReference","getProcedureCallNode","getNode","procedureCallNode","getProcedureName","findPrimitives","substitutions","getSubstitutions","primitives","map","parameter","primitive","findPrimitive","validate","validates","procedureCallString","getString","trace","procedureName","procedure","findProcedureByProcedureName","procedureBoolean","isBoolean","debug","unifyIndependently","unifiesIndependently","terms","term","call","boolean","info","primitiveValue","getPrimitiveValue","exception","message","getMessage","toJSON","parametersJSON","parametersToParametersJSON","procedureReferenceToProcedureReferenceJSON","json","name","fromJSON"],"mappings":"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"}
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.678",
4
+ "version": "1.0.680",
5
5
  "license": "MIT, Anti-996",
6
6
  "homepage": "https://github.com/djalbat/occam-verify-cli",
7
7
  "description": "Occam's Verifier",
@@ -13,12 +13,12 @@
13
13
  "argumentative": "^2.0.47",
14
14
  "necessary": "^17.1.7",
15
15
  "occam-file-system": "^6.0.505",
16
- "occam-furtle": "^3.0.143",
16
+ "occam-furtle": "^3.0.145",
17
17
  "occam-grammars": "^1.3.520",
18
- "occam-languages": "^0.0.122",
18
+ "occam-languages": "^0.0.126",
19
19
  "occam-lexers": "^23.1.44",
20
20
  "occam-model": "^1.0.501",
21
- "occam-nominal": "^1.0.63",
21
+ "occam-nominal": "^1.0.65",
22
22
  "occam-parsers": "^23.1.50"
23
23
  },
24
24
  "devDependencies": {
@@ -83,7 +83,7 @@ export default define(class ProcedureCall extends Element {
83
83
  const procedureName = this.getProcedureName(),
84
84
  procedure = context.findProcedureByProcedureName(procedureName);
85
85
 
86
- // try {
86
+ try {
87
87
  const primitives = this.findPrimitives(context),
88
88
  terms = termsFromPrimitives(primitives),
89
89
  term = await procedure.call(terms, context),
@@ -98,11 +98,11 @@ export default define(class ProcedureCall extends Element {
98
98
  unifiesIndependently = true;
99
99
  }
100
100
  }
101
- // } catch (exception) {
102
- // const message = exception.getMessage();
103
- //
104
- // context.info(message);
105
- // }
101
+ } catch (exception) {
102
+ const message = exception.getMessage();
103
+
104
+ context.info(message);
105
+ }
106
106
 
107
107
  if (unifiesIndependently) {
108
108
  context.debug(`...unified the '${procedureCallString}' procedure call independently.`);