occam-verify-cli 1.0.617 → 1.0.632

package/src/context/file/nominal.js

@@ -10,6 +10,7 @@ import NominalParser from "../../nominal/parser";
 
 import { verifyFile } from "../../process/verify";
 import { baseTypeFromNothing } from "../../utilities/type";
+import { findMetaTypeByMetaTypeName } from "../../metaTypes";
 import { typesFromJSON,
          rulesFromJSON,
          axiomsFromJSON,
@@ -94,6 +95,7 @@ export default class NominalFileContext extends FileContext {
 
   getEquivalences() {
     const { Equivalences } = elements,
+          context = this, ///
           equivalences = Equivalences.fromNothing(context);
 
     return equivalences;
@@ -374,43 +376,40 @@ export default class NominalFileContext extends FileContext {
     this.trace(`Added the '${metavariableString}' metavariable to the '${filePath}' file context.`)
   }
 
-  findLabelByReference(reference, context) {
-    const labels = this.getLabels(),
-          label = labels.find((label) => {
-            const metavariableUnifies = label.unifyReference(reference, context);
+  findMetavariable(metavariable) {
+    const metavariables = this.getMetavariables(),
+          specificMetavariable = metavariable;  ///
 
-            if (metavariableUnifies) {
-              return true;
-            }
-          }) || null;
+    metavariable = metavariables.find((metavariable) => {
+      const context = this, ///
+            generalMetavariable = metavariable, ///
+            metavariableUnifies = generalMetavariable.unifyMetavariable(specificMetavariable, context);
 
-    return label;
+      if (metavariableUnifies) {
+        return true;
+      }
+    }) || null;
+
+    return metavariable;
   }
 
-  findMetaLemmaByReference(reference) {
-    const metaLemmas = this.getMetaLemmas(),
-          metaLemma = metaLemmas.find((metaLemma) => {
-            const metaLemmaComparesToReference = metaLemma.compareReference(reference);
+  findLabelByMetavariable(metavariable) {
+    const labels = this.getLabels(),
+          label = labels.find((label) => {
+            const labelMetavariableComparesToMetavariable = label.compareMetavariable(metavariable);
 
-            if (metaLemmaComparesToReference) {
+            if (labelMetavariableComparesToMetavariable) {
               return true;
             }
           }) || null;
 
-    return metaLemma;
+    return label;
   }
 
-  findMetatheoremByReference(reference) {
-    const metatheorems = this.getMetatheorems(),
-          metatheorem = metatheorems.find((metatheorem) => {
-            const metatheoremComparesToReference = metatheorem.compareReference(reference);
-
-            if (metatheoremComparesToReference) {
-              return true;
-            }
-          }) || null;
+  findMetaTypeByMetaTypeName(metaTypeName) {
+    const metaType = findMetaTypeByMetaTypeName(metaTypeName);
 
-    return metatheorem;
+    return metaType;
   }
 
   findRuleByReference(reference) {
@@ -469,17 +468,17 @@ export default class NominalFileContext extends FileContext {
     return theorem;
   }
 
-  findProcedureByProcedureName(procedureName) {
-    const procedures = this.getProcedures(),
-          procedure = procedures.find((procedure) => {
-            const nameMatches = procedure.matchName(procedureName);
+  findMetaLemmaByReference(reference) {
+    const metaLemmas = this.getMetaLemmas(),
+          metaLemma = metaLemmas.find((metaLemma) => {
+            const metaLemmaComparesToReference = metaLemma.compareReference(reference);
 
-            if (nameMatches) {
+            if (metaLemmaComparesToReference) {
               return true;
             }
           }) || null;
 
-    return procedure;
+    return metaLemma;
   }
 
   findConjectureByReference(reference) {
@@ -512,6 +511,19 @@ export default class NominalFileContext extends FileContext {
     return metaLemmas;
   }
 
+  findMetatheoremByReference(reference) {
+    const metatheorems = this.getMetatheorems(),
+      metatheorem = metatheorems.find((metatheorem) => {
+        const metatheoremComparesToReference = metatheorem.compareReference(reference);
+
+        if (metatheoremComparesToReference) {
+          return true;
+        }
+      }) || null;
+
+    return metatheorem;
+  }
+
   findMetatheoremsByReference(reference) {
     const metatheorems = this.getMetatheorems();
 
@@ -528,6 +540,16 @@ export default class NominalFileContext extends FileContext {
     return metatheorems;
   }
 
+  findTopLevelAssertionByReference(reference) {
+    const axiom = this.findAxiomByReference(reference),
+          lemma = this.findLemmaByReference(reference),
+          theorem = this.findTheoremByReference(reference),
+          conjecture = this.findConjectureByReference(reference),
+          topLevelAssertion = (axiom || lemma || theorem || conjecture);
+
+    return topLevelAssertion;
+  }
+
   findTopLevelMetaAssertionByReference(reference) {
     const metaLemma = this.findMetaLemmaByReference(reference),
           metatheorem = this.findMetatheoremByReference(reference),
@@ -547,33 +569,6 @@ export default class NominalFileContext extends FileContext {
     return topLevelMetaAssertions;
   }
 
-  findTopLevelAssertionByReference(reference) {
-    const axiom = this.findAxiomByReference(reference),
-          lemma = this.findLemmaByReference(reference),
-          theorem = this.findTheoremByReference(reference),
-          conjecture = this.findConjectureByReference(reference),
-          topLevelAssertion = (axiom || lemma || theorem || conjecture);
-
-    return topLevelAssertion;
-  }
-
-  findMetavariable(metavariable) {
-    const metavariables = this.getMetavariables(),
-          specificMetavariable = metavariable;  ///
-
-    metavariable = metavariables.find((metavariable) => {
-      const context = this, ///
-            generalMetavariable = metavariable, ///
-            metavariableUnifies = generalMetavariable.unifyMetavariable(specificMetavariable, context);
-
-      if (metavariableUnifies) {
-        return true;
-      }
-    }) || null;
-
-    return metavariable;
-  }
-
   findTypeByTypeName(typeName, includeRelease = true, includeDependencies = true) {
     let types = this.getTypes(includeRelease, includeDependencies);
 
@@ -650,19 +645,6 @@ export default class NominalFileContext extends FileContext {
     return typePrefix;
   }
 
-  findVariableByVariableIdentifier(variableIdentifier) {
-    const variables = this.getVariables(),
-          variable = variables.find((variable) => {
-            const variableComparesToVariableIdentifier = variable.compareVariableIdentifier(variableIdentifier);
-
-            if (variableComparesToVariableIdentifier) {
-              return true;
-            }
-          }) || null;
-
-    return variable;
-  }
-
   findLabelByMetavariableName(metavariableName) {
     const labels = this.getLabels(),
           label = labels.find((label) => {
@@ -676,30 +658,30 @@ export default class NominalFileContext extends FileContext {
     return label;
   }
 
-  findLabelByMetavariable(metavariable) {
-    const labels = this.getLabels(),
-          label = labels.find((label) => {
-            const labelMetavariableComparesToMetavariable = label.compareMetavariable(metavariable);
+  findJudgementByMetavariableName(metavariableName) {
+    const judgements = this.getJudgements(),
+          judgement = judgements.find((judgement) => {
+            const judgementMetavariableComparesToMetavariable = judgement.compareMetavariableName(metavariableName);
 
-            if (labelMetavariableComparesToMetavariable) {
+            if (judgementMetavariableComparesToMetavariable) {
               return true;
             }
           }) || null;
 
-    return label;
+    return judgement;
   }
 
-  findJudgementByMetavariableName(metavariableName) {
-    const judgements = this.getJudgements(),
-          judgement = judgements.find((judgement) => {
-            const judgementMetavariableComparesToMetavariable = judgement.matchMetavariableName(metavariableName);
+  findVariableByVariableIdentifier(variableIdentifier) {
+    const variables = this.getVariables(),
+          variable = variables.find((variable) => {
+            const variableComparesToVariableIdentifier = variable.compareVariableIdentifier(variableIdentifier);
 
-            if (judgementMetavariableComparesToMetavariable) {
+            if (variableComparesToVariableIdentifier) {
               return true;
             }
           }) || null;
 
-    return judgement;
+    return variable;
   }
 
   findMetavariableByMetavariableName(metavariableName) {
@@ -715,6 +697,69 @@ export default class NominalFileContext extends FileContext {
     return metavariable;
   }
 
+  findProcedureByProcedureName(procedureName) {
+    const procedures = this.getProcedures(),
+          procedure = procedures.find((procedure) => {
+            const procedureComparesToProcedureName = procedure.compareProcedureName(procedureName);
+
+            if (procedureComparesToProcedureName) {
+              return true;
+            }
+          }) || null;
+
+    return procedure;
+  }
+
+  isMetavariablePresent(metavariable) {
+    metavariable = this.findMetavariable(metavariable);
+
+    const metavariablePresent = (metavariable !== null);
+
+    return metavariablePresent;
+  }
+
+  isLabelPresentByMetavariable(metavariable) {
+    const label = this.findLabelByMetavariable(metavariable),
+          labelPresent = (label !== null);
+
+    return labelPresent;
+  }
+
+  isLabelPresentByReference(reference) {
+    const labels = this.getLabels(),
+          labelPresent = labels.some((label) => {
+            const context = this, ///
+              labelUnifies = reference.unifyLabel(label, context);
+
+            if (labelUnifies) {
+              return true;
+            }
+          });
+
+    return labelPresent;
+  }
+
+  isMetavariablePresentByReference(reference) {
+    const metavariables = this.getMetavariables(),
+          metavariablePresent = metavariables.some((metavariable) => {
+            const context = this, ///
+              metavariableUnifies = reference.unifyMetavariable(metavariable, context);
+
+            if (metavariableUnifies) {
+              return true;
+            }
+          });
+
+    return metavariablePresent;
+  }
+
+  isTopLevelMetaAssertionPresentByReference(reference) {
+    const topLevelMetaAssertion = this.findTopLevelMetaAssertionByReference(reference),
+          topLevelMetaAssertionPresent = (topLevelMetaAssertion !== null);
+
+    return topLevelMetaAssertionPresent;
+  }
+
   isTypePresentByTypeName(typeName, includeRelease = true, includeDependencies = true) {
     const type = this.findTypeByTypeName(typeName, includeRelease, includeDependencies),
           typePresent = (type !== null);
@@ -736,6 +781,13 @@ export default class NominalFileContext extends FileContext {
     return typePresent;
   }
 
+  isLabelPresentByMetavariableName(metavariableName) {
+    const label = this.findLabelByMetavariableName(metavariableName),
+          labelPresent = (label !== null);
+
+    return labelPresent;
+  }
+
   isTypePrefixPresentByTypePrefixName(typePrefixName) {
     const typePrefix = this.findTypePrefixByTypePrefixName(typePrefixName),
           typePrefixPresent = (typePrefix !== null);
@@ -750,20 +802,6 @@ export default class NominalFileContext extends FileContext {
     return variablePresent;
   }
 
-  isLabelPresentByMetavariableName(metavariableName) {
-    const label = this.findLabelByMetavariableName(metavariableName),
-          labelPresent = (label !== null);
-
-    return labelPresent;
-  }
-
-  isLabelPresentByMetavariable(metavariable) {
-    const label = this.findLabelByMetavariable(metavariable),
-          labelPresent = (label !== null);
-
-    return labelPresent;
-  }
-
   isMetavariablePresentByMetavariableName(metavariableName) {
     const metavariable = this.findMetavariableByMetavariableName(metavariableName),
           metavariablePresent = (metavariable !== null);
@@ -771,14 +809,6 @@ export default class NominalFileContext extends FileContext {
     return metavariablePresent;
   }
 
-  isMetavariablePresent(metavariable) {
-    metavariable = this.findMetavariable(metavariable);
-
-    const metavariablePresent = (metavariable !== null);
-
-    return metavariablePresent;
-  }
-
   isProcedurePresentByProcedureName(procedureName) {
     const procedure = this.findProcedureByProcedureName(procedureName),
           procedurePresent = (procedure !== null);
@@ -786,41 +816,6 @@ export default class NominalFileContext extends FileContext {
     return procedurePresent;
   }
 
-  isLabelPresentByReference(reference) {
-    const labels = this.getLabels(),
-          labelPresent = labels.some((label) => {
-            const context = this, ///
-                  labelUnifies = reference.unifyLabel(label, context);
-
-            if (labelUnifies) {
-              return true;
-            }
-          });
-
-    return labelPresent;
-  }
-
-  isMetavariablePresentByReference(reference) {
-    const metavariables = this.getMetavariables(),
-          metavariablePresent = metavariables.some((metavariable) => {
-            const context = this, ///
-                  metavariableUnifies = reference.unifyMetavariable(metavariable, context);
-
-            if (metavariableUnifies) {
-              return true;
-            }
-          });
-
-    return metavariablePresent;
-  }
-
-  isTopLevelMetaAssertionPresentByReference(reference) {
-    const topLevelMetaAssertion = this.findTopLevelMetaAssertionByReference(reference),
-          topLevelMetaAssertionPresent = (topLevelMetaAssertion !== null);
-
-    return topLevelMetaAssertionPresent;
-  }
-
   clear() {
     this.types = [];
     this.rules = [];
@@ -875,7 +870,7 @@ export default class NominalFileContext extends FileContext {
 
   async verifyFile() {
     const node = this.getNode(),
-          context = this,
+          context = this, ///
           fileNode = node,  ///
           fileVerifies = await verifyFile(fileNode, context);
 

package/src/context/liminal.js

@@ -96,19 +96,16 @@ export default class LiminalContext extends Context {
           metavariableNames = metavariableNamesFromSubstitutions(substitutions);
 
     metavariableNames.forEach((metavariableName) => {
-      const complexSubstitutions = this.findComplexSubstitutionsByMetavariableName(metavariableName),
-            complexSubstitutionsResolved = complexSubstitutions.every((complexSubstitution) => {
-              const substitution = complexSubstitution, ///
-                    resolved = substitution.isResolved();
+      const complexSubstitutions = this.findComplexSubstitutionsByMetavariableName(metavariableName);
 
-              if (!resolved) {
-                substitution.resolve(generalContext, specificContext);
-              }
-            });
+      complexSubstitutions.forEach((complexSubstitution) => {
+        const substitution = complexSubstitution, ///
+              resolved = substitution.isResolved();
 
-      if (complexSubstitutionsResolved) {
-        return true;
-      }
+        if (!resolved) {
+          substitution.resolve(generalContext, specificContext);
+        }
+      });
     });
   }
 
@@ -143,9 +140,9 @@ export default class LiminalContext extends Context {
     context.addSubstitutions(this.substitutions);
   }
 
-  findSubstitution(callback, generalContext, specificContext) {
+  findSubstitution(callback) {
     const substitutions = this.getSubstitutions(),
-          substitution = substitutions.find(callback, generalContext, specificContext);
+          substitution = substitutions.find(callback);
 
     return substitution;
   }
@@ -160,16 +157,12 @@ export default class LiminalContext extends Context {
     return substitutions;
   }
 
-  findSubstitutionByVariableIdentifier(variable) {
+  findSubstitutionByVariableIdentifier(variableIdentifier) {
     const substitution = this.findSubstitution((substitution) => {
-      const substitutionVariable = substitution.getVariable();
+      const substitutionComparesToVariableIdentifier = substitution.compareVariableIdentifier(variableIdentifier);
 
-      if (substitutionVariable !== null) {
-        const substitutionVariableMatchesVariableIdentifier = substitutionVariable.matchVariableIdentifier(variableIdentifier);
-
-        if (substitutionVariableMatchesVariableIdentifier) {
-          return true;
-        }
+      if (substitutionComparesToVariableIdentifier) {
+        return true;
       }
     }) || null;
 
@@ -177,13 +170,8 @@ export default class LiminalContext extends Context {
   }
 
   findSubstitutionByMetavariableName(metavariableName) {
-    const substitution = this.findSubstitution((substitution) => {  ///
-      const substitutionMatchesMetavariableName = substitution.matchMetavariableName(metavariableName);
-
-      if (substitutionMatchesMetavariableName) {
-        return true;
-      }
-    }) || null;
+    const simpleSubstitution = this.findSimpleSubstitutionByMetavariableName(metavariableName),
+          substitution = simpleSubstitution;  ///
 
     return substitution;
   }
@@ -194,9 +182,9 @@ export default class LiminalContext extends Context {
 
       if (substitutionSimple) {
         const simpleSubstitution = substitution,  ///
-              simpleSubstitutionMatchesMetavariableName = simpleSubstitution.matchMetavariableName(metavariableName);
+              simpleSubstitutionComparesToMetavariableName = simpleSubstitution.compareMetavariableName(metavariableName);
 
-        if (simpleSubstitutionMatchesMetavariableName) {
+        if (simpleSubstitutionComparesToMetavariableName) {
           return true;
         }
       }
@@ -211,9 +199,9 @@ export default class LiminalContext extends Context {
 
       if (substitutionComplex) {
         const complexSubstitution = substitution,  ///
-              complexSubstitutionMatchesMetavariableName = complexSubstitution.matchMetavariableName(metavariableName);
+              complexSubstitutionComparesToMetavariableName = complexSubstitution.compareMetavariableName(metavariableName);
 
-        if (complexSubstitutionMatchesMetavariableName) {
+        if (complexSubstitutionComparesToMetavariableName) {
           return true;
         }
       }
@@ -226,9 +214,9 @@ export default class LiminalContext extends Context {
     const substitutionA = substitution; ///
 
     substitution = this.findSubstitution((substitution) => {  ///
-      const substitutionMatchesMetavariableName = substitution.matchMetavariableName(metavariableName);
+      const substitutionComparesToMetavariableName = substitution.compareMetavariableName(metavariableName);
 
-      if (substitutionMatchesMetavariableName) {
+      if (substitutionComparesToMetavariableName) {
         const substitutionB = substitution, ///
               substitutionBSubstitutionComparesToSubstitutionA = substitutionB.compare(substitutionA);