occam-verify-cli 0.0.991 → 0.0.992

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 (9) hide show
  1. package/lib/unifier/metaLevel.js +20 -12
  2. package/lib/unify/metavariableWithFrame.js +3 -2
  3. package/lib/unify/metavariableWithStatement.js +3 -2
  4. package/lib/unify/metavariableWithStatementGivenSubstitution.js +3 -2
  5. package/package.json +1 -1
  6. package/src/unifier/metaLevel.js +32 -21
  7. package/src/unify/metavariableWithFrame.js +3 -1
  8. package/src/unify/metavariableWithStatement.js +3 -1
  9. package/src/unify/metavariableWithStatementGivenSubstitution.js +3 -1
package/lib/unifier/metaLevel.js CHANGED
@@ -132,19 +132,23 @@ _define_property(MetaLevelUnifier, "maps", [
132
132
  nodeQueryB: statementNodeQuery,
133
133
  unify: function(statementNodeA, statementNodeB, substitutions, localContextA, localContextB) {
134
134
  var statementUnifiedWithStatement;
135
- var statementMetavariableNodeA = statementMetavariableNodeQuery(statementNodeA);
136
- if (statementMetavariableNodeA !== null) {
137
- var metavariableNodeA = statementMetavariableNodeA, statementSubstitutionNodeA = statementSubstitutionNodeQuery(statementNodeA);
138
- if (statementSubstitutionNodeA === null) {
139
- var metavariableUnifiedWithStatement = (0, _metavariableWithStatement.default)(metavariableNodeA, statementNodeB, substitutions, localContextA, localContextB);
140
- statementUnifiedWithStatement = metavariableUnifiedWithStatement; ///
135
+ var matches = statementNodeA.match(statementNodeB);
136
+ if (matches) {
137
+ statementUnifiedWithStatement = true;
138
+ } else {
139
+ var statementMetavariableNodeA = statementMetavariableNodeQuery(statementNodeA);
140
+ if (statementMetavariableNodeA !== null) {
141
+ var metavariableNodeA = statementMetavariableNodeA, statementSubstitutionNodeA = statementSubstitutionNodeQuery(statementNodeA);
142
+ if (statementSubstitutionNodeA === null) {
143
+ var metavariableUnifiedWithStatement = (0, _metavariableWithStatement.default)(metavariableNodeA, statementNodeB, substitutions, localContextA, localContextB);
144
+ statementUnifiedWithStatement = metavariableUnifiedWithStatement; ///
145
+ } else {
146
+ var substitutionNodeA = statementSubstitutionNodeA, metavariableUnifiedWithStatementGivenSubstitution = (0, _metavariableWithStatementGivenSubstitution.default)(metavariableNodeA, statementNodeB, substitutionNodeA, substitutions, localContextA, localContextB);
147
+ statementUnifiedWithStatement = metavariableUnifiedWithStatementGivenSubstitution; ///
148
+ }
141
149
  } else {
142
- var substitutionNodeA = statementSubstitutionNodeA, metavariableUnifiedWithStatementGivenSubstitution = (0, _metavariableWithStatementGivenSubstitution.default)(metavariableNodeA, statementNodeB, substitutionNodeA, substitutions, localContextA, localContextB);
143
- statementUnifiedWithStatement = metavariableUnifiedWithStatementGivenSubstitution; ///
150
+ statementUnifiedWithStatement = unifyStatementWithStatement(statementNodeA, statementNodeB, substitutions, localContextA, localContextB);
144
151
  }
145
- } else {
146
- var nonTerminalNodeA = statementNodeA, nonTerminalNodeB = statementNodeB, nonTerminalNodeAChildNodes = nonTerminalNodeA.getChildNodes(), nonTerminalNodeBChildNodes = nonTerminalNodeB.getChildNodes(), childNodesA = nonTerminalNodeAChildNodes, childNodesB = nonTerminalNodeBChildNodes, childNodesVerified = metaLevelUnifier.unifyChildNodes(childNodesA, childNodesB, substitutions, localContextA, localContextB);
147
- statementUnifiedWithStatement = childNodesVerified; ///
148
152
  }
149
153
  return statementUnifiedWithStatement;
150
154
  }
@@ -171,5 +175,9 @@ Object.assign(_shim.default, {
171
175
  metaLevelUnifier: metaLevelUnifier
172
176
  });
173
177
  var _default = metaLevelUnifier;
178
+ function unifyStatementWithStatement(statementNodeA, statementNodeB, substitutions, localContextA, localContextB) {
179
+ var nonTerminalNodeA = statementNodeA, nonTerminalNodeB = statementNodeB, nonTerminalNodeAChildNodes = nonTerminalNodeA.getChildNodes(), nonTerminalNodeBChildNodes = nonTerminalNodeB.getChildNodes(), childNodesA = nonTerminalNodeAChildNodes, childNodesB = nonTerminalNodeBChildNodes, childNodesVerified = metaLevelUnifier.unifyChildNodes(childNodesA, childNodesB, substitutions, localContextA, localContextB), statementUnifiedWithStatement = childNodesVerified; ///
180
+ return statementUnifiedWithStatement;
181
+ }
174
182
 
175
- //# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/unifier/metaLevel.js"],"sourcesContent":["\"use strict\";\n\nimport shim from \"../shim\";\nimport Unifier from \"../unifier\";\nimport unifyVariableWithTerm from \"../unify/variableWithTerm\";\nimport unifyMetavariableWithFrame from \"../unify/metavariableWithFrame\";\nimport unifyMetavariableWithStatement from \"../unify/metavariableWithStatement\";\nimport unifyMetavariableWithStatementGivenSubstitution from \"../unify/metavariableWithStatementGivenSubstitution\";\n\nimport { nodeQuery } from \"../utilities/query\";\n\nconst termNodeQuery = nodeQuery(\"/term!\"),\n      frameNodeQuery = nodeQuery(\"/frame!\"),\n      statementNodeQuery = nodeQuery(\"/statement!\"),\n      termVariableNodeQuery = nodeQuery(\"/term/variable!\"),\n      frameMetavariableNodeQuery = nodeQuery(\"/frame/metavariable!\"),\n      statementSubstitutionNodeQuery = nodeQuery(\"/statement/substitution!\"),\n      statementMetavariableNodeQuery = nodeQuery(\"/statement/metavariable!\");\n\nclass MetaLevelUnifier extends Unifier {\n  unify(nodeA, nodeB, substitutions, localContextA, localContextB) {\n    let unified;\n\n    const nonTerminalNodeA = nodeA, ///\n          nonTerminalNodeB = nodeB, ///\n          nonTerminalNodeUnified = this.unifyNonTerminalNode(nonTerminalNodeA, nonTerminalNodeB, substitutions, localContextA, localContextB);\n\n    unified = nonTerminalNodeUnified; ///\n\n    return unified;\n  }\n\n  static maps = [\n    {\n      nodeQueryA: statementNodeQuery,\n      nodeQueryB: statementNodeQuery,\n      unify: (statementNodeA, statementNodeB, substitutions, localContextA, localContextB) => {\n        let statementUnifiedWithStatement;\n\n        const statementMetavariableNodeA = statementMetavariableNodeQuery(statementNodeA);\n\n        if (statementMetavariableNodeA !== null) {\n          const metavariableNodeA = statementMetavariableNodeA, ///\n                statementSubstitutionNodeA = statementSubstitutionNodeQuery(statementNodeA);\n\n          if (statementSubstitutionNodeA === null) {\n            const metavariableUnifiedWithStatement = unifyMetavariableWithStatement(metavariableNodeA, statementNodeB, substitutions, localContextA, localContextB);\n\n            statementUnifiedWithStatement = metavariableUnifiedWithStatement; ///\n          } else {\n            const substitutionNodeA = statementSubstitutionNodeA, ///\n                  metavariableUnifiedWithStatementGivenSubstitution = unifyMetavariableWithStatementGivenSubstitution(metavariableNodeA, statementNodeB, substitutionNodeA, substitutions, localContextA, localContextB);\n\n            statementUnifiedWithStatement = metavariableUnifiedWithStatementGivenSubstitution; ///\n          }\n        } else {\n          const nonTerminalNodeA = statementNodeA, ///\n                nonTerminalNodeB = statementNodeB, ///\n                nonTerminalNodeAChildNodes = nonTerminalNodeA.getChildNodes(),\n                nonTerminalNodeBChildNodes = nonTerminalNodeB.getChildNodes(),\n                childNodesA = nonTerminalNodeAChildNodes, ///\n                childNodesB = nonTerminalNodeBChildNodes, ///\n                childNodesVerified = metaLevelUnifier.unifyChildNodes(childNodesA, childNodesB, substitutions, localContextA, localContextB);\n\n          statementUnifiedWithStatement = childNodesVerified; ///\n        }\n\n        return statementUnifiedWithStatement;\n      }\n    },\n    {\n      nodeQueryA: frameMetavariableNodeQuery,\n      nodeQueryB: frameNodeQuery,\n      unify: (frameMetavariableNodeA, frameNodeB, substitutions, localContextA, localContextB) => {\n        const metavariableNodeA = frameMetavariableNodeA, ///\n              metavariableUnifiedWithFrame = unifyMetavariableWithFrame(metavariableNodeA, frameNodeB, substitutions, localContextA, localContextB);\n\n        return metavariableUnifiedWithFrame;\n      }\n    },\n    {\n      nodeQueryA: termVariableNodeQuery,\n      nodeQueryB: termNodeQuery,\n      unify: (termVariableNodeA, termNodeB, substitutions, localContextA, localContextB) => {\n        const variableNodeA = termVariableNodeA, ///\n              variableUnifiedWithTerm = unifyVariableWithTerm(variableNodeA, termNodeB, substitutions, localContextA, localContextB);\n\n        return variableUnifiedWithTerm;\n      }\n    }\n  ];\n}\n\nconst metaLevelUnifier = new MetaLevelUnifier();\n\nObject.assign(shim, {\n  metaLevelUnifier\n});\n\nexport default metaLevelUnifier;\n"],"names":["termNodeQuery","nodeQuery","frameNodeQuery","statementNodeQuery","termVariableNodeQuery","frameMetavariableNodeQuery","statementSubstitutionNodeQuery","statementMetavariableNodeQuery","MetaLevelUnifier","unify","nodeA","nodeB","substitutions","localContextA","localContextB","unified","nonTerminalNodeA","nonTerminalNodeB","nonTerminalNodeUnified","unifyNonTerminalNode","Unifier","maps","nodeQueryA","nodeQueryB","statementNodeA","statementNodeB","statementUnifiedWithStatement","statementMetavariableNodeA","metavariableNodeA","statementSubstitutionNodeA","metavariableUnifiedWithStatement","unifyMetavariableWithStatement","substitutionNodeA","metavariableUnifiedWithStatementGivenSubstitution","unifyMetavariableWithStatementGivenSubstitution","nonTerminalNodeAChildNodes","getChildNodes","nonTerminalNodeBChildNodes","childNodesA","childNodesB","childNodesVerified","metaLevelUnifier","unifyChildNodes","frameMetavariableNodeA","frameNodeB","metavariableUnifiedWithFrame","unifyMetavariableWithFrame","termVariableNodeA","termNodeB","variableNodeA","variableUnifiedWithTerm","unifyVariableWithTerm","Object","assign","shim"],"mappings":"AAAA;;;;+BAmGA;;;eAAA;;;2DAjGiB;8DACG;uEACc;4EACK;gFACI;iGACiB;qBAElC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAE1B,IAAMA,gBAAgBC,IAAAA,gBAAS,EAAC,WAC1BC,iBAAiBD,IAAAA,gBAAS,EAAC,YAC3BE,qBAAqBF,IAAAA,gBAAS,EAAC,gBAC/BG,wBAAwBH,IAAAA,gBAAS,EAAC,oBAClCI,6BAA6BJ,IAAAA,gBAAS,EAAC,yBACvCK,iCAAiCL,IAAAA,gBAAS,EAAC,6BAC3CM,iCAAiCN,IAAAA,gBAAS,EAAC;AAEjD,IAAA,AAAMO,iCAAN;cAAMA;aAAAA;gCAAAA;iCAAAA;;kBAAAA;;YACJC,KAAAA;mBAAAA,SAAAA,MAAMC,KAAK,EAAEC,KAAK,EAAEC,aAAa,EAAEC,aAAa,EAAEC,aAAa;gBAC7D,IAAIC;gBAEJ,IAAMC,mBAAmBN,OACnBO,mBAAmBN,OACnBO,yBAAyB,IAAI,CAACC,oBAAoB,CAACH,kBAAkBC,kBAAkBL,eAAeC,eAAeC;gBAE3HC,UAAUG,wBAAwB,GAAG;gBAErC,OAAOH;YACT;;;WAXIP;EAAyBY,gBAAO;AAapC,iBAbIZ,kBAaGa,QAAO;IACZ;QACEC,YAAYnB;QACZoB,YAAYpB;QACZM,OAAO,SAACe,gBAAgBC,gBAAgBb,eAAeC,eAAeC;YACpE,IAAIY;YAEJ,IAAMC,6BAA6BpB,+BAA+BiB;YAElE,IAAIG,+BAA+B,MAAM;gBACvC,IAAMC,oBAAoBD,4BACpBE,6BAA6BvB,+BAA+BkB;gBAElE,IAAIK,+BAA+B,MAAM;oBACvC,IAAMC,mCAAmCC,IAAAA,kCAA8B,EAACH,mBAAmBH,gBAAgBb,eAAeC,eAAeC;oBAEzIY,gCAAgCI,kCAAkC,GAAG;gBACvE,OAAO;oBACL,IAAME,oBAAoBH,4BACpBI,oDAAoDC,IAAAA,mDAA+C,EAACN,mBAAmBH,gBAAgBO,mBAAmBpB,eAAeC,eAAeC;oBAE9LY,gCAAgCO,mDAAmD,GAAG;gBACxF;YACF,OAAO;gBACL,IAAMjB,mBAAmBQ,gBACnBP,mBAAmBQ,gBACnBU,6BAA6BnB,iBAAiBoB,aAAa,IAC3DC,6BAA6BpB,iBAAiBmB,aAAa,IAC3DE,cAAcH,4BACdI,cAAcF,4BACdG,qBAAqBC,iBAAiBC,eAAe,CAACJ,aAAaC,aAAa3B,eAAeC,eAAeC;gBAEpHY,gCAAgCc,oBAAoB,GAAG;YACzD;YAEA,OAAOd;QACT;IACF;IACA;QACEJ,YAAYjB;QACZkB,YAAYrB;QACZO,OAAO,SAACkC,wBAAwBC,YAAYhC,eAAeC,eAAeC;YACxE,IAAMc,oBAAoBe,wBACpBE,+BAA+BC,IAAAA,8BAA0B,EAAClB,mBAAmBgB,YAAYhC,eAAeC,eAAeC;YAE7H,OAAO+B;QACT;IACF;IACA;QACEvB,YAAYlB;QACZmB,YAAYvB;QACZS,OAAO,SAACsC,mBAAmBC,WAAWpC,eAAeC,eAAeC;YAClE,IAAMmC,gBAAgBF,mBAChBG,0BAA0BC,IAAAA,yBAAqB,EAACF,eAAeD,WAAWpC,eAAeC,eAAeC;YAE9G,OAAOoC;QACT;IACF;CACD;AAGH,IAAMT,mBAAmB,IAAIjC;AAE7B4C,OAAOC,MAAM,CAACC,aAAI,EAAE;IAClBb,kBAAAA;AACF;IAEA,WAAeA"}
183
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/unifier/metaLevel.js"],"sourcesContent":["\"use strict\";\n\nimport shim from \"../shim\";\nimport Unifier from \"../unifier\";\nimport unifyVariableWithTerm from \"../unify/variableWithTerm\";\nimport unifyMetavariableWithFrame from \"../unify/metavariableWithFrame\";\nimport unifyMetavariableWithStatement from \"../unify/metavariableWithStatement\";\nimport unifyMetavariableWithStatementGivenSubstitution from \"../unify/metavariableWithStatementGivenSubstitution\";\n\nimport { nodeQuery } from \"../utilities/query\";\n\nconst termNodeQuery = nodeQuery(\"/term!\"),\n      frameNodeQuery = nodeQuery(\"/frame!\"),\n      statementNodeQuery = nodeQuery(\"/statement!\"),\n      termVariableNodeQuery = nodeQuery(\"/term/variable!\"),\n      frameMetavariableNodeQuery = nodeQuery(\"/frame/metavariable!\"),\n      statementSubstitutionNodeQuery = nodeQuery(\"/statement/substitution!\"),\n      statementMetavariableNodeQuery = nodeQuery(\"/statement/metavariable!\");\n\nclass MetaLevelUnifier extends Unifier {\n  unify(nodeA, nodeB, substitutions, localContextA, localContextB) {\n    let unified;\n\n    const nonTerminalNodeA = nodeA, ///\n          nonTerminalNodeB = nodeB, ///\n          nonTerminalNodeUnified = this.unifyNonTerminalNode(nonTerminalNodeA, nonTerminalNodeB, substitutions, localContextA, localContextB);\n\n    unified = nonTerminalNodeUnified; ///\n\n    return unified;\n  }\n\n  static maps = [\n    {\n      nodeQueryA: statementNodeQuery,\n      nodeQueryB: statementNodeQuery,\n      unify: (statementNodeA, statementNodeB, substitutions, localContextA, localContextB) => {\n        let statementUnifiedWithStatement;\n\n        const matches = statementNodeA.match(statementNodeB);\n\n        if (matches) {\n          statementUnifiedWithStatement = true;\n        } else {\n          const statementMetavariableNodeA = statementMetavariableNodeQuery(statementNodeA);\n\n          if (statementMetavariableNodeA !== null) {\n            const metavariableNodeA = statementMetavariableNodeA, ///\n                  statementSubstitutionNodeA = statementSubstitutionNodeQuery(statementNodeA);\n\n            if (statementSubstitutionNodeA === null) {\n              const metavariableUnifiedWithStatement = unifyMetavariableWithStatement(metavariableNodeA, statementNodeB, substitutions, localContextA, localContextB);\n\n              statementUnifiedWithStatement = metavariableUnifiedWithStatement; ///\n            } else {\n              const substitutionNodeA = statementSubstitutionNodeA, ///\n                    metavariableUnifiedWithStatementGivenSubstitution = unifyMetavariableWithStatementGivenSubstitution(metavariableNodeA, statementNodeB, substitutionNodeA, substitutions, localContextA, localContextB);\n\n              statementUnifiedWithStatement = metavariableUnifiedWithStatementGivenSubstitution; ///\n            }\n          } else {\n            statementUnifiedWithStatement = unifyStatementWithStatement(statementNodeA, statementNodeB, substitutions, localContextA, localContextB);\n          }\n        }\n\n        return statementUnifiedWithStatement;\n      }\n    },\n    {\n      nodeQueryA: frameMetavariableNodeQuery,\n      nodeQueryB: frameNodeQuery,\n      unify: (frameMetavariableNodeA, frameNodeB, substitutions, localContextA, localContextB) => {\n        const metavariableNodeA = frameMetavariableNodeA, ///\n              metavariableUnifiedWithFrame = unifyMetavariableWithFrame(metavariableNodeA, frameNodeB, substitutions, localContextA, localContextB);\n\n        return metavariableUnifiedWithFrame;\n      }\n    },\n    {\n      nodeQueryA: termVariableNodeQuery,\n      nodeQueryB: termNodeQuery,\n      unify: (termVariableNodeA, termNodeB, substitutions, localContextA, localContextB) => {\n        const variableNodeA = termVariableNodeA, ///\n              variableUnifiedWithTerm = unifyVariableWithTerm(variableNodeA, termNodeB, substitutions, localContextA, localContextB);\n\n        return variableUnifiedWithTerm;\n      }\n    }\n  ];\n}\n\nconst metaLevelUnifier = new MetaLevelUnifier();\n\nObject.assign(shim, {\n  metaLevelUnifier\n});\n\nexport default metaLevelUnifier;\n\nfunction unifyStatementWithStatement(statementNodeA, statementNodeB, substitutions, localContextA, localContextB) {\n  const nonTerminalNodeA = statementNodeA, ///\n        nonTerminalNodeB = statementNodeB, ///\n        nonTerminalNodeAChildNodes = nonTerminalNodeA.getChildNodes(),\n        nonTerminalNodeBChildNodes = nonTerminalNodeB.getChildNodes(),\n        childNodesA = nonTerminalNodeAChildNodes, ///\n        childNodesB = nonTerminalNodeBChildNodes, ///\n        childNodesVerified = metaLevelUnifier.unifyChildNodes(childNodesA, childNodesB, substitutions, localContextA, localContextB),\n        statementUnifiedWithStatement = childNodesVerified; ///\n\n  return statementUnifiedWithStatement;\n}\n"],"names":["termNodeQuery","nodeQuery","frameNodeQuery","statementNodeQuery","termVariableNodeQuery","frameMetavariableNodeQuery","statementSubstitutionNodeQuery","statementMetavariableNodeQuery","MetaLevelUnifier","unify","nodeA","nodeB","substitutions","localContextA","localContextB","unified","nonTerminalNodeA","nonTerminalNodeB","nonTerminalNodeUnified","unifyNonTerminalNode","Unifier","maps","nodeQueryA","nodeQueryB","statementNodeA","statementNodeB","statementUnifiedWithStatement","matches","match","statementMetavariableNodeA","metavariableNodeA","statementSubstitutionNodeA","metavariableUnifiedWithStatement","unifyMetavariableWithStatement","substitutionNodeA","metavariableUnifiedWithStatementGivenSubstitution","unifyMetavariableWithStatementGivenSubstitution","unifyStatementWithStatement","frameMetavariableNodeA","frameNodeB","metavariableUnifiedWithFrame","unifyMetavariableWithFrame","termVariableNodeA","termNodeB","variableNodeA","variableUnifiedWithTerm","unifyVariableWithTerm","metaLevelUnifier","Object","assign","shim","nonTerminalNodeAChildNodes","getChildNodes","nonTerminalNodeBChildNodes","childNodesA","childNodesB","childNodesVerified","unifyChildNodes"],"mappings":"AAAA;;;;+BAiGA;;;eAAA;;;2DA/FiB;8DACG;uEACc;4EACK;gFACI;iGACiB;qBAElC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAE1B,IAAMA,gBAAgBC,IAAAA,gBAAS,EAAC,WAC1BC,iBAAiBD,IAAAA,gBAAS,EAAC,YAC3BE,qBAAqBF,IAAAA,gBAAS,EAAC,gBAC/BG,wBAAwBH,IAAAA,gBAAS,EAAC,oBAClCI,6BAA6BJ,IAAAA,gBAAS,EAAC,yBACvCK,iCAAiCL,IAAAA,gBAAS,EAAC,6BAC3CM,iCAAiCN,IAAAA,gBAAS,EAAC;AAEjD,IAAA,AAAMO,iCAAN;cAAMA;aAAAA;gCAAAA;iCAAAA;;kBAAAA;;YACJC,KAAAA;mBAAAA,SAAAA,MAAMC,KAAK,EAAEC,KAAK,EAAEC,aAAa,EAAEC,aAAa,EAAEC,aAAa;gBAC7D,IAAIC;gBAEJ,IAAMC,mBAAmBN,OACnBO,mBAAmBN,OACnBO,yBAAyB,IAAI,CAACC,oBAAoB,CAACH,kBAAkBC,kBAAkBL,eAAeC,eAAeC;gBAE3HC,UAAUG,wBAAwB,GAAG;gBAErC,OAAOH;YACT;;;WAXIP;EAAyBY,gBAAO;AAapC,iBAbIZ,kBAaGa,QAAO;IACZ;QACEC,YAAYnB;QACZoB,YAAYpB;QACZM,OAAO,SAACe,gBAAgBC,gBAAgBb,eAAeC,eAAeC;YACpE,IAAIY;YAEJ,IAAMC,UAAUH,eAAeI,KAAK,CAACH;YAErC,IAAIE,SAAS;gBACXD,gCAAgC;YAClC,OAAO;gBACL,IAAMG,6BAA6BtB,+BAA+BiB;gBAElE,IAAIK,+BAA+B,MAAM;oBACvC,IAAMC,oBAAoBD,4BACpBE,6BAA6BzB,+BAA+BkB;oBAElE,IAAIO,+BAA+B,MAAM;wBACvC,IAAMC,mCAAmCC,IAAAA,kCAA8B,EAACH,mBAAmBL,gBAAgBb,eAAeC,eAAeC;wBAEzIY,gCAAgCM,kCAAkC,GAAG;oBACvE,OAAO;wBACL,IAAME,oBAAoBH,4BACpBI,oDAAoDC,IAAAA,mDAA+C,EAACN,mBAAmBL,gBAAgBS,mBAAmBtB,eAAeC,eAAeC;wBAE9LY,gCAAgCS,mDAAmD,GAAG;oBACxF;gBACF,OAAO;oBACLT,gCAAgCW,4BAA4Bb,gBAAgBC,gBAAgBb,eAAeC,eAAeC;gBAC5H;YACF;YAEA,OAAOY;QACT;IACF;IACA;QACEJ,YAAYjB;QACZkB,YAAYrB;QACZO,OAAO,SAAC6B,wBAAwBC,YAAY3B,eAAeC,eAAeC;YACxE,IAAMgB,oBAAoBQ,wBACpBE,+BAA+BC,IAAAA,8BAA0B,EAACX,mBAAmBS,YAAY3B,eAAeC,eAAeC;YAE7H,OAAO0B;QACT;IACF;IACA;QACElB,YAAYlB;QACZmB,YAAYvB;QACZS,OAAO,SAACiC,mBAAmBC,WAAW/B,eAAeC,eAAeC;YAClE,IAAM8B,gBAAgBF,mBAChBG,0BAA0BC,IAAAA,yBAAqB,EAACF,eAAeD,WAAW/B,eAAeC,eAAeC;YAE9G,OAAO+B;QACT;IACF;CACD;AAGH,IAAME,mBAAmB,IAAIvC;AAE7BwC,OAAOC,MAAM,CAACC,aAAI,EAAE;IAClBH,kBAAAA;AACF;IAEA,WAAeA;AAEf,SAASV,4BAA4Bb,cAAc,EAAEC,cAAc,EAAEb,aAAa,EAAEC,aAAa,EAAEC,aAAa;IAC9G,IAAME,mBAAmBQ,gBACnBP,mBAAmBQ,gBACnB0B,6BAA6BnC,iBAAiBoC,aAAa,IAC3DC,6BAA6BpC,iBAAiBmC,aAAa,IAC3DE,cAAcH,4BACdI,cAAcF,4BACdG,qBAAqBT,iBAAiBU,eAAe,CAACH,aAAaC,aAAa3C,eAAeC,eAAeC,gBAC9GY,gCAAgC8B,oBAAoB,GAAG;IAE7D,OAAO9B;AACT"}
package/lib/unify/metavariableWithFrame.js CHANGED
@@ -10,6 +10,7 @@ Object.defineProperty(exports, "default", {
10
10
  });
11
11
  var _frameForMetavariable = /*#__PURE__*/ _interop_require_default(require("../substitution/frameForMetavariable"));
12
12
  var _unify = require("../utilities/unify");
13
+ var _name = require("../utilities/name");
13
14
  function _interop_require_default(obj) {
14
15
  return obj && obj.__esModule ? obj : {
15
16
  default: obj
@@ -24,7 +25,7 @@ function unifyMetavariableWithFrame(metavariableNodeA, frameNodeB, substitutions
24
25
  metavariableUnifiedWithFrame = true;
25
26
  }
26
27
  } else {
27
- var metavariableA = localContextA.findMetavariableByMetavariableNode(metavariableNodeA), metavariableB = (0, _unify.metavariableFromFrameNode)(frameNodeB, localContextB);
28
+ var metavariableNameA = (0, _name.metavariableNameFromMetavariableNode)(metavariableNodeA), metavariableA = localContextA.findMetavariableByMetavariableName(metavariableNameA), metavariableB = (0, _unify.metavariableFromFrameNode)(frameNodeB, localContextB);
28
29
  if (metavariableA === metavariableB) {
29
30
  metavariableUnifiedWithFrame = true;
30
31
  } else {
@@ -36,4 +37,4 @@ function unifyMetavariableWithFrame(metavariableNodeA, frameNodeB, substitutions
36
37
  return metavariableUnifiedWithFrame;
37
38
  }
38
39
 
39
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91bmlmeS9tZXRhdmFyaWFibGVXaXRoRnJhbWUuanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmltcG9ydCBGcmFtZUZvck1ldGF2YXJpYWJsZVN1YnN0aXR1dGlvbiBmcm9tIFwiLi4vc3Vic3RpdHV0aW9uL2ZyYW1lRm9yTWV0YXZhcmlhYmxlXCI7XG5cbmltcG9ydCB7IG1ldGF2YXJpYWJsZUZyb21GcmFtZU5vZGUgfSBmcm9tIFwiLi4vdXRpbGl0aWVzL3VuaWZ5XCI7XG5cbmV4cG9ydCBkZWZhdWx0IGZ1bmN0aW9uIHVuaWZ5TWV0YXZhcmlhYmxlV2l0aEZyYW1lKG1ldGF2YXJpYWJsZU5vZGVBLCBmcmFtZU5vZGVCLCBzdWJzdGl0dXRpb25zLCBsb2NhbENvbnRleHRBLCBsb2NhbENvbnRleHRCKSB7XG4gIGxldCBtZXRhdmFyaWFibGVVbmlmaWVkV2l0aEZyYW1lID0gZmFsc2U7XG5cbiAgY29uc3Qgc2ltcGxlU3Vic3RpdHV0aW9uID0gc3Vic3RpdHV0aW9ucy5maW5kU2ltcGxlU3Vic3RpdHV0aW9uQnlNZXRhdmFyaWFibGVOb2RlKG1ldGF2YXJpYWJsZU5vZGVBKSxcbiAgICAgICAgc3Vic3RpdHV0aW9uID0gc2ltcGxlU3Vic3RpdHV0aW9uOyAgLy8vXG5cbiAgaWYgKHN1YnN0aXR1dGlvbiAhPT0gbnVsbCkge1xuICAgIGNvbnN0IGZyYW1lTm9kZU1hdGNoZXMgPSBzdWJzdGl0dXRpb24ubWF0Y2hGcmFtZU5vZGUoZnJhbWVOb2RlQik7XG5cbiAgICBpZiAoZnJhbWVOb2RlTWF0Y2hlcykge1xuICAgICAgbWV0YXZhcmlhYmxlVW5pZmllZFdpdGhGcmFtZSA9IHRydWU7XG4gICAgfVxuICB9IGVsc2Uge1xuICAgIGNvbnN0IG1ldGF2YXJpYWJsZUEgPSBsb2NhbENvbnRleHRBLmZpbmRNZXRhdmFyaWFibGVCeU1ldGF2YXJpYWJsZU5vZGUobWV0YXZhcmlhYmxlTm9kZUEpLFxuICAgICAgICAgIG1ldGF2YXJpYWJsZUIgPSBtZXRhdmFyaWFibGVGcm9tRnJhbWVOb2RlKGZyYW1lTm9kZUIsIGxvY2FsQ29udGV4dEIpO1xuXG4gICAgaWYgKG1ldGF2YXJpYWJsZUEgPT09IG1ldGF2YXJpYWJsZUIpIHtcbiAgICAgIG1ldGF2YXJpYWJsZVVuaWZpZWRXaXRoRnJhbWUgPSB0cnVlO1xuICAgIH0gZWxzZSB7XG4gICAgICBjb25zdCBmcmFtZU5vZGUgPSBmcmFtZU5vZGVCLCAvLy9cbiAgICAgICAgICAgIG1ldGF2YXJpYWJsZU5vZGUgPSBtZXRhdmFyaWFibGVOb2RlQSwgLy8vXG4gICAgICAgICAgICBmcmFtZUZvck1ldGF2YXJpYWJsZVN1YnN0aXR1dGlvbiA9IEZyYW1lRm9yTWV0YXZhcmlhYmxlU3Vic3RpdHV0aW9uLmZyb21GcmFtZU5vZGVBbmRNZXRhdmFyaWFibGVOb2RlKGZyYW1lTm9kZSwgbWV0YXZhcmlhYmxlTm9kZSksXG4gICAgICAgICAgICBzdWJzdGl0dXRpb24gPSBmcmFtZUZvck1ldGF2YXJpYWJsZVN1YnN0aXR1dGlvbjsgIC8vL1xuXG4gICAgICBzdWJzdGl0dXRpb25zLmFkZFN1YnN0aXR1dGlvbihzdWJzdGl0dXRpb24sIGxvY2FsQ29udGV4dEEsIGxvY2FsQ29udGV4dEIpO1xuXG4gICAgICBtZXRhdmFyaWFibGVVbmlmaWVkV2l0aEZyYW1lID0gdHJ1ZTtcbiAgICB9XG4gIH1cblxuICByZXR1cm4gbWV0YXZhcmlhYmxlVW5pZmllZFdpdGhGcmFtZTtcbn1cbiJdLCJuYW1lcyI6WyJ1bmlmeU1ldGF2YXJpYWJsZVdpdGhGcmFtZSIsIm1ldGF2YXJpYWJsZU5vZGVBIiwiZnJhbWVOb2RlQiIsInN1YnN0aXR1dGlvbnMiLCJsb2NhbENvbnRleHRBIiwibG9jYWxDb250ZXh0QiIsIm1ldGF2YXJpYWJsZVVuaWZpZWRXaXRoRnJhbWUiLCJzaW1wbGVTdWJzdGl0dXRpb24iLCJmaW5kU2ltcGxlU3Vic3RpdHV0aW9uQnlNZXRhdmFyaWFibGVOb2RlIiwic3Vic3RpdHV0aW9uIiwiZnJhbWVOb2RlTWF0Y2hlcyIsIm1hdGNoRnJhbWVOb2RlIiwibWV0YXZhcmlhYmxlQSIsImZpbmRNZXRhdmFyaWFibGVCeU1ldGF2YXJpYWJsZU5vZGUiLCJtZXRhdmFyaWFibGVCIiwibWV0YXZhcmlhYmxlRnJvbUZyYW1lTm9kZSIsImZyYW1lTm9kZSIsIm1ldGF2YXJpYWJsZU5vZGUiLCJmcmFtZUZvck1ldGF2YXJpYWJsZVN1YnN0aXR1dGlvbiIsIkZyYW1lRm9yTWV0YXZhcmlhYmxlU3Vic3RpdHV0aW9uIiwiZnJvbUZyYW1lTm9kZUFuZE1ldGF2YXJpYWJsZU5vZGUiLCJhZGRTdWJzdGl0dXRpb24iXSwibWFwcGluZ3MiOiJBQUFBOzs7OytCQU1BOzs7ZUFBd0JBOzs7MkVBSnFCO3FCQUVIOzs7Ozs7QUFFM0IsU0FBU0EsMkJBQTJCQyxpQkFBaUIsRUFBRUMsVUFBVSxFQUFFQyxhQUFhLEVBQUVDLGFBQWEsRUFBRUMsYUFBYTtJQUMzSCxJQUFJQywrQkFBK0I7SUFFbkMsSUFBTUMscUJBQXFCSixjQUFjSyx3Q0FBd0MsQ0FBQ1Asb0JBQzVFUSxlQUFlRixvQkFBcUIsR0FBRztJQUU3QyxJQUFJRSxpQkFBaUIsTUFBTTtRQUN6QixJQUFNQyxtQkFBbUJELGFBQWFFLGNBQWMsQ0FBQ1Q7UUFFckQsSUFBSVEsa0JBQWtCO1lBQ3BCSiwrQkFBK0I7UUFDakM7SUFDRixPQUFPO1FBQ0wsSUFBTU0sZ0JBQWdCUixjQUFjUyxrQ0FBa0MsQ0FBQ1osb0JBQ2pFYSxnQkFBZ0JDLElBQUFBLGdDQUF5QixFQUFDYixZQUFZRztRQUU1RCxJQUFJTyxrQkFBa0JFLGVBQWU7WUFDbkNSLCtCQUErQjtRQUNqQyxPQUFPO1lBQ0wsSUFBTVUsWUFBWWQsWUFDWmUsbUJBQW1CaEIsbUJBQ25CaUIsbUNBQW1DQyw2QkFBZ0MsQ0FBQ0MsZ0NBQWdDLENBQUNKLFdBQVdDLG1CQUNoSFIsZ0JBQWVTLGtDQUFtQyxHQUFHO1lBRTNEZixjQUFja0IsZUFBZSxDQUFDWixlQUFjTCxlQUFlQztZQUUzREMsK0JBQStCO1FBQ2pDO0lBQ0Y7SUFFQSxPQUFPQTtBQUNUIn0=
40
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91bmlmeS9tZXRhdmFyaWFibGVXaXRoRnJhbWUuanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmltcG9ydCBGcmFtZUZvck1ldGF2YXJpYWJsZVN1YnN0aXR1dGlvbiBmcm9tIFwiLi4vc3Vic3RpdHV0aW9uL2ZyYW1lRm9yTWV0YXZhcmlhYmxlXCI7XG5cbmltcG9ydCB7IG1ldGF2YXJpYWJsZUZyb21GcmFtZU5vZGUgfSBmcm9tIFwiLi4vdXRpbGl0aWVzL3VuaWZ5XCI7XG5pbXBvcnQge21ldGF2YXJpYWJsZU5hbWVGcm9tTWV0YXZhcmlhYmxlTm9kZX0gZnJvbSBcIi4uL3V0aWxpdGllcy9uYW1lXCI7XG5cbmV4cG9ydCBkZWZhdWx0IGZ1bmN0aW9uIHVuaWZ5TWV0YXZhcmlhYmxlV2l0aEZyYW1lKG1ldGF2YXJpYWJsZU5vZGVBLCBmcmFtZU5vZGVCLCBzdWJzdGl0dXRpb25zLCBsb2NhbENvbnRleHRBLCBsb2NhbENvbnRleHRCKSB7XG4gIGxldCBtZXRhdmFyaWFibGVVbmlmaWVkV2l0aEZyYW1lID0gZmFsc2U7XG5cbiAgY29uc3Qgc2ltcGxlU3Vic3RpdHV0aW9uID0gc3Vic3RpdHV0aW9ucy5maW5kU2ltcGxlU3Vic3RpdHV0aW9uQnlNZXRhdmFyaWFibGVOb2RlKG1ldGF2YXJpYWJsZU5vZGVBKSxcbiAgICAgICAgc3Vic3RpdHV0aW9uID0gc2ltcGxlU3Vic3RpdHV0aW9uOyAgLy8vXG5cbiAgaWYgKHN1YnN0aXR1dGlvbiAhPT0gbnVsbCkge1xuICAgIGNvbnN0IGZyYW1lTm9kZU1hdGNoZXMgPSBzdWJzdGl0dXRpb24ubWF0Y2hGcmFtZU5vZGUoZnJhbWVOb2RlQik7XG5cbiAgICBpZiAoZnJhbWVOb2RlTWF0Y2hlcykge1xuICAgICAgbWV0YXZhcmlhYmxlVW5pZmllZFdpdGhGcmFtZSA9IHRydWU7XG4gICAgfVxuICB9IGVsc2Uge1xuICAgIGNvbnN0IG1ldGF2YXJpYWJsZU5hbWVBID0gbWV0YXZhcmlhYmxlTmFtZUZyb21NZXRhdmFyaWFibGVOb2RlKG1ldGF2YXJpYWJsZU5vZGVBKSxcbiAgICAgICAgICBtZXRhdmFyaWFibGVBID0gbG9jYWxDb250ZXh0QS5maW5kTWV0YXZhcmlhYmxlQnlNZXRhdmFyaWFibGVOYW1lKG1ldGF2YXJpYWJsZU5hbWVBKSxcbiAgICAgICAgICBtZXRhdmFyaWFibGVCID0gbWV0YXZhcmlhYmxlRnJvbUZyYW1lTm9kZShmcmFtZU5vZGVCLCBsb2NhbENvbnRleHRCKTtcblxuICAgIGlmIChtZXRhdmFyaWFibGVBID09PSBtZXRhdmFyaWFibGVCKSB7XG4gICAgICBtZXRhdmFyaWFibGVVbmlmaWVkV2l0aEZyYW1lID0gdHJ1ZTtcbiAgICB9IGVsc2Uge1xuICAgICAgY29uc3QgZnJhbWVOb2RlID0gZnJhbWVOb2RlQiwgLy8vXG4gICAgICAgICAgICBtZXRhdmFyaWFibGVOb2RlID0gbWV0YXZhcmlhYmxlTm9kZUEsIC8vL1xuICAgICAgICAgICAgZnJhbWVGb3JNZXRhdmFyaWFibGVTdWJzdGl0dXRpb24gPSBGcmFtZUZvck1ldGF2YXJpYWJsZVN1YnN0aXR1dGlvbi5mcm9tRnJhbWVOb2RlQW5kTWV0YXZhcmlhYmxlTm9kZShmcmFtZU5vZGUsIG1ldGF2YXJpYWJsZU5vZGUpLFxuICAgICAgICAgICAgc3Vic3RpdHV0aW9uID0gZnJhbWVGb3JNZXRhdmFyaWFibGVTdWJzdGl0dXRpb247ICAvLy9cblxuICAgICAgc3Vic3RpdHV0aW9ucy5hZGRTdWJzdGl0dXRpb24oc3Vic3RpdHV0aW9uLCBsb2NhbENvbnRleHRBLCBsb2NhbENvbnRleHRCKTtcblxuICAgICAgbWV0YXZhcmlhYmxlVW5pZmllZFdpdGhGcmFtZSA9IHRydWU7XG4gICAgfVxuICB9XG5cbiAgcmV0dXJuIG1ldGF2YXJpYWJsZVVuaWZpZWRXaXRoRnJhbWU7XG59XG4iXSwibmFtZXMiOlsidW5pZnlNZXRhdmFyaWFibGVXaXRoRnJhbWUiLCJtZXRhdmFyaWFibGVOb2RlQSIsImZyYW1lTm9kZUIiLCJzdWJzdGl0dXRpb25zIiwibG9jYWxDb250ZXh0QSIsImxvY2FsQ29udGV4dEIiLCJtZXRhdmFyaWFibGVVbmlmaWVkV2l0aEZyYW1lIiwic2ltcGxlU3Vic3RpdHV0aW9uIiwiZmluZFNpbXBsZVN1YnN0aXR1dGlvbkJ5TWV0YXZhcmlhYmxlTm9kZSIsInN1YnN0aXR1dGlvbiIsImZyYW1lTm9kZU1hdGNoZXMiLCJtYXRjaEZyYW1lTm9kZSIsIm1ldGF2YXJpYWJsZU5hbWVBIiwibWV0YXZhcmlhYmxlTmFtZUZyb21NZXRhdmFyaWFibGVOb2RlIiwibWV0YXZhcmlhYmxlQSIsImZpbmRNZXRhdmFyaWFibGVCeU1ldGF2YXJpYWJsZU5hbWUiLCJtZXRhdmFyaWFibGVCIiwibWV0YXZhcmlhYmxlRnJvbUZyYW1lTm9kZSIsImZyYW1lTm9kZSIsIm1ldGF2YXJpYWJsZU5vZGUiLCJmcmFtZUZvck1ldGF2YXJpYWJsZVN1YnN0aXR1dGlvbiIsIkZyYW1lRm9yTWV0YXZhcmlhYmxlU3Vic3RpdHV0aW9uIiwiZnJvbUZyYW1lTm9kZUFuZE1ldGF2YXJpYWJsZU5vZGUiLCJhZGRTdWJzdGl0dXRpb24iXSwibWFwcGluZ3MiOiJBQUFBOzs7OytCQU9BOzs7ZUFBd0JBOzs7MkVBTHFCO3FCQUVIO29CQUNTOzs7Ozs7QUFFcEMsU0FBU0EsMkJBQTJCQyxpQkFBaUIsRUFBRUMsVUFBVSxFQUFFQyxhQUFhLEVBQUVDLGFBQWEsRUFBRUMsYUFBYTtJQUMzSCxJQUFJQywrQkFBK0I7SUFFbkMsSUFBTUMscUJBQXFCSixjQUFjSyx3Q0FBd0MsQ0FBQ1Asb0JBQzVFUSxlQUFlRixvQkFBcUIsR0FBRztJQUU3QyxJQUFJRSxpQkFBaUIsTUFBTTtRQUN6QixJQUFNQyxtQkFBbUJELGFBQWFFLGNBQWMsQ0FBQ1Q7UUFFckQsSUFBSVEsa0JBQWtCO1lBQ3BCSiwrQkFBK0I7UUFDakM7SUFDRixPQUFPO1FBQ0wsSUFBTU0sb0JBQW9CQyxJQUFBQSwwQ0FBb0MsRUFBQ1osb0JBQ3pEYSxnQkFBZ0JWLGNBQWNXLGtDQUFrQyxDQUFDSCxvQkFDakVJLGdCQUFnQkMsSUFBQUEsZ0NBQXlCLEVBQUNmLFlBQVlHO1FBRTVELElBQUlTLGtCQUFrQkUsZUFBZTtZQUNuQ1YsK0JBQStCO1FBQ2pDLE9BQU87WUFDTCxJQUFNWSxZQUFZaEIsWUFDWmlCLG1CQUFtQmxCLG1CQUNuQm1CLG1DQUFtQ0MsNkJBQWdDLENBQUNDLGdDQUFnQyxDQUFDSixXQUFXQyxtQkFDaEhWLGdCQUFlVyxrQ0FBbUMsR0FBRztZQUUzRGpCLGNBQWNvQixlQUFlLENBQUNkLGVBQWNMLGVBQWVDO1lBRTNEQywrQkFBK0I7UUFDakM7SUFDRjtJQUVBLE9BQU9BO0FBQ1QifQ==
package/lib/unify/metavariableWithStatement.js CHANGED
@@ -10,6 +10,7 @@ Object.defineProperty(exports, "default", {
10
10
  });
11
11
  var _statementForMetavariable = /*#__PURE__*/ _interop_require_default(require("../substitution/statementForMetavariable"));
12
12
  var _unify = require("../utilities/unify");
13
+ var _name = require("../utilities/name");
13
14
  function _interop_require_default(obj) {
14
15
  return obj && obj.__esModule ? obj : {
15
16
  default: obj
@@ -24,7 +25,7 @@ function unifyMetavariableWithStatement(metavariableNodeA, statementNodeB, subst
24
25
  metavariableUnifiedWithStatement = true;
25
26
  }
26
27
  } else {
27
- var metavariableA = localContextA.findMetavariableByMetavariableNode(metavariableNodeA), metavariableB = (0, _unify.metavariableFromStatementNode)(statementNodeB, localContextB);
28
+ var metavariableNameA = (0, _name.metavariableNameFromMetavariableNode)(metavariableNodeA), metavariableA = localContextA.findMetavariableByMetavariableName(metavariableNameA), metavariableB = (0, _unify.metavariableFromStatementNode)(statementNodeB, localContextB);
28
29
  if (metavariableA === metavariableB) {
29
30
  metavariableUnifiedWithStatement = true;
30
31
  } else {
@@ -36,4 +37,4 @@ function unifyMetavariableWithStatement(metavariableNodeA, statementNodeB, subst
36
37
  return metavariableUnifiedWithStatement;
37
38
  }
38
39
 
39
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91bmlmeS9tZXRhdmFyaWFibGVXaXRoU3RhdGVtZW50LmpzIl0sInNvdXJjZXNDb250ZW50IjpbIlwidXNlIHN0cmljdFwiO1xuXG5pbXBvcnQgU3RhdGVtZW50Rm9yTWV0YXZhcmlhYmxlU3Vic3RpdHV0aW9uIGZyb20gXCIuLi9zdWJzdGl0dXRpb24vc3RhdGVtZW50Rm9yTWV0YXZhcmlhYmxlXCI7XG5cbmltcG9ydCB7IG1ldGF2YXJpYWJsZUZyb21TdGF0ZW1lbnROb2RlIH0gZnJvbSBcIi4uL3V0aWxpdGllcy91bmlmeVwiO1xuXG5leHBvcnQgZGVmYXVsdCBmdW5jdGlvbiB1bmlmeU1ldGF2YXJpYWJsZVdpdGhTdGF0ZW1lbnQobWV0YXZhcmlhYmxlTm9kZUEsIHN0YXRlbWVudE5vZGVCLCBzdWJzdGl0dXRpb25zLCBsb2NhbENvbnRleHRBLCBsb2NhbENvbnRleHRCKSB7XG4gIGxldCBtZXRhdmFyaWFibGVVbmlmaWVkV2l0aFN0YXRlbWVudCA9IGZhbHNlO1xuXG4gIGNvbnN0IHNpbXBsZVN1YnN0aXR1dGlvbiA9IHN1YnN0aXR1dGlvbnMuZmluZFNpbXBsZVN1YnN0aXR1dGlvbkJ5TWV0YXZhcmlhYmxlTm9kZShtZXRhdmFyaWFibGVOb2RlQSksXG4gICAgICAgIHN1YnN0aXR1dGlvbiA9IHNpbXBsZVN1YnN0aXR1dGlvbjsgIC8vL1xuXG4gIGlmIChzdWJzdGl0dXRpb24gIT09IG51bGwpIHtcbiAgICBjb25zdCBzdGF0ZW1lbnROb2RlTWF0Y2hlcyA9IHN1YnN0aXR1dGlvbi5tYXRjaFN0YXRlbWVudE5vZGUoc3RhdGVtZW50Tm9kZUIpO1xuXG4gICAgaWYgKHN0YXRlbWVudE5vZGVNYXRjaGVzKSB7XG4gICAgICBtZXRhdmFyaWFibGVVbmlmaWVkV2l0aFN0YXRlbWVudCA9IHRydWU7XG4gICAgfVxuICB9IGVsc2Uge1xuICAgIGNvbnN0IG1ldGF2YXJpYWJsZUEgPSBsb2NhbENvbnRleHRBLmZpbmRNZXRhdmFyaWFibGVCeU1ldGF2YXJpYWJsZU5vZGUobWV0YXZhcmlhYmxlTm9kZUEpLFxuICAgICAgICAgIG1ldGF2YXJpYWJsZUIgPSBtZXRhdmFyaWFibGVGcm9tU3RhdGVtZW50Tm9kZShzdGF0ZW1lbnROb2RlQiwgbG9jYWxDb250ZXh0Qik7XG5cbiAgICBpZiAobWV0YXZhcmlhYmxlQSA9PT0gbWV0YXZhcmlhYmxlQikge1xuICAgICAgbWV0YXZhcmlhYmxlVW5pZmllZFdpdGhTdGF0ZW1lbnQgPSB0cnVlO1xuICAgIH0gZWxzZSB7XG4gICAgICBjb25zdCBzdGF0ZW1lbnROb2RlID0gc3RhdGVtZW50Tm9kZUIsIC8vL1xuICAgICAgICAgICAgbWV0YXZhcmlhYmxlTm9kZSA9IG1ldGF2YXJpYWJsZU5vZGVBLCAvLy9cbiAgICAgICAgICAgIHN0YXRlbWVudEZvck1ldGF2YXJpYWJsZVN1YnN0aXR1dGlvbiA9IFN0YXRlbWVudEZvck1ldGF2YXJpYWJsZVN1YnN0aXR1dGlvbi5mcm9tU3RhdGVtZW50Tm9kZUFuZE1ldGF2YXJpYWJsZU5vZGUoc3RhdGVtZW50Tm9kZSwgbWV0YXZhcmlhYmxlTm9kZSksXG4gICAgICAgICAgICBzdWJzdGl0dXRpb24gPSBzdGF0ZW1lbnRGb3JNZXRhdmFyaWFibGVTdWJzdGl0dXRpb247ICAvLy9cblxuICAgICAgc3Vic3RpdHV0aW9ucy5hZGRTdWJzdGl0dXRpb24oc3Vic3RpdHV0aW9uLCBsb2NhbENvbnRleHRBLCBsb2NhbENvbnRleHRCKTtcblxuICAgICAgbWV0YXZhcmlhYmxlVW5pZmllZFdpdGhTdGF0ZW1lbnQgPSB0cnVlO1xuICAgIH1cbiAgfVxuXG4gIHJldHVybiBtZXRhdmFyaWFibGVVbmlmaWVkV2l0aFN0YXRlbWVudDtcbn1cbiJdLCJuYW1lcyI6WyJ1bmlmeU1ldGF2YXJpYWJsZVdpdGhTdGF0ZW1lbnQiLCJtZXRhdmFyaWFibGVOb2RlQSIsInN0YXRlbWVudE5vZGVCIiwic3Vic3RpdHV0aW9ucyIsImxvY2FsQ29udGV4dEEiLCJsb2NhbENvbnRleHRCIiwibWV0YXZhcmlhYmxlVW5pZmllZFdpdGhTdGF0ZW1lbnQiLCJzaW1wbGVTdWJzdGl0dXRpb24iLCJmaW5kU2ltcGxlU3Vic3RpdHV0aW9uQnlNZXRhdmFyaWFibGVOb2RlIiwic3Vic3RpdHV0aW9uIiwic3RhdGVtZW50Tm9kZU1hdGNoZXMiLCJtYXRjaFN0YXRlbWVudE5vZGUiLCJtZXRhdmFyaWFibGVBIiwiZmluZE1ldGF2YXJpYWJsZUJ5TWV0YXZhcmlhYmxlTm9kZSIsIm1ldGF2YXJpYWJsZUIiLCJtZXRhdmFyaWFibGVGcm9tU3RhdGVtZW50Tm9kZSIsInN0YXRlbWVudE5vZGUiLCJtZXRhdmFyaWFibGVOb2RlIiwic3RhdGVtZW50Rm9yTWV0YXZhcmlhYmxlU3Vic3RpdHV0aW9uIiwiU3RhdGVtZW50Rm9yTWV0YXZhcmlhYmxlU3Vic3RpdHV0aW9uIiwiZnJvbVN0YXRlbWVudE5vZGVBbmRNZXRhdmFyaWFibGVOb2RlIiwiYWRkU3Vic3RpdHV0aW9uIl0sIm1hcHBpbmdzIjoiQUFBQTs7OzsrQkFNQTs7O2VBQXdCQTs7OytFQUp5QjtxQkFFSDs7Ozs7O0FBRS9CLFNBQVNBLCtCQUErQkMsaUJBQWlCLEVBQUVDLGNBQWMsRUFBRUMsYUFBYSxFQUFFQyxhQUFhLEVBQUVDLGFBQWE7SUFDbkksSUFBSUMsbUNBQW1DO0lBRXZDLElBQU1DLHFCQUFxQkosY0FBY0ssd0NBQXdDLENBQUNQLG9CQUM1RVEsZUFBZUYsb0JBQXFCLEdBQUc7SUFFN0MsSUFBSUUsaUJBQWlCLE1BQU07UUFDekIsSUFBTUMsdUJBQXVCRCxhQUFhRSxrQkFBa0IsQ0FBQ1Q7UUFFN0QsSUFBSVEsc0JBQXNCO1lBQ3hCSixtQ0FBbUM7UUFDckM7SUFDRixPQUFPO1FBQ0wsSUFBTU0sZ0JBQWdCUixjQUFjUyxrQ0FBa0MsQ0FBQ1osb0JBQ2pFYSxnQkFBZ0JDLElBQUFBLG9DQUE2QixFQUFDYixnQkFBZ0JHO1FBRXBFLElBQUlPLGtCQUFrQkUsZUFBZTtZQUNuQ1IsbUNBQW1DO1FBQ3JDLE9BQU87WUFDTCxJQUFNVSxnQkFBZ0JkLGdCQUNoQmUsbUJBQW1CaEIsbUJBQ25CaUIsdUNBQXVDQyxpQ0FBb0MsQ0FBQ0Msb0NBQW9DLENBQUNKLGVBQWVDLG1CQUNoSVIsZ0JBQWVTLHNDQUF1QyxHQUFHO1lBRS9EZixjQUFja0IsZUFBZSxDQUFDWixlQUFjTCxlQUFlQztZQUUzREMsbUNBQW1DO1FBQ3JDO0lBQ0Y7SUFFQSxPQUFPQTtBQUNUIn0=
40
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91bmlmeS9tZXRhdmFyaWFibGVXaXRoU3RhdGVtZW50LmpzIl0sInNvdXJjZXNDb250ZW50IjpbIlwidXNlIHN0cmljdFwiO1xuXG5pbXBvcnQgU3RhdGVtZW50Rm9yTWV0YXZhcmlhYmxlU3Vic3RpdHV0aW9uIGZyb20gXCIuLi9zdWJzdGl0dXRpb24vc3RhdGVtZW50Rm9yTWV0YXZhcmlhYmxlXCI7XG5cbmltcG9ydCB7IG1ldGF2YXJpYWJsZUZyb21TdGF0ZW1lbnROb2RlIH0gZnJvbSBcIi4uL3V0aWxpdGllcy91bmlmeVwiO1xuaW1wb3J0IHttZXRhdmFyaWFibGVOYW1lRnJvbU1ldGF2YXJpYWJsZU5vZGV9IGZyb20gXCIuLi91dGlsaXRpZXMvbmFtZVwiO1xuXG5leHBvcnQgZGVmYXVsdCBmdW5jdGlvbiB1bmlmeU1ldGF2YXJpYWJsZVdpdGhTdGF0ZW1lbnQobWV0YXZhcmlhYmxlTm9kZUEsIHN0YXRlbWVudE5vZGVCLCBzdWJzdGl0dXRpb25zLCBsb2NhbENvbnRleHRBLCBsb2NhbENvbnRleHRCKSB7XG4gIGxldCBtZXRhdmFyaWFibGVVbmlmaWVkV2l0aFN0YXRlbWVudCA9IGZhbHNlO1xuXG4gIGNvbnN0IHNpbXBsZVN1YnN0aXR1dGlvbiA9IHN1YnN0aXR1dGlvbnMuZmluZFNpbXBsZVN1YnN0aXR1dGlvbkJ5TWV0YXZhcmlhYmxlTm9kZShtZXRhdmFyaWFibGVOb2RlQSksXG4gICAgICAgIHN1YnN0aXR1dGlvbiA9IHNpbXBsZVN1YnN0aXR1dGlvbjsgIC8vL1xuXG4gIGlmIChzdWJzdGl0dXRpb24gIT09IG51bGwpIHtcbiAgICBjb25zdCBzdGF0ZW1lbnROb2RlTWF0Y2hlcyA9IHN1YnN0aXR1dGlvbi5tYXRjaFN0YXRlbWVudE5vZGUoc3RhdGVtZW50Tm9kZUIpO1xuXG4gICAgaWYgKHN0YXRlbWVudE5vZGVNYXRjaGVzKSB7XG4gICAgICBtZXRhdmFyaWFibGVVbmlmaWVkV2l0aFN0YXRlbWVudCA9IHRydWU7XG4gICAgfVxuICB9IGVsc2Uge1xuICAgIGNvbnN0IG1ldGF2YXJpYWJsZU5hbWVBID0gbWV0YXZhcmlhYmxlTmFtZUZyb21NZXRhdmFyaWFibGVOb2RlKG1ldGF2YXJpYWJsZU5vZGVBKSxcbiAgICAgICAgICBtZXRhdmFyaWFibGVBID0gbG9jYWxDb250ZXh0QS5maW5kTWV0YXZhcmlhYmxlQnlNZXRhdmFyaWFibGVOYW1lKG1ldGF2YXJpYWJsZU5hbWVBKSxcbiAgICAgICAgICBtZXRhdmFyaWFibGVCID0gbWV0YXZhcmlhYmxlRnJvbVN0YXRlbWVudE5vZGUoc3RhdGVtZW50Tm9kZUIsIGxvY2FsQ29udGV4dEIpO1xuXG4gICAgaWYgKG1ldGF2YXJpYWJsZUEgPT09IG1ldGF2YXJpYWJsZUIpIHtcbiAgICAgIG1ldGF2YXJpYWJsZVVuaWZpZWRXaXRoU3RhdGVtZW50ID0gdHJ1ZTtcbiAgICB9IGVsc2Uge1xuICAgICAgY29uc3Qgc3RhdGVtZW50Tm9kZSA9IHN0YXRlbWVudE5vZGVCLCAvLy9cbiAgICAgICAgICAgIG1ldGF2YXJpYWJsZU5vZGUgPSBtZXRhdmFyaWFibGVOb2RlQSwgLy8vXG4gICAgICAgICAgICBzdGF0ZW1lbnRGb3JNZXRhdmFyaWFibGVTdWJzdGl0dXRpb24gPSBTdGF0ZW1lbnRGb3JNZXRhdmFyaWFibGVTdWJzdGl0dXRpb24uZnJvbVN0YXRlbWVudE5vZGVBbmRNZXRhdmFyaWFibGVOb2RlKHN0YXRlbWVudE5vZGUsIG1ldGF2YXJpYWJsZU5vZGUpLFxuICAgICAgICAgICAgc3Vic3RpdHV0aW9uID0gc3RhdGVtZW50Rm9yTWV0YXZhcmlhYmxlU3Vic3RpdHV0aW9uOyAgLy8vXG5cbiAgICAgIHN1YnN0aXR1dGlvbnMuYWRkU3Vic3RpdHV0aW9uKHN1YnN0aXR1dGlvbiwgbG9jYWxDb250ZXh0QSwgbG9jYWxDb250ZXh0Qik7XG5cbiAgICAgIG1ldGF2YXJpYWJsZVVuaWZpZWRXaXRoU3RhdGVtZW50ID0gdHJ1ZTtcbiAgICB9XG4gIH1cblxuICByZXR1cm4gbWV0YXZhcmlhYmxlVW5pZmllZFdpdGhTdGF0ZW1lbnQ7XG59XG4iXSwibmFtZXMiOlsidW5pZnlNZXRhdmFyaWFibGVXaXRoU3RhdGVtZW50IiwibWV0YXZhcmlhYmxlTm9kZUEiLCJzdGF0ZW1lbnROb2RlQiIsInN1YnN0aXR1dGlvbnMiLCJsb2NhbENvbnRleHRBIiwibG9jYWxDb250ZXh0QiIsIm1ldGF2YXJpYWJsZVVuaWZpZWRXaXRoU3RhdGVtZW50Iiwic2ltcGxlU3Vic3RpdHV0aW9uIiwiZmluZFNpbXBsZVN1YnN0aXR1dGlvbkJ5TWV0YXZhcmlhYmxlTm9kZSIsInN1YnN0aXR1dGlvbiIsInN0YXRlbWVudE5vZGVNYXRjaGVzIiwibWF0Y2hTdGF0ZW1lbnROb2RlIiwibWV0YXZhcmlhYmxlTmFtZUEiLCJtZXRhdmFyaWFibGVOYW1lRnJvbU1ldGF2YXJpYWJsZU5vZGUiLCJtZXRhdmFyaWFibGVBIiwiZmluZE1ldGF2YXJpYWJsZUJ5TWV0YXZhcmlhYmxlTmFtZSIsIm1ldGF2YXJpYWJsZUIiLCJtZXRhdmFyaWFibGVGcm9tU3RhdGVtZW50Tm9kZSIsInN0YXRlbWVudE5vZGUiLCJtZXRhdmFyaWFibGVOb2RlIiwic3RhdGVtZW50Rm9yTWV0YXZhcmlhYmxlU3Vic3RpdHV0aW9uIiwiU3RhdGVtZW50Rm9yTWV0YXZhcmlhYmxlU3Vic3RpdHV0aW9uIiwiZnJvbVN0YXRlbWVudE5vZGVBbmRNZXRhdmFyaWFibGVOb2RlIiwiYWRkU3Vic3RpdHV0aW9uIl0sIm1hcHBpbmdzIjoiQUFBQTs7OzsrQkFPQTs7O2VBQXdCQTs7OytFQUx5QjtxQkFFSDtvQkFDSzs7Ozs7O0FBRXBDLFNBQVNBLCtCQUErQkMsaUJBQWlCLEVBQUVDLGNBQWMsRUFBRUMsYUFBYSxFQUFFQyxhQUFhLEVBQUVDLGFBQWE7SUFDbkksSUFBSUMsbUNBQW1DO0lBRXZDLElBQU1DLHFCQUFxQkosY0FBY0ssd0NBQXdDLENBQUNQLG9CQUM1RVEsZUFBZUYsb0JBQXFCLEdBQUc7SUFFN0MsSUFBSUUsaUJBQWlCLE1BQU07UUFDekIsSUFBTUMsdUJBQXVCRCxhQUFhRSxrQkFBa0IsQ0FBQ1Q7UUFFN0QsSUFBSVEsc0JBQXNCO1lBQ3hCSixtQ0FBbUM7UUFDckM7SUFDRixPQUFPO1FBQ0wsSUFBTU0sb0JBQW9CQyxJQUFBQSwwQ0FBb0MsRUFBQ1osb0JBQ3pEYSxnQkFBZ0JWLGNBQWNXLGtDQUFrQyxDQUFDSCxvQkFDakVJLGdCQUFnQkMsSUFBQUEsb0NBQTZCLEVBQUNmLGdCQUFnQkc7UUFFcEUsSUFBSVMsa0JBQWtCRSxlQUFlO1lBQ25DVixtQ0FBbUM7UUFDckMsT0FBTztZQUNMLElBQU1ZLGdCQUFnQmhCLGdCQUNoQmlCLG1CQUFtQmxCLG1CQUNuQm1CLHVDQUF1Q0MsaUNBQW9DLENBQUNDLG9DQUFvQyxDQUFDSixlQUFlQyxtQkFDaElWLGdCQUFlVyxzQ0FBdUMsR0FBRztZQUUvRGpCLGNBQWNvQixlQUFlLENBQUNkLGVBQWNMLGVBQWVDO1lBRTNEQyxtQ0FBbUM7UUFDckM7SUFDRjtJQUVBLE9BQU9BO0FBQ1QifQ==
package/lib/unify/metavariableWithStatementGivenSubstitution.js CHANGED
@@ -10,6 +10,7 @@ Object.defineProperty(exports, "default", {
10
10
  });
11
11
  var _statementForMetavariable = /*#__PURE__*/ _interop_require_default(require("../substitution/statementForMetavariable"));
12
12
  var _unify = require("../utilities/unify");
13
+ var _name = require("../utilities/name");
13
14
  function _interop_require_default(obj) {
14
15
  return obj && obj.__esModule ? obj : {
15
16
  default: obj
@@ -24,7 +25,7 @@ function unifyMetavariableWithStatementGivenSubstitution(metavariableNodeA, stat
24
25
  metavariableUnifiedWithStatementGivenSubstitution = true;
25
26
  }
26
27
  } else {
27
- var metavariableA = localContextA.findMetavariableByMetavariableNode(metavariableNodeA), metavariableB = (0, _unify.metavariableFromStatementNode)(statementNodeB, localContextB);
28
+ var metavariableNameA = (0, _name.metavariableNameFromMetavariableNode)(metavariableNodeA), metavariableA = localContextA.findMetavariableByMetavariableName(metavariableNameA), metavariableB = (0, _unify.metavariableFromStatementNode)(statementNodeB, localContextB);
28
29
  if (metavariableA === metavariableB) {
29
30
  metavariableUnifiedWithStatementGivenSubstitution = false; ///
30
31
  } else {
@@ -36,4 +37,4 @@ function unifyMetavariableWithStatementGivenSubstitution(metavariableNodeA, stat
36
37
  return metavariableUnifiedWithStatementGivenSubstitution;
37
38
  }
38
39
 
39
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91bmlmeS9tZXRhdmFyaWFibGVXaXRoU3RhdGVtZW50R2l2ZW5TdWJzdGl0dXRpb24uanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmltcG9ydCBTdGF0ZW1lbnRGb3JNZXRhdmFyaWFibGVTdWJzdGl0dXRpb24gZnJvbSBcIi4uL3N1YnN0aXR1dGlvbi9zdGF0ZW1lbnRGb3JNZXRhdmFyaWFibGVcIjtcblxuaW1wb3J0IHsgbWV0YXZhcmlhYmxlRnJvbVN0YXRlbWVudE5vZGUgfSBmcm9tIFwiLi4vdXRpbGl0aWVzL3VuaWZ5XCI7XG5cbmV4cG9ydCBkZWZhdWx0IGZ1bmN0aW9uIHVuaWZ5TWV0YXZhcmlhYmxlV2l0aFN0YXRlbWVudEdpdmVuU3Vic3RpdHV0aW9uKG1ldGF2YXJpYWJsZU5vZGVBLCBzdGF0ZW1lbnROb2RlQiwgc3Vic3RpdHV0aW9uTm9kZUEsIHN1YnN0aXR1dGlvbnMsIGxvY2FsQ29udGV4dEEsIGxvY2FsQ29udGV4dEIpIHtcbiAgbGV0IG1ldGF2YXJpYWJsZVVuaWZpZWRXaXRoU3RhdGVtZW50R2l2ZW5TdWJzdGl0dXRpb24gPSBmYWxzZTtcblxuICBjb25zdCBjb21wbGV4U3Vic3RpdHV0aW9uID0gc3Vic3RpdHV0aW9ucy5maW5kQ29tcGxleFN1YnN0aXR1dGlvbkJ5TWV0YXZhcmlhYmxlTm9kZUFuZFN1YnN0aXR1dGlvbk5vZGUobWV0YXZhcmlhYmxlTm9kZUEsIHN1YnN0aXR1dGlvbk5vZGVBKSxcbiAgICAgICAgc3Vic3RpdHV0aW9uID0gY29tcGxleFN1YnN0aXR1dGlvbjsgLy8vXG5cbiAgaWYgKHN1YnN0aXR1dGlvbiAhPT0gbnVsbCkge1xuICAgIGNvbnN0IHN0YXRlbWVudE5vZGVNYXRjaGVzID0gc3Vic3RpdHV0aW9uLm1hdGNoU3RhdGVtZW50Tm9kZShzdGF0ZW1lbnROb2RlQik7XG5cbiAgICBpZiAoc3RhdGVtZW50Tm9kZU1hdGNoZXMpIHtcbiAgICAgIG1ldGF2YXJpYWJsZVVuaWZpZWRXaXRoU3RhdGVtZW50R2l2ZW5TdWJzdGl0dXRpb24gPSB0cnVlO1xuICAgIH1cbiAgfSBlbHNlIHtcbiAgICBjb25zdCBtZXRhdmFyaWFibGVBID0gbG9jYWxDb250ZXh0QS5maW5kTWV0YXZhcmlhYmxlQnlNZXRhdmFyaWFibGVOb2RlKG1ldGF2YXJpYWJsZU5vZGVBKSxcbiAgICAgICAgICBtZXRhdmFyaWFibGVCID0gbWV0YXZhcmlhYmxlRnJvbVN0YXRlbWVudE5vZGUoc3RhdGVtZW50Tm9kZUIsIGxvY2FsQ29udGV4dEIpO1xuXG4gICAgaWYgKG1ldGF2YXJpYWJsZUEgPT09IG1ldGF2YXJpYWJsZUIpIHtcbiAgICAgIG1ldGF2YXJpYWJsZVVuaWZpZWRXaXRoU3RhdGVtZW50R2l2ZW5TdWJzdGl0dXRpb24gPSBmYWxzZTsgIC8vL1xuICAgIH0gZWxzZSB7XG4gICAgICBjb25zdCBzdGF0ZW1lbnROb2RlID0gc3RhdGVtZW50Tm9kZUIsIC8vL1xuICAgICAgICAgICAgc3Vic3RpdHV0aW9uTm9kZSA9IHN1YnN0aXR1dGlvbk5vZGVBLCAvLy9cbiAgICAgICAgICAgIG1ldGF2YXJpYWJsZU5vZGUgPSBtZXRhdmFyaWFibGVOb2RlQSwgLy8vXG4gICAgICAgICAgICBzdGF0ZW1lbnRGb3JNZXRhdmFyaWFibGVTdWJzdGl0dXRpb24gPSBTdGF0ZW1lbnRGb3JNZXRhdmFyaWFibGVTdWJzdGl0dXRpb24uZnJvbVN0YXRlbWVudE5vZGVNZXRhdmFyaWFibGVOb2RlQW5kU3Vic3RpdHV0aW9uTm9kZShzdGF0ZW1lbnROb2RlLCBtZXRhdmFyaWFibGVOb2RlLCBzdWJzdGl0dXRpb25Ob2RlKSxcbiAgICAgICAgICAgIHN1YnN0aXR1dGlvbiA9IHN0YXRlbWVudEZvck1ldGF2YXJpYWJsZVN1YnN0aXR1dGlvbjsgIC8vL1xuXG4gICAgICBzdWJzdGl0dXRpb25zLmFkZFN1YnN0aXR1dGlvbihzdWJzdGl0dXRpb24sIGxvY2FsQ29udGV4dEEsIGxvY2FsQ29udGV4dEIpO1xuXG4gICAgICBtZXRhdmFyaWFibGVVbmlmaWVkV2l0aFN0YXRlbWVudEdpdmVuU3Vic3RpdHV0aW9uID0gdHJ1ZTtcbiAgICB9XG4gIH1cblxuICByZXR1cm4gbWV0YXZhcmlhYmxlVW5pZmllZFdpdGhTdGF0ZW1lbnRHaXZlblN1YnN0aXR1dGlvbjtcbn1cbiJdLCJuYW1lcyI6WyJ1bmlmeU1ldGF2YXJpYWJsZVdpdGhTdGF0ZW1lbnRHaXZlblN1YnN0aXR1dGlvbiIsIm1ldGF2YXJpYWJsZU5vZGVBIiwic3RhdGVtZW50Tm9kZUIiLCJzdWJzdGl0dXRpb25Ob2RlQSIsInN1YnN0aXR1dGlvbnMiLCJsb2NhbENvbnRleHRBIiwibG9jYWxDb250ZXh0QiIsIm1ldGF2YXJpYWJsZVVuaWZpZWRXaXRoU3RhdGVtZW50R2l2ZW5TdWJzdGl0dXRpb24iLCJjb21wbGV4U3Vic3RpdHV0aW9uIiwiZmluZENvbXBsZXhTdWJzdGl0dXRpb25CeU1ldGF2YXJpYWJsZU5vZGVBbmRTdWJzdGl0dXRpb25Ob2RlIiwic3Vic3RpdHV0aW9uIiwic3RhdGVtZW50Tm9kZU1hdGNoZXMiLCJtYXRjaFN0YXRlbWVudE5vZGUiLCJtZXRhdmFyaWFibGVBIiwiZmluZE1ldGF2YXJpYWJsZUJ5TWV0YXZhcmlhYmxlTm9kZSIsIm1ldGF2YXJpYWJsZUIiLCJtZXRhdmFyaWFibGVGcm9tU3RhdGVtZW50Tm9kZSIsInN0YXRlbWVudE5vZGUiLCJzdWJzdGl0dXRpb25Ob2RlIiwibWV0YXZhcmlhYmxlTm9kZSIsInN0YXRlbWVudEZvck1ldGF2YXJpYWJsZVN1YnN0aXR1dGlvbiIsIlN0YXRlbWVudEZvck1ldGF2YXJpYWJsZVN1YnN0aXR1dGlvbiIsImZyb21TdGF0ZW1lbnROb2RlTWV0YXZhcmlhYmxlTm9kZUFuZFN1YnN0aXR1dGlvbk5vZGUiLCJhZGRTdWJzdGl0dXRpb24iXSwibWFwcGluZ3MiOiJBQUFBOzs7OytCQU1BOzs7ZUFBd0JBOzs7K0VBSnlCO3FCQUVIOzs7Ozs7QUFFL0IsU0FBU0EsZ0RBQWdEQyxpQkFBaUIsRUFBRUMsY0FBYyxFQUFFQyxpQkFBaUIsRUFBRUMsYUFBYSxFQUFFQyxhQUFhLEVBQUVDLGFBQWE7SUFDdkssSUFBSUMsb0RBQW9EO0lBRXhELElBQU1DLHNCQUFzQkosY0FBY0ssNERBQTRELENBQUNSLG1CQUFtQkUsb0JBQ3BITyxlQUFlRixxQkFBcUIsR0FBRztJQUU3QyxJQUFJRSxpQkFBaUIsTUFBTTtRQUN6QixJQUFNQyx1QkFBdUJELGFBQWFFLGtCQUFrQixDQUFDVjtRQUU3RCxJQUFJUyxzQkFBc0I7WUFDeEJKLG9EQUFvRDtRQUN0RDtJQUNGLE9BQU87UUFDTCxJQUFNTSxnQkFBZ0JSLGNBQWNTLGtDQUFrQyxDQUFDYixvQkFDakVjLGdCQUFnQkMsSUFBQUEsb0NBQTZCLEVBQUNkLGdCQUFnQkk7UUFFcEUsSUFBSU8sa0JBQWtCRSxlQUFlO1lBQ25DUixvREFBb0QsT0FBUSxHQUFHO1FBQ2pFLE9BQU87WUFDTCxJQUFNVSxnQkFBZ0JmLGdCQUNoQmdCLG1CQUFtQmYsbUJBQ25CZ0IsbUJBQW1CbEIsbUJBQ25CbUIsdUNBQXVDQyxpQ0FBb0MsQ0FBQ0Msb0RBQW9ELENBQUNMLGVBQWVFLGtCQUFrQkQsbUJBQ2xLUixnQkFBZVUsc0NBQXVDLEdBQUc7WUFFL0RoQixjQUFjbUIsZUFBZSxDQUFDYixlQUFjTCxlQUFlQztZQUUzREMsb0RBQW9EO1FBQ3REO0lBQ0Y7SUFFQSxPQUFPQTtBQUNUIn0=
40
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91bmlmeS9tZXRhdmFyaWFibGVXaXRoU3RhdGVtZW50R2l2ZW5TdWJzdGl0dXRpb24uanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmltcG9ydCBTdGF0ZW1lbnRGb3JNZXRhdmFyaWFibGVTdWJzdGl0dXRpb24gZnJvbSBcIi4uL3N1YnN0aXR1dGlvbi9zdGF0ZW1lbnRGb3JNZXRhdmFyaWFibGVcIjtcblxuaW1wb3J0IHsgbWV0YXZhcmlhYmxlRnJvbVN0YXRlbWVudE5vZGUgfSBmcm9tIFwiLi4vdXRpbGl0aWVzL3VuaWZ5XCI7XG5pbXBvcnQge21ldGF2YXJpYWJsZU5hbWVGcm9tTWV0YXZhcmlhYmxlTm9kZX0gZnJvbSBcIi4uL3V0aWxpdGllcy9uYW1lXCI7XG5cbmV4cG9ydCBkZWZhdWx0IGZ1bmN0aW9uIHVuaWZ5TWV0YXZhcmlhYmxlV2l0aFN0YXRlbWVudEdpdmVuU3Vic3RpdHV0aW9uKG1ldGF2YXJpYWJsZU5vZGVBLCBzdGF0ZW1lbnROb2RlQiwgc3Vic3RpdHV0aW9uTm9kZUEsIHN1YnN0aXR1dGlvbnMsIGxvY2FsQ29udGV4dEEsIGxvY2FsQ29udGV4dEIpIHtcbiAgbGV0IG1ldGF2YXJpYWJsZVVuaWZpZWRXaXRoU3RhdGVtZW50R2l2ZW5TdWJzdGl0dXRpb24gPSBmYWxzZTtcblxuICBjb25zdCBjb21wbGV4U3Vic3RpdHV0aW9uID0gc3Vic3RpdHV0aW9ucy5maW5kQ29tcGxleFN1YnN0aXR1dGlvbkJ5TWV0YXZhcmlhYmxlTm9kZUFuZFN1YnN0aXR1dGlvbk5vZGUobWV0YXZhcmlhYmxlTm9kZUEsIHN1YnN0aXR1dGlvbk5vZGVBKSxcbiAgICAgICAgc3Vic3RpdHV0aW9uID0gY29tcGxleFN1YnN0aXR1dGlvbjsgLy8vXG5cbiAgaWYgKHN1YnN0aXR1dGlvbiAhPT0gbnVsbCkge1xuICAgIGNvbnN0IHN0YXRlbWVudE5vZGVNYXRjaGVzID0gc3Vic3RpdHV0aW9uLm1hdGNoU3RhdGVtZW50Tm9kZShzdGF0ZW1lbnROb2RlQik7XG5cbiAgICBpZiAoc3RhdGVtZW50Tm9kZU1hdGNoZXMpIHtcbiAgICAgIG1ldGF2YXJpYWJsZVVuaWZpZWRXaXRoU3RhdGVtZW50R2l2ZW5TdWJzdGl0dXRpb24gPSB0cnVlO1xuICAgIH1cbiAgfSBlbHNlIHtcbiAgICBjb25zdCBtZXRhdmFyaWFibGVOYW1lQSA9IG1ldGF2YXJpYWJsZU5hbWVGcm9tTWV0YXZhcmlhYmxlTm9kZShtZXRhdmFyaWFibGVOb2RlQSksXG4gICAgICAgICAgbWV0YXZhcmlhYmxlQSA9IGxvY2FsQ29udGV4dEEuZmluZE1ldGF2YXJpYWJsZUJ5TWV0YXZhcmlhYmxlTmFtZShtZXRhdmFyaWFibGVOYW1lQSksXG4gICAgICAgICAgbWV0YXZhcmlhYmxlQiA9IG1ldGF2YXJpYWJsZUZyb21TdGF0ZW1lbnROb2RlKHN0YXRlbWVudE5vZGVCLCBsb2NhbENvbnRleHRCKTtcblxuICAgIGlmIChtZXRhdmFyaWFibGVBID09PSBtZXRhdmFyaWFibGVCKSB7XG4gICAgICBtZXRhdmFyaWFibGVVbmlmaWVkV2l0aFN0YXRlbWVudEdpdmVuU3Vic3RpdHV0aW9uID0gZmFsc2U7ICAvLy9cbiAgICB9IGVsc2Uge1xuICAgICAgY29uc3Qgc3RhdGVtZW50Tm9kZSA9IHN0YXRlbWVudE5vZGVCLCAvLy9cbiAgICAgICAgICAgIHN1YnN0aXR1dGlvbk5vZGUgPSBzdWJzdGl0dXRpb25Ob2RlQSwgLy8vXG4gICAgICAgICAgICBtZXRhdmFyaWFibGVOb2RlID0gbWV0YXZhcmlhYmxlTm9kZUEsIC8vL1xuICAgICAgICAgICAgc3RhdGVtZW50Rm9yTWV0YXZhcmlhYmxlU3Vic3RpdHV0aW9uID0gU3RhdGVtZW50Rm9yTWV0YXZhcmlhYmxlU3Vic3RpdHV0aW9uLmZyb21TdGF0ZW1lbnROb2RlTWV0YXZhcmlhYmxlTm9kZUFuZFN1YnN0aXR1dGlvbk5vZGUoc3RhdGVtZW50Tm9kZSwgbWV0YXZhcmlhYmxlTm9kZSwgc3Vic3RpdHV0aW9uTm9kZSksXG4gICAgICAgICAgICBzdWJzdGl0dXRpb24gPSBzdGF0ZW1lbnRGb3JNZXRhdmFyaWFibGVTdWJzdGl0dXRpb247ICAvLy9cblxuICAgICAgc3Vic3RpdHV0aW9ucy5hZGRTdWJzdGl0dXRpb24oc3Vic3RpdHV0aW9uLCBsb2NhbENvbnRleHRBLCBsb2NhbENvbnRleHRCKTtcblxuICAgICAgbWV0YXZhcmlhYmxlVW5pZmllZFdpdGhTdGF0ZW1lbnRHaXZlblN1YnN0aXR1dGlvbiA9IHRydWU7XG4gICAgfVxuICB9XG5cbiAgcmV0dXJuIG1ldGF2YXJpYWJsZVVuaWZpZWRXaXRoU3RhdGVtZW50R2l2ZW5TdWJzdGl0dXRpb247XG59XG4iXSwibmFtZXMiOlsidW5pZnlNZXRhdmFyaWFibGVXaXRoU3RhdGVtZW50R2l2ZW5TdWJzdGl0dXRpb24iLCJtZXRhdmFyaWFibGVOb2RlQSIsInN0YXRlbWVudE5vZGVCIiwic3Vic3RpdHV0aW9uTm9kZUEiLCJzdWJzdGl0dXRpb25zIiwibG9jYWxDb250ZXh0QSIsImxvY2FsQ29udGV4dEIiLCJtZXRhdmFyaWFibGVVbmlmaWVkV2l0aFN0YXRlbWVudEdpdmVuU3Vic3RpdHV0aW9uIiwiY29tcGxleFN1YnN0aXR1dGlvbiIsImZpbmRDb21wbGV4U3Vic3RpdHV0aW9uQnlNZXRhdmFyaWFibGVOb2RlQW5kU3Vic3RpdHV0aW9uTm9kZSIsInN1YnN0aXR1dGlvbiIsInN0YXRlbWVudE5vZGVNYXRjaGVzIiwibWF0Y2hTdGF0ZW1lbnROb2RlIiwibWV0YXZhcmlhYmxlTmFtZUEiLCJtZXRhdmFyaWFibGVOYW1lRnJvbU1ldGF2YXJpYWJsZU5vZGUiLCJtZXRhdmFyaWFibGVBIiwiZmluZE1ldGF2YXJpYWJsZUJ5TWV0YXZhcmlhYmxlTmFtZSIsIm1ldGF2YXJpYWJsZUIiLCJtZXRhdmFyaWFibGVGcm9tU3RhdGVtZW50Tm9kZSIsInN0YXRlbWVudE5vZGUiLCJzdWJzdGl0dXRpb25Ob2RlIiwibWV0YXZhcmlhYmxlTm9kZSIsInN0YXRlbWVudEZvck1ldGF2YXJpYWJsZVN1YnN0aXR1dGlvbiIsIlN0YXRlbWVudEZvck1ldGF2YXJpYWJsZVN1YnN0aXR1dGlvbiIsImZyb21TdGF0ZW1lbnROb2RlTWV0YXZhcmlhYmxlTm9kZUFuZFN1YnN0aXR1dGlvbk5vZGUiLCJhZGRTdWJzdGl0dXRpb24iXSwibWFwcGluZ3MiOiJBQUFBOzs7OytCQU9BOzs7ZUFBd0JBOzs7K0VBTHlCO3FCQUVIO29CQUNLOzs7Ozs7QUFFcEMsU0FBU0EsZ0RBQWdEQyxpQkFBaUIsRUFBRUMsY0FBYyxFQUFFQyxpQkFBaUIsRUFBRUMsYUFBYSxFQUFFQyxhQUFhLEVBQUVDLGFBQWE7SUFDdkssSUFBSUMsb0RBQW9EO0lBRXhELElBQU1DLHNCQUFzQkosY0FBY0ssNERBQTRELENBQUNSLG1CQUFtQkUsb0JBQ3BITyxlQUFlRixxQkFBcUIsR0FBRztJQUU3QyxJQUFJRSxpQkFBaUIsTUFBTTtRQUN6QixJQUFNQyx1QkFBdUJELGFBQWFFLGtCQUFrQixDQUFDVjtRQUU3RCxJQUFJUyxzQkFBc0I7WUFDeEJKLG9EQUFvRDtRQUN0RDtJQUNGLE9BQU87UUFDTCxJQUFNTSxvQkFBb0JDLElBQUFBLDBDQUFvQyxFQUFDYixvQkFDekRjLGdCQUFnQlYsY0FBY1csa0NBQWtDLENBQUNILG9CQUNqRUksZ0JBQWdCQyxJQUFBQSxvQ0FBNkIsRUFBQ2hCLGdCQUFnQkk7UUFFcEUsSUFBSVMsa0JBQWtCRSxlQUFlO1lBQ25DVixvREFBb0QsT0FBUSxHQUFHO1FBQ2pFLE9BQU87WUFDTCxJQUFNWSxnQkFBZ0JqQixnQkFDaEJrQixtQkFBbUJqQixtQkFDbkJrQixtQkFBbUJwQixtQkFDbkJxQix1Q0FBdUNDLGlDQUFvQyxDQUFDQyxvREFBb0QsQ0FBQ0wsZUFBZUUsa0JBQWtCRCxtQkFDbEtWLGdCQUFlWSxzQ0FBdUMsR0FBRztZQUUvRGxCLGNBQWNxQixlQUFlLENBQUNmLGVBQWNMLGVBQWVDO1lBRTNEQyxvREFBb0Q7UUFDdEQ7SUFDRjtJQUVBLE9BQU9BO0FBQ1QifQ==
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.991",
4
+ "version": "0.0.992",
5
5
  "license": "MIT, Anti-996",
6
6
  "homepage": "https://github.com/djalbat/occam-verify-cli",
7
7
  "description": "Occam's Verifier",
package/src/unifier/metaLevel.js CHANGED
@@ -37,32 +37,30 @@ class MetaLevelUnifier extends Unifier {
37
37
  unify: (statementNodeA, statementNodeB, substitutions, localContextA, localContextB) => {
38
38
  let statementUnifiedWithStatement;
39
39
 
40
- const statementMetavariableNodeA = statementMetavariableNodeQuery(statementNodeA);
40
+ const matches = statementNodeA.match(statementNodeB);
41
41
 
42
- if (statementMetavariableNodeA !== null) {
43
- const metavariableNodeA = statementMetavariableNodeA, ///
44
- statementSubstitutionNodeA = statementSubstitutionNodeQuery(statementNodeA);
42
+ if (matches) {
43
+ statementUnifiedWithStatement = true;
44
+ } else {
45
+ const statementMetavariableNodeA = statementMetavariableNodeQuery(statementNodeA);
45
46
 
46
- if (statementSubstitutionNodeA === null) {
47
- const metavariableUnifiedWithStatement = unifyMetavariableWithStatement(metavariableNodeA, statementNodeB, substitutions, localContextA, localContextB);
47
+ if (statementMetavariableNodeA !== null) {
48
+ const metavariableNodeA = statementMetavariableNodeA, ///
49
+ statementSubstitutionNodeA = statementSubstitutionNodeQuery(statementNodeA);
48
50
 
49
- statementUnifiedWithStatement = metavariableUnifiedWithStatement; ///
50
- } else {
51
- const substitutionNodeA = statementSubstitutionNodeA, ///
52
- metavariableUnifiedWithStatementGivenSubstitution = unifyMetavariableWithStatementGivenSubstitution(metavariableNodeA, statementNodeB, substitutionNodeA, substitutions, localContextA, localContextB);
51
+ if (statementSubstitutionNodeA === null) {
52
+ const metavariableUnifiedWithStatement = unifyMetavariableWithStatement(metavariableNodeA, statementNodeB, substitutions, localContextA, localContextB);
53
53
 
54
- statementUnifiedWithStatement = metavariableUnifiedWithStatementGivenSubstitution; ///
54
+ statementUnifiedWithStatement = metavariableUnifiedWithStatement; ///
55
+ } else {
56
+ const substitutionNodeA = statementSubstitutionNodeA, ///
57
+ metavariableUnifiedWithStatementGivenSubstitution = unifyMetavariableWithStatementGivenSubstitution(metavariableNodeA, statementNodeB, substitutionNodeA, substitutions, localContextA, localContextB);
58
+
59
+ statementUnifiedWithStatement = metavariableUnifiedWithStatementGivenSubstitution; ///
60
+ }
61
+ } else {
62
+ statementUnifiedWithStatement = unifyStatementWithStatement(statementNodeA, statementNodeB, substitutions, localContextA, localContextB);
55
63
  }
56
- } else {
57
- const nonTerminalNodeA = statementNodeA, ///
58
- nonTerminalNodeB = statementNodeB, ///
59
- nonTerminalNodeAChildNodes = nonTerminalNodeA.getChildNodes(),
60
- nonTerminalNodeBChildNodes = nonTerminalNodeB.getChildNodes(),
61
- childNodesA = nonTerminalNodeAChildNodes, ///
62
- childNodesB = nonTerminalNodeBChildNodes, ///
63
- childNodesVerified = metaLevelUnifier.unifyChildNodes(childNodesA, childNodesB, substitutions, localContextA, localContextB);
64
-
65
- statementUnifiedWithStatement = childNodesVerified; ///
66
64
  }
67
65
 
68
66
  return statementUnifiedWithStatement;
@@ -98,3 +96,16 @@ Object.assign(shim, {
98
96
  });
99
97
 
100
98
  export default metaLevelUnifier;
99
+
100
+ function unifyStatementWithStatement(statementNodeA, statementNodeB, substitutions, localContextA, localContextB) {
101
+ const nonTerminalNodeA = statementNodeA, ///
102
+ nonTerminalNodeB = statementNodeB, ///
103
+ nonTerminalNodeAChildNodes = nonTerminalNodeA.getChildNodes(),
104
+ nonTerminalNodeBChildNodes = nonTerminalNodeB.getChildNodes(),
105
+ childNodesA = nonTerminalNodeAChildNodes, ///
106
+ childNodesB = nonTerminalNodeBChildNodes, ///
107
+ childNodesVerified = metaLevelUnifier.unifyChildNodes(childNodesA, childNodesB, substitutions, localContextA, localContextB),
108
+ statementUnifiedWithStatement = childNodesVerified; ///
109
+
110
+ return statementUnifiedWithStatement;
111
+ }
package/src/unify/metavariableWithFrame.js CHANGED
@@ -3,6 +3,7 @@
3
3
  import FrameForMetavariableSubstitution from "../substitution/frameForMetavariable";
4
4
 
5
5
  import { metavariableFromFrameNode } from "../utilities/unify";
6
+ import {metavariableNameFromMetavariableNode} from "../utilities/name";
6
7
 
7
8
  export default function unifyMetavariableWithFrame(metavariableNodeA, frameNodeB, substitutions, localContextA, localContextB) {
8
9
  let metavariableUnifiedWithFrame = false;
@@ -17,7 +18,8 @@ export default function unifyMetavariableWithFrame(metavariableNodeA, frameNodeB
17
18
  metavariableUnifiedWithFrame = true;
18
19
  }
19
20
  } else {
20
- const metavariableA = localContextA.findMetavariableByMetavariableNode(metavariableNodeA),
21
+ const metavariableNameA = metavariableNameFromMetavariableNode(metavariableNodeA),
22
+ metavariableA = localContextA.findMetavariableByMetavariableName(metavariableNameA),
21
23
  metavariableB = metavariableFromFrameNode(frameNodeB, localContextB);
22
24
 
23
25
  if (metavariableA === metavariableB) {
package/src/unify/metavariableWithStatement.js CHANGED
@@ -3,6 +3,7 @@
3
3
  import StatementForMetavariableSubstitution from "../substitution/statementForMetavariable";
4
4
 
5
5
  import { metavariableFromStatementNode } from "../utilities/unify";
6
+ import {metavariableNameFromMetavariableNode} from "../utilities/name";
6
7
 
7
8
  export default function unifyMetavariableWithStatement(metavariableNodeA, statementNodeB, substitutions, localContextA, localContextB) {
8
9
  let metavariableUnifiedWithStatement = false;
@@ -17,7 +18,8 @@ export default function unifyMetavariableWithStatement(metavariableNodeA, statem
17
18
  metavariableUnifiedWithStatement = true;
18
19
  }
19
20
  } else {
20
- const metavariableA = localContextA.findMetavariableByMetavariableNode(metavariableNodeA),
21
+ const metavariableNameA = metavariableNameFromMetavariableNode(metavariableNodeA),
22
+ metavariableA = localContextA.findMetavariableByMetavariableName(metavariableNameA),
21
23
  metavariableB = metavariableFromStatementNode(statementNodeB, localContextB);
22
24
 
23
25
  if (metavariableA === metavariableB) {
package/src/unify/metavariableWithStatementGivenSubstitution.js CHANGED
@@ -3,6 +3,7 @@
3
3
  import StatementForMetavariableSubstitution from "../substitution/statementForMetavariable";
4
4
 
5
5
  import { metavariableFromStatementNode } from "../utilities/unify";
6
+ import {metavariableNameFromMetavariableNode} from "../utilities/name";
6
7
 
7
8
  export default function unifyMetavariableWithStatementGivenSubstitution(metavariableNodeA, statementNodeB, substitutionNodeA, substitutions, localContextA, localContextB) {
8
9
  let metavariableUnifiedWithStatementGivenSubstitution = false;
@@ -17,7 +18,8 @@ export default function unifyMetavariableWithStatementGivenSubstitution(metavari
17
18
  metavariableUnifiedWithStatementGivenSubstitution = true;
18
19
  }
19
20
  } else {
20
- const metavariableA = localContextA.findMetavariableByMetavariableNode(metavariableNodeA),
21
+ const metavariableNameA = metavariableNameFromMetavariableNode(metavariableNodeA),
22
+ metavariableA = localContextA.findMetavariableByMetavariableName(metavariableNameA),
21
23
  metavariableB = metavariableFromStatementNode(statementNodeB, localContextB);
22
24
 
23
25
  if (metavariableA === metavariableB) {