occam-verify-cli 1.0.608 → 1.0.611

package/src/context/liminal.js

@@ -185,14 +185,14 @@ export default class LiminalContext extends Context {
     return substitutions;
   }
 
-  findSubstitutionByVariable(variable, generalContext, specifiContext) {
+  findSubstitutionByVariableIdentifier(variable) {
     const substitution = this.findSubstitution((substitution) => {
       const substitutionVariable = substitution.getVariable();
 
       if (substitutionVariable !== null) {
-        const substitutionVariableEqualToVariable = substitutionVariable.isEqualTo(variable);
+        const substitutionVariableMatchesVariableIdentifier = substitutionVariable.matchVariableIdentifier(variableIdentifier);
 
-        if (substitutionVariableEqualToVariable) {
+        if (substitutionVariableMatchesVariableIdentifier) {
           return true;
         }
       }
@@ -201,16 +201,12 @@ export default class LiminalContext extends Context {
     return substitution;
   }
 
-  findSubstitutionByMetavariable(metavariable, generalContext, specificContext) {
+  findSubstitutionByMetavariableName(metavariableName) {
     const substitution = this.findSubstitution((substitution) => {  ///
-      const substitutionMetavariable = substitution.getMetavariable(generalContext, specificContext);
+      const substitutionMatchesMetavariableName = substitution.matchMetavariableName(metavariableName);
 
-      if (substitutionMetavariable !== null) {
-        const substitutionMetavvariableComparesToMetavariable = substitutionMetavariable.compare(metavariable);
-
-        if (substitutionMetavvariableComparesToMetavariable) {
-          return true;
-        }
+      if (substitutionMatchesMetavariableName) {
+        return true;
       }
     }) || null;
 
@@ -251,13 +247,13 @@ export default class LiminalContext extends Context {
     return complexSubstitutions;
   }
 
-  findSubstitutionByMetavariableAndSubstitution(metavariable, substitution, generalContet, specificContext) {
+  findSubstitutionByMetavariableNameAndSubstitution(metavariableName, substitution) {
     const substitutionA = substitution; ///
 
     substitution = this.findSubstitution((substitution) => {  ///
-      const substitutionMetavariablCompareslToMetavariable = substitution.compareMetavariable(metavariable);
+      const substitutionMatchesMetavariableName = substitution.matchMetavariableName(metavariableName);
 
-      if (substitutionMetavariablCompareslToMetavariable) {
+      if (substitutionMatchesMetavariableName) {
         const substitutionB = substitution, ///
               substitutionBSubstitutionComparesToSubstitutionA = substitutionB.compare(substitutionA);
 
@@ -277,8 +273,8 @@ export default class LiminalContext extends Context {
     return simpleSubstitutionPresent;
   }
 
-  isSubstitutionPresentByMetavariableAndSubstitution(metavariable, substitution, generalContet, specificContext) {
-    substitution = this.findSubstitutionByMetavariableAndSubstitution(metavariable, substitution, generalContet, specificContext);  ///
+  isSubstitutionPresentByMetavariableNameAndSubstitution(metavariableName, substitution) {
+    substitution = this.findSubstitutionByMetavariableNameAndSubstitution(metavariableName, substitution);  ///
 
     const substitutionPresent = (substitution !== null);
 

package/src/context/scoped.js

@@ -159,7 +159,8 @@ class ScopedContext extends Context {
     let judgementAdded = false;
 
     const metavariable = judgement.getMetavariable(),
-          judgementPresent = this.isJudgementPresentByMetavariable(metavariable);
+          metavariableName = metavariable.getMetavariableName(),
+          judgementPresent = this.isJudgementPresentByMetavariableName(metavariableName);
 
     if (!judgementPresent) {
       this.judgements.push(judgement);
@@ -183,10 +184,10 @@ class ScopedContext extends Context {
 
   findEquivalenceByTerm(term) { return this.equivalences.findEquivalenceByTerm(term); }
 
-  findJudgementByMetavariable(metavariable) {
+  findJudgementByMetavariableName(metavariableName) {
     const judgements = this.getJudgements(),
           judgement = judgements.find((judgement) => {
-            const judgementMetavariableComparesToMetavariable = judgement.compareMetavariable(metavariable);
+            const judgementMetavariableComparesToMetavariable = judgement.matchMetavariableName(metavariableName);
 
             if (judgementMetavariableComparesToMetavariable) {
               return true;
@@ -230,8 +231,8 @@ class ScopedContext extends Context {
     return termGrounded;
   }
 
-  isJudgementPresentByMetavariable(metavariable) {
-    const judgement = this.findJudgementByMetavariable(metavariable),
+  isJudgementPresentByMetavariableName(metavariableName) {
+    const judgement = this.findJudgementByMetavariableName(metavariableName),
           judgementPresent = (judgement !== null);
 
     return judgementPresent;

package/src/context.js

@@ -123,16 +123,16 @@ export default class Context extends ContextBase {
     return topLevelAssertion;
   }
 
-  findSubstitutionByVariable(variable, generalContext, specificContext) {
+  findSubstitutionByVariableIdentifier(variableIdentifier) {
     const context = this.getContext(),
-          substitution = context.findSubstitutionByVariable(variable, generalContext, specificContext);
+          substitution = context.findSubstitutionByVariableIdentifier(variableIdentifier);
 
     return substitution;
   }
 
-  findSubstitutionByMetavariable(metavariable, generalContet, specificContext) {
+  findSubstitutionByMetavariableName(metavariableName) {
     const context = this.getContext(),
-          substitution = context.findSubstitutionByMetavariable(metavariable, generalContet, specificContext);
+          substitution = context.findSubstitutionByMetavariableName(metavariableName);
 
     return substitution;
   }
@@ -158,10 +158,10 @@ export default class Context extends ContextBase {
     return simpleSubstitution;
   }
 
-  findSubstitutionByMetavariableAndSubstitution(metavariable, substitution, generalContet, specificContext) {
+  findSubstitutionByMetavariableNameAndSubstitution(metavariableName, substitution) {
     const context = this.getContext();
 
-    substitution = context.findSubstitutionByMetavariableAndSubstitution(metavariable, substitution, generalContet, specificContext); ///
+    substitution = context.findSubstitutionByMetavariableNameAndSubstitution(metavariableName, substitution); ///
 
     return substitution;
   }
@@ -180,9 +180,9 @@ export default class Context extends ContextBase {
     return framePresent;
   }
 
-  isJudgementPresentByMetavariable(metavariable) {
+  isJudgementPresentByMetavariableName(metavariableName) {
     const context = this.getContext(),
-          judgementPresent = context.isJudgementPresentByMetavariable(metavariable);
+          judgementPresent = context.isJudgementPresentByMetavariableName(metavariableName);
 
     return judgementPresent;
   }

package/src/element/assertion/defined.js

@@ -189,7 +189,8 @@ function validateWhenDerived(term, frame, negated, generalContext, specificConte
   const context = specificContext;  ///
 
   if (term !== null) {
-    const variable = term.getVariable(generalContext, specificContext),
+    const variableIdentifier = term.getVariableIdentifier(),
+          variable = context.findVariableByVariableIdentifier(variableIdentifier),
           variableDefined = isVariableDefined(variable, context);
 
     if (!negated && variableDefined) {
@@ -202,7 +203,8 @@ function validateWhenDerived(term, frame, negated, generalContext, specificConte
   }
 
   if (frame!== null) {
-    const metavariable = frame.getMetavariable(generalContext, specificContext),
+    const metavariableName = frame.getMetavariableName(),
+          metavariable = context.findMetavariableByMetavariableName(metavariableName),
           metavariableDefined = isMetavariableDefined(metavariable, context);
 
     if (!negated && metavariableDefined) {
@@ -237,7 +239,8 @@ function isVariableDefined(variable, context) {
 }
 
 function isMetavariableDefined(metavariable, context) {
-  const judgementPresent = context.isJudgementPresentByMetavariable(metavariable),
+  const metavariableName = metavariable.getNode(),
+        judgementPresent = context.isJudgementPresentByMetavariableName(metavariableName),
         metavariableDefined = judgementPresent; ///
 
   return metavariableDefined

package/src/element/frame.js

@@ -23,13 +23,6 @@ export default define(class Frame extends Element {
     return this.metavariable;
   }
 
-  getMetavariableName() {
-    const node = this.getNode(),
-          metavariableName = node.getMetavariableName();
-
-    return metavariableName;
-  }
-
   getFrameNode() {
     const node = this.getNode(),
           frameNode = node; ///
@@ -37,26 +30,18 @@ export default define(class Frame extends Element {
     return frameNode;
   }
 
-  compareMetavariable(metavariable) {
-    let metavaraibleComparseTo = false;
-
-    const singular = this.isSingular();
-
-    if (singular) {
-      let metavariableName;
-
-      metavariableName = this.metavariable.getName();
-
-      const metavariableNameA = metavariableName ///
-
-      metavariableName = metavariable.getName();
+  getMetavariableName() {
+    const frameNode = this.getFrameNode(),
+          metavariableName = frameNode.getMetavariableName();
 
-      const metavariableNameB = metavariableName; ///
+    return metavariableName;
+  }
 
-      metavaraibleComparseTo = (metavariableNameA === metavariableNameB);
-    }
+  getMetavariableNode() {
+    const frameNode = this.getFrameNode(),
+          metavariableNode = frameNode.getMetavariableNode();
 
-    return metavaraibleComparseTo;
+    return metavariableNode;
   }
 
   matchFrameNode(frameNode) {
@@ -88,13 +73,30 @@ export default define(class Frame extends Element {
   }
 
   isSingular() {
-    const node = this.getNode(),
-          frameNode = node, ///
+    const frameNode = this.getFrameNode(),
           singular = frameNode.isSingular();
 
     return singular;
   }
 
+  matchMetavariableName(metavariableName) {
+    let metavariableNameMatches = false;
+
+    const singular = this.isSingular();
+
+    if (singular) {
+      const metavariableNameA = metavariableName ///
+
+      metavariableName = this.getMetavariableName();
+
+      const metavariableNameB = metavariableName; ///
+
+      metavariableNameMatches = (metavariableNameA === metavariableNameB);
+    }
+
+    return metavariableNameMatches;
+  }
+
   compareParameter(parameter) {
     let comparesToParamter = false;
 

package/src/element/judgement.js

@@ -31,7 +31,7 @@ export default define(class Judgement extends Element {
 
   getMetavariable() { return this.frame.getMetavariable(); }
 
-  compareMetavariable(metavariable) { return this.frame.compareMetavariable(metavariable); }
+  matchMetavariableName(metavariableName) { return this.frame.matchMetavariableName(metavariableName); }
 
   validate(assignments, stated, context) {
     let validates = false;

package/src/element/metavariable.js

@@ -39,6 +39,20 @@ export default define(class Metavariable extends Element {
     this.metaType = metaType;
   }
 
+  getMetavariableNode() {
+    const node = this.getNode(),
+          metavarialbeNode = node;  ///
+
+    return metavarialbeNode;
+  }
+
+  getMetavariableName() {
+    const metavarialbeNode = this.getMetavariableNode(),
+          metavariableName = metavarialbeNode.getMetavariableName();
+
+    return metavariableName;
+  }
+
   compare(metavariable) {
     const name = metavariable.getName(),
           comparesToMetavariable = (this.name === name);
@@ -169,10 +183,11 @@ export default define(class Metavariable extends Element {
     if (statementMetavariableUnifies) {
       statementUnifies = true;
     } else {
-      const substitutionPresent = context.isSubstitutionPresentByMetavariableAndSubstitution(metavariable, substitution);
+      const metavariableName = metavariable.getName(),
+            substitutionPresent = context.isSubstitutionPresentByMetavariableNameAndSubstitution(metavariableName, substitution);
 
       if (substitutionPresent) {
-        substitution = context.findSubstitutionByMetavariableAndSubstitution(metavariable, substitution, generalContet, specificContext); ///
+        substitution = context.findSubstitutionByMetavariableNameAndSubstitution(metavariableName, substitution); ///
 
         const substitutionComparesToStatement = substitution.compareStatement(statement, context);
 
@@ -295,8 +310,8 @@ export default define(class Metavariable extends Element {
           specificContextFilePath = specificContext.getFilePath();
 
     if (generalContextFilePath === specificContextFilePath) {
-      const metavariable = this,  ///
-            frameMetavariableComparesToMetvariable = frame.compareMetavariable(metavariable);
+      const metavariableName = this.getMetavariableName(),  ///
+            frameMetavariableComparesToMetvariable = frame.matchMetavariableName(metavariableName);
 
       if (frameMetavariableComparesToMetvariable) {
         frameMetavariableUnifies = true;

package/src/element/reference.js

@@ -53,6 +53,20 @@ export default define(class Reference extends Element {
     return equalTo;
   }
 
+  matchMetavariableName(metavariableName) {
+    let metavariableNameMatches = false;
+
+    const metavariableNameA = metavariableName ///
+
+    metavariableName = this.getMetavariableName();
+
+    const metavariableNameB = metavariableName; ///
+
+    metavariableNameMatches = (metavariableNameA === metavariableNameB);
+
+    return metavariableNameMatches;
+  }
+
   isValid(context) {
     const assertionNode = this.getReferenceNode(),
           assertionPresent = context.isReferencePresentByReferenceNode(assertionNode),

package/src/element/statement.js

@@ -49,6 +49,24 @@ export default define(class Statement extends Element {
     return equalTo;
   }
 
+  matchMetavariableName(metavariableName) {
+    let metavariableNameMatches = false;
+
+    const singular = this.isSingular();
+
+    if (singular) {
+      const metavariableNameA = metavariableName ///
+
+      metavariableName = this.getMetavariableName();
+
+      const metavariableNameB = metavariableName; ///
+
+      metavariableNameMatches = (metavariableNameA === metavariableNameB);
+    }
+
+    return metavariableNameMatches;
+  }
+
   isValid(context) {
     const statementNode = this.getStatementNode(),
           statementPresent = context.isStatementPresentByStatementNode(statementNode),

package/src/element/substitution/frame.js

@@ -38,20 +38,9 @@ export default define(class FrameSubstitution extends Substitution {
     return replacementNode;
   }
 
-  getMetavariable(generalContext, specificContext) {
-    let metavariable = null;
+  matchMetavariableName(metavariableName) { return this.targetFrame.matchMetavariableName(metavariableName); }
 
-    const targetFrameNode = this.targetFrame.getNode(),
-          metavariableName = targetFrameNode.getMetavariableName();
-
-    if (metavariableName !== null) {
-      const context = generalContext; ///
-
-      metavariable = context.findMetavariableByMetavariableName(metavariableName);
-    }
-
-    return metavariable;
-  }
+  getMetavariableName() { return this.targetFrame.getMetavariableName(); }
 
   isTrivial() {
     const targetFrameEqualToReplacementFrame = this.targetFrame.isEqualTo(this.replacementFrame),

package/src/element/substitution/reference.js

@@ -38,20 +38,9 @@ export default define(class ReferenceSubstitution extends Substitution {
     return replacementNode;
   }
 
-  getMetavariable(generalContext, specificContext) {
-    let metavariable = null;
+  getMetavariableName() { return this.targetReference.getMetavariableName(); }
 
-    const targetReferenceNode = this.targetReference.getNode(),
-          metavariableName = targetReferenceNode.getMetavariableName();
-
-    if (metavariableName !== null) {
-      const context = generalContext; ///
-
-      metavariable = context.findMetavariableByMetavariableName(metavariableName);
-    }
-
-    return metavariable;
-  }
+  matchMetavariableName(metavariableName) { return this.targetReference.matchMetavariableName(metavariableName); }
 
   isTrivial() {
     const targetReferenceEqualToReplacementReference = this.targetReference.isEqualTo(this.replacementReference),

package/src/element/substitution/statement.js

@@ -72,6 +72,10 @@ export default define(class StatementSubstitution extends Substitution {
     return simple;
   }
 
+  getMetavariableName() { return this.targetStatement.getMetavariableName(); }
+
+  matchMetavariableName(metavariableName) { return this.targetStatement.matchMetavariableName(metavariableName); }
+
   compareStatement(statement, context) {
     statement = stripBracketsFromStatement(statement, context); ///
 

package/src/element/substitution/term.js

@@ -39,19 +39,7 @@ export default define(class TermSubstitution extends Substitution {
     return replacementNode;
   }
 
-  getVariable(generalContext, specificContext) {
-    let variable = null;
-
-    const targetTermNode = this.targetTerm.getNode(),
-          variableIdentifier = targetTermNode.getVariableIdentifier();
-
-    if (variableIdentifier !== null) {
-      const context = specificContext;  ///
-      variable = context.findVariableByVariableIdentifier(variableIdentifier);
-    }
-
-    return variable;
-  }
+  getVariableIdentifier() { return this.targetTerm.getVariableIdentifier(); }
 
   isTrivial() {
     const targetTermEqualToReplacementTerm = this.targetTerm.isEqualTo(this.replacementTerm),

package/src/element/substitution.js

@@ -25,12 +25,6 @@ export default class Substitution extends Element {
     return primitive;
   }
 
-  getMetavariable(context) {
-    const metavariable = null;
-
-    return metavariable;
-  }
-
   getSubstitutionNode() {
     const node = this.getNode(),
           substitutionNode = node; ///
@@ -38,6 +32,18 @@ export default class Substitution extends Element {
     return substitutionNode;
   }
 
+  getNetavariableName() {
+    const metavariableName = null;
+
+    return metavariableName;
+  }
+
+  getVariableIdentifier() {
+    const variableIdentifier = null;
+
+    return variableIdentifier;
+  }
+
   matchSubstitutionNode(substitutionNode) {
     const substitutionNodeA = substitutionNode; ///
 

package/src/element/variable.js

@@ -113,7 +113,7 @@ export default define(class Variable extends Element {
     return typeValidates;
   }
 
-  unifyTerm(term, substitutions, generalContext, specificContext) {
+  unifyTerm(term, generalContext, specificContext) {
     let termUnifies = false;
 
     const context = specificContext,  ///
@@ -127,7 +127,9 @@ export default define(class Variable extends Element {
 
     variable = this; ///
 
-    substitution = substitutions.findSubstitutionByVariable(variable, generalContext, specificContext);
+    const variableIdentifier = variable.getIdentifier();
+
+    substitution = context.findSubstitutionByVariableIdentifier(variableIdentifier);
 
     if (substitution !== null) {
       const substitutionComparesToTerm = substitution.compareTerm(term, context);

package/src/process/unify.js

@@ -69,7 +69,7 @@ class MetaLevelPass extends ZipPass {
 
         const substitutionNode = statementNode.getSubstitutionNode(),
               substitution = (substitutionNode !== null) ?
-                               context.findSubstitutionBySubstitutionNode(substitutionNode, generalContext, specificContext) :
+                               context.findSubstitutionBySubstitutionNode(substitutionNode) :
                                  null;
 
         context = specificContext; ///

package/src/utilities/substitutions.js

@@ -16,7 +16,7 @@ export function termFromTermAndSubstitutions(term, generalContext, specificConte
             variable = generalContext.findVariableByVariableIdentifier(variableIdentifier);
 
       if (variable !== null) {
-        const substitution = specificContext.findSubstitutionByVariable(variable, generalContext, specificContext);
+        const substitution = specificContext.findSubstitutionByVariableIdentifier(variableIdentifier);
 
         if (substitution !== null) {
           const termSubstitution = substitution,  ///
@@ -43,7 +43,7 @@ export function frameFromFrameAndSubstitutions(frame, generalContext, specificCo
             metavariable = generalContext.findMetavariableByMetavariableName(metavariableName);
 
       if (metavariable !== null) {
-        const substitution = specificContext.findSubstitutionByMetavariable(metavariable, generalContext, specificContext);
+        const substitution = specificContext.findSubstitutionByMetavariableName(metavariableName);
 
         if (substitution !== null) {
           const frameSubstitution = substitution, ///
@@ -77,7 +77,7 @@ export function statementFromStatementAndSubstitutions(statement, generalContext
 
         specificContext = context;  ///
 
-        substitution = specificContext.findSubstitutionBySubstitutionNode(substitutionNode, generalContext, specificContext);
+        substitution = specificContext.findSubstitutionBySubstitutionNode(substitutionNode);
 
         context = generalContext; ///
 
@@ -91,8 +91,8 @@ export function statementFromStatementAndSubstitutions(statement, generalContext
 
       if (metavariable !== null) {
         substitution = (substitution !== null) ?
-                         specificContext.findSubstitutionByMetavariableAndSubstitution(metavariable, substitution, generalContext, specificContext) :
-                           specificContext.findSubstitutionByMetavariable(metavariable, generalContext, specificContext);
+                         specificContext.findSubstitutionByMetavariableNameAndSubstitution(metavariableName, substitution) :
+                           specificContext.findSubstitutionByMetavariableName(metavariableName);
 
         if (substitution !== null) {
           const statementSubstitution = substitution, ///
@@ -112,7 +112,8 @@ export function metavariablesFromSubstitutions(substitutions, generalContext, sp
 
   substitutions.forEach((substitution) => {
     const context = generalContext, ///
-          metavariable = substitution.getMetavariable(generalContext, specificContext);
+          metavariableName = substitution.getMetavariableName(),
+          metavariable = context.findMetavariableByMetavariableName(metavariableName);
 
     if (metavariable !== null) {
       metavariables.push(metavariable);