occam-verify-cli 1.0.396 → 1.0.404

package/lib/utilities/variable.js

@@ -2,29 +2,17 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
-function _export(target, all) {
-    for(var name in all)Object.defineProperty(target, name, {
-        enumerable: true,
-        get: Object.getOwnPropertyDescriptor(all, name).get
-    });
-}
-_export(exports, {
-    get termVariableIdentifierFromTermNode () {
+Object.defineProperty(exports, "termVariableIdentifierFromTermNode", {
+    enumerable: true,
+    get: function() {
         return termVariableIdentifierFromTermNode;
-    },
-    get variableIdentifierFromVariableNode () {
-        return variableIdentifierFromVariableNode;
     }
 });
 var _query = require("../utilities/query");
-var variableIdentifierNodeQuery = (0, _query.nodeQuery)("/variable/@identifier!"), termVariableIdentifierNodeQuery = (0, _query.nodeQuery)("/term/variable!/@identifier!");
+var termVariableIdentifierNodeQuery = (0, _query.nodeQuery)("/term/variable!/@identifier!");
 function termVariableIdentifierFromTermNode(TermNode) {
     var termVariableIdentifierTerminalNode = termVariableIdentifierNodeQuery(TermNode), termVariableIdentifierTerminalNodeContent = termVariableIdentifierTerminalNode.getContent(), termVariableIdentifier = termVariableIdentifierTerminalNodeContent; ///
     return termVariableIdentifier;
 }
-function variableIdentifierFromVariableNode(variableNode) {
-    var variableIdentifierTerminalNode = variableIdentifierNodeQuery(variableNode), variableIdentifierTerminalNodeContent = variableIdentifierTerminalNode.getContent(), variableIdentifier = variableIdentifierTerminalNodeContent; ///
-    return variableIdentifier;
-}
 
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlsaXRpZXMvdmFyaWFibGUuanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmltcG9ydCB7IG5vZGVRdWVyeSB9IGZyb20gXCIuLi91dGlsaXRpZXMvcXVlcnlcIjtcblxuY29uc3QgdmFyaWFibGVJZGVudGlmaWVyTm9kZVF1ZXJ5ID0gbm9kZVF1ZXJ5KFwiL3ZhcmlhYmxlL0BpZGVudGlmaWVyIVwiKSxcbiAgICAgIHRlcm1WYXJpYWJsZUlkZW50aWZpZXJOb2RlUXVlcnkgPSBub2RlUXVlcnkoXCIvdGVybS92YXJpYWJsZSEvQGlkZW50aWZpZXIhXCIpO1xuXG5leHBvcnQgZnVuY3Rpb24gdGVybVZhcmlhYmxlSWRlbnRpZmllckZyb21UZXJtTm9kZShUZXJtTm9kZSkge1xuICBjb25zdCB0ZXJtVmFyaWFibGVJZGVudGlmaWVyVGVybWluYWxOb2RlID0gdGVybVZhcmlhYmxlSWRlbnRpZmllck5vZGVRdWVyeShUZXJtTm9kZSksXG4gICAgICAgIHRlcm1WYXJpYWJsZUlkZW50aWZpZXJUZXJtaW5hbE5vZGVDb250ZW50ID0gdGVybVZhcmlhYmxlSWRlbnRpZmllclRlcm1pbmFsTm9kZS5nZXRDb250ZW50KCksXG4gICAgICAgIHRlcm1WYXJpYWJsZUlkZW50aWZpZXIgPSB0ZXJtVmFyaWFibGVJZGVudGlmaWVyVGVybWluYWxOb2RlQ29udGVudDsgLy8vXG5cbiAgcmV0dXJuIHRlcm1WYXJpYWJsZUlkZW50aWZpZXI7XG59XG5cbmV4cG9ydCBmdW5jdGlvbiB2YXJpYWJsZUlkZW50aWZpZXJGcm9tVmFyaWFibGVOb2RlKHZhcmlhYmxlTm9kZSkge1xuICBjb25zdCB2YXJpYWJsZUlkZW50aWZpZXJUZXJtaW5hbE5vZGUgPSB2YXJpYWJsZUlkZW50aWZpZXJOb2RlUXVlcnkodmFyaWFibGVOb2RlKSxcbiAgICAgICAgdmFyaWFibGVJZGVudGlmaWVyVGVybWluYWxOb2RlQ29udGVudCA9IHZhcmlhYmxlSWRlbnRpZmllclRlcm1pbmFsTm9kZS5nZXRDb250ZW50KCksXG4gICAgICAgIHZhcmlhYmxlSWRlbnRpZmllciA9IHZhcmlhYmxlSWRlbnRpZmllclRlcm1pbmFsTm9kZUNvbnRlbnQ7IC8vL1xuXG4gIHJldHVybiB2YXJpYWJsZUlkZW50aWZpZXI7XG59XG4iXSwibmFtZXMiOlsidGVybVZhcmlhYmxlSWRlbnRpZmllckZyb21UZXJtTm9kZSIsInZhcmlhYmxlSWRlbnRpZmllckZyb21WYXJpYWJsZU5vZGUiLCJ2YXJpYWJsZUlkZW50aWZpZXJOb2RlUXVlcnkiLCJub2RlUXVlcnkiLCJ0ZXJtVmFyaWFibGVJZGVudGlmaWVyTm9kZVF1ZXJ5IiwiVGVybU5vZGUiLCJ0ZXJtVmFyaWFibGVJZGVudGlmaWVyVGVybWluYWxOb2RlIiwidGVybVZhcmlhYmxlSWRlbnRpZmllclRlcm1pbmFsTm9kZUNvbnRlbnQiLCJnZXRDb250ZW50IiwidGVybVZhcmlhYmxlSWRlbnRpZmllciIsInZhcmlhYmxlTm9kZSIsInZhcmlhYmxlSWRlbnRpZmllclRlcm1pbmFsTm9kZSIsInZhcmlhYmxlSWRlbnRpZmllclRlcm1pbmFsTm9kZUNvbnRlbnQiLCJ2YXJpYWJsZUlkZW50aWZpZXIiXSwibWFwcGluZ3MiOiJBQUFBOzs7Ozs7Ozs7OztRQU9nQkE7ZUFBQUE7O1FBUUFDO2VBQUFBOzs7cUJBYlU7QUFFMUIsSUFBTUMsOEJBQThCQyxJQUFBQSxnQkFBUyxFQUFDLDJCQUN4Q0Msa0NBQWtDRCxJQUFBQSxnQkFBUyxFQUFDO0FBRTNDLFNBQVNILG1DQUFtQ0ssUUFBUTtJQUN6RCxJQUFNQyxxQ0FBcUNGLGdDQUFnQ0MsV0FDckVFLDRDQUE0Q0QsbUNBQW1DRSxVQUFVLElBQ3pGQyx5QkFBeUJGLDJDQUEyQyxHQUFHO0lBRTdFLE9BQU9FO0FBQ1Q7QUFFTyxTQUFTUixtQ0FBbUNTLFlBQVk7SUFDN0QsSUFBTUMsaUNBQWlDVCw0QkFBNEJRLGVBQzdERSx3Q0FBd0NELCtCQUErQkgsVUFBVSxJQUNqRksscUJBQXFCRCx1Q0FBdUMsR0FBRztJQUVyRSxPQUFPQztBQUNUIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlsaXRpZXMvdmFyaWFibGUuanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmltcG9ydCB7IG5vZGVRdWVyeSB9IGZyb20gXCIuLi91dGlsaXRpZXMvcXVlcnlcIjtcblxuY29uc3QgdGVybVZhcmlhYmxlSWRlbnRpZmllck5vZGVRdWVyeSA9IG5vZGVRdWVyeShcIi90ZXJtL3ZhcmlhYmxlIS9AaWRlbnRpZmllciFcIik7XG5cbmV4cG9ydCBmdW5jdGlvbiB0ZXJtVmFyaWFibGVJZGVudGlmaWVyRnJvbVRlcm1Ob2RlKFRlcm1Ob2RlKSB7XG4gIGNvbnN0IHRlcm1WYXJpYWJsZUlkZW50aWZpZXJUZXJtaW5hbE5vZGUgPSB0ZXJtVmFyaWFibGVJZGVudGlmaWVyTm9kZVF1ZXJ5KFRlcm1Ob2RlKSxcbiAgICAgICAgdGVybVZhcmlhYmxlSWRlbnRpZmllclRlcm1pbmFsTm9kZUNvbnRlbnQgPSB0ZXJtVmFyaWFibGVJZGVudGlmaWVyVGVybWluYWxOb2RlLmdldENvbnRlbnQoKSxcbiAgICAgICAgdGVybVZhcmlhYmxlSWRlbnRpZmllciA9IHRlcm1WYXJpYWJsZUlkZW50aWZpZXJUZXJtaW5hbE5vZGVDb250ZW50OyAvLy9cblxuICByZXR1cm4gdGVybVZhcmlhYmxlSWRlbnRpZmllcjtcbn1cbiJdLCJuYW1lcyI6WyJ0ZXJtVmFyaWFibGVJZGVudGlmaWVyRnJvbVRlcm1Ob2RlIiwidGVybVZhcmlhYmxlSWRlbnRpZmllck5vZGVRdWVyeSIsIm5vZGVRdWVyeSIsIlRlcm1Ob2RlIiwidGVybVZhcmlhYmxlSWRlbnRpZmllclRlcm1pbmFsTm9kZSIsInRlcm1WYXJpYWJsZUlkZW50aWZpZXJUZXJtaW5hbE5vZGVDb250ZW50IiwiZ2V0Q29udGVudCIsInRlcm1WYXJpYWJsZUlkZW50aWZpZXIiXSwibWFwcGluZ3MiOiJBQUFBOzs7OytCQU1nQkE7OztlQUFBQTs7O3FCQUpVO0FBRTFCLElBQU1DLGtDQUFrQ0MsSUFBQUEsZ0JBQVMsRUFBQztBQUUzQyxTQUFTRixtQ0FBbUNHLFFBQVE7SUFDekQsSUFBTUMscUNBQXFDSCxnQ0FBZ0NFLFdBQ3JFRSw0Q0FBNENELG1DQUFtQ0UsVUFBVSxJQUN6RkMseUJBQXlCRiwyQ0FBMkMsR0FBRztJQUU3RSxPQUFPRTtBQUNUIn0=

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "occam-verify-cli",
   "author": "James Smith",
-  "version": "1.0.396",
+  "version": "1.0.404",
   "license": "MIT, Anti-996",
   "homepage": "https://github.com/djalbat/occam-verify-cli",
   "description": "Occam's Verifier",
@@ -11,15 +11,15 @@
   },
   "dependencies": {
     "argumentative": "^2.0.36",
-    "necessary": "^15.0.6",
-    "occam-custom-grammars": "^5.0.1321",
-    "occam-entities": "^1.0.430",
-    "occam-file-system": "^6.0.445",
-    "occam-furtle": "^2.0.263",
-    "occam-grammars": "^1.3.410",
-    "occam-lexers": "^23.1.15",
-    "occam-parsers": "^23.1.18",
-    "occam-query": "^4.1.124"
+    "necessary": "^16.0.3",
+    "occam-custom-grammars": "^5.0.1322",
+    "occam-entities": "^1.0.431",
+    "occam-file-system": "^6.0.446",
+    "occam-furtle": "^2.0.265",
+    "occam-grammars": "^1.3.414",
+    "occam-lexers": "^23.1.22",
+    "occam-parsers": "^23.1.25",
+    "occam-query": "^4.1.131"
   },
   "devDependencies": {
     "@swc/core": "1.13.20",

package/src/assignment/equality.js

@@ -10,7 +10,7 @@ export default class EqualityAssignment {
   }
 
   assign(context) {
-    const equalityAdded = context.addEquality(this.equality, context),
+    const equalityAdded = context.addEquality(this.equality),
           equalityString = this.equality.getString(),
           equalityAssigned = equalityAdded; ///
 

package/src/context/file.js

@@ -2,8 +2,7 @@
 
 import { arrayUtilities } from "necessary";
 
-import Equivalences from "../equivalences";
-import Substitutions from "../substitutions";
+import ontology from "../ontology";
 import topLevelVerifier from "../verifier/topLevel";
 
 import { baseType } from "../ontology/type";
@@ -92,7 +91,8 @@ export default class FileContext {
   }
 
   getEquivalences() {
-    const equivalences = Equivalences.fromNothing();
+    const { Equivalences } = ontology,
+          equivalences = Equivalences.fromNothing();
 
     return equivalences;
   }
@@ -736,7 +736,8 @@ export default class FileContext {
   isLabelPresentByReference(reference) {
     const labels = this.getLabels(),
           labelPresent = labels.some((label) => {
-            const context = this, ///
+            const { Substitutions } = ontology,
+                  context = this, ///
                   substitutions = Substitutions.fromNothing(),
                   labelUnifies = reference.unifyLabel(label, substitutions, context);
 

package/src/context/local.js

@@ -2,8 +2,7 @@
 
 import { arrayUtilities } from "necessary";
 
-import Equivalence from "../equivalence";
-import Equivalences from "../equivalences";
+import ontology from "../ontology";
 
 const { last } = arrayUtilities;
 
@@ -119,19 +118,28 @@ class LocalContext {
 
   addTheorem(theorem) { this.context.addTheorem(theorem); }
 
-  addEquality(equality, context) {
+  addEquality(equality) {
     let equalityAdded;
 
     const equalityReflexive = equality.isReflexive();
 
     if (!equalityReflexive) {
-      const equivalence = Equivalence.fromEquality(equality);
+      const { Equivalence } = ontology,
+            equivalence = Equivalence.fromEquality(equality),
+            context = this; ///
 
       this.equivalences = this.equivalences.mergedWithEquivalence(equivalence, context);
     }
 
     equalityAdded = true;
 
+    if (equalityAdded) {
+      const context = this, ///
+            equalityString = equality.getString();
+
+      context.trace(`Added the '${equalityString}' equality.`)
+    }
+
     return equalityAdded;
   }
 
@@ -147,6 +155,13 @@ class LocalContext {
       variableAdded = true;
     }
 
+    if (variableAdded) {
+      const context = this,
+            variableString = variable.getString();
+
+      context.trace(`Added the '${variableString}' variable.`)
+    }
+
     return variableAdded;
   }
 
@@ -162,6 +177,13 @@ class LocalContext {
       judgementAdded = true;
     }
 
+    if (judgementAdded) {
+      const context = this, ///
+            judgementString = judgement.getString();
+
+      context.trace(`Added the '${judgementString}' judgement.`)
+    }
+
     return judgementAdded;
   }
 
@@ -357,7 +379,8 @@ class LocalContext {
   error(message, node = null) { this.context.error(message, node); }
 
   static fromNothing(context) {
-    const variables = [],
+    const { Equivalences } = ontology,
+          variables = [],
           judgements = [],
           equivalences = Equivalences.fromNothing(),
           stepsOrSubproofs = [],

package/src/context/partial.js

@@ -4,15 +4,11 @@ import { BNFLexer } from "occam-lexers";
 import { BNFParser } from "occam-parsers";
 import { arrayUtilities } from "necessary";
 
-import { nodeQuery } from "../utilities/query";
-
 const { first } = arrayUtilities;
 
 const bnfLexer = BNFLexer.fromNothing(),
       bnfParser = BNFParser.fromNothing();
 
-const childNodeQuery = nodeQuery("/*/*!");
-
 export default class PartialContext {
   constructor(node, tokens) {
     this.node = node;
@@ -29,25 +25,24 @@ export default class PartialContext {
 
   static fromStringLexerAndParser(Class, string, lexer, parser) {
     const { rule } = Class,
-          ruleMap = parser.getRuleMap(),
-          ruleName = rule.getName();
-
-    ruleMap[ruleName] = rule;
-
-    const startRule = rule, ///
+          startRule = rule, ///
           content = `${string}
 `;
 
     let tokens = lexer.tokenise(content),
         node = parser.parse(tokens, startRule);
 
-    delete  ruleMap[ruleName];
+    node.someChildNode((childNode) => {
+      const childNodeNonTerminalNode = childNode.isNonTerminalNode();
 
-    const childNode = childNodeQuery(node);
+      if (childNodeNonTerminalNode) {
+        node = childNode; ///
 
-    node = childNode; ///
+        tokens = tokensFromTokensAndNode(tokens, node);  ///
 
-    tokens = tokensFromTokensAndNode(tokens, node);  ///
+        return true;
+      }
+    })
 
     const partialContext = new Class(node, tokens);
 

package/src/context/temporary.js

@@ -2,18 +2,18 @@
 
 import { arrayUtilities } from "necessary";
 
-const { first, extract } = arrayUtilities;
+const { extract, compress } = arrayUtilities;
 
 export default class TemporaryContext {
-  constructor(context, tokens, terms, frames, statements, assertions, reference, substitution) {
+  constructor(context, tokens, terms, frames, statements, assertions, substitutions, reference) {
     this.context = context;
     this.tokens = tokens;
     this.terms = terms;
     this.frames = frames;
     this.statements = statements;
     this.assertions = assertions;
+    this.substitutions = substitutions;
     this.reference = reference;
-    this.substitution = substitution;
   }
 
   getContext() {
@@ -40,16 +40,18 @@ export default class TemporaryContext {
     return this.assertions;
   }
 
-  getReferences() {
-    return this.reference;
+  getSubstitutions() {
+    return this.substitutions;
   }
 
-  getSubstitution() {
-    return this.substitution;
+  getReference() {
+    return this.reference;
   }
 
   addTerm(term) {
-    const termNode = term.getNode();
+    const context = this, ///
+          termNode = term.getNode(),
+          termString = term.getString();
 
     extract(this.terms, (term) => {
       const termMatchesTermNode = term.matchTermNode(termNode);
@@ -59,11 +61,15 @@ export default class TemporaryContext {
       }
     });
 
+    context.trace(`ADded the '${termString}' term.`);
+
     this.terms.push(term);
   }
 
   addFrame(frame) {
-    const frameNode = frame.getNode();
+    const context = this, ///
+          frameNode = frame.getNode(),
+          frameString = frame.getString();
 
     extract(this.frames, (frame) => {
       const frameMatchesFrameNode = frame.matchFrameNode(frameNode);
@@ -73,19 +79,15 @@ export default class TemporaryContext {
       }
     });
 
-    this.frames.push(frame);
-  }
-
-  removeFrame(frame) {
-    const index = this.frames.indexOf(frame),
-          start = index,  ///
-          deleteCount = 1;
+    context.trace(`Added the '${frameString}' frame.`);
 
-    this.frames.splice(start, deleteCount);
+    this.frames.push(frame);
   }
 
   addStatement(statement) {
-    const statementNode = statement.getNode();
+    const context = this, ///
+          statementNode = statement.getNode(),
+          statementString = statement.getString();
 
     extract(this.statements, (statement) => {
       const statementMatchesFrameNode = statement.matchStatementNode(statementNode);
@@ -95,11 +97,15 @@ export default class TemporaryContext {
       }
     });
 
+    context.trace(`Added the '${statementString}' statement.`);
+
     this.statements.push(statement);
   }
 
   addAssertion(assertion) {
-    const assertionNode = assertion.getNode();
+    const context = this, ///
+          assertionNode = assertion.getNode(),
+          assertionString = assertion.getString();
 
     extract(this.assertions, (assertion) => {
       const assertionMatchesFrameNode = assertion.matchAssertionNode(assertionNode);
@@ -109,15 +115,36 @@ export default class TemporaryContext {
       }
     });
 
+    context.trace(`Added the '${assertionString}' assertion.`);
+
     this.assertions.push(assertion);
   }
 
+  addSubstitution(substitution) {
+    const context = this, ///
+          substitutionNode = substitution.getNode(),
+          substitutionString = substitution.getString();
+
+    extract(this.substitutions, (substitution) => {
+      const substitutionMatchesFrameNode = substitution.matchSubstitutionNode(substitutionNode);
+
+      if (substitutionMatchesFrameNode) {
+        return true;
+      }
+    });
+
+    context.trace(`Added the '${substitutionString}' substitution.`);
+
+    this.substitutions.push(substitution);
+  }
+
   addReference(reference) {
+    const context = this, ///
+      referenceString = reference.getString();
+
     this.reference = reference;
-  }
 
-  addSubstitution(substitution) {
-    this.substitution = substitution;
+    context.trace(`Added the '${referenceString}' reference.`);
   }
 
   findTermByTermNode(termNode) {
@@ -144,6 +171,18 @@ export default class TemporaryContext {
     return frame;
   }
 
+  findAssertionByAssertionNode(assertionNode) {
+    const assertion = this.assertions.find((assertion) => {
+      const assertionMatchesAssertionNode = assertion.matchAssertionNode(assertionNode);
+
+      if (assertionMatchesAssertionNode) {
+        return true;
+      }
+    }) || null;
+
+    return assertion;
+  }
+
   findStatementByStatementNode(statementNode) {
     const statement = this.statements.find((statement) => {
       const statementMatchesStatementNode = statement.matchStatementNode(statementNode);
@@ -156,30 +195,16 @@ export default class TemporaryContext {
     return statement;
   }
 
-  findReferenceByMetavariableName(metavariableName) {
-    let reference = null;
-
-    const referenceMatchesMetavariableName = this.reference.matchMetavariableName(metavariableName);
-
-    if (referenceMatchesMetavariableName) {
-      reference = this.reference;
-    }
-
-    return reference;
-  }
-
-  getFrame() {
-    let frame = null;
-
-    const framesLengtrh = this.frames.length;
+  findSubtitutionBySubtitutionNode(substitutionNode) {
+    const substitution = this.substitutions.find((substitution) => {
+      const substitutionMatchesSubtitutionNode = substitution.matchSubtitutionNode(substitutionNode);
 
-    if (framesLengtrh === 1) {
-      const firstFrame = first(this.frames);
-
-      frame = firstFrame; ///
-    }
+      if (substitutionMatchesSubtitutionNode) {
+        return true;
+      }
+    }) || null;
 
-    return frame;
+    return substitution;
   }
 
   getVariables(nested = true) { return this.context.getVariables(nested); }
@@ -220,7 +245,7 @@ export default class TemporaryContext {
 
   addTheorem(theorem) { this.context.addTheorem(theorem); }
 
-  addEquality(equality, context) { return this.context.addEquality(equality, context); }
+  addEquality(equality) { return this.context.addEquality(equality); }
 
   addVariable(variable, nested = true) { return this.context.addVariable(variable, nested); }
 
@@ -356,15 +381,59 @@ export default class TemporaryContext {
 
   error(message, node = null) { this.context.error(message, node); }
 
+  marge(context) {
+    const terms = context.getTerms(),
+          frames = context.getFrames(),
+          statements = context.getStatements(),
+          assertions = context.getAssertions(),
+          substitutions = context.getSubstitutions();
+
+    this.terms = [
+      ...this.terms,
+      ...terms
+    ];
+
+    this.frames = [
+      ...this.frames,
+      ...frames
+    ];
+
+    this.statements = [
+      ...this.statements,
+      ...statements
+    ];
+
+    this.assertions = [
+      ...this.assertions,
+      ...assertions
+    ];
+
+    this.substitutions = [
+      ...this.substitutions,
+      ...substitutions
+    ];
+
+    compress(this.terms, (termA, termB) => {
+      const termANode = termA.getNode(),
+            termBNode = termB.getNode(),
+            termANodeMatchesTermBNode = termANode.match(termBNode);
+
+      if (termAMatchesTermB) {
+        return true;
+      }
+    });
+
+  }
+
   static fromNothing(context) {
     const terms = [],
           frames = [],
           tokens = null,
           statements = [],
           assertions = [],
+          substitutions = [],
           reference = null,
-          substitution = null,
-          temporaryContext = new TemporaryContext(context, tokens, terms, frames, statements, assertions, reference, substitution);
+          temporaryContext = new TemporaryContext(context, tokens, terms, frames, statements, assertions, substitutions, reference);
 
     return temporaryContext;
   }
@@ -373,9 +442,9 @@ export default class TemporaryContext {
     const tokens = null,
           statements = [],
           assertions = [],
+          substitutions = [],
           reference = null,
-          substitution = null,
-          temporaryContext = new TemporaryContext(context, tokens, terms, frames, statements, assertions, reference, substitution);
+          temporaryContext = new TemporaryContext(context, tokens, terms, frames, statements, assertions, substitutions, reference);
 
     return temporaryContext;
   }
@@ -385,9 +454,9 @@ export default class TemporaryContext {
           frames = [],
           statements = [],
           assertions = [],
+          substitutions = [],
           reference = null,
-          substitution = null,
-          temporaryContext = new TemporaryContext(context, tokens, terms, frames, statements, assertions, reference, substitution);
+          temporaryContext = new TemporaryContext(context, tokens, terms, frames, statements, assertions, substitutions, reference);
 
     return temporaryContext;
   }

package/src/mixins/step/unify.js

@@ -3,7 +3,6 @@
 import { arrayUtilities } from "necessary";
 
 import ontology from "../../ontology";
-import Substitutions from "../../substitutions";
 
 import { equalityFromStatement,
          judgementFromStatement,
@@ -109,7 +108,8 @@ function unifyAsSatisfiesAssertion(statement, reference, satisfiesAssertion, sub
           const satisfiable = axiom.isSatisfiable();
 
           if (satisfiable) {
-            const substitutions = Substitutions.fromNothing(),
+            const { Substitutions } = ontology,
+                  substitutions = Substitutions.fromNothing(),
                   axiomLemmaTheoremOrConjectureUnifies = axiom.unifyAxiomLemmaTheoremOrConjecture(axiomLemmaTheoremOrConjecture, substitutions, context);
 
             if (axiomLemmaTheoremOrConjectureUnifies) {
@@ -140,7 +140,8 @@ function unifyWithAxiomLemmaTheoremOrConjecture(statement, reference, satisfiesA
   let unifiesWithAxiomLemmaTheoremOrConjecture = false;
 
   if (reference !== null) {
-    const axiomLemmaTheoremOrConjecture = context.findAxiomLemmaTheoremOrConjectureByReference(reference),
+    const { Substitutions } = ontology,
+          axiomLemmaTheoremOrConjecture = context.findAxiomLemmaTheoremOrConjectureByReference(reference),
           generalSubstitutions = substitutions; ///
 
     if (axiomLemmaTheoremOrConjecture !== null) {
@@ -158,7 +159,6 @@ function unifyWithAxiomLemmaTheoremOrConjecture(statement, reference, satisfiesA
       if (statementAndStepsUnify) {
         const { StatementSubstitution } = ontology,
               metavariable = reference.getMetavariable(),
-              specificContext = context,  ///
               statementSubstitution = StatementSubstitution.fromStatementAndMetavariable(statement, metavariable, context),
               substitution = statementSubstitution;  ///
 

package/src/node/argument.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/assertion/contained.js

@@ -1,11 +1,11 @@
 "use strict";
 
-import NonTerminalNode from "../../node/nonTerminal";
+import AssertionNode from "../../node/assertion";
 
 import { MISSING } from "../../constants";
 import { TERM_RULE_NAME, FRAME_RULE_NAME, STATEMENT_RULE_NAME } from "../../ruleNames";
 
-export default class ContainedAssertionNode extends NonTerminalNode {
+export default class ContainedAssertionNode extends AssertionNode {
   isNegated() {
     let negated = false;
 
@@ -49,5 +49,5 @@ export default class ContainedAssertionNode extends NonTerminalNode {
     return statementNode;
   }
 
-  static fromRuleNameChildNodesOpacityAndPrecedence(ruleName, childNodes, opacity, precedence) { return NonTerminalNode.fromRuleNameChildNodesOpacityAndPrecedence(ContainedAssertionNode, ruleName, childNodes, opacity, precedence); }
+  static fromRuleNameChildNodesOpacityAndPrecedence(ruleName, childNodes, opacity, precedence) { return AssertionNode.fromRuleNameChildNodesOpacityAndPrecedence(ContainedAssertionNode, ruleName, childNodes, opacity, precedence); }
 }

package/src/node/assertion/defined.js

@@ -1,11 +1,11 @@
 "use strict";
 
-import NonTerminalNode from "../../node/nonTerminal";
+import AssertionNode from "../../node/assertion";
 
 import { UNDEFINED } from "../../constants";
 import { FRAME_RULE_NAME, TERM_RULE_NAME } from "../../ruleNames";
 
-export default class DefinedAssertionNode extends NonTerminalNode {
+export default class DefinedAssertionNode extends AssertionNode {
   isNegated() {
     let negated = false;
 
@@ -42,5 +42,5 @@ export default class DefinedAssertionNode extends NonTerminalNode {
     return frameNode;
   }
 
-  static fromRuleNameChildNodesOpacityAndPrecedence(ruleName, childNodes, opacity, precedence) { return NonTerminalNode.fromRuleNameChildNodesOpacityAndPrecedence(DefinedAssertionNode, ruleName, childNodes, opacity, precedence); }
+  static fromRuleNameChildNodesOpacityAndPrecedence(ruleName, childNodes, opacity, precedence) { return AssertionNode.fromRuleNameChildNodesOpacityAndPrecedence(DefinedAssertionNode, ruleName, childNodes, opacity, precedence); }
 }

package/src/node/assertion/property.js

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

package/src/node/assertion/satisfies.js

@@ -1,10 +1,10 @@
 "use strict";
 
-import NonTerminalNode from "../../node/nonTerminal";
+import AssertionNode from "../../node/assertion";
 
 import { SIGNATURE_RULE_NAME, METAVARIABLE_RULE_NAME } from "../../ruleNames";
 
-export default class SatisfiesAssertionNode extends NonTerminalNode {
+export default class SatisfiesAssertionNode extends AssertionNode {
   getSignatureNode() {
     const ruleName = SIGNATURE_RULE_NAME,
           signatureNode = this.getNodeByRuleName(ruleName);
@@ -19,5 +19,5 @@ export default class SatisfiesAssertionNode extends NonTerminalNode {
     return metavariableNode;
   }
 
-  static fromRuleNameChildNodesOpacityAndPrecedence(ruleName, childNodes, opacity, precedence) { return NonTerminalNode.fromRuleNameChildNodesOpacityAndPrecedence(SatisfiesAssertionNode, ruleName, childNodes, opacity, precedence); }
+  static fromRuleNameChildNodesOpacityAndPrecedence(ruleName, childNodes, opacity, precedence) { return AssertionNode.fromRuleNameChildNodesOpacityAndPrecedence(SatisfiesAssertionNode, ruleName, childNodes, opacity, precedence); }
 }