occam-verify-cli 1.0.153 → 1.0.154

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.
Files changed (3) hide show
  1. package/lib/dom/procedureCall.js +3 -3
  2. package/package.json +1 -1
  3. package/src/dom/procedureCall.js +3 -3
package/lib/dom/procedureCall.js CHANGED
@@ -152,9 +152,9 @@ var _default = (0, _dom.domAssigned)((_ProcedureCall = /*#__PURE__*/ function()
152
152
  var unifiedIndependently = false;
153
153
  var procedureCallString = this.string; ///
154
154
  context.trace("Unifying the '".concat(procedureCallString, "' procedure call independently..."));
155
- var procedure = context.findProcedureByReference(this.reference), nodes = this.findNodes(substitutions), values = _occamfurtle.Values.fromNodes(nodes, context);
155
+ var procedure = context.findProcedureByReference(this.reference), nodes = this.findNodes(substitutions), expressions = _occamfurtle.Expressions.fromNodes(nodes, context);
156
156
  try {
157
- var value = procedure.call(values, context), boolean = value.getBoolean();
157
+ var value = procedure.call(expressions, context), boolean = value.getBoolean();
158
158
  unifiedIndependently = boolean; ///
159
159
  } catch (exception) {
160
160
  var message = exception.getMessage();
@@ -231,4 +231,4 @@ function stringFromReferenceAndParameters(reference, parameters) {
231
231
  return string;
232
232
  }
233
233
 
234
- //# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/dom/procedureCall.js"],"sourcesContent":["\"use strict\";\n\nimport { Values } from \"occam-furtle\";\n\nimport dom from \"../dom\";\n\nimport { domAssigned } from \"../dom\";\nimport { nodeQuery, nodesQuery } from \"../utilities/query\";\nimport { referenceFromJSON, parametersFromJSON, parametersToParametersJSON } from \"../utilities/json\";\n\nconst parameterNodesQuery = nodesQuery(\"/procedureCall/parameter\"),\n      premiseProcedureCallNodeQuery = nodeQuery(\"/premise/procedureCall\"),\n      suppositionProcedureCallNodeQuery = nodeQuery(\"/supposition/procedureCall\");\n\nexport default domAssigned(class ProcedureCall {\n  constructor(string, reference, parameters) {\n    this.string = string;\n    this.reference = reference;\n    this.parameters = parameters;\n  }\n\n  getString() {\n    return this.string;\n  }\n\n  getReference() {\n    return this.reference;\n  }\n\n  getParameters() {\n    return this.parameters;\n  }\n\n  findNodes(substitutions) {\n    const nodes = this.parameters.map((parameter) => {\n      const replacementNode = parameter.findReplacementNode(substitutions),\n            node = replacementNode;  ///\n\n      return node;\n    });\n\n    return nodes;\n  }\n\n  verify(assignments, stated, context) {\n    let verified = false;\n\n    const procedureCallString = this.string; ///\n\n    context.trace(`Verifying the '${procedureCallString}' procedure call...`);\n\n    const procedure = context.findProcedureByReference(this.reference);\n\n    if (procedure !== null) {\n      const procedureBoolean = procedure.isBoolean();\n\n      if (procedureBoolean) {\n        verified = true;\n      } else {\n        context.trace(`The '${procedureCallString}' procedure is not boolean.`);\n      }\n    } else {\n      context.trace(`The '${procedureCallString}' procedure is not present.`);\n    }\n\n    if (verified) {\n      context.debug(`...verified the '${procedureCallString}' procedure call.`);\n    }\n\n    return verified;\n  }\n\n  unifyIndependently(substitutions, context) {\n    let unifiedIndependently = false;\n\n    const procedureCallString = this.string; ///\n\n    context.trace(`Unifying the '${procedureCallString}' procedure call independently...`);\n\n    const procedure = context.findProcedureByReference(this.reference),\n          nodes = this.findNodes(substitutions),\n          values = Values.fromNodes(nodes, context);\n\n    try {\n      const value = procedure.call(values, context),\n            boolean = value.getBoolean();\n\n      unifiedIndependently = boolean; ///\n    } catch (exception) {\n      const message = exception.getMessage();\n\n      context.info(message);\n    }\n\n    if (unifiedIndependently) {\n      context.debug(`...unified the '${procedureCallString}' procedure call independently.`);\n    }\n\n    return unifiedIndependently;\n  }\n\n  toJSON() {\n    const referenceJSON = this.reference.toJSON(),\n          parametersJSON = parametersToParametersJSON(this.parameters),\n          reference = referenceJSON,  ///\n          parameters = parametersJSON,  ///\n          json = {\n            reference,\n            parameters\n          };\n\n    return json;\n  }\n\n  static name = \"ProcedureCall\";\n\n  static fromJSON(json, fileContext) {\n    const reference = referenceFromJSON(json, fileContext),\n          parameters = parametersFromJSON(json, fileContext),\n          string = stringFromReferenceAndParameters(reference, parameters),\n          procedureCall = new ProcedureCall(string, reference, parameters);\n\n    return procedureCall;\n  }\n\n  static fromPremiseNode(premiseNode, context) {\n    let procedureCall = null;\n\n    const premiseProcedureCallNode = premiseProcedureCallNodeQuery(premiseNode);\n\n    if (premiseProcedureCallNode !== null) {\n      const procedureCallNode = premiseProcedureCallNode; ///\n\n      procedureCall = procedureCallFromProcedureCallNode(procedureCallNode, context);\n    }\n\n    return procedureCall;\n  }\n\n  static fromSuppositionNode(suppositionNode, context) {\n    let procedureCall = null;\n\n    const suppositionProcedureCallNode = suppositionProcedureCallNodeQuery(suppositionNode);\n\n    if (suppositionProcedureCallNode !== null) {\n      const procedureCallNode = suppositionProcedureCallNode; ///\n\n      procedureCall = procedureCallFromProcedureCallNode(procedureCallNode, context);\n    }\n\n    return procedureCall;\n  }\n});\n\nfunction procedureCallFromProcedureCallNode(procedureCallNode, context) {\n  const { Reference, ProcedureCall } = dom,\n        parameters = parametersFromProcedureCallNode(procedureCallNode, context),\n        reference = Reference.fromProcedureCallNode(procedureCallNode, context),\n        string = stringFromReferenceAndParameters(reference, parameters),\n        procedureCall = new ProcedureCall(string, reference, parameters);\n\n  return procedureCall;\n}\n\nfunction parametersFromProcedureCallNode(procedureCallNode, context) {\n  const { Parameter } = dom,\n        parameterNodes = parameterNodesQuery(procedureCallNode),\n        parameters = parameterNodes.map((parameterNode) => {\n          const parameter = Parameter.fromParameterNode(parameterNode, context);\n\n          return parameter;\n        });\n\n  return parameters;\n}\n\nfunction stringFromReferenceAndParameters(reference, parameters) {\n  const referenceString = reference.getString(),\n        parametersString = parameters.reduce((parametersString, parameter) => {\n          const parameterString = parameter.getString();\n\n          parametersString = (parametersString === null) ?\n                                parameterString : ///\n                                  `${parametersString}, ${parameterString}`;\n\n          return parametersString;\n        }, null),\n        string = `${referenceString}(${parametersString})`;\n\n  return string;\n}\n"],"names":["parameterNodesQuery","nodesQuery","premiseProcedureCallNodeQuery","nodeQuery","suppositionProcedureCallNodeQuery","domAssigned","ProcedureCall","string","reference","parameters","getString","getReference","getParameters","findNodes","substitutions","nodes","map","parameter","replacementNode","findReplacementNode","node","verify","assignments","stated","context","verified","procedureCallString","trace","procedure","findProcedureByReference","procedureBoolean","isBoolean","debug","unifyIndependently","unifiedIndependently","values","Values","fromNodes","value","call","boolean","getBoolean","exception","message","getMessage","info","toJSON","referenceJSON","parametersJSON","parametersToParametersJSON","json","fromJSON","fileContext","referenceFromJSON","parametersFromJSON","stringFromReferenceAndParameters","procedureCall","fromPremiseNode","premiseNode","premiseProcedureCallNode","procedureCallNode","procedureCallFromProcedureCallNode","fromSuppositionNode","suppositionNode","suppositionProcedureCallNode","name","Reference","dom","parametersFromProcedureCallNode","fromProcedureCallNode","Parameter","parameterNodes","parameterNode","fromParameterNode","referenceString","parametersString","reduce","parameterString"],"mappings":"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"}
234
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/dom/procedureCall.js"],"sourcesContent":["\"use strict\";\n\nimport { Expressions } from \"occam-furtle\";\n\nimport dom from \"../dom\";\n\nimport { domAssigned } from \"../dom\";\nimport { nodeQuery, nodesQuery } from \"../utilities/query\";\nimport { referenceFromJSON, parametersFromJSON, parametersToParametersJSON } from \"../utilities/json\";\n\nconst parameterNodesQuery = nodesQuery(\"/procedureCall/parameter\"),\n      premiseProcedureCallNodeQuery = nodeQuery(\"/premise/procedureCall\"),\n      suppositionProcedureCallNodeQuery = nodeQuery(\"/supposition/procedureCall\");\n\nexport default domAssigned(class ProcedureCall {\n  constructor(string, reference, parameters) {\n    this.string = string;\n    this.reference = reference;\n    this.parameters = parameters;\n  }\n\n  getString() {\n    return this.string;\n  }\n\n  getReference() {\n    return this.reference;\n  }\n\n  getParameters() {\n    return this.parameters;\n  }\n\n  findNodes(substitutions) {\n    const nodes = this.parameters.map((parameter) => {\n      const replacementNode = parameter.findReplacementNode(substitutions),\n            node = replacementNode;  ///\n\n      return node;\n    });\n\n    return nodes;\n  }\n\n  verify(assignments, stated, context) {\n    let verified = false;\n\n    const procedureCallString = this.string; ///\n\n    context.trace(`Verifying the '${procedureCallString}' procedure call...`);\n\n    const procedure = context.findProcedureByReference(this.reference);\n\n    if (procedure !== null) {\n      const procedureBoolean = procedure.isBoolean();\n\n      if (procedureBoolean) {\n        verified = true;\n      } else {\n        context.trace(`The '${procedureCallString}' procedure is not boolean.`);\n      }\n    } else {\n      context.trace(`The '${procedureCallString}' procedure is not present.`);\n    }\n\n    if (verified) {\n      context.debug(`...verified the '${procedureCallString}' procedure call.`);\n    }\n\n    return verified;\n  }\n\n  unifyIndependently(substitutions, context) {\n    let unifiedIndependently = false;\n\n    const procedureCallString = this.string; ///\n\n    context.trace(`Unifying the '${procedureCallString}' procedure call independently...`);\n\n    const procedure = context.findProcedureByReference(this.reference),\n          nodes = this.findNodes(substitutions),\n          expressions = Expressions.fromNodes(nodes, context);\n\n    try {\n      const value = procedure.call(expressions, context),\n            boolean = value.getBoolean();\n\n      unifiedIndependently = boolean; ///\n    } catch (exception) {\n      const message = exception.getMessage();\n\n      context.info(message);\n    }\n\n    if (unifiedIndependently) {\n      context.debug(`...unified the '${procedureCallString}' procedure call independently.`);\n    }\n\n    return unifiedIndependently;\n  }\n\n  toJSON() {\n    const referenceJSON = this.reference.toJSON(),\n          parametersJSON = parametersToParametersJSON(this.parameters),\n          reference = referenceJSON,  ///\n          parameters = parametersJSON,  ///\n          json = {\n            reference,\n            parameters\n          };\n\n    return json;\n  }\n\n  static name = \"ProcedureCall\";\n\n  static fromJSON(json, fileContext) {\n    const reference = referenceFromJSON(json, fileContext),\n          parameters = parametersFromJSON(json, fileContext),\n          string = stringFromReferenceAndParameters(reference, parameters),\n          procedureCall = new ProcedureCall(string, reference, parameters);\n\n    return procedureCall;\n  }\n\n  static fromPremiseNode(premiseNode, context) {\n    let procedureCall = null;\n\n    const premiseProcedureCallNode = premiseProcedureCallNodeQuery(premiseNode);\n\n    if (premiseProcedureCallNode !== null) {\n      const procedureCallNode = premiseProcedureCallNode; ///\n\n      procedureCall = procedureCallFromProcedureCallNode(procedureCallNode, context);\n    }\n\n    return procedureCall;\n  }\n\n  static fromSuppositionNode(suppositionNode, context) {\n    let procedureCall = null;\n\n    const suppositionProcedureCallNode = suppositionProcedureCallNodeQuery(suppositionNode);\n\n    if (suppositionProcedureCallNode !== null) {\n      const procedureCallNode = suppositionProcedureCallNode; ///\n\n      procedureCall = procedureCallFromProcedureCallNode(procedureCallNode, context);\n    }\n\n    return procedureCall;\n  }\n});\n\nfunction procedureCallFromProcedureCallNode(procedureCallNode, context) {\n  const { Reference, ProcedureCall } = dom,\n        parameters = parametersFromProcedureCallNode(procedureCallNode, context),\n        reference = Reference.fromProcedureCallNode(procedureCallNode, context),\n        string = stringFromReferenceAndParameters(reference, parameters),\n        procedureCall = new ProcedureCall(string, reference, parameters);\n\n  return procedureCall;\n}\n\nfunction parametersFromProcedureCallNode(procedureCallNode, context) {\n  const { Parameter } = dom,\n        parameterNodes = parameterNodesQuery(procedureCallNode),\n        parameters = parameterNodes.map((parameterNode) => {\n          const parameter = Parameter.fromParameterNode(parameterNode, context);\n\n          return parameter;\n        });\n\n  return parameters;\n}\n\nfunction stringFromReferenceAndParameters(reference, parameters) {\n  const referenceString = reference.getString(),\n        parametersString = parameters.reduce((parametersString, parameter) => {\n          const parameterString = parameter.getString();\n\n          parametersString = (parametersString === null) ?\n                                parameterString : ///\n                                  `${parametersString}, ${parameterString}`;\n\n          return parametersString;\n        }, null),\n        string = `${referenceString}(${parametersString})`;\n\n  return string;\n}\n"],"names":["parameterNodesQuery","nodesQuery","premiseProcedureCallNodeQuery","nodeQuery","suppositionProcedureCallNodeQuery","domAssigned","ProcedureCall","string","reference","parameters","getString","getReference","getParameters","findNodes","substitutions","nodes","map","parameter","replacementNode","findReplacementNode","node","verify","assignments","stated","context","verified","procedureCallString","trace","procedure","findProcedureByReference","procedureBoolean","isBoolean","debug","unifyIndependently","unifiedIndependently","expressions","Expressions","fromNodes","value","call","boolean","getBoolean","exception","message","getMessage","info","toJSON","referenceJSON","parametersJSON","parametersToParametersJSON","json","fromJSON","fileContext","referenceFromJSON","parametersFromJSON","stringFromReferenceAndParameters","procedureCall","fromPremiseNode","premiseNode","premiseProcedureCallNode","procedureCallNode","procedureCallFromProcedureCallNode","fromSuppositionNode","suppositionNode","suppositionProcedureCallNode","name","Reference","dom","parametersFromProcedureCallNode","fromProcedureCallNode","Parameter","parameterNodes","parameterNode","fromParameterNode","referenceString","parametersString","reduce","parameterString"],"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.153",
4
+ "version": "1.0.154",
5
5
  "license": "MIT, Anti-996",
6
6
  "homepage": "https://github.com/djalbat/occam-verify-cli",
7
7
  "description": "Occam's Verifier",
package/src/dom/procedureCall.js CHANGED
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
 
3
- import { Values } from "occam-furtle";
3
+ import { Expressions } from "occam-furtle";
4
4
 
5
5
  import dom from "../dom";
6
6
 
@@ -79,10 +79,10 @@ export default domAssigned(class ProcedureCall {
79
79
 
80
80
  const procedure = context.findProcedureByReference(this.reference),
81
81
  nodes = this.findNodes(substitutions),
82
- values = Values.fromNodes(nodes, context);
82
+ expressions = Expressions.fromNodes(nodes, context);
83
83
 
84
84
  try {
85
- const value = procedure.call(values, context),
85
+ const value = procedure.call(expressions, context),
86
86
  boolean = value.getBoolean();
87
87
 
88
88
  unifiedIndependently = boolean; ///