occam-verify-cli 0.0.270 → 0.0.272

package/bin/metaSubstitution.js

@@ -1,29 +1,49 @@
 "use strict";
 
+const { matchBracketedMetastatementChildNode } = require("./utilities/metastatement");
+
 class MetaSubstitution {
-  constructor(metavariableName, nonTerminalNode) {
+  constructor(metavariableName, nodes) {
     this.metavariableName = metavariableName;
-    this.nonTerminalNode = nonTerminalNode;
+    this.nodes = nodes;
   }
 
   getMetavariableName() {
     return this.metavariableName;
   }
 
-  getNonTerminalNode() {
-    return this.nonTerminalNode;
+  getNodes() {
+    return this.nodes;
   }
 
-  matchNonTerminalNode(nonTerminalNode) {
-    const metaSubstitutionNonTerminalNode = this.nonTerminalNode,
-          metaSubstitutionNonTerminalNodeMatches = matchMetaSubstitutionNonTerminalNode(metaSubstitutionNonTerminalNode, nonTerminalNode),
-          nonTerminalNodeMatches = metaSubstitutionNonTerminalNodeMatches;  ///
+  matchNodes(nodes) {
+    let matches;
+
+    const metaSubstitutionNodes = this.nodes,  ///
+          metaSubstitutionNonTerminalNodeMatches = matchMetaSubstitutionNodes(metaSubstitutionNodes, nodes);
+
+    matches = metaSubstitutionNonTerminalNodeMatches;  ///
+
+    if (!matches) {
+      const childNodes = nodes, ///
+            bracketedMetastatementChildNodeMatches = matchBracketedMetastatementChildNode(childNodes, (bracketedMetastatementChildNode) => {
+              const nonTerminalNode = bracketedMetastatementChildNode,  ///
+                    childNodes = nonTerminalNode.getChildNodes(),
+                    nodes = childNodes, ///
+                    metaAssertionNonTerminalNodeMatches = matchMetaSubstitutionNodes(metaSubstitutionNodes, nodes),
+                    bracketedMetastatementChildNodeMatches = metaAssertionNonTerminalNodeMatches; ///
+
+              return bracketedMetastatementChildNodeMatches;
+            });
 
-    return nonTerminalNodeMatches;
+      matches = bracketedMetastatementChildNodeMatches; ///
+    }
+
+    return matches;
   }
 
-  static fromMetavariableNameAndNonTerminalNode(metavariableName, nonTerminalNode) {
-    const metaSubstitution = new MetaSubstitution(metavariableName, nonTerminalNode);
+  static fromMetavariableNameAndNodes(metavariableName, nodes) {
+    const metaSubstitution = new MetaSubstitution(metavariableName, nodes);
 
     return metaSubstitution;
   }
@@ -56,17 +76,15 @@ function matchMetaSubstitutionNode(metaSubstitutionNode, node) {
   return metaSubstitutionNodeMatches;
 }
 
-function matchMetaSubstitutionChildNodes(metaSubstitutionChildNodes, childNodes) {
-  let metaSubstitutionChildNodesMatches = false;
+function matchMetaSubstitutionNodes(metaSubstitutionNodes, nodes) {
+  let metaSubstitutionNodesMatches = false;
 
-  const childNodesLength = childNodes.length,
-        metaSubstitutionChildNodesLength = metaSubstitutionChildNodes.length;
+  const nodesLength = nodes.length,
+        metaSubstitutionNodesLength = metaSubstitutionNodes.length;
 
-  if (childNodesLength === metaSubstitutionChildNodesLength) {
-    metaSubstitutionChildNodesMatches = childNodes.every((childNode, index) => {
-      const metaSubstitutionChildNode = metaSubstitutionChildNodes[index],
-            metaSubstitutionNode = metaSubstitutionChildNode, ///
-            node = childNode, ///
+  if (nodesLength === metaSubstitutionNodesLength) {
+    metaSubstitutionNodesMatches = nodes.every((node, index) => {
+      const metaSubstitutionNode = metaSubstitutionNodes[index],
             metaSubstitutionNodeMatches = matchMetaSubstitutionNode(metaSubstitutionNode, node);
 
       if (metaSubstitutionNodeMatches) {
@@ -75,17 +93,12 @@ function matchMetaSubstitutionChildNodes(metaSubstitutionChildNodes, childNodes)
     })
   }
 
-  return metaSubstitutionChildNodesMatches;
+  return metaSubstitutionNodesMatches;
 }
 
 function matchMetaSubstitutionTerminalNode(metaSubstitutionTerminalNode, terminalNode) {
-  let metaSubstitutionTerminalNodeMatches = false;
-
-  const matches = metaSubstitutionTerminalNode.match(terminalNode);
-
-  if (matches) {
-    metaSubstitutionTerminalNodeMatches = true;
-  }
+  const matches = metaSubstitutionTerminalNode.match(terminalNode),
+        metaSubstitutionTerminalNodeMatches = matches;  ///
 
   return metaSubstitutionTerminalNodeMatches;
 }
@@ -99,9 +112,11 @@ function matchMetaSubstitutionNonTerminalNode(metaSubstitutionNonTerminalNode, n
   if (ruleName === metaSubstitutionRuleName) {
     const childNodes = nonTerminalNode.getChildNodes(),
           metaSubstitutionChildNodes = metaSubstitutionNonTerminalNode.getChildNodes(),
-          metaSubstitutionChildNodesMatches = matchMetaSubstitutionChildNodes(metaSubstitutionChildNodes, childNodes);
+          nodes = childNodes, ///
+          metaSubstitutionNodes = metaSubstitutionChildNodes, ///
+          metaSubstitutionNodesMatches = matchMetaSubstitutionNodes(metaSubstitutionNodes, nodes);
 
-    metaSubstitutionNonTerminalNodeMatches = metaSubstitutionChildNodesMatches; ///
+    metaSubstitutionNonTerminalNodeMatches = metaSubstitutionNodesMatches; ///
   }
 
   return metaSubstitutionNonTerminalNodeMatches;

package/bin/permutations.js

@@ -0,0 +1,3 @@
+"use strict";
+      
+[[0,1,2],[1,0,2],[1,2,0],[0,2,1],[2,0,1],[2,1,0],[0,1,3],[1,0,3],[1,3,0],[0,3,1],[3,0,1],[3,1,0],[0,1,4],[1,0,4],[1,4,0],[0,4,1],[4,0,1],[4,1,0],[0,2,3],[2,0,3],[2,3,0],[0,3,2],[3,0,2],[3,2,0],[0,2,4],[2,0,4],[2,4,0],[0,4,2],[4,0,2],[4,2,0],[0,3,4],[3,0,4],[3,4,0],[0,4,3],[4,0,3],[4,3,0],[1,2,3],[2,1,3],[2,3,1],[1,3,2],[3,1,2],[3,2,1],[1,2,4],[2,1,4],[2,4,1],[1,4,2],[4,1,2],[4,2,1],[1,3,4],[3,1,4],[3,4,1],[1,4,3],[4,1,3],[4,3,1],[2,3,4],[3,2,4],[3,4,2],[2,4,3],[4,2,3],[4,3,2]]