occam-verify-cli 1.0.638 → 1.0.642

package/src/element/equality.js

@@ -120,13 +120,13 @@ export default define(class Equality extends Element {
   }
 
   validate(stated, context) {
-    let equality = false;
+    let equality = null;
 
     const equalityString = this.getString(); ///
 
     context.trace(`Validating the '${equalityString}' equality...`);
 
-    const validEquality = this.isValid(context);
+    const validEquality = this.findValidEquality(context);
 
     if (validEquality !== null) {
       equality = validEquality; ///
@@ -153,7 +153,7 @@ export default define(class Equality extends Element {
       }
 
       if (validates) {
-        const equality = this;  ///
+        equality = this;  ///
 
         this.assign(stated, context);
 
@@ -174,38 +174,36 @@ export default define(class Equality extends Element {
     context.trace(`Validating the '${equalityString}' equality's terms...`);
 
     let leftTerm,
-        rightTerm = null;
+        rightTerm;
 
     leftTerm = this.leftTerm.validate(context, () => {
-        let validatesForwards;
+        let validatesForwards = false;
 
         rightTerm = this.rightTerm.validate(context, () => {
-          let validatesForwards;
-
-          const leftTermType = this.leftTerm.getType(),
-                rightTermType = this.rightTerm.getType(),
-                leftTermTypeComparableToRightTermType = leftTermType.isComparableTo(rightTermType);
-
-          validatesForwards = leftTermTypeComparableToRightTermType;  ///
+          const validatesForwards = true;
 
           return validatesForwards;
         });
 
-        const rightTermValidates = (rightTerm !== null);
-
-        validatesForwards = rightTermValidates; ///
+        if (rightTerm !== null) {
+          validatesForwards = true;
+        }
 
         return validatesForwards;
       });
 
-    const leftTermValidates = (leftTerm !== null);
+    if (leftTerm !== null) {
+      const leftTermType = leftTerm.getType(),
+            rightTermType = rightTerm.getType(),
+            leftTermTypeComparableToRightTermType = leftTermType.isComparableTo(rightTermType);
 
-    if (leftTermValidates) {
-      this.leftTerm = leftTerm;
+      if (leftTermTypeComparableToRightTermType) {
+        this.leftTerm = leftTerm;
 
-      this.rightTerm = rightTerm;
+        this.rightTerm = rightTerm;
 
-      termsValidate = true;
+        termsValidate = true;
+      }
     }
 
     if (termsValidate) {

package/src/element/frame.js

@@ -64,7 +64,6 @@ export default define(class Frame extends Element {
     return validFrame;
   }
 
-
   isEqualTo(frame) {
     const frameNode = frame.getNode(),
           frameNodeMatches = this.matchFrameNode(frameNode),
@@ -225,7 +224,7 @@ export default define(class Frame extends Element {
     if (singular) {
       validatesWhenStated = true;
     } else {
-      context.trace(`The '${frameString}' stated frame must be singular.`);
+      context.debug(`The '${frameString}' stated frame must be singular.`);
     }
 
     if (validatesWhenStated) {

package/src/element/judgement.js

@@ -97,7 +97,7 @@ export default define(class Judgement extends Element {
       }
 
       if (validates) {
-        const judgement = this; ///
+        judgement = this; ///
 
         context.addJudgement(judgement)
 
@@ -148,7 +148,7 @@ export default define(class Judgement extends Element {
     }
 
     if (assumptionValidates) {
-      context.trace(`...validated the '${judgementString}' judgement's '${assumptionString}' assumption.`);
+      context.debug(`...validated the '${judgementString}' judgement's '${assumptionString}' assumption.`);
     }
 
     return assumptionValidates;

package/src/element/procedureCall.js

@@ -60,10 +60,10 @@ export default define(class ProcedureCall extends Element {
       if (procedureBoolean) {
         validates = true;
       } else {
-        context.trace(`The '${procedureCallString}' procedure is not boolean.`);
+        context.debug(`The '${procedureCallString}' procedure is not boolean.`);
       }
     } else {
-      context.trace(`The '${procedureCallString}' procedure is not present.`);
+      context.debug(`The '${procedureCallString}' procedure is not present.`);
     }
 
     if (validates) {

package/src/element/reference.js

@@ -144,7 +144,7 @@ export default define(class Reference extends Element {
       }
 
       if (validates) {
-        const reference = this; ///
+        reference = this; ///
 
         context.addReference(reference);
 

package/src/element/rule.js

@@ -78,7 +78,7 @@ export default define(class Rule extends Element {
     });
 
     if (labelsVerify) {
-      context.trace(`...verified the '${ruleString}' rule's labels.`);
+      context.debug(`...verified the '${ruleString}' rule's labels.`);
     }
 
     return labelsVerify;

package/src/element/statement.js

@@ -196,7 +196,7 @@ export default define(class Statement extends Element {
       });
 
       if (validates) {
-        const statement = this; ///
+        statement = this; ///
 
         context.addStatement(statement);
 

package/src/element/term.js

@@ -159,9 +159,13 @@ export default define(class Term extends Element {
           valid = (validTerm !== null);
 
     if (valid) {
-      term = validTerm; ///
+      const validatesForward = validateForwards();
 
-      context.debug(`...the '${termString}' term is already valid.`);
+      if (validatesForward) {
+        term = validTerm; ///
+
+        context.debug(`...the '${termString}' term is already valid.`);
+      }
     } else {
       const validates = validateTerms.some((validateTerm) => {  ///
         const term = this,  ///
@@ -173,7 +177,7 @@ export default define(class Term extends Element {
       });
 
       if (validates) {
-        term = null;  ///
+        term = this;  ///
 
         context.addTerm(term);
 

package/src/element/topLevelAssertion.js

@@ -140,7 +140,7 @@ export default class TopLevelAssertion extends Element {
     });
 
     if (labelsVerify) {
-      context.trace(`...verified the '${topLevelAssertionString}' top level assertion's labels.`);
+      context.debug(`...verified the '${topLevelAssertionString}' top level assertion's labels.`);
     }
 
     return labelsVerify;

package/src/element/topLevelMetaAssertion.js

@@ -66,7 +66,7 @@ export default class TopLevelMetaAssertion extends Element {
     labelVerifies = this.label.verify(nameOnly);
 
     if (labelVerifies) {
-      context.trace(`...verified the '${topLevelMetaAssertionString}' top level meta assertion's label.`);
+      context.debug(`...verified the '${topLevelMetaAssertionString}' top level meta assertion's label.`);
     }
 
     return labelVerifies;

package/src/element/type.js

@@ -93,12 +93,11 @@ export default define(class Type extends Element {
     this.provisional = provisional;
   }
 
-  replaceSuperType(oldSuperType, newSuperType) {
-    const index = this.superTypes.indexOf(oldSuperType),
-          start = index,
+  replaceSuperType(superType, index) {
+    const start = index,
           deleteCount = 1;
 
-    this.superTypes.splice(start, deleteCount, newSuperType);
+    this.superTypes.splice(start, deleteCount, superType);
   }
 
   isPrefixed() {