occam-verify-cli 1.0.396 → 1.0.405

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);
@@ -45,5 +45,5 @@ export default class FrameSubstitutionNode extends NonTerminalNode {
     return firstMetavariableNode;
   }
 
-  static fromRuleNameChildNodesOpacityAndPrecedence(ruleName, childNodes, opacity, precedence) { return NonTerminalNode.fromRuleNameChildNodesOpacityAndPrecedence(FrameSubstitutionNode, ruleName, childNodes, opacity, precedence); }
+  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);
@@ -45,5 +45,5 @@ export default class TermSubstitutionNode extends NonTerminalNode {
     return firstVariableNode;
   }
 
-  static fromRuleNameChildNodesOpacityAndPrecedence(ruleName, childNodes, opacity, precedence) { return NonTerminalNode.fromRuleNameChildNodesOpacityAndPrecedence(TermSubstitutionNode, ruleName, childNodes, opacity, precedence); }
+  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;
   }

package/src/nonTerminalNodeMap.js

@@ -23,6 +23,7 @@ import MetaTypeNode from "./node/metaType";
 import EqualityNode from "./node/equality";
 import VariableNode from "./node/variable";
 import RuleBodyNode from "./node/body/rule";
+import DocumentNode from "./node/document";
 import StatementNode from "./node/statement";
 import ReferenceNode from "./node/reference";
 import DeductionNode from "./node/deduction";
@@ -38,10 +39,11 @@ import ConclusionNode from "./node/conclusion";
 import ConjectureNode from "./node/conjecture";
 import HypothesisNode from "./node/hypothesis";
 import TypePrefixNode from "./node/typePrefix";
+import AssumptionNode from "./node/assumption";
 import RuleHeaderNode from "./node/header/rule";
 import SuppositionNode from "./node/supposition";
+import PlaceholderNode from "./node/placeholder";
 import ConstructorNode from "./node/constructor";
-import DeclarationNode from "./node/declaration";
 import MetatheoremNode from "./node/metatheorem";
 import TheoremBodyNode from "./node/body/theorem";
 import AxiomHeaderNode from "./node/header/axiom";
@@ -102,6 +104,7 @@ import {
   PROPERTY_RULE_NAME,
   EQUALITY_RULE_NAME,
   VARIABLE_RULE_NAME,
+  DOCUMENT_RULE_NAME,
   META_TYPE_RULE_NAME,
   SIGNATURE_RULE_NAME,
   DEDUCTION_RULE_NAME,
@@ -118,11 +121,12 @@ import {
   HYPOTHESIS_RULE_NAME,
   AXIOM_BODY_RULE_NAME,
   LEMMA_BODY_RULE_NAME,
+  ASSUMPTION_RULE_NAME,
+  PLACEHOLDER_RULE_NAME,
   TYPE_PREFIX_RULE_NAME,
   SUPPOSITION_RULE_NAME,
   RULE_HEADER_RULE_NAME,
   CONSTRUCTOR_RULE_NAME,
-  DECLARATION_RULE_NAME,
   METATHEOREM_RULE_NAME,
   AXIOM_HEADER_RULE_NAME,
   LEMMA_HEADER_RULE_NAME,
@@ -159,8 +163,7 @@ import {
   CONSTRUCTOR_DECLARATION_RULE_NAME,
   TYPE_PREFIX_DECLARATION_RULE_NAME,
   COMPLEX_TYPE_DECLARATION_RULE_NAME,
-  METAVARIABLE_DECLARATION_RULE_NAME
-} from "./ruleNames";
+  METAVARIABLE_DECLARATION_RULE_NAME } from "./ruleNames";
 
 const NonTerminalNodeMap = {
   [RULE_RULE_NAME]: RuleNode,
@@ -184,6 +187,7 @@ const NonTerminalNodeMap = {
   [EQUALITY_RULE_NAME]: EqualityNode,
   [VARIABLE_RULE_NAME]: VariableNode,
   [NONSENSE_RULE_NAME]: NonsenseNode,
+  [DOCUMENT_RULE_NAME]: DocumentNode,
   [RULE_BODY_RULE_NAME]: RuleBodyNode,
   [META_TYPE_RULE_NAME]: MetaTypeNode,
   [SIGNATURE_RULE_NAME]: SignatureNode,
@@ -200,11 +204,12 @@ const NonTerminalNodeMap = {
   [CONJECTURE_RULE_NAME]: ConjectureNode,
   [DERIVATION_RULE_NAME]: DerivationNode,
   [HYPOTHESIS_RULE_NAME]: HypothesisNode,
+  [ASSUMPTION_RULE_NAME]: AssumptionNode,
   [RULE_HEADER_RULE_NAME]: RuleHeaderNode,
   [TYPE_PREFIX_RULE_NAME]: TypePrefixNode,
+  [PLACEHOLDER_RULE_NAME]: PlaceholderNode,
   [SUPPOSITION_RULE_NAME]: SuppositionNode,
   [CONSTRUCTOR_RULE_NAME]: ConstructorNode,
-  [DECLARATION_RULE_NAME]: DeclarationNode,
   [METATHEOREM_RULE_NAME]: MetatheoremNode,
   [AXIOM_HEADER_RULE_NAME]: AxiomHeaderNode,
   [LEMMA_HEADER_RULE_NAME]: LemmaHeaderNode,

package/src/ontology/assertion/contained.js

@@ -2,7 +2,6 @@
 
 import ontology from "../../ontology";
 import Assertion from "../assertion";
-import TemporaryContext from "../../context/temporary";
 
 import { define } from "../../ontology";
 import { termFromTermAndSubstitutions, frameFromFrameAndSubstitutions, statementFromStatementAndSubstitutions } from "../../utilities/substitutions";
@@ -167,7 +166,10 @@ export default define(class ContainedAssertion extends Assertion {
 
     context.trace(`Verifying the '${containedAssertionString}' derived contained assertion...`);
 
-    verifiesWhenDerived = verifyWhenDerived(this.term, this.frame, this.statement, this.negated, context);
+    const generalCotnext = null,
+          specificContext = context; ///
+
+    verifiesWhenDerived = verifyWhenDerived(this.term, this.frame, this.statement, this.negated, generalCotnext, specificContext);
 
     if (verifiesWhenDerived) {
       context.debug(`...verified the '${containedAssertionString}' derived contained assertion.`);
@@ -176,22 +178,18 @@ export default define(class ContainedAssertion extends Assertion {
     return verifiesWhenDerived;
   }
 
-  unifyIndependently(substitutions, context) {
+  unifyIndependently(substitutions, generalContext, specificContext) {
     let unifiesIndependently;
 
-    const containedAssertionString = this.getString(); ///
+    const context = specificContext,  ///
+          containedAssertionString = this.getString(); ///
 
     context.trace(`Unifying the '${containedAssertionString}' contained assertion independently...`);
 
-    const tokens = this.getTokens(),
-          temporaryContext = TemporaryContext.fromContextAndTokens(context, tokens);
-
-    context = temporaryContext; ///
-
-    const term = termFromTermAndSubstitutions(this.term, substitutions, context),
-          frame = frameFromFrameAndSubstitutions(this.frame, substitutions, context),
-          statement = statementFromStatementAndSubstitutions(this.statement, substitutions, context),
-          verifiesWhenDerived = verifyWhenDerived(term, frame, statement, this.negated, context);
+    const term = termFromTermAndSubstitutions(this.term, substitutions, generalContext, specificContext),
+          frame = frameFromFrameAndSubstitutions(this.frame, substitutions, generalContext, specificContext),
+          statement = statementFromStatementAndSubstitutions(this.statement, substitutions, generalContext, specificContext),
+          verifiesWhenDerived = verifyWhenDerived(term, frame, statement, this.negated, generalContext, specificContext);
 
     unifiesIndependently = verifiesWhenDerived; ///
 
@@ -226,9 +224,11 @@ export default define(class ContainedAssertion extends Assertion {
   }
 });
 
-function verifyWhenDerived(term, frame, statement, negated, context) {
+function verifyWhenDerived(term, frame, statement, negated, generalContext, specificContext) {
   let verifiesWhenDerived = false;
 
+  const context = specificContext;  ///
+
   if (statement !== null) {
     if (term !== null) {
       const termContained = statement.isTermContained(term, context);