occam-verify-cli 1.0.631 → 1.0.633

package/src/element/constructor/bracketed.js

@@ -1,9 +1,9 @@
 "use strict";
 
-import elements from "../../elements";
 import Constructor from "../constructor";
 
 import { define } from "../../elements";
+import { termFromTermNode } from "../../utilities/element";
 
 export default define(class BracketedConstructor extends Constructor {
   getBracketedConstructorNode() {
@@ -13,7 +13,7 @@ export default define(class BracketedConstructor extends Constructor {
     return bracketedConstructorNode;
   }
 
-  unifyTerm(term, context, verifyForwards) {
+  unifyTerm(term, context, validateForwards) {
     let termUnifies;
 
     const termString = term.getString();
@@ -21,34 +21,33 @@ export default define(class BracketedConstructor extends Constructor {
     context.trace(`Unifying the '${termString}' term with the bracketed constructor...`);
 
     termUnifies = super.unifyTerm(term, context, () => {
-      let verifiesForwards = false;
+      let validatesForwards = false;
 
-      const { Term } = elements,
-            bracketedTerm = term, ///
+      const bracketedTerm = term, ///
             bracketedTermNode = bracketedTerm.getNode(),
             singularTermNode = bracketedTermNode.getSingularTermNode();
 
       if (singularTermNode !== null) {
         const termNode = singularTermNode;  ///
 
-        term = Term.fromTermNode(termNode, context);
+        term = termFromTermNode(termNode, context);
 
-        const termVVerifies = term.verify(context, () => {
-          let verifiesForwards;
+        const termValidates = term.validate(context, () => {
+          let validatesForwards;
 
           const type = term.getType();
 
           bracketedTerm.setType(type);
 
-          verifiesForwards = verifyForwards();
+          validatesForwards = validateForwards();
 
-          return verifiesForwards;
+          return validatesForwards;
         });
 
-        verifiesForwards = termVVerifies;  ///
+        validatesForwards = termValidates;  ///
       }
 
-      return verifiesForwards;
+      return validatesForwards;
     });
 
     if (termUnifies) {

package/src/element/constructor.js

@@ -30,7 +30,7 @@ export default define(class Constructor extends Element {
 
   setType(type) { this.term.setType(type); }
 
-  unifyTerm(term, context, verifyForwards) {
+  unifyTerm(term, context, validateForwards) {
     let termUnifies = false;
 
     const termString = term.getString(),
@@ -42,15 +42,15 @@ export default define(class Constructor extends Element {
           termUnifiesWithConstructor = unifyTermWithConstructor(term, constructor, context);
 
     if (termUnifiesWithConstructor) {
-      let verifiesForwards;
+      let validatesForwards;
 
       const type = this.getType();
 
       term.setType(type);
 
-      verifiesForwards = verifyForwards();
+      validatesForwards = validateForwards();
 
-      termUnifies = verifiesForwards;  ///
+      termUnifies = validatesForwards;  ///
     }
 
     if (termUnifies) {

package/src/element/declaration/constructor.js

@@ -33,7 +33,11 @@ export default define(class ConstructorDeclaration extends Declaration {
 
     const term = this.constructor.getTerm(),
           termNode = term.getNode(),
-          termValidates = validateTerm(termNode, context);
+          termValidates = validateTerm(termNode, context, () => {
+            const validatesFormards = true;
+
+            return validatesFormards;
+          });
 
     if (termValidates) {
       constructorValidates = true;

package/src/element/propertyRelation.js

@@ -57,9 +57,9 @@ export default define(class PropertyRelation extends Element {
     context.trace(`Validating the '${termString}' term...`);
 
     termValidates = this.term.validate(context, () => {
-      const verifiesForwards = true;
+      const validatesForwards = true;
 
-      return verifiesForwards;
+      return validatesForwards;
     });
 
     if (termValidates) {

package/src/element/signature.js

@@ -35,13 +35,13 @@ export default define(class Signature extends Element {
     context.trace(`Verifying the '${signatureString}' signature...`);
 
     verifies = this.terms.every((term) => {
-      const termVerifies = term.verify(context, () => {
-        const verifiesForwards = true;
+      const termValidates = term.validate(context, () => {
+        const validatesForwards = true;
 
-        return verifiesForwards;
+        return validatesForwards;
       });
 
-      if (termVerifies) {
+      if (termValidates) {
         return true;
       }
     });

package/src/element/substitution/term.js

@@ -126,9 +126,9 @@ export default define(class TermSubstitution extends Substitution {
 
     if (targetTermSingular) {
       targetTermValidates = this.targetTerm.validate(context, () => {
-        const verifiesForwards = true;
+        const validatesForwards = true;
 
-        return verifiesForwards;
+        return validatesForwards;
       });
     } else {
       context.debug(`The '${termSubstitutionString}' term subtitution's '${targetTermString}' target term is not singular.`);

package/src/element/term.js

@@ -148,7 +148,7 @@ export default define(class Term extends Element {
     return comparesToParamter;
   }
 
-  validate(context, verifyForwards) {
+  validate(context, validateForwards) {
     let validates;
 
     const termString = this.getString();  ///
@@ -162,9 +162,10 @@ export default define(class Term extends Element {
 
       context.debug(`...the '${termString}' term is already valid.`);
     } else {
+      const term = this;  ///
+
       validates = validateTerms.some((validateTerm) => {  ///
-        const term = this, ///
-              termValidates = validateTerm(term, context, verifyForwards);
+        const termValidates = validateTerm(term, context, validateForwards);
 
         if (termValidates) {
           return true;

package/src/process/validate.js

@@ -1,7 +1,7 @@
 "use strict";
 
-import { ForwardPass } from "occam-languages";
 import { queryUtilities } from "occam-languages";
+import { SimplePass, ForwardPass } from "occam-languages";
 
 import { termFromTermNode, statementFromStatementNode } from "../utilities/element";
 
@@ -70,7 +70,7 @@ class TermPass extends ForwardPass {
   ];
 }
 
-class StatementPass extends ForwardPass {
+class StatementPass extends SimplePass {
   run(statementNode, context) {
     let success = false;
 
@@ -143,11 +143,11 @@ class StatementPass extends ForwardPass {
 const termPass = new TermPass(),
       statementPass = new StatementPass();
 
-export function validateTerm(termNode, context) {
+export function validateTerm(termNode, context, validateForwards) {
   let termValidates = false;
 
   const node = termNode, ///
-        sucess = termPass.run(node, context);
+        sucess = termPass.run(node, context, validateForwards);
 
   if (sucess) {
     termValidates = true;

package/src/ruleNames.js

@@ -76,6 +76,7 @@ export const PARENTHESISED_LABELS_RULE_NAME = "parenthesisedLabels";
 export const PROPERTY_DECLARATION_RULE_NAME = "propertyDeclaration";
 export const VARIABLE_DECLARATION_RULE_NAME = "variableDeclaration";
 export const STATEMENT_SUBSTITUTION_RULE_NAME = "statementSubstitution";
+export const REFERENCE_SUBSTITUTION_RULE_NAME = "referenceSubstitution";
 export const COMBINATOR_DECLARATION_RULE_NAME = "combinatorDeclaration";
 export const TYPE_PREFIX_DECLARATION_RULE_NAME = "typePrefixDeclaration";
 export const SIMPLE_TYPE_DECLARATION_RULE_NAME = "simpleTypeDeclaration";

package/src/utilities/validation.js

@@ -31,9 +31,9 @@ function validateTermAsVariable(term, context, validateForwards) {
 
       term.setType(type);
 
-      const verifiesForwards = validateForwards();
+      const validatesForwards = validateForwards();
 
-      if (verifiesForwards) {
+      if (validatesForwards) {
         termValidatesAsVariable = true;
       }
     }