occam-verify-cli 1.0.388 → 1.0.404

package/src/node/metaLemma.js

@@ -1,13 +1,13 @@
 "use strict";
 
-import TopLevelMetaAssertionNode from "../node/topLevelMetaAssertion";
+import MetaLemmaMetaTheoremNode from "../node/metaLemmaMetaTheorem";
 
 import { META_LEMMA_BODY_RULE_NAME, META_LEMMA_HEADER_RULE_NAME } from "../ruleNames";
 
-export default class MetaLemmaNode extends TopLevelMetaAssertionNode {
+export default class MetaLemmaNode extends MetaLemmaMetaTheoremNode {
   static bodyRuleName = META_LEMMA_BODY_RULE_NAME;
 
   static headerRuleName = META_LEMMA_HEADER_RULE_NAME;
 
-  static fromRuleNameChildNodesOpacityAndPrecedence(ruleName, childNodes, opacity, precedence) { return TopLevelMetaAssertionNode.fromRuleNameChildNodesOpacityAndPrecedence(MetaLemmaNode, ruleName, childNodes, opacity, precedence); }
+  static fromRuleNameChildNodesOpacityAndPrecedence(ruleName, childNodes, opacity, precedence) { return MetaLemmaMetaTheoremNode.fromRuleNameChildNodesOpacityAndPrecedence(MetaLemmaNode, ruleName, childNodes, opacity, precedence); }
 }

package/src/node/{topLevelMetaAssertion.js → metaLemmaMetaTheorem.js}

@@ -1,8 +1,8 @@
 "use strict";
 
-import NonTerminalNode from "../node/nonTerminal";
+import NonTerminalNode from "../nonTerminalNode";
 
-export default class TopLevelMetaAssertionNode extends NonTerminalNode {
+export default class MetaLemmaMetaTheoremNode extends NonTerminalNode {
   getBodyNode() {
     const { bodyRuleName } = this.constructor,
           ruleName = bodyRuleName,  ///

package/src/node/metaType.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import NonTerminalNode from "../node/nonTerminal";
+import NonTerminalNode from "../nonTerminalNode";
 
 export default class MetaTypeNode extends NonTerminalNode {
   getMetaTypeName() {

package/src/node/metatheorem.js

@@ -1,13 +1,13 @@
 "use strict";
 
-import TopLevelMetaAssertionNode from "../node/topLevelMetaAssertion";
+import MetaLemmaMetaTheoremNode from "../node/metaLemmaMetaTheorem";
 
 import { METATHEOREM_BODY_RULE_NAME, METATHEOREM_HEADER_RULE_NAME } from "../ruleNames";
 
-export default class MetatheoremNode extends TopLevelMetaAssertionNode {
+export default class MetatheoremNode extends MetaLemmaMetaTheoremNode {
   static bodyRuleName = METATHEOREM_BODY_RULE_NAME;
 
   static headerRuleName = METATHEOREM_HEADER_RULE_NAME;
 
-  static fromRuleNameChildNodesOpacityAndPrecedence(ruleName, childNodes, opacity, precedence) { return TopLevelMetaAssertionNode.fromRuleNameChildNodesOpacityAndPrecedence(MetatheoremNode, ruleName, childNodes, opacity, precedence); }
+  static fromRuleNameChildNodesOpacityAndPrecedence(ruleName, childNodes, opacity, precedence) { return MetaLemmaMetaTheoremNode.fromRuleNameChildNodesOpacityAndPrecedence(MetatheoremNode, ruleName, childNodes, opacity, precedence); }
 }

package/src/node/metavariable.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import NonTerminalNode from "../node/nonTerminal";
+import NonTerminalNode from "../nonTerminalNode";
 
 import { TERM_RULE_NAME, TYPE_RULE_NAME } from "../ruleNames";
 

package/src/node/nonsense.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import NonTerminalNode from "../node/nonTerminal";
+import NonTerminalNode from "../nonTerminalNode";
 
 export default class NonsenseNode extends NonTerminalNode {
   static fromRuleNameChildNodesOpacityAndPrecedence(ruleName, childNodes, opacity, precedence) { return NonTerminalNode.fromRuleNameChildNodesOpacityAndPrecedence(NonsenseNode, ruleName, childNodes, opacity, precedence); }

package/src/node/parameter.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import NonTerminalNode from "../node/nonTerminal";
+import NonTerminalNode from "../nonTerminalNode";
 
 export default class ParameterNode extends NonTerminalNode {
   getParameterName() {

package/src/node/parenthesisedLabel.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import NonTerminalNode from "../node/nonTerminal";
+import NonTerminalNode from "../nonTerminalNode";
 
 import { LABEL_RULE_NAME } from "../ruleNames";
 

package/src/node/parenthesisedLabels.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import NonTerminalNode from "../node/nonTerminal";
+import NonTerminalNode from "../nonTerminalNode";
 
 import { LABELS_RULE_NAME } from "../ruleNames";
 

package/src/node/placeholder.js

@@ -0,0 +1,7 @@
+"use strict";
+
+import NonTerminalNode from "../nonTerminalNode";
+
+export default class PlaceholderNode extends NonTerminalNode {
+  static fromRuleNameChildNodesOpacityAndPrecedence(ruleName, childNodes, opacity, precedence) { return NonTerminalNode.fromRuleNameChildNodesOpacityAndPrecedence(PlaceholderNode, ruleName, childNodes, opacity, precedence); }
+}

package/src/node/premise.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import NonTerminalNode from "../node/nonTerminal";
+import NonTerminalNode from "../nonTerminalNode";
 
 import { NONSENSE_RULE_NAME, STATEMENT_RULE_NAME, PROCEDURE_CALL_RULE_NAME } from "../ruleNames";
 

package/src/node/procedureCall.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import NonTerminalNode from "../node/nonTerminal";
+import NonTerminalNode from "../nonTerminalNode";
 
 import { PARAMETER_RULE_NAME, PROCEDURE_REFERENCE_RULE_NAME } from "../ruleNames";
 

package/src/node/procedureReference.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import NonTerminalNode from "../node/nonTerminal";
+import NonTerminalNode from "../nonTerminalNode";
 
 export default class ProcedureReferenceNode extends NonTerminalNode {
   getProcedureName() {

package/src/node/proof.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import NonTerminalNode from "../node/nonTerminal";
+import NonTerminalNode from "../nonTerminalNode";
 
 import { DERIVATION_RULE_NAME } from "../ruleNames";
 

package/src/node/property.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import NonTerminalNode from "../node/nonTerminal";
+import NonTerminalNode from "../nonTerminalNode";
 
 import { SINGLE_SPACE } from "../constants";
 

package/src/node/propertyRelation.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import NonTerminalNode from "../node/nonTerminal";
+import NonTerminalNode from "../nonTerminalNode";
 
 import { TERM_RULE_NAME, PROPERTY_RULE_NAME } from "../ruleNames";
 

package/src/node/qualification.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import NonTerminalNode from "../node/nonTerminal";
+import NonTerminalNode from "../nonTerminalNode";
 
 import { REFERENCE_RULE_NAME, SATISFIES_ASSERTION_RULE_NAME } from "../ruleNames";
 

package/src/node/reference.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import NonTerminalNode from "../node/nonTerminal";
+import NonTerminalNode from "../nonTerminalNode";
 
 import { METAVARIABLE_RULE_NAME } from "../ruleNames";
 

package/src/node/rule.js

@@ -1,8 +1,8 @@
 "use strict";
 
-import NonTerminalNode from "../node/nonTerminal";
+import NonTerminalNode from "../nonTerminalNode";
 
-import {RULE_BODY_RULE_NAME, RULE_HEADER_RULE_NAME} from "../ruleNames";
+import { RULE_BODY_RULE_NAME, RULE_HEADER_RULE_NAME } from "../ruleNames";
 
 export default class RuleNode extends NonTerminalNode {
   getRuleBodyNode() {

package/src/node/section.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import NonTerminalNode from "../node/nonTerminal";
+import NonTerminalNode from "../nonTerminalNode";
 
 import { AXIOM_RULE_NAME, LEMMA_RULE_NAME, THEOREM_RULE_NAME, CONJECTURE_RULE_NAME, HYPOTHESIS_RULE_NAME } from "../ruleNames";
 

package/src/node/signature.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import NonTerminalNode from "../node/nonTerminal";
+import NonTerminalNode from "../nonTerminalNode";
 
 import { TERM_RULE_NAME } from "../ruleNames";
 

package/src/node/statement.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import NonTerminalNode from "../node/nonTerminal";
+import NonTerminalNode from "../nonTerminalNode";
 
 import { TERM_RULE_NAME,
          FRAME_RULE_NAME,
@@ -19,6 +19,18 @@ import { TERM_RULE_NAME,
          STATEMENT_SUBSTITUTION_RULE_NAME } from "../ruleNames";
 
 export default class StatementNode extends NonTerminalNode {
+  isSimple() {
+    let simple = false;
+
+    const metavariableNode = this.getMetavariableNode();
+
+    if (metavariableNode !== null) {
+      simple = true;
+    }
+
+    return simple;
+  }
+
   getTermNodes() {
     const ruleName = TERM_RULE_NAME,
           termNodes = this.getDescendantNodesByRuleName(ruleName);

package/src/node/step.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import NonTerminalNode from "../node/nonTerminal";
+import NonTerminalNode from "../nonTerminalNode";
 
 import { NONSENSE_RULE_NAME, STATEMENT_RULE_NAME, QUALIFICATION_RULE_NAME } from "../ruleNames";
 

package/src/node/subDerivation.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import NonTerminalNode from "../node/nonTerminal";
+import NonTerminalNode from "../nonTerminalNode";
 
 import { STEP_RULE_NAME, SUBPROOF_RULE_NAME } from "../ruleNames";
 

package/src/node/subproof.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import NonTerminalNode from "../node/nonTerminal";
+import NonTerminalNode from "../nonTerminalNode";
 
 import { SUPPOSITION_RULE_NAME, SUB_DERIVATION_RULE_NAME } from "../ruleNames";
 

package/src/node/substitution/frame.js

@@ -1,10 +1,10 @@
 "use strict";
 
-import NonTerminalNode from "../../node/nonTerminal";
+import SubstitutionNode from "../../node/substitution";
 
 import { FRAME_RULE_NAME } from "../../ruleNames";
 
-export default class FrameSubstitutionNode extends NonTerminalNode {
+export default class FrameSubstitutionNode extends SubstitutionNode {
   getLastFrameNode() {
     const ruleName = FRAME_RULE_NAME,
           lastFrameNode = this.getLastNodeByRuleName(ruleName);
@@ -19,5 +19,31 @@ export default class FrameSubstitutionNode extends NonTerminalNode {
     return firstFrameNode;
   }
 
-  static fromRuleNameChildNodesOpacityAndPrecedence(ruleName, childNodes, opacity, precedence) { return NonTerminalNode.fromRuleNameChildNodesOpacityAndPrecedence(FrameSubstitutionNode, ruleName, childNodes, opacity, precedence); }
+  getLastMetavariableNode() {
+    let lastMetavariableNode = null;
+
+    const lastFrameNode = this.getLastFrameNode(),
+          singularMetavariableNode = lastFrameNode.getSingularMetavariableNode();
+
+    if (singularMetavariableNode !== null) {
+      lastMetavariableNode = singularMetavariableNode;  ///
+    }
+
+    return lastMetavariableNode;
+  }
+
+  getFirstMetavariableNode() {
+    let firstMetavariableNode = null;
+
+    const firstFrameNode = this.getFirstFrameNode(),
+          singularMetavariableNode = firstFrameNode.getSingularMetavariableNode();
+
+    if (singularMetavariableNode !== null) {
+      firstMetavariableNode = singularMetavariableNode;  ///
+    }
+
+    return firstMetavariableNode;
+  }
+
+  static fromRuleNameChildNodesOpacityAndPrecedence(ruleName, childNodes, opacity, precedence) { return SubstitutionNode.fromRuleNameChildNodesOpacityAndPrecedence(FrameSubstitutionNode, ruleName, childNodes, opacity, precedence); }
 }

package/src/node/substitution/statement.js

@@ -1,10 +1,10 @@
 "use strict";
 
-import NonTerminalNode from "../../node/nonTerminal";
+import SubstitutionNode from "../../node/substitution";
 
 import { STATEMENT_RULE_NAME } from "../../ruleNames";
 
-export default class StatementSubstitutionNode extends NonTerminalNode {
+export default class StatementSubstitutionNode extends SubstitutionNode {
   getLastStatementNode() {
     const ruleName = STATEMENT_RULE_NAME,
           lastStatementNode = this.getLastNodeByRuleName(ruleName);
@@ -19,5 +19,5 @@ export default class StatementSubstitutionNode extends NonTerminalNode {
     return firstStatementNode;
   }
 
-  static fromRuleNameChildNodesOpacityAndPrecedence(ruleName, childNodes, opacity, precedence) { return NonTerminalNode.fromRuleNameChildNodesOpacityAndPrecedence(StatementSubstitutionNode, ruleName, childNodes, opacity, precedence); }
+  static fromRuleNameChildNodesOpacityAndPrecedence(ruleName, childNodes, opacity, precedence) { return SubstitutionNode.fromRuleNameChildNodesOpacityAndPrecedence(StatementSubstitutionNode, ruleName, childNodes, opacity, precedence); }
 }

package/src/node/substitution/term.js

@@ -1,10 +1,10 @@
 "use strict";
 
-import NonTerminalNode from "../../node/nonTerminal";
+import SubstitutionNode from "../../node/substitution";
 
 import { TERM_RULE_NAME } from "../../ruleNames";
 
-export default class TermSubstitutionNode extends NonTerminalNode {
+export default class TermSubstitutionNode extends SubstitutionNode {
   getLastTermNode() {
     const ruleName = TERM_RULE_NAME,
           lastTermNode = this.getLastNodeByRuleName(ruleName);
@@ -19,5 +19,31 @@ export default class TermSubstitutionNode extends NonTerminalNode {
     return firstTermNode;
   }
 
-  static fromRuleNameChildNodesOpacityAndPrecedence(ruleName, childNodes, opacity, precedence) { return NonTerminalNode.fromRuleNameChildNodesOpacityAndPrecedence(TermSubstitutionNode, ruleName, childNodes, opacity, precedence); }
+  getLastVariableNode() {
+    let lastVariableNode = null;
+
+    const lastTermNode = this.getLastTermNode(),
+          singularVariableNode = lastTermNode.getSingularVariableNode();
+
+    if (singularVariableNode !== null) {
+      lastVariableNode = singularVariableNode;  ///
+    }
+
+    return lastVariableNode;
+  }
+
+  getFirstVariableNode() {
+    let firstVariableNode = null;
+
+    const firstTermNode = this.getFirstTermNode(),
+          singularVariableNode = firstTermNode.getSingularVariableNode();
+
+    if (singularVariableNode !== null) {
+      firstVariableNode = singularVariableNode;  ///
+    }
+
+    return firstVariableNode;
+  }
+
+  static fromRuleNameChildNodesOpacityAndPrecedence(ruleName, childNodes, opacity, precedence) { return SubstitutionNode.fromRuleNameChildNodesOpacityAndPrecedence(TermSubstitutionNode, ruleName, childNodes, opacity, precedence); }
 }

package/src/node/substitution.js

@@ -0,0 +1,7 @@
+"use strict";
+
+import NonTerminalNode from "../nonTerminalNode";
+
+export default class SubstitutionNode extends NonTerminalNode {
+  static fromRuleNameChildNodesOpacityAndPrecedence(Class, ruleName, childNodes, opacity, precedence) { return NonTerminalNode.fromRuleNameChildNodesOpacityAndPrecedence(Class, ruleName, childNodes, opacity, precedence); }
+}

package/src/node/supposition.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import NonTerminalNode from "../node/nonTerminal";
+import NonTerminalNode from "../nonTerminalNode";
 
 import { NONSENSE_RULE_NAME, STATEMENT_RULE_NAME, PROCEDURE_CALL_RULE_NAME } from "../ruleNames";
 

package/src/node/term.js

@@ -1,10 +1,22 @@
 "use strict";
 
-import NonTerminalNode from "../node/nonTerminal";
+import NonTerminalNode from "../nonTerminalNode";
 
 import { ARGUMENT_RULE_NAME, VARIABLE_RULE_NAME } from "../ruleNames";
 
 export default class TermNode extends NonTerminalNode {
+  isSimple() {
+    let simple = false;
+
+    const singularVariableNode = this.getSingularVariableNode();
+
+    if (singularVariableNode !== null) {
+      simple = true;
+    }
+
+    return simple;
+  }
+
   getVariableNodes() {
     const ruleName = VARIABLE_RULE_NAME,
           variableNodes = this.getNodesByRuleName(ruleName);
@@ -38,5 +50,19 @@ export default class TermNode extends NonTerminalNode {
     return singularVariableNode;
   }
 
+  getSingularVariableIdentifier() {
+    let singularVariableIdentifier = null;
+
+    const singularVariableNode = this.getSingularVariableNode();
+
+    if (singularVariableNode !== null) {
+      const variableIdentifier = singularVariableNode.getVariableIdentifier();
+
+      singularVariableIdentifier = variableIdentifier;  ///
+    }
+
+    return singularVariableIdentifier;
+  }
+
   static fromRuleNameChildNodesOpacityAndPrecedence(ruleName, childNodes, opacity, precedence) { return NonTerminalNode.fromRuleNameChildNodesOpacityAndPrecedence(TermNode, ruleName, childNodes, opacity, precedence); }
 }

package/src/node/theorem.js

@@ -1,13 +1,13 @@
 "use strict";
 
-import TopLevelAssertionNode from "../node/topLevelAssertion";
+import AxiomLemmaTheoremConjectureNode from "../node/axiomLemmaTheoremConjecture";
 
 import { THEOREM_BODY_RULE_NAME, THEOREM_HEADER_RULE_NAME } from "../ruleNames";
 
-export default class TheoremNode extends TopLevelAssertionNode {
+export default class TheoremNode extends AxiomLemmaTheoremConjectureNode {
   static bodyRuleName = THEOREM_BODY_RULE_NAME;
 
   static headerRuleName = THEOREM_HEADER_RULE_NAME;
 
-  static fromRuleNameChildNodesOpacityAndPrecedence(ruleName, childNodes, opacity, precedence) { return TopLevelAssertionNode.fromRuleNameChildNodesOpacityAndPrecedence(TheoremNode, ruleName, childNodes, opacity, precedence); }
+  static fromRuleNameChildNodesOpacityAndPrecedence(ruleName, childNodes, opacity, precedence) { return AxiomLemmaTheoremConjectureNode.fromRuleNameChildNodesOpacityAndPrecedence(TheoremNode, ruleName, childNodes, opacity, precedence); }
 }

package/src/node/type.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import NonTerminalNode from "../node/nonTerminal";
+import NonTerminalNode from "../nonTerminalNode";
 
 export default class TypeNode extends NonTerminalNode {
   isPrefixed() {

package/src/node/typePrefix.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import NonTerminalNode from "../node/nonTerminal";
+import NonTerminalNode from "../nonTerminalNode";
 
 export default class TypePrefixNode extends NonTerminalNode {
   getTypePrefixName() {

package/src/node/types.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import NonTerminalNode from "../node/nonTerminal";
+import NonTerminalNode from "../nonTerminalNode";
 
 import { TYPE_RULE_NAME } from "../ruleNames";
 

package/src/node/variable.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import NonTerminalNode from "../node/nonTerminal";
+import NonTerminalNode from "../nonTerminalNode";
 
 export default class VariableNode extends NonTerminalNode {
   getVariableIdentifier() {

package/src/nominal/parser.js

@@ -1,12 +1,12 @@
 "use strict";
 
 import { NominalParser as NominalParserBase } from "occam-grammars";
-import { NonTerminalNode as defaultNonTerminalNode } from "occam-parsers";
 
+import NonTerminalNode from "../nonTerminalNode";
 import NonTerminalNodeMap from "../nonTerminalNodeMap";
 
 export default class NominalParser extends NominalParserBase {
   static NonTerminalNodeMap = NonTerminalNodeMap;
 
-  static defaultNonTerminalNode = defaultNonTerminalNode;
+  static defaultNonTerminalNode = NonTerminalNode;
 }

package/src/{node/nonTerminal.js → nonTerminalNode.js}

@@ -4,7 +4,7 @@ import { arrayUtilities } from "necessary";
 
 import { NonTerminalNode as NonTerminalNodeBase } from "occam-parsers";
 
-const { first, forwardsFind, backwardsFind } = arrayUtilities;
+const { first } = arrayUtilities;
 
 export default class NonTerminalNode extends NonTerminalNodeBase {
   getNodeByRuleName(...ruleNames) {
@@ -44,39 +44,45 @@ export default class NonTerminalNode extends NonTerminalNodeBase {
   }
 
   getLastNodeByRuleName(...ruleNames) {
-    const childNodes = this.getChildNodes(),
-          lastNode = backwardsFind(childNodes, (childNode) => {
-            const childNodeNonTerminalNode = childNode.isNonTerminalNode();
+    let lastNode = null;
 
-            if (childNodeNonTerminalNode) {
-              const nonTerminalNode = childNode, ///
-                    ruleName = nonTerminalNode.getRuleName(),
-                    ruleNamesIncludesRuleName = ruleNames.includes(ruleName);
+    this.backwardsSomeChildNode((childNode) => {
+      const childNodeNonTerminalNode = childNode.isNonTerminalNode();
 
-              if (ruleNamesIncludesRuleName) {
-                return true;
-              }
-            }
-          }) || null;
+      if (childNodeNonTerminalNode) {
+        const nonTerminalNode = childNode, ///
+              ruleName = nonTerminalNode.getRuleName(),
+              ruleNamesIncludesRuleName = ruleNames.includes(ruleName);
+
+        if (ruleNamesIncludesRuleName) {
+          lastNode = childNode; ///
+
+          return true;
+        }
+      }
+    });
 
     return lastNode;
   }
 
   getFirstNodeByRuleName(...ruleNames) {
-    const childNodes = this.getChildNodes(),
-          firstNode = forwardsFind(childNodes, (childNode) => {
-            const childNodeNonTerminalNode = childNode.isNonTerminalNode();
+    let firstNode = null;
 
-            if (childNodeNonTerminalNode) {
-              const nonTerminalNode = childNode, ///
-                    ruleName = nonTerminalNode.getRuleName(),
-                    ruleNamesIncludesRuleName = ruleNames.includes(ruleName);
+    this.forwardsSomeChildNode((childNode) => {
+      const childNodeNonTerminalNode = childNode.isNonTerminalNode();
 
-              if (ruleNamesIncludesRuleName) {
-                return true;
-              }
-            }
-          }) || null;
+      if (childNodeNonTerminalNode) {
+        const nonTerminalNode = childNode, ///
+              ruleName = nonTerminalNode.getRuleName(),
+              ruleNamesIncludesRuleName = ruleNames.includes(ruleName);
+
+        if (ruleNamesIncludesRuleName) {
+          firstNode = childNode; ///
+
+          return true;
+        }
+      }
+    });
 
     return firstNode;
   }