occam-verify-cli 1.0.931 → 1.0.933

package/lib/element/variable.js

@@ -130,27 +130,19 @@ const _default = (0, _elements.define)(class Variable extends _occamlanguages.El
         let termUnifies = false;
         const context = specificContext, termString = term.getString(), variableString = this.getString(); ///
         context.trace(`Unifying the '${termString}' term with the '${variableString}' variable...`);
-        let variable, derivedSubstitution;
-        variable = this; ///
-        const variableNode = variable.getNode();
-        derivedSubstitution = context.findDerivedSubstitutionByVariableNode(variableNode);
-        if (derivedSubstitution !== null) {
-            const derivedSubstitutionComparesToTerm = derivedSubstitution.compareTerm(term, context);
-            if (derivedSubstitutionComparesToTerm) {
-                const derivedSubstitutionString = derivedSubstitution.getString();
-                context.trace(`The '${derivedSubstitutionString}' derived substitution is already present.`);
-                termUnifies = true;
-            }
+        const variable = this, termVariableUnifies = this.unifyTermVariable(term, generalContext, specificContext);
+        if (termVariableUnifies) {
+            termUnifies = true;
         } else {
-            let context;
-            context = generalContext; ///
-            const variableNode = variable.getNode();
-            variable = context.findVariableByVariableNode(variableNode);
-            context = specificContext; ///
-            const termNode = term.getNode();
-            term = context.findTermByTermNode(termNode);
-            const termType = term.getType(), variableType = variable.getType(), termTypeEqualToOrSubTypeOfVariableType = termType.isEqualToOrSubTypeOf(variableType);
-            if (termTypeEqualToOrSubTypeOfVariableType) {
+            const variableNode = variable.getNode(), derivedSubstitution = context.findDerivedSubstitutionByVariableNode(variableNode);
+            if (derivedSubstitution !== null) {
+                const derivedSubstitutionTermComparesToTerm = derivedSubstitution.compareTerm(term, context);
+                if (derivedSubstitutionTermComparesToTerm) {
+                    const derivedSubstitutionString = derivedSubstitution.getString();
+                    context.trace(`The '${derivedSubstitutionString}' derived substitution is already present.`);
+                    termUnifies = true;
+                }
+            } else {
                 const { TermSubstitution } = _elements.default;
                 let termSubstitution;
                 termSubstitution = TermSubstitution.fromTermAndVariable(term, variable, generalContext, specificContext);
@@ -165,6 +157,22 @@ const _default = (0, _elements.define)(class Variable extends _occamlanguages.El
         }
         return termUnifies;
     }
+    unifyTermVariable(term, generalContext, specificContext) {
+        let termVariableUnifies = false;
+        const context = specificContext, termString = term.getString(), variableString = this.getString(); ///
+        context.trace(`Unifying the '${termString}' term's variable with the '${variableString}' variable...`);
+        const generalContextFilePath = generalContext.getFilePath(), specificContextFilePath = specificContext.getFilePath();
+        if (generalContextFilePath === specificContextFilePath) {
+            const variableNode = this.getVariableNode(), variableNodeMatches = term.matchVariableNode(variableNode);
+            if (variableNodeMatches) {
+                termVariableUnifies = true;
+            }
+        }
+        if (termVariableUnifies) {
+            context.debug(`...unified the '${termString}' term's variable with the '${variableString}' variable.`);
+        }
+        return termVariableUnifies;
+    }
     toJSON() {
         const typeJSON = (0, _json.typeToTypeJSON)(this.type), provisionalJSON = (0, _json.provisionalToProvisionalJSON)(this.provisional), string = this.getString(), lineIndex = this.getLineIndex(), type = typeJSON, provisional = provisionalJSON, json = {
             string,
@@ -189,4 +197,4 @@ const _default = (0, _elements.define)(class Variable extends _occamlanguages.El
     }
 });
 
-//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/element/variable.js"],"sourcesContent":["\"use strict\";\n\nimport { Element } from \"occam-languages\";\n\nimport elements from \"../elements\";\n\nimport { define } from \"../elements\";\nimport { instantiate } from \"../utilities/context\";\nimport { instantiateVariable } from \"../process/instantiate\";\nimport { provisionallyStringFromProvisional } from \"../utilities/string\";\nimport { variableFromTermNode, identifierFromVariableNode } from \"../utilities/element\";\nimport { typeFromJSON, typeToTypeJSON, provisionalFromJSON, provisionalToProvisionalJSON } from \"../utilities/json\";\n\nexport default define(class Variable extends Element {\n  constructor(context, string, node, lineIndex, type, identifier, provisional) {\n    super(context, string, node, lineIndex);\n\n    this.type = type;\n    this.identifier = identifier;\n    this.provisional = provisional;\n  }\n\n  getType() {\n    return this.type;\n  }\n\n  getIdentifier() {\n    return this.identifier;\n  }\n\n  isProvisional() {\n    return this.provisional;\n  }\n\n  setType(type) {\n    this.type = type;\n  }\n\n  setProvisional(provisional) {\n    this.provisional = provisional;\n  }\n\n  getVariableNode() {\n    const node = this.getNode(),\n          variableNode = node;  //\n\n    return variableNode;\n  }\n\n  getTypeString() { return this.type.getString(); }\n\n  isEstablished() {\n    const provisional = this.isProvisional(),\n          established = !provisional;\n\n    return established;\n  }\n\n  isIdentifierEqualTo(identifier) {\n    const identifierEqualTo = (this.identifier === identifier);\n\n    return identifierEqualTo;\n  }\n\n  compareVariable(variable) {\n    const variableIdentifier = variable.getIdentifier(),\n          comparesToVariable = (this.identifier === variableIdentifier);\n\n    return comparesToVariable;\n  }\n\n  compareParamter(parameter) {\n    const identifier = parameter.getIdentifier(),\n          identifierEqualTo = this.isIdentifierEqualTo(identifier),\n          comparesToParamter = identifierEqualTo; ///\n\n    return comparesToParamter;\n  }\n\n  compareVariableIdentifier(variableIdentifier) {\n    const identifier = variableIdentifier, ///\n          identifierEqualTo = this.isIdentifierEqualTo(identifier),\n          comparesToVariableIdentifier = identifierEqualTo; ///\n\n    return comparesToVariableIdentifier;\n  }\n\n  validate(context) {\n    let variable = null;\n\n    const variableString = this.getString(); ///\n\n    context.trace(`Validating the '${variableString}' variable...`);\n\n    let validates = false;\n\n    const variableIdentifier = this.identifier, ///\n          declaredVariable = context.findDeclaredVariableByVariableIdentifier(variableIdentifier);\n\n    if (declaredVariable !== null) {\n      const type = declaredVariable.getType(),\n            typeString = type.getString(),\n            provisional = declaredVariable.isProvisional(),\n            variableString = this.getString(),  ///\n            provisinallyString = provisionallyStringFromProvisional(provisional);\n\n      context.trace(`Setting the '${variableString}' variable's type to the '${typeString}' type${provisinallyString}.`);\n\n      this.type = type;\n\n      this.provisional = provisional;\n\n      variable = this;\n\n      validates = true;\n    } else {\n      context.debug(`The '${variableString}' variable is not present.`);\n    }\n\n    if (validates) {\n      context.debug(`...validated the '${variableString}' variable.`);\n    }\n\n    return variable;\n  }\n\n  unifyTerm(term, generalContext, specificContext) {\n    let termUnifies = false;\n\n    const context = specificContext,  ///\n          termString = term.getString(),\n          variableString = this.getString(); ///\n\n    context.trace(`Unifying the '${termString}' term with the '${variableString}' variable...`);\n\n    let variable,\n        derivedSubstitution;\n\n    variable = this; ///\n\n    const variableNode = variable.getNode();\n\n    derivedSubstitution = context.findDerivedSubstitutionByVariableNode(variableNode);\n\n    if (derivedSubstitution !== null) {\n      const derivedSubstitutionComparesToTerm = derivedSubstitution.compareTerm(term, context);\n\n      if (derivedSubstitutionComparesToTerm) {\n        const derivedSubstitutionString = derivedSubstitution.getString();\n\n        context.trace(`The '${derivedSubstitutionString}' derived substitution is already present.`);\n\n        termUnifies = true;\n      }\n    } else {\n      let context;\n\n      context = generalContext;  ///\n\n      const variableNode = variable.getNode();\n\n      variable = context.findVariableByVariableNode(variableNode);\n\n      context = specificContext;  ///\n\n      const termNode = term.getNode();\n\n      term = context.findTermByTermNode(termNode);\n\n      const termType = term.getType(),\n            variableType = variable.getType(),\n            termTypeEqualToOrSubTypeOfVariableType = termType.isEqualToOrSubTypeOf(variableType);\n\n      if (termTypeEqualToOrSubTypeOfVariableType) {\n        const { TermSubstitution } = elements;\n\n        let termSubstitution;\n\n        termSubstitution = TermSubstitution.fromTermAndVariable(term, variable, generalContext, specificContext);\n\n        termSubstitution = termSubstitution.validate(context);  ///\n\n        const derivedSubstitution = termSubstitution; ///\n\n        context.addDerivedSubstitution(derivedSubstitution);\n\n        termUnifies = true;\n      }\n    }\n\n    if (termUnifies) {\n      context.debug(`...unified the '${termString}' term with the '${variableString}' variable.`);\n    }\n\n    return termUnifies;\n  }\n\n  toJSON() {\n    const typeJSON = typeToTypeJSON(this.type),\n          provisionalJSON = provisionalToProvisionalJSON(this.provisional),\n          string = this.getString(), ///\n          lineIndex = this.getLineIndex(),\n          type = typeJSON,  ///\n          provisional = provisionalJSON,  ///\n          json = {\n            string,\n            lineIndex,\n            type,\n            provisional\n          };\n\n    return json;\n  }\n\n  static name = \"Variable\";\n\n  static fromJSON(json, context) {\n    return instantiate((context) => {\n      const { string, lineIndex } = json,\n            variableNode = instantiateVariable(string, context),\n            node = variableNode,  ///\n            type = typeFromJSON(json, context),\n            identifier = identifierFromVariableNode(variableNode, context),\n            provisional = provisionalFromJSON(json, context);\n\n      context = null;\n\n      const variable = new Variable(context, string, node, lineIndex, type, identifier, provisional);\n\n      return variable;\n    }, context);\n  }\n\n  static fromTerm(term, context) {\n    const termNode = term.getNode(),\n          variable = variableFromTermNode(termNode, context);\n\n    return variable;\n  }\n});\n"],"names":["define","Variable","Element","context","string","node","lineIndex","type","identifier","provisional","getType","getIdentifier","isProvisional","setType","setProvisional","getVariableNode","getNode","variableNode","getTypeString","getString","isEstablished","established","isIdentifierEqualTo","identifierEqualTo","compareVariable","variable","variableIdentifier","comparesToVariable","compareParamter","parameter","comparesToParamter","compareVariableIdentifier","comparesToVariableIdentifier","validate","variableString","trace","validates","declaredVariable","findDeclaredVariableByVariableIdentifier","typeString","provisinallyString","provisionallyStringFromProvisional","debug","unifyTerm","term","generalContext","specificContext","termUnifies","termString","derivedSubstitution","findDerivedSubstitutionByVariableNode","derivedSubstitutionComparesToTerm","compareTerm","derivedSubstitutionString","findVariableByVariableNode","termNode","findTermByTermNode","termType","variableType","termTypeEqualToOrSubTypeOfVariableType","isEqualToOrSubTypeOf","TermSubstitution","elements","termSubstitution","fromTermAndVariable","addDerivedSubstitution","toJSON","typeJSON","typeToTypeJSON","provisionalJSON","provisionalToProvisionalJSON","getLineIndex","json","name","fromJSON","instantiate","instantiateVariable","typeFromJSON","identifierFromVariableNode","provisionalFromJSON","fromTerm","variableFromTermNode"],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/element/variable.js"],"sourcesContent":["\"use strict\";\n\nimport { Element } from \"occam-languages\";\n\nimport elements from \"../elements\";\n\nimport { define } from \"../elements\";\nimport { instantiate } from \"../utilities/context\";\nimport { instantiateVariable } from \"../process/instantiate\";\nimport { provisionallyStringFromProvisional } from \"../utilities/string\";\nimport { variableFromTermNode, identifierFromVariableNode } from \"../utilities/element\";\nimport { typeFromJSON, typeToTypeJSON, provisionalFromJSON, provisionalToProvisionalJSON } from \"../utilities/json\";\n\nexport default define(class Variable extends Element {\n  constructor(context, string, node, lineIndex, type, identifier, provisional) {\n    super(context, string, node, lineIndex);\n\n    this.type = type;\n    this.identifier = identifier;\n    this.provisional = provisional;\n  }\n\n  getType() {\n    return this.type;\n  }\n\n  getIdentifier() {\n    return this.identifier;\n  }\n\n  isProvisional() {\n    return this.provisional;\n  }\n\n  setType(type) {\n    this.type = type;\n  }\n\n  setProvisional(provisional) {\n    this.provisional = provisional;\n  }\n\n  getVariableNode() {\n    const node = this.getNode(),\n          variableNode = node;  //\n\n    return variableNode;\n  }\n\n  getTypeString() { return this.type.getString(); }\n\n  isEstablished() {\n    const provisional = this.isProvisional(),\n          established = !provisional;\n\n    return established;\n  }\n\n  isIdentifierEqualTo(identifier) {\n    const identifierEqualTo = (this.identifier === identifier);\n\n    return identifierEqualTo;\n  }\n\n  compareVariable(variable) {\n    const variableIdentifier = variable.getIdentifier(),\n          comparesToVariable = (this.identifier === variableIdentifier);\n\n    return comparesToVariable;\n  }\n\n  compareParamter(parameter) {\n    const identifier = parameter.getIdentifier(),\n          identifierEqualTo = this.isIdentifierEqualTo(identifier),\n          comparesToParamter = identifierEqualTo; ///\n\n    return comparesToParamter;\n  }\n\n  compareVariableIdentifier(variableIdentifier) {\n    const identifier = variableIdentifier, ///\n          identifierEqualTo = this.isIdentifierEqualTo(identifier),\n          comparesToVariableIdentifier = identifierEqualTo; ///\n\n    return comparesToVariableIdentifier;\n  }\n\n  validate(context) {\n    let variable = null;\n\n    const variableString = this.getString(); ///\n\n    context.trace(`Validating the '${variableString}' variable...`);\n\n    let validates = false;\n\n    const variableIdentifier = this.identifier, ///\n          declaredVariable = context.findDeclaredVariableByVariableIdentifier(variableIdentifier);\n\n    if (declaredVariable !== null) {\n      const type = declaredVariable.getType(),\n            typeString = type.getString(),\n            provisional = declaredVariable.isProvisional(),\n            variableString = this.getString(),  ///\n            provisinallyString = provisionallyStringFromProvisional(provisional);\n\n      context.trace(`Setting the '${variableString}' variable's type to the '${typeString}' type${provisinallyString}.`);\n\n      this.type = type;\n\n      this.provisional = provisional;\n\n      variable = this;\n\n      validates = true;\n    } else {\n      context.debug(`The '${variableString}' variable is not present.`);\n    }\n\n    if (validates) {\n      context.debug(`...validated the '${variableString}' variable.`);\n    }\n\n    return variable;\n  }\n\n  unifyTerm(term, generalContext, specificContext) {\n    let termUnifies = false;\n\n    const context = specificContext,  ///\n          termString = term.getString(),\n          variableString = this.getString(); ///\n\n    context.trace(`Unifying the '${termString}' term with the '${variableString}' variable...`);\n\n    const variable = this,  ///\n          termVariableUnifies = this.unifyTermVariable(term, generalContext, specificContext);\n\n    if (termVariableUnifies) {\n      termUnifies = true;\n    } else {\n      const variableNode = variable.getNode(),\n            derivedSubstitution = context.findDerivedSubstitutionByVariableNode(variableNode);\n\n      if (derivedSubstitution !== null) {\n        const derivedSubstitutionTermComparesToTerm = derivedSubstitution.compareTerm(term, context);\n\n        if (derivedSubstitutionTermComparesToTerm) {\n          const derivedSubstitutionString = derivedSubstitution.getString();\n\n          context.trace(`The '${derivedSubstitutionString}' derived substitution is already present.`);\n\n          termUnifies = true;\n        }\n      } else {\n        const { TermSubstitution } = elements;\n\n        let termSubstitution;\n\n        termSubstitution = TermSubstitution.fromTermAndVariable(term, variable, generalContext, specificContext);\n\n        termSubstitution = termSubstitution.validate(context);  ///\n\n        const derivedSubstitution = termSubstitution;  ///\n\n        context.addDerivedSubstitution(derivedSubstitution);\n\n        termUnifies = true;\n      }\n    }\n\n    if (termUnifies) {\n      context.debug(`...unified the '${termString}' term with the '${variableString}' variable.`);\n    }\n\n    return termUnifies;\n  }\n\n  unifyTermVariable(term, generalContext, specificContext) {\n    let termVariableUnifies = false;\n\n    const context = specificContext,  ///\n          termString = term.getString(),\n          variableString = this.getString();  ///\n\n    context.trace(`Unifying the '${termString}' term's variable with the '${variableString}' variable...`);\n\n    const generalContextFilePath = generalContext.getFilePath(),\n          specificContextFilePath = specificContext.getFilePath();\n\n    if (generalContextFilePath === specificContextFilePath) {\n      const variableNode = this.getVariableNode(),  ///\n            variableNodeMatches = term.matchVariableNode(variableNode);\n\n      if (variableNodeMatches) {\n        termVariableUnifies = true;\n      }\n    }\n\n    if (termVariableUnifies) {\n      context.debug(`...unified the '${termString}' term's variable with the '${variableString}' variable.`);\n    }\n\n    return termVariableUnifies;\n  }\n\n  toJSON() {\n    const typeJSON = typeToTypeJSON(this.type),\n          provisionalJSON = provisionalToProvisionalJSON(this.provisional),\n          string = this.getString(), ///\n          lineIndex = this.getLineIndex(),\n          type = typeJSON,  ///\n          provisional = provisionalJSON,  ///\n          json = {\n            string,\n            lineIndex,\n            type,\n            provisional\n          };\n\n    return json;\n  }\n\n  static name = \"Variable\";\n\n  static fromJSON(json, context) {\n    return instantiate((context) => {\n      const { string, lineIndex } = json,\n            variableNode = instantiateVariable(string, context),\n            node = variableNode,  ///\n            type = typeFromJSON(json, context),\n            identifier = identifierFromVariableNode(variableNode, context),\n            provisional = provisionalFromJSON(json, context);\n\n      context = null;\n\n      const variable = new Variable(context, string, node, lineIndex, type, identifier, provisional);\n\n      return variable;\n    }, context);\n  }\n\n  static fromTerm(term, context) {\n    const termNode = term.getNode(),\n          variable = variableFromTermNode(termNode, context);\n\n    return variable;\n  }\n});\n"],"names":["define","Variable","Element","context","string","node","lineIndex","type","identifier","provisional","getType","getIdentifier","isProvisional","setType","setProvisional","getVariableNode","getNode","variableNode","getTypeString","getString","isEstablished","established","isIdentifierEqualTo","identifierEqualTo","compareVariable","variable","variableIdentifier","comparesToVariable","compareParamter","parameter","comparesToParamter","compareVariableIdentifier","comparesToVariableIdentifier","validate","variableString","trace","validates","declaredVariable","findDeclaredVariableByVariableIdentifier","typeString","provisinallyString","provisionallyStringFromProvisional","debug","unifyTerm","term","generalContext","specificContext","termUnifies","termString","termVariableUnifies","unifyTermVariable","derivedSubstitution","findDerivedSubstitutionByVariableNode","derivedSubstitutionTermComparesToTerm","compareTerm","derivedSubstitutionString","TermSubstitution","elements","termSubstitution","fromTermAndVariable","addDerivedSubstitution","generalContextFilePath","getFilePath","specificContextFilePath","variableNodeMatches","matchVariableNode","toJSON","typeJSON","typeToTypeJSON","provisionalJSON","provisionalToProvisionalJSON","getLineIndex","json","name","fromJSON","instantiate","instantiateVariable","typeFromJSON","identifierFromVariableNode","provisionalFromJSON","fromTerm","termNode","variableFromTermNode"],"mappings":"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"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "occam-verify-cli",
   "author": "James Smith",
-  "version": "1.0.931",
+  "version": "1.0.933",
   "license": "MIT, Anti-996",
   "homepage": "https://github.com/djalbat/occam-verify-cli",
   "description": "Occam's Verifier",

package/src/element/variable.js

@@ -133,45 +133,26 @@ export default define(class Variable extends Element {
 
     context.trace(`Unifying the '${termString}' term with the '${variableString}' variable...`);
 
-    let variable,
-        derivedSubstitution;
+    const variable = this,  ///
+          termVariableUnifies = this.unifyTermVariable(term, generalContext, specificContext);
 
-    variable = this; ///
-
-    const variableNode = variable.getNode();
-
-    derivedSubstitution = context.findDerivedSubstitutionByVariableNode(variableNode);
-
-    if (derivedSubstitution !== null) {
-      const derivedSubstitutionComparesToTerm = derivedSubstitution.compareTerm(term, context);
-
-      if (derivedSubstitutionComparesToTerm) {
-        const derivedSubstitutionString = derivedSubstitution.getString();
-
-        context.trace(`The '${derivedSubstitutionString}' derived substitution is already present.`);
-
-        termUnifies = true;
-      }
+    if (termVariableUnifies) {
+      termUnifies = true;
     } else {
-      let context;
-
-      context = generalContext;  ///
-
-      const variableNode = variable.getNode();
+      const variableNode = variable.getNode(),
+            derivedSubstitution = context.findDerivedSubstitutionByVariableNode(variableNode);
 
-      variable = context.findVariableByVariableNode(variableNode);
+      if (derivedSubstitution !== null) {
+        const derivedSubstitutionTermComparesToTerm = derivedSubstitution.compareTerm(term, context);
 
-      context = specificContext;  ///
+        if (derivedSubstitutionTermComparesToTerm) {
+          const derivedSubstitutionString = derivedSubstitution.getString();
 
-      const termNode = term.getNode();
+          context.trace(`The '${derivedSubstitutionString}' derived substitution is already present.`);
 
-      term = context.findTermByTermNode(termNode);
-
-      const termType = term.getType(),
-            variableType = variable.getType(),
-            termTypeEqualToOrSubTypeOfVariableType = termType.isEqualToOrSubTypeOf(variableType);
-
-      if (termTypeEqualToOrSubTypeOfVariableType) {
+          termUnifies = true;
+        }
+      } else {
         const { TermSubstitution } = elements;
 
         let termSubstitution;
@@ -180,7 +161,7 @@ export default define(class Variable extends Element {
 
         termSubstitution = termSubstitution.validate(context);  ///
 
-        const derivedSubstitution = termSubstitution; ///
+        const derivedSubstitution = termSubstitution;  ///
 
         context.addDerivedSubstitution(derivedSubstitution);
 
@@ -195,6 +176,34 @@ export default define(class Variable extends Element {
     return termUnifies;
   }
 
+  unifyTermVariable(term, generalContext, specificContext) {
+    let termVariableUnifies = false;
+
+    const context = specificContext,  ///
+          termString = term.getString(),
+          variableString = this.getString();  ///
+
+    context.trace(`Unifying the '${termString}' term's variable with the '${variableString}' variable...`);
+
+    const generalContextFilePath = generalContext.getFilePath(),
+          specificContextFilePath = specificContext.getFilePath();
+
+    if (generalContextFilePath === specificContextFilePath) {
+      const variableNode = this.getVariableNode(),  ///
+            variableNodeMatches = term.matchVariableNode(variableNode);
+
+      if (variableNodeMatches) {
+        termVariableUnifies = true;
+      }
+    }
+
+    if (termVariableUnifies) {
+      context.debug(`...unified the '${termString}' term's variable with the '${variableString}' variable.`);
+    }
+
+    return termVariableUnifies;
+  }
+
   toJSON() {
     const typeJSON = typeToTypeJSON(this.type),
           provisionalJSON = provisionalToProvisionalJSON(this.provisional),