occam-verify-cli 0.0.987 → 0.0.988

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 (7) hide show
  1. package/lib/resolve/complexSubstitutionAgainstSimpleSubstitution.js +5 -2
  2. package/lib/unify/complexSubstitutionStatementWithSimpleSubstitutionStatement.js +6 -1
  3. package/lib/verify/assertion/contained.js +15 -15
  4. package/package.json +2 -2
  5. package/src/resolve/complexSubstitutionAgainstSimpleSubstitution.js +11 -2
  6. package/src/unify/complexSubstitutionStatementWithSimpleSubstitutionStatement.js +9 -0
  7. package/src/verify/assertion/contained.js +16 -16
package/lib/resolve/complexSubstitutionAgainstSimpleSubstitution.js CHANGED
@@ -62,15 +62,18 @@ function transformedSubstitutionFromComplexSubstitutionSimpleSubstitutionAndSubs
62
62
  var substitution = complexSubstitution.getSubstitution();
63
63
  transformedSubstitution = substitution.transformed(substitutions);
64
64
  if (transformedSubstitution !== null) {
65
- var simpleSubstitutionStatementNode = simpleSubstitution.getStatementNode(), complexSubstitutionStatementNode = complexSubstitution.getStatementNode();
66
65
  substitutions = _substitutions.default.fromNothing(); ///
66
+ var substitutionString = substitution.asString(localContextA, localContextA), transformedSubstitutionString = transformedSubstitution.asString(localContextA, localContextB), simpleSubstitutionStatementNode = simpleSubstitution.getStatementNode(), complexSubstitutionStatementNode = complexSubstitution.getStatementNode();
67
+ localContextB.trace("Transformed the complex substitution's '".concat(substitutionString, "' substitution into the '").concat(transformedSubstitutionString, "' substitution."), complexSubstitutionStatementNode);
67
68
  var complexSubstitutionStatementWithSimpleSubstitutionStatement = (0, _complexSubstitutionStatementWithSimpleSubstitutionStatement.default)(complexSubstitutionStatementNode, simpleSubstitutionStatementNode, substitutions, localContextA, localContextB);
68
69
  if (complexSubstitutionStatementWithSimpleSubstitutionStatement) {
69
70
  var substitution1 = transformedSubstitution; ///
70
71
  transformedSubstitution = substitution1.transformed(substitutions);
72
+ var substitutionString1 = substitution1.asString(localContextA, localContextB), transformedSubstitutionString1 = transformedSubstitution.asString(localContextA, localContextB);
73
+ localContextB.trace("Transformed the complex substitution's transformed '".concat(substitutionString1, "' substitution into the '").concat(transformedSubstitutionString1, "' substitution."), complexSubstitutionStatementNode);
71
74
  }
72
75
  }
73
76
  return transformedSubstitution;
74
77
  }
75
78
 
76
- //# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/resolve/complexSubstitutionAgainstSimpleSubstitution.js"],"sourcesContent":["\"use strict\";\n\nimport Substitutions from \"../substitutions\";\nimport unifyComplexSubstitutionStatementWithSimpleSubstitutionStatement from \"../unify/complexSubstitutionStatementWithSimpleSubstitutionStatement\";\n\nexport default function resolveComplexSubstitutionAgainstSimpleSubstitution(complexSubstitution, simpleSubstitution, substitutions, localContextA, localContextB) {\n  let complexSubstitutionResolvedAgainstSimpleSubstitution = false;\n\n  const statementNode = complexSubstitution.getStatementNode(),\n        simpleSubstitutionString = simpleSubstitution.asString(localContextA, localContextB),\n        complexSubstitutionString = complexSubstitution.asString(localContextA, localContextB);\n\n  localContextB.trace(`Resolving the complex ${complexSubstitutionString} substitution against the simple ${simpleSubstitutionString} substitution...`, statementNode);\n\n  const transformedSubstitution = transformedSubstitutionFromComplexSubstitutionSimpleSubstitutionAndSubstitutions(complexSubstitution, simpleSubstitution, substitutions, localContextA, localContextB);\n\n  if (transformedSubstitution !== null) {\n    const variableNode = transformedSubstitution.getVariableNode(),\n          metavariableNode = transformedSubstitution.getMetavariableNode();\n\n    if (false) {\n      ///\n    } else if (variableNode !== null) {\n      const substitution = substitutions.findSubstitutionByVariableNode(variableNode);\n\n      if (substitution === null) {\n        substitutions.addSubstitution(transformedSubstitution, localContextA, localContextB);\n\n        substitutions.removeSubstitution(complexSubstitution, localContextA, localContextB);\n\n        complexSubstitutionResolvedAgainstSimpleSubstitution = true;\n      } else {\n        const termNode = transformedSubstitution.getTermNode(),\n              termNodeMatches = substitution.matchTermNode(termNode);\n\n        if (termNodeMatches) {\n          substitutions.removeSubstitution(complexSubstitution, localContextA, localContextB);\n\n          complexSubstitutionResolvedAgainstSimpleSubstitution = true;\n        }\n      }\n    } else if (metavariableNode !== null) {\n      const substitution = substitutions.findSubstitutionByMetavariableNode(metavariableNode);\n\n      if (substitution === null) {\n        substitutions.addSubstitution(transformedSubstitution, localContextA, localContextB);\n\n        substitutions.removeSubstitution(complexSubstitution, localContextA, localContextB);\n\n        complexSubstitutionResolvedAgainstSimpleSubstitution = true;\n      } else {\n        const frameNode = transformedSubstitution.getFrameNode(),\n              frameNodeMatches = substitution.matchFrameNode(frameNode);\n\n        if (frameNodeMatches) {\n          substitutions.removeSubstitution(complexSubstitution, localContextA, localContextB);\n\n          complexSubstitutionResolvedAgainstSimpleSubstitution = true;\n        }\n      }\n    }\n  }\n\n  if (complexSubstitutionResolvedAgainstSimpleSubstitution) {\n    localContextB.debug(`...resolved the complex ${complexSubstitutionString} substitution against the simple ${simpleSubstitutionString} substitution.`, statementNode);\n  }\n\n  return complexSubstitutionResolvedAgainstSimpleSubstitution;\n}\n\nfunction transformedSubstitutionFromComplexSubstitutionSimpleSubstitutionAndSubstitutions(complexSubstitution, simpleSubstitution, substitutions, localContextA, localContextB) {\n  let transformedSubstitution;\n\n  const substitution = complexSubstitution.getSubstitution();\n\n  transformedSubstitution = substitution.transformed(substitutions);\n\n  if (transformedSubstitution !== null) {\n    const simpleSubstitutionStatementNode = simpleSubstitution.getStatementNode(),\n          complexSubstitutionStatementNode = complexSubstitution.getStatementNode();\n\n    substitutions = Substitutions.fromNothing();  ///\n\n    const complexSubstitutionStatementWithSimpleSubstitutionStatement = unifyComplexSubstitutionStatementWithSimpleSubstitutionStatement(complexSubstitutionStatementNode, simpleSubstitutionStatementNode, substitutions, localContextA, localContextB);\n\n    if (complexSubstitutionStatementWithSimpleSubstitutionStatement) {\n      const substitution = transformedSubstitution; ///\n\n      transformedSubstitution = substitution.transformed(substitutions);\n    }\n  }\n\n  return transformedSubstitution;\n}\n"],"names":["resolveComplexSubstitutionAgainstSimpleSubstitution","complexSubstitution","simpleSubstitution","substitutions","localContextA","localContextB","complexSubstitutionResolvedAgainstSimpleSubstitution","statementNode","getStatementNode","simpleSubstitutionString","asString","complexSubstitutionString","trace","transformedSubstitution","transformedSubstitutionFromComplexSubstitutionSimpleSubstitutionAndSubstitutions","variableNode","getVariableNode","metavariableNode","getMetavariableNode","substitution","findSubstitutionByVariableNode","addSubstitution","removeSubstitution","termNode","getTermNode","termNodeMatches","matchTermNode","findSubstitutionByMetavariableNode","frameNode","getFrameNode","frameNodeMatches","matchFrameNode","debug","getSubstitution","transformed","simpleSubstitutionStatementNode","complexSubstitutionStatementNode","Substitutions","fromNothing","complexSubstitutionStatementWithSimpleSubstitutionStatement","unifyComplexSubstitutionStatementWithSimpleSubstitutionStatement"],"mappings":"AAAA;;;;+BAKA;;;eAAwBA;;;oEAHE;kHACmD;;;;;;AAE9D,SAASA,oDAAoDC,mBAAmB,EAAEC,kBAAkB,EAAEC,aAAa,EAAEC,aAAa,EAAEC,aAAa;IAC9J,IAAIC,uDAAuD;IAE3D,IAAMC,gBAAgBN,oBAAoBO,gBAAgB,IACpDC,2BAA2BP,mBAAmBQ,QAAQ,CAACN,eAAeC,gBACtEM,4BAA4BV,oBAAoBS,QAAQ,CAACN,eAAeC;IAE9EA,cAAcO,KAAK,CAAC,AAAC,yBAAqFH,OAA7DE,2BAA0B,qCAA4D,OAAzBF,0BAAyB,qBAAmBF;IAEtJ,IAAMM,0BAA0BC,iFAAiFb,qBAAqBC,oBAAoBC,eAAeC,eAAeC;IAExL,IAAIQ,4BAA4B,MAAM;QACpC,IAAME,eAAeF,wBAAwBG,eAAe,IACtDC,mBAAmBJ,wBAAwBK,mBAAmB;QAEpE,IAAI,OAAO;QACT,GAAG;QACL,OAAO,IAAIH,iBAAiB,MAAM;YAChC,IAAMI,eAAehB,cAAciB,8BAA8B,CAACL;YAElE,IAAII,iBAAiB,MAAM;gBACzBhB,cAAckB,eAAe,CAACR,yBAAyBT,eAAeC;gBAEtEF,cAAcmB,kBAAkB,CAACrB,qBAAqBG,eAAeC;gBAErEC,uDAAuD;YACzD,OAAO;gBACL,IAAMiB,WAAWV,wBAAwBW,WAAW,IAC9CC,kBAAkBN,aAAaO,aAAa,CAACH;gBAEnD,IAAIE,iBAAiB;oBACnBtB,cAAcmB,kBAAkB,CAACrB,qBAAqBG,eAAeC;oBAErEC,uDAAuD;gBACzD;YACF;QACF,OAAO,IAAIW,qBAAqB,MAAM;YACpC,IAAME,gBAAehB,cAAcwB,kCAAkC,CAACV;YAEtE,IAAIE,kBAAiB,MAAM;gBACzBhB,cAAckB,eAAe,CAACR,yBAAyBT,eAAeC;gBAEtEF,cAAcmB,kBAAkB,CAACrB,qBAAqBG,eAAeC;gBAErEC,uDAAuD;YACzD,OAAO;gBACL,IAAMsB,YAAYf,wBAAwBgB,YAAY,IAChDC,mBAAmBX,cAAaY,cAAc,CAACH;gBAErD,IAAIE,kBAAkB;oBACpB3B,cAAcmB,kBAAkB,CAACrB,qBAAqBG,eAAeC;oBAErEC,uDAAuD;gBACzD;YACF;QACF;IACF;IAEA,IAAIA,sDAAsD;QACxDD,cAAc2B,KAAK,CAAC,AAAC,2BAAuFvB,OAA7DE,2BAA0B,qCAA4D,OAAzBF,0BAAyB,mBAAiBF;IACxJ;IAEA,OAAOD;AACT;AAEA,SAASQ,iFAAiFb,mBAAmB,EAAEC,kBAAkB,EAAEC,aAAa,EAAEC,aAAa,EAAEC,aAAa;IAC5K,IAAIQ;IAEJ,IAAMM,eAAelB,oBAAoBgC,eAAe;IAExDpB,0BAA0BM,aAAae,WAAW,CAAC/B;IAEnD,IAAIU,4BAA4B,MAAM;QACpC,IAAMsB,kCAAkCjC,mBAAmBM,gBAAgB,IACrE4B,mCAAmCnC,oBAAoBO,gBAAgB;QAE7EL,gBAAgBkC,sBAAa,CAACC,WAAW,IAAK,GAAG;QAEjD,IAAMC,8DAA8DC,IAAAA,oEAAgE,EAACJ,kCAAkCD,iCAAiChC,eAAeC,eAAeC;QAEtO,IAAIkC,6DAA6D;YAC/D,IAAMpB,gBAAeN,yBAAyB,GAAG;YAEjDA,0BAA0BM,cAAae,WAAW,CAAC/B;QACrD;IACF;IAEA,OAAOU;AACT"}
79
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/resolve/complexSubstitutionAgainstSimpleSubstitution.js"],"sourcesContent":["\"use strict\";\n\nimport Substitutions from \"../substitutions\";\nimport unifyComplexSubstitutionStatementWithSimpleSubstitutionStatement from \"../unify/complexSubstitutionStatementWithSimpleSubstitutionStatement\";\n\nexport default function resolveComplexSubstitutionAgainstSimpleSubstitution(complexSubstitution, simpleSubstitution, substitutions, localContextA, localContextB) {\n  let complexSubstitutionResolvedAgainstSimpleSubstitution = false;\n\n  const statementNode = complexSubstitution.getStatementNode(),\n        simpleSubstitutionString = simpleSubstitution.asString(localContextA, localContextB),\n        complexSubstitutionString = complexSubstitution.asString(localContextA, localContextB);\n\n  localContextB.trace(`Resolving the complex ${complexSubstitutionString} substitution against the simple ${simpleSubstitutionString} substitution...`, statementNode);\n\n  const transformedSubstitution = transformedSubstitutionFromComplexSubstitutionSimpleSubstitutionAndSubstitutions(complexSubstitution, simpleSubstitution, substitutions, localContextA, localContextB);\n\n  if (transformedSubstitution !== null) {\n    const variableNode = transformedSubstitution.getVariableNode(),\n          metavariableNode = transformedSubstitution.getMetavariableNode();\n\n    if (false) {\n      ///\n    } else if (variableNode !== null) {\n      const substitution = substitutions.findSubstitutionByVariableNode(variableNode);\n\n      if (substitution === null) {\n        substitutions.addSubstitution(transformedSubstitution, localContextA, localContextB);\n\n        substitutions.removeSubstitution(complexSubstitution, localContextA, localContextB);\n\n        complexSubstitutionResolvedAgainstSimpleSubstitution = true;\n      } else {\n        const termNode = transformedSubstitution.getTermNode(),\n              termNodeMatches = substitution.matchTermNode(termNode);\n\n        if (termNodeMatches) {\n          substitutions.removeSubstitution(complexSubstitution, localContextA, localContextB);\n\n          complexSubstitutionResolvedAgainstSimpleSubstitution = true;\n        }\n      }\n    } else if (metavariableNode !== null) {\n      const substitution = substitutions.findSubstitutionByMetavariableNode(metavariableNode);\n\n      if (substitution === null) {\n        substitutions.addSubstitution(transformedSubstitution, localContextA, localContextB);\n\n        substitutions.removeSubstitution(complexSubstitution, localContextA, localContextB);\n\n        complexSubstitutionResolvedAgainstSimpleSubstitution = true;\n      } else {\n        const frameNode = transformedSubstitution.getFrameNode(),\n              frameNodeMatches = substitution.matchFrameNode(frameNode);\n\n        if (frameNodeMatches) {\n          substitutions.removeSubstitution(complexSubstitution, localContextA, localContextB);\n\n          complexSubstitutionResolvedAgainstSimpleSubstitution = true;\n        }\n      }\n    }\n  }\n\n  if (complexSubstitutionResolvedAgainstSimpleSubstitution) {\n    localContextB.debug(`...resolved the complex ${complexSubstitutionString} substitution against the simple ${simpleSubstitutionString} substitution.`, statementNode);\n  }\n\n  return complexSubstitutionResolvedAgainstSimpleSubstitution;\n}\n\nfunction transformedSubstitutionFromComplexSubstitutionSimpleSubstitutionAndSubstitutions(complexSubstitution, simpleSubstitution, substitutions, localContextA, localContextB) {\n  let transformedSubstitution;\n\n  const substitution = complexSubstitution.getSubstitution();\n\n  transformedSubstitution = substitution.transformed(substitutions);\n\n  if (transformedSubstitution !== null) {\n    substitutions = Substitutions.fromNothing();  ///\n\n    const substitutionString = substitution.asString(localContextA, localContextA),\n          transformedSubstitutionString = transformedSubstitution.asString(localContextA, localContextB),\n          simpleSubstitutionStatementNode = simpleSubstitution.getStatementNode(),\n          complexSubstitutionStatementNode = complexSubstitution.getStatementNode();\n\n    localContextB.trace(`Transformed the complex substitution's '${substitutionString}' substitution into the '${transformedSubstitutionString}' substitution.`, complexSubstitutionStatementNode);\n\n    const complexSubstitutionStatementWithSimpleSubstitutionStatement = unifyComplexSubstitutionStatementWithSimpleSubstitutionStatement(complexSubstitutionStatementNode, simpleSubstitutionStatementNode, substitutions, localContextA, localContextB);\n\n    if (complexSubstitutionStatementWithSimpleSubstitutionStatement) {\n      const substitution = transformedSubstitution; ///\n\n      transformedSubstitution = substitution.transformed(substitutions);\n\n      const substitutionString = substitution.asString(localContextA, localContextB),\n            transformedSubstitutionString = transformedSubstitution.asString(localContextA, localContextB);\n\n      localContextB.trace(`Transformed the complex substitution's transformed '${substitutionString}' substitution into the '${transformedSubstitutionString}' substitution.`, complexSubstitutionStatementNode);\n    }\n  }\n\n  return transformedSubstitution;\n}\n"],"names":["resolveComplexSubstitutionAgainstSimpleSubstitution","complexSubstitution","simpleSubstitution","substitutions","localContextA","localContextB","complexSubstitutionResolvedAgainstSimpleSubstitution","statementNode","getStatementNode","simpleSubstitutionString","asString","complexSubstitutionString","trace","transformedSubstitution","transformedSubstitutionFromComplexSubstitutionSimpleSubstitutionAndSubstitutions","variableNode","getVariableNode","metavariableNode","getMetavariableNode","substitution","findSubstitutionByVariableNode","addSubstitution","removeSubstitution","termNode","getTermNode","termNodeMatches","matchTermNode","findSubstitutionByMetavariableNode","frameNode","getFrameNode","frameNodeMatches","matchFrameNode","debug","getSubstitution","transformed","Substitutions","fromNothing","substitutionString","transformedSubstitutionString","simpleSubstitutionStatementNode","complexSubstitutionStatementNode","complexSubstitutionStatementWithSimpleSubstitutionStatement","unifyComplexSubstitutionStatementWithSimpleSubstitutionStatement"],"mappings":"AAAA;;;;+BAKA;;;eAAwBA;;;oEAHE;kHACmD;;;;;;AAE9D,SAASA,oDAAoDC,mBAAmB,EAAEC,kBAAkB,EAAEC,aAAa,EAAEC,aAAa,EAAEC,aAAa;IAC9J,IAAIC,uDAAuD;IAE3D,IAAMC,gBAAgBN,oBAAoBO,gBAAgB,IACpDC,2BAA2BP,mBAAmBQ,QAAQ,CAACN,eAAeC,gBACtEM,4BAA4BV,oBAAoBS,QAAQ,CAACN,eAAeC;IAE9EA,cAAcO,KAAK,CAAC,AAAC,yBAAqFH,OAA7DE,2BAA0B,qCAA4D,OAAzBF,0BAAyB,qBAAmBF;IAEtJ,IAAMM,0BAA0BC,iFAAiFb,qBAAqBC,oBAAoBC,eAAeC,eAAeC;IAExL,IAAIQ,4BAA4B,MAAM;QACpC,IAAME,eAAeF,wBAAwBG,eAAe,IACtDC,mBAAmBJ,wBAAwBK,mBAAmB;QAEpE,IAAI,OAAO;QACT,GAAG;QACL,OAAO,IAAIH,iBAAiB,MAAM;YAChC,IAAMI,eAAehB,cAAciB,8BAA8B,CAACL;YAElE,IAAII,iBAAiB,MAAM;gBACzBhB,cAAckB,eAAe,CAACR,yBAAyBT,eAAeC;gBAEtEF,cAAcmB,kBAAkB,CAACrB,qBAAqBG,eAAeC;gBAErEC,uDAAuD;YACzD,OAAO;gBACL,IAAMiB,WAAWV,wBAAwBW,WAAW,IAC9CC,kBAAkBN,aAAaO,aAAa,CAACH;gBAEnD,IAAIE,iBAAiB;oBACnBtB,cAAcmB,kBAAkB,CAACrB,qBAAqBG,eAAeC;oBAErEC,uDAAuD;gBACzD;YACF;QACF,OAAO,IAAIW,qBAAqB,MAAM;YACpC,IAAME,gBAAehB,cAAcwB,kCAAkC,CAACV;YAEtE,IAAIE,kBAAiB,MAAM;gBACzBhB,cAAckB,eAAe,CAACR,yBAAyBT,eAAeC;gBAEtEF,cAAcmB,kBAAkB,CAACrB,qBAAqBG,eAAeC;gBAErEC,uDAAuD;YACzD,OAAO;gBACL,IAAMsB,YAAYf,wBAAwBgB,YAAY,IAChDC,mBAAmBX,cAAaY,cAAc,CAACH;gBAErD,IAAIE,kBAAkB;oBACpB3B,cAAcmB,kBAAkB,CAACrB,qBAAqBG,eAAeC;oBAErEC,uDAAuD;gBACzD;YACF;QACF;IACF;IAEA,IAAIA,sDAAsD;QACxDD,cAAc2B,KAAK,CAAC,AAAC,2BAAuFvB,OAA7DE,2BAA0B,qCAA4D,OAAzBF,0BAAyB,mBAAiBF;IACxJ;IAEA,OAAOD;AACT;AAEA,SAASQ,iFAAiFb,mBAAmB,EAAEC,kBAAkB,EAAEC,aAAa,EAAEC,aAAa,EAAEC,aAAa;IAC5K,IAAIQ;IAEJ,IAAMM,eAAelB,oBAAoBgC,eAAe;IAExDpB,0BAA0BM,aAAae,WAAW,CAAC/B;IAEnD,IAAIU,4BAA4B,MAAM;QACpCV,gBAAgBgC,sBAAa,CAACC,WAAW,IAAK,GAAG;QAEjD,IAAMC,qBAAqBlB,aAAaT,QAAQ,CAACN,eAAeA,gBAC1DkC,gCAAgCzB,wBAAwBH,QAAQ,CAACN,eAAeC,gBAChFkC,kCAAkCrC,mBAAmBM,gBAAgB,IACrEgC,mCAAmCvC,oBAAoBO,gBAAgB;QAE7EH,cAAcO,KAAK,CAAC,AAAC,2CAAwF0B,OAA9CD,oBAAmB,6BAAyD,OAA9BC,+BAA8B,oBAAkBE;QAE7J,IAAMC,8DAA8DC,IAAAA,oEAAgE,EAACF,kCAAkCD,iCAAiCpC,eAAeC,eAAeC;QAEtO,IAAIoC,6DAA6D;YAC/D,IAAMtB,gBAAeN,yBAAyB,GAAG;YAEjDA,0BAA0BM,cAAae,WAAW,CAAC/B;YAEnD,IAAMkC,sBAAqBlB,cAAaT,QAAQ,CAACN,eAAeC,gBAC1DiC,iCAAgCzB,wBAAwBH,QAAQ,CAACN,eAAeC;YAEtFA,cAAcO,KAAK,CAAC,AAAC,uDAAoG0B,OAA9CD,qBAAmB,6BAAyD,OAA9BC,gCAA8B,oBAAkBE;QAC3K;IACF;IAEA,OAAO3B;AACT"}
package/lib/unify/complexSubstitutionStatementWithSimpleSubstitutionStatement.js CHANGED
@@ -16,11 +16,16 @@ function _interop_require_default(obj) {
16
16
  }
17
17
  function unifyComplexSubstitutionStatementWithSimpleSubstitutionStatement(complexSubstitutionStatementNode, simpleSubstitutionStatementNode, substitutions, localContextA, localContextB) {
18
18
  var complexSubstitutionStatementWithSimpleSubstitutionStatement;
19
+ var complexSubstitutionStatementString = localContextB.nodeAsString(complexSubstitutionStatementNode), simpleSubstitutionStatementString = localContextB.nodeAsString(simpleSubstitutionStatementNode);
20
+ localContextB.trace("Unifying the complex substitution's '".concat(complexSubstitutionStatementString, "' statement with the simple substitution's '").concat(simpleSubstitutionStatementString, "' statement..."), simpleSubstitutionStatementNode);
19
21
  var nodeA = complexSubstitutionStatementNode, nodeB = simpleSubstitutionStatementNode; ///
20
22
  localContextA = localContextB; ///
21
23
  var unified = _metaLevel.default.unify(nodeA, nodeB, substitutions, localContextA, localContextB);
22
24
  complexSubstitutionStatementWithSimpleSubstitutionStatement = unified; ///
25
+ if (complexSubstitutionStatementWithSimpleSubstitutionStatement) {
26
+ localContextB.trace("...unified the complex substitution's '".concat(complexSubstitutionStatementString, "' statement with the simple substitution's '").concat(simpleSubstitutionStatementString, "' statement."), simpleSubstitutionStatementNode);
27
+ }
23
28
  return complexSubstitutionStatementWithSimpleSubstitutionStatement;
24
29
  }
25
30
 
26
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91bmlmeS9jb21wbGV4U3Vic3RpdHV0aW9uU3RhdGVtZW50V2l0aFNpbXBsZVN1YnN0aXR1dGlvblN0YXRlbWVudC5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuaW1wb3J0IG1ldGFMZXZlbFVuaWZpZXIgZnJvbSBcIi4uL3VuaWZpZXIvbWV0YUxldmVsXCI7XG5cbmV4cG9ydCBkZWZhdWx0IGZ1bmN0aW9uIHVuaWZ5Q29tcGxleFN1YnN0aXR1dGlvblN0YXRlbWVudFdpdGhTaW1wbGVTdWJzdGl0dXRpb25TdGF0ZW1lbnQoY29tcGxleFN1YnN0aXR1dGlvblN0YXRlbWVudE5vZGUsIHNpbXBsZVN1YnN0aXR1dGlvblN0YXRlbWVudE5vZGUsIHN1YnN0aXR1dGlvbnMsIGxvY2FsQ29udGV4dEEsIGxvY2FsQ29udGV4dEIpIHtcbiAgbGV0IGNvbXBsZXhTdWJzdGl0dXRpb25TdGF0ZW1lbnRXaXRoU2ltcGxlU3Vic3RpdHV0aW9uU3RhdGVtZW50O1xuXG4gIGNvbnN0IG5vZGVBID0gY29tcGxleFN1YnN0aXR1dGlvblN0YXRlbWVudE5vZGUsICAvLy9cbiAgICAgICAgbm9kZUIgPSBzaW1wbGVTdWJzdGl0dXRpb25TdGF0ZW1lbnROb2RlOyAgLy8vXG5cbiAgbG9jYWxDb250ZXh0QSA9IGxvY2FsQ29udGV4dEI7ICAvLy9cblxuICBjb25zdCB1bmlmaWVkID0gbWV0YUxldmVsVW5pZmllci51bmlmeShub2RlQSwgbm9kZUIsIHN1YnN0aXR1dGlvbnMsIGxvY2FsQ29udGV4dEEsIGxvY2FsQ29udGV4dEIpO1xuXG4gIGNvbXBsZXhTdWJzdGl0dXRpb25TdGF0ZW1lbnRXaXRoU2ltcGxlU3Vic3RpdHV0aW9uU3RhdGVtZW50ID0gdW5pZmllZDsgIC8vL1xuXG4gIHJldHVybiBjb21wbGV4U3Vic3RpdHV0aW9uU3RhdGVtZW50V2l0aFNpbXBsZVN1YnN0aXR1dGlvblN0YXRlbWVudDtcbn1cbiJdLCJuYW1lcyI6WyJ1bmlmeUNvbXBsZXhTdWJzdGl0dXRpb25TdGF0ZW1lbnRXaXRoU2ltcGxlU3Vic3RpdHV0aW9uU3RhdGVtZW50IiwiY29tcGxleFN1YnN0aXR1dGlvblN0YXRlbWVudE5vZGUiLCJzaW1wbGVTdWJzdGl0dXRpb25TdGF0ZW1lbnROb2RlIiwic3Vic3RpdHV0aW9ucyIsImxvY2FsQ29udGV4dEEiLCJsb2NhbENvbnRleHRCIiwiY29tcGxleFN1YnN0aXR1dGlvblN0YXRlbWVudFdpdGhTaW1wbGVTdWJzdGl0dXRpb25TdGF0ZW1lbnQiLCJub2RlQSIsIm5vZGVCIiwidW5pZmllZCIsIm1ldGFMZXZlbFVuaWZpZXIiLCJ1bmlmeSJdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7K0JBSUE7OztlQUF3QkE7OztnRUFGSzs7Ozs7O0FBRWQsU0FBU0EsaUVBQWlFQyxnQ0FBZ0MsRUFBRUMsK0JBQStCLEVBQUVDLGFBQWEsRUFBRUMsYUFBYSxFQUFFQyxhQUFhO0lBQ3JNLElBQUlDO0lBRUosSUFBTUMsUUFBUU4sa0NBQ1JPLFFBQVFOLGlDQUFrQyxHQUFHO0lBRW5ERSxnQkFBZ0JDLGVBQWdCLEdBQUc7SUFFbkMsSUFBTUksVUFBVUMsa0JBQWdCLENBQUNDLEtBQUssQ0FBQ0osT0FBT0MsT0FBT0wsZUFBZUMsZUFBZUM7SUFFbkZDLDhEQUE4REcsU0FBVSxHQUFHO0lBRTNFLE9BQU9IO0FBQ1QifQ==
31
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91bmlmeS9jb21wbGV4U3Vic3RpdHV0aW9uU3RhdGVtZW50V2l0aFNpbXBsZVN1YnN0aXR1dGlvblN0YXRlbWVudC5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuaW1wb3J0IG1ldGFMZXZlbFVuaWZpZXIgZnJvbSBcIi4uL3VuaWZpZXIvbWV0YUxldmVsXCI7XG5cbmV4cG9ydCBkZWZhdWx0IGZ1bmN0aW9uIHVuaWZ5Q29tcGxleFN1YnN0aXR1dGlvblN0YXRlbWVudFdpdGhTaW1wbGVTdWJzdGl0dXRpb25TdGF0ZW1lbnQoY29tcGxleFN1YnN0aXR1dGlvblN0YXRlbWVudE5vZGUsIHNpbXBsZVN1YnN0aXR1dGlvblN0YXRlbWVudE5vZGUsIHN1YnN0aXR1dGlvbnMsIGxvY2FsQ29udGV4dEEsIGxvY2FsQ29udGV4dEIpIHtcbiAgbGV0IGNvbXBsZXhTdWJzdGl0dXRpb25TdGF0ZW1lbnRXaXRoU2ltcGxlU3Vic3RpdHV0aW9uU3RhdGVtZW50O1xuXG4gIGNvbnN0IGNvbXBsZXhTdWJzdGl0dXRpb25TdGF0ZW1lbnRTdHJpbmcgPSBsb2NhbENvbnRleHRCLm5vZGVBc1N0cmluZyhjb21wbGV4U3Vic3RpdHV0aW9uU3RhdGVtZW50Tm9kZSksXG4gICAgICAgIHNpbXBsZVN1YnN0aXR1dGlvblN0YXRlbWVudFN0cmluZyA9IGxvY2FsQ29udGV4dEIubm9kZUFzU3RyaW5nKHNpbXBsZVN1YnN0aXR1dGlvblN0YXRlbWVudE5vZGUpO1xuXG4gIGxvY2FsQ29udGV4dEIudHJhY2UoYFVuaWZ5aW5nIHRoZSBjb21wbGV4IHN1YnN0aXR1dGlvbidzICcke2NvbXBsZXhTdWJzdGl0dXRpb25TdGF0ZW1lbnRTdHJpbmd9JyBzdGF0ZW1lbnQgd2l0aCB0aGUgc2ltcGxlIHN1YnN0aXR1dGlvbidzICcke3NpbXBsZVN1YnN0aXR1dGlvblN0YXRlbWVudFN0cmluZ30nIHN0YXRlbWVudC4uLmAsIHNpbXBsZVN1YnN0aXR1dGlvblN0YXRlbWVudE5vZGUpO1xuXG4gIGNvbnN0IG5vZGVBID0gY29tcGxleFN1YnN0aXR1dGlvblN0YXRlbWVudE5vZGUsICAvLy9cbiAgICAgICAgbm9kZUIgPSBzaW1wbGVTdWJzdGl0dXRpb25TdGF0ZW1lbnROb2RlOyAgLy8vXG5cbiAgbG9jYWxDb250ZXh0QSA9IGxvY2FsQ29udGV4dEI7ICAvLy9cblxuICBjb25zdCB1bmlmaWVkID0gbWV0YUxldmVsVW5pZmllci51bmlmeShub2RlQSwgbm9kZUIsIHN1YnN0aXR1dGlvbnMsIGxvY2FsQ29udGV4dEEsIGxvY2FsQ29udGV4dEIpO1xuXG4gIGNvbXBsZXhTdWJzdGl0dXRpb25TdGF0ZW1lbnRXaXRoU2ltcGxlU3Vic3RpdHV0aW9uU3RhdGVtZW50ID0gdW5pZmllZDsgIC8vL1xuXG4gIGlmIChjb21wbGV4U3Vic3RpdHV0aW9uU3RhdGVtZW50V2l0aFNpbXBsZVN1YnN0aXR1dGlvblN0YXRlbWVudCkge1xuICAgIGxvY2FsQ29udGV4dEIudHJhY2UoYC4uLnVuaWZpZWQgdGhlIGNvbXBsZXggc3Vic3RpdHV0aW9uJ3MgJyR7Y29tcGxleFN1YnN0aXR1dGlvblN0YXRlbWVudFN0cmluZ30nIHN0YXRlbWVudCB3aXRoIHRoZSBzaW1wbGUgc3Vic3RpdHV0aW9uJ3MgJyR7c2ltcGxlU3Vic3RpdHV0aW9uU3RhdGVtZW50U3RyaW5nfScgc3RhdGVtZW50LmAsIHNpbXBsZVN1YnN0aXR1dGlvblN0YXRlbWVudE5vZGUpO1xuICB9XG5cbiAgcmV0dXJuIGNvbXBsZXhTdWJzdGl0dXRpb25TdGF0ZW1lbnRXaXRoU2ltcGxlU3Vic3RpdHV0aW9uU3RhdGVtZW50O1xufVxuIl0sIm5hbWVzIjpbInVuaWZ5Q29tcGxleFN1YnN0aXR1dGlvblN0YXRlbWVudFdpdGhTaW1wbGVTdWJzdGl0dXRpb25TdGF0ZW1lbnQiLCJjb21wbGV4U3Vic3RpdHV0aW9uU3RhdGVtZW50Tm9kZSIsInNpbXBsZVN1YnN0aXR1dGlvblN0YXRlbWVudE5vZGUiLCJzdWJzdGl0dXRpb25zIiwibG9jYWxDb250ZXh0QSIsImxvY2FsQ29udGV4dEIiLCJjb21wbGV4U3Vic3RpdHV0aW9uU3RhdGVtZW50V2l0aFNpbXBsZVN1YnN0aXR1dGlvblN0YXRlbWVudCIsImNvbXBsZXhTdWJzdGl0dXRpb25TdGF0ZW1lbnRTdHJpbmciLCJub2RlQXNTdHJpbmciLCJzaW1wbGVTdWJzdGl0dXRpb25TdGF0ZW1lbnRTdHJpbmciLCJ0cmFjZSIsIm5vZGVBIiwibm9kZUIiLCJ1bmlmaWVkIiwibWV0YUxldmVsVW5pZmllciIsInVuaWZ5Il0sIm1hcHBpbmdzIjoiQUFBQTs7OzsrQkFJQTs7O2VBQXdCQTs7O2dFQUZLOzs7Ozs7QUFFZCxTQUFTQSxpRUFBaUVDLGdDQUFnQyxFQUFFQywrQkFBK0IsRUFBRUMsYUFBYSxFQUFFQyxhQUFhLEVBQUVDLGFBQWE7SUFDck0sSUFBSUM7SUFFSixJQUFNQyxxQ0FBcUNGLGNBQWNHLFlBQVksQ0FBQ1AsbUNBQ2hFUSxvQ0FBb0NKLGNBQWNHLFlBQVksQ0FBQ047SUFFckVHLGNBQWNLLEtBQUssQ0FBQyxBQUFDLHdDQUF3SEQsT0FBakZGLG9DQUFtQyxnREFBZ0YsT0FBbENFLG1DQUFrQyxtQkFBaUJQO0lBRWhNLElBQU1TLFFBQVFWLGtDQUNSVyxRQUFRVixpQ0FBa0MsR0FBRztJQUVuREUsZ0JBQWdCQyxlQUFnQixHQUFHO0lBRW5DLElBQU1RLFVBQVVDLGtCQUFnQixDQUFDQyxLQUFLLENBQUNKLE9BQU9DLE9BQU9ULGVBQWVDLGVBQWVDO0lBRW5GQyw4REFBOERPLFNBQVUsR0FBRztJQUUzRSxJQUFJUCw2REFBNkQ7UUFDL0RELGNBQWNLLEtBQUssQ0FBQyxBQUFDLDBDQUEwSEQsT0FBakZGLG9DQUFtQyxnREFBZ0YsT0FBbENFLG1DQUFrQyxpQkFBZVA7SUFDbE07SUFFQSxPQUFPSTtBQUNUIn0=
package/lib/verify/assertion/contained.js CHANGED
@@ -16,7 +16,7 @@ function _interop_require_default(obj) {
16
16
  default: obj
17
17
  };
18
18
  }
19
- var variableNodeQuery = (0, _query.nodeQuery)("/containedAssertion/term/variable!"), metavariableNodeQuery = (0, _query.nodeQuery)("/containedAssertion/frame/metavariable!"), statementVariableNodesQuery = (0, _query.nodesQuery)("/containedAssertion/statement//variable"), statementMetavariableNodesQuery = (0, _query.nodesQuery)("/containedAssertion/statement//metavariable");
19
+ var termVariableNodeQuery = (0, _query.nodeQuery)("/containedAssertion/term/variable!"), frameMetavariableNodeQuery = (0, _query.nodeQuery)("/containedAssertion/frame/metavariable!"), statementVariableNodesQuery = (0, _query.nodesQuery)("/containedAssertion/statement//variable"), statementMetavariableNodesQuery = (0, _query.nodesQuery)("/containedAssertion/statement//metavariable");
20
20
  var verifyContainedAssertionFunctions = [
21
21
  verifyDerivedContainedAssertion,
22
22
  verifyStatedContainedAssertion
@@ -47,40 +47,40 @@ function verifyDerivedContainedAssertion(containedAssertionNode, assignments, st
47
47
  if (!stated) {
48
48
  var containedAssertionString = localContext.nodeAsString(containedAssertionNode);
49
49
  localContext.trace("Verifying the '".concat(containedAssertionString, "' derived contained assertion..."), containedAssertionNode);
50
- var assertionNegated = (0, _assertion.isAssertionNegated)(containedAssertionNode), metavariableNode = metavariableNodeQuery(containedAssertionNode), variableNode = variableNodeQuery(containedAssertionNode), negated = assertionNegated; ///
50
+ var assertionNegated = (0, _assertion.isAssertionNegated)(containedAssertionNode), frameMetavariableNode = frameMetavariableNodeQuery(containedAssertionNode), termVariableNode = termVariableNodeQuery(containedAssertionNode), negated = assertionNegated; ///
51
51
  if (false) {
52
52
  ///
53
- } else if (metavariableNode !== null) {
54
- var statementMetavariableNodes = statementMetavariableNodesQuery(containedAssertionNode), variableNodeMatchesStatementMetavariableNode = statementMetavariableNodes.some(function(statementMetavariableNode) {
55
- var variableNodeMatchesStatementMetavariableNode = metavariableNode.match(statementMetavariableNode);
56
- if (variableNodeMatchesStatementMetavariableNode) {
53
+ } else if (frameMetavariableNode !== null) {
54
+ var statementMetavariableNodes = statementMetavariableNodesQuery(containedAssertionNode), frameMetavariableNodeMatchesStatementMetavariableNode = statementMetavariableNodes.some(function(statementMetavariableNode) {
55
+ var frameMetavariableNodeMatchesStatementMetavariableNode = frameMetavariableNode.match(statementMetavariableNode);
56
+ if (frameMetavariableNodeMatchesStatementMetavariableNode) {
57
57
  return true;
58
58
  }
59
59
  });
60
60
  if (!negated) {
61
- if (variableNodeMatchesStatementMetavariableNode) {
61
+ if (frameMetavariableNodeMatchesStatementMetavariableNode) {
62
62
  derivedContainedAssertionVerified = true;
63
63
  }
64
64
  }
65
65
  if (negated) {
66
- if (!variableNodeMatchesStatementMetavariableNode) {
66
+ if (!frameMetavariableNodeMatchesStatementMetavariableNode) {
67
67
  derivedContainedAssertionVerified = true;
68
68
  }
69
69
  }
70
- } else if (variableNode !== null) {
71
- var statementVariableNodes = statementVariableNodesQuery(containedAssertionNode), variableNodeMatchesStatementVariableNode = statementVariableNodes.some(function(statementVariableNode) {
72
- var variableNodeMatchesStatementVariableNode = variableNode.match(statementVariableNode);
73
- if (variableNodeMatchesStatementVariableNode) {
70
+ } else if (termVariableNode !== null) {
71
+ var statementVariableNodes = statementVariableNodesQuery(containedAssertionNode), termVariableNodeMatchesStatementVariableNode = statementVariableNodes.some(function(statementVariableNode) {
72
+ var termVariableNodeMatchesStatementVariableNode = termVariableNode.match(statementVariableNode);
73
+ if (termVariableNodeMatchesStatementVariableNode) {
74
74
  return true;
75
75
  }
76
76
  });
77
77
  if (!negated) {
78
- if (variableNodeMatchesStatementVariableNode) {
78
+ if (termVariableNodeMatchesStatementVariableNode) {
79
79
  derivedContainedAssertionVerified = true;
80
80
  }
81
81
  }
82
82
  if (negated) {
83
- if (!variableNodeMatchesStatementVariableNode) {
83
+ if (!termVariableNodeMatchesStatementVariableNode) {
84
84
  derivedContainedAssertionVerified = true;
85
85
  }
86
86
  }
@@ -104,4 +104,4 @@ function verifyStatedContainedAssertion(containedAssertionNode, assignments, sta
104
104
  return statedContainedAssertionVerified;
105
105
  }
106
106
 
107
- //# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../../src/verify/assertion/contained.js"],"sourcesContent":["\"use strict\";\n\nimport metaLevelVerifier from \"../../verifier/metaLevel\";\n\nimport { isAssertionNegated } from \"../../utilities/assertion\";\nimport { nodeQuery, nodesQuery } from \"../../utilities/query\";\n\nconst variableNodeQuery = nodeQuery(\"/containedAssertion/term/variable!\"),\n      metavariableNodeQuery = nodeQuery(\"/containedAssertion/frame/metavariable!\"),\n      statementVariableNodesQuery = nodesQuery(\"/containedAssertion/statement//variable\"),\n      statementMetavariableNodesQuery = nodesQuery(\"/containedAssertion/statement//metavariable\");\n\nconst verifyContainedAssertionFunctions = [\n  verifyDerivedContainedAssertion,\n  verifyStatedContainedAssertion\n];\n\nexport default function verifyContainedAssertion(containedAssertionNode, assignments, stated, localContext) {\n  let containedAssertionVerified = false;\n\n  const containedAssertionString = localContext.nodeAsString(containedAssertionNode),\n        savedStated = stated; ///\n\n  localContext.trace(`Verifying the '${containedAssertionString}' contained assertion...`, containedAssertionNode);\n\n  assignments = null; ///\n\n  stated = true;  ///\n\n  const verified = metaLevelVerifier.verify(containedAssertionNode, assignments, stated, localContext);\n\n  stated = savedStated; ///\n\n  if (verified) {\n    containedAssertionVerified = verifyContainedAssertionFunctions.some((verifyContainedAssertionFunction) => {\n      const containedAssertionVerified = verifyContainedAssertionFunction(containedAssertionNode, assignments, stated, localContext);\n\n      if (containedAssertionVerified) {\n        return true;\n      }\n    });\n  }\n\n  if (containedAssertionVerified) {\n    localContext.debug(`...verified the '${containedAssertionString}' contained assertion.`, containedAssertionNode);\n  }\n\n  return containedAssertionVerified;\n}\n\nfunction verifyDerivedContainedAssertion(containedAssertionNode, assignments, stated, localContext) {\n  let derivedContainedAssertionVerified = false;\n\n  if (!stated) {\n    const containedAssertionString = localContext.nodeAsString(containedAssertionNode);\n\n    localContext.trace(`Verifying the '${containedAssertionString}' derived contained assertion...`, containedAssertionNode);\n\n    const assertionNegated = isAssertionNegated(containedAssertionNode),\n          metavariableNode = metavariableNodeQuery(containedAssertionNode),\n          variableNode = variableNodeQuery(containedAssertionNode),\n          negated = assertionNegated; ///\n\n    if (false) {\n      ///\n    } else if (metavariableNode !== null) {\n      const statementMetavariableNodes = statementMetavariableNodesQuery(containedAssertionNode),\n            variableNodeMatchesStatementMetavariableNode = statementMetavariableNodes.some((statementMetavariableNode) => {\n              const variableNodeMatchesStatementMetavariableNode = metavariableNode.match(statementMetavariableNode);\n\n              if (variableNodeMatchesStatementMetavariableNode) {\n                return true;\n              }\n            });\n\n      if (!negated) {\n        if (variableNodeMatchesStatementMetavariableNode) {\n          derivedContainedAssertionVerified = true;\n        }\n      }\n\n      if (negated) {\n        if (!variableNodeMatchesStatementMetavariableNode) {\n          derivedContainedAssertionVerified = true;\n        }\n      }\n    } else if (variableNode !== null) {\n      const statementVariableNodes = statementVariableNodesQuery(containedAssertionNode),\n            variableNodeMatchesStatementVariableNode = statementVariableNodes.some((statementVariableNode) => {\n              const variableNodeMatchesStatementVariableNode = variableNode.match(statementVariableNode);\n\n              if (variableNodeMatchesStatementVariableNode) {\n                return true;\n              }\n            });\n\n      if (!negated) {\n        if (variableNodeMatchesStatementVariableNode) {\n          derivedContainedAssertionVerified = true;\n        }\n      }\n\n      if (negated) {\n        if (!variableNodeMatchesStatementVariableNode) {\n          derivedContainedAssertionVerified = true;\n        }\n      }\n    }\n\n    if (derivedContainedAssertionVerified) {\n      localContext.debug(`...verified the '${containedAssertionString}' derived contained assertion.`, containedAssertionNode);\n    }\n  }\n\n  return derivedContainedAssertionVerified;\n}\n\nfunction verifyStatedContainedAssertion(containedAssertionNode, assignments, stated, localContext) {\n  let statedContainedAssertionVerified;\n\n  if (stated) {\n    const containedAssertionString = localContext.nodeAsString(containedAssertionNode);\n\n    localContext.trace(`Verifying the '${containedAssertionString}' stated contained assertion...`, containedAssertionNode);\n\n    statedContainedAssertionVerified = true;\n\n    if (statedContainedAssertionVerified) {\n      localContext.debug(`...verified the '${containedAssertionString}' stated contained assertion.`, containedAssertionNode);\n    }\n  }\n\n  return statedContainedAssertionVerified;\n}\n"],"names":["verifyContainedAssertion","variableNodeQuery","nodeQuery","metavariableNodeQuery","statementVariableNodesQuery","nodesQuery","statementMetavariableNodesQuery","verifyContainedAssertionFunctions","verifyDerivedContainedAssertion","verifyStatedContainedAssertion","containedAssertionNode","assignments","stated","localContext","containedAssertionVerified","containedAssertionString","nodeAsString","savedStated","trace","verified","metaLevelVerifier","verify","some","verifyContainedAssertionFunction","debug","derivedContainedAssertionVerified","assertionNegated","isAssertionNegated","metavariableNode","variableNode","negated","statementMetavariableNodes","variableNodeMatchesStatementMetavariableNode","statementMetavariableNode","match","statementVariableNodes","variableNodeMatchesStatementVariableNode","statementVariableNode","statedContainedAssertionVerified"],"mappings":"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"}
107
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../../src/verify/assertion/contained.js"],"sourcesContent":["\"use strict\";\n\nimport metaLevelVerifier from \"../../verifier/metaLevel\";\n\nimport { isAssertionNegated } from \"../../utilities/assertion\";\nimport { nodeQuery, nodesQuery } from \"../../utilities/query\";\n\nconst termVariableNodeQuery = nodeQuery(\"/containedAssertion/term/variable!\"),\n      frameMetavariableNodeQuery = nodeQuery(\"/containedAssertion/frame/metavariable!\"),\n      statementVariableNodesQuery = nodesQuery(\"/containedAssertion/statement//variable\"),\n      statementMetavariableNodesQuery = nodesQuery(\"/containedAssertion/statement//metavariable\");\n\nconst verifyContainedAssertionFunctions = [\n  verifyDerivedContainedAssertion,\n  verifyStatedContainedAssertion\n];\n\nexport default function verifyContainedAssertion(containedAssertionNode, assignments, stated, localContext) {\n  let containedAssertionVerified = false;\n\n  const containedAssertionString = localContext.nodeAsString(containedAssertionNode),\n        savedStated = stated; ///\n\n  localContext.trace(`Verifying the '${containedAssertionString}' contained assertion...`, containedAssertionNode);\n\n  assignments = null; ///\n\n  stated = true;  ///\n\n  const verified = metaLevelVerifier.verify(containedAssertionNode, assignments, stated, localContext);\n\n  stated = savedStated; ///\n\n  if (verified) {\n    containedAssertionVerified = verifyContainedAssertionFunctions.some((verifyContainedAssertionFunction) => {\n      const containedAssertionVerified = verifyContainedAssertionFunction(containedAssertionNode, assignments, stated, localContext);\n\n      if (containedAssertionVerified) {\n        return true;\n      }\n    });\n  }\n\n  if (containedAssertionVerified) {\n    localContext.debug(`...verified the '${containedAssertionString}' contained assertion.`, containedAssertionNode);\n  }\n\n  return containedAssertionVerified;\n}\n\nfunction verifyDerivedContainedAssertion(containedAssertionNode, assignments, stated, localContext) {\n  let derivedContainedAssertionVerified = false;\n\n  if (!stated) {\n    const containedAssertionString = localContext.nodeAsString(containedAssertionNode);\n\n    localContext.trace(`Verifying the '${containedAssertionString}' derived contained assertion...`, containedAssertionNode);\n\n    const assertionNegated = isAssertionNegated(containedAssertionNode),\n          frameMetavariableNode = frameMetavariableNodeQuery(containedAssertionNode),\n          termVariableNode = termVariableNodeQuery(containedAssertionNode),\n          negated = assertionNegated; ///\n\n    if (false) {\n      ///\n    } else if (frameMetavariableNode !== null) {\n      const statementMetavariableNodes = statementMetavariableNodesQuery(containedAssertionNode),\n            frameMetavariableNodeMatchesStatementMetavariableNode = statementMetavariableNodes.some((statementMetavariableNode) => {\n              const frameMetavariableNodeMatchesStatementMetavariableNode = frameMetavariableNode.match(statementMetavariableNode);\n\n              if (frameMetavariableNodeMatchesStatementMetavariableNode) {\n                return true;\n              }\n            });\n\n      if (!negated) {\n        if (frameMetavariableNodeMatchesStatementMetavariableNode) {\n          derivedContainedAssertionVerified = true;\n        }\n      }\n\n      if (negated) {\n        if (!frameMetavariableNodeMatchesStatementMetavariableNode) {\n          derivedContainedAssertionVerified = true;\n        }\n      }\n    } else if (termVariableNode !== null) {\n      const statementVariableNodes = statementVariableNodesQuery(containedAssertionNode),\n            termVariableNodeMatchesStatementVariableNode = statementVariableNodes.some((statementVariableNode) => {\n              const termVariableNodeMatchesStatementVariableNode = termVariableNode.match(statementVariableNode);\n\n              if (termVariableNodeMatchesStatementVariableNode) {\n                return true;\n              }\n            });\n\n      if (!negated) {\n        if (termVariableNodeMatchesStatementVariableNode) {\n          derivedContainedAssertionVerified = true;\n        }\n      }\n\n      if (negated) {\n        if (!termVariableNodeMatchesStatementVariableNode) {\n          derivedContainedAssertionVerified = true;\n        }\n      }\n    }\n\n    if (derivedContainedAssertionVerified) {\n      localContext.debug(`...verified the '${containedAssertionString}' derived contained assertion.`, containedAssertionNode);\n    }\n  }\n\n  return derivedContainedAssertionVerified;\n}\n\nfunction verifyStatedContainedAssertion(containedAssertionNode, assignments, stated, localContext) {\n  let statedContainedAssertionVerified;\n\n  if (stated) {\n    const containedAssertionString = localContext.nodeAsString(containedAssertionNode);\n\n    localContext.trace(`Verifying the '${containedAssertionString}' stated contained assertion...`, containedAssertionNode);\n\n    statedContainedAssertionVerified = true;\n\n    if (statedContainedAssertionVerified) {\n      localContext.debug(`...verified the '${containedAssertionString}' stated contained assertion.`, containedAssertionNode);\n    }\n  }\n\n  return statedContainedAssertionVerified;\n}\n"],"names":["verifyContainedAssertion","termVariableNodeQuery","nodeQuery","frameMetavariableNodeQuery","statementVariableNodesQuery","nodesQuery","statementMetavariableNodesQuery","verifyContainedAssertionFunctions","verifyDerivedContainedAssertion","verifyStatedContainedAssertion","containedAssertionNode","assignments","stated","localContext","containedAssertionVerified","containedAssertionString","nodeAsString","savedStated","trace","verified","metaLevelVerifier","verify","some","verifyContainedAssertionFunction","debug","derivedContainedAssertionVerified","assertionNegated","isAssertionNegated","frameMetavariableNode","termVariableNode","negated","statementMetavariableNodes","frameMetavariableNodeMatchesStatementMetavariableNode","statementMetavariableNode","match","statementVariableNodes","termVariableNodeMatchesStatementVariableNode","statementVariableNode","statedContainedAssertionVerified"],"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": "0.0.987",
4
+ "version": "0.0.988",
5
5
  "license": "MIT, Anti-996",
6
6
  "homepage": "https://github.com/djalbat/occam-verify-cli",
7
7
  "description": "Occam's Verifier",
@@ -12,7 +12,7 @@
12
12
  "dependencies": {
13
13
  "argumentative": "^2.0.32",
14
14
  "necessary": "^14.0.1",
15
- "occam-custom-grammars": "^5.0.863",
15
+ "occam-custom-grammars": "^5.0.865",
16
16
  "occam-entities": "^1.0.161",
17
17
  "occam-file-system": "^6.0.201",
18
18
  "occam-grammar-utilities": "^8.0.214",
package/src/resolve/complexSubstitutionAgainstSimpleSubstitution.js CHANGED
@@ -76,10 +76,14 @@ function transformedSubstitutionFromComplexSubstitutionSimpleSubstitutionAndSubs
76
76
  transformedSubstitution = substitution.transformed(substitutions);
77
77
 
78
78
  if (transformedSubstitution !== null) {
79
- const simpleSubstitutionStatementNode = simpleSubstitution.getStatementNode(),
79
+ substitutions = Substitutions.fromNothing(); ///
80
+
81
+ const substitutionString = substitution.asString(localContextA, localContextA),
82
+ transformedSubstitutionString = transformedSubstitution.asString(localContextA, localContextB),
83
+ simpleSubstitutionStatementNode = simpleSubstitution.getStatementNode(),
80
84
  complexSubstitutionStatementNode = complexSubstitution.getStatementNode();
81
85
 
82
- substitutions = Substitutions.fromNothing(); ///
86
+ localContextB.trace(`Transformed the complex substitution's '${substitutionString}' substitution into the '${transformedSubstitutionString}' substitution.`, complexSubstitutionStatementNode);
83
87
 
84
88
  const complexSubstitutionStatementWithSimpleSubstitutionStatement = unifyComplexSubstitutionStatementWithSimpleSubstitutionStatement(complexSubstitutionStatementNode, simpleSubstitutionStatementNode, substitutions, localContextA, localContextB);
85
89
 
@@ -87,6 +91,11 @@ function transformedSubstitutionFromComplexSubstitutionSimpleSubstitutionAndSubs
87
91
  const substitution = transformedSubstitution; ///
88
92
 
89
93
  transformedSubstitution = substitution.transformed(substitutions);
94
+
95
+ const substitutionString = substitution.asString(localContextA, localContextB),
96
+ transformedSubstitutionString = transformedSubstitution.asString(localContextA, localContextB);
97
+
98
+ localContextB.trace(`Transformed the complex substitution's transformed '${substitutionString}' substitution into the '${transformedSubstitutionString}' substitution.`, complexSubstitutionStatementNode);
90
99
  }
91
100
  }
92
101
 
package/src/unify/complexSubstitutionStatementWithSimpleSubstitutionStatement.js CHANGED
@@ -5,6 +5,11 @@ import metaLevelUnifier from "../unifier/metaLevel";
5
5
  export default function unifyComplexSubstitutionStatementWithSimpleSubstitutionStatement(complexSubstitutionStatementNode, simpleSubstitutionStatementNode, substitutions, localContextA, localContextB) {
6
6
  let complexSubstitutionStatementWithSimpleSubstitutionStatement;
7
7
 
8
+ const complexSubstitutionStatementString = localContextB.nodeAsString(complexSubstitutionStatementNode),
9
+ simpleSubstitutionStatementString = localContextB.nodeAsString(simpleSubstitutionStatementNode);
10
+
11
+ localContextB.trace(`Unifying the complex substitution's '${complexSubstitutionStatementString}' statement with the simple substitution's '${simpleSubstitutionStatementString}' statement...`, simpleSubstitutionStatementNode);
12
+
8
13
  const nodeA = complexSubstitutionStatementNode, ///
9
14
  nodeB = simpleSubstitutionStatementNode; ///
10
15
 
@@ -14,5 +19,9 @@ export default function unifyComplexSubstitutionStatementWithSimpleSubstitutionS
14
19
 
15
20
  complexSubstitutionStatementWithSimpleSubstitutionStatement = unified; ///
16
21
 
22
+ if (complexSubstitutionStatementWithSimpleSubstitutionStatement) {
23
+ localContextB.trace(`...unified the complex substitution's '${complexSubstitutionStatementString}' statement with the simple substitution's '${simpleSubstitutionStatementString}' statement.`, simpleSubstitutionStatementNode);
24
+ }
25
+
17
26
  return complexSubstitutionStatementWithSimpleSubstitutionStatement;
18
27
  }
package/src/verify/assertion/contained.js CHANGED
@@ -5,8 +5,8 @@ import metaLevelVerifier from "../../verifier/metaLevel";
5
5
  import { isAssertionNegated } from "../../utilities/assertion";
6
6
  import { nodeQuery, nodesQuery } from "../../utilities/query";
7
7
 
8
- const variableNodeQuery = nodeQuery("/containedAssertion/term/variable!"),
9
- metavariableNodeQuery = nodeQuery("/containedAssertion/frame/metavariable!"),
8
+ const termVariableNodeQuery = nodeQuery("/containedAssertion/term/variable!"),
9
+ frameMetavariableNodeQuery = nodeQuery("/containedAssertion/frame/metavariable!"),
10
10
  statementVariableNodesQuery = nodesQuery("/containedAssertion/statement//variable"),
11
11
  statementMetavariableNodesQuery = nodesQuery("/containedAssertion/statement//metavariable");
12
12
 
@@ -57,51 +57,51 @@ function verifyDerivedContainedAssertion(containedAssertionNode, assignments, st
57
57
  localContext.trace(`Verifying the '${containedAssertionString}' derived contained assertion...`, containedAssertionNode);
58
58
 
59
59
  const assertionNegated = isAssertionNegated(containedAssertionNode),
60
- metavariableNode = metavariableNodeQuery(containedAssertionNode),
61
- variableNode = variableNodeQuery(containedAssertionNode),
60
+ frameMetavariableNode = frameMetavariableNodeQuery(containedAssertionNode),
61
+ termVariableNode = termVariableNodeQuery(containedAssertionNode),
62
62
  negated = assertionNegated; ///
63
63
 
64
64
  if (false) {
65
65
  ///
66
- } else if (metavariableNode !== null) {
66
+ } else if (frameMetavariableNode !== null) {
67
67
  const statementMetavariableNodes = statementMetavariableNodesQuery(containedAssertionNode),
68
- variableNodeMatchesStatementMetavariableNode = statementMetavariableNodes.some((statementMetavariableNode) => {
69
- const variableNodeMatchesStatementMetavariableNode = metavariableNode.match(statementMetavariableNode);
68
+ frameMetavariableNodeMatchesStatementMetavariableNode = statementMetavariableNodes.some((statementMetavariableNode) => {
69
+ const frameMetavariableNodeMatchesStatementMetavariableNode = frameMetavariableNode.match(statementMetavariableNode);
70
70
 
71
- if (variableNodeMatchesStatementMetavariableNode) {
71
+ if (frameMetavariableNodeMatchesStatementMetavariableNode) {
72
72
  return true;
73
73
  }
74
74
  });
75
75
 
76
76
  if (!negated) {
77
- if (variableNodeMatchesStatementMetavariableNode) {
77
+ if (frameMetavariableNodeMatchesStatementMetavariableNode) {
78
78
  derivedContainedAssertionVerified = true;
79
79
  }
80
80
  }
81
81
 
82
82
  if (negated) {
83
- if (!variableNodeMatchesStatementMetavariableNode) {
83
+ if (!frameMetavariableNodeMatchesStatementMetavariableNode) {
84
84
  derivedContainedAssertionVerified = true;
85
85
  }
86
86
  }
87
- } else if (variableNode !== null) {
87
+ } else if (termVariableNode !== null) {
88
88
  const statementVariableNodes = statementVariableNodesQuery(containedAssertionNode),
89
- variableNodeMatchesStatementVariableNode = statementVariableNodes.some((statementVariableNode) => {
90
- const variableNodeMatchesStatementVariableNode = variableNode.match(statementVariableNode);
89
+ termVariableNodeMatchesStatementVariableNode = statementVariableNodes.some((statementVariableNode) => {
90
+ const termVariableNodeMatchesStatementVariableNode = termVariableNode.match(statementVariableNode);
91
91
 
92
- if (variableNodeMatchesStatementVariableNode) {
92
+ if (termVariableNodeMatchesStatementVariableNode) {
93
93
  return true;
94
94
  }
95
95
  });
96
96
 
97
97
  if (!negated) {
98
- if (variableNodeMatchesStatementVariableNode) {
98
+ if (termVariableNodeMatchesStatementVariableNode) {
99
99
  derivedContainedAssertionVerified = true;
100
100
  }
101
101
  }
102
102
 
103
103
  if (negated) {
104
- if (!variableNodeMatchesStatementVariableNode) {
104
+ if (!termVariableNodeMatchesStatementVariableNode) {
105
105
  derivedContainedAssertionVerified = true;
106
106
  }
107
107
  }