occam-verify-cli 0.0.1063 → 0.0.1065

package/src/unify/simpleSubstitutionStatementWithComplexSubstitutionStatement.js

@@ -15,9 +15,9 @@ export default function unifyComplexSubstitutionStatementWithSimpleSubstitutionS
 
   localContextA = localContextB;  ///
 
-  const unified = metaLevelUnifier.unify(nodeA, nodeB, substitutions, localContextA, localContextB);
+  const unifiedAtMetaLevel = metaLevelUnifier.unify(nodeA, nodeB, substitutions, localContextA, localContextB);
 
-  simpleSubstitutionStatementUnifiedWithComplexSubstitutionStatement = unified;  ///
+  simpleSubstitutionStatementUnifiedWithComplexSubstitutionStatement = unifiedAtMetaLevel;  ///
 
   if (simpleSubstitutionStatementUnifiedWithComplexSubstitutionStatement) {
     localContextB.trace(`...unified the simple substitution's '${simpleSubstitutionStatementString}' statement with the complex substitution's '${complexSubstitutionStatementString}' statement.`, simpleSubstitutionStatementNode);

package/src/unify/statementWithSttaemetnGivenEquivalences.js

@@ -15,9 +15,9 @@ export default function unifyStatementWithStatementGivenEquivalences(statementNo
     const substitutions = Substitutions.fromNothing(),
           nodeA = statementNodeA,  ///
           nodeB = statementNodeB,  ///
-          unified = intrinsicLevelUnifier.unify(nodeA, nodeB, substitutions, localContextA, localContextB);
+          unifiedAtIntrinsicLevel = intrinsicLevelUnifier.unify(nodeA, nodeB, substitutions, localContextA, localContextB);
 
-    if (unified) {
+    if (unifiedAtIntrinsicLevel) {
       const substitutionsUnifiedWithEquivalences = substitutions.unifyWithEquivalences(equivalences, localContextA, localContextB);
 
       statementUnifiedWithStatementGivenEquivalences = substitutionsUnifiedWithEquivalences;  ///
@@ -34,9 +34,9 @@ export default function unifyStatementWithStatementGivenEquivalences(statementNo
     const substitutions = Substitutions.fromNothing(),
           nodeA = statementNodeB,  ///
           nodeB = statementNodeA,  ///
-          unified = intrinsicLevelUnifier.unify(nodeA, nodeB, substitutions, localContextA, localContextB);
+          unifiedAtIntrinsicLevel = intrinsicLevelUnifier.unify(nodeA, nodeB, substitutions, localContextA, localContextB);
 
-    if (unified) {
+    if (unifiedAtIntrinsicLevel) {
       const substitutionsUnifiedWithEquivalences = substitutions.unifyWithEquivalences(equivalences, localContextA, localContextB);
 
       statementUnifiedWithStatementGivenEquivalences = substitutionsUnifiedWithEquivalences;  ///

package/src/utilities/unify.js

@@ -21,17 +21,3 @@ export function metavariableFromFrameNode(frameNode, localContext) {
   return metavariable;
 }
 
-export function metavariableFromStatementNode(statementNode, localContext) {
-  let metavariable = null;
-
-  const statementMetavariableNode = statementMetavariableNodeQuery(statementNode)
-
-  if (statementMetavariableNode !== null) {
-    const metavariableNode = statementMetavariableNode, ///
-          metavariableName = metavariableNameFromMetavariableNode(metavariableNode);
-
-    metavariable = localContext.findMetavariableByMetavariableName(metavariableName);
-  }
-
-  return metavariable;
-}

package/src/variable.js

@@ -165,7 +165,7 @@ class Variable {
       if (termVariable === variable) {
         termUnified = true;
       } else {
-        const termForVariableSubstitution = TermForVariableSubstitution.fromTernAndVariable(term, variable, localContext),
+        const termForVariableSubstitution = TermForVariableSubstitution.fromTernAndVariable(term, variable),
               substitution = termForVariableSubstitution;  ///
 
         substitutions.addSubstitution(substitution, localContext);
@@ -209,6 +209,25 @@ class Variable {
     return variable;
   }
 
+  static fromTermNode(termNode, localContext) {
+    let variable = null;
+
+    const termVariableNode = termVariableNodeQuery(termNode);
+
+    if (termVariableNode !== null) {
+      const variableNode = termVariableNode,  ///
+            variableName = variableNameFromVariableNode(variableNode),
+            node = variableNode,  ///
+            string = localContext.nodeAsString(node),
+            name = variableName,  ///
+            type = null;
+
+      variable = new Variable(localContext, string, node, name, type);
+    }
+
+    return variable;
+  }
+
   static fromVariableNode(variableNode, localContext) {
     let variable = null;
 

package/lib/unify/frameWithMetaType.js

@@ -1,24 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", {
-    value: true
-});
-Object.defineProperty(exports, "default", {
-    enumerable: true,
-    get: function() {
-        return unifyFrameWithMetaType;
-    }
-});
-var _frameGivenMetaType = /*#__PURE__*/ _interop_require_default(require("../verify/frameGivenMetaType"));
-function _interop_require_default(obj) {
-    return obj && obj.__esModule ? obj : {
-        default: obj
-    };
-}
-function unifyFrameWithMetaType(frameNode, metaTypeNode, assignments, stated, localContext) {
-    var frameUnifiedWithMetaType;
-    var metaType = localContext.findMetaTypeByMetaTypeName(metaTypeNode), frameVerifiedGivenMetaType = (0, _frameGivenMetaType.default)(frameNode, metaType, assignments, stated, localContext);
-    frameUnifiedWithMetaType = frameVerifiedGivenMetaType; ///
-    return frameUnifiedWithMetaType;
-}
-
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91bmlmeS9mcmFtZVdpdGhNZXRhVHlwZS5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuaW1wb3J0IHZlcmlmeUZyYW1lR2l2ZW5NZXRhVHlwZSBmcm9tIFwiLi4vdmVyaWZ5L2ZyYW1lR2l2ZW5NZXRhVHlwZVwiO1xuXG5leHBvcnQgZGVmYXVsdCBmdW5jdGlvbiB1bmlmeUZyYW1lV2l0aE1ldGFUeXBlKGZyYW1lTm9kZSwgbWV0YVR5cGVOb2RlLCBhc3NpZ25tZW50cywgc3RhdGVkLCBsb2NhbENvbnRleHQpIHtcbiAgbGV0IGZyYW1lVW5pZmllZFdpdGhNZXRhVHlwZTtcblxuICBjb25zdCBtZXRhVHlwZSA9IGxvY2FsQ29udGV4dC5maW5kTWV0YVR5cGVCeU1ldGFUeXBlTmFtZShtZXRhVHlwZU5vZGUpLFxuICAgICAgICBmcmFtZVZlcmlmaWVkR2l2ZW5NZXRhVHlwZSA9IHZlcmlmeUZyYW1lR2l2ZW5NZXRhVHlwZShmcmFtZU5vZGUsIG1ldGFUeXBlLCBhc3NpZ25tZW50cywgc3RhdGVkLCBsb2NhbENvbnRleHQpO1xuXG4gIGZyYW1lVW5pZmllZFdpdGhNZXRhVHlwZSA9IGZyYW1lVmVyaWZpZWRHaXZlbk1ldGFUeXBlOyAgLy8vXG5cbiAgcmV0dXJuIGZyYW1lVW5pZmllZFdpdGhNZXRhVHlwZTtcbn1cbiJdLCJuYW1lcyI6WyJ1bmlmeUZyYW1lV2l0aE1ldGFUeXBlIiwiZnJhbWVOb2RlIiwibWV0YVR5cGVOb2RlIiwiYXNzaWdubWVudHMiLCJzdGF0ZWQiLCJsb2NhbENvbnRleHQiLCJmcmFtZVVuaWZpZWRXaXRoTWV0YVR5cGUiLCJtZXRhVHlwZSIsImZpbmRNZXRhVHlwZUJ5TWV0YVR5cGVOYW1lIiwiZnJhbWVWZXJpZmllZEdpdmVuTWV0YVR5cGUiLCJ2ZXJpZnlGcmFtZUdpdmVuTWV0YVR5cGUiXSwibWFwcGluZ3MiOiJBQUFBOzs7OytCQUlBOzs7ZUFBd0JBOzs7eUVBRmE7Ozs7OztBQUV0QixTQUFTQSx1QkFBdUJDLFNBQVMsRUFBRUMsWUFBWSxFQUFFQyxXQUFXLEVBQUVDLE1BQU0sRUFBRUMsWUFBWTtJQUN2RyxJQUFJQztJQUVKLElBQU1DLFdBQVdGLGFBQWFHLDBCQUEwQixDQUFDTixlQUNuRE8sNkJBQTZCQyxJQUFBQSwyQkFBd0IsRUFBQ1QsV0FBV00sVUFBVUosYUFBYUMsUUFBUUM7SUFFdEdDLDJCQUEyQkcsNEJBQTZCLEdBQUc7SUFFM0QsT0FBT0g7QUFDVCJ9

package/lib/verify/frameGivenMetaType.js

@@ -1,37 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", {
-    value: true
-});
-Object.defineProperty(exports, "default", {
-    enumerable: true,
-    get: function() {
-        return verifyFrameGivenMetaType;
-    }
-});
-var _shim = /*#__PURE__*/ _interop_require_default(require("../shim"));
-var _metaTypeNames = require("../metaTypeNames");
-function _interop_require_default(obj) {
-    return obj && obj.__esModule ? obj : {
-        default: obj
-    };
-}
-function verifyFrameGivenMetaType(frameNode, metaType, assignments, stated, localContext) {
-    var frameVerifiedGivenMetaType;
-    var metaTypeName = metaType.getName();
-    switch(metaTypeName){
-        case _metaTypeNames.FRAME_META_TYPE_NAME:
-            {
-                var verifyFrame = _shim.default.verifyFrame, frames = [], frameVerified = verifyFrame(frameNode, frames, stated, localContext);
-                frameVerifiedGivenMetaType = frameVerified; ///
-                break;
-            }
-        default:
-            {
-                debugger;
-                break;
-            }
-    }
-    return frameVerifiedGivenMetaType;
-}
-
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy92ZXJpZnkvZnJhbWVHaXZlbk1ldGFUeXBlLmpzIl0sInNvdXJjZXNDb250ZW50IjpbIlwidXNlIHN0cmljdFwiO1xuXG5pbXBvcnQgc2hpbSBmcm9tIFwiLi4vc2hpbVwiO1xuXG5pbXBvcnQgeyBGUkFNRV9NRVRBX1RZUEVfTkFNRSB9IGZyb20gXCIuLi9tZXRhVHlwZU5hbWVzXCI7XG5cbmV4cG9ydCBkZWZhdWx0IGZ1bmN0aW9uIHZlcmlmeUZyYW1lR2l2ZW5NZXRhVHlwZShmcmFtZU5vZGUsIG1ldGFUeXBlLCBhc3NpZ25tZW50cywgc3RhdGVkLCBsb2NhbENvbnRleHQpIHtcbiAgbGV0IGZyYW1lVmVyaWZpZWRHaXZlbk1ldGFUeXBlO1xuXG4gIGNvbnN0IG1ldGFUeXBlTmFtZSA9IG1ldGFUeXBlLmdldE5hbWUoKTtcblxuICBzd2l0Y2ggKG1ldGFUeXBlTmFtZSkge1xuICAgIGNhc2UgRlJBTUVfTUVUQV9UWVBFX05BTUU6IHtcbiAgICAgIGNvbnN0IHsgdmVyaWZ5RnJhbWUgfSA9IHNoaW0sXG4gICAgICAgICAgICBmcmFtZXMgPSBbXSxcbiAgICAgICAgICAgIGZyYW1lVmVyaWZpZWQgPSB2ZXJpZnlGcmFtZShmcmFtZU5vZGUsIGZyYW1lcywgc3RhdGVkLCBsb2NhbENvbnRleHQpXG5cbiAgICAgIGZyYW1lVmVyaWZpZWRHaXZlbk1ldGFUeXBlID0gZnJhbWVWZXJpZmllZDsgLy8vXG5cbiAgICAgIGJyZWFrO1xuICAgIH1cblxuICAgIGRlZmF1bHQ6IHtcbiAgICAgIGRlYnVnZ2VyXG5cbiAgICAgIGJyZWFrO1xuICAgIH1cbiAgfVxuXG4gIHJldHVybiBmcmFtZVZlcmlmaWVkR2l2ZW5NZXRhVHlwZTtcbn0iXSwibmFtZXMiOlsidmVyaWZ5RnJhbWVHaXZlbk1ldGFUeXBlIiwiZnJhbWVOb2RlIiwibWV0YVR5cGUiLCJhc3NpZ25tZW50cyIsInN0YXRlZCIsImxvY2FsQ29udGV4dCIsImZyYW1lVmVyaWZpZWRHaXZlbk1ldGFUeXBlIiwibWV0YVR5cGVOYW1lIiwiZ2V0TmFtZSIsIkZSQU1FX01FVEFfVFlQRV9OQU1FIiwidmVyaWZ5RnJhbWUiLCJzaGltIiwiZnJhbWVzIiwiZnJhbWVWZXJpZmllZCJdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7K0JBTUE7OztlQUF3QkE7OzsyREFKUDs2QkFFb0I7Ozs7OztBQUV0QixTQUFTQSx5QkFBeUJDLFNBQVMsRUFBRUMsUUFBUSxFQUFFQyxXQUFXLEVBQUVDLE1BQU0sRUFBRUMsWUFBWTtJQUNyRyxJQUFJQztJQUVKLElBQU1DLGVBQWVMLFNBQVNNLE9BQU87SUFFckMsT0FBUUQ7UUFDTixLQUFLRSxtQ0FBb0I7WUFBRTtnQkFDekIsSUFBTSxBQUFFQyxjQUFnQkMsYUFBSSxDQUFwQkQsYUFDRkUsU0FBUyxFQUFFLEVBQ1hDLGdCQUFnQkgsWUFBWVQsV0FBV1csUUFBUVIsUUFBUUM7Z0JBRTdEQyw2QkFBNkJPLGVBQWUsR0FBRztnQkFFL0M7WUFDRjtRQUVBO1lBQVM7Z0JBQ1AsUUFBUTtnQkFFUjtZQUNGO0lBQ0Y7SUFFQSxPQUFPUDtBQUNUIn0=

package/src/unify/frameWithMetaType.js

@@ -1,14 +0,0 @@
-"use strict";
-
-import verifyFrameGivenMetaType from "../verify/frameGivenMetaType";
-
-export default function unifyFrameWithMetaType(frameNode, metaTypeNode, assignments, stated, localContext) {
-  let frameUnifiedWithMetaType;
-
-  const metaType = localContext.findMetaTypeByMetaTypeName(metaTypeNode),
-        frameVerifiedGivenMetaType = verifyFrameGivenMetaType(frameNode, metaType, assignments, stated, localContext);
-
-  frameUnifiedWithMetaType = frameVerifiedGivenMetaType;  ///
-
-  return frameUnifiedWithMetaType;
-}

package/src/verify/frameGivenMetaType.js

@@ -1,31 +0,0 @@
-"use strict";
-
-import shim from "../shim";
-
-import { FRAME_META_TYPE_NAME } from "../metaTypeNames";
-
-export default function verifyFrameGivenMetaType(frameNode, metaType, assignments, stated, localContext) {
-  let frameVerifiedGivenMetaType;
-
-  const metaTypeName = metaType.getName();
-
-  switch (metaTypeName) {
-    case FRAME_META_TYPE_NAME: {
-      const { verifyFrame } = shim,
-            frames = [],
-            frameVerified = verifyFrame(frameNode, frames, stated, localContext)
-
-      frameVerifiedGivenMetaType = frameVerified; ///
-
-      break;
-    }
-
-    default: {
-      debugger
-
-      break;
-    }
-  }
-
-  return frameVerifiedGivenMetaType;
-}