occam-verify-cli 1.0.862 → 1.0.866

package/src/context/liminal.js

@@ -6,7 +6,7 @@ import { metavariableNodesFromDerivedSubstitutions } from "../utilities/substitu
 import Context from "../context";
 import elements from "../elements";
 
-const { find, first } = arrayUtilities;
+const { push, find, first } = arrayUtilities;
 
 export default class LiminalContext extends Context {
   constructor(context, derivedSubstitutions) {
@@ -15,33 +15,23 @@ export default class LiminalContext extends Context {
     this.derivedSubstitutions = derivedSubstitutions;
   }
 
-  getDerivedSubstitutions(nested = true) {
-    let derivedSubstitutions;
-
-    if (nested) {
-      const context = this.getContext();
+  getDerivedSubstitutions(derivedSubstitutions = []) {
+    const context = this.getContext();
 
-      derivedSubstitutions = context.getDerivedSubstitutions();
+    push(derivedSubstitutions, this.derivedSubstitutions);
 
-      derivedSubstitutions = [ ///
-        ...this.derivedSubstitutions,
-        ...derivedSubstitutions
-      ]
-    } else {
-      derivedSubstitutions = this.derivedSubstitutions;
-    }
+    context.getDerivedSubstitutions(derivedSubstitutions);
 
     return derivedSubstitutions;
   }
 
-  getSoleDerivedSubstitution(nested = true) {
+  getSoleDerivedSubstitution() {
     let soleDerivedSubstitution = null;
 
-    const derivedSubstitutions = this.getDerivedSubstitutions(nested),
-          derivedSubstitutionsLength = derivedSubstitutions.length;
+    const derivedSubstitutionsLength = this.derivedSubstitutions.length;
 
     if (derivedSubstitutionsLength === 1) {
-      const firstDerivedSubstitution = first(derivedSubstitutions);
+      const firstDerivedSubstitution = first(this.derivedSubstitutions);
 
       soleDerivedSubstitution = firstDerivedSubstitution; ///
     }
@@ -49,10 +39,10 @@ export default class LiminalContext extends Context {
     return soleDerivedSubstitution;
   }
 
-  getSoleNonTrivialDerivedSubstitution(nested = true) {
+  getSoleNonTrivialDerivedSubstitution() {
     let soleNonTrivialDerivedSubstitution = null;
 
-    const soleDerivedSubstitution = this.getSoleDerivedSubstitution(nested);
+    const soleDerivedSubstitution = this.getSoleDerivedSubstitution();
 
     if (soleDerivedSubstitution !== null) {
       const soleDerivedSubstitutionNonTrivial = soleDerivedSubstitution.isNonTrivial();
@@ -151,16 +141,15 @@ export default class LiminalContext extends Context {
     if (empty) {
       qualifies = true;
     } else {
-      const nested = false,
-            soleDerivedSubstitution = this.getSoleDerivedSubstitution(nested);
+      const soleDerivedSubstitution = this.getSoleDerivedSubstitution();
 
       if (soleDerivedSubstitution !== null) {
         const { ReferenceDerivedSubstitution } = elements,
               context = this,
               referenceDerivedSubstitution = ReferenceDerivedSubstitution.fromAssumptionAndMetaLevelAssumption(assumption, metaLevelAssumption, context),
-              soleDerivedSubstitutionCompares = referenceDerivedSubstitution.compareDerivedSubstitution(soleDerivedSubstitution);
+              referenceDerivedSubstitutionComparesToSsoleDerivedSubstitution = referenceDerivedSubstitution.compareSubstitution(soleDerivedSubstitution);
 
-        if (soleDerivedSubstitutionCompares) {
+        if (referenceDerivedSubstitutionComparesToSsoleDerivedSubstitution) {
           qualifies = true;
         }
       }
@@ -186,10 +175,10 @@ export default class LiminalContext extends Context {
     return derivedSubstitution;
   }
 
-  findDerivedSubstitutions(callback, nested = true) {
+  findDerivedSubstitutions(callback) {
     let derivedSubstitutions;
 
-    derivedSubstitutions = this.getDerivedSubstitutions(nested);
+    derivedSubstitutions = this.getDerivedSubstitutions();
 
     derivedSubstitutions = find(derivedSubstitutions, callback);  ///
 

package/src/context/literal.js

@@ -17,20 +17,6 @@ export default class LiteralContext extends Context {
     return this.tokens;
   }
 
-  getLexer() {
-    const context = this.getContext(),
-          lexer = context.getLexer();
-
-    return lexer;
-  }
-
-  getParser() {
-    const context = this.getContext(),
-          parser = context.getParser();
-
-    return parser;
-  }
-
   setTokens(tokens) {
     this.tokens = tokens;
   }

package/src/context/mnemic.js

@@ -439,70 +439,6 @@ export default class MnemicContext extends Context {
     });
   }
 
-  addFrames(frames) {
-    frames.forEach((frame) => {
-      this.addFrame(frame);
-    });
-  }
-
-  addEqualities(equalities) {
-    equalities.forEach((equality) => {
-      this.addEquality(equality);
-    });
-  }
-
-  addJudgements(judgements) {
-    judgements.forEach((judgement) => {
-      this.addJudgement(judgement);
-    });
-  }
-
-  addAssertions(assertions) {
-    assertions.forEach((assertion) => {
-      this.addAssertion(assertion);
-    });
-  }
-
-  addStatements(statements) {
-    statements.forEach((statement) => {
-      this.addStatement(statement);
-    });
-  }
-
-  addReferences(references) {
-    references.forEach((reference) => {
-      this.addReference(reference);
-    });
-  }
-
-  addAssumptions(assumptions) {
-    assumptions.forEach((assumption) => {
-      this.addAssumption(assumption);
-    });
-  }
-
-  addMetavariables(metavariables) {
-    metavariables.forEach((metavariable) => {
-      this.addMetavariable(metavariable);
-    });
-  }
-
-  addSubstitutions(substitutions) {
-    ///
-  }
-
-  addDerivedSubstitutions(derivedSubstitutions) {
-    ///
-  }
-
-  findVariableByVariableNode(variableNode) {
-    const variableIdentifier = variableNode.getVariableIdentifier(),
-          declaredVariable = this.findDeclaredVariableByVariableIdentifier(variableIdentifier),
-          variable = declaredVariable;  ///
-
-    return variable;
-  }
-
   findTermByTermNode(termNode) {
     const terms = this.getTerms(),
           term = terms.find((term) => {
@@ -646,6 +582,14 @@ export default class MnemicContext extends Context {
     return substitution;
   }
 
+  findVariableByVariableNode(variableNode) {
+    const variableIdentifier = variableNode.getVariableIdentifier(),
+          declaredVariable = this.findDeclaredVariableByVariableIdentifier(variableIdentifier),
+          variable = declaredVariable;  ///
+
+    return variable;
+  }
+
   isTermPresentByTermNode(termNode) {
     const term = this.findTermByTermNode(termNode),
           termPresent = (term !== null);

package/src/context/synoptic.js

@@ -35,9 +35,11 @@ export default class SynopticContext extends Context {
   }
 
   getTerms(terms = []) {
+    const context = this.getContext();
+
     push(terms, this.terms);
 
-    this.context.getTerms(terms);
+    context.getTerms(terms);
 
     compressTerms(terms);
 
@@ -45,9 +47,11 @@ export default class SynopticContext extends Context {
   }
 
   getFrames(frames = []) {
+    const context = this.getContext();
+
     push(frames, this.frames);
 
-    this.context.getFrames(frames);
+    context.getFrames(frames);
 
     compressFrames(frames);
 
@@ -55,9 +59,11 @@ export default class SynopticContext extends Context {
   }
 
   getEqualities(equalities = []) {
+    const context = this.getContext();
+
     push(equalities, this.equalities);
 
-    this.context.getEqualities(equalities);
+    context.getEqualities(equalities);
 
     compressEqualities(equalities);
 
@@ -65,9 +71,11 @@ export default class SynopticContext extends Context {
   }
 
   getJudgements(judgements = []) {
+    const context = this.getContext();
+
     push(judgements, this.judgements);
 
-    this.context.getJudgements(judgements);
+    context.getJudgements(judgements);
 
     compressJudgements(judgements);
 
@@ -75,9 +83,11 @@ export default class SynopticContext extends Context {
   }
 
   getStatements(statements = []) {
+    const context = this.getContext();
+
     push(statements, this.statements);
 
-    this.context.getStatements(statements);
+    context.getStatements(statements);
 
     compressStatements(statements);
 
@@ -85,9 +95,11 @@ export default class SynopticContext extends Context {
   }
 
   getAssertions(assertions = []) {
+    const context = this.getContext();
+
     push(assertions, this.assertions);
 
-    this.context.getAssertions(assertions);
+    context.getAssertions(assertions);
 
     compressAssertions(assertions);
 
@@ -95,9 +107,11 @@ export default class SynopticContext extends Context {
   }
 
   getReferences(references = []) {
+    const context = this.getContext();
+
     push(references, this.references);
 
-    this.context.getReferences(references);
+    context.getReferences(references);
 
     compressReferences(references);
 
@@ -105,9 +119,11 @@ export default class SynopticContext extends Context {
   }
 
   getAssumptions(assumptions = []) {
+    const context = this.getContext();
+
     push(assumptions, this.assumptions);
 
-    this.context.getAssumptions(assumptions);
+    context.getAssumptions(assumptions);
 
     compressAssumptions(assumptions);
 
@@ -115,9 +131,11 @@ export default class SynopticContext extends Context {
   }
 
   getMetavariables(metavariables = []) {
+    const context = this.getContext();
+
     push(metavariables, this.metavariables);
 
-    this.context.getMetavariables(metavariables);
+    context.getMetavariables(metavariables);
 
     compressMetavariables(metavariables);
 
@@ -125,9 +143,11 @@ export default class SynopticContext extends Context {
   }
 
   getSubstitutions(substitutions = []) {
+    const context = this.getContext();
+
     push(substitutions, this.substitutions);
 
-    this.context.getSubstitutions(substitutions);
+    context.getSubstitutions(substitutions);
 
     compressSubstitutions(substitutions);
 
@@ -135,9 +155,11 @@ export default class SynopticContext extends Context {
   }
 
   getDerivedSubstitutions(derivedSubstitutions = []) {
+    const context = this.getContext();
+
     push(derivedSubstitutions, this.derivedSubstitutions);
 
-    this.context.getDerivedSubstitutions(derivedSubstitutions);
+    context.getDerivedSubstitutions(derivedSubstitutions);
 
     return derivedSubstitutions;
   }
@@ -286,6 +308,10 @@ export default class SynopticContext extends Context {
   }
 
   static fromContexts(...contexts) {
+    contexts = [  ///
+      ...contexts
+    ];
+
     const context = contexts.pop(),  ///
           terms = termsFromContexts(contexts),
           frames = framesFromContexts(contexts),

package/src/context.js

@@ -546,60 +546,6 @@ export default class Context extends ContextBase {
     context.addTerms(terms);
   }
 
-  addFrames(frames) {
-    const context = this.getContext();
-
-    context.addFrames(frames);
-  }
-
-  addEqualities(equalities) {
-    const context = this.getContext();
-
-    context.addEqualities(equalities);
-  }
-
-  addJudgements(judgements) {
-    const context = this.getContext();
-
-    context.addJudgements(judgements);
-  }
-
-  addAssertions(assertions) {
-    const context = this.getContext();
-
-    context.addAssertions(assertions);
-  }
-
-  addStatements(statements) {
-    const context = this.getContext();
-
-    context.addStatements(statements);
-  }
-
-  addReferences(references) {
-    const context = this.getContext();
-
-    context.addReferences(references);
-  }
-
-  addAssumptions(assumptions) {
-    const context = this.getContext();
-
-    context.addAssumptions(assumptions);
-  }
-
-  addMetavariables(metavariables) {
-    const context = this.getContext();
-
-    context.addMetavariables(metavariables);
-  }
-
-  addSubstitutions(substitutions) {
-    const context = this.getContext();
-
-    context.addSubstitutions(substitutions);
-  }
-
   addDerivedSubstitutions(derivedSubstitutions) {
     const context = this.getContext();
 

package/src/element/assumption/metaLevel.js

@@ -102,7 +102,7 @@ export default define(class MetaLevelAssumption extends Element {
         }
 
         if (validates) {
-          context.commit(this);
+          this.commit(context);
         }
       }, context);
     }
@@ -201,7 +201,7 @@ export default define(class MetaLevelAssumption extends Element {
   }
 
   unifyAssumption(assumption, context) {
-    let assumptionUnifies;
+    let assumptionUnifies = false;
 
     const assumptionString = assumption.getString(),  ///
           metaLevelAssumptionString = this.getString();

package/src/element/combinator.js

@@ -42,7 +42,7 @@ export default define(class Combinator extends Element {
       }
 
       if (validates) {
-        context.commit(this);
+        this.commit(context);
       }
     }, context)
 

package/src/element/conclusion.js

@@ -66,7 +66,7 @@ export default define(class Conclusion extends Element {
         }
 
         if (validates) {
-          context.commit(this);
+          this.commit(context);
         }
       }, context);
     }, context);

package/src/element/constructor.js

@@ -68,7 +68,7 @@ export default define(class Constructor extends Element {
       }
 
       if (validates) {
-        context.commit(this);
+        this.commit(context);
       }
     }, context);
 

package/src/element/deduction.js

@@ -66,7 +66,7 @@ export default define(class Deduction extends Element {
         }
 
         if (validates) {
-          context.commit(this);
+          this.commit(context);
         }
       }, context);
     }, context);

package/src/element/label.js

@@ -92,7 +92,7 @@ export default define(class Label extends Element {
       }
 
       if (validates) {
-        context.commit(this);
+        this.commit(context);
       }
     }, context);
 

package/src/element/metavariable.js

@@ -351,13 +351,13 @@ export default define(class Metavariable extends Element {
         }
       } else {
         const { FrameSubstitution } = elements,
-              frameSubstitution = FrameSubstitution.fromFrameAndMetavariable(frame, metavariable, context);
+              frameSubstitution = FrameSubstitution.fromFrameAndMetavariable(frame, metavariable, generalContext, specificContext);
 
-        frameSubstitution.validate(generalContext, specificContext);
+        frameSubstitution.validate(context);
 
         const derivedSubstitution = frameSubstitution;  ///
 
-        specificContext.addDerivedSubstitution(derivedSubstitution);
+        context.addDerivedSubstitution(derivedSubstitution);
 
         frameUnifies = true;
       }
@@ -406,14 +406,14 @@ export default define(class Metavariable extends Element {
       } else {
         const { StatementSubstitution } = elements,
               statementSubstitution = (substitution !== null) ?
-                                        StatementSubstitution.fromStatementMetavariableAndSubstitution(statement, metavariable, substitution, context) :
-                                          StatementSubstitution.fromStatementAndMetavariable(statement, metavariable, context);
+                                        StatementSubstitution.fromStatementMetavariableAndSubstitution(statement, metavariable, substitution, generalContext, specificContext) :
+                                          StatementSubstitution.fromStatementAndMetavariable(statement, metavariable, generalContext, specificContext);
 
-        statementSubstitution.validate(substitution, generalContext, specificContext);
+        statementSubstitution.validate(substitution, context);
 
         const derivedSubstitution = statementSubstitution;  ///
 
-        specificContext.addDerivedSubstitution(derivedSubstitution);
+        context.addDerivedSubstitution(derivedSubstitution);
 
         statementUnifies = true;
       }
@@ -456,13 +456,13 @@ export default define(class Metavariable extends Element {
         }
       } else {
         const { ReferenceSubstitution } = elements,
-              referenceSubstitution = ReferenceSubstitution.fromReferenceAndMetavariable(reference, metavariable, context);
+              referenceSubstitution = ReferenceSubstitution.fromReferenceAndMetavariable(reference, metavariable, generalContext, specificContext);
 
-        referenceSubstitution.validate(generalContext, specificContext);
+        referenceSubstitution.validate(context);
 
         const derivedSubstitution = referenceSubstitution;  ///
 
-        specificContext.addDerivedSubstitution(derivedSubstitution);
+        context.addDerivedSubstitution(derivedSubstitution);
 
         referenceUnifies = true;
       }

package/src/element/proofAssertion/premise.js

@@ -79,7 +79,7 @@ export default define(class Premise extends ProofAssertion {
         }
 
         if (validates) {
-          context.commit(this);
+          this.commit(context);
         }
       }, context);
     }, context);

package/src/element/proofAssertion/step.js

@@ -152,7 +152,7 @@ export default define(class Step extends ProofAssertion {
         }
 
         if (validates) {
-          context.commit(this);
+          this.commit(context);
         }
       }, context);
     }, context)

package/src/element/proofAssertion/supposition.js

@@ -79,7 +79,7 @@ export default define(class Supposition extends ProofAssertion {
         }
 
         if (validates) {
-          context.commit(this);
+          this.commit(context);
         }
       }, context);
     }, context);

package/src/element/reference.js

@@ -178,7 +178,7 @@ export default define(class Reference extends Element {
         }
 
         if (validates) {
-          context.commit(this);
+          this.commit(context);
         }
       }, context);
     }