occam-verify-cli 1.0.396 → 1.0.405

package/src/node/assertion/subproof.js

@@ -1,10 +1,10 @@
 "use strict";
 
-import NonTerminalNode from "../../node/nonTerminal";
+import AssertionNode from "../../node/assertion";
 
 import { STATEMENT_RULE_NAME } from "../../ruleNames";
 
-export default class SubproofAssertionNode extends NonTerminalNode {
+export default class SubproofAssertionNode extends AssertionNode {
   getStatementNodes() {
     const ruleName = STATEMENT_RULE_NAME,
           statementNodes = this.getNodesByRuleName(ruleName);
@@ -12,5 +12,5 @@ export default class SubproofAssertionNode extends NonTerminalNode {
     return statementNodes;
   }
 
-  static fromRuleNameChildNodesOpacityAndPrecedence(ruleName, childNodes, opacity, precedence) { return NonTerminalNode.fromRuleNameChildNodesOpacityAndPrecedence(SubproofAssertionNode, ruleName, childNodes, opacity, precedence); }
+  static fromRuleNameChildNodesOpacityAndPrecedence(ruleName, childNodes, opacity, precedence) { return AssertionNode.fromRuleNameChildNodesOpacityAndPrecedence(SubproofAssertionNode, ruleName, childNodes, opacity, precedence); }
 }

package/src/node/assertion/type.js

@@ -1,10 +1,10 @@
 "use strict";
 
-import NonTerminalNode from "../../node/nonTerminal";
+import AssertionNode from "../../node/assertion";
 
 import { TERM_RULE_NAME, TYPE_RULE_NAME } from "../../ruleNames";
 
-export default class TypeAssertionNode extends NonTerminalNode {
+export default class TypeAssertionNode extends AssertionNode {
   getTermNode() {
     const ruleName = TERM_RULE_NAME,
           termNode = this.getNodeByRuleName(ruleName);
@@ -19,5 +19,5 @@ export default class TypeAssertionNode extends NonTerminalNode {
     return typeNode;
   }
 
-  static fromRuleNameChildNodesOpacityAndPrecedence(ruleName, childNodes, opacity, precedence) { return NonTerminalNode.fromRuleNameChildNodesOpacityAndPrecedence(TypeAssertionNode, ruleName, childNodes, opacity, precedence); }
+  static fromRuleNameChildNodesOpacityAndPrecedence(ruleName, childNodes, opacity, precedence) { return AssertionNode.fromRuleNameChildNodesOpacityAndPrecedence(TypeAssertionNode, ruleName, childNodes, opacity, precedence); }
 }

package/src/node/assertion.js

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

package/src/node/assumption.js

@@ -0,0 +1,35 @@
+"use strict";
+
+import DocumentNode from "../nonTerminalNode";
+
+import { STATEMENT_RULE_NAME, METAVARIABLE_RULE_NAME } from "../ruleNames";
+
+export default class AssumptionpNode extends DocumentNode {
+  isSimple() {
+    let simple = false;
+
+    const statementNode = this.getStatementNode();
+
+    if (statementNode === null) {
+      simple = true;
+    }
+
+    return simple;
+  }
+
+  getStatementNode() {
+    const ruleName = STATEMENT_RULE_NAME,
+          statementNode = this.getNodeByRuleName(ruleName);
+
+    return statementNode;
+  }
+
+  getMetavariableNode() {
+    const ruleName = METAVARIABLE_RULE_NAME,
+          metavariableNode = this.getNodeByRuleName(ruleName);
+
+    return metavariableNode;
+  }
+
+  static fromRuleNameChildNodesOpacityAndPrecedence(ruleName, childNodes, opacity, precedence) { return DocumentNode.fromRuleNameChildNodesOpacityAndPrecedence(AssumptionpNode, ruleName, childNodes, opacity, precedence); }
+}

package/src/node/axiom.js

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

package/src/node/{topLevelAssertion.js → axiomLemmaTheoremConjecture.js}

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

package/src/node/body.js

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

package/src/node/combinator.js

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

package/src/node/conclusion.js

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

package/src/node/conjecture.js

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

package/src/node/constructor.js

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

package/src/node/declaration/combinator.js

@@ -1,10 +1,10 @@
 "use strict";
 
-import NonTerminalNode from "../../node/nonTerminal";
+import DeclarationNode from "../../node/declaration";
 
 import { STATEMENT_RULE_NAME } from "../../ruleNames";
 
-export default class ContainedDeclarationNode extends NonTerminalNode {
+export default class ContainedDeclarationNode extends DeclarationNode {
   getStatementNode() {
     const ruleName = STATEMENT_RULE_NAME,
           statementNode = this.getNodeByRuleName(ruleName);
@@ -12,5 +12,5 @@ export default class ContainedDeclarationNode extends NonTerminalNode {
     return statementNode;
   }
 
-  static fromRuleNameChildNodesOpacityAndPrecedence(ruleName, childNodes, opacity, precedence) { return NonTerminalNode.fromRuleNameChildNodesOpacityAndPrecedence(ContainedDeclarationNode, ruleName, childNodes, opacity, precedence); }
+  static fromRuleNameChildNodesOpacityAndPrecedence(ruleName, childNodes, opacity, precedence) { return DeclarationNode.fromRuleNameChildNodesOpacityAndPrecedence(ContainedDeclarationNode, ruleName, childNodes, opacity, precedence); }
 }

package/src/node/declaration/complexType.js

@@ -1,11 +1,11 @@
 "use strict";
 
-import NonTerminalNode from "../../node/nonTerminal";
+import DeclarationNode from "../../node/declaration";
 
 import { PROVISIONAL } from "../../constants";
 import { TYPE_RULE_NAME, TYPES_RULE_NAME, PROPERTY_DECLARATION_RULE_NAME } from "../../ruleNames";
 
-export default class ComplexTypeDeclarationNode extends NonTerminalNode {
+export default class ComplexTypeDeclarationNode extends DeclarationNode {
   isProvisional() {
     let provisional = false;
 
@@ -91,5 +91,5 @@ export default class ComplexTypeDeclarationNode extends NonTerminalNode {
     return propertyDeclarationNodes;
   }
 
-  static fromRuleNameChildNodesOpacityAndPrecedence(ruleName, childNodes, opacity, precedence) { return NonTerminalNode.fromRuleNameChildNodesOpacityAndPrecedence(ComplexTypeDeclarationNode, ruleName, childNodes, opacity, precedence); }
+  static fromRuleNameChildNodesOpacityAndPrecedence(ruleName, childNodes, opacity, precedence) { return DeclarationNode.fromRuleNameChildNodesOpacityAndPrecedence(ComplexTypeDeclarationNode, ruleName, childNodes, opacity, precedence); }
 }

package/src/node/declaration/constructor.js

@@ -1,11 +1,11 @@
 "use strict";
 
-import NonTerminalNode from "../../node/nonTerminal";
+import DeclarationNode from "../../node/declaration";
 
 import { PROVISIONALLY } from "../../constants";
 import { TERM_RULE_NAME, TYPE_RULE_NAME } from "../../ruleNames";
 
-export default class ConstructorDeclarationNode extends NonTerminalNode {
+export default class ConstructorDeclarationNode extends DeclarationNode {
   isProvisional() {
     let provisional = false;
 
@@ -42,5 +42,5 @@ export default class ConstructorDeclarationNode extends NonTerminalNode {
     return typeNode;
   }
 
-  static fromRuleNameChildNodesOpacityAndPrecedence(ruleName, childNodes, opacity, precedence) { return NonTerminalNode.fromRuleNameChildNodesOpacityAndPrecedence(ConstructorDeclarationNode, ruleName, childNodes, opacity, precedence); }
+  static fromRuleNameChildNodesOpacityAndPrecedence(ruleName, childNodes, opacity, precedence) { return DeclarationNode.fromRuleNameChildNodesOpacityAndPrecedence(ConstructorDeclarationNode, ruleName, childNodes, opacity, precedence); }
 }

package/src/node/declaration/metavariable.js

@@ -1,10 +1,10 @@
 "use strict";
 
-import NonTerminalNode from "../../node/nonTerminal";
+import DeclarationNode from "../../node/declaration";
 
 import { META_TYPE_RULE_NAME, METAVARIABLE_RULE_NAME } from "../../ruleNames";
 
-export default class MetavariableDeclarationNode extends NonTerminalNode {
+export default class MetavariableDeclarationNode extends DeclarationNode {
   getTypeNode() {
     const metavariableNode = this.getMetavariableNode(),
           typeNode = metavariableNode.getTypeNode();
@@ -26,5 +26,5 @@ export default class MetavariableDeclarationNode extends NonTerminalNode {
     return metavariableNode;
   }
 
-  static fromRuleNameChildNodesOpacityAndPrecedence(ruleName, childNodes, opacity, precedence) { return NonTerminalNode.fromRuleNameChildNodesOpacityAndPrecedence(MetavariableDeclarationNode, ruleName, childNodes, opacity, precedence); }
+  static fromRuleNameChildNodesOpacityAndPrecedence(ruleName, childNodes, opacity, precedence) { return DeclarationNode.fromRuleNameChildNodesOpacityAndPrecedence(MetavariableDeclarationNode, ruleName, childNodes, opacity, precedence); }
 }

package/src/node/declaration/property.js

@@ -1,10 +1,10 @@
 "use strict";
 
-import NonTerminalNode from "../../node/nonTerminal";
+import DeclarationNode from "../../node/declaration";
 
 import { TYPE_RULE_NAME, PROPERTY_RULE_NAME } from "../../ruleNames";
 
-export default class PropertyDeclarationNode extends NonTerminalNode {
+export default class PropertyDeclarationNode extends DeclarationNode {
   getTypeNode() {
     const ruleName = TYPE_RULE_NAME,
           typeNode = this.getNodeByRuleName(ruleName);
@@ -38,5 +38,5 @@ export default class PropertyDeclarationNode extends NonTerminalNode {
     return nominalTypeName;
   }
 
-  static fromRuleNameChildNodesOpacityAndPrecedence(ruleName, childNodes, opacity, precedence) { return NonTerminalNode.fromRuleNameChildNodesOpacityAndPrecedence(PropertyDeclarationNode, ruleName, childNodes, opacity, precedence); }
+  static fromRuleNameChildNodesOpacityAndPrecedence(ruleName, childNodes, opacity, precedence) { return DeclarationNode.fromRuleNameChildNodesOpacityAndPrecedence(PropertyDeclarationNode, ruleName, childNodes, opacity, precedence); }
 }

package/src/node/declaration/simpleType.js

@@ -1,11 +1,11 @@
 "use strict";
 
-import NonTerminalNode from "../../node/nonTerminal";
+import DeclarationNode from "../../node/declaration";
 
 import { PROVISIONAL } from "../../constants";
 import { TYPE_RULE_NAME, TYPES_RULE_NAME } from "../../ruleNames";
 
-export default class SimpleTypeDeclarationNode extends NonTerminalNode {
+export default class SimpleTypeDeclarationNode extends DeclarationNode {
   isProvisional() {
     let provisional = false;
 
@@ -89,6 +89,6 @@ export default class SimpleTypeDeclarationNode extends NonTerminalNode {
     return nominalTypeName;
   }
 
-  static fromRuleNameChildNodesOpacityAndPrecedence(ruleName, childNodes, opacity, precedence) { return NonTerminalNode.fromRuleNameChildNodesOpacityAndPrecedence(SimpleTypeDeclarationNode, ruleName, childNodes, opacity, precedence); }
+  static fromRuleNameChildNodesOpacityAndPrecedence(ruleName, childNodes, opacity, precedence) { return DeclarationNode.fromRuleNameChildNodesOpacityAndPrecedence(SimpleTypeDeclarationNode, ruleName, childNodes, opacity, precedence); }
 }
 

package/src/node/declaration/typePrefix.js

@@ -1,10 +1,10 @@
 "use strict";
 
-import NonTerminalNode from "../../node/nonTerminal";
+import DeclarationNode from "../../node/declaration";
 
 import { TYPE_PREFIX_RULE_NAME } from "../../ruleNames";
 
-export default class TypePrefixDeclarationNode extends NonTerminalNode {
+export default class TypePrefixDeclarationNode extends DeclarationNode {
   getTypePrefix() {
     const typePrefixNode = this.getTypePrefixNode(),
           typePrefixName = typePrefixNode.getTypePrefixName();
@@ -19,6 +19,6 @@ export default class TypePrefixDeclarationNode extends NonTerminalNode {
     return typePrefixNode;
   }
 
-  static fromRuleNameChildNodesOpacityAndPrecedence(ruleName, childNodes, opacity, precedence) { return NonTerminalNode.fromRuleNameChildNodesOpacityAndPrecedence(TypePrefixDeclarationNode, ruleName, childNodes, opacity, precedence); }
+  static fromRuleNameChildNodesOpacityAndPrecedence(ruleName, childNodes, opacity, precedence) { return DeclarationNode.fromRuleNameChildNodesOpacityAndPrecedence(TypePrefixDeclarationNode, ruleName, childNodes, opacity, precedence); }
 }
 

package/src/node/declaration/variable.js

@@ -1,11 +1,11 @@
 "use strict";
 
-import NonTerminalNode from "../../node/nonTerminal";
+import DeclarationNode from "../../node/declaration";
 
 import { PROVISIONALLY } from "../../constants";
 import { TYPE_RULE_NAME, VARIABLE_RULE_NAME } from "../../ruleNames";
 
-export default class VariableDeclarationNode extends NonTerminalNode {
+export default class VariableDeclarationNode extends DeclarationNode {
   isProvisional() {
     let provisional = false;
 
@@ -49,5 +49,5 @@ export default class VariableDeclarationNode extends NonTerminalNode {
     return variableIdentifier;
   }
 
-  static fromRuleNameChildNodesOpacityAndPrecedence(ruleName, childNodes, opacity, precedence) { return NonTerminalNode.fromRuleNameChildNodesOpacityAndPrecedence(VariableDeclarationNode, ruleName, childNodes, opacity, precedence); }
+  static fromRuleNameChildNodesOpacityAndPrecedence(ruleName, childNodes, opacity, precedence) { return DeclarationNode.fromRuleNameChildNodesOpacityAndPrecedence(VariableDeclarationNode, ruleName, childNodes, opacity, precedence); }
 }

package/src/node/declaration.js

@@ -1,23 +1,7 @@
 "use strict";
 
-import NonTerminalNode from "../node/nonTerminal";
-
-import { STATEMENT_RULE_NAME, METAVARIABLE_RULE_NAME } from "../ruleNames";
+import NonTerminalNode from "../nonTerminalNode";
 
 export default class DeclarationNode extends NonTerminalNode {
-  getStatementNode() {
-    const ruleName = STATEMENT_RULE_NAME,
-          statementNode = this.getNodeByRuleName(ruleName);
-
-    return statementNode;
-  }
-
-  getMetavariableNode() {
-    const ruleName = METAVARIABLE_RULE_NAME,
-          metavariableNode = this.getNodeByRuleName(ruleName);
-
-    return metavariableNode;
-  }
-
-  static fromRuleNameChildNodesOpacityAndPrecedence(ruleName, childNodes, opacity, precedence) { return NonTerminalNode.fromRuleNameChildNodesOpacityAndPrecedence(DeclarationNode, ruleName, childNodes, opacity, precedence); }
+  static fromRuleNameChildNodesOpacityAndPrecedence(Class, ruleName, childNodes, opacity, precedence) { return NonTerminalNode.fromRuleNameChildNodesOpacityAndPrecedence(Class, ruleName, childNodes, opacity, precedence); }
 }

package/src/node/deduction.js

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

package/src/node/derivation.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/document.js

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

package/src/node/equality.js

@@ -2,7 +2,7 @@
 
 import { arrayUtilities } from "necessary";
 
-import NonTerminalNode from "../node/nonTerminal";
+import NonTerminalNode from "../nonTerminalNode";
 
 import { TERM_RULE_NAME } from "../ruleNames";
 

package/src/node/error.js

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

package/src/node/frame.js

@@ -1,12 +1,24 @@
 "use strict";
 
-import NonTerminalNode from "../node/nonTerminal";
+import NonTerminalNode from "../nonTerminalNode";
 
-import { DECLARATION_RULE_NAME, METAVARIABLE_RULE_NAME } from "../ruleNames";
+import { ASSUMPTION_RULE_NAME, METAVARIABLE_RULE_NAME } from "../ruleNames";
 
 export default class FrameNode extends NonTerminalNode {
-  getDeclarationNodes() {
-    const ruleName = DECLARATION_RULE_NAME,
+  isSimple() {
+    let simple = false;
+
+    const singularAssumptionNode = this.getSingularAssumptionNode();
+
+    if (singularAssumptionNode !== null) {
+      simple = singularAssumptionNode.isSimple();
+    }
+
+    return simple;
+  }
+
+  getAssumptionNodes() {
+    const ruleName = ASSUMPTION_RULE_NAME,
           declarationNodes = this.getNodesByRuleName(ruleName);
 
     return declarationNodes;
@@ -19,20 +31,20 @@ export default class FrameNode extends NonTerminalNode {
     return metavariableNodes;
   }
 
-  getSingularDeclarationNode() {
-    const ruleName = DECLARATION_RULE_NAME,
-          singularDeclarationNode = this.getSingularTNodeByRuleName(ruleName);
+  getSingularAssumptionNode() {
+    const ruleName = ASSUMPTION_RULE_NAME,
+          singularAssumptionNode = this.getSingularTNodeByRuleName(ruleName);
 
-    return singularDeclarationNode;
+    return singularAssumptionNode;
   }
 
   getSingularMetavariableNode() {
     let singularMetavariableNode = null;
 
-    const singularDeclarationNode = this.getSingularDeclarationNode();
+    const singularAssumptionNode = this.getSingularAssumptionNode();
 
-    if (singularDeclarationNode !== null) {
-      const metavariableNode = singularDeclarationNode.getMetavariableNode();
+    if (singularAssumptionNode !== null) {
+      const metavariableNode = singularAssumptionNode.getMetavariableNode();
 
       singularMetavariableNode = metavariableNode;  ///
     }

package/src/node/header.js

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

package/src/node/hypothesis.js

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

package/src/node/judgement.js

@@ -1,8 +1,8 @@
 "use strict";
 
-import NonTerminalNode from "../node/nonTerminal";
+import NonTerminalNode from "../nonTerminalNode";
 
-import { FRAME_RULE_NAME, DECLARATION_RULE_NAME } from "../ruleNames";
+import { FRAME_RULE_NAME, ASSUMPTION_RULE_NAME } from "../ruleNames";
 
 export default class JudgementNode extends NonTerminalNode {
   getFrameNode() {
@@ -12,11 +12,11 @@ export default class JudgementNode extends NonTerminalNode {
     return frameNode;
   }
 
-  getDeclarationNode() {
-    const ruleName = DECLARATION_RULE_NAME,
-          declarationNodes = this.getNodeByRuleName(ruleName);
+  getAssumptionNode() {
+    const ruleName = ASSUMPTION_RULE_NAME,
+          assumptionNodes = this.getNodeByRuleName(ruleName);
 
-    return declarationNodes;
+    return assumptionNodes;
   }
 
   static fromRuleNameChildNodesOpacityAndPrecedence(ruleName, childNodes, opacity, precedence) { return NonTerminalNode.fromRuleNameChildNodesOpacityAndPrecedence(JudgementNode, ruleName, childNodes, opacity, precedence); }

package/src/node/label.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/labels.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/lemma.js

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

package/src/node/metaArgument.js

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

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";