occam-verify-cli 1.0.24 → 1.0.25

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/assertion/property.js +36 -26
  2. package/package.json +1 -1
  3. package/src/dom/assertion/property.js +40 -26
package/lib/dom/assertion/property.js CHANGED
@@ -90,14 +90,14 @@ function _interop_require_wildcard(obj, nodeInterop) {
90
90
  return newObj;
91
91
  }
92
92
  var _PropertyAssertion;
93
- var variableNodeQuery = (0, _query.nodeQuery)("/propertyAssertion/variable"), propertyRelationNodeQuery = (0, _query.nodeQuery)("/propertyAssertion/propertyRelation"), propertyAssertionNodeQuery = (0, _query.nodeQuery)("/statement/propertyAssertion");
93
+ var termNodeQuery = (0, _query.nodeQuery)("/propertyAssertion/term"), propertyRelationNodeQuery = (0, _query.nodeQuery)("/propertyAssertion/propertyRelation"), propertyAssertionNodeQuery = (0, _query.nodeQuery)("/statement/propertyAssertion");
94
94
  var _default = (0, _dom.domAssigned)((_PropertyAssertion = /*#__PURE__*/ function() {
95
- function PropertyAssertion(string, node, tokens, variable, propertyRelation) {
95
+ function PropertyAssertion(string, node, tokens, term, propertyRelation) {
96
96
  _class_call_check(this, PropertyAssertion);
97
97
  this.string = string;
98
98
  this.node = node;
99
99
  this.tokens = tokens;
100
- this.variable = variable;
100
+ this.term = term;
101
101
  this.propertyRelation = propertyRelation;
102
102
  }
103
103
  _create_class(PropertyAssertion, [
@@ -120,9 +120,9 @@ var _default = (0, _dom.domAssigned)((_PropertyAssertion = /*#__PURE__*/ functio
120
120
  }
121
121
  },
122
122
  {
123
- key: "getVariable",
124
- value: function getVariable() {
125
- return this.variable;
123
+ key: "getTerm",
124
+ value: function getTerm() {
125
+ return this.term;
126
126
  }
127
127
  },
128
128
  {
@@ -137,8 +137,8 @@ var _default = (0, _dom.domAssigned)((_PropertyAssertion = /*#__PURE__*/ functio
137
137
  var verified = false;
138
138
  var propertyAssertionString = this.string; ///
139
139
  context.trace("Verifying the '".concat(propertyAssertionString, "' property assertion..."));
140
- var variableVerified = this.verifyVariable(assignments, stated, context);
141
- if (variableVerified) {
140
+ var termVerified = this.verifyTerm(assignments, stated, context);
141
+ if (termVerified) {
142
142
  var propertyRelationVerified = this.verifyPropertyRelation(assignments, stated, context);
143
143
  if (propertyRelationVerified) {
144
144
  var verifiedWhenStated = false, verifiedWhenDerived = false;
@@ -159,16 +159,19 @@ var _default = (0, _dom.domAssigned)((_PropertyAssertion = /*#__PURE__*/ functio
159
159
  }
160
160
  },
161
161
  {
162
- key: "verifyVariable",
163
- value: function verifyVariable(assignments, stated, context) {
164
- var variableVerified;
165
- var variableString = this.variable.getString(), propertyAssertionString = this.string; ///
166
- context.trace("Verifying the '".concat(propertyAssertionString, "' property assertion's '").concat(variableString, "' variable..."));
167
- variableVerified = this.variable.verify(context);
168
- if (variableVerified) {
169
- context.debug("...verified the '".concat(propertyAssertionString, "' property assertion's '").concat(variableString, "' variable."));
162
+ key: "verifyTerm",
163
+ value: function verifyTerm(assignments, stated, context) {
164
+ var termVerified;
165
+ var termString = this.term.getString(), propertyAssertionString = this.string; ///
166
+ context.trace("Verifying the '".concat(propertyAssertionString, "' property assertion's '").concat(termString, "' term..."));
167
+ termVerified = this.term.verify(context, function() {
168
+ var verifiedAhead = true;
169
+ return verifiedAhead;
170
+ });
171
+ if (termVerified) {
172
+ context.debug("...verified the '".concat(propertyAssertionString, "' property assertion's '").concat(termString, "' term."));
170
173
  }
171
- return variableVerified;
174
+ return termVerified;
172
175
  }
173
176
  },
174
177
  {
@@ -187,16 +190,23 @@ var _default = (0, _dom.domAssigned)((_PropertyAssertion = /*#__PURE__*/ functio
187
190
  {
188
191
  key: "verifyWhenStated",
189
192
  value: function verifyWhenStated(assignments, context) {
190
- var verifiedWhenStated;
193
+ var verifiedWhenStated = false;
191
194
  var propertyAssertionString = this.string; ///
192
195
  context.trace("Verifying the '".concat(propertyAssertionString, "' stated property assertion..."));
193
196
  if (assignments !== null) {
194
197
  var variable;
195
- var Variable = _dom.default.Variable, variableName = this.variable.getName();
196
- variable = context.findVariableByVariableName(variableName);
197
- variable = Variable.fromVariableAndPropertyRelation(variable, this.propertyRelation);
198
- var variableAssignment = _variable.default.fromVariable(variable), assignment = variableAssignment; ///
199
- assignments.push(assignment);
198
+ var Variable = _dom.default.Variable, termNode = this.term.getNode();
199
+ variable = Variable.fromTermNode(termNode, context);
200
+ if (variable === null) {
201
+ var termString = this.term.getString();
202
+ context.debug("The '".concat(propertyAssertionString, "' stated property assertion's '").concat(termString, "' term is not a variable."));
203
+ } else {
204
+ var variableName = variable.getName();
205
+ variable = context.findVariableByVariableName(variableName);
206
+ variable = Variable.fromVariableAndPropertyRelation(variable, this.propertyRelation);
207
+ var variableAssignment = _variable.default.fromVariable(variable), assignment = variableAssignment; ///
208
+ assignments.push(assignment);
209
+ }
200
210
  }
201
211
  verifiedWhenStated = true;
202
212
  if (verifiedWhenStated) {
@@ -225,8 +235,8 @@ var _default = (0, _dom.domAssigned)((_PropertyAssertion = /*#__PURE__*/ functio
225
235
  var propertyAssertion = null;
226
236
  var propertyAssertionNode = propertyAssertionNodeQuery(statementNode);
227
237
  if (propertyAssertionNode !== null) {
228
- var Variable = _dom.default.Variable, PropertyRelation = _dom.default.PropertyRelation, node = propertyAssertionNode, string = context.nodeAsString(node), tokens = context.nodeAsTokens(node), variableNode = variableNodeQuery(propertyAssertionNode), propertyRelationNode = propertyRelationNodeQuery(propertyAssertionNode), variable = Variable.fromVariableNode(variableNode, context), propertyRelation = PropertyRelation.fromPropertyRelationNode(propertyRelationNode, context);
229
- propertyAssertion = new PropertyAssertion(string, node, tokens, variable, propertyRelation);
238
+ var Term = _dom.default.Term, PropertyRelation = _dom.default.PropertyRelation, node = propertyAssertionNode, string = context.nodeAsString(node), tokens = context.nodeAsTokens(node), termNode = termNodeQuery(propertyAssertionNode), propertyRelationNode = propertyRelationNodeQuery(propertyAssertionNode), term = Term.fromTermNode(termNode, context), propertyRelation = PropertyRelation.fromPropertyRelationNode(propertyRelationNode, context);
239
+ propertyAssertion = new PropertyAssertion(string, node, tokens, term, propertyRelation);
230
240
  }
231
241
  return propertyAssertion;
232
242
  }
@@ -235,4 +245,4 @@ var _default = (0, _dom.domAssigned)((_PropertyAssertion = /*#__PURE__*/ functio
235
245
  return PropertyAssertion;
236
246
  }(), _define_property(_PropertyAssertion, "name", "PropertyAssertion"), _PropertyAssertion));
237
247
 
238
- //# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../../src/dom/assertion/property.js"],"sourcesContent":["\"use strict\";\n\nimport dom from \"../../dom\";\n\nimport { nodeQuery } from \"../../utilities/query\";\nimport { domAssigned } from \"../../dom\";\nimport VariableAssignment from \"../../assignment/variable\";\n\nconst variableNodeQuery = nodeQuery(\"/propertyAssertion/variable\"),\n      propertyRelationNodeQuery = nodeQuery(\"/propertyAssertion/propertyRelation\"),\n      propertyAssertionNodeQuery = nodeQuery(\"/statement/propertyAssertion\");\n\nexport default domAssigned(class PropertyAssertion {\n  constructor(string, node, tokens, variable, propertyRelation) {\n    this.string = string;\n    this.node = node;\n    this.tokens = tokens;\n    this.variable = variable;\n    this.propertyRelation = propertyRelation;\n  }\n\n  getString() {\n    return this.string;\n  }\n\n  getNode() {\n    return this.node;\n  }\n\n  getTokens() {\n    return this.tokens;\n  }\n\n  getVariable() {\n    return this.variable;\n  }\n\n  getPropertyRelation() {\n    return this.propertyRelation;\n  }\n\n  verify(assignments, stated, context) {\n    let verified = false;\n\n    const propertyAssertionString = this.string; ///\n\n    context.trace(`Verifying the '${propertyAssertionString}' property assertion...`);\n\n    const variableVerified = this.verifyVariable(assignments, stated, context);\n\n    if (variableVerified) {\n      const propertyRelationVerified = this.verifyPropertyRelation(assignments, stated, context);\n\n      if (propertyRelationVerified) {\n        let verifiedWhenStated = false,\n            verifiedWhenDerived = false;\n\n        if (stated) {\n          verifiedWhenStated = this.verifyWhenStated(assignments, context);\n        } else {\n          verifiedWhenDerived = this.verifyWhenDerived(context);\n        }\n\n        if (verifiedWhenStated || verifiedWhenDerived) {\n          verified = true;\n        }\n      }\n    }\n\n    if (verified) {\n      context.debug(`...verified the '${propertyAssertionString}' property assertion.`);\n    }\n\n    return verified;\n  }\n\n  verifyVariable(assignments, stated, context) {\n    let variableVerified;\n\n    const variableString = this.variable.getString(),\n          propertyAssertionString = this.string; ///\n\n    context.trace(`Verifying the '${propertyAssertionString}' property assertion's '${variableString}' variable...`);\n\n    variableVerified = this.variable.verify(context);\n\n    if (variableVerified) {\n      context.debug(`...verified the '${propertyAssertionString}' property assertion's '${variableString}' variable.`);\n    }\n\n    return variableVerified;\n  }\n\n  verifyPropertyRelation(assignments, stated, context) {\n    let propertyRelationVerified;\n\n    const propertyRelationString = this.propertyRelation.getString(),\n          propertyAssertionString = this.string; ///\n\n    context.trace(`Verifying the '${propertyAssertionString}' property assertion's '${propertyRelationString}' property relation...`);\n\n    propertyRelationVerified = this.propertyRelation.verify(context);\n\n    if (propertyRelationVerified) {\n      context.debug(`...verified the '${propertyAssertionString}' property assertion's '${propertyRelationString}' property relation.`);\n    }\n\n    return propertyRelationVerified;\n  }\n\n  verifyWhenStated(assignments, context) {\n    let verifiedWhenStated;\n\n    const propertyAssertionString = this.string; ///\n\n    context.trace(`Verifying the '${propertyAssertionString}' stated property assertion...`);\n\n    if (assignments !== null) {\n      let variable;\n\n      const { Variable } = dom,\n            variableName = this.variable.getName();\n\n      variable = context.findVariableByVariableName(variableName);\n\n      variable = Variable.fromVariableAndPropertyRelation(variable, this.propertyRelation);\n\n      const variableAssignment = VariableAssignment.fromVariable(variable),\n            assignment = variableAssignment;  ///\n\n      assignments.push(assignment);\n    }\n\n    verifiedWhenStated = true;\n\n    if (verifiedWhenStated) {\n      context.debug(`...verified the '${propertyAssertionString}' stated property assertion.`);\n    }\n\n    return verifiedWhenStated;\n  }\n\n  verifyWhenDerived(assignments, context) {\n    let verifiedWhenDerived = false;\n\n    const propertyAssertionString = this.string; ///\n\n    context.trace(`Verifying the '${propertyAssertionString}' derived property assertion...`);\n\n    debugger\n\n    if (verifiedWhenDerived) {\n      context.debug(`...verified the '${propertyAssertionString}' derived property assertion.`);\n    }\n\n    return verifiedWhenDerived;\n  }\n\n  static name = \"PropertyAssertion\";\n\n  static fromStatementNode(statementNode, context) {\n    let propertyAssertion = null;\n\n    const propertyAssertionNode = propertyAssertionNodeQuery(statementNode);\n\n    if (propertyAssertionNode !== null) {\n      const { Variable, PropertyRelation } = dom,\n            node = propertyAssertionNode,  ///\n            string = context.nodeAsString(node),\n            tokens = context.nodeAsTokens(node),\n            variableNode = variableNodeQuery(propertyAssertionNode),\n            propertyRelationNode = propertyRelationNodeQuery(propertyAssertionNode),\n            variable = Variable.fromVariableNode(variableNode, context),\n            propertyRelation = PropertyRelation.fromPropertyRelationNode(propertyRelationNode, context);\n\n      propertyAssertion = new PropertyAssertion(string, node, tokens, variable, propertyRelation);\n    }\n\n    return propertyAssertion;\n  }\n});\n"],"names":["variableNodeQuery","nodeQuery","propertyRelationNodeQuery","propertyAssertionNodeQuery","domAssigned","PropertyAssertion","string","node","tokens","variable","propertyRelation","getString","getNode","getTokens","getVariable","getPropertyRelation","verify","assignments","stated","context","verified","propertyAssertionString","trace","variableVerified","verifyVariable","propertyRelationVerified","verifyPropertyRelation","verifiedWhenStated","verifiedWhenDerived","verifyWhenStated","verifyWhenDerived","debug","variableString","propertyRelationString","Variable","dom","variableName","getName","findVariableByVariableName","fromVariableAndPropertyRelation","variableAssignment","VariableAssignment","fromVariable","assignment","push","fromStatementNode","statementNode","propertyAssertion","propertyAssertionNode","PropertyRelation","nodeAsString","nodeAsTokens","variableNode","propertyRelationNode","fromVariableNode","fromPropertyRelationNode","name"],"mappings":"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"}
248
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../../src/dom/assertion/property.js"],"sourcesContent":["\"use strict\";\n\nimport dom from \"../../dom\";\n\nimport { nodeQuery } from \"../../utilities/query\";\nimport { domAssigned } from \"../../dom\";\nimport VariableAssignment from \"../../assignment/variable\";\n\nconst termNodeQuery = nodeQuery(\"/propertyAssertion/term\"),\n      propertyRelationNodeQuery = nodeQuery(\"/propertyAssertion/propertyRelation\"),\n      propertyAssertionNodeQuery = nodeQuery(\"/statement/propertyAssertion\");\n\nexport default domAssigned(class PropertyAssertion {\n  constructor(string, node, tokens, term, propertyRelation) {\n    this.string = string;\n    this.node = node;\n    this.tokens = tokens;\n    this.term = term;\n    this.propertyRelation = propertyRelation;\n  }\n\n  getString() {\n    return this.string;\n  }\n\n  getNode() {\n    return this.node;\n  }\n\n  getTokens() {\n    return this.tokens;\n  }\n\n  getTerm() {\n    return this.term;\n  }\n\n  getPropertyRelation() {\n    return this.propertyRelation;\n  }\n\n  verify(assignments, stated, context) {\n    let verified = false;\n\n    const propertyAssertionString = this.string; ///\n\n    context.trace(`Verifying the '${propertyAssertionString}' property assertion...`);\n\n    const termVerified = this.verifyTerm(assignments, stated, context);\n\n    if (termVerified) {\n      const propertyRelationVerified = this.verifyPropertyRelation(assignments, stated, context);\n\n      if (propertyRelationVerified) {\n        let verifiedWhenStated = false,\n            verifiedWhenDerived = false;\n\n        if (stated) {\n          verifiedWhenStated = this.verifyWhenStated(assignments, context);\n        } else {\n          verifiedWhenDerived = this.verifyWhenDerived(context);\n        }\n\n        if (verifiedWhenStated || verifiedWhenDerived) {\n          verified = true;\n        }\n      }\n    }\n\n    if (verified) {\n      context.debug(`...verified the '${propertyAssertionString}' property assertion.`);\n    }\n\n    return verified;\n  }\n\n  verifyTerm(assignments, stated, context) {\n    let termVerified;\n\n    const termString = this.term.getString(),\n          propertyAssertionString = this.string; ///\n\n    context.trace(`Verifying the '${propertyAssertionString}' property assertion's '${termString}' term...`);\n\n    termVerified = this.term.verify(context, () => {\n      const verifiedAhead = true;\n\n      return verifiedAhead;\n    });\n\n    if (termVerified) {\n      context.debug(`...verified the '${propertyAssertionString}' property assertion's '${termString}' term.`);\n    }\n\n    return termVerified;\n  }\n\n  verifyPropertyRelation(assignments, stated, context) {\n    let propertyRelationVerified;\n\n    const propertyRelationString = this.propertyRelation.getString(),\n          propertyAssertionString = this.string; ///\n\n    context.trace(`Verifying the '${propertyAssertionString}' property assertion's '${propertyRelationString}' property relation...`);\n\n    propertyRelationVerified = this.propertyRelation.verify(context);\n\n    if (propertyRelationVerified) {\n      context.debug(`...verified the '${propertyAssertionString}' property assertion's '${propertyRelationString}' property relation.`);\n    }\n\n    return propertyRelationVerified;\n  }\n\n  verifyWhenStated(assignments, context) {\n    let verifiedWhenStated = false;\n\n    const propertyAssertionString = this.string; ///\n\n    context.trace(`Verifying the '${propertyAssertionString}' stated property assertion...`);\n\n    if (assignments !== null) {\n      let variable;\n\n      const { Variable } = dom,\n            termNode = this.term.getNode();\n\n      variable = Variable.fromTermNode(termNode, context);\n\n      if (variable === null) {\n        const termString = this.term.getString();\n\n        context.debug(`The '${propertyAssertionString}' stated property assertion's '${termString}' term is not a variable.`);\n      } else {\n        const variableName = variable.getName();\n\n        variable = context.findVariableByVariableName(variableName);\n\n        variable = Variable.fromVariableAndPropertyRelation(variable, this.propertyRelation);\n\n        const variableAssignment = VariableAssignment.fromVariable(variable),\n              assignment = variableAssignment;  ///\n\n        assignments.push(assignment);\n      }\n    }\n\n    verifiedWhenStated = true;\n\n    if (verifiedWhenStated) {\n      context.debug(`...verified the '${propertyAssertionString}' stated property assertion.`);\n    }\n\n    return verifiedWhenStated;\n  }\n\n  verifyWhenDerived(assignments, context) {\n    let verifiedWhenDerived = false;\n\n    const propertyAssertionString = this.string; ///\n\n    context.trace(`Verifying the '${propertyAssertionString}' derived property assertion...`);\n\n    debugger\n\n    if (verifiedWhenDerived) {\n      context.debug(`...verified the '${propertyAssertionString}' derived property assertion.`);\n    }\n\n    return verifiedWhenDerived;\n  }\n\n  static name = \"PropertyAssertion\";\n\n  static fromStatementNode(statementNode, context) {\n    let propertyAssertion = null;\n\n    const propertyAssertionNode = propertyAssertionNodeQuery(statementNode);\n\n    if (propertyAssertionNode !== null) {\n      const { Term, PropertyRelation } = dom,\n            node = propertyAssertionNode,  ///\n            string = context.nodeAsString(node),\n            tokens = context.nodeAsTokens(node),\n            termNode = termNodeQuery(propertyAssertionNode),\n            propertyRelationNode = propertyRelationNodeQuery(propertyAssertionNode),\n            term = Term.fromTermNode(termNode, context),\n            propertyRelation = PropertyRelation.fromPropertyRelationNode(propertyRelationNode, context);\n\n      propertyAssertion = new PropertyAssertion(string, node, tokens, term, propertyRelation);\n    }\n\n    return propertyAssertion;\n  }\n});\n"],"names":["termNodeQuery","nodeQuery","propertyRelationNodeQuery","propertyAssertionNodeQuery","domAssigned","PropertyAssertion","string","node","tokens","term","propertyRelation","getString","getNode","getTokens","getTerm","getPropertyRelation","verify","assignments","stated","context","verified","propertyAssertionString","trace","termVerified","verifyTerm","propertyRelationVerified","verifyPropertyRelation","verifiedWhenStated","verifiedWhenDerived","verifyWhenStated","verifyWhenDerived","debug","termString","verifiedAhead","propertyRelationString","variable","Variable","dom","termNode","fromTermNode","variableName","getName","findVariableByVariableName","fromVariableAndPropertyRelation","variableAssignment","VariableAssignment","fromVariable","assignment","push","fromStatementNode","statementNode","propertyAssertion","propertyAssertionNode","Term","PropertyRelation","nodeAsString","nodeAsTokens","propertyRelationNode","fromPropertyRelationNode","name"],"mappings":"AAAA;;;;+BAYA;;;eAAA;;;2DAVgB;qBAEU;+DAEK;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAE/B,IAAMA,gBAAgBC,IAAAA,gBAAS,EAAC,4BAC1BC,4BAA4BD,IAAAA,gBAAS,EAAC,wCACtCE,6BAA6BF,IAAAA,gBAAS,EAAC;IAE7C,WAAeG,IAAAA,gBAAW,sCAAC;aAAMC,kBACnBC,MAAM,EAAEC,IAAI,EAAEC,MAAM,EAAEC,IAAI,EAAEC,gBAAgB;gCADzBL;QAE7B,IAAI,CAACC,MAAM,GAAGA;QACd,IAAI,CAACC,IAAI,GAAGA;QACZ,IAAI,CAACC,MAAM,GAAGA;QACd,IAAI,CAACC,IAAI,GAAGA;QACZ,IAAI,CAACC,gBAAgB,GAAGA;;;;YAG1BC,KAAAA;mBAAAA,SAAAA;gBACE,OAAO,IAAI,CAACL,MAAM;YACpB;;;YAEAM,KAAAA;mBAAAA,SAAAA;gBACE,OAAO,IAAI,CAACL,IAAI;YAClB;;;YAEAM,KAAAA;mBAAAA,SAAAA;gBACE,OAAO,IAAI,CAACL,MAAM;YACpB;;;YAEAM,KAAAA;mBAAAA,SAAAA;gBACE,OAAO,IAAI,CAACL,IAAI;YAClB;;;YAEAM,KAAAA;mBAAAA,SAAAA;gBACE,OAAO,IAAI,CAACL,gBAAgB;YAC9B;;;YAEAM,KAAAA;mBAAAA,SAAAA,OAAOC,WAAW,EAAEC,MAAM,EAAEC,OAAO;gBACjC,IAAIC,WAAW;gBAEf,IAAMC,0BAA0B,IAAI,CAACf,MAAM,EAAE,GAAG;gBAEhDa,QAAQG,KAAK,CAAC,AAAC,kBAAyC,OAAxBD,yBAAwB;gBAExD,IAAME,eAAe,IAAI,CAACC,UAAU,CAACP,aAAaC,QAAQC;gBAE1D,IAAII,cAAc;oBAChB,IAAME,2BAA2B,IAAI,CAACC,sBAAsB,CAACT,aAAaC,QAAQC;oBAElF,IAAIM,0BAA0B;wBAC5B,IAAIE,qBAAqB,OACrBC,sBAAsB;wBAE1B,IAAIV,QAAQ;4BACVS,qBAAqB,IAAI,CAACE,gBAAgB,CAACZ,aAAaE;wBAC1D,OAAO;4BACLS,sBAAsB,IAAI,CAACE,iBAAiB,CAACX;wBAC/C;wBAEA,IAAIQ,sBAAsBC,qBAAqB;4BAC7CR,WAAW;wBACb;oBACF;gBACF;gBAEA,IAAIA,UAAU;oBACZD,QAAQY,KAAK,CAAC,AAAC,oBAA2C,OAAxBV,yBAAwB;gBAC5D;gBAEA,OAAOD;YACT;;;YAEAI,KAAAA;mBAAAA,SAAAA,WAAWP,WAAW,EAAEC,MAAM,EAAEC,OAAO;gBACrC,IAAII;gBAEJ,IAAMS,aAAa,IAAI,CAACvB,IAAI,CAACE,SAAS,IAChCU,0BAA0B,IAAI,CAACf,MAAM,EAAE,GAAG;gBAEhDa,QAAQG,KAAK,CAAC,AAAC,kBAAmEU,OAAlDX,yBAAwB,4BAAqC,OAAXW,YAAW;gBAE7FT,eAAe,IAAI,CAACd,IAAI,CAACO,MAAM,CAACG,SAAS;oBACvC,IAAMc,gBAAgB;oBAEtB,OAAOA;gBACT;gBAEA,IAAIV,cAAc;oBAChBJ,QAAQY,KAAK,CAAC,AAAC,oBAAqEC,OAAlDX,yBAAwB,4BAAqC,OAAXW,YAAW;gBACjG;gBAEA,OAAOT;YACT;;;YAEAG,KAAAA;mBAAAA,SAAAA,uBAAuBT,WAAW,EAAEC,MAAM,EAAEC,OAAO;gBACjD,IAAIM;gBAEJ,IAAMS,yBAAyB,IAAI,CAACxB,gBAAgB,CAACC,SAAS,IACxDU,0BAA0B,IAAI,CAACf,MAAM,EAAE,GAAG;gBAEhDa,QAAQG,KAAK,CAAC,AAAC,kBAAmEY,OAAlDb,yBAAwB,4BAAiD,OAAvBa,wBAAuB;gBAEzGT,2BAA2B,IAAI,CAACf,gBAAgB,CAACM,MAAM,CAACG;gBAExD,IAAIM,0BAA0B;oBAC5BN,QAAQY,KAAK,CAAC,AAAC,oBAAqEG,OAAlDb,yBAAwB,4BAAiD,OAAvBa,wBAAuB;gBAC7G;gBAEA,OAAOT;YACT;;;YAEAI,KAAAA;mBAAAA,SAAAA,iBAAiBZ,WAAW,EAAEE,OAAO;gBACnC,IAAIQ,qBAAqB;gBAEzB,IAAMN,0BAA0B,IAAI,CAACf,MAAM,EAAE,GAAG;gBAEhDa,QAAQG,KAAK,CAAC,AAAC,kBAAyC,OAAxBD,yBAAwB;gBAExD,IAAIJ,gBAAgB,MAAM;oBACxB,IAAIkB;oBAEJ,IAAM,AAAEC,WAAaC,YAAG,CAAhBD,UACFE,WAAW,IAAI,CAAC7B,IAAI,CAACG,OAAO;oBAElCuB,WAAWC,SAASG,YAAY,CAACD,UAAUnB;oBAE3C,IAAIgB,aAAa,MAAM;wBACrB,IAAMH,aAAa,IAAI,CAACvB,IAAI,CAACE,SAAS;wBAEtCQ,QAAQY,KAAK,CAAC,AAAC,QAAgEC,OAAzDX,yBAAwB,mCAA4C,OAAXW,YAAW;oBAC5F,OAAO;wBACL,IAAMQ,eAAeL,SAASM,OAAO;wBAErCN,WAAWhB,QAAQuB,0BAA0B,CAACF;wBAE9CL,WAAWC,SAASO,+BAA+B,CAACR,UAAU,IAAI,CAACzB,gBAAgB;wBAEnF,IAAMkC,qBAAqBC,iBAAkB,CAACC,YAAY,CAACX,WACrDY,aAAaH,oBAAqB,GAAG;wBAE3C3B,YAAY+B,IAAI,CAACD;oBACnB;gBACF;gBAEApB,qBAAqB;gBAErB,IAAIA,oBAAoB;oBACtBR,QAAQY,KAAK,CAAC,AAAC,oBAA2C,OAAxBV,yBAAwB;gBAC5D;gBAEA,OAAOM;YACT;;;YAEAG,KAAAA;mBAAAA,SAAAA,kBAAkBb,WAAW,EAAEE,OAAO;gBACpC,IAAIS,sBAAsB;gBAE1B,IAAMP,0BAA0B,IAAI,CAACf,MAAM,EAAE,GAAG;gBAEhDa,QAAQG,KAAK,CAAC,AAAC,kBAAyC,OAAxBD,yBAAwB;gBAExD,QAAQ;gBAER,IAAIO,qBAAqB;oBACvBT,QAAQY,KAAK,CAAC,AAAC,oBAA2C,OAAxBV,yBAAwB;gBAC5D;gBAEA,OAAOO;YACT;;;;YAIOqB,KAAAA;mBAAP,SAAOA,kBAAkBC,aAAa,EAAE/B,OAAO;gBAC7C,IAAIgC,oBAAoB;gBAExB,IAAMC,wBAAwBjD,2BAA2B+C;gBAEzD,IAAIE,0BAA0B,MAAM;oBAClC,IAAQC,OAA2BhB,YAAG,CAA9BgB,MAAMC,mBAAqBjB,YAAG,CAAxBiB,kBACR/C,OAAO6C,uBACP9C,SAASa,QAAQoC,YAAY,CAAChD,OAC9BC,SAASW,QAAQqC,YAAY,CAACjD,OAC9B+B,WAAWtC,cAAcoD,wBACzBK,uBAAuBvD,0BAA0BkD,wBACjD3C,OAAO4C,KAAKd,YAAY,CAACD,UAAUnB,UACnCT,mBAAmB4C,iBAAiBI,wBAAwB,CAACD,sBAAsBtC;oBAEzFgC,oBAAoB,IAAI9C,kBAAkBC,QAAQC,MAAMC,QAAQC,MAAMC;gBACxE;gBAEA,OAAOyC;YACT;;;;KArBA,qCAAOQ,QAAO"}
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.24",
4
+ "version": "1.0.25",
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/assertion/property.js CHANGED
@@ -6,16 +6,16 @@ import { nodeQuery } from "../../utilities/query";
6
6
  import { domAssigned } from "../../dom";
7
7
  import VariableAssignment from "../../assignment/variable";
8
8
 
9
- const variableNodeQuery = nodeQuery("/propertyAssertion/variable"),
9
+ const termNodeQuery = nodeQuery("/propertyAssertion/term"),
10
10
  propertyRelationNodeQuery = nodeQuery("/propertyAssertion/propertyRelation"),
11
11
  propertyAssertionNodeQuery = nodeQuery("/statement/propertyAssertion");
12
12
 
13
13
  export default domAssigned(class PropertyAssertion {
14
- constructor(string, node, tokens, variable, propertyRelation) {
14
+ constructor(string, node, tokens, term, propertyRelation) {
15
15
  this.string = string;
16
16
  this.node = node;
17
17
  this.tokens = tokens;
18
- this.variable = variable;
18
+ this.term = term;
19
19
  this.propertyRelation = propertyRelation;
20
20
  }
21
21
 
@@ -31,8 +31,8 @@ export default domAssigned(class PropertyAssertion {
31
31
  return this.tokens;
32
32
  }
33
33
 
34
- getVariable() {
35
- return this.variable;
34
+ getTerm() {
35
+ return this.term;
36
36
  }
37
37
 
38
38
  getPropertyRelation() {
@@ -46,9 +46,9 @@ export default domAssigned(class PropertyAssertion {
46
46
 
47
47
  context.trace(`Verifying the '${propertyAssertionString}' property assertion...`);
48
48
 
49
- const variableVerified = this.verifyVariable(assignments, stated, context);
49
+ const termVerified = this.verifyTerm(assignments, stated, context);
50
50
 
51
- if (variableVerified) {
51
+ if (termVerified) {
52
52
  const propertyRelationVerified = this.verifyPropertyRelation(assignments, stated, context);
53
53
 
54
54
  if (propertyRelationVerified) {
@@ -74,21 +74,25 @@ export default domAssigned(class PropertyAssertion {
74
74
  return verified;
75
75
  }
76
76
 
77
- verifyVariable(assignments, stated, context) {
78
- let variableVerified;
77
+ verifyTerm(assignments, stated, context) {
78
+ let termVerified;
79
79
 
80
- const variableString = this.variable.getString(),
80
+ const termString = this.term.getString(),
81
81
  propertyAssertionString = this.string; ///
82
82
 
83
- context.trace(`Verifying the '${propertyAssertionString}' property assertion's '${variableString}' variable...`);
83
+ context.trace(`Verifying the '${propertyAssertionString}' property assertion's '${termString}' term...`);
84
84
 
85
- variableVerified = this.variable.verify(context);
85
+ termVerified = this.term.verify(context, () => {
86
+ const verifiedAhead = true;
86
87
 
87
- if (variableVerified) {
88
- context.debug(`...verified the '${propertyAssertionString}' property assertion's '${variableString}' variable.`);
88
+ return verifiedAhead;
89
+ });
90
+
91
+ if (termVerified) {
92
+ context.debug(`...verified the '${propertyAssertionString}' property assertion's '${termString}' term.`);
89
93
  }
90
94
 
91
- return variableVerified;
95
+ return termVerified;
92
96
  }
93
97
 
94
98
  verifyPropertyRelation(assignments, stated, context) {
@@ -109,7 +113,7 @@ export default domAssigned(class PropertyAssertion {
109
113
  }
110
114
 
111
115
  verifyWhenStated(assignments, context) {
112
- let verifiedWhenStated;
116
+ let verifiedWhenStated = false;
113
117
 
114
118
  const propertyAssertionString = this.string; ///
115
119
 
@@ -119,16 +123,26 @@ export default domAssigned(class PropertyAssertion {
119
123
  let variable;
120
124
 
121
125
  const { Variable } = dom,
122
- variableName = this.variable.getName();
126
+ termNode = this.term.getNode();
127
+
128
+ variable = Variable.fromTermNode(termNode, context);
129
+
130
+ if (variable === null) {
131
+ const termString = this.term.getString();
123
132
 
124
- variable = context.findVariableByVariableName(variableName);
133
+ context.debug(`The '${propertyAssertionString}' stated property assertion's '${termString}' term is not a variable.`);
134
+ } else {
135
+ const variableName = variable.getName();
125
136
 
126
- variable = Variable.fromVariableAndPropertyRelation(variable, this.propertyRelation);
137
+ variable = context.findVariableByVariableName(variableName);
127
138
 
128
- const variableAssignment = VariableAssignment.fromVariable(variable),
129
- assignment = variableAssignment; ///
139
+ variable = Variable.fromVariableAndPropertyRelation(variable, this.propertyRelation);
130
140
 
131
- assignments.push(assignment);
141
+ const variableAssignment = VariableAssignment.fromVariable(variable),
142
+ assignment = variableAssignment; ///
143
+
144
+ assignments.push(assignment);
145
+ }
132
146
  }
133
147
 
134
148
  verifiedWhenStated = true;
@@ -164,16 +178,16 @@ export default domAssigned(class PropertyAssertion {
164
178
  const propertyAssertionNode = propertyAssertionNodeQuery(statementNode);
165
179
 
166
180
  if (propertyAssertionNode !== null) {
167
- const { Variable, PropertyRelation } = dom,
181
+ const { Term, PropertyRelation } = dom,
168
182
  node = propertyAssertionNode, ///
169
183
  string = context.nodeAsString(node),
170
184
  tokens = context.nodeAsTokens(node),
171
- variableNode = variableNodeQuery(propertyAssertionNode),
185
+ termNode = termNodeQuery(propertyAssertionNode),
172
186
  propertyRelationNode = propertyRelationNodeQuery(propertyAssertionNode),
173
- variable = Variable.fromVariableNode(variableNode, context),
187
+ term = Term.fromTermNode(termNode, context),
174
188
  propertyRelation = PropertyRelation.fromPropertyRelationNode(propertyRelationNode, context);
175
189
 
176
- propertyAssertion = new PropertyAssertion(string, node, tokens, variable, propertyRelation);
190
+ propertyAssertion = new PropertyAssertion(string, node, tokens, term, propertyRelation);
177
191
  }
178
192
 
179
193
  return propertyAssertion;