occam-verify-cli 1.0.635 → 1.0.641

package/src/element/proofAssertion/step.js

@@ -66,7 +66,7 @@ export default define(class Step extends ProofAssertion {
     return comparesToTermAndPropertyRelation;
   }
 
-  validate(assignments, context) {
+  validate(context) {
     let validates = false;
 
     const stepString = this.getString(); ///
@@ -82,7 +82,7 @@ export default define(class Step extends ProofAssertion {
         const satisfiesAssertioValidates = this.validateSatisfiesAssertion(context);
 
         if (satisfiesAssertioValidates) {
-          const statementValidates = this.validateStatement(assignments, context);
+          const statementValidates = this.validateStatement(context);
 
           if (statementValidates) {
             validates = true;
@@ -109,7 +109,11 @@ export default define(class Step extends ProofAssertion {
 
       context.trace(`Validating the '${stepString}' step's '${referenceString}' reference... `);
 
-      referenceValidates = this.reference.validate(context);
+      const reference = this.reference.validate(context);
+
+      if (reference === null) {
+        referenceValidates = false;
+      }
 
       if (referenceValidates) {
         context.debug(`...validated the '${stepString}' step's '${referenceString}' reference. `);
@@ -124,17 +128,19 @@ export default define(class Step extends ProofAssertion {
 
     if (this.satisfiesAssertion !== null) {
       const stepString = this.getString(),  ///
-            satisfiesAssertion = this.satisfiesAssertion.getString();
+            satisfiesAssertionString = this.satisfiesAssertion.getString();
 
-      context.trace(`Validating the '${stepString}' step's '${satisfiesAssertion}' satisfies assertion... `);
+      context.trace(`Validating the '${stepString}' step's '${satisfiesAssertionString}' satisfies assertion... `);
 
       const stated = true,
-            assignments = null;
+            satisfiesAssertion = this.satisfiesAssertion.validate(stated, context);
 
-      satisfiesAssertionValidates = this.satisfiesAssertion.validate(assignments, stated, context);
+      if (satisfiesAssertion !== null) {
+        satisfiesAssertionValidates = true;
+      }
 
       if (satisfiesAssertionValidates) {
-        context.debug(`...validating the '${stepString}' step's '${satisfiesAssertion}' satisfies assertion. `);
+        context.debug(`...validating the '${stepString}' step's '${satisfiesAssertionString}' satisfies assertion. `);
       }
     }
 
@@ -173,7 +179,7 @@ export default define(class Step extends ProofAssertion {
     return unifiesWithSatisfiesAssertion;
   }
 
-  async verify(assignments, context) {
+  async verify(context) {
     let verifies = false;
 
     await this.break(context);
@@ -183,7 +189,7 @@ export default define(class Step extends ProofAssertion {
     context.trace(`Verifying the '${stepString}' step...`);
 
     await asyncAttempt(async (context) => {
-      const validates = this.validate(assignments, context);
+      const validates = this.validate(context);
 
       if (validates) {
         const unifies = await this.unify(context);

package/src/element/proofAssertion/supposition.js

@@ -30,7 +30,7 @@ export default define(class Supposition extends ProofAssertion {
     return stated;
   }
 
-  validate(assignments, context) {
+  validate(context) {
     let validates = false;
 
     const suppositionString = this.getString(); ///
@@ -43,13 +43,13 @@ export default define(class Supposition extends ProofAssertion {
     if (false) {
       ///
     } else if (statement !== null) {
-      const statementValidates = this.validateStatement(assignments, context);
+      const statementValidates = this.validateStatement(context);
 
       if (statementValidates) {
         validates = true;
       }
     } else if (procedureCall !== null) {
-      const procedureCallValidates = this.validateProcedureCall(assignments, context);
+      const procedureCallValidates = this.validateProcedureCall(context);
 
       if (procedureCallValidates) {
         validates = true;
@@ -65,7 +65,7 @@ export default define(class Supposition extends ProofAssertion {
     return validates;
   }
 
-  validateProcedureCall(assignments, context) {
+  validateProcedureCall(context) {
     let procedureCallValidates = false;
 
     const suppositionString = this.getString(), ///
@@ -216,7 +216,7 @@ export default define(class Supposition extends ProofAssertion {
     return subproofUnifies;
   }
 
-  async verify(assignments, context) {
+  async verify(context) {
     let verifies = false;
 
     await this.break(context);
@@ -226,7 +226,7 @@ export default define(class Supposition extends ProofAssertion {
     context.trace(`Verifying the '${suppositionString}' supposition...`);
 
     attempt((context) => {
-      const validates = this.validate(assignments, context);
+      const validates = this.validate(context);
 
       if (validates) {
         this.setContext(context);

package/src/element/proofAssertion.js

@@ -53,17 +53,20 @@ export default class ProofAssertion extends Element {
     return comparesToStatement;
   }
 
-  validateStatement(assignments, context) {
-    let statementValidates;
+  validateStatement(context) {
+    let statementValidates = false;
 
     const statementString = this.statement.getString(),
           proofAssertionString = this.getString();  ///
 
     context.trace(`Validating the '${proofAssertionString}' proof assertion's '${statementString}' statement... `);
 
-    const stated = this.isStated();
+    const stated = this.isStated(),
+          statement = this.statement.validate(stated, context);
 
-    statementValidates = this.statement.validate(assignments, stated, context);
+    if (statement !== null) {
+      statementValidates = true;
+    }
 
     if (statementValidates) {
       context.debug(`...validated the '${proofAssertionString}' proof assertion's '${statementString}' statement. `);

package/src/element/propertyRelation.js

@@ -50,18 +50,24 @@ export default define(class PropertyRelation extends Element {
   }
 
   validateTerm(context) {
-    let termValidates;
+    let termValidates = false;
 
     const termString = this.term.getString();
 
     context.trace(`Validating the '${termString}' term...`);
 
-    termValidates = this.term.validate(context, () => {
+    const term = this.term.validate(context, () => {
       const validatesForwards = true;
 
       return validatesForwards;
     });
 
+    if (term !== null) {
+      this.term = term;
+
+      termValidates = true;
+    }
+
     if (termValidates) {
       context.debug(`...validated the '${termString}' term.`);
     }

package/src/element/reference.js

@@ -54,12 +54,12 @@ export default define(class Reference extends Element {
     return equalTo;
   }
 
-  isValid(context) {
+  findValidRefernece(context) {
     const metavariableNode = this.getMetavariableNode(),
-          referencePresent = context.isReferencePresentByMetavariableNode(metavariableNode),
-          valid = referencePresent;  ///
+          reference = context.findReferenceByMetavariableNode(metavariableNode),
+          validReference = reference;  ///
 
-    return valid;
+    return validReference;
   }
 
   isEqualTo(reference) {
@@ -111,38 +111,48 @@ export default define(class Reference extends Element {
   matchMetavariableNode(metavariableNode) { return this.metavariable.matchMetavariableNode(metavariableNode); }
 
   validate(context) {
-    let validates = false;
+    let reference = null;
 
     const referenceString = this.getString(); ///
 
     context.trace(`Validating the '${referenceString}' reference...`);
 
-    if (!validates) {
-      const metavariableValidates = this.validateMetavariable(context);
+    const validRefernece = this.findValidRefernece(context);
 
-      if (metavariableValidates) {
-        validates = true;
+    if (validRefernece !== null) {
+      reference = validRefernece; ///
+
+      context.debug(`...the '${referenceString}' reference is alrady valid.`);
+    } else {
+      let validates = false;
+
+      if (!validates) {
+        const metavariableValidates = this.validateMetavariable(context);
+
+        if (metavariableValidates) {
+          validates = true;
+        }
       }
-    }
 
-    if (!validates) {
-      const reference = this, ///
-            labelPresent = context.isLabelPresentByReference(reference);
+      if (!validates) {
+        const reference = this, ///
+              labelPresent = context.isLabelPresentByReference(reference);
 
-      if (labelPresent) {
-        validates = true; ///
+        if (labelPresent) {
+          validates = true;
+        }
       }
-    }
 
-    if (validates) {
-      const reference = this; ///
+      if (validates) {
+        reference = this; ///
 
-      context.addReference(reference);
+        context.addReference(reference);
 
-      context.debug(`...validated the '${referenceString}' reference.`);
+        context.debug(`...validated the '${referenceString}' reference.`);
+      }
     }
 
-    return validates;
+    return reference;
   }
 
   validateMetavariable(context) {

package/src/element/rule.js

@@ -3,8 +3,6 @@
 import { arrayUtilities } from "necessary";
 import { Element, asynchronousUtilities } from "occam-languages";
 
-import assignAssignments from "../process/assign";
-
 import { define } from "../elements";
 import { asyncScope } from "../utilities/context";
 import { labelsFromJSON,
@@ -180,14 +178,13 @@ export default define(class Rule extends Element {
     context.trace(`Verifying the '${ruleString}' rule's premises...`);
 
     premisesVerify = await asyncForwardsEvery(this.premises, async (premise) => {
-      const assignments = [],
-            premiseVerifies = await premise.verify(assignments, context)
+      const premiseVerifies = await premise.verify(context)
 
       if (premiseVerifies) {
-        assignAssignments(assignments, context);
-
         const subproofOrProofAssertion = premise;  ////
 
+        context.assignAssignments();
+
         context.addSubproofOrProofAssertion(subproofOrProofAssertion);
 
         return true;

package/src/element/signature.js

@@ -28,23 +28,34 @@ export default define(class Signature extends Element {
   }
 
   verify(context) {
-    let verifies;
+    let verifies = false;
 
     const signatureString = this.getString();  ///
 
     context.trace(`Verifying the '${signatureString}' signature...`);
 
-    verifies = this.terms.every((term) => {
-      const termValidates = term.validate(context, () => {
-        const validatesForwards = true;
+    const terms = [],
+          termsValidate = this.terms.every((term) => {
+            term = term.validate(context, () => { ///
+              const validatesForwards = true;
 
-        return validatesForwards;
-      });
+              return validatesForwards;
+            });
 
-      if (termValidates) {
-        return true;
-      }
-    });
+            const termValidates = (term !== null);
+
+            if (termValidates) {
+              terms.push(term);
+
+              return true;
+            }
+          });
+
+    if (termsValidate) {
+      this.terms = terms;
+
+      verifies = true;
+    }
 
     if (verifies) {
       context.debug(`...verified the '${signatureString}' signature.`);

package/src/element/statement.js

@@ -62,12 +62,12 @@ export default define(class Statement extends Element {
     return comparesToMetavariableName;
   }
 
-  isValid(context) {
+  findValidStatment(context) {
     const statementNode = this.getStatementNode(),
-          statementPresent = context.isStatementPresentByStatementNode(statementNode),
-          valid = statementPresent;  ///
+          statement = context.findStatementByStatementNode(statementNode),
+          validStatement = statement;  ///
 
-    return valid;
+    return validStatement;
   }
 
   isEqualTo(statement) {
@@ -172,23 +172,23 @@ export default define(class Statement extends Element {
     return comparesToMetavariableName;
   }
 
-  validate(assignments, stated, context) {
-    let validates;
+  validate(stated, context) {
+    let statement = null;
 
     const statementString = this.getString();  ///
 
     context.trace(`Validating the '${statementString}' statement...`);
 
-    const valid = this.isValid(context);
+    const validStatement = this.findValidStatment(context);
 
-    if (valid) {
-      validates = true;
+    if (validStatement !== null) {
+      statement = validStatement; ///
 
       context.debug(`...the '${statementString}' statement is alrady valid.`);
     } else {
-      validates = validateStatements.some((validateStatement) => {
+      const validates = validateStatements.some((validateStatement) => {
         const statement = this, ///
-              statementValidates = validateStatement(statement, assignments, stated, context);
+              statementValidates = validateStatement(statement, stated, context);
 
         if (statementValidates) {
           return true;
@@ -196,7 +196,7 @@ export default define(class Statement extends Element {
       });
 
       if (validates) {
-        const statement = this; ///
+        statement = this; ///
 
         context.addStatement(statement);
 
@@ -204,10 +204,10 @@ export default define(class Statement extends Element {
       }
     }
 
-    return validates;
+    return statement;
   }
 
-  validateGivenMetaType(metaType, assignments, stated, context) {
+  validateGivenMetaType(metaType, stated, context) {
     let validatesGivenMetaType = false;
 
     const metaTypeString = metaType.getString(),
@@ -218,7 +218,7 @@ export default define(class Statement extends Element {
     const metaTypeName = metaType.getName();
 
     if (metaTypeName === STATEMENT_META_TYPE_NAME) {
-      const validates = this.validate(assignments, stated, context)
+      const validates = this.validate(stated, context)
 
       validatesGivenMetaType = validates; ///
     }

package/src/element/subDerivation.js

@@ -5,8 +5,6 @@ import { Element, asynchronousUtilities } from "occam-languages";
 
 import { define } from "../elements";
 
-import assignAssignments from "../process/assign";
-
 const { last } = arrayUtilities,
       { asyncEvery } = asynchronousUtilities;
 
@@ -39,11 +37,10 @@ export default define(class SubDerivation extends Element {
     let verifies;
 
     verifies = await asyncEvery(this.subproofOrProofAssertions, async (subproofOrProofAssertion) => { ///
-      const assignments = [],
-            subproofOrProofAssertionVarifies = await subproofOrProofAssertion.verify(assignments, context);
+      const subproofOrProofAssertionVarifies = await subproofOrProofAssertion.verify(context);
 
       if (subproofOrProofAssertionVarifies) {
-        assignAssignments(assignments, context);
+        context.assignAssignments();
 
         context.addSubproofOrProofAssertion(subproofOrProofAssertion);
 

package/src/element/subproof.js

@@ -54,14 +54,20 @@ export default define(class Subproof extends Element {
     return proofAssertion;
   }
 
-  async verify(assignments, context) {
+  async verify(context) {
     let verifies = false;
 
     await asyncScope(async () => {
-      const suppositionsVerify = asyncEvery(this.suppositions, async (supposition) => {
-        const suppositionVerifies = await supposition.verify(assignments, context);
+      const suppositionsVerify = await asyncEvery(this.suppositions, async (supposition) => {
+        const suppositionVerifies = await supposition.verify(context);
 
         if (suppositionVerifies) {
+          const subproofOrProofAssertion = supposition;  ////
+
+          context.assignAssignments(context);
+
+          context.addSubproofOrProofAssertion(subproofOrProofAssertion);
+
           return true;
         }
       });

package/src/element/substitution/frame.js

@@ -71,7 +71,7 @@ export default define(class FrameSubstitution extends Substitution {
   }
 
   validate(generalContext, specificContext) {
-    let validates = false;
+    let frameSubstitution = null;
 
     const context = this.getContext();
 
@@ -81,13 +81,15 @@ export default define(class FrameSubstitution extends Substitution {
 
     context.trace(`Validating the '${frameSubstitutionString}' frame substitution...`);
 
-    const valid = this.isValid(context);
+    const validSubstitution = this.findValidSubstiution(context);
 
-    if (valid) {
-      validates = true;
+    if (validSubstitution) {
+      frameSubstitution = validSubstitution;  ///
 
       context.debug(`...the '${frameSubstitutionString}' frame substitution is already valid.`);
     } else {
+      let validates = false;
+
       const targetFrameValidates = this.validateTargetFrame(generalContext, specificContext);
 
       if (targetFrameValidates) {
@@ -101,13 +103,15 @@ export default define(class FrameSubstitution extends Substitution {
       if (validates) {
         const substitution = this;  ///
 
+        frameSubstitution = substitution; ///
+
         context.addSubstitution(substitution);
 
         context.debug(`...validated the '${frameSubstitutionString}' frame substitution.`);
       }
     }
 
-    return validates;
+    return frameSubstitution;
   }
 
   validateTargetFrame(generalContext, specificContext) {
@@ -123,9 +127,13 @@ export default define(class FrameSubstitution extends Substitution {
 
     if (targetFrameSingular) {
       const stated = true,
-            assignments = null;
+            tragetFrame = this.targetFrame.validate(stated, context);
+
+      if (tragetFrame !== null) {
+        this.targetFrame = tragetFrame;
 
-      targetFrameValidates = this.targetFrame.validate(assignments, stated, context);
+        targetFrameValidates = true;
+      }
     } else {
       context.debug(`The '${frameSubstitutionString}' frame subtitution's '${targetFrameString}' target frame is not singular.`);
     }
@@ -147,9 +155,13 @@ export default define(class FrameSubstitution extends Substitution {
     context.trace(`Validating the '${frameSubstitutionString}' frame subtitution's '${replacementFrameString}' replacement frame...`);
 
     const stated = true,
-          assignments = null;
+          replacementFrame = this.replacementFrame.validate(stated, context);
+
+    if (replacementFrame !== null) {
+      this.replacementFrame = replacementFrame;
 
-    replacementFrameValidates = this.replacementFrame.validate(assignments, stated, context);
+      replacementFrameValidates = true;
+    }
 
     if (replacementFrameValidates) {
       context.debug(`...validated the '${frameSubstitutionString}' frame subtitution's '${replacementFrameString}' replacement frame.`);

package/src/element/substitution/reference.js

@@ -71,7 +71,7 @@ export default define(class ReferenceSubstitution extends Substitution {
   }
 
   validate(generalContext, specificContext) {
-    let validates = false;
+    let referenceSubstitution = null;
 
     const context = this.getContext();
 
@@ -81,13 +81,15 @@ export default define(class ReferenceSubstitution extends Substitution {
 
     context.trace(`Validating the '${referenceSubstitutionString}' reference substitution...`);
 
-    const valid = this.isValid(context);
+    const validSubstitution = this.findValidSubstiution(context);
 
-    if (valid) {
-      validates = true;
+    if (validSubstitution) {
+      referenceSubstitution = validSubstitution;  ///
 
       context.debug(`...the '${referenceSubstitutionString}' reference substitution is already valid.`);
     } else {
+      let validates = false;
+
       const targetReferenceValidates = this.validateTargetReference(generalContext, specificContext);
 
       if (targetReferenceValidates) {
@@ -101,13 +103,15 @@ export default define(class ReferenceSubstitution extends Substitution {
       if (validates) {
         const subsitution = this;  ///
 
+        referenceSubstitution = subsitution;  ///
+
         context.addSubstitution(subsitution);
 
         context.debug(`...validated the '${referenceSubstitutionString}' reference substitution.`);
       }
     }
 
-    return validates;
+    return referenceSubstitution;
   }
 
   validateTargetReference(generalContext, specificContext) {
@@ -122,7 +126,11 @@ export default define(class ReferenceSubstitution extends Substitution {
     const targetReferenceSingular = this.targetReference.isSingular();
 
     if (targetReferenceSingular) {
-      targetReferenceValidates = this.targetReference.validate(context);
+      const targetReference = this.targetReference.validate(context);
+
+      if (targetReference !== null) {
+        targetReferenceValidates = true;
+      }
     } else {
       context.debug(`The '${referenceSubstitutionString}' reference subtitution's '${targetReferenceString}' target reference is not singular.`);
     }
@@ -135,7 +143,7 @@ export default define(class ReferenceSubstitution extends Substitution {
   }
 
   validateReplacementReference(generalContext, specificContext) {
-    let replacementReferenceValidates;
+    let replacementReferenceValidates = false;
 
     const context = specificContext,  ///
           replacementReferenceString = this.replacementReference.getString(),
@@ -143,7 +151,11 @@ export default define(class ReferenceSubstitution extends Substitution {
 
     context.trace(`Validating the '${referenceSubstitutionString}' reference subtitution's '${replacementReferenceString}' replacement reference...`);
 
-    replacementReferenceValidates = this.replacementReference.validate(context);
+    const replacementReference = this.replacementReference.validate(context);
+
+    if (replacementReference !== null) {
+      replacementReferenceValidates = true;
+    }
 
     if (replacementReferenceValidates) {
       context.debug(`...validated the '${referenceSubstitutionString}' reference subtitution's '${replacementReferenceString}' replacement reference.`);