occam-verify-cli 0.0.478 → 0.0.479

package/lib/verify/statement.js

@@ -23,16 +23,19 @@ function verifyStatement(statementNode, proofContext) {
     proofContext.begin(statementNode);
     var equalityNode = equalityNodeQuery(statementNode), statementString = (0, _string.nodeAsString)(statementNode), typeAssertionNode = typeAssertionNodeQuery(statementNode);
     proofContext.debug("Verifying the '".concat(statementString, "' statement..."));
-    if (equalityNode !== null) {
+    if (false) {
+    ///
+    } else if (equalityNode !== null) {
         var equalityVerified = (0, _equality.default)(equalityNode, proofContext);
         statementVerified = equalityVerified; ///
-    }
-    if (typeAssertionNode !== null) {
+    } else if (typeAssertionNode !== null) {
         var typeAssertionVerified = (0, _type.default)(typeAssertionNode, proofContext);
         statementVerified = typeAssertionVerified; ///
+    } else {
+        statementVerified = true;
     }
     statementVerified ? proofContext.complete(statementNode) : proofContext.halt(statementNode);
     return statementVerified;
 }
 
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy92ZXJpZnkvc3RhdGVtZW50LmpzIl0sInNvdXJjZXNDb250ZW50IjpbIlwidXNlIHN0cmljdFwiO1xuXG5pbXBvcnQgdmVyaWZ5RXF1YWxpdHkgZnJvbSBcIi4uL3ZlcmlmeS9lcXVhbGl0eVwiO1xuaW1wb3J0IHZlcmlmeVR5cGVBc3NlcnRpb24gZnJvbSBcIi4uL3ZlcmlmeS9hc3NlcnRpb24vdHlwZVwiO1xuXG5pbXBvcnQgeyBub2RlUXVlcnkgfSBmcm9tIFwiLi4vdXRpbGl0aWVzL3F1ZXJ5XCI7XG5pbXBvcnQgeyBub2RlQXNTdHJpbmcgfSBmcm9tIFwiLi4vdXRpbGl0aWVzL3N0cmluZ1wiO1xuXG5jb25zdCBlcXVhbGl0eU5vZGVRdWVyeSA9IG5vZGVRdWVyeShcIi9zdGF0ZW1lbnQvZXF1YWxpdHkhXCIpLFxuICAgICAgdHlwZUFzc2VydGlvbk5vZGVRdWVyeSA9IG5vZGVRdWVyeShcIi9zdGF0ZW1lbnQvdHlwZUFzc2VydGlvbiFcIik7XG5cbmV4cG9ydCBkZWZhdWx0IGZ1bmN0aW9uIHZlcmlmeVN0YXRlbWVudChzdGF0ZW1lbnROb2RlLCBwcm9vZkNvbnRleHQpIHtcbiAgbGV0IHN0YXRlbWVudFZlcmlmaWVkID0gZmFsc2U7XG5cbiAgcHJvb2ZDb250ZXh0LmJlZ2luKHN0YXRlbWVudE5vZGUpO1xuXG4gIGNvbnN0IGVxdWFsaXR5Tm9kZSA9IGVxdWFsaXR5Tm9kZVF1ZXJ5KHN0YXRlbWVudE5vZGUpLFxuICAgICAgICBzdGF0ZW1lbnRTdHJpbmcgPSBub2RlQXNTdHJpbmcoc3RhdGVtZW50Tm9kZSksXG4gICAgICAgIHR5cGVBc3NlcnRpb25Ob2RlID0gdHlwZUFzc2VydGlvbk5vZGVRdWVyeShzdGF0ZW1lbnROb2RlKTtcblxuICBwcm9vZkNvbnRleHQuZGVidWcoYFZlcmlmeWluZyB0aGUgJyR7c3RhdGVtZW50U3RyaW5nfScgc3RhdGVtZW50Li4uYCk7XG5cbiAgaWYgKGVxdWFsaXR5Tm9kZSAhPT0gbnVsbCkge1xuICAgIGNvbnN0IGVxdWFsaXR5VmVyaWZpZWQgPSB2ZXJpZnlFcXVhbGl0eShlcXVhbGl0eU5vZGUsIHByb29mQ29udGV4dCk7XG5cbiAgICBzdGF0ZW1lbnRWZXJpZmllZCA9IGVxdWFsaXR5VmVyaWZpZWQ7IC8vL1xuICB9XG5cbiAgaWYgKHR5cGVBc3NlcnRpb25Ob2RlICE9PSBudWxsKSB7XG4gICAgY29uc3QgdHlwZUFzc2VydGlvblZlcmlmaWVkID0gdmVyaWZ5VHlwZUFzc2VydGlvbih0eXBlQXNzZXJ0aW9uTm9kZSwgcHJvb2ZDb250ZXh0KTtcblxuICAgIHN0YXRlbWVudFZlcmlmaWVkID0gdHlwZUFzc2VydGlvblZlcmlmaWVkOyAvLy9cbiAgfVxuXG4gIHN0YXRlbWVudFZlcmlmaWVkID9cbiAgICBwcm9vZkNvbnRleHQuY29tcGxldGUoc3RhdGVtZW50Tm9kZSkgOlxuICAgICAgcHJvb2ZDb250ZXh0LmhhbHQoc3RhdGVtZW50Tm9kZSk7XG5cbiAgcmV0dXJuIHN0YXRlbWVudFZlcmlmaWVkO1xufVxuIl0sIm5hbWVzIjpbInZlcmlmeVN0YXRlbWVudCIsImVxdWFsaXR5Tm9kZVF1ZXJ5Iiwibm9kZVF1ZXJ5IiwidHlwZUFzc2VydGlvbk5vZGVRdWVyeSIsInN0YXRlbWVudE5vZGUiLCJwcm9vZkNvbnRleHQiLCJzdGF0ZW1lbnRWZXJpZmllZCIsImJlZ2luIiwiZXF1YWxpdHlOb2RlIiwic3RhdGVtZW50U3RyaW5nIiwibm9kZUFzU3RyaW5nIiwidHlwZUFzc2VydGlvbk5vZGUiLCJkZWJ1ZyIsImVxdWFsaXR5VmVyaWZpZWQiLCJ2ZXJpZnlFcXVhbGl0eSIsInR5cGVBc3NlcnRpb25WZXJpZmllZCIsInZlcmlmeVR5cGVBc3NlcnRpb24iLCJjb21wbGV0ZSIsImhhbHQiXSwibWFwcGluZ3MiOiJBQUFBOzs7OytCQVdBOzs7ZUFBd0JBOzs7NkRBVEc7eURBQ0s7cUJBRU47c0JBQ0c7Ozs7OztBQUU3QixJQUFNQyxvQkFBb0JDLElBQUFBLGdCQUFTLEVBQUMseUJBQzlCQyx5QkFBeUJELElBQUFBLGdCQUFTLEVBQUM7QUFFMUIsU0FBU0YsZ0JBQWdCSSxhQUFhLEVBQUVDLFlBQVksRUFBRTtJQUNuRSxJQUFJQyxvQkFBb0IsS0FBSztJQUU3QkQsYUFBYUUsS0FBSyxDQUFDSDtJQUVuQixJQUFNSSxlQUFlUCxrQkFBa0JHLGdCQUNqQ0ssa0JBQWtCQyxJQUFBQSxvQkFBWSxFQUFDTixnQkFDL0JPLG9CQUFvQlIsdUJBQXVCQztJQUVqREMsYUFBYU8sS0FBSyxDQUFDLEFBQUMsa0JBQWlDLE9BQWhCSCxpQkFBZ0I7SUFFckQsSUFBSUQsaUJBQWlCLElBQUksRUFBRTtRQUN6QixJQUFNSyxtQkFBbUJDLElBQUFBLGlCQUFjLEVBQUNOLGNBQWNIO1FBRXREQyxvQkFBb0JPLGtCQUFrQixHQUFHO0lBQzNDLENBQUM7SUFFRCxJQUFJRixzQkFBc0IsSUFBSSxFQUFFO1FBQzlCLElBQU1JLHdCQUF3QkMsSUFBQUEsYUFBbUIsRUFBQ0wsbUJBQW1CTjtRQUVyRUMsb0JBQW9CUyx1QkFBdUIsR0FBRztJQUNoRCxDQUFDO0lBRURULG9CQUNFRCxhQUFhWSxRQUFRLENBQUNiLGlCQUNwQkMsYUFBYWEsSUFBSSxDQUFDZCxjQUFjO0lBRXBDLE9BQU9FO0FBQ1QifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy92ZXJpZnkvc3RhdGVtZW50LmpzIl0sInNvdXJjZXNDb250ZW50IjpbIlwidXNlIHN0cmljdFwiO1xuXG5pbXBvcnQgdmVyaWZ5RXF1YWxpdHkgZnJvbSBcIi4uL3ZlcmlmeS9lcXVhbGl0eVwiO1xuaW1wb3J0IHZlcmlmeVR5cGVBc3NlcnRpb24gZnJvbSBcIi4uL3ZlcmlmeS9hc3NlcnRpb24vdHlwZVwiO1xuXG5pbXBvcnQgeyBub2RlUXVlcnkgfSBmcm9tIFwiLi4vdXRpbGl0aWVzL3F1ZXJ5XCI7XG5pbXBvcnQgeyBub2RlQXNTdHJpbmcgfSBmcm9tIFwiLi4vdXRpbGl0aWVzL3N0cmluZ1wiO1xuXG5jb25zdCBlcXVhbGl0eU5vZGVRdWVyeSA9IG5vZGVRdWVyeShcIi9zdGF0ZW1lbnQvZXF1YWxpdHkhXCIpLFxuICAgICAgdHlwZUFzc2VydGlvbk5vZGVRdWVyeSA9IG5vZGVRdWVyeShcIi9zdGF0ZW1lbnQvdHlwZUFzc2VydGlvbiFcIik7XG5cbmV4cG9ydCBkZWZhdWx0IGZ1bmN0aW9uIHZlcmlmeVN0YXRlbWVudChzdGF0ZW1lbnROb2RlLCBwcm9vZkNvbnRleHQpIHtcbiAgbGV0IHN0YXRlbWVudFZlcmlmaWVkID0gZmFsc2U7XG5cbiAgcHJvb2ZDb250ZXh0LmJlZ2luKHN0YXRlbWVudE5vZGUpO1xuXG4gIGNvbnN0IGVxdWFsaXR5Tm9kZSA9IGVxdWFsaXR5Tm9kZVF1ZXJ5KHN0YXRlbWVudE5vZGUpLFxuICAgICAgICBzdGF0ZW1lbnRTdHJpbmcgPSBub2RlQXNTdHJpbmcoc3RhdGVtZW50Tm9kZSksXG4gICAgICAgIHR5cGVBc3NlcnRpb25Ob2RlID0gdHlwZUFzc2VydGlvbk5vZGVRdWVyeShzdGF0ZW1lbnROb2RlKTtcblxuICBwcm9vZkNvbnRleHQuZGVidWcoYFZlcmlmeWluZyB0aGUgJyR7c3RhdGVtZW50U3RyaW5nfScgc3RhdGVtZW50Li4uYCk7XG5cbiAgaWYgKGZhbHNlKSB7XG4gICAgLy8vXG4gIH0gZWxzZSBpZiAoZXF1YWxpdHlOb2RlICE9PSBudWxsKSB7XG4gICAgY29uc3QgZXF1YWxpdHlWZXJpZmllZCA9IHZlcmlmeUVxdWFsaXR5KGVxdWFsaXR5Tm9kZSwgcHJvb2ZDb250ZXh0KTtcblxuICAgIHN0YXRlbWVudFZlcmlmaWVkID0gZXF1YWxpdHlWZXJpZmllZDsgLy8vXG4gIH0gZWxzZSBpZiAodHlwZUFzc2VydGlvbk5vZGUgIT09IG51bGwpIHtcbiAgICBjb25zdCB0eXBlQXNzZXJ0aW9uVmVyaWZpZWQgPSB2ZXJpZnlUeXBlQXNzZXJ0aW9uKHR5cGVBc3NlcnRpb25Ob2RlLCBwcm9vZkNvbnRleHQpO1xuXG4gICAgc3RhdGVtZW50VmVyaWZpZWQgPSB0eXBlQXNzZXJ0aW9uVmVyaWZpZWQ7IC8vL1xuICB9IGVsc2Uge1xuICAgIHN0YXRlbWVudFZlcmlmaWVkID0gdHJ1ZTtcbiAgfVxuXG4gIHN0YXRlbWVudFZlcmlmaWVkID9cbiAgICBwcm9vZkNvbnRleHQuY29tcGxldGUoc3RhdGVtZW50Tm9kZSkgOlxuICAgICAgcHJvb2ZDb250ZXh0LmhhbHQoc3RhdGVtZW50Tm9kZSk7XG5cbiAgcmV0dXJuIHN0YXRlbWVudFZlcmlmaWVkO1xufVxuIl0sIm5hbWVzIjpbInZlcmlmeVN0YXRlbWVudCIsImVxdWFsaXR5Tm9kZVF1ZXJ5Iiwibm9kZVF1ZXJ5IiwidHlwZUFzc2VydGlvbk5vZGVRdWVyeSIsInN0YXRlbWVudE5vZGUiLCJwcm9vZkNvbnRleHQiLCJzdGF0ZW1lbnRWZXJpZmllZCIsImJlZ2luIiwiZXF1YWxpdHlOb2RlIiwic3RhdGVtZW50U3RyaW5nIiwibm9kZUFzU3RyaW5nIiwidHlwZUFzc2VydGlvbk5vZGUiLCJkZWJ1ZyIsImVxdWFsaXR5VmVyaWZpZWQiLCJ2ZXJpZnlFcXVhbGl0eSIsInR5cGVBc3NlcnRpb25WZXJpZmllZCIsInZlcmlmeVR5cGVBc3NlcnRpb24iLCJjb21wbGV0ZSIsImhhbHQiXSwibWFwcGluZ3MiOiJBQUFBOzs7OytCQVdBOzs7ZUFBd0JBOzs7NkRBVEc7eURBQ0s7cUJBRU47c0JBQ0c7Ozs7OztBQUU3QixJQUFNQyxvQkFBb0JDLElBQUFBLGdCQUFTLEVBQUMseUJBQzlCQyx5QkFBeUJELElBQUFBLGdCQUFTLEVBQUM7QUFFMUIsU0FBU0YsZ0JBQWdCSSxhQUFhLEVBQUVDLFlBQVksRUFBRTtJQUNuRSxJQUFJQyxvQkFBb0IsS0FBSztJQUU3QkQsYUFBYUUsS0FBSyxDQUFDSDtJQUVuQixJQUFNSSxlQUFlUCxrQkFBa0JHLGdCQUNqQ0ssa0JBQWtCQyxJQUFBQSxvQkFBWSxFQUFDTixnQkFDL0JPLG9CQUFvQlIsdUJBQXVCQztJQUVqREMsYUFBYU8sS0FBSyxDQUFDLEFBQUMsa0JBQWlDLE9BQWhCSCxpQkFBZ0I7SUFFckQsSUFBSSxLQUFLLEVBQUU7SUFDVCxHQUFHO0lBQ0wsT0FBTyxJQUFJRCxpQkFBaUIsSUFBSSxFQUFFO1FBQ2hDLElBQU1LLG1CQUFtQkMsSUFBQUEsaUJBQWMsRUFBQ04sY0FBY0g7UUFFdERDLG9CQUFvQk8sa0JBQWtCLEdBQUc7SUFDM0MsT0FBTyxJQUFJRixzQkFBc0IsSUFBSSxFQUFFO1FBQ3JDLElBQU1JLHdCQUF3QkMsSUFBQUEsYUFBbUIsRUFBQ0wsbUJBQW1CTjtRQUVyRUMsb0JBQW9CUyx1QkFBdUIsR0FBRztJQUNoRCxPQUFPO1FBQ0xULG9CQUFvQixJQUFJO0lBQzFCLENBQUM7SUFFREEsb0JBQ0VELGFBQWFZLFFBQVEsQ0FBQ2IsaUJBQ3BCQyxhQUFhYSxJQUFJLENBQUNkLGNBQWM7SUFFcEMsT0FBT0U7QUFDVCJ9

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "occam-verify-cli",
   "author": "James Smith",
-  "version": "0.0.478",
+  "version": "0.0.479",
   "license": "MIT, Anti-996",
   "homepage": "https://github.com/djalbat/occam-verify-cli",
   "description": "Occam's Verifier",
@@ -12,9 +12,9 @@
   "dependencies": {
     "argumentative": "^2.0.21",
     "necessary": "^11.2.1",
-    "occam-custom-grammars": "^5.0.375",
+    "occam-custom-grammars": "^5.0.376",
     "occam-dom": "^3.1.1",
-    "occam-file-system": "^5.0.134",
+    "occam-file-system": "^5.0.135",
     "occam-grammar-utilities": "^7.0.66"
   },
   "devDependencies": {

package/src/conclusion.js

@@ -4,7 +4,7 @@ import { first } from "./utilities/array";
 import { nodeAsString } from "./utilities/string";
 import { metavariableNameFromMetavariableNode } from "./utilities/query";
 import { metastatementNodeFromMetastatementString } from "./utilities/string";
-import { METAVARIABLE_RULE_NAME, METASTATEMENT_RULE_NAME } from "./ruleNames";
+import { STATEMENT_RULE_NAME, METASTATEMENT_RULE_NAME, METAVARIABLE_RULE_NAME } from "./ruleNames";
 
 export default class Conclusion {
   constructor(metastatementNode) {
@@ -15,10 +15,19 @@ export default class Conclusion {
     return this.metastatementNode;
   }
 
+  matchStatementNode(statementNode, substitutions) {
+    const nonTerminalNode = statementNode,  ///
+          conclusionNonTerminalNode = this.metastatementNode,  ///
+          conclusionNonTerminalNodeMatches = matchConclusionNonTerminalNode(conclusionNonTerminalNode, nonTerminalNode, substitutions),
+          statementNodeMatches = conclusionNonTerminalNodeMatches; ///
+
+    return statementNodeMatches;
+  }
+
   matchMetastatementNode(metastatementNode, metaSubstitutions) {
     const nonTerminalNode = metastatementNode,  ///
           conclusionNonTerminalNode = this.metastatementNode,  ///
-          conclusionNonTerminalNodeMatches = matchConclusionNonTerminalNode(conclusionNonTerminalNode, nonTerminalNode, metaSubstitutions),
+          conclusionNonTerminalNodeMatches = metaMatchConclusionNonTerminalNode(conclusionNonTerminalNode, nonTerminalNode, metaSubstitutions),
           metastatementNodeMatches = conclusionNonTerminalNodeMatches; ///
 
     return metastatementNodeMatches;
@@ -50,7 +59,7 @@ export default class Conclusion {
   }
 }
 
-function matchConclusionNode(conclusionNode, node, metaSubstitutions) {
+function matchConclusionNode(conclusionNode, node, substitutions) {
   let conclusionNodeMatches = false;
 
   const nodeTerminalNode = node.isTerminalNode(),
@@ -60,13 +69,13 @@ function matchConclusionNode(conclusionNode, node, metaSubstitutions) {
     if (nodeTerminalNode) {
       const terminalNode = node,  ///
             conclusionTerminalNode = conclusionNode,  ///
-            conclusionTerminalNodeMatches = matchConclusionTerminalNode(conclusionTerminalNode, terminalNode, metaSubstitutions);
+            conclusionTerminalNodeMatches = matchConclusionTerminalNode(conclusionTerminalNode, terminalNode, substitutions);
 
       conclusionNodeMatches = conclusionTerminalNodeMatches;  ///
     } else {
       const nonTerminalNode = node, ///
             conclusionNonTerminalNode = conclusionNode,  ///
-            conclusionNonTerminalNodeMatches = matchConclusionNonTerminalNode(conclusionNonTerminalNode, nonTerminalNode, metaSubstitutions);
+            conclusionNonTerminalNodeMatches = matchConclusionNonTerminalNode(conclusionNonTerminalNode, nonTerminalNode, substitutions);
 
       conclusionNodeMatches = conclusionNonTerminalNodeMatches; ///
     }
@@ -76,13 +85,13 @@ function matchConclusionNode(conclusionNode, node, metaSubstitutions) {
 }
 
 function matchConclusionNodes(conclusionNodes, nodes, metaSubstitutions) {
-  let conclusionNodesMatches = false;
+  let conclusionNodesMatch = false;
 
   const nodesLength = nodes.length,
         conclusionNodesLength = conclusionNodes.length;
 
   if (nodesLength === conclusionNodesLength) {
-    conclusionNodesMatches = nodes.every((node, index) => {
+    conclusionNodesMatch = nodes.every((node, index) => {
       const conclusionNode = conclusionNodes[index],
             conclusionNodeMatches = matchConclusionNode(conclusionNode, node, metaSubstitutions);
 
@@ -92,51 +101,170 @@ function matchConclusionNodes(conclusionNodes, nodes, metaSubstitutions) {
     });
   }
 
-  return conclusionNodesMatches;
+  return conclusionNodesMatch;
 }
 
-function matchConclusionMetavariable(conclusionMetavariableNode, nodes, metaSubstitutions) {
-  let conclusionMetavariableMatches = true;
+function matchConclusionTerminalNode(conclusionTerminalNode, terminalNode, substitutions) {
+  const matches = conclusionTerminalNode.match(terminalNode),
+        conclusionTerminalNodeMatches = matches;  ///
+
+  return conclusionTerminalNodeMatches;
+}
+
+function matchConclusionNonTerminalNode(conclusionNonTerminalNode, nonTerminalNode, substitutions) {
+  let conclusionNonTerminalNodeMatches = false;
+
+  const ruleName = nonTerminalNode.getRuleName(),
+        childNodes = nonTerminalNode.getChildNodes(),
+        conclusionNonTerminalNodeRuleName = conclusionNonTerminalNode.getRuleName(),
+        conclusionNonTerminalNodeChildNodes = conclusionNonTerminalNode.getChildNodes(),
+        ruleNameStatementRuleName = (ruleName === STATEMENT_RULE_NAME),
+        conclusionNonTerminalNodeRuleNameMetastatementRuleName = (conclusionNonTerminalNodeRuleName === METASTATEMENT_RULE_NAME);
+
+  if (ruleNameStatementRuleName && conclusionNonTerminalNodeRuleNameMetastatementRuleName) {
+    const statementNode = nonTerminalNode,  ///
+          conclusionMetastatementNode = conclusionNonTerminalNode,  ///
+          conclusionMetastatementNodeMatches = matchConclusionMetastatementNode(conclusionMetastatementNode, statementNode, substitutions);
+
+    if (conclusionMetastatementNodeMatches) {
+      conclusionNonTerminalNodeMatches = true; ///
+    } else {
+      const nodes = childNodes, ///
+            conclusionNodes = conclusionNonTerminalNodeChildNodes, ///
+            conclusionNonTerminalNodeChildNodesMatches = matchConclusionNodes(conclusionNodes, nodes, substitutions);
+
+      conclusionNonTerminalNodeMatches = conclusionNonTerminalNodeChildNodesMatches; ///
+    }
+  } else if (ruleName === conclusionNonTerminalNodeRuleName) {
+    const nodes = childNodes, ///
+          conclusionNodes = conclusionNonTerminalNodeChildNodes, ///
+          conclusionNonTerminalNodeChildNodesMatches = matchConclusionNodes(conclusionNodes, nodes, substitutions);
+
+    conclusionNonTerminalNodeMatches = conclusionNonTerminalNodeChildNodesMatches; ///
+  }
+
+  return conclusionNonTerminalNodeMatches;
+}
+
+function matchConclusionMetavariableNode(conclusionMetavariableNode, nodes, substitutions) {
+  let conclusionMetavariableNodeMatches = true;
 
   const conclusionMetavariableName = metavariableNameFromMetavariableNode(conclusionMetavariableNode),
-        metaSubstitution = metaSubstitutions.find((metaSubstitution) => {
-          const metavariableName = metaSubstitution.getMetavariableName();
+        substitution = substitutions.find((substitution) => {
+          const metavariableName = substitution.getMetavariableName();
 
           if (metavariableName === conclusionMetavariableName) {
             return true;
           }
         }) || null;
 
-  if (metaSubstitution !== null) {
-    const metaSubstitutionNodesMatch = metaSubstitution.matchNodes(nodes);
+  if (substitution !== null) {
+    const substitutionNodesMatch = substitution.matchNodes(nodes);
+
+    conclusionMetavariableNodeMatches = substitutionNodesMatch;  ///
+  }
+
+  return conclusionMetavariableNodeMatches;
+}
+
+function matchConclusionMetastatementNode(conclusionMetastatementNode, statementNode, substitutions) {
+  let conclusionMetastatementNodeMatches = false;
+
+  const conclusionNonTerminalNode = conclusionMetastatementNode,  ///
+        conclusionNonTerminalNodeChildNodes = conclusionNonTerminalNode.getChildNodes(),
+        conclusionNonTerminalNodeChildNodesLength = conclusionNonTerminalNodeChildNodes.length;
+
+  if (conclusionNonTerminalNodeChildNodesLength === 1) {
+    const firstConclusionChildNode = first(conclusionNonTerminalNodeChildNodes),
+          conclusionChildNode = firstConclusionChildNode,  ///
+          conclusionChildNodeNonTerminalNode = conclusionChildNode.isNonTerminalNode();
+
+    if (conclusionChildNodeNonTerminalNode) {
+      const conclusionNonTerminalChildNode = conclusionChildNode,  ///
+            conclusionNonTerminalChildNodeRuleName = conclusionNonTerminalChildNode.getRuleName(),
+            conclusionNonTerminalChildNodeRuleNameMetavariableRuleName = (conclusionNonTerminalChildNodeRuleName === METAVARIABLE_RULE_NAME);
+
+      if (conclusionNonTerminalChildNodeRuleNameMetavariableRuleName) {
+        const conclusionMetavariableNode = conclusionNonTerminalChildNode,  ///
+              nonTerminalNode = statementNode,  ///
+              childNodes = nonTerminalNode.getChildNodes(),
+              nodes = childNodes, ///
+              conclusionMetavariableNodeMatches = matchConclusionMetavariableNode(conclusionMetavariableNode, nodes, substitutions);
+
+        conclusionMetastatementNodeMatches = conclusionMetavariableNodeMatches; ///
+      }
+    }
+  }
 
-    conclusionMetavariableMatches = metaSubstitutionNodesMatch;  ///
+  return conclusionMetastatementNodeMatches;
+}
+
+function metaMatchConclusionNode(conclusionNode, node, metaSubstitutions) {
+  let conclusionNodeMatches = false;
+
+  const nodeTerminalNode = node.isTerminalNode(),
+        ruleNodeTerminalNode = conclusionNode.isTerminalNode();
+
+  if (nodeTerminalNode === ruleNodeTerminalNode) {
+    if (nodeTerminalNode) {
+      const terminalNode = node,  ///
+            conclusionTerminalNode = conclusionNode,  ///
+            conclusionTerminalNodeMatches = metaMatchConclusionTerminalNode(conclusionTerminalNode, terminalNode, metaSubstitutions);
+
+      conclusionNodeMatches = conclusionTerminalNodeMatches;  ///
+    } else {
+      const nonTerminalNode = node, ///
+            conclusionNonTerminalNode = conclusionNode,  ///
+            conclusionNonTerminalNodeMatches = metaMatchConclusionNonTerminalNode(conclusionNonTerminalNode, nonTerminalNode, metaSubstitutions);
+
+      conclusionNodeMatches = conclusionNonTerminalNodeMatches; ///
+    }
+  }
+
+  return conclusionNodeMatches;
+}
+
+function metaMatchConclusionNodes(conclusionNodes, nodes, metaSubstitutions) {
+  let conclusionNodesMatch = false;
+
+  const nodesLength = nodes.length,
+        conclusionNodesLength = conclusionNodes.length;
+
+  if (nodesLength === conclusionNodesLength) {
+    conclusionNodesMatch = nodes.every((node, index) => {
+      const conclusionNode = conclusionNodes[index],
+            conclusionNodeMatches = metaMatchConclusionNode(conclusionNode, node, metaSubstitutions);
+
+      if (conclusionNodeMatches) {
+        return true;
+      }
+    });
   }
 
-  return conclusionMetavariableMatches;
+  return conclusionNodesMatch;
 }
 
-function matchConclusionTerminalNode(conclusionTerminalNode, terminalNode, metaSubstitutions) {
+function metaMatchConclusionTerminalNode(conclusionTerminalNode, terminalNode, metaSubstitutions) {
   const matches = conclusionTerminalNode.match(terminalNode),
         conclusionTerminalNodeMatches = matches;  ///
 
   return conclusionTerminalNodeMatches;
 }
 
-function matchConclusionNonTerminalNode(conclusionNonTerminalNode, nonTerminalNode, metaSubstitutions) {
+function metaMatchConclusionNonTerminalNode(conclusionNonTerminalNode, nonTerminalNode, metaSubstitutions) {
   let conclusionNonTerminalNodeMatches = false;
 
   const ruleName = nonTerminalNode.getRuleName(),
-        conclusionRuleName = conclusionNonTerminalNode.getRuleName(); ///
+        conclusionNonTerminalNodeRuleName = conclusionNonTerminalNode.getRuleName();
 
-  if (ruleName === conclusionRuleName) {
+  if (ruleName === conclusionNonTerminalNodeRuleName) {
     const childNodes = nonTerminalNode.getChildNodes(),
-          conclusionChildNodes = conclusionNonTerminalNode.getChildNodes(),
+          conclusionNonTerminalNodeChildNodes = conclusionNonTerminalNode.getChildNodes(),
           nodes = childNodes, ///
-          conclusionNodes = conclusionChildNodes, ///
-          conclusionChildNodesMatches = matchConclusionNodes(conclusionNodes, nodes, metaSubstitutions);
+          conclusionNodes = conclusionNonTerminalNodeChildNodes, ///
+          conclusionNonTerminalNodeChildNodesMatches = metaMatchConclusionNodes(conclusionNodes, nodes, metaSubstitutions);
 
-    conclusionNonTerminalNodeMatches = conclusionChildNodesMatches; ///
+    conclusionNonTerminalNodeMatches = conclusionNonTerminalNodeChildNodesMatches; ///
 
     if (!conclusionNonTerminalNodeMatches) {
       const ruleNameMetastatementRuleName = (ruleName === METASTATEMENT_RULE_NAME);
@@ -144,7 +272,7 @@ function matchConclusionNonTerminalNode(conclusionNonTerminalNode, nonTerminalNo
       if (ruleNameMetastatementRuleName) {
         const metastatementNode = nonTerminalNode,  ///
               conclusionMetastatementNode = conclusionNonTerminalNode,  ///
-              conclusionMetastatementNodeMatches = matchConclusionMetastatementNode(conclusionMetastatementNode, metastatementNode, metaSubstitutions);
+              conclusionMetastatementNodeMatches = metaMatchConclusionMetastatementNode(conclusionMetastatementNode, metastatementNode, metaSubstitutions);
 
         conclusionNonTerminalNodeMatches = conclusionMetastatementNodeMatches; ///
       }
@@ -154,15 +282,36 @@ function matchConclusionNonTerminalNode(conclusionNonTerminalNode, nonTerminalNo
   return conclusionNonTerminalNodeMatches;
 }
 
-function matchConclusionMetastatementNode(conclusionMetastatementNode, metastatementNode, metaSubstitutions) {
+function metaMatchConclusionMetavariableNode(conclusionMetavariableNode, nodes, metaSubstitutions) {
+  let conclusionMetavariableNodeMatches = true;
+
+  const conclusionMetavariableName = metavariableNameFromMetavariableNode(conclusionMetavariableNode),
+        metaSubstitution = metaSubstitutions.find((metaSubstitution) => {
+      const metavariableName = metaSubstitution.getMetavariableName();
+
+      if (metavariableName === conclusionMetavariableName) {
+        return true;
+      }
+    }) || null;
+
+  if (metaSubstitution !== null) {
+    const metaSubstitutionNodesMatch = metaSubstitution.matchNodes(nodes);
+
+    conclusionMetavariableNodeMatches = metaSubstitutionNodesMatch;  ///
+  }
+
+  return conclusionMetavariableNodeMatches;
+}
+
+function metaMatchConclusionMetastatementNode(conclusionMetastatementNode, metastatementNode, metaSubstitutions) {
   let conclusionMetastatementNodeMatches = false;
 
   const conclusionNonTerminalNode = conclusionMetastatementNode,  ///
-        conclusionChildNodes = conclusionNonTerminalNode.getChildNodes(),
-        conclusionChildNodesLength = conclusionChildNodes.length;
+        conclusionNonTerminalNodeChildNodes = conclusionNonTerminalNode.getChildNodes(),
+        conclusionNonTerminalNodeChildNodesLength = conclusionNonTerminalNodeChildNodes.length;
 
-  if (conclusionChildNodesLength === 1) {
-    const firstConclusionChildNode = first(conclusionChildNodes),
+  if (conclusionNonTerminalNodeChildNodesLength === 1) {
+    const firstConclusionChildNode = first(conclusionNonTerminalNodeChildNodes),
           conclusionChildNode = firstConclusionChildNode,  ///
           conclusionChildNodeNonTerminalNode = conclusionChildNode.isNonTerminalNode();
 
@@ -176,9 +325,9 @@ function matchConclusionMetastatementNode(conclusionMetastatementNode, metastate
               nonTerminalNode = metastatementNode,  ///
               childNodes = nonTerminalNode.getChildNodes(),
               nodes = childNodes, ///
-              conclusionMetaVariableMatches = matchConclusionMetavariable(conclusionMetavariableNode, nodes, metaSubstitutions);
+              conclusionMetavariableNodeMatches = metaMatchConclusionMetavariableNode(conclusionMetavariableNode, nodes, metaSubstitutions);
 
-        conclusionMetastatementNodeMatches = conclusionMetaVariableMatches; ///
+        conclusionMetastatementNodeMatches = conclusionMetavariableNodeMatches; ///
       }
     }
   }

package/src/metaSubstitution.js

@@ -21,9 +21,9 @@ export default class MetaSubstitution {
 
     const nodesA = this.nodes,  ///
           nodesB = nodes,
-          metaSubstitutionNodesMatch = matchNodes(nodesA, nodesB);
+          nodesMatch = matchNodes(nodesA, nodesB);
 
-    matches = metaSubstitutionNodesMatch;  ///
+    matches = nodesMatch;  ///
 
     if (!matches) {
       const childNodes = nodes, ///