occam-verify-cli 1.0.724 → 1.0.728

package/src/element/substitution.js

@@ -23,15 +23,11 @@ export default class Substitution extends Element {
   }
 
   matchSubstitutionNode(substitutionNode) {
-    const substitutionNodeA = substitutionNode; ///
+    const node = substitutionNode, ///
+          nodeMatches = this.matchNode(node),
+          substitutionNodeMatches = nodeMatches; ///
 
-    substitutionNode = this.getSubstitutionNode();
-
-    const substitutionNodeB = substitutionNode, ///
-          substitutionNodeAAMatchesSubstitutionBNodeB = substitutionNodeA.match(substitutionNodeB),
-          equalTo = substitutionNodeAAMatchesSubstitutionBNodeB; ///
-
-    return equalTo;
+    return substitutionNodeMatches;
   }
 
   findValidSubstiution(context) {

package/src/element/term.js

@@ -42,15 +42,11 @@ export default define(class Term extends Element {
   }
 
   matchTermNode(termNode) {
-    const termNodeA = termNode; ///
+    const node = termNode, ///
+          nodeMatches = this.matchNode(node),
+          termNodeMatches = nodeMatches; ///
 
-    termNode = this.getTermNode();
-
-    const termNodeB = termNode, ///
-          termNodeAAMatchesTermBNodeB = termNodeA.match(termNodeB),
-          equalTo = termNodeAAMatchesTermBNodeB; ///
-
-    return equalTo;
+    return termNodeMatches;
   }
 
   compareVariableIdentifier(variableIdentifier) {

package/src/element/topLevelAssertion.js

@@ -1,8 +1,7 @@
 "use strict";
 
-import { Element } from "occam-languages";
 import { arrayUtilities } from "necessary";
-import { asynchronousUtilities } from "occam-languages";
+import { Element, asynchronousUtilities } from "occam-languages";
 
 import { asyncScope } from "../utilities/context";
 import { topLevelAssertionStringFromLabelsSuppositionsAndDeduction } from "../utilities/string";
@@ -259,6 +258,31 @@ export default class TopLevelAssertion extends Element {
     return deductionVerifies;
   }
 
+  async verifySupposition(supposition, context) {
+    let suppositionVerifies;
+
+    const suppositionString = supposition.getString(),
+          topLevelAssertionString = this.getString();  ///
+
+    context.trace(`Verifying the '${topLevelAssertionString}' top level assertion's '${suppositionString}' supposition...`);
+
+    suppositionVerifies = await supposition.verify(context)
+
+    if (suppositionVerifies) {
+      const subproofOrProofAssertion = supposition;  ////
+
+      context.assignAssignments();
+
+      context.addSubproofOrProofAssertion(subproofOrProofAssertion);
+    }
+
+    if (suppositionVerifies) {
+      context.debug(`...verified the '${topLevelAssertionString}' top level assertion's '${suppositionString}' supposition.`);
+    }
+
+    return suppositionVerifies;
+  }
+
   async verifySuppositions(context) {
     let suppositionsVerify;
 
@@ -267,15 +291,9 @@ export default class TopLevelAssertion extends Element {
     context.trace(`Verifying the '${topLevelAssertionString}' top level assertion's suppositions...`);
 
     suppositionsVerify = await asyncForwardsEvery(this.suppositions, async (supposition) => {
-      const suppositionVerifies = await supposition.verify(context)
+      const suppositionVerifies = await this.verifySupposition(supposition, context);
 
       if (suppositionVerifies) {
-        const subproofOrProofAssertion = supposition;  ////
-
-        context.assignAssignments();
-
-        context.addSubproofOrProofAssertion(subproofOrProofAssertion);
-
         return true;
       }
     });

package/src/element/topLevelMetaAssertion.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import { Element } from "occam-languages";
+import { Element, asynchronousUtilities } from "occam-languages";
 
 import { asyncScope } from "../utilities/context";
 import { labelFromJSON,
@@ -12,6 +12,8 @@ import { labelFromJSON,
          suppositionsToSuppositionsJSON,
          substitutionsToSubstitutionsJSON } from "../utilities/json";
 
+const { asyncForwardsEvery } = asynchronousUtilities;
+
 export default class TopLevelMetaAssertion extends Element {
   constructor(context, string, node, label, suppositions, deduction, proof, substitutions) {
     super(context, string, node);
@@ -144,29 +146,48 @@ export default class TopLevelMetaAssertion extends Element {
     return deductionVerifies;
   }
 
+  async verifySupposition(supposition, context) {
+    let suppositionVerifies;
+
+    const suppositionString = supposition.getString(),
+          topLevelMetaAssertionString = this.getString();  ///
+
+    context.trace(`Verifying the '${topLevelMetaAssertionString}' top level meta-assertion's '${suppositionString}' supposition...`);
+
+    suppositionVerifies = await supposition.verify(context)
+
+    if (suppositionVerifies) {
+      const subproofOrProofAssertion = supposition;  ////
+
+      context.assignAssignments();
+
+      context.addSubproofOrProofAssertion(subproofOrProofAssertion);
+    }
+
+    if (suppositionVerifies) {
+      context.debug(`...verified the '${topLevelMetaAssertionString}' top level meta-assertion's '${suppositionString}' supposition.`);
+    }
+
+    return suppositionVerifies;
+  }
+
   async verifySuppositions(context) {
     let suppositionsVerify;
 
     const topLevelMetaAssertionString = this.getString();  ///
 
-    context.trace(`Verifying the '${topLevelMetaAssertionString}' top level meta assertion's suppositions...`);
+    context.trace(`Verifying the '${topLevelMetaAssertionString}' top level meta-assertion's suppositions...`);
 
     suppositionsVerify = await asyncForwardsEvery(this.suppositions, async (supposition) => {
-      const suppositionVerifies = await supposition.verify(context)
+      const suppositionVerifies = await this.verifySupposition(supposition, context);
 
       if (suppositionVerifies) {
-        const subproofOrProofAssertion = supposition;  ////
-
-        context.assignAssignments();
-
-        context.addSubproofOrProofAssertion(subproofOrProofAssertion);
-
         return true;
       }
     });
 
     if (suppositionsVerify) {
-      context.debug(`...verified the '${topLevelMetaAssertionString}' top level meta assertion's suppositions.`);
+      context.debug(`...verified the '${topLevelMetaAssertionString}' top level meta-assertion's suppositions.`);
     }
 
     return suppositionsVerify;

package/src/utilities/element.js

@@ -520,7 +520,7 @@ export function equivalenceFromEquivalenceNode(equivalenceNode, context) {
 }
 
 export function metatheoremFromMetatheoremNode(metatheoremNode, context) {
-  const { Metatehorem } = elements,
+  const { Metatheorem } = elements,
         metaLemmaMetathoremNode = metatheoremNode,  ///
         proof = proofFromTopLevelMetaAssertionNode(metaLemmaMetathoremNode, context),
         label = labelFromTopLevelMetaAssertionNode(metaLemmaMetathoremNode, context),
@@ -530,24 +530,11 @@ export function metatheoremFromMetatheoremNode(metatheoremNode, context) {
         node = metatheoremNode, ///
         string = topLevelMetaAssertionString, ///
         substitutions = null,
-        metatheorem = new Metatehorem(context, string, node, label, suppositions, deduction, proof, substitutions);
+        metatheorem = new Metatheorem(context, string, node, label, suppositions, deduction, proof, substitutions);
 
   return metatheorem;
 }
 
-export function referencesFromMetavariableNode(metavariableNode, context) {
-  const { Reference } = elements,
-        node = metavariableNode, ///
-        string = context.nodeAsString(node),
-        metavariable = metavariableFromMetavariableNode(metavariableNode, context);
-
-  context = null;
-
-  const reference = new Reference(context, string, node, metavariable);
-
-  return reference
-}
-
 export function metavariableFromMetavariableNode(metavariableNode, context) {
   const { Metavariable } = elements,
         node = metavariableNode,  ///

package/src/utilities/unification.js

@@ -2,8 +2,6 @@
 
 import { arrayUtilities } from "necessary";
 
-import elements from "../elements";
-
 import { equalityFromStatement,
          judgementFromStatement,
          typeAssertionFromStatement,