occam-verify-cli 1.0.438 → 1.0.444

package/src/element/premise.js

@@ -6,7 +6,6 @@ import TemporaryContext from "../context/temporary";
 import assignAssignments from "../process/assign";
 
 import { define } from "../elements";
-import { subproofAssertionFromStatement } from "../utilities/statement";
 import { termsFromJSON, framesFromJSON, statementFromJSON, procedureCallFromJSON, termsToTermsJSON, framesToFramesJSON, statementToStatementJSON, procedureCallToProcedureCallJSON } from "../utilities/json";
 
 export default define(class Premise extends Element {
@@ -25,8 +24,8 @@ export default define(class Premise extends Element {
     return this.procedureCall;
   }
 
-  validate(context) {
-    let validates = false;
+  verify(context) {
+    let verifies = false;
 
     const temporaryContext = TemporaryContext.fromNothing(context);
 
@@ -35,53 +34,56 @@ export default define(class Premise extends Element {
     const node = this.getNode(),
           premiseString = this.getString(); ///
 
-    context.trace(`Validating the '${premiseString}' premise...`, node);
+    context.trace(`Verifying the '${premiseString}' premise...`, node);
 
-    if (false) {
-      ///
-    } else if (this.statement !== null) {
-      const stated = true,
-            assignments = [],
-            statementValidates = this.statement.validate(assignments, stated, context);
+    if ((this.statement === null) && (this.procedureCall === null)) {
+      context.debug(`Unable to verify the '${premiseString}' premise because it is nonsense.`, node);
+    } else {
+      if (this.statement !== null) {
+        const stated = true,
+              assignments = [],
+              statementValidates = this.statement.validate(assignments, stated, context);
 
-      if (statementValidates) {
-        const assignmentsAssigned = assignAssignments(assignments, context);
+        if (statementValidates) {
+          const assignmentsAssigned = assignAssignments(assignments, context);
 
-        if (assignmentsAssigned) {
-          const { Step } = elements,
-                step = Step.fromStatement(this.statement, context),
-                stepOrSubproof = step;  ///
+          if (assignmentsAssigned) {
+            const { Step } = elements,
+                  step = Step.fromStatement(this.statement, context),
+                  stepOrSubproof = step;  ///
 
-          context.addStepOrSubproof(stepOrSubproof);
+            context.addStepOrSubproof(stepOrSubproof);
 
-          validates = true;
+            verifies = true;
+          }
         }
       }
-    } else if (this.procedureCall !== null) {
-      const stated = true,
-            assignments = null,
-            procedureCallVerifies = this.procedureCall.verify(assignments, stated, context);
 
-      if (procedureCallVerifies) {
-        validates = true;
+      if (this.procedureCall !== null) {
+        const stated = true,
+              assignments = null,
+              procedureCallVerifies = this.procedureCall.verify(assignments, stated, context);
+
+        if (procedureCallVerifies) {
+          verifies = true;
+        }
       }
-    } else {
-      context.debug(`Unable to validate the '${premiseString}' premise because it is nonsense.`, node);
     }
 
-    if (validates) {
+    if (verifies) {
       this.setContext(context);
 
-      context.debug(`...validated the '${premiseString}' premise.`, node);
+      context.debug(`...verified the '${premiseString}' premise.`, node);
     }
 
-    return validates;
+    return verifies;
   }
 
   unifyIndependently(substitutions, context) {
     let unifiesIndependently = false;
 
-    const premiseString = this.getString(),  ///
+    const node = this.getNode(),
+          premiseString = this.getString(),  ///
           generalContext = this.context,  ///
           specificContext = context;  ///
 
@@ -146,22 +148,7 @@ export default define(class Premise extends Element {
     return stepOrSubproofUnifies;
   }
 
-  unifyStep(step, substitutions, context) {
-    let stepUnifies = false;
-
-    context = step.getContext();
-
-    const statement = step.getStatement(),
-          statementUnifies = this.unifyStatement(statement, substitutions, context);
-
-    if (statementUnifies) {
-      stepUnifies = true;
-    }
-
-    return stepUnifies;
-  }
-
-  unifySubproof(subproof, substitutions, generalContext, specificContext) {
+  unifySubproof(subproof, substitutions, context) {
     let subproofUnifies = false;
 
     const premise = this, ///
@@ -169,10 +156,18 @@ export default define(class Premise extends Element {
           premiseStatement = premise.getStatement(),
           premiseStatementString = premiseStatement.getString();
 
-    specificContext.trace(`Unifying the '${subproofString}' subproof with the premise's '${premiseStatementString}' statement...`);
+    context.trace(`Unifying the '${subproofString}' subproof with the premise's '${premiseStatementString}' statement...`);
+
+    const specificContext = context;  ///
+
+    context = this.getContext();
+
+    const generalContext = context; ///
+
+    context = specificContext;  ///
 
     if (this.statement !== null) {
-      const context = generalContext,
+      const context = generalContext, ///
             subproofAssertion = subproofAssertionFromStatement(this.statement, context);
 
       if (subproofAssertion !== null) {
@@ -181,33 +176,31 @@ export default define(class Premise extends Element {
     }
 
     if (subproofUnifies) {
-      specificContext.debug(`...unified the '${subproofString}' subproof with the premise's '${premiseStatementString}' statement.`);
+      context.debug(`...unified the '${subproofString}' subproof with the premise's '${premiseStatementString}' statement.`);
     }
 
     return subproofUnifies;
   }
 
-  unifyStatement(statement, substitutions, context) {
-    let statementUnifies;
+  unifyStep(step, substitutions, context) {
+    let stepUnifies = false;
 
-    const premise = this, ///
-          premiseString = premise.getString(),
-          statementString = statement.getString();
+    const specificContext = context;  ///
 
-    context.trace(`Unifying the '${statementString}' statement with the '${premiseString}' premise...`);
+    context = this.getContext();
 
-    if (this.statement !== null) {
-      const generalContext = this.context,  ///
-            specificContext = context;  ///
+    const generalContext = context; ///
 
-      statementUnifies = this.statement.unifyStatement(statement, substitutions, generalContext, specificContext);
-    }
+    context = specificContext;  ///
+
+    const statement = step.getStatement(),
+          statementUnifies = this.unifyStatement(statement, substitutions, generalContext, specificContext);
 
     if (statementUnifies) {
-      context.debug(`...unified the '${statementString}' statement with the '${premiseString}' premise.`);
+      stepUnifies = true;
     }
 
-    return statementUnifies;
+    return stepUnifies;
   }
 
   toJSON() {

package/src/element/property.js

@@ -20,16 +20,16 @@ export default define(class Property extends Element {
     return this.nominalTypeName;
   }
 
-  matchPropertyName(propertyName) {
-    const propertyNameMatches = (this.name === propertyName);
+  comparePropertyName(propertyName) {
+    const comparesToPropertyName = (this.name === propertyName);
 
-    return propertyNameMatches;
+    return comparesToPropertyName;
   }
 
-  matchNominalTypeName(nominalTypeName) {
-    const nominalTypeNameMatches = (this.nominalTypeName === nominalTypeName);
+  compareNominalTypeName(nominalTypeName) {
+    const comparesToNominalTypeName = (this.nominalTypeName === nominalTypeName);
 
-    return nominalTypeNameMatches;
+    return comparesToNominalTypeName;
   }
 
   toJSON() {

package/src/element/propertyRelation.js

@@ -27,9 +27,9 @@ export default define(class PropertyRelation extends Element {
 
     context.trace(`Verifying the '${propertyRelationString}' property relation...`);
 
-    const termVerifies = this.verifyTerm(context);
+    const termValidates = this.validateTerm(context);
 
-    if (termVerifies) {
+    if (termValidates) {
       const propertyVerifies = this.verifyProperty(context);
 
       verifies = propertyVerifies;
@@ -42,24 +42,24 @@ export default define(class PropertyRelation extends Element {
     return verifies;
   }
 
-  verifyTerm(context) {
-    let termVerifies;
+  validateTerm(context) {
+    let termValidates;
 
     const termString = this.term.getString();
 
-    context.trace(`Verifying the '${termString}' term...`);
+    context.trace(`Validating the '${termString}' term...`);
 
-    termVerifies = this.term.verify(context, () => {
+    termValidates = this.term.validate(context, () => {
       const verifiesAhead = true;
 
       return verifiesAhead;
     });
 
-    if (termVerifies) {
-      context.debug(`...verified the '${termString}' term.`);
+    if (termValidates) {
+      context.debug(`...validated the '${termString}' term.`);
     }
 
-    return termVerifies;
+    return termValidates;
   }
 
   verifyProperty(context) {
@@ -73,9 +73,9 @@ export default define(class PropertyRelation extends Element {
           propertyName = this.property.getName(),
           termTypeProperties = termType.getProperties(),
           variableTypeProperty = termTypeProperties.find((termTypeProperty) => {
-            const propertyNameMatches = termTypeProperty.matchPropertyName(propertyName);
+            const termTypePropertyComparesToPropertyName = termTypeProperty.comparePropertyName(propertyName);
 
-            if (propertyNameMatches) {
+            if (termTypePropertyComparesToPropertyName) {
               return true;
             }
           }) || null;

package/src/element/reference.js

@@ -4,7 +4,7 @@ import Element from "../element";
 import elements from "../elements";
 
 import { define } from "../elements";
-import { referenceMetaType } from ".//metaType";
+import { referenceMetaTypeFromNothing } from "../metaTypes";
 import { unifyMetavariableIntrinsically } from "../process/unify";
 import { metavariableFromJSON, metavariableToMetavariableJSON } from "../utilities/json";
 
@@ -35,19 +35,9 @@ export default define(class Reference extends Element {
 
   isMetavariableEqualToMetavariable(metavariable) { return this.metavariable.isEqualTo(metavariable); }
 
-  matchMetavariableName(metavariableName) { return this.metavariable.matchMetavariableName(metavariableName); }
+  compareMetavariableName(metavariableName) { return this.metavariable.compareMetavariableName(metavariableName); }
 
-  matchMetavariableNode(metavariableNode) {
-    const metavariableNodeA = metavariableNode; ///
-
-    metavariableNode = this.metavariable.getNode();
-
-    const metavariableNodeB = metavariableNode, ///
-          matches = metavariableNodeA.match(metavariableNodeB),
-          metavariableNodeMatches = matches;  ///
-
-    return metavariableNodeMatches; ///
-  }
+  matchMetavariableNode(metavariableNode) { return this.metavariable.matchNode(metavariableNode); }
 
   verify(context) {
     let verifies = false;
@@ -57,9 +47,9 @@ export default define(class Reference extends Element {
     context.trace(`Verifying the '${referenceString}' reference...`);
 
     if (!verifies) {
-      const metavariableVerifies = this.verifyMetavariable(context);
+      const metavariableValidates = this.validateMetavariable(context);
 
-      verifies = metavariableVerifies; ///
+      verifies = metavariableValidates; ///
     }
 
     if (!verifies) {
@@ -80,15 +70,16 @@ export default define(class Reference extends Element {
     return verifies;
   }
 
-  verifyMetavariable(context) {
-    let metavariableVerifies;
+  validateMetavariable(context) {
+    let metavariableValidates;
 
-    const metaType = referenceMetaType, ///
-          metavariableVerifiesGivenMetaType = this.metavariable.verifyGivenMetaType(metaType, context);
+    const referenceMetaType = referenceMetaTypeFromNothing(),
+          metaType = referenceMetaType, ///
+          metavariableValidatesGivenMetaType = this.metavariable.validateGivenMetaType(metaType, context);
 
-    metavariableVerifies = metavariableVerifiesGivenMetaType; ///
+    metavariableValidates = metavariableValidatesGivenMetaType; ///
 
-    return metavariableVerifies;
+    return metavariableValidates;
   }
 
   unifyLabel(label, substitutions, context) {

package/src/element/rule.js

@@ -42,16 +42,16 @@ export default define(class Rule extends Element {
     return this.conclusion;
   }
 
-  matchMetavariableName(metavariableName) {
-    const metavariableNameMatches = this.labels.some((label) => {
-      const metavariableNameMatches = label.matchMetavariableName(metavariableName);
+  compareMetavariableName(metavariableName) {
+    const comparesToMetavariableName = this.labels.some((label) => {
+      const labelComparesToMetavariableName = label.compareMetavariableName(metavariableName);
 
-      if (metavariableNameMatches) {
+      if (labelComparesToMetavariableName) {
         return true;
       }
     });
 
-    return metavariableNameMatches;
+    return comparesToMetavariableName;
   }
 
   verify() {
@@ -74,16 +74,17 @@ export default define(class Rule extends Element {
 
       context = localContext; ///
 
-      const premisesValidate = this.validatePremises(context);
+      const premisesVerify = this.verifyPremises(context);
 
-      if (premisesValidate) {
+      if (premisesVerify) {
         const conclusionVerifies = this.verifyConclusion(context);
 
         if (conclusionVerifies) {
           const proofVerifies = this.verifyProof(context);
 
           if (proofVerifies) {
-            const rule = this;  ///
+            const rule = this,  ///
+                  context = this.getContext();
 
             context.addRule(rule);
 
@@ -113,22 +114,22 @@ export default define(class Rule extends Element {
     return labelsVerify;
   }
 
-  validatePremises(context) {
-    const premisesValidate = this.premises.every((premise) => {
-      const premiseValidates = this.validatePremise(premise, context);
+  verifyPremises(context) {
+    const premisesVerify = this.premises.every((premise) => {
+      const premiseVerifies = this.verifyPremise(premise, context);
 
-      if (premiseValidates) {
+      if (premiseVerifies) {
         return true;
       }
     });
 
-    return premisesValidate;
+    return premisesVerify;
   }
 
-  validatePremise(premise, context) {
-    const premiseValidates = premise.validate(context);
+  verifyPremise(premise, context) {
+    const premiseVerifies = premise.verify(context);
 
-    return premiseValidates;
+    return premiseVerifies;
   }
 
   verifyConclusion(context) {

package/src/element/signature.js

@@ -27,7 +27,7 @@ export default define(class Signature extends Element {
 
     const signatureString = this.string;  ///
 
-    context.trace(`Verifying the ${signatureString} signature...`);
+    context.trace(`Verifying the '${signatureString}' signature...`);
 
     verifies = this.terms.every((term) => {
       const termVerifies = term.verify(context, () => {
@@ -42,13 +42,13 @@ export default define(class Signature extends Element {
     });
 
     if (verifies) {
-      context.debug(`...verified the ${signatureString} signature.`);
+      context.debug(`...verified the '${signatureString}' signature.`);
     }
 
     return verifies;
   }
 
-  match(signature, substitutions, generalContext, specificContext) {
+  compare(signature, substitutions, generalContext, specificContext) {
     const terms = signature.getTerms(),
           termsA = this.terms,  ///
           termsB = terms, ///
@@ -74,9 +74,10 @@ export default define(class Signature extends Element {
                 return true;
               }
             }
-          });
+          }),
+          compares = matches; ///
 
-    return matches;
+    return compares;
   }
 
   compareSubstitutions(substitutions, context) {
@@ -85,7 +86,7 @@ export default define(class Signature extends Element {
     const signatureString = this.string,  ///
           substitutionsString = substitutions.asString();
 
-    context.trace(`Comparing the '${substitutionsString}' substitutions against the ${signatureString} signature...`);
+    context.trace(`Comparing the '${substitutionsString}' substitutions against the '${signatureString}' signature...`);
 
     const array = substitutions.getArray(),
           compares = compare(this.terms, array, (term, substitution) => {
@@ -102,7 +103,7 @@ export default define(class Signature extends Element {
     }
 
     if (substitutionsCompares) {
-      context.debug(`...compared the '${substitutionsString}' substitutions against the ${signatureString} signature.`);
+      context.debug(`...compared the '${substitutionsString}' substitutions against the '${signatureString}' signature.`);
     }
 
     return substitutionsCompares;
@@ -114,7 +115,7 @@ export default define(class Signature extends Element {
     const signatureString = this.string,  ///
           substitutionsString = substitutions.asString();
 
-    context.trace(`Correlating the '${substitutionsString}' substitutions against the ${signatureString} signature...`);
+    context.trace(`Correlating the '${substitutionsString}' substitutions against the '${signatureString}' signature...`);
 
     const array = substitutions.getArray(),
           correlates = correlate(this.terms, array, (term, substitution) => {
@@ -131,7 +132,7 @@ export default define(class Signature extends Element {
     }
 
     if (substitutionsCorrelates) {
-      context.debug(`...correlated the '${substitutionsString}' substitutions against the ${signatureString} signature.`);
+      context.debug(`...correlated the '${substitutionsString}' substitutions against the '${signatureString}' signature.`);
     }
 
     return substitutionsCorrelates;

package/src/element/statement.js

@@ -3,10 +3,10 @@
 import { arrayUtilities } from "necessary";
 
 import Element from "../element";
-import validateMixins from "../mixins/statement/validate";
 
 import { define } from "../elements";
 import { unifyStatement } from "../process/unify";
+import { validateStatements } from "../utilities/validation";
 import { instantiateStatement } from "../process/instantiate";
 import { STATEMENT_META_TYPE_NAME } from "../metaTypeNames";
 
@@ -47,14 +47,13 @@ export default define(class Statement extends Element {
 
     context.trace(`Is the '${termString}' term contained in the '${statementString}' statement...`, node);
 
-    const termNode = term.getNode(),
-          statementNode = node, ///
+    const statementNode = node, ///
           statementNodeTermNodes = statementNode.getTermNodes();
 
     termContained = statementNodeTermNodes.some((statementNodeTermNode) => {  ///
-      const termNodeMatchesStatementNodeTermNode = termNode.match(statementNodeTermNode);
+      const statementNodeTermNodeMatches = term.matchNode(statementNodeTermNode);
 
-      if (termNodeMatchesStatementNodeTermNode) {
+      if (statementNodeTermNodeMatches) {
         return true;
       }
     });
@@ -75,14 +74,13 @@ export default define(class Statement extends Element {
 
     context.trace(`Is the '${frameString}' frame contained in the '${statementString}' statement...`, node);
 
-    const frameNode = frame.getNode(),
-          statementNode = node,
+    const statementNode = node,
           statementNodeFrameNodes = statementNode.getFrameNodes();
 
     frameContained = statementNodeFrameNodes.some((statementNodeFrameNode) => {  ///
-      const frameNodeMatchesStatementNodeFrameNode = frameNode.match(statementNodeFrameNode);
+      const statementNodeFrameNodeMatches = frame.matchNode(statementNodeFrameNode);
 
-      if (frameNodeMatchesStatementNodeFrameNode) {
+      if (statementNodeFrameNodeMatches) {
         return true;
       }
     });
@@ -124,11 +122,11 @@ export default define(class Statement extends Element {
 
     context.trace(`Validating the '${statementString}' statement...`, node);
 
-    validates = validateMixins.some((validateMixin) => {
+    validates = validateStatements.some((validateStatement) => {
       const statement = this, ///
-            validates = validateMixin(statement, assignments, stated, context);
+            statementValidates = validateStatement(statement, assignments, stated, context);
 
-      if (validates) {
+      if (statementValidates) {
         return true;
       }
     });
@@ -256,19 +254,19 @@ export default define(class Statement extends Element {
     return unifiesIndependently;
   }
 
-  equateWithStepsOrSubproofs(stepsOrSubproofs, context) {
-    let equatesWithStepsOrSubproofs;
+  compareStepsOrSubproofs(stepsOrSubproofs, context) {
+    let comparesToStepsOrSubproofs;
 
-    equatesWithStepsOrSubproofs = backwardsSome(stepsOrSubproofs, (stepOrSubproof) => {
+    comparesToStepsOrSubproofs = backwardsSome(stepsOrSubproofs, (stepOrSubproof) => {
       const statement = this, ///
-            statementUnifies = stepOrSubproof.equateWithStatement(statement, context);
+            stepOrSubproofComparesToStatement = stepOrSubproof.compareStatement(statement, context);
 
-      if (statementUnifies) {
+      if (stepOrSubproofComparesToStatement) {
         return true;
       }
     });
 
-    return equatesWithStepsOrSubproofs;
+    return comparesToStepsOrSubproofs;
   }
 
   toJSON() {