occam-verify-cli 0.0.617 → 0.0.618

package/lib/equality.js

@@ -8,7 +8,6 @@ Object.defineProperty(exports, "default", {
         return Equality;
     }
 });
-var _matcher = /*#__PURE__*/ _interop_require_default(require("./matcher"));
 var _verifier = /*#__PURE__*/ _interop_require_default(require("./verifier"));
 var _term = /*#__PURE__*/ _interop_require_wildcard(require("./verify/term"));
 var _equality = /*#__PURE__*/ _interop_require_default(require("./node/statement/equality"));
@@ -211,8 +210,8 @@ var Equality = /*#__PURE__*/ function() {
                 var equality = null;
                 var statementNode = proofStep.getStatementNode();
                 if (statementNode !== null) {
-                    var nodeA = statementNode, nodeB = _equality.default, depth = _constants.EQUALITY_DEPTH, nodeMatches = _matcher.default.matchNode(nodeA, nodeB, depth);
-                    if (nodeMatches) {
+                    var depth = _constants.EQUALITY_DEPTH, statementNodeMatchesEqualityStatementNode = statementNode.match(_equality.default, depth);
+                    if (statementNodeMatchesEqualityStatementNode) {
                         var leftTermNode = leftTermNodeQuery(statementNode), rightTermNode = rightTermNodeQuery(statementNode);
                         equality = new Equality(leftTermNode, rightTermNode);
                     }
@@ -325,4 +324,4 @@ function filterEqualities(equalities, equality) {
     return equalities;
 }
 
-//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../src/equality.js"],"sourcesContent":["\"use strict\";\n\nimport matcher from \"./matcher\";\nimport Verifier from \"./verifier\";\nimport verifyTerm from \"./verify/term\";\nimport equalityStatementNode from \"./node/statement/equality\";\n\nimport { nodeQuery } from \"./utilities/query\";\nimport { first, second } from \"./utilities/array\";\nimport { TERM_RULE_NAME } from \"./ruleNames\";\nimport { EQUALITY_DEPTH } from \"./constants\";\nimport { verifyTermAsVariable } from \"./verify/term\";\n\nconst leftTermNodeQuery = nodeQuery(\"/statement/argument[0]/term!\"),\n      rightTermNodeQuery = nodeQuery(\"/statement/argument[1]/term!\");\n\nexport default class Equality {\n  constructor(leftTermNode, rightTermNode) {\n    this.leftTermNode = leftTermNode;\n    this.rightTermNode = rightTermNode;\n  }\n\n  getLeftTermNode() {\n    return this.leftTermNode;\n  }\n\n  getRightTermNode() {\n    return this.rightTermNode;\n  }\n\n  matchTermNodes(leftTermNode, rightTermNode, reversed, equalities, context) {\n    let leftTermNodeAndRightTermNodeMatch = true;\n\n    if (leftTermNodeAndRightTermNodeMatch) {\n      const leftNonTerminalNode = reversed ?\n                                    this.rightTermNode :\n                                      this.leftTermNode,  ///\n            rightNonTerminalNode = leftTermNode,  ///\n            nonTerminalNodeVerified = equalityVerifier.verifyNonTerminalNode(leftNonTerminalNode, rightNonTerminalNode, equalities, context);\n\n      leftTermNodeAndRightTermNodeMatch = nonTerminalNodeVerified; ///\n    }\n\n    if (leftTermNodeAndRightTermNodeMatch) {\n      const leftNonTerminalNode = reversed ?\n                                    this.leftTermNode :\n                                      this.rightTermNode,  ///\n            rightNonTerminalNode = rightTermNode,  ///\n            nonTerminalNodeVerified = equalityVerifier.verifyNonTerminalNode(leftNonTerminalNode, rightNonTerminalNode, equalities, context);\n\n      leftTermNodeAndRightTermNodeMatch = nonTerminalNodeVerified; ///\n    }\n\n    return leftTermNodeAndRightTermNodeMatch;\n  }\n\n  match(equality, equalities, context) {\n    let matches = false;\n\n    const leftTermNode = equality.getLeftTermNode(),\n          rightTermNode = equality.getRightTermNode();\n\n    equalities = filterEqualities(equalities, equality);  ///\n\n    if (!matches) {\n      const reversed = false,\n            leftTermNodeAndRightTermNodeMatch = this.matchTermNodes(leftTermNode, rightTermNode, reversed, equalities, context);\n\n      matches = leftTermNodeAndRightTermNodeMatch;  ///\n    }\n\n    if (!matches) {\n      const reversed = true,\n            leftTermNodeAndRightTermNodeMatch = this.matchTermNodes(leftTermNode, rightTermNode, reversed, equalities, context);\n\n      matches = leftTermNodeAndRightTermNodeMatch;  ///\n    }\n\n    return matches;\n  }\n\n  verify(equalities, context) {\n    const leftNonTerminalNode = this.leftTermNode,  ///\n          rightNonTerminalNode = this.rightTermNode,  ///\n          nonTerminalNodeVerified = equalityVerifier.verifyNonTerminalNode(leftNonTerminalNode, rightNonTerminalNode, equalities, context),\n          verified = nonTerminalNodeVerified; ///\n\n    return verified;\n  }\n\n  static fromProofStep(proofStep) {\n    let equality = null;\n\n    const statementNode = proofStep.getStatementNode();\n\n    if (statementNode !== null) {\n      const nodeA = statementNode,  ///\n            nodeB = equalityStatementNode,  ///\n            depth = EQUALITY_DEPTH,\n            nodeMatches = matcher.matchNode(nodeA, nodeB, depth);\n\n      if (nodeMatches) {\n        const leftTermNode = leftTermNodeQuery(statementNode),\n              rightTermNode = rightTermNodeQuery(statementNode);\n\n        equality = new Equality(leftTermNode, rightTermNode);\n      }\n    }\n\n    return equality;\n  }\n\n  static fromStatementNode(statementNode) {\n    const leftTermNode = leftTermNodeQuery(statementNode),\n          rightTermNode = rightTermNodeQuery(statementNode),\n          equality = new Equality(leftTermNode, rightTermNode);\n\n    return equality;\n  }\n\n  static fromLeftTermNodeAndRightTermNode(leftTermNode, rightTermNode) {\n    const equality = new Equality(leftTermNode, rightTermNode);\n\n    return equality;\n  }\n}\n\nclass EqualityVerifier extends Verifier {\n  verifyNonTerminalNode(leftNonTerminalNode, rightNonTerminalNode, equalities, context) {\n    let nonTerminalNodeVerified = false;\n\n    const leftNonTerminalNodeRuleName = leftNonTerminalNode.getRuleName(),\n          rightNonTerminalNodeRuleName = rightNonTerminalNode.getRuleName();\n\n    if (leftNonTerminalNodeRuleName === rightNonTerminalNodeRuleName) {\n      const ruleName = leftNonTerminalNodeRuleName, ///\n            ruleNameTermRuleName = (ruleName === TERM_RULE_NAME);\n\n      if (ruleNameTermRuleName) {\n        const leftTermNode = leftNonTerminalNode, ///\n              rightTermNode = rightNonTerminalNode, ///\n              termNodeVerified = this.verifyTermNode(leftTermNode, rightTermNode, equalities, context);\n\n        nonTerminalNodeVerified = termNodeVerified;  ///\n      }\n\n      if (!nonTerminalNodeVerified) {\n        const leftNonTerminalNodeChildNodes = leftNonTerminalNode.getChildNodes(),\n              rightNonTerminalNodeChildNodes = rightNonTerminalNode.getChildNodes(),\n              leftNodes = leftNonTerminalNodeChildNodes, ///\n              rightNodes = rightNonTerminalNodeChildNodes, ///\n              nodesVerified = this.verifyNodes(leftNodes, rightNodes, equalities, context);\n\n        nonTerminalNodeVerified = nodesVerified; ///\n      }\n    }\n\n    return nonTerminalNodeVerified;\n  }\n\n  verifyTermNode(leftTermNode, rightTermNode, equalities, context) {\n    let termNodeVerified = false;\n\n    const variables = [],\n          leftTermVerifiedAsVariable = verifyTermAsVariable(leftTermNode, variables, context),\n          rightTermVerifiedAsVariable = verifyTermAsVariable(rightTermNode, variables, context);\n\n    let equality = null;\n\n    if (leftTermVerifiedAsVariable && rightTermVerifiedAsVariable) {\n      const firstVariable = first(variables),\n            secondVariable = second(variables),\n            leftVariable = firstVariable, ///\n            rightVariable = secondVariable, ///\n            leftVariableType = leftVariable.getType(),\n            rightVariableType = rightVariable.getType(),\n            leftVariableTypeEqualToOrSubTypeOfOfSuperTypeOfRightVariableType = leftVariableType.isEqualToOrSubTypeOfOfSuperTypeOf(rightVariableType);\n\n      if (leftVariableTypeEqualToOrSubTypeOfOfSuperTypeOfRightVariableType) {\n        equality = Equality.fromLeftTermNodeAndRightTermNode(leftTermNode, rightTermNode);\n      }\n    } else if (leftTermVerifiedAsVariable) {\n      const types = [];\n\n      verifyTerm(rightTermNode, types, context);\n\n      const firstType = first(types),\n            firstVariable = first(variables),\n            leftVariable = firstVariable, ///\n            rightTermType = firstType,  ///\n            leftVariableType = leftVariable.getType(),\n            leftVariableTypeEqualToOrSuperTypeOfRightTermType = leftVariableType.isEqualToOrSuperTypeOf(rightTermType);\n\n      if (leftVariableTypeEqualToOrSuperTypeOfRightTermType) {\n        equality = Equality.fromLeftTermNodeAndRightTermNode(leftTermNode, rightTermNode);\n      }\n    } else if (rightTermVerifiedAsVariable) {\n      const types = [];\n\n      verifyTerm(leftTermNode, types, context);\n\n      const firstType = first(types),\n            firstVariable = first(variables),\n            leftTermType = firstType,  ///\n            rightVariable = firstVariable, ///\n            rightVariableType = rightVariable.getType(),\n            rightVariableTypeEqualToOrSuperTypeOfRightTermType = rightVariableType.isEqualToOrSuperTypeOf(leftTermType);\n\n      if (rightVariableTypeEqualToOrSuperTypeOfRightTermType) {\n        equality = Equality.fromLeftTermNodeAndRightTermNode(leftTermNode, rightTermNode);\n      }\n    } else {\n      const types = [];\n\n      verifyTerm(leftTermNode, types, context);\n\n      verifyTerm(rightTermNode, types, context);\n\n      const firstType = first(types),\n            secondType = second(types),\n            leftTermType = firstType, ///\n            rightTermType = secondType, ///\n            leftTermTypeEqualToOrSubTypeOfOfSuperTypeOfRightTermType = leftTermType.isEqualToOrSubTypeOfOfSuperTypeOf(rightTermType);\n\n      if (leftTermTypeEqualToOrSubTypeOfOfSuperTypeOfRightTermType) {\n        equality = Equality.fromLeftTermNodeAndRightTermNode(leftTermNode, rightTermNode);\n      }\n    }\n\n    if (equality !== null) {\n      const equalityA = equality, ///\n            equalitiesB = equalities, ///\n            equalityMatches = equalitiesB.some((equalityB) => { ///\n              const equalityAMatchesEqualityB = equalityA.match(equalityB, equalitiesB, context);\n\n              if (equalityAMatchesEqualityB) {\n                return true;\n              }\n            });\n\n      termNodeVerified = equalityMatches;  ///\n    }\n\n    return termNodeVerified;\n  }\n}\n\nconst equalityVerifier = new EqualityVerifier();\n\nfunction filterEqualities(equalities, equality) {\n  const equalityA = equality; ///\n\n  equalities = equalities.filter((equality) => {\n    const equalityB = equality; ///\n\n    if (equalityA !== equalityB) {\n      return true;\n    }\n  });\n\n  return equalities;\n}\n"],"names":["Equality","leftTermNodeQuery","nodeQuery","rightTermNodeQuery","leftTermNode","rightTermNode","getLeftTermNode","getRightTermNode","matchTermNodes","reversed","equalities","context","leftTermNodeAndRightTermNodeMatch","leftNonTerminalNode","rightNonTerminalNode","nonTerminalNodeVerified","equalityVerifier","verifyNonTerminalNode","match","equality","matches","filterEqualities","verify","verified","fromProofStep","proofStep","statementNode","getStatementNode","nodeA","nodeB","equalityStatementNode","depth","EQUALITY_DEPTH","nodeMatches","matcher","matchNode","fromStatementNode","fromLeftTermNodeAndRightTermNode","EqualityVerifier","leftNonTerminalNodeRuleName","getRuleName","rightNonTerminalNodeRuleName","ruleName","ruleNameTermRuleName","TERM_RULE_NAME","termNodeVerified","verifyTermNode","leftNonTerminalNodeChildNodes","getChildNodes","rightNonTerminalNodeChildNodes","leftNodes","rightNodes","nodesVerified","verifyNodes","variables","leftTermVerifiedAsVariable","verifyTermAsVariable","rightTermVerifiedAsVariable","firstVariable","first","secondVariable","second","leftVariable","rightVariable","leftVariableType","getType","rightVariableType","leftVariableTypeEqualToOrSubTypeOfOfSuperTypeOfRightVariableType","isEqualToOrSubTypeOfOfSuperTypeOf","types","verifyTerm","firstType","rightTermType","leftVariableTypeEqualToOrSuperTypeOfRightTermType","isEqualToOrSuperTypeOf","leftTermType","rightVariableTypeEqualToOrSuperTypeOfRightTermType","secondType","leftTermTypeEqualToOrSubTypeOfOfSuperTypeOfRightTermType","equalityA","equalitiesB","equalityMatches","some","equalityB","equalityAMatchesEqualityB","Verifier","filter"],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../src/equality.js"],"sourcesContent":["\"use strict\";\n\nimport Verifier from \"./verifier\";\nimport verifyTerm from \"./verify/term\";\nimport equalityStatementNode from \"./node/statement/equality\";\n\nimport { nodeQuery } from \"./utilities/query\";\nimport { first, second } from \"./utilities/array\";\nimport { TERM_RULE_NAME } from \"./ruleNames\";\nimport { EQUALITY_DEPTH } from \"./constants\";\nimport { verifyTermAsVariable } from \"./verify/term\";\n\nconst leftTermNodeQuery = nodeQuery(\"/statement/argument[0]/term!\"),\n      rightTermNodeQuery = nodeQuery(\"/statement/argument[1]/term!\");\n\nexport default class Equality {\n  constructor(leftTermNode, rightTermNode) {\n    this.leftTermNode = leftTermNode;\n    this.rightTermNode = rightTermNode;\n  }\n\n  getLeftTermNode() {\n    return this.leftTermNode;\n  }\n\n  getRightTermNode() {\n    return this.rightTermNode;\n  }\n\n  matchTermNodes(leftTermNode, rightTermNode, reversed, equalities, context) {\n    let leftTermNodeAndRightTermNodeMatch = true;\n\n    if (leftTermNodeAndRightTermNodeMatch) {\n      const leftNonTerminalNode = reversed ?\n                                    this.rightTermNode :\n                                      this.leftTermNode,  ///\n            rightNonTerminalNode = leftTermNode,  ///\n            nonTerminalNodeVerified = equalityVerifier.verifyNonTerminalNode(leftNonTerminalNode, rightNonTerminalNode, equalities, context);\n\n      leftTermNodeAndRightTermNodeMatch = nonTerminalNodeVerified; ///\n    }\n\n    if (leftTermNodeAndRightTermNodeMatch) {\n      const leftNonTerminalNode = reversed ?\n                                    this.leftTermNode :\n                                      this.rightTermNode,  ///\n            rightNonTerminalNode = rightTermNode,  ///\n            nonTerminalNodeVerified = equalityVerifier.verifyNonTerminalNode(leftNonTerminalNode, rightNonTerminalNode, equalities, context);\n\n      leftTermNodeAndRightTermNodeMatch = nonTerminalNodeVerified; ///\n    }\n\n    return leftTermNodeAndRightTermNodeMatch;\n  }\n\n  match(equality, equalities, context) {\n    let matches = false;\n\n    const leftTermNode = equality.getLeftTermNode(),\n          rightTermNode = equality.getRightTermNode();\n\n    equalities = filterEqualities(equalities, equality);  ///\n\n    if (!matches) {\n      const reversed = false,\n            leftTermNodeAndRightTermNodeMatch = this.matchTermNodes(leftTermNode, rightTermNode, reversed, equalities, context);\n\n      matches = leftTermNodeAndRightTermNodeMatch;  ///\n    }\n\n    if (!matches) {\n      const reversed = true,\n            leftTermNodeAndRightTermNodeMatch = this.matchTermNodes(leftTermNode, rightTermNode, reversed, equalities, context);\n\n      matches = leftTermNodeAndRightTermNodeMatch;  ///\n    }\n\n    return matches;\n  }\n\n  verify(equalities, context) {\n    const leftNonTerminalNode = this.leftTermNode,  ///\n          rightNonTerminalNode = this.rightTermNode,  ///\n          nonTerminalNodeVerified = equalityVerifier.verifyNonTerminalNode(leftNonTerminalNode, rightNonTerminalNode, equalities, context),\n          verified = nonTerminalNodeVerified; ///\n\n    return verified;\n  }\n\n  static fromProofStep(proofStep) {\n    let equality = null;\n\n    const statementNode = proofStep.getStatementNode();\n\n    if (statementNode !== null) {\n      const depth = EQUALITY_DEPTH,\n            statementNodeMatchesEqualityStatementNode = statementNode.match(equalityStatementNode, depth);\n\n      if (statementNodeMatchesEqualityStatementNode) {\n        const leftTermNode = leftTermNodeQuery(statementNode),\n              rightTermNode = rightTermNodeQuery(statementNode);\n\n        equality = new Equality(leftTermNode, rightTermNode);\n      }\n    }\n\n    return equality;\n  }\n\n  static fromStatementNode(statementNode) {\n    const leftTermNode = leftTermNodeQuery(statementNode),\n          rightTermNode = rightTermNodeQuery(statementNode),\n          equality = new Equality(leftTermNode, rightTermNode);\n\n    return equality;\n  }\n\n  static fromLeftTermNodeAndRightTermNode(leftTermNode, rightTermNode) {\n    const equality = new Equality(leftTermNode, rightTermNode);\n\n    return equality;\n  }\n}\n\nclass EqualityVerifier extends Verifier {\n  verifyNonTerminalNode(leftNonTerminalNode, rightNonTerminalNode, equalities, context) {\n    let nonTerminalNodeVerified = false;\n\n    const leftNonTerminalNodeRuleName = leftNonTerminalNode.getRuleName(),\n          rightNonTerminalNodeRuleName = rightNonTerminalNode.getRuleName();\n\n    if (leftNonTerminalNodeRuleName === rightNonTerminalNodeRuleName) {\n      const ruleName = leftNonTerminalNodeRuleName, ///\n            ruleNameTermRuleName = (ruleName === TERM_RULE_NAME);\n\n      if (ruleNameTermRuleName) {\n        const leftTermNode = leftNonTerminalNode, ///\n              rightTermNode = rightNonTerminalNode, ///\n              termNodeVerified = this.verifyTermNode(leftTermNode, rightTermNode, equalities, context);\n\n        nonTerminalNodeVerified = termNodeVerified;  ///\n      }\n\n      if (!nonTerminalNodeVerified) {\n        const leftNonTerminalNodeChildNodes = leftNonTerminalNode.getChildNodes(),\n              rightNonTerminalNodeChildNodes = rightNonTerminalNode.getChildNodes(),\n              leftNodes = leftNonTerminalNodeChildNodes, ///\n              rightNodes = rightNonTerminalNodeChildNodes, ///\n              nodesVerified = this.verifyNodes(leftNodes, rightNodes, equalities, context);\n\n        nonTerminalNodeVerified = nodesVerified; ///\n      }\n    }\n\n    return nonTerminalNodeVerified;\n  }\n\n  verifyTermNode(leftTermNode, rightTermNode, equalities, context) {\n    let termNodeVerified = false;\n\n    const variables = [],\n          leftTermVerifiedAsVariable = verifyTermAsVariable(leftTermNode, variables, context),\n          rightTermVerifiedAsVariable = verifyTermAsVariable(rightTermNode, variables, context);\n\n    let equality = null;\n\n    if (leftTermVerifiedAsVariable && rightTermVerifiedAsVariable) {\n      const firstVariable = first(variables),\n            secondVariable = second(variables),\n            leftVariable = firstVariable, ///\n            rightVariable = secondVariable, ///\n            leftVariableType = leftVariable.getType(),\n            rightVariableType = rightVariable.getType(),\n            leftVariableTypeEqualToOrSubTypeOfOfSuperTypeOfRightVariableType = leftVariableType.isEqualToOrSubTypeOfOfSuperTypeOf(rightVariableType);\n\n      if (leftVariableTypeEqualToOrSubTypeOfOfSuperTypeOfRightVariableType) {\n        equality = Equality.fromLeftTermNodeAndRightTermNode(leftTermNode, rightTermNode);\n      }\n    } else if (leftTermVerifiedAsVariable) {\n      const types = [];\n\n      verifyTerm(rightTermNode, types, context);\n\n      const firstType = first(types),\n            firstVariable = first(variables),\n            leftVariable = firstVariable, ///\n            rightTermType = firstType,  ///\n            leftVariableType = leftVariable.getType(),\n            leftVariableTypeEqualToOrSuperTypeOfRightTermType = leftVariableType.isEqualToOrSuperTypeOf(rightTermType);\n\n      if (leftVariableTypeEqualToOrSuperTypeOfRightTermType) {\n        equality = Equality.fromLeftTermNodeAndRightTermNode(leftTermNode, rightTermNode);\n      }\n    } else if (rightTermVerifiedAsVariable) {\n      const types = [];\n\n      verifyTerm(leftTermNode, types, context);\n\n      const firstType = first(types),\n            firstVariable = first(variables),\n            leftTermType = firstType,  ///\n            rightVariable = firstVariable, ///\n            rightVariableType = rightVariable.getType(),\n            rightVariableTypeEqualToOrSuperTypeOfRightTermType = rightVariableType.isEqualToOrSuperTypeOf(leftTermType);\n\n      if (rightVariableTypeEqualToOrSuperTypeOfRightTermType) {\n        equality = Equality.fromLeftTermNodeAndRightTermNode(leftTermNode, rightTermNode);\n      }\n    } else {\n      const types = [];\n\n      verifyTerm(leftTermNode, types, context);\n\n      verifyTerm(rightTermNode, types, context);\n\n      const firstType = first(types),\n            secondType = second(types),\n            leftTermType = firstType, ///\n            rightTermType = secondType, ///\n            leftTermTypeEqualToOrSubTypeOfOfSuperTypeOfRightTermType = leftTermType.isEqualToOrSubTypeOfOfSuperTypeOf(rightTermType);\n\n      if (leftTermTypeEqualToOrSubTypeOfOfSuperTypeOfRightTermType) {\n        equality = Equality.fromLeftTermNodeAndRightTermNode(leftTermNode, rightTermNode);\n      }\n    }\n\n    if (equality !== null) {\n      const equalityA = equality, ///\n            equalitiesB = equalities, ///\n            equalityMatches = equalitiesB.some((equalityB) => { ///\n              const equalityAMatchesEqualityB = equalityA.match(equalityB, equalitiesB, context);\n\n              if (equalityAMatchesEqualityB) {\n                return true;\n              }\n            });\n\n      termNodeVerified = equalityMatches;  ///\n    }\n\n    return termNodeVerified;\n  }\n}\n\nconst equalityVerifier = new EqualityVerifier();\n\nfunction filterEqualities(equalities, equality) {\n  const equalityA = equality; ///\n\n  equalities = equalities.filter((equality) => {\n    const equalityB = equality; ///\n\n    if (equalityA !== equalityB) {\n      return true;\n    }\n  });\n\n  return equalities;\n}\n"],"names":["Equality","leftTermNodeQuery","nodeQuery","rightTermNodeQuery","leftTermNode","rightTermNode","getLeftTermNode","getRightTermNode","matchTermNodes","reversed","equalities","context","leftTermNodeAndRightTermNodeMatch","leftNonTerminalNode","rightNonTerminalNode","nonTerminalNodeVerified","equalityVerifier","verifyNonTerminalNode","match","equality","matches","filterEqualities","verify","verified","fromProofStep","proofStep","statementNode","getStatementNode","depth","EQUALITY_DEPTH","statementNodeMatchesEqualityStatementNode","equalityStatementNode","fromStatementNode","fromLeftTermNodeAndRightTermNode","EqualityVerifier","leftNonTerminalNodeRuleName","getRuleName","rightNonTerminalNodeRuleName","ruleName","ruleNameTermRuleName","TERM_RULE_NAME","termNodeVerified","verifyTermNode","leftNonTerminalNodeChildNodes","getChildNodes","rightNonTerminalNodeChildNodes","leftNodes","rightNodes","nodesVerified","verifyNodes","variables","leftTermVerifiedAsVariable","verifyTermAsVariable","rightTermVerifiedAsVariable","firstVariable","first","secondVariable","second","leftVariable","rightVariable","leftVariableType","getType","rightVariableType","leftVariableTypeEqualToOrSubTypeOfOfSuperTypeOfRightVariableType","isEqualToOrSubTypeOfOfSuperTypeOf","types","verifyTerm","firstType","rightTermType","leftVariableTypeEqualToOrSuperTypeOfRightTermType","isEqualToOrSuperTypeOf","leftTermType","rightVariableTypeEqualToOrSuperTypeOfRightTermType","secondType","leftTermTypeEqualToOrSubTypeOfOfSuperTypeOfRightTermType","equalityA","equalitiesB","equalityMatches","some","equalityB","equalityAMatchesEqualityB","Verifier","filter"],"mappings":"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"}

package/lib/substitution/metastatementForMetavariable.js

@@ -8,7 +8,6 @@ Object.defineProperty(exports, "default", {
         return MetastatementForMetavariableSubstitution;
     }
 });
-var _matcher = /*#__PURE__*/ _interop_require_default(require("../matcher"));
 var _metaproof = require("../utilities/metaproof");
 function _class_call_check(instance, Constructor) {
     if (!(instance instanceof Constructor)) {
@@ -29,11 +28,6 @@ function _create_class(Constructor, protoProps, staticProps) {
     if (staticProps) _defineProperties(Constructor, staticProps);
     return Constructor;
 }
-function _interop_require_default(obj) {
-    return obj && obj.__esModule ? obj : {
-        default: obj
-    };
-}
 var MetastatementForMetavariableSubstitution = /*#__PURE__*/ function() {
     function MetastatementForMetavariableSubstitution(metavariableName, metastatementNode) {
         _class_call_check(this, MetastatementForMetavariableSubstitution);
@@ -57,13 +51,12 @@ var MetastatementForMetavariableSubstitution = /*#__PURE__*/ function() {
             key: "matchMetastatementNode",
             value: function matchMetastatementNode(metastatementNode) {
                 var metastatementNodeMatches;
-                var nodeA = this.metastatementNode, nodeB = metastatementNode, nodeMatches = _matcher.default.matchNode(nodeA, nodeB);
-                metastatementNodeMatches = nodeMatches; ///
+                metastatementNodeMatches = this.metastatementNode.match(metastatementNode);
                 if (!metastatementNodeMatches) {
                     var bracketedMetastatementChildNode = (0, _metaproof.bracketedMetastatementChildNodeFromMetastatementNode)(metastatementNode);
                     if (bracketedMetastatementChildNode !== null) {
-                        var _$metastatementNode = bracketedMetastatementChildNode, nodeA1 = this.metastatementNode, nodeB1 = _$metastatementNode, nodeMatches1 = _matcher.default.matchNode(nodeA1, nodeB1);
-                        metastatementNodeMatches = nodeMatches1; ///
+                        var _$metastatementNode = bracketedMetastatementChildNode; ///
+                        metastatementNodeMatches = this.metastatementNode.match(_$metastatementNode);
                     }
                 }
                 return metastatementNodeMatches;
@@ -86,4 +79,4 @@ var MetastatementForMetavariableSubstitution = /*#__PURE__*/ function() {
     return MetastatementForMetavariableSubstitution;
 }();
 
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zdWJzdGl0dXRpb24vbWV0YXN0YXRlbWVudEZvck1ldGF2YXJpYWJsZS5qcyIsIjw8anN4LWNvbmZpZy1wcmFnbWEuanM+PiJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuaW1wb3J0IG1hdGNoZXIgZnJvbSBcIi4uL21hdGNoZXJcIjtcblxuaW1wb3J0IHsgYnJhY2tldGVkTWV0YXN0YXRlbWVudENoaWxkTm9kZUZyb21NZXRhc3RhdGVtZW50Tm9kZSB9IGZyb20gXCIuLi91dGlsaXRpZXMvbWV0YXByb29mXCI7XG5cbmV4cG9ydCBkZWZhdWx0IGNsYXNzIE1ldGFzdGF0ZW1lbnRGb3JNZXRhdmFyaWFibGVTdWJzdGl0dXRpb24ge1xuICBjb25zdHJ1Y3RvcihtZXRhdmFyaWFibGVOYW1lLCBtZXRhc3RhdGVtZW50Tm9kZSkge1xuICAgIHRoaXMubWV0YXZhcmlhYmxlTmFtZSA9IG1ldGF2YXJpYWJsZU5hbWU7XG4gICAgdGhpcy5tZXRhc3RhdGVtZW50Tm9kZSA9IG1ldGFzdGF0ZW1lbnROb2RlO1xuICB9XG5cbiAgZ2V0TWV0YXZhcmlhYmxlTmFtZSgpIHtcbiAgICByZXR1cm4gdGhpcy5tZXRhdmFyaWFibGVOYW1lO1xuICB9XG5cbiAgZ2V0TWV0YXN0YXRlbWVudE5vZGUoKSB7XG4gICAgcmV0dXJuIHRoaXMubWV0YXN0YXRlbWVudE5vZGU7XG4gIH1cblxuICBtYXRjaE1ldGFzdGF0ZW1lbnROb2RlKG1ldGFzdGF0ZW1lbnROb2RlKSB7XG4gICAgbGV0IG1ldGFzdGF0ZW1lbnROb2RlTWF0Y2hlcztcblxuICAgIGNvbnN0IG5vZGVBID0gdGhpcy5tZXRhc3RhdGVtZW50Tm9kZSwgIC8vL1xuICAgICAgICAgIG5vZGVCID0gbWV0YXN0YXRlbWVudE5vZGUsXG4gICAgICAgICAgbm9kZU1hdGNoZXMgPSBtYXRjaGVyLm1hdGNoTm9kZShub2RlQSwgbm9kZUIpO1xuXG4gICAgbWV0YXN0YXRlbWVudE5vZGVNYXRjaGVzID0gbm9kZU1hdGNoZXM7ICAvLy9cblxuICAgIGlmICghbWV0YXN0YXRlbWVudE5vZGVNYXRjaGVzKSB7XG4gICAgICBjb25zdCBicmFja2V0ZWRNZXRhc3RhdGVtZW50Q2hpbGROb2RlID0gYnJhY2tldGVkTWV0YXN0YXRlbWVudENoaWxkTm9kZUZyb21NZXRhc3RhdGVtZW50Tm9kZShtZXRhc3RhdGVtZW50Tm9kZSk7XG5cbiAgICAgIGlmIChicmFja2V0ZWRNZXRhc3RhdGVtZW50Q2hpbGROb2RlICE9PSBudWxsKSB7XG4gICAgICAgIGNvbnN0IG1ldGFzdGF0ZW1lbnROb2RlID0gYnJhY2tldGVkTWV0YXN0YXRlbWVudENoaWxkTm9kZSwgLy8vXG4gICAgICAgICAgICAgIG5vZGVBID0gdGhpcy5tZXRhc3RhdGVtZW50Tm9kZSwgIC8vL1xuICAgICAgICAgICAgICBub2RlQiA9IG1ldGFzdGF0ZW1lbnROb2RlLFxuICAgICAgICAgICAgICBub2RlTWF0Y2hlcyA9IG1hdGNoZXIubWF0Y2hOb2RlKG5vZGVBLCBub2RlQik7XG5cbiAgICAgICAgbWV0YXN0YXRlbWVudE5vZGVNYXRjaGVzID0gbm9kZU1hdGNoZXM7ICAvLy9cbiAgICAgIH1cbiAgICB9XG5cbiAgICByZXR1cm4gbWV0YXN0YXRlbWVudE5vZGVNYXRjaGVzO1xuICB9XG5cbiAgc3RhdGljIGZyb21NZXRhdmFyaWFibGVOYW1lQW5kTWV0YXN0YXRlbWVudE5vZGUobWV0YXZhcmlhYmxlTmFtZSwgbWV0YXN0YXRlbWVudE5vZGUpIHtcbiAgICBsZXQgbWV0YXN0YXRlbWVudEZvck1ldGF2YXJpYWJsZVN1YnN0aXR1dGlvbiA9IG5ldyBNZXRhc3RhdGVtZW50Rm9yTWV0YXZhcmlhYmxlU3Vic3RpdHV0aW9uKG1ldGF2YXJpYWJsZU5hbWUsIG1ldGFzdGF0ZW1lbnROb2RlKTtcblxuICAgIGNvbnN0IGJyYWNrZXRlZE1ldGFzdGF0ZW1lbnRDaGlsZE5vZGUgPSBicmFja2V0ZWRNZXRhc3RhdGVtZW50Q2hpbGROb2RlRnJvbU1ldGFzdGF0ZW1lbnROb2RlKG1ldGFzdGF0ZW1lbnROb2RlKTtcblxuICAgIGlmIChicmFja2V0ZWRNZXRhc3RhdGVtZW50Q2hpbGROb2RlICE9PSBudWxsKSB7XG4gICAgICBjb25zdCBtZXRhc3RhdGVtZW50Tm9kZSA9IGJyYWNrZXRlZE1ldGFzdGF0ZW1lbnRDaGlsZE5vZGU7IC8vL1xuXG4gICAgICBtZXRhc3RhdGVtZW50Rm9yTWV0YXZhcmlhYmxlU3Vic3RpdHV0aW9uID0gbmV3IE1ldGFzdGF0ZW1lbnRGb3JNZXRhdmFyaWFibGVTdWJzdGl0dXRpb24obWV0YXZhcmlhYmxlTmFtZSwgbWV0YXN0YXRlbWVudE5vZGUpO1xuICAgIH1cblxuICAgIHJldHVybiBtZXRhc3RhdGVtZW50Rm9yTWV0YXZhcmlhYmxlU3Vic3RpdHV0aW9uO1xuICB9XG59XG4iLCJSZWFjdC5jcmVhdGVFbGVtZW50Il0sIm5hbWVzIjpbIk1ldGFzdGF0ZW1lbnRGb3JNZXRhdmFyaWFibGVTdWJzdGl0dXRpb24iLCJtZXRhdmFyaWFibGVOYW1lIiwibWV0YXN0YXRlbWVudE5vZGUiLCJnZXRNZXRhdmFyaWFibGVOYW1lIiwiZ2V0TWV0YXN0YXRlbWVudE5vZGUiLCJtYXRjaE1ldGFzdGF0ZW1lbnROb2RlIiwibWV0YXN0YXRlbWVudE5vZGVNYXRjaGVzIiwibm9kZUEiLCJub2RlQiIsIm5vZGVNYXRjaGVzIiwibWF0Y2hlciIsIm1hdGNoTm9kZSIsImJyYWNrZXRlZE1ldGFzdGF0ZW1lbnRDaGlsZE5vZGUiLCJicmFja2V0ZWRNZXRhc3RhdGVtZW50Q2hpbGROb2RlRnJvbU1ldGFzdGF0ZW1lbnROb2RlIiwiZnJvbU1ldGF2YXJpYWJsZU5hbWVBbmRNZXRhc3RhdGVtZW50Tm9kZSIsIm1ldGFzdGF0ZW1lbnRGb3JNZXRhdmFyaWFibGVTdWJzdGl0dXRpb24iXSwibWFwcGluZ3MiOiJBQUFBOzs7Ozs7O2VBTXFCQTs7OzhEQUpEO3lCQUVpRDs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUV0RCxJQUFBLEFBQU1BLHlEQUFOO2FBQU1BLHlDQUNQQyxnQkFBZ0IsRUFBRUMsaUJBQWlCO2dDQUQ1QkY7UUFFakIsSUFBSSxDQUFDQyxnQkFBZ0IsR0FBR0E7UUFDeEIsSUFBSSxDQUFDQyxpQkFBaUIsR0FBR0E7O2tCQUhSRjs7WUFNbkJHLEtBQUFBO21CQUFBQSxTQUFBQSxzQkFBc0I7Z0JBQ3BCLE9BQU8sSUFBSSxDQUFDRixnQkFBZ0I7WUFDOUI7OztZQUVBRyxLQUFBQTttQkFBQUEsU0FBQUEsdUJBQXVCO2dCQUNyQixPQUFPLElBQUksQ0FBQ0YsaUJBQWlCO1lBQy9COzs7WUFFQUcsS0FBQUE7bUJBQUFBLFNBQUFBLHVCQUF1QkgsaUJBQWlCLEVBQUU7Z0JBQ3hDLElBQUlJO2dCQUVKLElBQU1DLFFBQVEsSUFBSSxDQUFDTCxpQkFBaUIsRUFDOUJNLFFBQVFOLG1CQUNSTyxjQUFjQyxnQkFBTyxDQUFDQyxTQUFTLENBQUNKLE9BQU9DO2dCQUU3Q0YsMkJBQTJCRyxhQUFjLEdBQUc7Z0JBRTVDLElBQUksQ0FBQ0gsMEJBQTBCO29CQUM3QixJQUFNTSxrQ0FBa0NDLElBQUFBLCtEQUFvRCxFQUFDWDtvQkFFN0YsSUFBSVUsb0NBQW9DLElBQUksRUFBRTt3QkFDNUMsSUFBTVYsc0JBQW9CVSxpQ0FDcEJMLFNBQVEsSUFBSSxDQUFDTCxpQkFBaUIsRUFDOUJNLFNBQVFOLHFCQUNSTyxlQUFjQyxnQkFBTyxDQUFDQyxTQUFTLENBQUNKLFFBQU9DO3dCQUU3Q0YsMkJBQTJCRyxjQUFjLEdBQUc7b0JBQzlDLENBQUM7Z0JBQ0gsQ0FBQztnQkFFRCxPQUFPSDtZQUNUOzs7O1lBRU9RLEtBQUFBO21CQUFQLFNBQU9BLHlDQUF5Q2IsZ0JBQWdCLEVBQUVDLGlCQUFpQixFQUFFO2dCQUNuRixJQUFJYSwyQ0FBMkMsSUF4QzlCZix5Q0F3QzJFQyxrQkFBa0JDO2dCQUU5RyxJQUFNVSxrQ0FBa0NDLElBQUFBLCtEQUFvRCxFQUFDWDtnQkFFN0YsSUFBSVUsb0NBQW9DLElBQUksRUFBRTtvQkFDNUMsSUFBTVYsc0JBQW9CVSxpQ0FBaUMsR0FBRztvQkFFOURHLDJDQUEyQyxJQS9DNUJmLHlDQStDeUVDLGtCQUFrQkM7Z0JBQzVHLENBQUM7Z0JBRUQsT0FBT2E7WUFDVDs7O1dBbkRtQmYifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zdWJzdGl0dXRpb24vbWV0YXN0YXRlbWVudEZvck1ldGF2YXJpYWJsZS5qcyIsIjw8anN4LWNvbmZpZy1wcmFnbWEuanM+PiJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuaW1wb3J0IHsgYnJhY2tldGVkTWV0YXN0YXRlbWVudENoaWxkTm9kZUZyb21NZXRhc3RhdGVtZW50Tm9kZSB9IGZyb20gXCIuLi91dGlsaXRpZXMvbWV0YXByb29mXCI7XG5cbmV4cG9ydCBkZWZhdWx0IGNsYXNzIE1ldGFzdGF0ZW1lbnRGb3JNZXRhdmFyaWFibGVTdWJzdGl0dXRpb24ge1xuICBjb25zdHJ1Y3RvcihtZXRhdmFyaWFibGVOYW1lLCBtZXRhc3RhdGVtZW50Tm9kZSkge1xuICAgIHRoaXMubWV0YXZhcmlhYmxlTmFtZSA9IG1ldGF2YXJpYWJsZU5hbWU7XG4gICAgdGhpcy5tZXRhc3RhdGVtZW50Tm9kZSA9IG1ldGFzdGF0ZW1lbnROb2RlO1xuICB9XG5cbiAgZ2V0TWV0YXZhcmlhYmxlTmFtZSgpIHtcbiAgICByZXR1cm4gdGhpcy5tZXRhdmFyaWFibGVOYW1lO1xuICB9XG5cbiAgZ2V0TWV0YXN0YXRlbWVudE5vZGUoKSB7XG4gICAgcmV0dXJuIHRoaXMubWV0YXN0YXRlbWVudE5vZGU7XG4gIH1cblxuICBtYXRjaE1ldGFzdGF0ZW1lbnROb2RlKG1ldGFzdGF0ZW1lbnROb2RlKSB7XG4gICAgbGV0IG1ldGFzdGF0ZW1lbnROb2RlTWF0Y2hlcztcblxuICAgIG1ldGFzdGF0ZW1lbnROb2RlTWF0Y2hlcyA9IHRoaXMubWV0YXN0YXRlbWVudE5vZGUubWF0Y2gobWV0YXN0YXRlbWVudE5vZGUpXG5cbiAgICBpZiAoIW1ldGFzdGF0ZW1lbnROb2RlTWF0Y2hlcykge1xuICAgICAgY29uc3QgYnJhY2tldGVkTWV0YXN0YXRlbWVudENoaWxkTm9kZSA9IGJyYWNrZXRlZE1ldGFzdGF0ZW1lbnRDaGlsZE5vZGVGcm9tTWV0YXN0YXRlbWVudE5vZGUobWV0YXN0YXRlbWVudE5vZGUpO1xuXG4gICAgICBpZiAoYnJhY2tldGVkTWV0YXN0YXRlbWVudENoaWxkTm9kZSAhPT0gbnVsbCkge1xuICAgICAgICBjb25zdCBtZXRhc3RhdGVtZW50Tm9kZSA9IGJyYWNrZXRlZE1ldGFzdGF0ZW1lbnRDaGlsZE5vZGU7IC8vL1xuXG4gICAgICAgIG1ldGFzdGF0ZW1lbnROb2RlTWF0Y2hlcyA9IHRoaXMubWV0YXN0YXRlbWVudE5vZGUubWF0Y2gobWV0YXN0YXRlbWVudE5vZGUpO1xuICAgICAgfVxuICAgIH1cblxuICAgIHJldHVybiBtZXRhc3RhdGVtZW50Tm9kZU1hdGNoZXM7XG4gIH1cblxuICBzdGF0aWMgZnJvbU1ldGF2YXJpYWJsZU5hbWVBbmRNZXRhc3RhdGVtZW50Tm9kZShtZXRhdmFyaWFibGVOYW1lLCBtZXRhc3RhdGVtZW50Tm9kZSkge1xuICAgIGxldCBtZXRhc3RhdGVtZW50Rm9yTWV0YXZhcmlhYmxlU3Vic3RpdHV0aW9uID0gbmV3IE1ldGFzdGF0ZW1lbnRGb3JNZXRhdmFyaWFibGVTdWJzdGl0dXRpb24obWV0YXZhcmlhYmxlTmFtZSwgbWV0YXN0YXRlbWVudE5vZGUpO1xuXG4gICAgY29uc3QgYnJhY2tldGVkTWV0YXN0YXRlbWVudENoaWxkTm9kZSA9IGJyYWNrZXRlZE1ldGFzdGF0ZW1lbnRDaGlsZE5vZGVGcm9tTWV0YXN0YXRlbWVudE5vZGUobWV0YXN0YXRlbWVudE5vZGUpO1xuXG4gICAgaWYgKGJyYWNrZXRlZE1ldGFzdGF0ZW1lbnRDaGlsZE5vZGUgIT09IG51bGwpIHtcbiAgICAgIGNvbnN0IG1ldGFzdGF0ZW1lbnROb2RlID0gYnJhY2tldGVkTWV0YXN0YXRlbWVudENoaWxkTm9kZTsgLy8vXG5cbiAgICAgIG1ldGFzdGF0ZW1lbnRGb3JNZXRhdmFyaWFibGVTdWJzdGl0dXRpb24gPSBuZXcgTWV0YXN0YXRlbWVudEZvck1ldGF2YXJpYWJsZVN1YnN0aXR1dGlvbihtZXRhdmFyaWFibGVOYW1lLCBtZXRhc3RhdGVtZW50Tm9kZSk7XG4gICAgfVxuXG4gICAgcmV0dXJuIG1ldGFzdGF0ZW1lbnRGb3JNZXRhdmFyaWFibGVTdWJzdGl0dXRpb247XG4gIH1cbn1cbiIsIlJlYWN0LmNyZWF0ZUVsZW1lbnQiXSwibmFtZXMiOlsiTWV0YXN0YXRlbWVudEZvck1ldGF2YXJpYWJsZVN1YnN0aXR1dGlvbiIsIm1ldGF2YXJpYWJsZU5hbWUiLCJtZXRhc3RhdGVtZW50Tm9kZSIsImdldE1ldGF2YXJpYWJsZU5hbWUiLCJnZXRNZXRhc3RhdGVtZW50Tm9kZSIsIm1hdGNoTWV0YXN0YXRlbWVudE5vZGUiLCJtZXRhc3RhdGVtZW50Tm9kZU1hdGNoZXMiLCJtYXRjaCIsImJyYWNrZXRlZE1ldGFzdGF0ZW1lbnRDaGlsZE5vZGUiLCJicmFja2V0ZWRNZXRhc3RhdGVtZW50Q2hpbGROb2RlRnJvbU1ldGFzdGF0ZW1lbnROb2RlIiwiZnJvbU1ldGF2YXJpYWJsZU5hbWVBbmRNZXRhc3RhdGVtZW50Tm9kZSIsIm1ldGFzdGF0ZW1lbnRGb3JNZXRhdmFyaWFibGVTdWJzdGl0dXRpb24iXSwibWFwcGluZ3MiOiJBQUFBOzs7Ozs7O2VBSXFCQTs7O3lCQUZnRDs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFFdEQsSUFBQSxBQUFNQSx5REFBTjthQUFNQSx5Q0FDUEMsZ0JBQWdCLEVBQUVDLGlCQUFpQjtnQ0FENUJGO1FBRWpCLElBQUksQ0FBQ0MsZ0JBQWdCLEdBQUdBO1FBQ3hCLElBQUksQ0FBQ0MsaUJBQWlCLEdBQUdBOztrQkFIUkY7O1lBTW5CRyxLQUFBQTttQkFBQUEsU0FBQUEsc0JBQXNCO2dCQUNwQixPQUFPLElBQUksQ0FBQ0YsZ0JBQWdCO1lBQzlCOzs7WUFFQUcsS0FBQUE7bUJBQUFBLFNBQUFBLHVCQUF1QjtnQkFDckIsT0FBTyxJQUFJLENBQUNGLGlCQUFpQjtZQUMvQjs7O1lBRUFHLEtBQUFBO21CQUFBQSxTQUFBQSx1QkFBdUJILGlCQUFpQixFQUFFO2dCQUN4QyxJQUFJSTtnQkFFSkEsMkJBQTJCLElBQUksQ0FBQ0osaUJBQWlCLENBQUNLLEtBQUssQ0FBQ0w7Z0JBRXhELElBQUksQ0FBQ0ksMEJBQTBCO29CQUM3QixJQUFNRSxrQ0FBa0NDLElBQUFBLCtEQUFvRCxFQUFDUDtvQkFFN0YsSUFBSU0sb0NBQW9DLElBQUksRUFBRTt3QkFDNUMsSUFBTU4sc0JBQW9CTSxpQ0FBaUMsR0FBRzt3QkFFOURGLDJCQUEyQixJQUFJLENBQUNKLGlCQUFpQixDQUFDSyxLQUFLLENBQUNMO29CQUMxRCxDQUFDO2dCQUNILENBQUM7Z0JBRUQsT0FBT0k7WUFDVDs7OztZQUVPSSxLQUFBQTttQkFBUCxTQUFPQSx5Q0FBeUNULGdCQUFnQixFQUFFQyxpQkFBaUIsRUFBRTtnQkFDbkYsSUFBSVMsMkNBQTJDLElBakM5QlgseUNBaUMyRUMsa0JBQWtCQztnQkFFOUcsSUFBTU0sa0NBQWtDQyxJQUFBQSwrREFBb0QsRUFBQ1A7Z0JBRTdGLElBQUlNLG9DQUFvQyxJQUFJLEVBQUU7b0JBQzVDLElBQU1OLHNCQUFvQk0saUNBQWlDLEdBQUc7b0JBRTlERywyQ0FBMkMsSUF4QzVCWCx5Q0F3Q3lFQyxrQkFBa0JDO2dCQUM1RyxDQUFDO2dCQUVELE9BQU9TO1lBQ1Q7OztXQTVDbUJYIn0=

package/lib/substitution/statementForMetavariable.js

@@ -8,7 +8,6 @@ Object.defineProperty(exports, "default", {
         return StatementForMetavariableSubstitution;
     }
 });
-var _matcher = /*#__PURE__*/ _interop_require_default(require("../matcher"));
 var _proof = require("../utilities/proof");
 function _class_call_check(instance, Constructor) {
     if (!(instance instanceof Constructor)) {
@@ -29,11 +28,6 @@ function _create_class(Constructor, protoProps, staticProps) {
     if (staticProps) _defineProperties(Constructor, staticProps);
     return Constructor;
 }
-function _interop_require_default(obj) {
-    return obj && obj.__esModule ? obj : {
-        default: obj
-    };
-}
 var StatementForMetavariableSubstitution = /*#__PURE__*/ function() {
     function StatementForMetavariableSubstitution(metavariableName, statementNode) {
         _class_call_check(this, StatementForMetavariableSubstitution);
@@ -57,13 +51,12 @@ var StatementForMetavariableSubstitution = /*#__PURE__*/ function() {
             key: "matchStatementNode",
             value: function matchStatementNode(statementNode) {
                 var statementNodeMatches;
-                var nodeA = this.statementNode, nodeB = statementNode, nodeMatches = _matcher.default.matchNode(nodeA, nodeB);
-                statementNodeMatches = nodeMatches; ///
+                statementNodeMatches = this.statementNode.match(statementNode);
                 if (!statementNodeMatches) {
                     var bracketedStatementChildNode = (0, _proof.bracketedStatementChildNodeFromStatementNode)(statementNode);
                     if (bracketedStatementChildNode !== null) {
-                        var _$statementNode = bracketedStatementChildNode, nodeA1 = this.statementNode, nodeB1 = _$statementNode, nodeMatches1 = _matcher.default.matchNode(nodeA1, nodeB1);
-                        statementNodeMatches = nodeMatches1; ///
+                        var _$statementNode = bracketedStatementChildNode; ///
+                        statementNodeMatches = this.statementNode.match(_$statementNode);
                     }
                 }
                 return statementNodeMatches;
@@ -86,4 +79,4 @@ var StatementForMetavariableSubstitution = /*#__PURE__*/ function() {
     return StatementForMetavariableSubstitution;
 }();
 
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zdWJzdGl0dXRpb24vc3RhdGVtZW50Rm9yTWV0YXZhcmlhYmxlLmpzIiwiPDxqc3gtY29uZmlnLXByYWdtYS5qcz4+Il0sInNvdXJjZXNDb250ZW50IjpbIlwidXNlIHN0cmljdFwiO1xuXG5pbXBvcnQgbWF0Y2hlciBmcm9tIFwiLi4vbWF0Y2hlclwiO1xuXG5pbXBvcnQgeyBicmFja2V0ZWRTdGF0ZW1lbnRDaGlsZE5vZGVGcm9tU3RhdGVtZW50Tm9kZSB9IGZyb20gXCIuLi91dGlsaXRpZXMvcHJvb2ZcIjtcblxuZXhwb3J0IGRlZmF1bHQgY2xhc3MgU3RhdGVtZW50Rm9yTWV0YXZhcmlhYmxlU3Vic3RpdHV0aW9uIHtcbiAgY29uc3RydWN0b3IobWV0YXZhcmlhYmxlTmFtZSwgc3RhdGVtZW50Tm9kZSkge1xuICAgIHRoaXMubWV0YXZhcmlhYmxlTmFtZSA9IG1ldGF2YXJpYWJsZU5hbWU7XG4gICAgdGhpcy5zdGF0ZW1lbnROb2RlID0gc3RhdGVtZW50Tm9kZTtcbiAgfVxuXG4gIGdldE1ldGF2YXJpYWJsZU5hbWUoKSB7XG4gICAgcmV0dXJuIHRoaXMubWV0YXZhcmlhYmxlTmFtZTtcbiAgfVxuXG4gIGdldFN0YXRlbWVudE5vZGUoKSB7XG4gICAgcmV0dXJuIHRoaXMuc3RhdGVtZW50Tm9kZTtcbiAgfVxuXG4gIG1hdGNoU3RhdGVtZW50Tm9kZShzdGF0ZW1lbnROb2RlKSB7XG4gICAgbGV0IHN0YXRlbWVudE5vZGVNYXRjaGVzO1xuXG4gICAgY29uc3Qgbm9kZUEgPSB0aGlzLnN0YXRlbWVudE5vZGUsICAvLy9cbiAgICAgICAgICBub2RlQiA9IHN0YXRlbWVudE5vZGUsXG4gICAgICAgICAgbm9kZU1hdGNoZXMgPSBtYXRjaGVyLm1hdGNoTm9kZShub2RlQSwgbm9kZUIpO1xuXG4gICAgc3RhdGVtZW50Tm9kZU1hdGNoZXMgPSBub2RlTWF0Y2hlczsgIC8vL1xuXG4gICAgaWYgKCFzdGF0ZW1lbnROb2RlTWF0Y2hlcykge1xuICAgICAgY29uc3QgYnJhY2tldGVkU3RhdGVtZW50Q2hpbGROb2RlID0gYnJhY2tldGVkU3RhdGVtZW50Q2hpbGROb2RlRnJvbVN0YXRlbWVudE5vZGUoc3RhdGVtZW50Tm9kZSk7XG5cbiAgICAgIGlmIChicmFja2V0ZWRTdGF0ZW1lbnRDaGlsZE5vZGUgIT09IG51bGwpIHtcbiAgICAgICAgY29uc3Qgc3RhdGVtZW50Tm9kZSA9IGJyYWNrZXRlZFN0YXRlbWVudENoaWxkTm9kZSwgLy8vXG4gICAgICAgICAgICAgIG5vZGVBID0gdGhpcy5zdGF0ZW1lbnROb2RlLCAgLy8vXG4gICAgICAgICAgICAgIG5vZGVCID0gc3RhdGVtZW50Tm9kZSxcbiAgICAgICAgICAgICAgbm9kZU1hdGNoZXMgPSBtYXRjaGVyLm1hdGNoTm9kZShub2RlQSwgbm9kZUIpO1xuXG4gICAgICAgIHN0YXRlbWVudE5vZGVNYXRjaGVzID0gbm9kZU1hdGNoZXM7ICAvLy9cbiAgICAgIH1cbiAgICB9XG5cbiAgICByZXR1cm4gc3RhdGVtZW50Tm9kZU1hdGNoZXM7XG4gIH1cblxuICBzdGF0aWMgZnJvbU1ldGF2YXJpYWJsZU5hbWVBbmRTdGF0ZW1lbnROb2RlKG1ldGF2YXJpYWJsZU5hbWUsIHN0YXRlbWVudE5vZGUpIHtcbiAgICBsZXQgc3RhdGVtZW50Rm9yTWV0YXZhcmlhYmxlU3Vic3RpdHV0aW9uID0gbmV3IFN0YXRlbWVudEZvck1ldGF2YXJpYWJsZVN1YnN0aXR1dGlvbihtZXRhdmFyaWFibGVOYW1lLCBzdGF0ZW1lbnROb2RlKTtcblxuICAgIGNvbnN0IGJyYWNrZXRlZFN0YXRlbWVudENoaWxkTm9kZSA9IGJyYWNrZXRlZFN0YXRlbWVudENoaWxkTm9kZUZyb21TdGF0ZW1lbnROb2RlKHN0YXRlbWVudE5vZGUpO1xuXG4gICAgaWYgKGJyYWNrZXRlZFN0YXRlbWVudENoaWxkTm9kZSAhPT0gbnVsbCkge1xuICAgICAgY29uc3Qgc3RhdGVtZW50Tm9kZSA9IGJyYWNrZXRlZFN0YXRlbWVudENoaWxkTm9kZTsgLy8vXG5cbiAgICAgIHN0YXRlbWVudEZvck1ldGF2YXJpYWJsZVN1YnN0aXR1dGlvbiA9IG5ldyBTdGF0ZW1lbnRGb3JNZXRhdmFyaWFibGVTdWJzdGl0dXRpb24obWV0YXZhcmlhYmxlTmFtZSwgc3RhdGVtZW50Tm9kZSk7XG4gICAgfVxuXG4gICAgcmV0dXJuIHN0YXRlbWVudEZvck1ldGF2YXJpYWJsZVN1YnN0aXR1dGlvbjtcbiAgfVxufVxuIiwiUmVhY3QuY3JlYXRlRWxlbWVudCJdLCJuYW1lcyI6WyJTdGF0ZW1lbnRGb3JNZXRhdmFyaWFibGVTdWJzdGl0dXRpb24iLCJtZXRhdmFyaWFibGVOYW1lIiwic3RhdGVtZW50Tm9kZSIsImdldE1ldGF2YXJpYWJsZU5hbWUiLCJnZXRTdGF0ZW1lbnROb2RlIiwibWF0Y2hTdGF0ZW1lbnROb2RlIiwic3RhdGVtZW50Tm9kZU1hdGNoZXMiLCJub2RlQSIsIm5vZGVCIiwibm9kZU1hdGNoZXMiLCJtYXRjaGVyIiwibWF0Y2hOb2RlIiwiYnJhY2tldGVkU3RhdGVtZW50Q2hpbGROb2RlIiwiYnJhY2tldGVkU3RhdGVtZW50Q2hpbGROb2RlRnJvbVN0YXRlbWVudE5vZGUiLCJmcm9tTWV0YXZhcmlhYmxlTmFtZUFuZFN0YXRlbWVudE5vZGUiLCJzdGF0ZW1lbnRGb3JNZXRhdmFyaWFibGVTdWJzdGl0dXRpb24iXSwibWFwcGluZ3MiOiJBQUFBOzs7Ozs7O2VBTXFCQTs7OzhEQUpEO3FCQUV5Qzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUU5QyxJQUFBLEFBQU1BLHFEQUFOO2FBQU1BLHFDQUNQQyxnQkFBZ0IsRUFBRUMsYUFBYTtnQ0FEeEJGO1FBRWpCLElBQUksQ0FBQ0MsZ0JBQWdCLEdBQUdBO1FBQ3hCLElBQUksQ0FBQ0MsYUFBYSxHQUFHQTs7a0JBSEpGOztZQU1uQkcsS0FBQUE7bUJBQUFBLFNBQUFBLHNCQUFzQjtnQkFDcEIsT0FBTyxJQUFJLENBQUNGLGdCQUFnQjtZQUM5Qjs7O1lBRUFHLEtBQUFBO21CQUFBQSxTQUFBQSxtQkFBbUI7Z0JBQ2pCLE9BQU8sSUFBSSxDQUFDRixhQUFhO1lBQzNCOzs7WUFFQUcsS0FBQUE7bUJBQUFBLFNBQUFBLG1CQUFtQkgsYUFBYSxFQUFFO2dCQUNoQyxJQUFJSTtnQkFFSixJQUFNQyxRQUFRLElBQUksQ0FBQ0wsYUFBYSxFQUMxQk0sUUFBUU4sZUFDUk8sY0FBY0MsZ0JBQU8sQ0FBQ0MsU0FBUyxDQUFDSixPQUFPQztnQkFFN0NGLHVCQUF1QkcsYUFBYyxHQUFHO2dCQUV4QyxJQUFJLENBQUNILHNCQUFzQjtvQkFDekIsSUFBTU0sOEJBQThCQyxJQUFBQSxtREFBNEMsRUFBQ1g7b0JBRWpGLElBQUlVLGdDQUFnQyxJQUFJLEVBQUU7d0JBQ3hDLElBQU1WLGtCQUFnQlUsNkJBQ2hCTCxTQUFRLElBQUksQ0FBQ0wsYUFBYSxFQUMxQk0sU0FBUU4saUJBQ1JPLGVBQWNDLGdCQUFPLENBQUNDLFNBQVMsQ0FBQ0osUUFBT0M7d0JBRTdDRix1QkFBdUJHLGNBQWMsR0FBRztvQkFDMUMsQ0FBQztnQkFDSCxDQUFDO2dCQUVELE9BQU9IO1lBQ1Q7Ozs7WUFFT1EsS0FBQUE7bUJBQVAsU0FBT0EscUNBQXFDYixnQkFBZ0IsRUFBRUMsYUFBYSxFQUFFO2dCQUMzRSxJQUFJYSx1Q0FBdUMsSUF4QzFCZixxQ0F3Q21FQyxrQkFBa0JDO2dCQUV0RyxJQUFNVSw4QkFBOEJDLElBQUFBLG1EQUE0QyxFQUFDWDtnQkFFakYsSUFBSVUsZ0NBQWdDLElBQUksRUFBRTtvQkFDeEMsSUFBTVYsa0JBQWdCVSw2QkFBNkIsR0FBRztvQkFFdERHLHVDQUF1QyxJQS9DeEJmLHFDQStDaUVDLGtCQUFrQkM7Z0JBQ3BHLENBQUM7Z0JBRUQsT0FBT2E7WUFDVDs7O1dBbkRtQmYifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zdWJzdGl0dXRpb24vc3RhdGVtZW50Rm9yTWV0YXZhcmlhYmxlLmpzIiwiPDxqc3gtY29uZmlnLXByYWdtYS5qcz4+Il0sInNvdXJjZXNDb250ZW50IjpbIlwidXNlIHN0cmljdFwiO1xuXG5pbXBvcnQgeyBicmFja2V0ZWRTdGF0ZW1lbnRDaGlsZE5vZGVGcm9tU3RhdGVtZW50Tm9kZSB9IGZyb20gXCIuLi91dGlsaXRpZXMvcHJvb2ZcIjtcblxuZXhwb3J0IGRlZmF1bHQgY2xhc3MgU3RhdGVtZW50Rm9yTWV0YXZhcmlhYmxlU3Vic3RpdHV0aW9uIHtcbiAgY29uc3RydWN0b3IobWV0YXZhcmlhYmxlTmFtZSwgc3RhdGVtZW50Tm9kZSkge1xuICAgIHRoaXMubWV0YXZhcmlhYmxlTmFtZSA9IG1ldGF2YXJpYWJsZU5hbWU7XG4gICAgdGhpcy5zdGF0ZW1lbnROb2RlID0gc3RhdGVtZW50Tm9kZTtcbiAgfVxuXG4gIGdldE1ldGF2YXJpYWJsZU5hbWUoKSB7XG4gICAgcmV0dXJuIHRoaXMubWV0YXZhcmlhYmxlTmFtZTtcbiAgfVxuXG4gIGdldFN0YXRlbWVudE5vZGUoKSB7XG4gICAgcmV0dXJuIHRoaXMuc3RhdGVtZW50Tm9kZTtcbiAgfVxuXG4gIG1hdGNoU3RhdGVtZW50Tm9kZShzdGF0ZW1lbnROb2RlKSB7XG4gICAgbGV0IHN0YXRlbWVudE5vZGVNYXRjaGVzO1xuXG4gICAgc3RhdGVtZW50Tm9kZU1hdGNoZXMgPSB0aGlzLnN0YXRlbWVudE5vZGUubWF0Y2goc3RhdGVtZW50Tm9kZSk7XG5cbiAgICBpZiAoIXN0YXRlbWVudE5vZGVNYXRjaGVzKSB7XG4gICAgICBjb25zdCBicmFja2V0ZWRTdGF0ZW1lbnRDaGlsZE5vZGUgPSBicmFja2V0ZWRTdGF0ZW1lbnRDaGlsZE5vZGVGcm9tU3RhdGVtZW50Tm9kZShzdGF0ZW1lbnROb2RlKTtcblxuICAgICAgaWYgKGJyYWNrZXRlZFN0YXRlbWVudENoaWxkTm9kZSAhPT0gbnVsbCkge1xuICAgICAgICBjb25zdCBzdGF0ZW1lbnROb2RlID0gYnJhY2tldGVkU3RhdGVtZW50Q2hpbGROb2RlOyAvLy9cblxuICAgICAgICBzdGF0ZW1lbnROb2RlTWF0Y2hlcyA9IHRoaXMuc3RhdGVtZW50Tm9kZS5tYXRjaChzdGF0ZW1lbnROb2RlKTtcbiAgICAgIH1cbiAgICB9XG5cbiAgICByZXR1cm4gc3RhdGVtZW50Tm9kZU1hdGNoZXM7XG4gIH1cblxuICBzdGF0aWMgZnJvbU1ldGF2YXJpYWJsZU5hbWVBbmRTdGF0ZW1lbnROb2RlKG1ldGF2YXJpYWJsZU5hbWUsIHN0YXRlbWVudE5vZGUpIHtcbiAgICBsZXQgc3RhdGVtZW50Rm9yTWV0YXZhcmlhYmxlU3Vic3RpdHV0aW9uID0gbmV3IFN0YXRlbWVudEZvck1ldGF2YXJpYWJsZVN1YnN0aXR1dGlvbihtZXRhdmFyaWFibGVOYW1lLCBzdGF0ZW1lbnROb2RlKTtcblxuICAgIGNvbnN0IGJyYWNrZXRlZFN0YXRlbWVudENoaWxkTm9kZSA9IGJyYWNrZXRlZFN0YXRlbWVudENoaWxkTm9kZUZyb21TdGF0ZW1lbnROb2RlKHN0YXRlbWVudE5vZGUpO1xuXG4gICAgaWYgKGJyYWNrZXRlZFN0YXRlbWVudENoaWxkTm9kZSAhPT0gbnVsbCkge1xuICAgICAgY29uc3Qgc3RhdGVtZW50Tm9kZSA9IGJyYWNrZXRlZFN0YXRlbWVudENoaWxkTm9kZTsgLy8vXG5cbiAgICAgIHN0YXRlbWVudEZvck1ldGF2YXJpYWJsZVN1YnN0aXR1dGlvbiA9IG5ldyBTdGF0ZW1lbnRGb3JNZXRhdmFyaWFibGVTdWJzdGl0dXRpb24obWV0YXZhcmlhYmxlTmFtZSwgc3RhdGVtZW50Tm9kZSk7XG4gICAgfVxuXG4gICAgcmV0dXJuIHN0YXRlbWVudEZvck1ldGF2YXJpYWJsZVN1YnN0aXR1dGlvbjtcbiAgfVxufVxuIiwiUmVhY3QuY3JlYXRlRWxlbWVudCJdLCJuYW1lcyI6WyJTdGF0ZW1lbnRGb3JNZXRhdmFyaWFibGVTdWJzdGl0dXRpb24iLCJtZXRhdmFyaWFibGVOYW1lIiwic3RhdGVtZW50Tm9kZSIsImdldE1ldGF2YXJpYWJsZU5hbWUiLCJnZXRTdGF0ZW1lbnROb2RlIiwibWF0Y2hTdGF0ZW1lbnROb2RlIiwic3RhdGVtZW50Tm9kZU1hdGNoZXMiLCJtYXRjaCIsImJyYWNrZXRlZFN0YXRlbWVudENoaWxkTm9kZSIsImJyYWNrZXRlZFN0YXRlbWVudENoaWxkTm9kZUZyb21TdGF0ZW1lbnROb2RlIiwiZnJvbU1ldGF2YXJpYWJsZU5hbWVBbmRTdGF0ZW1lbnROb2RlIiwic3RhdGVtZW50Rm9yTWV0YXZhcmlhYmxlU3Vic3RpdHV0aW9uIl0sIm1hcHBpbmdzIjoiQUFBQTs7Ozs7OztlQUlxQkE7OztxQkFGd0M7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBRTlDLElBQUEsQUFBTUEscURBQU47YUFBTUEscUNBQ1BDLGdCQUFnQixFQUFFQyxhQUFhO2dDQUR4QkY7UUFFakIsSUFBSSxDQUFDQyxnQkFBZ0IsR0FBR0E7UUFDeEIsSUFBSSxDQUFDQyxhQUFhLEdBQUdBOztrQkFISkY7O1lBTW5CRyxLQUFBQTttQkFBQUEsU0FBQUEsc0JBQXNCO2dCQUNwQixPQUFPLElBQUksQ0FBQ0YsZ0JBQWdCO1lBQzlCOzs7WUFFQUcsS0FBQUE7bUJBQUFBLFNBQUFBLG1CQUFtQjtnQkFDakIsT0FBTyxJQUFJLENBQUNGLGFBQWE7WUFDM0I7OztZQUVBRyxLQUFBQTttQkFBQUEsU0FBQUEsbUJBQW1CSCxhQUFhLEVBQUU7Z0JBQ2hDLElBQUlJO2dCQUVKQSx1QkFBdUIsSUFBSSxDQUFDSixhQUFhLENBQUNLLEtBQUssQ0FBQ0w7Z0JBRWhELElBQUksQ0FBQ0ksc0JBQXNCO29CQUN6QixJQUFNRSw4QkFBOEJDLElBQUFBLG1EQUE0QyxFQUFDUDtvQkFFakYsSUFBSU0sZ0NBQWdDLElBQUksRUFBRTt3QkFDeEMsSUFBTU4sa0JBQWdCTSw2QkFBNkIsR0FBRzt3QkFFdERGLHVCQUF1QixJQUFJLENBQUNKLGFBQWEsQ0FBQ0ssS0FBSyxDQUFDTDtvQkFDbEQsQ0FBQztnQkFDSCxDQUFDO2dCQUVELE9BQU9JO1lBQ1Q7Ozs7WUFFT0ksS0FBQUE7bUJBQVAsU0FBT0EscUNBQXFDVCxnQkFBZ0IsRUFBRUMsYUFBYSxFQUFFO2dCQUMzRSxJQUFJUyx1Q0FBdUMsSUFqQzFCWCxxQ0FpQ21FQyxrQkFBa0JDO2dCQUV0RyxJQUFNTSw4QkFBOEJDLElBQUFBLG1EQUE0QyxFQUFDUDtnQkFFakYsSUFBSU0sZ0NBQWdDLElBQUksRUFBRTtvQkFDeEMsSUFBTU4sa0JBQWdCTSw2QkFBNkIsR0FBRztvQkFFdERHLHVDQUF1QyxJQXhDeEJYLHFDQXdDaUVDLGtCQUFrQkM7Z0JBQ3BHLENBQUM7Z0JBRUQsT0FBT1M7WUFDVDs7O1dBNUNtQlgifQ==

package/lib/substitution/termForVariable.js

@@ -8,7 +8,6 @@ Object.defineProperty(exports, "default", {
         return TermForVariableSubstitution;
     }
 });
-var _matcher = /*#__PURE__*/ _interop_require_default(require("../matcher"));
 function _class_call_check(instance, Constructor) {
     if (!(instance instanceof Constructor)) {
         throw new TypeError("Cannot call a class as a function");
@@ -28,11 +27,6 @@ function _create_class(Constructor, protoProps, staticProps) {
     if (staticProps) _defineProperties(Constructor, staticProps);
     return Constructor;
 }
-function _interop_require_default(obj) {
-    return obj && obj.__esModule ? obj : {
-        default: obj
-    };
-}
 var TermForVariableSubstitution = /*#__PURE__*/ function() {
     function TermForVariableSubstitution(variableName, termNode) {
         _class_call_check(this, TermForVariableSubstitution);
@@ -56,8 +50,7 @@ var TermForVariableSubstitution = /*#__PURE__*/ function() {
             key: "matchTermNode",
             value: function matchTermNode(termNode) {
                 var termNodeMatches;
-                var nodeA = this.termNode, nodeB = termNode, nodeMatches = _matcher.default.matchNode(nodeA, nodeB);
-                termNodeMatches = nodeMatches; ///
+                termNodeMatches = this.termNode.match(termNode);
                 return termNodeMatches;
             }
         }
@@ -73,4 +66,4 @@ var TermForVariableSubstitution = /*#__PURE__*/ function() {
     return TermForVariableSubstitution;
 }();
 
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zdWJzdGl0dXRpb24vdGVybUZvclZhcmlhYmxlLmpzIiwiPDxqc3gtY29uZmlnLXByYWdtYS5qcz4+Il0sInNvdXJjZXNDb250ZW50IjpbIlwidXNlIHN0cmljdFwiO1xuXG5pbXBvcnQgbWF0Y2hlciBmcm9tIFwiLi4vbWF0Y2hlclwiO1xuXG5leHBvcnQgZGVmYXVsdCBjbGFzcyBUZXJtRm9yVmFyaWFibGVTdWJzdGl0dXRpb24ge1xuICBjb25zdHJ1Y3Rvcih2YXJpYWJsZU5hbWUsIHRlcm1Ob2RlKSB7XG4gICAgdGhpcy52YXJpYWJsZU5hbWUgPSB2YXJpYWJsZU5hbWU7XG4gICAgdGhpcy50ZXJtTm9kZSA9IHRlcm1Ob2RlO1xuICB9XG5cbiAgZ2V0VmFyaWFibGVOYW1lKCkge1xuICAgIHJldHVybiB0aGlzLnZhcmlhYmxlTmFtZTtcbiAgfVxuXG4gIGdldFRlcm1Ob2RlKCkge1xuICAgIHJldHVybiB0aGlzLnRlcm1Ob2RlO1xuICB9XG5cbiAgbWF0Y2hUZXJtTm9kZSh0ZXJtTm9kZSkge1xuICAgIGxldCB0ZXJtTm9kZU1hdGNoZXM7XG5cbiAgICBjb25zdCBub2RlQSA9IHRoaXMudGVybU5vZGUsICAvLy9cbiAgICAgICAgICBub2RlQiA9IHRlcm1Ob2RlLFxuICAgICAgICAgIG5vZGVNYXRjaGVzID0gbWF0Y2hlci5tYXRjaE5vZGUobm9kZUEsIG5vZGVCKTtcblxuICAgIHRlcm1Ob2RlTWF0Y2hlcyA9IG5vZGVNYXRjaGVzOyAgLy8vXG5cbiAgICByZXR1cm4gdGVybU5vZGVNYXRjaGVzO1xuICB9XG5cbiAgc3RhdGljIGZyb21WYXJpYWJsZU5hbWVBbmRUZXJtTm9kZSh2YXJpYWJsZU5hbWUsIHRlcm1Ob2RlKSB7XG4gICAgY29uc3QgdGVybUZvclZhcmlhYmxlU3Vic3RpdHV0aW9uID0gbmV3IFRlcm1Gb3JWYXJpYWJsZVN1YnN0aXR1dGlvbih2YXJpYWJsZU5hbWUsIHRlcm1Ob2RlKTtcblxuICAgIHJldHVybiB0ZXJtRm9yVmFyaWFibGVTdWJzdGl0dXRpb247XG4gIH1cbn1cbiIsIlJlYWN0LmNyZWF0ZUVsZW1lbnQiXSwibmFtZXMiOlsiVGVybUZvclZhcmlhYmxlU3Vic3RpdHV0aW9uIiwidmFyaWFibGVOYW1lIiwidGVybU5vZGUiLCJnZXRWYXJpYWJsZU5hbWUiLCJnZXRUZXJtTm9kZSIsIm1hdGNoVGVybU5vZGUiLCJ0ZXJtTm9kZU1hdGNoZXMiLCJub2RlQSIsIm5vZGVCIiwibm9kZU1hdGNoZXMiLCJtYXRjaGVyIiwibWF0Y2hOb2RlIiwiZnJvbVZhcmlhYmxlTmFtZUFuZFRlcm1Ob2RlIiwidGVybUZvclZhcmlhYmxlU3Vic3RpdHV0aW9uIl0sIm1hcHBpbmdzIjoiQUFBQTs7Ozs7OztlQUlxQkE7Ozs4REFGRDs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUVMLElBQUEsQUFBTUEsNENBQU47YUFBTUEsNEJBQ1BDLFlBQVksRUFBRUMsUUFBUTtnQ0FEZkY7UUFFakIsSUFBSSxDQUFDQyxZQUFZLEdBQUdBO1FBQ3BCLElBQUksQ0FBQ0MsUUFBUSxHQUFHQTs7a0JBSENGOztZQU1uQkcsS0FBQUE7bUJBQUFBLFNBQUFBLGtCQUFrQjtnQkFDaEIsT0FBTyxJQUFJLENBQUNGLFlBQVk7WUFDMUI7OztZQUVBRyxLQUFBQTttQkFBQUEsU0FBQUEsY0FBYztnQkFDWixPQUFPLElBQUksQ0FBQ0YsUUFBUTtZQUN0Qjs7O1lBRUFHLEtBQUFBO21CQUFBQSxTQUFBQSxjQUFjSCxRQUFRLEVBQUU7Z0JBQ3RCLElBQUlJO2dCQUVKLElBQU1DLFFBQVEsSUFBSSxDQUFDTCxRQUFRLEVBQ3JCTSxRQUFRTixVQUNSTyxjQUFjQyxnQkFBTyxDQUFDQyxTQUFTLENBQUNKLE9BQU9DO2dCQUU3Q0Ysa0JBQWtCRyxhQUFjLEdBQUc7Z0JBRW5DLE9BQU9IO1lBQ1Q7Ozs7WUFFT00sS0FBQUE7bUJBQVAsU0FBT0EsNEJBQTRCWCxZQUFZLEVBQUVDLFFBQVEsRUFBRTtnQkFDekQsSUFBTVcsOEJBQThCLElBM0JuQmIsNEJBMkJtREMsY0FBY0M7Z0JBRWxGLE9BQU9XO1lBQ1Q7OztXQTlCbUJiIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zdWJzdGl0dXRpb24vdGVybUZvclZhcmlhYmxlLmpzIiwiPDxqc3gtY29uZmlnLXByYWdtYS5qcz4+Il0sInNvdXJjZXNDb250ZW50IjpbIlwidXNlIHN0cmljdFwiO1xuXG5leHBvcnQgZGVmYXVsdCBjbGFzcyBUZXJtRm9yVmFyaWFibGVTdWJzdGl0dXRpb24ge1xuICBjb25zdHJ1Y3Rvcih2YXJpYWJsZU5hbWUsIHRlcm1Ob2RlKSB7XG4gICAgdGhpcy52YXJpYWJsZU5hbWUgPSB2YXJpYWJsZU5hbWU7XG4gICAgdGhpcy50ZXJtTm9kZSA9IHRlcm1Ob2RlO1xuICB9XG5cbiAgZ2V0VmFyaWFibGVOYW1lKCkge1xuICAgIHJldHVybiB0aGlzLnZhcmlhYmxlTmFtZTtcbiAgfVxuXG4gIGdldFRlcm1Ob2RlKCkge1xuICAgIHJldHVybiB0aGlzLnRlcm1Ob2RlO1xuICB9XG5cbiAgbWF0Y2hUZXJtTm9kZSh0ZXJtTm9kZSkge1xuICAgIGxldCB0ZXJtTm9kZU1hdGNoZXM7XG5cbiAgICB0ZXJtTm9kZU1hdGNoZXMgPSB0aGlzLnRlcm1Ob2RlLm1hdGNoKHRlcm1Ob2RlKTtcblxuICAgIHJldHVybiB0ZXJtTm9kZU1hdGNoZXM7XG4gIH1cblxuICBzdGF0aWMgZnJvbVZhcmlhYmxlTmFtZUFuZFRlcm1Ob2RlKHZhcmlhYmxlTmFtZSwgdGVybU5vZGUpIHtcbiAgICBjb25zdCB0ZXJtRm9yVmFyaWFibGVTdWJzdGl0dXRpb24gPSBuZXcgVGVybUZvclZhcmlhYmxlU3Vic3RpdHV0aW9uKHZhcmlhYmxlTmFtZSwgdGVybU5vZGUpO1xuXG4gICAgcmV0dXJuIHRlcm1Gb3JWYXJpYWJsZVN1YnN0aXR1dGlvbjtcbiAgfVxufVxuIiwiUmVhY3QuY3JlYXRlRWxlbWVudCJdLCJuYW1lcyI6WyJUZXJtRm9yVmFyaWFibGVTdWJzdGl0dXRpb24iLCJ2YXJpYWJsZU5hbWUiLCJ0ZXJtTm9kZSIsImdldFZhcmlhYmxlTmFtZSIsImdldFRlcm1Ob2RlIiwibWF0Y2hUZXJtTm9kZSIsInRlcm1Ob2RlTWF0Y2hlcyIsIm1hdGNoIiwiZnJvbVZhcmlhYmxlTmFtZUFuZFRlcm1Ob2RlIiwidGVybUZvclZhcmlhYmxlU3Vic3RpdHV0aW9uIl0sIm1hcHBpbmdzIjoiQUFBQTs7Ozs7OztlQUVxQkE7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBTixJQUFBLEFBQU1BLDRDQUFOO2FBQU1BLDRCQUNQQyxZQUFZLEVBQUVDLFFBQVE7Z0NBRGZGO1FBRWpCLElBQUksQ0FBQ0MsWUFBWSxHQUFHQTtRQUNwQixJQUFJLENBQUNDLFFBQVEsR0FBR0E7O2tCQUhDRjs7WUFNbkJHLEtBQUFBO21CQUFBQSxTQUFBQSxrQkFBa0I7Z0JBQ2hCLE9BQU8sSUFBSSxDQUFDRixZQUFZO1lBQzFCOzs7WUFFQUcsS0FBQUE7bUJBQUFBLFNBQUFBLGNBQWM7Z0JBQ1osT0FBTyxJQUFJLENBQUNGLFFBQVE7WUFDdEI7OztZQUVBRyxLQUFBQTttQkFBQUEsU0FBQUEsY0FBY0gsUUFBUSxFQUFFO2dCQUN0QixJQUFJSTtnQkFFSkEsa0JBQWtCLElBQUksQ0FBQ0osUUFBUSxDQUFDSyxLQUFLLENBQUNMO2dCQUV0QyxPQUFPSTtZQUNUOzs7O1lBRU9FLEtBQUFBO21CQUFQLFNBQU9BLDRCQUE0QlAsWUFBWSxFQUFFQyxRQUFRLEVBQUU7Z0JBQ3pELElBQU1PLDhCQUE4QixJQXZCbkJULDRCQXVCbURDLGNBQWNDO2dCQUVsRixPQUFPTztZQUNUOzs7V0ExQm1CVCJ9

package/lib/utilities/metaproof.js

@@ -16,7 +16,6 @@ _export(exports, {
         return bracketedMetastatementChildNodeFromMetastatementNode;
     }
 });
-var _matcher = /*#__PURE__*/ _interop_require_default(require("../matcher"));
 var _bracketed = /*#__PURE__*/ _interop_require_default(require("../node/metastatement/bracketed"));
 var _query = require("../utilities/query");
 var _constants = require("../constants");
@@ -29,32 +28,32 @@ var bracketedMetastatementChildNodeQuery = (0, _query.nodeQuery)("/metastatement
 function matchMetastatementModuloBrackets(metastatementNodeA, metastatementNodeB) {
     var metastatementMatchesModuloBrackets = false;
     if (!metastatementMatchesModuloBrackets) {
-        var nodeA = metastatementNodeA, nodeB = metastatementNodeB, nodeMatches = _matcher.default.matchNode(nodeA, nodeB);
-        metastatementMatchesModuloBrackets = nodeMatches; ///
+        var metastatementNodeMatches = metastatementNodeA.match(metastatementNodeB);
+        metastatementMatchesModuloBrackets = metastatementNodeMatches; ///
     }
     if (!metastatementMatchesModuloBrackets) {
         var bracketedMetastatementChildNodeA = bracketedMetastatementChildNodeFromMetastatementNode(metastatementNodeA);
         if (bracketedMetastatementChildNodeA !== null) {
-            var nodeA1 = bracketedMetastatementChildNodeA, nodeB1 = metastatementNodeB, nodeMatches1 = _matcher.default.matchNode(nodeA1, nodeB1);
-            metastatementMatchesModuloBrackets = nodeMatches1; ///
+            var bracketedMetastatementChildNodeAMatchesMetastatementNodeB = bracketedMetastatementChildNodeA.match(metastatementNodeB);
+            metastatementMatchesModuloBrackets = bracketedMetastatementChildNodeAMatchesMetastatementNodeB; ///
         }
     }
     if (!metastatementMatchesModuloBrackets) {
         var bracketedMetastatementChildNodeB = bracketedMetastatementChildNodeFromMetastatementNode(metastatementNodeB);
         if (bracketedMetastatementChildNodeB !== null) {
-            var nodeA2 = metastatementNodeA, nodeB2 = bracketedMetastatementChildNodeB, nodeMatches2 = _matcher.default.matchNode(nodeA2, nodeB2);
-            metastatementMatchesModuloBrackets = nodeMatches2; ///
+            var metastatementNodeAMatchesBracketedMetastatementChildNodeB = metastatementNodeA.match(bracketedMetastatementChildNodeB);
+            metastatementMatchesModuloBrackets = metastatementNodeAMatchesBracketedMetastatementChildNodeB; ///
         }
     }
     return metastatementMatchesModuloBrackets;
 }
 function bracketedMetastatementChildNodeFromMetastatementNode(metastatementNode) {
     var bracketedMetastatementChildNode = null;
-    var nodeA = metastatementNode, nodeB = _bracketed.default, depth = _constants.BRACKETED_METASTATEMENT_DEPTH, nonTerminalNodeMatches = _matcher.default.matchNode(nodeA, nodeB, depth);
-    if (nonTerminalNodeMatches) {
+    var depth = _constants.BRACKETED_METASTATEMENT_DEPTH, metastatementNodeMatchesBracketedMetastatementNode = metastatementNode.match(_bracketed.default, depth);
+    if (metastatementNodeMatchesBracketedMetastatementNode) {
         bracketedMetastatementChildNode = bracketedMetastatementChildNodeQuery(metastatementNode);
     }
     return bracketedMetastatementChildNode;
 }
 
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlsaXRpZXMvbWV0YXByb29mLmpzIl0sInNvdXJjZXNDb250ZW50IjpbIlwidXNlIHN0cmljdFwiO1xuXG5pbXBvcnQgbWF0Y2hlciBmcm9tIFwiLi4vbWF0Y2hlclwiO1xuaW1wb3J0IGJyYWNrZXRlZE1ldGFzdGF0ZW1lbnROb2RlIGZyb20gXCIuLi9ub2RlL21ldGFzdGF0ZW1lbnQvYnJhY2tldGVkXCI7XG5cbmltcG9ydCB7IG5vZGVRdWVyeSB9IGZyb20gXCIuLi91dGlsaXRpZXMvcXVlcnlcIjtcbmltcG9ydCB7IEJSQUNLRVRFRF9NRVRBU1RBVEVNRU5UX0RFUFRIIH0gZnJvbSBcIi4uL2NvbnN0YW50c1wiO1xuXG5jb25zdCBicmFja2V0ZWRNZXRhc3RhdGVtZW50Q2hpbGROb2RlUXVlcnkgPSBub2RlUXVlcnkoJy9tZXRhc3RhdGVtZW50L21ldGFzdGF0ZW1lbnQhJyk7XG5cbmV4cG9ydCBmdW5jdGlvbiBtYXRjaE1ldGFzdGF0ZW1lbnRNb2R1bG9CcmFja2V0cyhtZXRhc3RhdGVtZW50Tm9kZUEsIG1ldGFzdGF0ZW1lbnROb2RlQikge1xuICBsZXQgbWV0YXN0YXRlbWVudE1hdGNoZXNNb2R1bG9CcmFja2V0cyA9IGZhbHNlO1xuXG4gIGlmICghbWV0YXN0YXRlbWVudE1hdGNoZXNNb2R1bG9CcmFja2V0cykge1xuICAgIGNvbnN0IG5vZGVBID0gbWV0YXN0YXRlbWVudE5vZGVBLCAgLy8vXG4gICAgICAgICAgbm9kZUIgPSBtZXRhc3RhdGVtZW50Tm9kZUIsICAvLy9cbiAgICAgICAgICBub2RlTWF0Y2hlcyA9IG1hdGNoZXIubWF0Y2hOb2RlKG5vZGVBLCBub2RlQik7XG5cbiAgICBtZXRhc3RhdGVtZW50TWF0Y2hlc01vZHVsb0JyYWNrZXRzID0gbm9kZU1hdGNoZXM7ICAvLy9cbiAgfVxuXG4gIGlmICghbWV0YXN0YXRlbWVudE1hdGNoZXNNb2R1bG9CcmFja2V0cykge1xuICAgIGNvbnN0IGJyYWNrZXRlZE1ldGFzdGF0ZW1lbnRDaGlsZE5vZGVBID0gYnJhY2tldGVkTWV0YXN0YXRlbWVudENoaWxkTm9kZUZyb21NZXRhc3RhdGVtZW50Tm9kZShtZXRhc3RhdGVtZW50Tm9kZUEpO1xuXG4gICAgaWYgKGJyYWNrZXRlZE1ldGFzdGF0ZW1lbnRDaGlsZE5vZGVBICE9PSBudWxsKSB7XG4gICAgICBjb25zdCBub2RlQSA9IGJyYWNrZXRlZE1ldGFzdGF0ZW1lbnRDaGlsZE5vZGVBLCAgLy8vXG4gICAgICAgICAgICBub2RlQiA9IG1ldGFzdGF0ZW1lbnROb2RlQiwgLy8vXG4gICAgICAgICAgICBub2RlTWF0Y2hlcyA9IG1hdGNoZXIubWF0Y2hOb2RlKG5vZGVBLCBub2RlQik7XG5cbiAgICAgIG1ldGFzdGF0ZW1lbnRNYXRjaGVzTW9kdWxvQnJhY2tldHMgPSBub2RlTWF0Y2hlczsgLy8vXG4gICAgfVxuICB9XG5cbiAgaWYgKCFtZXRhc3RhdGVtZW50TWF0Y2hlc01vZHVsb0JyYWNrZXRzKSB7XG4gICAgY29uc3QgYnJhY2tldGVkTWV0YXN0YXRlbWVudENoaWxkTm9kZUIgPSBicmFja2V0ZWRNZXRhc3RhdGVtZW50Q2hpbGROb2RlRnJvbU1ldGFzdGF0ZW1lbnROb2RlKG1ldGFzdGF0ZW1lbnROb2RlQik7XG5cbiAgICBpZiAoYnJhY2tldGVkTWV0YXN0YXRlbWVudENoaWxkTm9kZUIgIT09IG51bGwpIHtcbiAgICAgIGNvbnN0IG5vZGVBID0gbWV0YXN0YXRlbWVudE5vZGVBLCAvLy9cbiAgICAgICAgICAgIG5vZGVCID0gYnJhY2tldGVkTWV0YXN0YXRlbWVudENoaWxkTm9kZUIsICAvLy9cbiAgICAgICAgICAgIG5vZGVNYXRjaGVzID0gbWF0Y2hlci5tYXRjaE5vZGUobm9kZUEsIG5vZGVCKTtcblxuICAgICAgbWV0YXN0YXRlbWVudE1hdGNoZXNNb2R1bG9CcmFja2V0cyA9IG5vZGVNYXRjaGVzOyAvLy9cbiAgICB9XG4gIH1cblxuICByZXR1cm4gbWV0YXN0YXRlbWVudE1hdGNoZXNNb2R1bG9CcmFja2V0cztcbn1cblxuZXhwb3J0IGZ1bmN0aW9uIGJyYWNrZXRlZE1ldGFzdGF0ZW1lbnRDaGlsZE5vZGVGcm9tTWV0YXN0YXRlbWVudE5vZGUobWV0YXN0YXRlbWVudE5vZGUpIHtcbiAgbGV0IGJyYWNrZXRlZE1ldGFzdGF0ZW1lbnRDaGlsZE5vZGUgPSBudWxsO1xuXG4gIGNvbnN0IG5vZGVBID0gbWV0YXN0YXRlbWVudE5vZGUsICAvLy9cbiAgICAgICAgbm9kZUIgPSBicmFja2V0ZWRNZXRhc3RhdGVtZW50Tm9kZSwgIC8vL1xuICAgICAgICBkZXB0aCA9IEJSQUNLRVRFRF9NRVRBU1RBVEVNRU5UX0RFUFRILFxuICAgICAgICBub25UZXJtaW5hbE5vZGVNYXRjaGVzID0gbWF0Y2hlci5tYXRjaE5vZGUobm9kZUEsIG5vZGVCLCBkZXB0aCk7XG5cbiAgaWYgKG5vblRlcm1pbmFsTm9kZU1hdGNoZXMpIHtcbiAgICBicmFja2V0ZWRNZXRhc3RhdGVtZW50Q2hpbGROb2RlID0gYnJhY2tldGVkTWV0YXN0YXRlbWVudENoaWxkTm9kZVF1ZXJ5KG1ldGFzdGF0ZW1lbnROb2RlKTtcbiAgfVxuXG4gIHJldHVybiBicmFja2V0ZWRNZXRhc3RhdGVtZW50Q2hpbGROb2RlO1xufVxuIl0sIm5hbWVzIjpbIm1hdGNoTWV0YXN0YXRlbWVudE1vZHVsb0JyYWNrZXRzIiwiYnJhY2tldGVkTWV0YXN0YXRlbWVudENoaWxkTm9kZUZyb21NZXRhc3RhdGVtZW50Tm9kZSIsImJyYWNrZXRlZE1ldGFzdGF0ZW1lbnRDaGlsZE5vZGVRdWVyeSIsIm5vZGVRdWVyeSIsIm1ldGFzdGF0ZW1lbnROb2RlQSIsIm1ldGFzdGF0ZW1lbnROb2RlQiIsIm1ldGFzdGF0ZW1lbnRNYXRjaGVzTW9kdWxvQnJhY2tldHMiLCJub2RlQSIsIm5vZGVCIiwibm9kZU1hdGNoZXMiLCJtYXRjaGVyIiwibWF0Y2hOb2RlIiwiYnJhY2tldGVkTWV0YXN0YXRlbWVudENoaWxkTm9kZUEiLCJicmFja2V0ZWRNZXRhc3RhdGVtZW50Q2hpbGROb2RlQiIsIm1ldGFzdGF0ZW1lbnROb2RlIiwiYnJhY2tldGVkTWV0YXN0YXRlbWVudENoaWxkTm9kZSIsImJyYWNrZXRlZE1ldGFzdGF0ZW1lbnROb2RlIiwiZGVwdGgiLCJCUkFDS0VURURfTUVUQVNUQVRFTUVOVF9ERVBUSCIsIm5vblRlcm1pbmFsTm9kZU1hdGNoZXMiXSwibWFwcGluZ3MiOiJBQUFBOzs7Ozs7Ozs7OztJQVVnQkEsZ0NBQWdDO2VBQWhDQTs7SUFzQ0FDLG9EQUFvRDtlQUFwREE7Ozs4REE5Q0k7Z0VBQ21CO3FCQUViO3lCQUNvQjs7Ozs7O0FBRTlDLElBQU1DLHVDQUF1Q0MsSUFBQUEsZ0JBQVMsRUFBQztBQUVoRCxTQUFTSCxpQ0FBaUNJLGtCQUFrQixFQUFFQyxrQkFBa0IsRUFBRTtJQUN2RixJQUFJQyxxQ0FBcUMsS0FBSztJQUU5QyxJQUFJLENBQUNBLG9DQUFvQztRQUN2QyxJQUFNQyxRQUFRSCxvQkFDUkksUUFBUUgsb0JBQ1JJLGNBQWNDLGdCQUFPLENBQUNDLFNBQVMsQ0FBQ0osT0FBT0M7UUFFN0NGLHFDQUFxQ0csYUFBYyxHQUFHO0lBQ3hELENBQUM7SUFFRCxJQUFJLENBQUNILG9DQUFvQztRQUN2QyxJQUFNTSxtQ0FBbUNYLHFEQUFxREc7UUFFOUYsSUFBSVEscUNBQXFDLElBQUksRUFBRTtZQUM3QyxJQUFNTCxTQUFRSyxrQ0FDUkosU0FBUUgsb0JBQ1JJLGVBQWNDLGdCQUFPLENBQUNDLFNBQVMsQ0FBQ0osUUFBT0M7WUFFN0NGLHFDQUFxQ0csY0FBYSxHQUFHO1FBQ3ZELENBQUM7SUFDSCxDQUFDO0lBRUQsSUFBSSxDQUFDSCxvQ0FBb0M7UUFDdkMsSUFBTU8sbUNBQW1DWixxREFBcURJO1FBRTlGLElBQUlRLHFDQUFxQyxJQUFJLEVBQUU7WUFDN0MsSUFBTU4sU0FBUUgsb0JBQ1JJLFNBQVFLLGtDQUNSSixlQUFjQyxnQkFBTyxDQUFDQyxTQUFTLENBQUNKLFFBQU9DO1lBRTdDRixxQ0FBcUNHLGNBQWEsR0FBRztRQUN2RCxDQUFDO0lBQ0gsQ0FBQztJQUVELE9BQU9IO0FBQ1Q7QUFFTyxTQUFTTCxxREFBcURhLGlCQUFpQixFQUFFO0lBQ3RGLElBQUlDLGtDQUFrQyxJQUFJO0lBRTFDLElBQU1SLFFBQVFPLG1CQUNSTixRQUFRUSxrQkFBMEIsRUFDbENDLFFBQVFDLHdDQUE2QixFQUNyQ0MseUJBQXlCVCxnQkFBTyxDQUFDQyxTQUFTLENBQUNKLE9BQU9DLE9BQU9TO0lBRS9ELElBQUlFLHdCQUF3QjtRQUMxQkosa0NBQWtDYixxQ0FBcUNZO0lBQ3pFLENBQUM7SUFFRCxPQUFPQztBQUNUIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlsaXRpZXMvbWV0YXByb29mLmpzIl0sInNvdXJjZXNDb250ZW50IjpbIlwidXNlIHN0cmljdFwiO1xuXG5pbXBvcnQgYnJhY2tldGVkTWV0YXN0YXRlbWVudE5vZGUgZnJvbSBcIi4uL25vZGUvbWV0YXN0YXRlbWVudC9icmFja2V0ZWRcIjtcblxuaW1wb3J0IHsgbm9kZVF1ZXJ5IH0gZnJvbSBcIi4uL3V0aWxpdGllcy9xdWVyeVwiO1xuaW1wb3J0IHsgQlJBQ0tFVEVEX01FVEFTVEFURU1FTlRfREVQVEggfSBmcm9tIFwiLi4vY29uc3RhbnRzXCI7XG5cbmNvbnN0IGJyYWNrZXRlZE1ldGFzdGF0ZW1lbnRDaGlsZE5vZGVRdWVyeSA9IG5vZGVRdWVyeSgnL21ldGFzdGF0ZW1lbnQvbWV0YXN0YXRlbWVudCEnKTtcblxuZXhwb3J0IGZ1bmN0aW9uIG1hdGNoTWV0YXN0YXRlbWVudE1vZHVsb0JyYWNrZXRzKG1ldGFzdGF0ZW1lbnROb2RlQSwgbWV0YXN0YXRlbWVudE5vZGVCKSB7XG4gIGxldCBtZXRhc3RhdGVtZW50TWF0Y2hlc01vZHVsb0JyYWNrZXRzID0gZmFsc2U7XG5cbiAgaWYgKCFtZXRhc3RhdGVtZW50TWF0Y2hlc01vZHVsb0JyYWNrZXRzKSB7XG4gICAgY29uc3QgbWV0YXN0YXRlbWVudE5vZGVNYXRjaGVzID0gbWV0YXN0YXRlbWVudE5vZGVBLm1hdGNoKG1ldGFzdGF0ZW1lbnROb2RlQik7XG5cbiAgICBtZXRhc3RhdGVtZW50TWF0Y2hlc01vZHVsb0JyYWNrZXRzID0gbWV0YXN0YXRlbWVudE5vZGVNYXRjaGVzOyAgLy8vXG4gIH1cblxuICBpZiAoIW1ldGFzdGF0ZW1lbnRNYXRjaGVzTW9kdWxvQnJhY2tldHMpIHtcbiAgICBjb25zdCBicmFja2V0ZWRNZXRhc3RhdGVtZW50Q2hpbGROb2RlQSA9IGJyYWNrZXRlZE1ldGFzdGF0ZW1lbnRDaGlsZE5vZGVGcm9tTWV0YXN0YXRlbWVudE5vZGUobWV0YXN0YXRlbWVudE5vZGVBKTtcblxuICAgIGlmIChicmFja2V0ZWRNZXRhc3RhdGVtZW50Q2hpbGROb2RlQSAhPT0gbnVsbCkge1xuICAgICAgY29uc3QgYnJhY2tldGVkTWV0YXN0YXRlbWVudENoaWxkTm9kZUFNYXRjaGVzTWV0YXN0YXRlbWVudE5vZGVCID0gYnJhY2tldGVkTWV0YXN0YXRlbWVudENoaWxkTm9kZUEubWF0Y2gobWV0YXN0YXRlbWVudE5vZGVCKTtcblxuICAgICAgbWV0YXN0YXRlbWVudE1hdGNoZXNNb2R1bG9CcmFja2V0cyA9IGJyYWNrZXRlZE1ldGFzdGF0ZW1lbnRDaGlsZE5vZGVBTWF0Y2hlc01ldGFzdGF0ZW1lbnROb2RlQjsgLy8vXG4gICAgfVxuICB9XG5cbiAgaWYgKCFtZXRhc3RhdGVtZW50TWF0Y2hlc01vZHVsb0JyYWNrZXRzKSB7XG4gICAgY29uc3QgYnJhY2tldGVkTWV0YXN0YXRlbWVudENoaWxkTm9kZUIgPSBicmFja2V0ZWRNZXRhc3RhdGVtZW50Q2hpbGROb2RlRnJvbU1ldGFzdGF0ZW1lbnROb2RlKG1ldGFzdGF0ZW1lbnROb2RlQik7XG5cbiAgICBpZiAoYnJhY2tldGVkTWV0YXN0YXRlbWVudENoaWxkTm9kZUIgIT09IG51bGwpIHtcbiAgICAgIGNvbnN0IG1ldGFzdGF0ZW1lbnROb2RlQU1hdGNoZXNCcmFja2V0ZWRNZXRhc3RhdGVtZW50Q2hpbGROb2RlQiA9IG1ldGFzdGF0ZW1lbnROb2RlQS5tYXRjaChicmFja2V0ZWRNZXRhc3RhdGVtZW50Q2hpbGROb2RlQik7XG5cbiAgICAgIG1ldGFzdGF0ZW1lbnRNYXRjaGVzTW9kdWxvQnJhY2tldHMgPSBtZXRhc3RhdGVtZW50Tm9kZUFNYXRjaGVzQnJhY2tldGVkTWV0YXN0YXRlbWVudENoaWxkTm9kZUI7IC8vL1xuICAgIH1cbiAgfVxuXG4gIHJldHVybiBtZXRhc3RhdGVtZW50TWF0Y2hlc01vZHVsb0JyYWNrZXRzO1xufVxuXG5leHBvcnQgZnVuY3Rpb24gYnJhY2tldGVkTWV0YXN0YXRlbWVudENoaWxkTm9kZUZyb21NZXRhc3RhdGVtZW50Tm9kZShtZXRhc3RhdGVtZW50Tm9kZSkge1xuICBsZXQgYnJhY2tldGVkTWV0YXN0YXRlbWVudENoaWxkTm9kZSA9IG51bGw7XG5cbiAgY29uc3QgZGVwdGggPSBCUkFDS0VURURfTUVUQVNUQVRFTUVOVF9ERVBUSCxcbiAgICAgICAgbWV0YXN0YXRlbWVudE5vZGVNYXRjaGVzQnJhY2tldGVkTWV0YXN0YXRlbWVudE5vZGUgPSBtZXRhc3RhdGVtZW50Tm9kZS5tYXRjaChicmFja2V0ZWRNZXRhc3RhdGVtZW50Tm9kZSwgZGVwdGgpO1xuXG4gIGlmIChtZXRhc3RhdGVtZW50Tm9kZU1hdGNoZXNCcmFja2V0ZWRNZXRhc3RhdGVtZW50Tm9kZSkge1xuICAgIGJyYWNrZXRlZE1ldGFzdGF0ZW1lbnRDaGlsZE5vZGUgPSBicmFja2V0ZWRNZXRhc3RhdGVtZW50Q2hpbGROb2RlUXVlcnkobWV0YXN0YXRlbWVudE5vZGUpO1xuICB9XG5cbiAgcmV0dXJuIGJyYWNrZXRlZE1ldGFzdGF0ZW1lbnRDaGlsZE5vZGU7XG59XG4iXSwibmFtZXMiOlsibWF0Y2hNZXRhc3RhdGVtZW50TW9kdWxvQnJhY2tldHMiLCJicmFja2V0ZWRNZXRhc3RhdGVtZW50Q2hpbGROb2RlRnJvbU1ldGFzdGF0ZW1lbnROb2RlIiwiYnJhY2tldGVkTWV0YXN0YXRlbWVudENoaWxkTm9kZVF1ZXJ5Iiwibm9kZVF1ZXJ5IiwibWV0YXN0YXRlbWVudE5vZGVBIiwibWV0YXN0YXRlbWVudE5vZGVCIiwibWV0YXN0YXRlbWVudE1hdGNoZXNNb2R1bG9CcmFja2V0cyIsIm1ldGFzdGF0ZW1lbnROb2RlTWF0Y2hlcyIsIm1hdGNoIiwiYnJhY2tldGVkTWV0YXN0YXRlbWVudENoaWxkTm9kZUEiLCJicmFja2V0ZWRNZXRhc3RhdGVtZW50Q2hpbGROb2RlQU1hdGNoZXNNZXRhc3RhdGVtZW50Tm9kZUIiLCJicmFja2V0ZWRNZXRhc3RhdGVtZW50Q2hpbGROb2RlQiIsIm1ldGFzdGF0ZW1lbnROb2RlQU1hdGNoZXNCcmFja2V0ZWRNZXRhc3RhdGVtZW50Q2hpbGROb2RlQiIsIm1ldGFzdGF0ZW1lbnROb2RlIiwiYnJhY2tldGVkTWV0YXN0YXRlbWVudENoaWxkTm9kZSIsImRlcHRoIiwiQlJBQ0tFVEVEX01FVEFTVEFURU1FTlRfREVQVEgiLCJtZXRhc3RhdGVtZW50Tm9kZU1hdGNoZXNCcmFja2V0ZWRNZXRhc3RhdGVtZW50Tm9kZSIsImJyYWNrZXRlZE1ldGFzdGF0ZW1lbnROb2RlIl0sIm1hcHBpbmdzIjoiQUFBQTs7Ozs7Ozs7Ozs7SUFTZ0JBLGdDQUFnQztlQUFoQ0E7O0lBZ0NBQyxvREFBb0Q7ZUFBcERBOzs7Z0VBdkN1QjtxQkFFYjt5QkFDb0I7Ozs7OztBQUU5QyxJQUFNQyx1Q0FBdUNDLElBQUFBLGdCQUFTLEVBQUM7QUFFaEQsU0FBU0gsaUNBQWlDSSxrQkFBa0IsRUFBRUMsa0JBQWtCLEVBQUU7SUFDdkYsSUFBSUMscUNBQXFDLEtBQUs7SUFFOUMsSUFBSSxDQUFDQSxvQ0FBb0M7UUFDdkMsSUFBTUMsMkJBQTJCSCxtQkFBbUJJLEtBQUssQ0FBQ0g7UUFFMURDLHFDQUFxQ0MsMEJBQTJCLEdBQUc7SUFDckUsQ0FBQztJQUVELElBQUksQ0FBQ0Qsb0NBQW9DO1FBQ3ZDLElBQU1HLG1DQUFtQ1IscURBQXFERztRQUU5RixJQUFJSyxxQ0FBcUMsSUFBSSxFQUFFO1lBQzdDLElBQU1DLDREQUE0REQsaUNBQWlDRCxLQUFLLENBQUNIO1lBRXpHQyxxQ0FBcUNJLDJEQUEyRCxHQUFHO1FBQ3JHLENBQUM7SUFDSCxDQUFDO0lBRUQsSUFBSSxDQUFDSixvQ0FBb0M7UUFDdkMsSUFBTUssbUNBQW1DVixxREFBcURJO1FBRTlGLElBQUlNLHFDQUFxQyxJQUFJLEVBQUU7WUFDN0MsSUFBTUMsNERBQTREUixtQkFBbUJJLEtBQUssQ0FBQ0c7WUFFM0ZMLHFDQUFxQ00sMkRBQTJELEdBQUc7UUFDckcsQ0FBQztJQUNILENBQUM7SUFFRCxPQUFPTjtBQUNUO0FBRU8sU0FBU0wscURBQXFEWSxpQkFBaUIsRUFBRTtJQUN0RixJQUFJQyxrQ0FBa0MsSUFBSTtJQUUxQyxJQUFNQyxRQUFRQyx3Q0FBNkIsRUFDckNDLHFEQUFxREosa0JBQWtCTCxLQUFLLENBQUNVLGtCQUEwQixFQUFFSDtJQUUvRyxJQUFJRSxvREFBb0Q7UUFDdERILGtDQUFrQ1oscUNBQXFDVztJQUN6RSxDQUFDO0lBRUQsT0FBT0M7QUFDVCJ9

package/lib/utilities/proof.js

@@ -16,7 +16,6 @@ _export(exports, {
         return bracketedStatementChildNodeFromStatementNode;
     }
 });
-var _matcher = /*#__PURE__*/ _interop_require_default(require("../matcher"));
 var _bracketed = /*#__PURE__*/ _interop_require_default(require("../node/statement/bracketed"));
 var _query = require("../utilities/query");
 var _constants = require("../constants");
@@ -29,32 +28,32 @@ var bracketedStatementChildNodeQuery = (0, _query.nodeQuery)("/statement/metaArg
 function matchStatementModuloBrackets(statementNodeA, statementNodeB) {
     var statementMatchesModuloBrackets = false;
     if (!statementMatchesModuloBrackets) {
-        var nodeA = statementNodeA, nodeB = statementNodeB, nonTerminalNodeMatches = _matcher.default.matchNode(nodeA, nodeB);
-        statementMatchesModuloBrackets = nonTerminalNodeMatches; ///
+        var statementNodeMatches = statementNodeA.match(statementNodeB);
+        statementMatchesModuloBrackets = statementNodeMatches; ///
     }
     if (!statementMatchesModuloBrackets) {
         var bracketedStatementChildNodeA = bracketedStatementChildNodeFromStatementNode(statementNodeA);
         if (bracketedStatementChildNodeA !== null) {
-            var nodeA1 = bracketedStatementChildNodeA, nodeB1 = statementNodeB, nodeMatches = _matcher.default.matchNode(nodeA1, nodeB1);
-            statementMatchesModuloBrackets = nodeMatches; ///
+            var bracketedStatementChildNodeAMatchStatementNodeB = bracketedStatementChildNodeA.match(statementNodeB);
+            statementMatchesModuloBrackets = bracketedStatementChildNodeAMatchStatementNodeB; ///
         }
     }
     if (!statementMatchesModuloBrackets) {
         var bracketedStatementChildNodeB = bracketedStatementChildNodeFromStatementNode(statementNodeB);
         if (bracketedStatementChildNodeB !== null) {
-            var nodeA2 = statementNodeA, nodeB2 = bracketedStatementChildNodeB, nodeMatches1 = _matcher.default.matchNode(nodeA2, nodeB2);
-            statementMatchesModuloBrackets = nodeMatches1; ///
+            var statementNodeAMatchBracketedStatementChildNodeB = statementNodeA.match(bracketedStatementChildNodeB);
+            statementMatchesModuloBrackets = statementNodeAMatchBracketedStatementChildNodeB; ///
         }
     }
     return statementMatchesModuloBrackets;
 }
 function bracketedStatementChildNodeFromStatementNode(statementNode) {
     var bracketedStatementChildNode = null;
-    var nodeA = statementNode, nodeB = _bracketed.default, depth = _constants.BRACKETED_STATEMENT_DEPTH, nonTerminalNodeMatches = _matcher.default.matchNode(nodeA, nodeB, depth);
-    if (nonTerminalNodeMatches) {
+    var depth = _constants.BRACKETED_STATEMENT_DEPTH, statementNodeMatchBracketedStatementNode = statementNode.match(_bracketed.default, depth);
+    if (statementNodeMatchBracketedStatementNode) {
         bracketedStatementChildNode = bracketedStatementChildNodeQuery(statementNode);
     }
     return bracketedStatementChildNode;
 }
 
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlsaXRpZXMvcHJvb2YuanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmltcG9ydCBtYXRjaGVyIGZyb20gXCIuLi9tYXRjaGVyXCI7XG5pbXBvcnQgYnJhY2tldGVkU3RhdGVtZW50Tm9kZSBmcm9tIFwiLi4vbm9kZS9zdGF0ZW1lbnQvYnJhY2tldGVkXCI7XG5cbmltcG9ydCB7IG5vZGVRdWVyeSB9IGZyb20gXCIuLi91dGlsaXRpZXMvcXVlcnlcIjtcbmltcG9ydCB7IEJSQUNLRVRFRF9TVEFURU1FTlRfREVQVEggfSBmcm9tIFwiLi4vY29uc3RhbnRzXCI7XG5cbmNvbnN0IGJyYWNrZXRlZFN0YXRlbWVudENoaWxkTm9kZVF1ZXJ5ID0gbm9kZVF1ZXJ5KCcvc3RhdGVtZW50L21ldGFBcmd1bWVudCEvc3RhdGVtZW50IScpO1xuXG5leHBvcnQgZnVuY3Rpb24gbWF0Y2hTdGF0ZW1lbnRNb2R1bG9CcmFja2V0cyhzdGF0ZW1lbnROb2RlQSwgc3RhdGVtZW50Tm9kZUIpIHtcbiAgbGV0IHN0YXRlbWVudE1hdGNoZXNNb2R1bG9CcmFja2V0cyA9IGZhbHNlO1xuXG4gIGlmICghc3RhdGVtZW50TWF0Y2hlc01vZHVsb0JyYWNrZXRzKSB7XG4gICAgY29uc3Qgbm9kZUEgPSBzdGF0ZW1lbnROb2RlQSwgIC8vL1xuICAgICAgICAgIG5vZGVCID0gc3RhdGVtZW50Tm9kZUIsICAvLy9cbiAgICAgICAgICBub25UZXJtaW5hbE5vZGVNYXRjaGVzID0gbWF0Y2hlci5tYXRjaE5vZGUobm9kZUEsIG5vZGVCKTtcblxuICAgIHN0YXRlbWVudE1hdGNoZXNNb2R1bG9CcmFja2V0cyA9IG5vblRlcm1pbmFsTm9kZU1hdGNoZXM7ICAvLy9cbiAgfVxuXG4gIGlmICghc3RhdGVtZW50TWF0Y2hlc01vZHVsb0JyYWNrZXRzKSB7XG4gICAgY29uc3QgYnJhY2tldGVkU3RhdGVtZW50Q2hpbGROb2RlQSA9IGJyYWNrZXRlZFN0YXRlbWVudENoaWxkTm9kZUZyb21TdGF0ZW1lbnROb2RlKHN0YXRlbWVudE5vZGVBKTtcblxuICAgIGlmIChicmFja2V0ZWRTdGF0ZW1lbnRDaGlsZE5vZGVBICE9PSBudWxsKSB7XG4gICAgICBjb25zdCBub2RlQSA9IGJyYWNrZXRlZFN0YXRlbWVudENoaWxkTm9kZUEsICAvLy9cbiAgICAgICAgICAgIG5vZGVCID0gc3RhdGVtZW50Tm9kZUIsIC8vL1xuICAgICAgICAgICAgbm9kZU1hdGNoZXMgPSBtYXRjaGVyLm1hdGNoTm9kZShub2RlQSwgbm9kZUIpO1xuXG4gICAgICBzdGF0ZW1lbnRNYXRjaGVzTW9kdWxvQnJhY2tldHMgPSBub2RlTWF0Y2hlczsgLy8vXG4gICAgfVxuICB9XG5cbiAgaWYgKCFzdGF0ZW1lbnRNYXRjaGVzTW9kdWxvQnJhY2tldHMpIHtcbiAgICBjb25zdCBicmFja2V0ZWRTdGF0ZW1lbnRDaGlsZE5vZGVCID0gYnJhY2tldGVkU3RhdGVtZW50Q2hpbGROb2RlRnJvbVN0YXRlbWVudE5vZGUoc3RhdGVtZW50Tm9kZUIpO1xuXG4gICAgaWYgKGJyYWNrZXRlZFN0YXRlbWVudENoaWxkTm9kZUIgIT09IG51bGwpIHtcbiAgICAgIGNvbnN0IG5vZGVBID0gc3RhdGVtZW50Tm9kZUEsIC8vL1xuICAgICAgICAgICAgbm9kZUIgPSBicmFja2V0ZWRTdGF0ZW1lbnRDaGlsZE5vZGVCLCAgLy8vXG4gICAgICAgICAgICBub2RlTWF0Y2hlcyA9IG1hdGNoZXIubWF0Y2hOb2RlKG5vZGVBLCBub2RlQik7XG5cbiAgICAgIHN0YXRlbWVudE1hdGNoZXNNb2R1bG9CcmFja2V0cyA9IG5vZGVNYXRjaGVzOyAvLy9cbiAgICB9XG4gIH1cblxuICByZXR1cm4gc3RhdGVtZW50TWF0Y2hlc01vZHVsb0JyYWNrZXRzO1xufVxuXG5leHBvcnQgZnVuY3Rpb24gYnJhY2tldGVkU3RhdGVtZW50Q2hpbGROb2RlRnJvbVN0YXRlbWVudE5vZGUoc3RhdGVtZW50Tm9kZSkge1xuICBsZXQgYnJhY2tldGVkU3RhdGVtZW50Q2hpbGROb2RlID0gbnVsbDtcblxuICBjb25zdCBub2RlQSA9IHN0YXRlbWVudE5vZGUsICAvLy9cbiAgICAgICAgbm9kZUIgPSBicmFja2V0ZWRTdGF0ZW1lbnROb2RlLCAgLy8vXG4gICAgICAgIGRlcHRoID0gQlJBQ0tFVEVEX1NUQVRFTUVOVF9ERVBUSCxcbiAgICAgICAgbm9uVGVybWluYWxOb2RlTWF0Y2hlcyA9IG1hdGNoZXIubWF0Y2hOb2RlKG5vZGVBLCBub2RlQiwgZGVwdGgpO1xuXG4gIGlmIChub25UZXJtaW5hbE5vZGVNYXRjaGVzKSB7XG4gICAgYnJhY2tldGVkU3RhdGVtZW50Q2hpbGROb2RlID0gYnJhY2tldGVkU3RhdGVtZW50Q2hpbGROb2RlUXVlcnkoc3RhdGVtZW50Tm9kZSk7XG4gIH1cblxuICByZXR1cm4gYnJhY2tldGVkU3RhdGVtZW50Q2hpbGROb2RlO1xufVxuIl0sIm5hbWVzIjpbIm1hdGNoU3RhdGVtZW50TW9kdWxvQnJhY2tldHMiLCJicmFja2V0ZWRTdGF0ZW1lbnRDaGlsZE5vZGVGcm9tU3RhdGVtZW50Tm9kZSIsImJyYWNrZXRlZFN0YXRlbWVudENoaWxkTm9kZVF1ZXJ5Iiwibm9kZVF1ZXJ5Iiwic3RhdGVtZW50Tm9kZUEiLCJzdGF0ZW1lbnROb2RlQiIsInN0YXRlbWVudE1hdGNoZXNNb2R1bG9CcmFja2V0cyIsIm5vZGVBIiwibm9kZUIiLCJub25UZXJtaW5hbE5vZGVNYXRjaGVzIiwibWF0Y2hlciIsIm1hdGNoTm9kZSIsImJyYWNrZXRlZFN0YXRlbWVudENoaWxkTm9kZUEiLCJub2RlTWF0Y2hlcyIsImJyYWNrZXRlZFN0YXRlbWVudENoaWxkTm9kZUIiLCJzdGF0ZW1lbnROb2RlIiwiYnJhY2tldGVkU3RhdGVtZW50Q2hpbGROb2RlIiwiYnJhY2tldGVkU3RhdGVtZW50Tm9kZSIsImRlcHRoIiwiQlJBQ0tFVEVEX1NUQVRFTUVOVF9ERVBUSCJdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7Ozs7Ozs7O0lBVWdCQSw0QkFBNEI7ZUFBNUJBOztJQXNDQUMsNENBQTRDO2VBQTVDQTs7OzhEQTlDSTtnRUFDZTtxQkFFVDt5QkFDZ0I7Ozs7OztBQUUxQyxJQUFNQyxtQ0FBbUNDLElBQUFBLGdCQUFTLEVBQUM7QUFFNUMsU0FBU0gsNkJBQTZCSSxjQUFjLEVBQUVDLGNBQWMsRUFBRTtJQUMzRSxJQUFJQyxpQ0FBaUMsS0FBSztJQUUxQyxJQUFJLENBQUNBLGdDQUFnQztRQUNuQyxJQUFNQyxRQUFRSCxnQkFDUkksUUFBUUgsZ0JBQ1JJLHlCQUF5QkMsZ0JBQU8sQ0FBQ0MsU0FBUyxDQUFDSixPQUFPQztRQUV4REYsaUNBQWlDRyx3QkFBeUIsR0FBRztJQUMvRCxDQUFDO0lBRUQsSUFBSSxDQUFDSCxnQ0FBZ0M7UUFDbkMsSUFBTU0sK0JBQStCWCw2Q0FBNkNHO1FBRWxGLElBQUlRLGlDQUFpQyxJQUFJLEVBQUU7WUFDekMsSUFBTUwsU0FBUUssOEJBQ1JKLFNBQVFILGdCQUNSUSxjQUFjSCxnQkFBTyxDQUFDQyxTQUFTLENBQUNKLFFBQU9DO1lBRTdDRixpQ0FBaUNPLGFBQWEsR0FBRztRQUNuRCxDQUFDO0lBQ0gsQ0FBQztJQUVELElBQUksQ0FBQ1AsZ0NBQWdDO1FBQ25DLElBQU1RLCtCQUErQmIsNkNBQTZDSTtRQUVsRixJQUFJUyxpQ0FBaUMsSUFBSSxFQUFFO1lBQ3pDLElBQU1QLFNBQVFILGdCQUNSSSxTQUFRTSw4QkFDUkQsZUFBY0gsZ0JBQU8sQ0FBQ0MsU0FBUyxDQUFDSixRQUFPQztZQUU3Q0YsaUNBQWlDTyxjQUFhLEdBQUc7UUFDbkQsQ0FBQztJQUNILENBQUM7SUFFRCxPQUFPUDtBQUNUO0FBRU8sU0FBU0wsNkNBQTZDYyxhQUFhLEVBQUU7SUFDMUUsSUFBSUMsOEJBQThCLElBQUk7SUFFdEMsSUFBTVQsUUFBUVEsZUFDUlAsUUFBUVMsa0JBQXNCLEVBQzlCQyxRQUFRQyxvQ0FBeUIsRUFDakNWLHlCQUF5QkMsZ0JBQU8sQ0FBQ0MsU0FBUyxDQUFDSixPQUFPQyxPQUFPVTtJQUUvRCxJQUFJVCx3QkFBd0I7UUFDMUJPLDhCQUE4QmQsaUNBQWlDYTtJQUNqRSxDQUFDO0lBRUQsT0FBT0M7QUFDVCJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlsaXRpZXMvcHJvb2YuanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmltcG9ydCBicmFja2V0ZWRTdGF0ZW1lbnROb2RlIGZyb20gXCIuLi9ub2RlL3N0YXRlbWVudC9icmFja2V0ZWRcIjtcblxuaW1wb3J0IHsgbm9kZVF1ZXJ5IH0gZnJvbSBcIi4uL3V0aWxpdGllcy9xdWVyeVwiO1xuaW1wb3J0IHsgQlJBQ0tFVEVEX1NUQVRFTUVOVF9ERVBUSCB9IGZyb20gXCIuLi9jb25zdGFudHNcIjtcblxuY29uc3QgYnJhY2tldGVkU3RhdGVtZW50Q2hpbGROb2RlUXVlcnkgPSBub2RlUXVlcnkoJy9zdGF0ZW1lbnQvbWV0YUFyZ3VtZW50IS9zdGF0ZW1lbnQhJyk7XG5cbmV4cG9ydCBmdW5jdGlvbiBtYXRjaFN0YXRlbWVudE1vZHVsb0JyYWNrZXRzKHN0YXRlbWVudE5vZGVBLCBzdGF0ZW1lbnROb2RlQikge1xuICBsZXQgc3RhdGVtZW50TWF0Y2hlc01vZHVsb0JyYWNrZXRzID0gZmFsc2U7XG5cbiAgaWYgKCFzdGF0ZW1lbnRNYXRjaGVzTW9kdWxvQnJhY2tldHMpIHtcbiAgICBjb25zdCBzdGF0ZW1lbnROb2RlTWF0Y2hlcyA9IHN0YXRlbWVudE5vZGVBLm1hdGNoKHN0YXRlbWVudE5vZGVCKTtcblxuICAgIHN0YXRlbWVudE1hdGNoZXNNb2R1bG9CcmFja2V0cyA9IHN0YXRlbWVudE5vZGVNYXRjaGVzOyAgLy8vXG4gIH1cblxuICBpZiAoIXN0YXRlbWVudE1hdGNoZXNNb2R1bG9CcmFja2V0cykge1xuICAgIGNvbnN0IGJyYWNrZXRlZFN0YXRlbWVudENoaWxkTm9kZUEgPSBicmFja2V0ZWRTdGF0ZW1lbnRDaGlsZE5vZGVGcm9tU3RhdGVtZW50Tm9kZShzdGF0ZW1lbnROb2RlQSk7XG5cbiAgICBpZiAoYnJhY2tldGVkU3RhdGVtZW50Q2hpbGROb2RlQSAhPT0gbnVsbCkge1xuICAgICAgY29uc3QgYnJhY2tldGVkU3RhdGVtZW50Q2hpbGROb2RlQU1hdGNoU3RhdGVtZW50Tm9kZUIgPSBicmFja2V0ZWRTdGF0ZW1lbnRDaGlsZE5vZGVBLm1hdGNoKHN0YXRlbWVudE5vZGVCKTtcblxuICAgICAgc3RhdGVtZW50TWF0Y2hlc01vZHVsb0JyYWNrZXRzID0gYnJhY2tldGVkU3RhdGVtZW50Q2hpbGROb2RlQU1hdGNoU3RhdGVtZW50Tm9kZUI7IC8vL1xuICAgIH1cbiAgfVxuXG4gIGlmICghc3RhdGVtZW50TWF0Y2hlc01vZHVsb0JyYWNrZXRzKSB7XG4gICAgY29uc3QgYnJhY2tldGVkU3RhdGVtZW50Q2hpbGROb2RlQiA9IGJyYWNrZXRlZFN0YXRlbWVudENoaWxkTm9kZUZyb21TdGF0ZW1lbnROb2RlKHN0YXRlbWVudE5vZGVCKTtcblxuICAgIGlmIChicmFja2V0ZWRTdGF0ZW1lbnRDaGlsZE5vZGVCICE9PSBudWxsKSB7XG4gICAgICBjb25zdCBzdGF0ZW1lbnROb2RlQU1hdGNoQnJhY2tldGVkU3RhdGVtZW50Q2hpbGROb2RlQiA9IHN0YXRlbWVudE5vZGVBLm1hdGNoKGJyYWNrZXRlZFN0YXRlbWVudENoaWxkTm9kZUIpO1xuXG4gICAgICBzdGF0ZW1lbnRNYXRjaGVzTW9kdWxvQnJhY2tldHMgPSBzdGF0ZW1lbnROb2RlQU1hdGNoQnJhY2tldGVkU3RhdGVtZW50Q2hpbGROb2RlQjsgLy8vXG4gICAgfVxuICB9XG5cbiAgcmV0dXJuIHN0YXRlbWVudE1hdGNoZXNNb2R1bG9CcmFja2V0cztcbn1cblxuZXhwb3J0IGZ1bmN0aW9uIGJyYWNrZXRlZFN0YXRlbWVudENoaWxkTm9kZUZyb21TdGF0ZW1lbnROb2RlKHN0YXRlbWVudE5vZGUpIHtcbiAgbGV0IGJyYWNrZXRlZFN0YXRlbWVudENoaWxkTm9kZSA9IG51bGw7XG5cbiAgY29uc3QgZGVwdGggPSBCUkFDS0VURURfU1RBVEVNRU5UX0RFUFRILFxuICAgICAgICBzdGF0ZW1lbnROb2RlTWF0Y2hCcmFja2V0ZWRTdGF0ZW1lbnROb2RlID0gc3RhdGVtZW50Tm9kZS5tYXRjaChicmFja2V0ZWRTdGF0ZW1lbnROb2RlLCBkZXB0aCk7XG5cbiAgaWYgKHN0YXRlbWVudE5vZGVNYXRjaEJyYWNrZXRlZFN0YXRlbWVudE5vZGUpIHtcbiAgICBicmFja2V0ZWRTdGF0ZW1lbnRDaGlsZE5vZGUgPSBicmFja2V0ZWRTdGF0ZW1lbnRDaGlsZE5vZGVRdWVyeShzdGF0ZW1lbnROb2RlKTtcbiAgfVxuXG4gIHJldHVybiBicmFja2V0ZWRTdGF0ZW1lbnRDaGlsZE5vZGU7XG59XG4iXSwibmFtZXMiOlsibWF0Y2hTdGF0ZW1lbnRNb2R1bG9CcmFja2V0cyIsImJyYWNrZXRlZFN0YXRlbWVudENoaWxkTm9kZUZyb21TdGF0ZW1lbnROb2RlIiwiYnJhY2tldGVkU3RhdGVtZW50Q2hpbGROb2RlUXVlcnkiLCJub2RlUXVlcnkiLCJzdGF0ZW1lbnROb2RlQSIsInN0YXRlbWVudE5vZGVCIiwic3RhdGVtZW50TWF0Y2hlc01vZHVsb0JyYWNrZXRzIiwic3RhdGVtZW50Tm9kZU1hdGNoZXMiLCJtYXRjaCIsImJyYWNrZXRlZFN0YXRlbWVudENoaWxkTm9kZUEiLCJicmFja2V0ZWRTdGF0ZW1lbnRDaGlsZE5vZGVBTWF0Y2hTdGF0ZW1lbnROb2RlQiIsImJyYWNrZXRlZFN0YXRlbWVudENoaWxkTm9kZUIiLCJzdGF0ZW1lbnROb2RlQU1hdGNoQnJhY2tldGVkU3RhdGVtZW50Q2hpbGROb2RlQiIsInN0YXRlbWVudE5vZGUiLCJicmFja2V0ZWRTdGF0ZW1lbnRDaGlsZE5vZGUiLCJkZXB0aCIsIkJSQUNLRVRFRF9TVEFURU1FTlRfREVQVEgiLCJzdGF0ZW1lbnROb2RlTWF0Y2hCcmFja2V0ZWRTdGF0ZW1lbnROb2RlIiwiYnJhY2tldGVkU3RhdGVtZW50Tm9kZSJdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7Ozs7Ozs7O0lBU2dCQSw0QkFBNEI7ZUFBNUJBOztJQWdDQUMsNENBQTRDO2VBQTVDQTs7O2dFQXZDbUI7cUJBRVQ7eUJBQ2dCOzs7Ozs7QUFFMUMsSUFBTUMsbUNBQW1DQyxJQUFBQSxnQkFBUyxFQUFDO0FBRTVDLFNBQVNILDZCQUE2QkksY0FBYyxFQUFFQyxjQUFjLEVBQUU7SUFDM0UsSUFBSUMsaUNBQWlDLEtBQUs7SUFFMUMsSUFBSSxDQUFDQSxnQ0FBZ0M7UUFDbkMsSUFBTUMsdUJBQXVCSCxlQUFlSSxLQUFLLENBQUNIO1FBRWxEQyxpQ0FBaUNDLHNCQUF1QixHQUFHO0lBQzdELENBQUM7SUFFRCxJQUFJLENBQUNELGdDQUFnQztRQUNuQyxJQUFNRywrQkFBK0JSLDZDQUE2Q0c7UUFFbEYsSUFBSUssaUNBQWlDLElBQUksRUFBRTtZQUN6QyxJQUFNQyxrREFBa0RELDZCQUE2QkQsS0FBSyxDQUFDSDtZQUUzRkMsaUNBQWlDSSxpREFBaUQsR0FBRztRQUN2RixDQUFDO0lBQ0gsQ0FBQztJQUVELElBQUksQ0FBQ0osZ0NBQWdDO1FBQ25DLElBQU1LLCtCQUErQlYsNkNBQTZDSTtRQUVsRixJQUFJTSxpQ0FBaUMsSUFBSSxFQUFFO1lBQ3pDLElBQU1DLGtEQUFrRFIsZUFBZUksS0FBSyxDQUFDRztZQUU3RUwsaUNBQWlDTSxpREFBaUQsR0FBRztRQUN2RixDQUFDO0lBQ0gsQ0FBQztJQUVELE9BQU9OO0FBQ1Q7QUFFTyxTQUFTTCw2Q0FBNkNZLGFBQWEsRUFBRTtJQUMxRSxJQUFJQyw4QkFBOEIsSUFBSTtJQUV0QyxJQUFNQyxRQUFRQyxvQ0FBeUIsRUFDakNDLDJDQUEyQ0osY0FBY0wsS0FBSyxDQUFDVSxrQkFBc0IsRUFBRUg7SUFFN0YsSUFBSUUsMENBQTBDO1FBQzVDSCw4QkFBOEJaLGlDQUFpQ1c7SUFDakUsQ0FBQztJQUVELE9BQU9DO0FBQ1QifQ==

package/lib/verify/proof.js

@@ -8,7 +8,6 @@ Object.defineProperty(exports, "default", {
         return verifyProof;
     }
 });
-var _matcher = /*#__PURE__*/ _interop_require_default(require("../matcher"));
 var _proof = /*#__PURE__*/ _interop_require_default(require("../context/proof"));
 var _derivation = /*#__PURE__*/ _interop_require_default(require("../verify/derivation"));
 var _query = require("../utilities/query");
@@ -23,10 +22,10 @@ function verifyProof(proofNode, conclusion, proofContext) {
     proofContext = _proof.default.fromProofContext(proofContext); ///
     var derivationNode = derivationNodeQuery(proofNode), derivationVerified = (0, _derivation.default)(derivationNode, proofContext);
     if (derivationVerified) {
-        var lastProofStep = proofContext.getLastProofStep(), proofStep = lastProofStep, statementNode = proofStep.getStatementNode(), conclusionStatementNode = conclusion.getStatementNode(), nodeA = statementNode, nodeB = conclusionStatementNode, nodeMatches = _matcher.default.matchNode(nodeA, nodeB);
-        proofVerified = nodeMatches; ///
+        var lastProofStep = proofContext.getLastProofStep(), proofStep = lastProofStep, statementNode = proofStep.getStatementNode(), conclusionStatementNode = conclusion.getStatementNode(), statementNodeMatchConclusionStatementNode = statementNode.match(conclusionStatementNode);
+        proofVerified = statementNodeMatchConclusionStatementNode; ///
     }
     return proofVerified;
 }
 
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy92ZXJpZnkvcHJvb2YuanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmltcG9ydCBtYXRjaGVyIGZyb20gXCIuLi9tYXRjaGVyXCI7XG5pbXBvcnQgUHJvb2ZDb250ZXh0IGZyb20gXCIuLi9jb250ZXh0L3Byb29mXCI7XG5pbXBvcnQgdmVyaWZ5RGVyaXZhdGlvbiBmcm9tIFwiLi4vdmVyaWZ5L2Rlcml2YXRpb25cIjtcblxuaW1wb3J0IHsgbm9kZVF1ZXJ5IH0gZnJvbSBcIi4uL3V0aWxpdGllcy9xdWVyeVwiO1xuXG5jb25zdCBkZXJpdmF0aW9uTm9kZVF1ZXJ5ID0gbm9kZVF1ZXJ5KFwiL3Byb29mL2Rlcml2YXRpb24hXCIpO1xuXG5leHBvcnQgZGVmYXVsdCBmdW5jdGlvbiB2ZXJpZnlQcm9vZihwcm9vZk5vZGUsIGNvbmNsdXNpb24sIHByb29mQ29udGV4dCkge1xuICBsZXQgcHJvb2ZWZXJpZmllZCA9IGZhbHNlO1xuXG4gIHByb29mQ29udGV4dCA9IFByb29mQ29udGV4dC5mcm9tUHJvb2ZDb250ZXh0KHByb29mQ29udGV4dCk7IC8vL1xuXG4gIGNvbnN0IGRlcml2YXRpb25Ob2RlID0gZGVyaXZhdGlvbk5vZGVRdWVyeShwcm9vZk5vZGUpLFxuICAgICAgICBkZXJpdmF0aW9uVmVyaWZpZWQgPSB2ZXJpZnlEZXJpdmF0aW9uKGRlcml2YXRpb25Ob2RlLCBwcm9vZkNvbnRleHQpO1xuXG4gIGlmIChkZXJpdmF0aW9uVmVyaWZpZWQpIHtcbiAgICBjb25zdCBsYXN0UHJvb2ZTdGVwID0gcHJvb2ZDb250ZXh0LmdldExhc3RQcm9vZlN0ZXAoKSxcbiAgICAgICAgICBwcm9vZlN0ZXAgPSBsYXN0UHJvb2ZTdGVwLCAvLy9cbiAgICAgICAgICBzdGF0ZW1lbnROb2RlID0gcHJvb2ZTdGVwLmdldFN0YXRlbWVudE5vZGUoKSxcbiAgICAgICAgICBjb25jbHVzaW9uU3RhdGVtZW50Tm9kZSA9IGNvbmNsdXNpb24uZ2V0U3RhdGVtZW50Tm9kZSgpLFxuICAgICAgICAgIG5vZGVBID0gc3RhdGVtZW50Tm9kZSwgIC8vL1xuICAgICAgICAgIG5vZGVCID0gY29uY2x1c2lvblN0YXRlbWVudE5vZGUsICAvLy9cbiAgICAgICAgICBub2RlTWF0Y2hlcyA9IG1hdGNoZXIubWF0Y2hOb2RlKG5vZGVBLCBub2RlQik7XG5cbiAgICBwcm9vZlZlcmlmaWVkID0gbm9kZU1hdGNoZXM7ICAvLy9cbiAgfVxuXG4gIHJldHVybiBwcm9vZlZlcmlmaWVkO1xufVxuIl0sIm5hbWVzIjpbInZlcmlmeVByb29mIiwiZGVyaXZhdGlvbk5vZGVRdWVyeSIsIm5vZGVRdWVyeSIsInByb29mTm9kZSIsImNvbmNsdXNpb24iLCJwcm9vZkNvbnRleHQiLCJwcm9vZlZlcmlmaWVkIiwiUHJvb2ZDb250ZXh0IiwiZnJvbVByb29mQ29udGV4dCIsImRlcml2YXRpb25Ob2RlIiwiZGVyaXZhdGlvblZlcmlmaWVkIiwidmVyaWZ5RGVyaXZhdGlvbiIsImxhc3RQcm9vZlN0ZXAiLCJnZXRMYXN0UHJvb2ZTdGVwIiwicHJvb2ZTdGVwIiwic3RhdGVtZW50Tm9kZSIsImdldFN0YXRlbWVudE5vZGUiLCJjb25jbHVzaW9uU3RhdGVtZW50Tm9kZSIsIm5vZGVBIiwibm9kZUIiLCJub2RlTWF0Y2hlcyIsIm1hdGNoZXIiLCJtYXRjaE5vZGUiXSwibWFwcGluZ3MiOiJBQUFBOzs7OytCQVVBOzs7ZUFBd0JBOzs7OERBUko7NERBQ0s7aUVBQ0k7cUJBRUg7Ozs7OztBQUUxQixJQUFNQyxzQkFBc0JDLElBQUFBLGdCQUFTLEVBQUM7QUFFdkIsU0FBU0YsWUFBWUcsU0FBUyxFQUFFQyxVQUFVLEVBQUVDLFlBQVksRUFBRTtJQUN2RSxJQUFJQyxnQkFBZ0IsS0FBSztJQUV6QkQsZUFBZUUsY0FBWSxDQUFDQyxnQkFBZ0IsQ0FBQ0gsZUFBZSxHQUFHO0lBRS9ELElBQU1JLGlCQUFpQlIsb0JBQW9CRSxZQUNyQ08scUJBQXFCQyxJQUFBQSxtQkFBZ0IsRUFBQ0YsZ0JBQWdCSjtJQUU1RCxJQUFJSyxvQkFBb0I7UUFDdEIsSUFBTUUsZ0JBQWdCUCxhQUFhUSxnQkFBZ0IsSUFDN0NDLFlBQVlGLGVBQ1pHLGdCQUFnQkQsVUFBVUUsZ0JBQWdCLElBQzFDQywwQkFBMEJiLFdBQVdZLGdCQUFnQixJQUNyREUsUUFBUUgsZUFDUkksUUFBUUYseUJBQ1JHLGNBQWNDLGdCQUFPLENBQUNDLFNBQVMsQ0FBQ0osT0FBT0M7UUFFN0NiLGdCQUFnQmMsYUFBYyxHQUFHO0lBQ25DLENBQUM7SUFFRCxPQUFPZDtBQUNUIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy92ZXJpZnkvcHJvb2YuanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmltcG9ydCBQcm9vZkNvbnRleHQgZnJvbSBcIi4uL2NvbnRleHQvcHJvb2ZcIjtcbmltcG9ydCB2ZXJpZnlEZXJpdmF0aW9uIGZyb20gXCIuLi92ZXJpZnkvZGVyaXZhdGlvblwiO1xuXG5pbXBvcnQgeyBub2RlUXVlcnkgfSBmcm9tIFwiLi4vdXRpbGl0aWVzL3F1ZXJ5XCI7XG5cbmNvbnN0IGRlcml2YXRpb25Ob2RlUXVlcnkgPSBub2RlUXVlcnkoXCIvcHJvb2YvZGVyaXZhdGlvbiFcIik7XG5cbmV4cG9ydCBkZWZhdWx0IGZ1bmN0aW9uIHZlcmlmeVByb29mKHByb29mTm9kZSwgY29uY2x1c2lvbiwgcHJvb2ZDb250ZXh0KSB7XG4gIGxldCBwcm9vZlZlcmlmaWVkID0gZmFsc2U7XG5cbiAgcHJvb2ZDb250ZXh0ID0gUHJvb2ZDb250ZXh0LmZyb21Qcm9vZkNvbnRleHQocHJvb2ZDb250ZXh0KTsgLy8vXG5cbiAgY29uc3QgZGVyaXZhdGlvbk5vZGUgPSBkZXJpdmF0aW9uTm9kZVF1ZXJ5KHByb29mTm9kZSksXG4gICAgICAgIGRlcml2YXRpb25WZXJpZmllZCA9IHZlcmlmeURlcml2YXRpb24oZGVyaXZhdGlvbk5vZGUsIHByb29mQ29udGV4dCk7XG5cbiAgaWYgKGRlcml2YXRpb25WZXJpZmllZCkge1xuICAgIGNvbnN0IGxhc3RQcm9vZlN0ZXAgPSBwcm9vZkNvbnRleHQuZ2V0TGFzdFByb29mU3RlcCgpLFxuICAgICAgICAgIHByb29mU3RlcCA9IGxhc3RQcm9vZlN0ZXAsIC8vL1xuICAgICAgICAgIHN0YXRlbWVudE5vZGUgPSBwcm9vZlN0ZXAuZ2V0U3RhdGVtZW50Tm9kZSgpLFxuICAgICAgICAgIGNvbmNsdXNpb25TdGF0ZW1lbnROb2RlID0gY29uY2x1c2lvbi5nZXRTdGF0ZW1lbnROb2RlKCksXG4gICAgICAgICAgc3RhdGVtZW50Tm9kZU1hdGNoQ29uY2x1c2lvblN0YXRlbWVudE5vZGUgPSBzdGF0ZW1lbnROb2RlLm1hdGNoKGNvbmNsdXNpb25TdGF0ZW1lbnROb2RlKTtcblxuICAgIHByb29mVmVyaWZpZWQgPSBzdGF0ZW1lbnROb2RlTWF0Y2hDb25jbHVzaW9uU3RhdGVtZW50Tm9kZTsgIC8vL1xuICB9XG5cbiAgcmV0dXJuIHByb29mVmVyaWZpZWQ7XG59XG4iXSwibmFtZXMiOlsidmVyaWZ5UHJvb2YiLCJkZXJpdmF0aW9uTm9kZVF1ZXJ5Iiwibm9kZVF1ZXJ5IiwicHJvb2ZOb2RlIiwiY29uY2x1c2lvbiIsInByb29mQ29udGV4dCIsInByb29mVmVyaWZpZWQiLCJQcm9vZkNvbnRleHQiLCJmcm9tUHJvb2ZDb250ZXh0IiwiZGVyaXZhdGlvbk5vZGUiLCJkZXJpdmF0aW9uVmVyaWZpZWQiLCJ2ZXJpZnlEZXJpdmF0aW9uIiwibGFzdFByb29mU3RlcCIsImdldExhc3RQcm9vZlN0ZXAiLCJwcm9vZlN0ZXAiLCJzdGF0ZW1lbnROb2RlIiwiZ2V0U3RhdGVtZW50Tm9kZSIsImNvbmNsdXNpb25TdGF0ZW1lbnROb2RlIiwic3RhdGVtZW50Tm9kZU1hdGNoQ29uY2x1c2lvblN0YXRlbWVudE5vZGUiLCJtYXRjaCJdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7K0JBU0E7OztlQUF3QkE7Ozs0REFQQztpRUFDSTtxQkFFSDs7Ozs7O0FBRTFCLElBQU1DLHNCQUFzQkMsSUFBQUEsZ0JBQVMsRUFBQztBQUV2QixTQUFTRixZQUFZRyxTQUFTLEVBQUVDLFVBQVUsRUFBRUMsWUFBWSxFQUFFO0lBQ3ZFLElBQUlDLGdCQUFnQixLQUFLO0lBRXpCRCxlQUFlRSxjQUFZLENBQUNDLGdCQUFnQixDQUFDSCxlQUFlLEdBQUc7SUFFL0QsSUFBTUksaUJBQWlCUixvQkFBb0JFLFlBQ3JDTyxxQkFBcUJDLElBQUFBLG1CQUFnQixFQUFDRixnQkFBZ0JKO0lBRTVELElBQUlLLG9CQUFvQjtRQUN0QixJQUFNRSxnQkFBZ0JQLGFBQWFRLGdCQUFnQixJQUM3Q0MsWUFBWUYsZUFDWkcsZ0JBQWdCRCxVQUFVRSxnQkFBZ0IsSUFDMUNDLDBCQUEwQmIsV0FBV1ksZ0JBQWdCLElBQ3JERSw0Q0FBNENILGNBQWNJLEtBQUssQ0FBQ0Y7UUFFdEVYLGdCQUFnQlksMkNBQTRDLEdBQUc7SUFDakUsQ0FBQztJQUVELE9BQU9aO0FBQ1QifQ==

package/lib/verify/ruleProof.js

@@ -8,7 +8,6 @@ Object.defineProperty(exports, "default", {
         return verifyRuleProof;
     }
 });
-var _matcher = /*#__PURE__*/ _interop_require_default(require("../matcher"));
 var _metaproof = /*#__PURE__*/ _interop_require_default(require("../context/metaproof"));
 var _ruleDerivation = /*#__PURE__*/ _interop_require_default(require("../verify/ruleDerivation"));
 var _query = require("../utilities/query");
@@ -23,10 +22,10 @@ function verifyRuleProof(ruleProofNode, conclusion, metaproofContext) {
     metaproofContext = _metaproof.default.fromMetaproofContext(metaproofContext); ///
     var ruleDerivationNode = ruleDerivationNodeQuery(ruleProofNode), ruleDerivationVerified = (0, _ruleDerivation.default)(ruleDerivationNode, metaproofContext);
     if (ruleDerivationVerified) {
-        var lastMetaproofStep = metaproofContext.getLastMetaproofStep(), metaproofStep = lastMetaproofStep, metastatementNode = metaproofStep.getMetastatementNode(), conclusionMetastatementNode = conclusion.getMetastatementNode(), nodeA = metastatementNode, nodeB = conclusionMetastatementNode, nodeMatches = _matcher.default.matchNode(nodeA, nodeB);
-        ruleProofVerified = nodeMatches; ///
+        var lastMetaproofStep = metaproofContext.getLastMetaproofStep(), metaproofStep = lastMetaproofStep, metastatementNode = metaproofStep.getMetastatementNode(), conclusionMetastatementNode = conclusion.getMetastatementNode(), metastatementNodeMatchConclusionMetastatementNode = metastatementNode.match(conclusionMetastatementNode);
+        ruleProofVerified = metastatementNodeMatchConclusionMetastatementNode; ///
     }
     return ruleProofVerified;
 }
 
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy92ZXJpZnkvcnVsZVByb29mLmpzIl0sInNvdXJjZXNDb250ZW50IjpbIlwidXNlIHN0cmljdFwiO1xuXG5pbXBvcnQgbWF0Y2hlciBmcm9tIFwiLi4vbWF0Y2hlclwiO1xuaW1wb3J0IE1ldGFwcm9vZkNvbnRleHQgZnJvbSBcIi4uL2NvbnRleHQvbWV0YXByb29mXCI7XG5pbXBvcnQgdmVyaWZ5UnVsZURlcml2YXRpb24gZnJvbSBcIi4uL3ZlcmlmeS9ydWxlRGVyaXZhdGlvblwiO1xuXG5pbXBvcnQgeyBub2RlUXVlcnkgfSBmcm9tIFwiLi4vdXRpbGl0aWVzL3F1ZXJ5XCI7XG5cbmNvbnN0IHJ1bGVEZXJpdmF0aW9uTm9kZVF1ZXJ5ID0gbm9kZVF1ZXJ5KFwiL3J1bGVQcm9vZi9ydWxlRGVyaXZhdGlvbiFcIik7XG5cbmV4cG9ydCBkZWZhdWx0IGZ1bmN0aW9uIHZlcmlmeVJ1bGVQcm9vZihydWxlUHJvb2ZOb2RlLCBjb25jbHVzaW9uLCBtZXRhcHJvb2ZDb250ZXh0KSB7XG4gIGxldCBydWxlUHJvb2ZWZXJpZmllZCA9IGZhbHNlO1xuXG4gIG1ldGFwcm9vZkNvbnRleHQgPSBNZXRhcHJvb2ZDb250ZXh0LmZyb21NZXRhcHJvb2ZDb250ZXh0KG1ldGFwcm9vZkNvbnRleHQpOyAvLy9cblxuICBjb25zdCBydWxlRGVyaXZhdGlvbk5vZGUgPSBydWxlRGVyaXZhdGlvbk5vZGVRdWVyeShydWxlUHJvb2ZOb2RlKSxcbiAgICAgICAgcnVsZURlcml2YXRpb25WZXJpZmllZCA9IHZlcmlmeVJ1bGVEZXJpdmF0aW9uKHJ1bGVEZXJpdmF0aW9uTm9kZSwgbWV0YXByb29mQ29udGV4dCk7XG5cbiAgaWYgKHJ1bGVEZXJpdmF0aW9uVmVyaWZpZWQpIHtcbiAgICBjb25zdCBsYXN0TWV0YXByb29mU3RlcCA9IG1ldGFwcm9vZkNvbnRleHQuZ2V0TGFzdE1ldGFwcm9vZlN0ZXAoKSxcbiAgICAgICAgICBtZXRhcHJvb2ZTdGVwID0gbGFzdE1ldGFwcm9vZlN0ZXAsIC8vL1xuICAgICAgICAgIG1ldGFzdGF0ZW1lbnROb2RlID0gbWV0YXByb29mU3RlcC5nZXRNZXRhc3RhdGVtZW50Tm9kZSgpLFxuICAgICAgICAgIGNvbmNsdXNpb25NZXRhc3RhdGVtZW50Tm9kZSA9IGNvbmNsdXNpb24uZ2V0TWV0YXN0YXRlbWVudE5vZGUoKSxcbiAgICAgICAgICBub2RlQSA9IG1ldGFzdGF0ZW1lbnROb2RlLCAgLy8vXG4gICAgICAgICAgbm9kZUIgPSBjb25jbHVzaW9uTWV0YXN0YXRlbWVudE5vZGUsICAvLy9cbiAgICAgICAgICBub2RlTWF0Y2hlcyA9IG1hdGNoZXIubWF0Y2hOb2RlKG5vZGVBLCBub2RlQik7XG5cbiAgICBydWxlUHJvb2ZWZXJpZmllZCA9IG5vZGVNYXRjaGVzOyAgLy8vXG4gIH1cblxuICByZXR1cm4gcnVsZVByb29mVmVyaWZpZWQ7XG59XG4iXSwibmFtZXMiOlsidmVyaWZ5UnVsZVByb29mIiwicnVsZURlcml2YXRpb25Ob2RlUXVlcnkiLCJub2RlUXVlcnkiLCJydWxlUHJvb2ZOb2RlIiwiY29uY2x1c2lvbiIsIm1ldGFwcm9vZkNvbnRleHQiLCJydWxlUHJvb2ZWZXJpZmllZCIsIk1ldGFwcm9vZkNvbnRleHQiLCJmcm9tTWV0YXByb29mQ29udGV4dCIsInJ1bGVEZXJpdmF0aW9uTm9kZSIsInJ1bGVEZXJpdmF0aW9uVmVyaWZpZWQiLCJ2ZXJpZnlSdWxlRGVyaXZhdGlvbiIsImxhc3RNZXRhcHJvb2ZTdGVwIiwiZ2V0TGFzdE1ldGFwcm9vZlN0ZXAiLCJtZXRhcHJvb2ZTdGVwIiwibWV0YXN0YXRlbWVudE5vZGUiLCJnZXRNZXRhc3RhdGVtZW50Tm9kZSIsImNvbmNsdXNpb25NZXRhc3RhdGVtZW50Tm9kZSIsIm5vZGVBIiwibm9kZUIiLCJub2RlTWF0Y2hlcyIsIm1hdGNoZXIiLCJtYXRjaE5vZGUiXSwibWFwcGluZ3MiOiJBQUFBOzs7OytCQVVBOzs7ZUFBd0JBOzs7OERBUko7Z0VBQ1M7cUVBQ0k7cUJBRVA7Ozs7OztBQUUxQixJQUFNQywwQkFBMEJDLElBQUFBLGdCQUFTLEVBQUM7QUFFM0IsU0FBU0YsZ0JBQWdCRyxhQUFhLEVBQUVDLFVBQVUsRUFBRUMsZ0JBQWdCLEVBQUU7SUFDbkYsSUFBSUMsb0JBQW9CLEtBQUs7SUFFN0JELG1CQUFtQkUsa0JBQWdCLENBQUNDLG9CQUFvQixDQUFDSCxtQkFBbUIsR0FBRztJQUUvRSxJQUFNSSxxQkFBcUJSLHdCQUF3QkUsZ0JBQzdDTyx5QkFBeUJDLElBQUFBLHVCQUFvQixFQUFDRixvQkFBb0JKO0lBRXhFLElBQUlLLHdCQUF3QjtRQUMxQixJQUFNRSxvQkFBb0JQLGlCQUFpQlEsb0JBQW9CLElBQ3pEQyxnQkFBZ0JGLG1CQUNoQkcsb0JBQW9CRCxjQUFjRSxvQkFBb0IsSUFDdERDLDhCQUE4QmIsV0FBV1ksb0JBQW9CLElBQzdERSxRQUFRSCxtQkFDUkksUUFBUUYsNkJBQ1JHLGNBQWNDLGdCQUFPLENBQUNDLFNBQVMsQ0FBQ0osT0FBT0M7UUFFN0NiLG9CQUFvQmMsYUFBYyxHQUFHO0lBQ3ZDLENBQUM7SUFFRCxPQUFPZDtBQUNUIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy92ZXJpZnkvcnVsZVByb29mLmpzIl0sInNvdXJjZXNDb250ZW50IjpbIlwidXNlIHN0cmljdFwiO1xuXG5pbXBvcnQgTWV0YXByb29mQ29udGV4dCBmcm9tIFwiLi4vY29udGV4dC9tZXRhcHJvb2ZcIjtcbmltcG9ydCB2ZXJpZnlSdWxlRGVyaXZhdGlvbiBmcm9tIFwiLi4vdmVyaWZ5L3J1bGVEZXJpdmF0aW9uXCI7XG5cbmltcG9ydCB7IG5vZGVRdWVyeSB9IGZyb20gXCIuLi91dGlsaXRpZXMvcXVlcnlcIjtcblxuY29uc3QgcnVsZURlcml2YXRpb25Ob2RlUXVlcnkgPSBub2RlUXVlcnkoXCIvcnVsZVByb29mL3J1bGVEZXJpdmF0aW9uIVwiKTtcblxuZXhwb3J0IGRlZmF1bHQgZnVuY3Rpb24gdmVyaWZ5UnVsZVByb29mKHJ1bGVQcm9vZk5vZGUsIGNvbmNsdXNpb24sIG1ldGFwcm9vZkNvbnRleHQpIHtcbiAgbGV0IHJ1bGVQcm9vZlZlcmlmaWVkID0gZmFsc2U7XG5cbiAgbWV0YXByb29mQ29udGV4dCA9IE1ldGFwcm9vZkNvbnRleHQuZnJvbU1ldGFwcm9vZkNvbnRleHQobWV0YXByb29mQ29udGV4dCk7IC8vL1xuXG4gIGNvbnN0IHJ1bGVEZXJpdmF0aW9uTm9kZSA9IHJ1bGVEZXJpdmF0aW9uTm9kZVF1ZXJ5KHJ1bGVQcm9vZk5vZGUpLFxuICAgICAgICBydWxlRGVyaXZhdGlvblZlcmlmaWVkID0gdmVyaWZ5UnVsZURlcml2YXRpb24ocnVsZURlcml2YXRpb25Ob2RlLCBtZXRhcHJvb2ZDb250ZXh0KTtcblxuICBpZiAocnVsZURlcml2YXRpb25WZXJpZmllZCkge1xuICAgIGNvbnN0IGxhc3RNZXRhcHJvb2ZTdGVwID0gbWV0YXByb29mQ29udGV4dC5nZXRMYXN0TWV0YXByb29mU3RlcCgpLFxuICAgICAgICAgIG1ldGFwcm9vZlN0ZXAgPSBsYXN0TWV0YXByb29mU3RlcCwgLy8vXG4gICAgICAgICAgbWV0YXN0YXRlbWVudE5vZGUgPSBtZXRhcHJvb2ZTdGVwLmdldE1ldGFzdGF0ZW1lbnROb2RlKCksXG4gICAgICAgICAgY29uY2x1c2lvbk1ldGFzdGF0ZW1lbnROb2RlID0gY29uY2x1c2lvbi5nZXRNZXRhc3RhdGVtZW50Tm9kZSgpLFxuICAgICAgICAgIG1ldGFzdGF0ZW1lbnROb2RlTWF0Y2hDb25jbHVzaW9uTWV0YXN0YXRlbWVudE5vZGUgPSBtZXRhc3RhdGVtZW50Tm9kZS5tYXRjaChjb25jbHVzaW9uTWV0YXN0YXRlbWVudE5vZGUpO1xuXG4gICAgcnVsZVByb29mVmVyaWZpZWQgPSBtZXRhc3RhdGVtZW50Tm9kZU1hdGNoQ29uY2x1c2lvbk1ldGFzdGF0ZW1lbnROb2RlOyAgLy8vXG4gIH1cblxuICByZXR1cm4gcnVsZVByb29mVmVyaWZpZWQ7XG59XG4iXSwibmFtZXMiOlsidmVyaWZ5UnVsZVByb29mIiwicnVsZURlcml2YXRpb25Ob2RlUXVlcnkiLCJub2RlUXVlcnkiLCJydWxlUHJvb2ZOb2RlIiwiY29uY2x1c2lvbiIsIm1ldGFwcm9vZkNvbnRleHQiLCJydWxlUHJvb2ZWZXJpZmllZCIsIk1ldGFwcm9vZkNvbnRleHQiLCJmcm9tTWV0YXByb29mQ29udGV4dCIsInJ1bGVEZXJpdmF0aW9uTm9kZSIsInJ1bGVEZXJpdmF0aW9uVmVyaWZpZWQiLCJ2ZXJpZnlSdWxlRGVyaXZhdGlvbiIsImxhc3RNZXRhcHJvb2ZTdGVwIiwiZ2V0TGFzdE1ldGFwcm9vZlN0ZXAiLCJtZXRhcHJvb2ZTdGVwIiwibWV0YXN0YXRlbWVudE5vZGUiLCJnZXRNZXRhc3RhdGVtZW50Tm9kZSIsImNvbmNsdXNpb25NZXRhc3RhdGVtZW50Tm9kZSIsIm1ldGFzdGF0ZW1lbnROb2RlTWF0Y2hDb25jbHVzaW9uTWV0YXN0YXRlbWVudE5vZGUiLCJtYXRjaCJdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7K0JBU0E7OztlQUF3QkE7OztnRUFQSztxRUFDSTtxQkFFUDs7Ozs7O0FBRTFCLElBQU1DLDBCQUEwQkMsSUFBQUEsZ0JBQVMsRUFBQztBQUUzQixTQUFTRixnQkFBZ0JHLGFBQWEsRUFBRUMsVUFBVSxFQUFFQyxnQkFBZ0IsRUFBRTtJQUNuRixJQUFJQyxvQkFBb0IsS0FBSztJQUU3QkQsbUJBQW1CRSxrQkFBZ0IsQ0FBQ0Msb0JBQW9CLENBQUNILG1CQUFtQixHQUFHO0lBRS9FLElBQU1JLHFCQUFxQlIsd0JBQXdCRSxnQkFDN0NPLHlCQUF5QkMsSUFBQUEsdUJBQW9CLEVBQUNGLG9CQUFvQko7SUFFeEUsSUFBSUssd0JBQXdCO1FBQzFCLElBQU1FLG9CQUFvQlAsaUJBQWlCUSxvQkFBb0IsSUFDekRDLGdCQUFnQkYsbUJBQ2hCRyxvQkFBb0JELGNBQWNFLG9CQUFvQixJQUN0REMsOEJBQThCYixXQUFXWSxvQkFBb0IsSUFDN0RFLG9EQUFvREgsa0JBQWtCSSxLQUFLLENBQUNGO1FBRWxGWCxvQkFBb0JZLG1EQUFvRCxHQUFHO0lBQzdFLENBQUM7SUFFRCxPQUFPWjtBQUNUIn0=

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "occam-verify-cli",
   "author": "James Smith",
-  "version": "0.0.617",
+  "version": "0.0.618",
   "license": "MIT, Anti-996",
   "homepage": "https://github.com/djalbat/occam-verify-cli",
   "description": "Occam's Verifier",

package/src/equality.js

@@ -1,6 +1,5 @@
 "use strict";
 
-import matcher from "./matcher";
 import Verifier from "./verifier";
 import verifyTerm from "./verify/term";
 import equalityStatementNode from "./node/statement/equality";
@@ -94,12 +93,10 @@ export default class Equality {
     const statementNode = proofStep.getStatementNode();
 
     if (statementNode !== null) {
-      const nodeA = statementNode,  ///
-            nodeB = equalityStatementNode,  ///
-            depth = EQUALITY_DEPTH,
-            nodeMatches = matcher.matchNode(nodeA, nodeB, depth);
+      const depth = EQUALITY_DEPTH,
+            statementNodeMatchesEqualityStatementNode = statementNode.match(equalityStatementNode, depth);
 
-      if (nodeMatches) {
+      if (statementNodeMatchesEqualityStatementNode) {
         const leftTermNode = leftTermNodeQuery(statementNode),
               rightTermNode = rightTermNodeQuery(statementNode);
 

package/src/substitution/metastatementForMetavariable.js

@@ -1,7 +1,5 @@
 "use strict";
 
-import matcher from "../matcher";
-
 import { bracketedMetastatementChildNodeFromMetastatementNode } from "../utilities/metaproof";
 
 export default class MetastatementForMetavariableSubstitution {
@@ -21,22 +19,15 @@ export default class MetastatementForMetavariableSubstitution {
   matchMetastatementNode(metastatementNode) {
     let metastatementNodeMatches;
 
-    const nodeA = this.metastatementNode,  ///
-          nodeB = metastatementNode,
-          nodeMatches = matcher.matchNode(nodeA, nodeB);
-
-    metastatementNodeMatches = nodeMatches;  ///
+    metastatementNodeMatches = this.metastatementNode.match(metastatementNode)
 
     if (!metastatementNodeMatches) {
       const bracketedMetastatementChildNode = bracketedMetastatementChildNodeFromMetastatementNode(metastatementNode);
 
       if (bracketedMetastatementChildNode !== null) {
-        const metastatementNode = bracketedMetastatementChildNode, ///
-              nodeA = this.metastatementNode,  ///
-              nodeB = metastatementNode,
-              nodeMatches = matcher.matchNode(nodeA, nodeB);
+        const metastatementNode = bracketedMetastatementChildNode; ///
 
-        metastatementNodeMatches = nodeMatches;  ///
+        metastatementNodeMatches = this.metastatementNode.match(metastatementNode);
       }
     }
 

package/src/substitution/statementForMetavariable.js

@@ -1,7 +1,5 @@
 "use strict";
 
-import matcher from "../matcher";
-
 import { bracketedStatementChildNodeFromStatementNode } from "../utilities/proof";
 
 export default class StatementForMetavariableSubstitution {
@@ -21,22 +19,15 @@ export default class StatementForMetavariableSubstitution {
   matchStatementNode(statementNode) {
     let statementNodeMatches;
 
-    const nodeA = this.statementNode,  ///
-          nodeB = statementNode,
-          nodeMatches = matcher.matchNode(nodeA, nodeB);
-
-    statementNodeMatches = nodeMatches;  ///
+    statementNodeMatches = this.statementNode.match(statementNode);
 
     if (!statementNodeMatches) {
       const bracketedStatementChildNode = bracketedStatementChildNodeFromStatementNode(statementNode);
 
       if (bracketedStatementChildNode !== null) {
-        const statementNode = bracketedStatementChildNode, ///
-              nodeA = this.statementNode,  ///
-              nodeB = statementNode,
-              nodeMatches = matcher.matchNode(nodeA, nodeB);
+        const statementNode = bracketedStatementChildNode; ///
 
-        statementNodeMatches = nodeMatches;  ///
+        statementNodeMatches = this.statementNode.match(statementNode);
       }
     }
 

package/src/substitution/termForVariable.js

@@ -1,7 +1,5 @@
 "use strict";
 
-import matcher from "../matcher";
-
 export default class TermForVariableSubstitution {
   constructor(variableName, termNode) {
     this.variableName = variableName;
@@ -19,11 +17,7 @@ export default class TermForVariableSubstitution {
   matchTermNode(termNode) {
     let termNodeMatches;
 
-    const nodeA = this.termNode,  ///
-          nodeB = termNode,
-          nodeMatches = matcher.matchNode(nodeA, nodeB);
-
-    termNodeMatches = nodeMatches;  ///
+    termNodeMatches = this.termNode.match(termNode);
 
     return termNodeMatches;
   }

package/src/utilities/metaproof.js

@@ -1,6 +1,5 @@
 "use strict";
 
-import matcher from "../matcher";
 import bracketedMetastatementNode from "../node/metastatement/bracketed";
 
 import { nodeQuery } from "../utilities/query";
@@ -12,22 +11,18 @@ export function matchMetastatementModuloBrackets(metastatementNodeA, metastateme
   let metastatementMatchesModuloBrackets = false;
 
   if (!metastatementMatchesModuloBrackets) {
-    const nodeA = metastatementNodeA,  ///
-          nodeB = metastatementNodeB,  ///
-          nodeMatches = matcher.matchNode(nodeA, nodeB);
+    const metastatementNodeMatches = metastatementNodeA.match(metastatementNodeB);
 
-    metastatementMatchesModuloBrackets = nodeMatches;  ///
+    metastatementMatchesModuloBrackets = metastatementNodeMatches;  ///
   }
 
   if (!metastatementMatchesModuloBrackets) {
     const bracketedMetastatementChildNodeA = bracketedMetastatementChildNodeFromMetastatementNode(metastatementNodeA);
 
     if (bracketedMetastatementChildNodeA !== null) {
-      const nodeA = bracketedMetastatementChildNodeA,  ///
-            nodeB = metastatementNodeB, ///
-            nodeMatches = matcher.matchNode(nodeA, nodeB);
+      const bracketedMetastatementChildNodeAMatchesMetastatementNodeB = bracketedMetastatementChildNodeA.match(metastatementNodeB);
 
-      metastatementMatchesModuloBrackets = nodeMatches; ///
+      metastatementMatchesModuloBrackets = bracketedMetastatementChildNodeAMatchesMetastatementNodeB; ///
     }
   }
 
@@ -35,11 +30,9 @@ export function matchMetastatementModuloBrackets(metastatementNodeA, metastateme
     const bracketedMetastatementChildNodeB = bracketedMetastatementChildNodeFromMetastatementNode(metastatementNodeB);
 
     if (bracketedMetastatementChildNodeB !== null) {
-      const nodeA = metastatementNodeA, ///
-            nodeB = bracketedMetastatementChildNodeB,  ///
-            nodeMatches = matcher.matchNode(nodeA, nodeB);
+      const metastatementNodeAMatchesBracketedMetastatementChildNodeB = metastatementNodeA.match(bracketedMetastatementChildNodeB);
 
-      metastatementMatchesModuloBrackets = nodeMatches; ///
+      metastatementMatchesModuloBrackets = metastatementNodeAMatchesBracketedMetastatementChildNodeB; ///
     }
   }
 
@@ -49,12 +42,10 @@ export function matchMetastatementModuloBrackets(metastatementNodeA, metastateme
 export function bracketedMetastatementChildNodeFromMetastatementNode(metastatementNode) {
   let bracketedMetastatementChildNode = null;
 
-  const nodeA = metastatementNode,  ///
-        nodeB = bracketedMetastatementNode,  ///
-        depth = BRACKETED_METASTATEMENT_DEPTH,
-        nonTerminalNodeMatches = matcher.matchNode(nodeA, nodeB, depth);
+  const depth = BRACKETED_METASTATEMENT_DEPTH,
+        metastatementNodeMatchesBracketedMetastatementNode = metastatementNode.match(bracketedMetastatementNode, depth);
 
-  if (nonTerminalNodeMatches) {
+  if (metastatementNodeMatchesBracketedMetastatementNode) {
     bracketedMetastatementChildNode = bracketedMetastatementChildNodeQuery(metastatementNode);
   }
 

package/src/utilities/proof.js

@@ -1,6 +1,5 @@
 "use strict";
 
-import matcher from "../matcher";
 import bracketedStatementNode from "../node/statement/bracketed";
 
 import { nodeQuery } from "../utilities/query";
@@ -12,22 +11,18 @@ export function matchStatementModuloBrackets(statementNodeA, statementNodeB) {
   let statementMatchesModuloBrackets = false;
 
   if (!statementMatchesModuloBrackets) {
-    const nodeA = statementNodeA,  ///
-          nodeB = statementNodeB,  ///
-          nonTerminalNodeMatches = matcher.matchNode(nodeA, nodeB);
+    const statementNodeMatches = statementNodeA.match(statementNodeB);
 
-    statementMatchesModuloBrackets = nonTerminalNodeMatches;  ///
+    statementMatchesModuloBrackets = statementNodeMatches;  ///
   }
 
   if (!statementMatchesModuloBrackets) {
     const bracketedStatementChildNodeA = bracketedStatementChildNodeFromStatementNode(statementNodeA);
 
     if (bracketedStatementChildNodeA !== null) {
-      const nodeA = bracketedStatementChildNodeA,  ///
-            nodeB = statementNodeB, ///
-            nodeMatches = matcher.matchNode(nodeA, nodeB);
+      const bracketedStatementChildNodeAMatchStatementNodeB = bracketedStatementChildNodeA.match(statementNodeB);
 
-      statementMatchesModuloBrackets = nodeMatches; ///
+      statementMatchesModuloBrackets = bracketedStatementChildNodeAMatchStatementNodeB; ///
     }
   }
 
@@ -35,11 +30,9 @@ export function matchStatementModuloBrackets(statementNodeA, statementNodeB) {
     const bracketedStatementChildNodeB = bracketedStatementChildNodeFromStatementNode(statementNodeB);
 
     if (bracketedStatementChildNodeB !== null) {
-      const nodeA = statementNodeA, ///
-            nodeB = bracketedStatementChildNodeB,  ///
-            nodeMatches = matcher.matchNode(nodeA, nodeB);
+      const statementNodeAMatchBracketedStatementChildNodeB = statementNodeA.match(bracketedStatementChildNodeB);
 
-      statementMatchesModuloBrackets = nodeMatches; ///
+      statementMatchesModuloBrackets = statementNodeAMatchBracketedStatementChildNodeB; ///
     }
   }
 
@@ -49,12 +42,10 @@ export function matchStatementModuloBrackets(statementNodeA, statementNodeB) {
 export function bracketedStatementChildNodeFromStatementNode(statementNode) {
   let bracketedStatementChildNode = null;
 
-  const nodeA = statementNode,  ///
-        nodeB = bracketedStatementNode,  ///
-        depth = BRACKETED_STATEMENT_DEPTH,
-        nonTerminalNodeMatches = matcher.matchNode(nodeA, nodeB, depth);
+  const depth = BRACKETED_STATEMENT_DEPTH,
+        statementNodeMatchBracketedStatementNode = statementNode.match(bracketedStatementNode, depth);
 
-  if (nonTerminalNodeMatches) {
+  if (statementNodeMatchBracketedStatementNode) {
     bracketedStatementChildNode = bracketedStatementChildNodeQuery(statementNode);
   }
 

package/src/verify/proof.js

@@ -1,6 +1,5 @@
 "use strict";
 
-import matcher from "../matcher";
 import ProofContext from "../context/proof";
 import verifyDerivation from "../verify/derivation";
 
@@ -21,11 +20,9 @@ export default function verifyProof(proofNode, conclusion, proofContext) {
           proofStep = lastProofStep, ///
           statementNode = proofStep.getStatementNode(),
           conclusionStatementNode = conclusion.getStatementNode(),
-          nodeA = statementNode,  ///
-          nodeB = conclusionStatementNode,  ///
-          nodeMatches = matcher.matchNode(nodeA, nodeB);
+          statementNodeMatchConclusionStatementNode = statementNode.match(conclusionStatementNode);
 
-    proofVerified = nodeMatches;  ///
+    proofVerified = statementNodeMatchConclusionStatementNode;  ///
   }
 
   return proofVerified;

package/src/verify/ruleProof.js

@@ -1,6 +1,5 @@
 "use strict";
 
-import matcher from "../matcher";
 import MetaproofContext from "../context/metaproof";
 import verifyRuleDerivation from "../verify/ruleDerivation";
 
@@ -21,11 +20,9 @@ export default function verifyRuleProof(ruleProofNode, conclusion, metaproofCont
           metaproofStep = lastMetaproofStep, ///
           metastatementNode = metaproofStep.getMetastatementNode(),
           conclusionMetastatementNode = conclusion.getMetastatementNode(),
-          nodeA = metastatementNode,  ///
-          nodeB = conclusionMetastatementNode,  ///
-          nodeMatches = matcher.matchNode(nodeA, nodeB);
+          metastatementNodeMatchConclusionMetastatementNode = metastatementNode.match(conclusionMetastatementNode);
 
-    ruleProofVerified = nodeMatches;  ///
+    ruleProofVerified = metastatementNodeMatchConclusionMetastatementNode;  ///
   }
 
   return ruleProofVerified;

package/lib/matcher.js

@@ -1,100 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", {
-    value: true
-});
-Object.defineProperty(exports, "default", {
-    enumerable: true,
-    get: function() {
-        return _default;
-    }
-});
-function _class_call_check(instance, Constructor) {
-    if (!(instance instanceof Constructor)) {
-        throw new TypeError("Cannot call a class as a function");
-    }
-}
-function _defineProperties(target, props) {
-    for(var i = 0; i < props.length; i++){
-        var descriptor = props[i];
-        descriptor.enumerable = descriptor.enumerable || false;
-        descriptor.configurable = true;
-        if ("value" in descriptor) descriptor.writable = true;
-        Object.defineProperty(target, descriptor.key, descriptor);
-    }
-}
-function _create_class(Constructor, protoProps, staticProps) {
-    if (protoProps) _defineProperties(Constructor.prototype, protoProps);
-    if (staticProps) _defineProperties(Constructor, staticProps);
-    return Constructor;
-}
-var Matcher = /*#__PURE__*/ function() {
-    function Matcher() {
-        _class_call_check(this, Matcher);
-    }
-    _create_class(Matcher, [
-        {
-            key: "matchNode",
-            value: function matchNode(nodeA, nodeB) {
-                var depth = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : Infinity;
-                var nodeMatches = false;
-                if (depth === 0) {
-                    nodeMatches = true;
-                } else {
-                    var nodeATerminalNode = nodeA.isTerminalNode(), nodeBTerminalNode = nodeB.isTerminalNode();
-                    if (nodeATerminalNode === nodeBTerminalNode) {
-                        if (nodeATerminalNode) {
-                            var terminalNodeA = nodeA, terminalNodeB = nodeB, terminalNodeMatches = this.matchTerminalNode(terminalNodeA, terminalNodeB);
-                            nodeMatches = terminalNodeMatches; ///
-                        } else {
-                            var nonTerminalNodeA = nodeA, nonTerminalNodeB = nodeB, nonTerminalNodeMatches = this.matchNonTerminalNode(nonTerminalNodeA, nonTerminalNodeB, depth);
-                            nodeMatches = nonTerminalNodeMatches; ///
-                        }
-                    }
-                }
-                return nodeMatches;
-            }
-        },
-        {
-            key: "matchNodes",
-            value: function matchNodes(nodesA, nodesB, depth) {
-                var _this = this;
-                var nodesMatch = false;
-                var nodesALength = nodesA.length, nodesBLength = nodesB.length;
-                if (nodesALength === nodesBLength) {
-                    depth--;
-                    nodesMatch = nodesA.every(function(nodeA, index) {
-                        var nodeB = nodesB[index], nodeMatches = _this.matchNode(nodeA, nodeB, depth);
-                        if (nodeMatches) {
-                            return true;
-                        }
-                    });
-                }
-                return nodesMatch;
-            }
-        },
-        {
-            key: "matchTerminalNode",
-            value: function matchTerminalNode(terminalNodeA, terminalNodeB, depth) {
-                var matches = terminalNodeA.match(terminalNodeB), terminalNodeMatches = matches; ///
-                return terminalNodeMatches;
-            }
-        },
-        {
-            key: "matchNonTerminalNode",
-            value: function matchNonTerminalNode(nonTerminalNodeA, nonTerminalNodeB, depth) {
-                var nonTerminalNodeMatches = false;
-                var nonTerminalNodeARuleName = nonTerminalNodeA.getRuleName(), nonTerminalNodeBRuleName = nonTerminalNodeB.getRuleName(); ///
-                if (nonTerminalNodeARuleName === nonTerminalNodeBRuleName) {
-                    var nonTerminalNodeAChildNodes = nonTerminalNodeA.getChildNodes(), nonTerminalNodeBChildNodes = nonTerminalNodeB.getChildNodes(), nodesA = nonTerminalNodeAChildNodes, nodesB = nonTerminalNodeBChildNodes, nodesMatch = this.matchNodes(nodesA, nodesB, depth);
-                    nonTerminalNodeMatches = nodesMatch; ///
-                }
-                return nonTerminalNodeMatches;
-            }
-        }
-    ]);
-    return Matcher;
-}();
-var matcher = new Matcher();
-var _default = matcher;
-
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy9tYXRjaGVyLmpzIl0sInNvdXJjZXNDb250ZW50IjpbIlwidXNlIHN0cmljdFwiO1xuXG5jbGFzcyBNYXRjaGVyIHtcbiAgbWF0Y2hOb2RlKG5vZGVBLCBub2RlQiwgZGVwdGggPSBJbmZpbml0eSkge1xuICAgIGxldCBub2RlTWF0Y2hlcyA9IGZhbHNlO1xuXG4gICAgaWYgKGRlcHRoID09PSAwKSB7XG4gICAgICBub2RlTWF0Y2hlcyA9IHRydWU7XG4gICAgfSBlbHNlIHtcbiAgICAgIGNvbnN0IG5vZGVBVGVybWluYWxOb2RlID0gbm9kZUEuaXNUZXJtaW5hbE5vZGUoKSxcbiAgICAgICAgICAgIG5vZGVCVGVybWluYWxOb2RlID0gbm9kZUIuaXNUZXJtaW5hbE5vZGUoKTtcblxuICAgICAgaWYgKG5vZGVBVGVybWluYWxOb2RlID09PSBub2RlQlRlcm1pbmFsTm9kZSkge1xuICAgICAgICBpZiAobm9kZUFUZXJtaW5hbE5vZGUpIHtcbiAgICAgICAgICBjb25zdCB0ZXJtaW5hbE5vZGVBID0gbm9kZUEsICAvLy9cbiAgICAgICAgICAgICAgICB0ZXJtaW5hbE5vZGVCID0gbm9kZUIsICAvLy9cbiAgICAgICAgICAgICAgICB0ZXJtaW5hbE5vZGVNYXRjaGVzID0gdGhpcy5tYXRjaFRlcm1pbmFsTm9kZSh0ZXJtaW5hbE5vZGVBLCB0ZXJtaW5hbE5vZGVCKTtcblxuICAgICAgICAgIG5vZGVNYXRjaGVzID0gdGVybWluYWxOb2RlTWF0Y2hlczsgIC8vL1xuICAgICAgICB9IGVsc2Uge1xuICAgICAgICAgIGNvbnN0IG5vblRlcm1pbmFsTm9kZUEgPSBub2RlQSwgIC8vL1xuICAgICAgICAgICAgICAgIG5vblRlcm1pbmFsTm9kZUIgPSBub2RlQiwgLy8vXG4gICAgICAgICAgICAgICAgbm9uVGVybWluYWxOb2RlTWF0Y2hlcyA9IHRoaXMubWF0Y2hOb25UZXJtaW5hbE5vZGUobm9uVGVybWluYWxOb2RlQSwgbm9uVGVybWluYWxOb2RlQiwgZGVwdGgpO1xuXG4gICAgICAgICAgbm9kZU1hdGNoZXMgPSBub25UZXJtaW5hbE5vZGVNYXRjaGVzOyAvLy9cbiAgICAgICAgfVxuICAgICAgfVxuICAgIH1cblxuICAgIHJldHVybiBub2RlTWF0Y2hlcztcbiAgfVxuXG4gIG1hdGNoTm9kZXMobm9kZXNBLCBub2Rlc0IsIGRlcHRoKSB7XG4gICAgbGV0IG5vZGVzTWF0Y2ggPSBmYWxzZTtcblxuICAgIGNvbnN0IG5vZGVzQUxlbmd0aCA9IG5vZGVzQS5sZW5ndGgsXG4gICAgICAgICAgbm9kZXNCTGVuZ3RoID0gbm9kZXNCLmxlbmd0aDtcblxuICAgIGlmIChub2Rlc0FMZW5ndGggPT09IG5vZGVzQkxlbmd0aCkge1xuICAgICAgZGVwdGgtLTtcblxuICAgICAgbm9kZXNNYXRjaCA9IG5vZGVzQS5ldmVyeSgobm9kZUEsIGluZGV4KSA9PiB7XG4gICAgICAgIGNvbnN0IG5vZGVCID0gbm9kZXNCW2luZGV4XSxcbiAgICAgICAgICAgICAgbm9kZU1hdGNoZXMgPSB0aGlzLm1hdGNoTm9kZShub2RlQSwgbm9kZUIsIGRlcHRoKTtcblxuICAgICAgICBpZiAobm9kZU1hdGNoZXMpIHtcbiAgICAgICAgICByZXR1cm4gdHJ1ZTtcbiAgICAgICAgfVxuICAgICAgfSlcbiAgICB9XG5cbiAgICByZXR1cm4gbm9kZXNNYXRjaDtcbiAgfVxuXG4gIG1hdGNoVGVybWluYWxOb2RlKHRlcm1pbmFsTm9kZUEsIHRlcm1pbmFsTm9kZUIsIGRlcHRoKSB7XG4gICAgY29uc3QgbWF0Y2hlcyA9IHRlcm1pbmFsTm9kZUEubWF0Y2godGVybWluYWxOb2RlQiksXG4gICAgICAgICAgdGVybWluYWxOb2RlTWF0Y2hlcyA9IG1hdGNoZXM7ICAvLy9cblxuICAgIHJldHVybiB0ZXJtaW5hbE5vZGVNYXRjaGVzO1xuICB9XG5cbiAgbWF0Y2hOb25UZXJtaW5hbE5vZGUobm9uVGVybWluYWxOb2RlQSwgbm9uVGVybWluYWxOb2RlQiwgZGVwdGgpIHtcbiAgICBsZXQgbm9uVGVybWluYWxOb2RlTWF0Y2hlcyA9IGZhbHNlO1xuXG4gICAgY29uc3Qgbm9uVGVybWluYWxOb2RlQVJ1bGVOYW1lID0gbm9uVGVybWluYWxOb2RlQS5nZXRSdWxlTmFtZSgpLCAvLy9cbiAgICAgICAgICBub25UZXJtaW5hbE5vZGVCUnVsZU5hbWUgPSBub25UZXJtaW5hbE5vZGVCLmdldFJ1bGVOYW1lKCk7IC8vL1xuXG4gICAgaWYgKG5vblRlcm1pbmFsTm9kZUFSdWxlTmFtZSA9PT0gbm9uVGVybWluYWxOb2RlQlJ1bGVOYW1lKSB7XG4gICAgICBjb25zdCBub25UZXJtaW5hbE5vZGVBQ2hpbGROb2RlcyA9IG5vblRlcm1pbmFsTm9kZUEuZ2V0Q2hpbGROb2RlcygpLFxuICAgICAgICAgICAgbm9uVGVybWluYWxOb2RlQkNoaWxkTm9kZXMgPSBub25UZXJtaW5hbE5vZGVCLmdldENoaWxkTm9kZXMoKSxcbiAgICAgICAgICAgIG5vZGVzQSA9IG5vblRlcm1pbmFsTm9kZUFDaGlsZE5vZGVzLCAvLy9cbiAgICAgICAgICAgIG5vZGVzQiA9IG5vblRlcm1pbmFsTm9kZUJDaGlsZE5vZGVzLCAvLy9cbiAgICAgICAgICAgIG5vZGVzTWF0Y2ggPSB0aGlzLm1hdGNoTm9kZXMobm9kZXNBLCBub2Rlc0IsIGRlcHRoKTtcblxuICAgICAgbm9uVGVybWluYWxOb2RlTWF0Y2hlcyA9IG5vZGVzTWF0Y2g7IC8vL1xuICAgIH1cblxuICAgIHJldHVybiBub25UZXJtaW5hbE5vZGVNYXRjaGVzO1xuICB9XG59XG5cbmNvbnN0IG1hdGNoZXIgPSBuZXcgTWF0Y2hlcigpO1xuXG5leHBvcnQgZGVmYXVsdCBtYXRjaGVyO1xuIl0sIm5hbWVzIjpbIk1hdGNoZXIiLCJtYXRjaE5vZGUiLCJub2RlQSIsIm5vZGVCIiwiZGVwdGgiLCJJbmZpbml0eSIsIm5vZGVNYXRjaGVzIiwibm9kZUFUZXJtaW5hbE5vZGUiLCJpc1Rlcm1pbmFsTm9kZSIsIm5vZGVCVGVybWluYWxOb2RlIiwidGVybWluYWxOb2RlQSIsInRlcm1pbmFsTm9kZUIiLCJ0ZXJtaW5hbE5vZGVNYXRjaGVzIiwibWF0Y2hUZXJtaW5hbE5vZGUiLCJub25UZXJtaW5hbE5vZGVBIiwibm9uVGVybWluYWxOb2RlQiIsIm5vblRlcm1pbmFsTm9kZU1hdGNoZXMiLCJtYXRjaE5vblRlcm1pbmFsTm9kZSIsIm1hdGNoTm9kZXMiLCJub2Rlc0EiLCJub2Rlc0IiLCJub2Rlc01hdGNoIiwibm9kZXNBTGVuZ3RoIiwibGVuZ3RoIiwibm9kZXNCTGVuZ3RoIiwiZXZlcnkiLCJpbmRleCIsIm1hdGNoZXMiLCJtYXRjaCIsIm5vblRlcm1pbmFsTm9kZUFSdWxlTmFtZSIsImdldFJ1bGVOYW1lIiwibm9uVGVybWluYWxOb2RlQlJ1bGVOYW1lIiwibm9uVGVybWluYWxOb2RlQUNoaWxkTm9kZXMiLCJnZXRDaGlsZE5vZGVzIiwibm9uVGVybWluYWxOb2RlQkNoaWxkTm9kZXMiLCJtYXRjaGVyIl0sIm1hcHBpbmdzIjoiQUFBQTs7OzsrQkFtRkE7OztlQUFBOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBakZBLElBQUEsQUFBTUEsd0JBK0VILEFBL0VIO2FBQU1BO2dDQUFBQTs7a0JBQUFBOztZQUNKQyxLQUFBQTttQkFBQUEsU0FBQUEsVUFBVUMsS0FBSyxFQUFFQyxLQUFLLEVBQW9CO29CQUFsQkMsUUFBQUEsaUVBQVFDLFFBQVE7Z0JBQ3RDLElBQUlDLGNBQWMsS0FBSztnQkFFdkIsSUFBSUYsVUFBVSxHQUFHO29CQUNmRSxjQUFjLElBQUk7Z0JBQ3BCLE9BQU87b0JBQ0wsSUFBTUMsb0JBQW9CTCxNQUFNTSxjQUFjLElBQ3hDQyxvQkFBb0JOLE1BQU1LLGNBQWM7b0JBRTlDLElBQUlELHNCQUFzQkUsbUJBQW1CO3dCQUMzQyxJQUFJRixtQkFBbUI7NEJBQ3JCLElBQU1HLGdCQUFnQlIsT0FDaEJTLGdCQUFnQlIsT0FDaEJTLHNCQUFzQixJQUFJLENBQUNDLGlCQUFpQixDQUFDSCxlQUFlQzs0QkFFbEVMLGNBQWNNLHFCQUFzQixHQUFHO3dCQUN6QyxPQUFPOzRCQUNMLElBQU1FLG1CQUFtQlosT0FDbkJhLG1CQUFtQlosT0FDbkJhLHlCQUF5QixJQUFJLENBQUNDLG9CQUFvQixDQUFDSCxrQkFBa0JDLGtCQUFrQlg7NEJBRTdGRSxjQUFjVSx3QkFBd0IsR0FBRzt3QkFDM0MsQ0FBQztvQkFDSCxDQUFDO2dCQUNILENBQUM7Z0JBRUQsT0FBT1Y7WUFDVDs7O1lBRUFZLEtBQUFBO21CQUFBQSxTQUFBQSxXQUFXQyxNQUFNLEVBQUVDLE1BQU0sRUFBRWhCLEtBQUssRUFBRTs7Z0JBQ2hDLElBQUlpQixhQUFhLEtBQUs7Z0JBRXRCLElBQU1DLGVBQWVILE9BQU9JLE1BQU0sRUFDNUJDLGVBQWVKLE9BQU9HLE1BQU07Z0JBRWxDLElBQUlELGlCQUFpQkUsY0FBYztvQkFDakNwQjtvQkFFQWlCLGFBQWFGLE9BQU9NLEtBQUssQ0FBQyxTQUFDdkIsT0FBT3dCLE9BQVU7d0JBQzFDLElBQU12QixRQUFRaUIsTUFBTSxDQUFDTSxNQUFNLEVBQ3JCcEIsY0FBYyxNQUFLTCxTQUFTLENBQUNDLE9BQU9DLE9BQU9DO3dCQUVqRCxJQUFJRSxhQUFhOzRCQUNmLE9BQU8sSUFBSTt3QkFDYixDQUFDO29CQUNIO2dCQUNGLENBQUM7Z0JBRUQsT0FBT2U7WUFDVDs7O1lBRUFSLEtBQUFBO21CQUFBQSxTQUFBQSxrQkFBa0JILGFBQWEsRUFBRUMsYUFBYSxFQUFFUCxLQUFLLEVBQUU7Z0JBQ3JELElBQU11QixVQUFVakIsY0FBY2tCLEtBQUssQ0FBQ2pCLGdCQUM5QkMsc0JBQXNCZSxTQUFVLEdBQUc7Z0JBRXpDLE9BQU9mO1lBQ1Q7OztZQUVBSyxLQUFBQTttQkFBQUEsU0FBQUEscUJBQXFCSCxnQkFBZ0IsRUFBRUMsZ0JBQWdCLEVBQUVYLEtBQUssRUFBRTtnQkFDOUQsSUFBSVkseUJBQXlCLEtBQUs7Z0JBRWxDLElBQU1hLDJCQUEyQmYsaUJBQWlCZ0IsV0FBVyxJQUN2REMsMkJBQTJCaEIsaUJBQWlCZSxXQUFXLElBQUksR0FBRztnQkFFcEUsSUFBSUQsNkJBQTZCRSwwQkFBMEI7b0JBQ3pELElBQU1DLDZCQUE2QmxCLGlCQUFpQm1CLGFBQWEsSUFDM0RDLDZCQUE2Qm5CLGlCQUFpQmtCLGFBQWEsSUFDM0RkLFNBQVNhLDRCQUNUWixTQUFTYyw0QkFDVGIsYUFBYSxJQUFJLENBQUNILFVBQVUsQ0FBQ0MsUUFBUUMsUUFBUWhCO29CQUVuRFkseUJBQXlCSyxZQUFZLEdBQUc7Z0JBQzFDLENBQUM7Z0JBRUQsT0FBT0w7WUFDVDs7O1dBNUVJaEI7O0FBK0VOLElBQU1tQyxVQUFVLElBQUluQztJQUVwQixXQUFlbUMifQ==

package/src/matcher.js

@@ -1,84 +0,0 @@
-"use strict";
-
-class Matcher {
-  matchNode(nodeA, nodeB, depth = Infinity) {
-    let nodeMatches = false;
-
-    if (depth === 0) {
-      nodeMatches = true;
-    } else {
-      const nodeATerminalNode = nodeA.isTerminalNode(),
-            nodeBTerminalNode = nodeB.isTerminalNode();
-
-      if (nodeATerminalNode === nodeBTerminalNode) {
-        if (nodeATerminalNode) {
-          const terminalNodeA = nodeA,  ///
-                terminalNodeB = nodeB,  ///
-                terminalNodeMatches = this.matchTerminalNode(terminalNodeA, terminalNodeB);
-
-          nodeMatches = terminalNodeMatches;  ///
-        } else {
-          const nonTerminalNodeA = nodeA,  ///
-                nonTerminalNodeB = nodeB, ///
-                nonTerminalNodeMatches = this.matchNonTerminalNode(nonTerminalNodeA, nonTerminalNodeB, depth);
-
-          nodeMatches = nonTerminalNodeMatches; ///
-        }
-      }
-    }
-
-    return nodeMatches;
-  }
-
-  matchNodes(nodesA, nodesB, depth) {
-    let nodesMatch = false;
-
-    const nodesALength = nodesA.length,
-          nodesBLength = nodesB.length;
-
-    if (nodesALength === nodesBLength) {
-      depth--;
-
-      nodesMatch = nodesA.every((nodeA, index) => {
-        const nodeB = nodesB[index],
-              nodeMatches = this.matchNode(nodeA, nodeB, depth);
-
-        if (nodeMatches) {
-          return true;
-        }
-      })
-    }
-
-    return nodesMatch;
-  }
-
-  matchTerminalNode(terminalNodeA, terminalNodeB, depth) {
-    const matches = terminalNodeA.match(terminalNodeB),
-          terminalNodeMatches = matches;  ///
-
-    return terminalNodeMatches;
-  }
-
-  matchNonTerminalNode(nonTerminalNodeA, nonTerminalNodeB, depth) {
-    let nonTerminalNodeMatches = false;
-
-    const nonTerminalNodeARuleName = nonTerminalNodeA.getRuleName(), ///
-          nonTerminalNodeBRuleName = nonTerminalNodeB.getRuleName(); ///
-
-    if (nonTerminalNodeARuleName === nonTerminalNodeBRuleName) {
-      const nonTerminalNodeAChildNodes = nonTerminalNodeA.getChildNodes(),
-            nonTerminalNodeBChildNodes = nonTerminalNodeB.getChildNodes(),
-            nodesA = nonTerminalNodeAChildNodes, ///
-            nodesB = nonTerminalNodeBChildNodes, ///
-            nodesMatch = this.matchNodes(nodesA, nodesB, depth);
-
-      nonTerminalNodeMatches = nodesMatch; ///
-    }
-
-    return nonTerminalNodeMatches;
-  }
-}
-
-const matcher = new Matcher();
-
-export default matcher;