occam-verify-cli 0.0.1032 → 0.0.1033

package/src/context/release.js

@@ -438,9 +438,9 @@ export default class ReleaseContext {
 
     this.parser = nominalParser; ///
 
-    this.fileContexts = released ?
-                          fileContextsFromJSONEntriesAndReleaseContext(this.json, this.entries, releaseContext) :
-                            fileContextsFromEntriesAndReleaseContext(this.entries, releaseContext);
+    released ?
+       fileContextsFromJSONAndReleaseContext(this.json, this.fileContexts, releaseContext) :
+         fileContextsFromEntriesAndReleaseContext(this.entries, this.fileContexts, releaseContext);
 
     this.initialised = true;
   }
@@ -487,31 +487,20 @@ export default class ReleaseContext {
   }
 }
 
-function fileContextsFromJSONEntriesAndReleaseContext(json, entries, releaseContext) {
-  const fileContexts = [];
+function fileContextsFromJSONAndReleaseContext(json, fileContexts, releaseContext) {
+  const fileContextsJSON = json;  ///
 
-  entries.forEachFile((file) => {
-    const filePath = file.getPath(),
-          filePathNominalFilePath = isFilePathNominalFilePath(filePath);
-
-    if (filePathNominalFilePath) {
-      const fileContext = FileContext.fromFileAndReleaseContext(file, releaseContext),
-            filePath = fileContext.getFilePath();
-
-      fileContexts.push(fileContext);
+  fileContextsJSON.forEach((fileContextJSON) => {
+    const json = fileContextJSON,
+          fileContext = FileContext.fromJSONAndReleaseContext(json, releaseContext);
 
-      const fileContextJSON = findFileContextJSON(json, filePath);
+    fileContext.initialise(fileContextJSON);
 
-      fileContext.initialise(fileContextJSON);
-    }
+    fileContexts.push(fileContext);
   });
-
-  return fileContexts;
 }
 
-function fileContextsFromEntriesAndReleaseContext(entries, releaseContext) {
-  const fileContexts = [];
-
+function fileContextsFromEntriesAndReleaseContext(entries, fileContexts, releaseContext) {
   entries.forEachFile((file) => {
     const filePath = file.getPath(),
           filePathNominalFilePath = isFilePathNominalFilePath(filePath);
@@ -526,19 +515,6 @@ function fileContextsFromEntriesAndReleaseContext(entries, releaseContext) {
   return fileContexts;
 }
 
-function findFileContextJSON(json, filePath) {
-  const fileContextsJSON = json,  ///
-        fileContextJSON = fileContextsJSON.find((fileContextJSON) => {
-          const { filePath: fileContextFilePath } = fileContextJSON;
-
-          if (fileContextFilePath === filePath) {
-            return true;
-          }
-        });
-
-  return fileContextJSON;
-}
-
 function verifyFileContexts(fileContexts, verifiedFileContexts) {
   let fileContextsVerified;
 

package/src/mixins/statement/verify.js

@@ -1,11 +1,11 @@
 "use strict";
 
 import Equality from "../../equality";
+import TypeAssertion from "../../assertion/type";
 
 import verifyFrame from "../../verify/frame";
 import verifyJudgement from "../../verify/judgement";
 import verifyDeclaration from "../../verify/declaration";
-import verifyTypeAssertion from "../../verify/assertion/type";
 import metavariableUnifier from "../../unifier/metavariable";
 import verifyDefinedAssertion from "../../verify/assertion/defined";
 import verifySubproofAssertion from "../../verify/assertion/subproof";
@@ -151,7 +151,8 @@ function verifyAsTypeAssertion(statement, assignments, stated, localContext) {
 
     localContext.trace(`Verifying the '${statementString}' statement as a type assertion...`);
 
-    const typeAssertionVerified = verifyTypeAssertion(typeAssertionNode, assignments, stated, localContext);
+    const typeAssertion = TypeAssertion.fromTypeAssertionNode(typeAssertionNode, localContext),
+          typeAssertionVerified = typeAssertion.verify(assignments, stated, localContext);
 
     verifiedAsTypeAssertion = typeAssertionVerified; ///
 

package/src/term.js

@@ -8,6 +8,7 @@ import termAsConstructorVerifier from "./verifier/termAsConstructor";
 import { filter } from "./utilities/array";
 import { nodesQuery } from "./utilities/query"
 import { termNodeFromTermString } from "./utilities/node";
+import {objectType} from "./type";
 
 const variableNodesQuery = nodesQuery("//variable");
 
@@ -136,22 +137,26 @@ class Term {
   verifyType(fileContext) {
     let typeVerified;
 
-    const typeName = this.type.getName();
+    if (this.type === objectType) {
+      typeVerified = true;
+    } else {
+      const typeName = this.type.getName();
 
-    fileContext.trace(`Verifying the '${typeName}' type...`);
+      fileContext.trace(`Verifying the '${typeName}' type...`);
 
-    const type = fileContext.findTypeByTypeName(typeName);
+      const type = fileContext.findTypeByTypeName(typeName);
 
-    if (type === null) {
-      fileContext.debug(`The '${typeName}' type is missing.`);
-    } else {
-      this.type = type; ///
+      if (type === null) {
+        fileContext.debug(`The '${typeName}' type is missing.`);
+      } else {
+        this.type = type; ///
 
-      typeVerified = true;
-    }
+        typeVerified = true;
+      }
 
-    if (typeVerified) {
-      fileContext.debug(`...verified the '${typeName}' type.`);
+      if (typeVerified) {
+        fileContext.debug(`...verified the '${typeName}' type.`);
+      }
     }
 
     return typeVerified;
@@ -160,10 +165,10 @@ class Term {
   verifyGivenType(type, localContext) {
     let verifiedGivenType;
 
-    const termString = this.getString(),
-          typeString = type.getString();
+    const typeName = type.getName(),
+          termString = this.getString();
 
-    localContext.trace(`Verifying the '${termString}' term given the '${typeString}' type...`);
+    localContext.trace(`Verifying the '${termString}' term given the '${typeName}' type...`);
 
     const verified = this.verify(localContext, () => {
       let verifiedAhead;
@@ -180,7 +185,7 @@ class Term {
     verifiedGivenType = verified; ///
 
     if (verifiedGivenType) {
-      localContext.debug(`...verified the '${termString}' term given the '${typeString}' type.`);
+      localContext.debug(`...verified the '${termString}' term given the '${typeName}' type.`);
     }
 
     return verifiedGivenType;

package/src/unifier/statementWithCombinator.js

@@ -55,7 +55,7 @@ class StatementWithCombinatorUnifier extends Unifier {
               metaTypeNode = metaTypeNodeB, ///
               frameNode = frameNodeA, ///
               metaType = MetaType.fromMetaTypeNode(metaTypeNode, localContext),
-              frame = Frame.fromTermNode(frameNode, localContext),
+              frame = Frame.fromFrameNode(frameNode, localContext),
               frameVerifiedGivenType = frame.verifyGivenMetaType(metaType, localContext);
 
         unified = frameVerifiedGivenType;

package/src/variable.js

@@ -4,9 +4,9 @@ import shim from "./shim";
 import LocalContext from "./context/local";
 
 import { nodeQuery } from "./utilities/query";
-import { objectType } from "./type";
 import { variableNameFromVariableNode} from "./utilities/name";
 import { variableNodeFromVariableString } from "./utilities/node";
+import {objectType} from "./type";
 
 const typeNodeQuery = nodeQuery("/variableDeclaration/type"),
       variableNodeQuery = nodeQuery("/variableDeclaration/variable");
@@ -35,6 +35,10 @@ export default class Variable {
     return this.type;
   }
 
+  setType(type) {
+    this.type = type;
+  }
+
   matchNode(node) {
     const nodeMatches = this.node.match(node);
 
@@ -78,22 +82,26 @@ export default class Variable {
   verifyType(fileContext) {
     let typeVerified;
 
-    const typeName = this.type.getName();
+    if (this.type === objectType) {
+      typeVerified = true;
+    } else {
+      const typeName = this.type.getName();
 
-    fileContext.trace(`Verifying the '${typeName}' type...`);
+      fileContext.trace(`Verifying the '${typeName}' type...`);
 
-    const type = fileContext.findTypeByTypeName(typeName);
+      const type = fileContext.findTypeByTypeName(typeName);
 
-    if (type === null) {
-      fileContext.debug(`The '${typeName}' type is missing.`);
-    } else {
-      this.type = type; ///
+      if (type === null) {
+        fileContext.debug(`The '${typeName}' type is missing.`);
+      } else {
+        this.type = type; ///
 
-      typeVerified = true;
-    }
+        typeVerified = true;
+      }
 
-    if (typeVerified) {
-      fileContext.debug(`...verified the '${typeName}' type.`);
+      if (typeVerified) {
+        fileContext.debug(`...verified the '${typeName}' type.`);
+      }
     }
 
     return typeVerified;
@@ -153,12 +161,17 @@ export default class Variable {
   }
 
   static fromVariableNode(variableNode, localContext) {
-    const node = variableNode,  ///
-          variableName = variableNameFromVariableNode(variableNode),
-          string = localContext.nodeAsString(node),
-          name = variableName,  ///
-          type = null,
-          variable = new Variable(string, node, name, type);
+    let variable = null;
+
+    if (variableNode !== null) {
+      const node = variableNode,  ///
+            variableName = variableNameFromVariableNode(variableNode),
+            string = localContext.nodeAsString(node),
+            name = variableName,  ///
+            type = null;
+
+      variable = new Variable(string, node, name, type);
+    }
 
     return variable;
   }

package/lib/verify/assertion/type.js

@@ -1,99 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", {
-    value: true
-});
-Object.defineProperty(exports, "default", {
-    enumerable: true,
-    get: function() {
-        return verifyTypeAssertion;
-    }
-});
-var _variable = /*#__PURE__*/ _interop_require_default(require("../../variable"));
-var _variable1 = /*#__PURE__*/ _interop_require_default(require("../../assignment/variable"));
-var _array = require("../../utilities/array");
-var _query = require("../../utilities/query");
-function _interop_require_default(obj) {
-    return obj && obj.__esModule ? obj : {
-        default: obj
-    };
-}
-var termNodeQuery = (0, _query.nodeQuery)("/typeAssertion/term!"), typeNodeQuery = (0, _query.nodeQuery)("/typeAssertion/type!"), variableNodeQuery = (0, _query.nodeQuery)("/term/variable!");
-var verifyTypeAssertionFunctions = [
-    verifyDerivedTypeAssertion,
-    verifyStatedTypeAssertion
-];
-function verifyTypeAssertion(typeAssertionNode, assignments, stated, localContext) {
-    var typeAssertionVerified;
-    var typeAssertionString = localContext.nodeAsString(typeAssertionNode);
-    localContext.trace("Verifying the '".concat(typeAssertionString, "' type assertion..."), typeAssertionNode);
-    typeAssertionVerified = verifyTypeAssertionFunctions.some(function(verifyTypeAssertionFunction) {
-        var typeAssertionVerified = verifyTypeAssertionFunction(typeAssertionNode, assignments, stated, localContext);
-        if (typeAssertionVerified) {
-            return true;
-        }
-    });
-    if (typeAssertionVerified) {
-        localContext.debug("...verified the '".concat(typeAssertionString, "' type assertion."), typeAssertionNode);
-    }
-    return typeAssertionVerified;
-}
-function verifyDerivedTypeAssertion(typeAssertionNode, assignments, stated, localContext) {
-    var derivedTypeAssertionVerified = false;
-    if (!stated) {
-        var typeAssertionString = localContext.nodeAsString(typeAssertionNode);
-        localContext.trace("Verifying the '".concat(typeAssertionString, "' derived type assertion..."), typeAssertionNode);
-        var typeNode = typeNodeQuery(typeAssertionNode), type = localContext.findTypeByTypeNode(typeNode);
-        if (type === null) {
-            var typeString = localContext.nodeAsString(typeNode);
-            localContext.debug("The '".concat(typeString, "' type is not present."), typeNode);
-        }
-        var terms = [], termNode = termNodeQuery(typeAssertionNode), termVerified = verifyTerm(termNode, terms, localContext, function() {
-            var verifiedAhead = false;
-            var firstTerm = (0, _array.first)(terms), term = firstTerm, termType = localContext.getTermType(term), typeEqualToOrSuperTypeOfTermType = type.isEqualToOrSuperTypeOf(termType);
-            if (typeEqualToOrSuperTypeOfTermType) {
-                verifiedAhead = true;
-            }
-            return verifiedAhead;
-        });
-        derivedTypeAssertionVerified = termVerified; ///
-        if (derivedTypeAssertionVerified) {
-            localContext.debug("...verified the '".concat(typeAssertionString, "' derived type assertion."), typeAssertionNode);
-        }
-    }
-    return derivedTypeAssertionVerified;
-}
-function verifyStatedTypeAssertion(typeAssertionNode, assignments, stated, localContext) {
-    var statedTypeAssertionVerified = false;
-    if (stated) {
-        var typeAssertionString = localContext.nodeAsString(typeAssertionNode);
-        localContext.trace("Verifying the '".concat(typeAssertionString, "' stated type assertion..."), typeAssertionNode);
-        var typeNode = typeNodeQuery(typeAssertionNode), type = localContext.findTypeByTypeNode(typeNode);
-        if (type === null) {
-            var typeString = localContext.nodeAsString(typeNode);
-            localContext.debug("The '".concat(typeString, "' type is not present."), typeNode);
-        } else {
-            var terms = [], termNode = termNodeQuery(typeAssertionNode), termVerified = verifyTerm(termNode, terms, localContext, function() {
-                var verifiedAhead = false;
-                var firstTerm = (0, _array.first)(terms), term = firstTerm, termType = term.getType(), typeEqualToOrSubTypeOfTermType = type.isEqualToOrSubTypeOf(termType);
-                if (typeEqualToOrSubTypeOfTermType) {
-                    var variableNode = variableNodeQuery(termNode);
-                    if (variableNode !== null) {
-                        if (assignments !== null) {
-                            var variable = _variable.default.fromVariableNodeAndType(variableNode, type), variableAssignment = _variable1.default.fromVariable(variable), assignment = variableAssignment; ///
-                            assignments.push(assignment);
-                        }
-                    }
-                    verifiedAhead = true;
-                }
-                return verifiedAhead;
-            });
-            statedTypeAssertionVerified = termVerified; ///
-        }
-        if (statedTypeAssertionVerified) {
-            localContext.debug("...verified the '".concat(typeAssertionString, "' stated type assertion."), typeAssertionNode);
-        }
-    }
-    return statedTypeAssertionVerified;
-}
-
-//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../../src/verify/assertion/type.js"],"sourcesContent":["\"use strict\";\n\nimport Variable from \"../../variable\";\n// import verifyTerm from \"../../verify/term\";\nimport VariableAssignment from \"../../assignment/variable\";\n\nimport { first } from \"../../utilities/array\";\nimport { nodeQuery } from \"../../utilities/query\";\n\nconst termNodeQuery = nodeQuery(\"/typeAssertion/term!\"),\n      typeNodeQuery = nodeQuery(\"/typeAssertion/type!\"),\n      variableNodeQuery = nodeQuery(\"/term/variable!\");\n\nconst verifyTypeAssertionFunctions = [\n  verifyDerivedTypeAssertion,\n  verifyStatedTypeAssertion\n];\n\nexport default function verifyTypeAssertion(typeAssertionNode, assignments, stated, localContext) {\n  let typeAssertionVerified;\n\n  const typeAssertionString = localContext.nodeAsString(typeAssertionNode);\n\n  localContext.trace(`Verifying the '${typeAssertionString}' type assertion...`, typeAssertionNode);\n\n  typeAssertionVerified = verifyTypeAssertionFunctions.some((verifyTypeAssertionFunction) => {\n    const typeAssertionVerified = verifyTypeAssertionFunction(typeAssertionNode, assignments, stated, localContext);\n\n    if (typeAssertionVerified) {\n      return true;\n    }\n  });\n\n  if (typeAssertionVerified) {\n    localContext.debug(`...verified the '${typeAssertionString}' type assertion.`, typeAssertionNode);\n  }\n\n  return typeAssertionVerified;\n}\n\nfunction verifyDerivedTypeAssertion(typeAssertionNode, assignments, stated, localContext) {\n  let derivedTypeAssertionVerified = false;\n\n  if (!stated) {\n    const typeAssertionString = localContext.nodeAsString(typeAssertionNode);\n\n    localContext.trace(`Verifying the '${typeAssertionString}' derived type assertion...`, typeAssertionNode);\n\n    const typeNode = typeNodeQuery(typeAssertionNode),\n          type = localContext.findTypeByTypeNode(typeNode);\n\n    if (type === null) {\n      const typeString = localContext.nodeAsString(typeNode);\n\n      localContext.debug(`The '${typeString}' type is not present.`, typeNode);\n    }\n\n    const terms = [],\n          termNode = termNodeQuery(typeAssertionNode),\n          termVerified = verifyTerm(termNode, terms, localContext, () => {\n            let verifiedAhead = false;\n\n            const firstTerm = first(terms),\n                  term = firstTerm, ///\n                  termType = localContext.getTermType(term),\n                  typeEqualToOrSuperTypeOfTermType = type.isEqualToOrSuperTypeOf(termType);\n\n            if (typeEqualToOrSuperTypeOfTermType) {\n              verifiedAhead = true;\n            }\n\n            return verifiedAhead;\n          });\n\n    derivedTypeAssertionVerified = termVerified; ///\n\n    if (derivedTypeAssertionVerified) {\n      localContext.debug(`...verified the '${typeAssertionString}' derived type assertion.`, typeAssertionNode);\n    }\n  }\n\n  return derivedTypeAssertionVerified;\n}\n\nfunction verifyStatedTypeAssertion(typeAssertionNode, assignments, stated, localContext) {\n  let statedTypeAssertionVerified = false;\n\n  if (stated) {\n    const typeAssertionString = localContext.nodeAsString(typeAssertionNode);\n\n    localContext.trace(`Verifying the '${typeAssertionString}' stated type assertion...`, typeAssertionNode);\n\n    const typeNode = typeNodeQuery(typeAssertionNode),\n          type = localContext.findTypeByTypeNode(typeNode);\n\n    if (type === null) {\n      const typeString = localContext.nodeAsString(typeNode);\n\n      localContext.debug(`The '${typeString}' type is not present.`, typeNode);\n    } else {\n      const terms = [],\n            termNode = termNodeQuery(typeAssertionNode),\n            termVerified = verifyTerm(termNode, terms, localContext, () => {\n              let verifiedAhead = false;\n\n              const firstTerm = first(terms),\n                    term = firstTerm, ///\n                    termType = term.getType(),\n                    typeEqualToOrSubTypeOfTermType = type.isEqualToOrSubTypeOf(termType);\n\n              if (typeEqualToOrSubTypeOfTermType) {\n                const variableNode = variableNodeQuery(termNode);\n\n                if (variableNode !== null) {\n                  if (assignments !== null) {\n                    const variable = Variable.fromVariableNodeAndType(variableNode, type),\n                          variableAssignment = VariableAssignment.fromVariable(variable),\n                          assignment = variableAssignment;  ///\n\n                    assignments.push(assignment);\n                  }\n                }\n\n                verifiedAhead = true;\n              }\n\n              return verifiedAhead;\n            });\n\n      statedTypeAssertionVerified = termVerified; ///\n    }\n\n    if (statedTypeAssertionVerified) {\n      localContext.debug(`...verified the '${typeAssertionString}' stated type assertion.`, typeAssertionNode);\n    }\n  }\n\n  return statedTypeAssertionVerified;\n}\n"],"names":["verifyTypeAssertion","termNodeQuery","nodeQuery","typeNodeQuery","variableNodeQuery","verifyTypeAssertionFunctions","verifyDerivedTypeAssertion","verifyStatedTypeAssertion","typeAssertionNode","assignments","stated","localContext","typeAssertionVerified","typeAssertionString","nodeAsString","trace","some","verifyTypeAssertionFunction","debug","derivedTypeAssertionVerified","typeNode","type","findTypeByTypeNode","typeString","terms","termNode","termVerified","verifyTerm","verifiedAhead","firstTerm","first","term","termType","getTermType","typeEqualToOrSuperTypeOfTermType","isEqualToOrSuperTypeOf","statedTypeAssertionVerified","getType","typeEqualToOrSubTypeOfTermType","isEqualToOrSubTypeOf","variableNode","variable","Variable","fromVariableNodeAndType","variableAssignment","VariableAssignment","fromVariable","assignment","push"],"mappings":"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"}

package/src/verify/assertion/type.js

@@ -1,139 +0,0 @@
-"use strict";
-
-import Variable from "../../variable";
-// import verifyTerm from "../../verify/term";
-import VariableAssignment from "../../assignment/variable";
-
-import { first } from "../../utilities/array";
-import { nodeQuery } from "../../utilities/query";
-
-const termNodeQuery = nodeQuery("/typeAssertion/term!"),
-      typeNodeQuery = nodeQuery("/typeAssertion/type!"),
-      variableNodeQuery = nodeQuery("/term/variable!");
-
-const verifyTypeAssertionFunctions = [
-  verifyDerivedTypeAssertion,
-  verifyStatedTypeAssertion
-];
-
-export default function verifyTypeAssertion(typeAssertionNode, assignments, stated, localContext) {
-  let typeAssertionVerified;
-
-  const typeAssertionString = localContext.nodeAsString(typeAssertionNode);
-
-  localContext.trace(`Verifying the '${typeAssertionString}' type assertion...`, typeAssertionNode);
-
-  typeAssertionVerified = verifyTypeAssertionFunctions.some((verifyTypeAssertionFunction) => {
-    const typeAssertionVerified = verifyTypeAssertionFunction(typeAssertionNode, assignments, stated, localContext);
-
-    if (typeAssertionVerified) {
-      return true;
-    }
-  });
-
-  if (typeAssertionVerified) {
-    localContext.debug(`...verified the '${typeAssertionString}' type assertion.`, typeAssertionNode);
-  }
-
-  return typeAssertionVerified;
-}
-
-function verifyDerivedTypeAssertion(typeAssertionNode, assignments, stated, localContext) {
-  let derivedTypeAssertionVerified = false;
-
-  if (!stated) {
-    const typeAssertionString = localContext.nodeAsString(typeAssertionNode);
-
-    localContext.trace(`Verifying the '${typeAssertionString}' derived type assertion...`, typeAssertionNode);
-
-    const typeNode = typeNodeQuery(typeAssertionNode),
-          type = localContext.findTypeByTypeNode(typeNode);
-
-    if (type === null) {
-      const typeString = localContext.nodeAsString(typeNode);
-
-      localContext.debug(`The '${typeString}' type is not present.`, typeNode);
-    }
-
-    const terms = [],
-          termNode = termNodeQuery(typeAssertionNode),
-          termVerified = verifyTerm(termNode, terms, localContext, () => {
-            let verifiedAhead = false;
-
-            const firstTerm = first(terms),
-                  term = firstTerm, ///
-                  termType = localContext.getTermType(term),
-                  typeEqualToOrSuperTypeOfTermType = type.isEqualToOrSuperTypeOf(termType);
-
-            if (typeEqualToOrSuperTypeOfTermType) {
-              verifiedAhead = true;
-            }
-
-            return verifiedAhead;
-          });
-
-    derivedTypeAssertionVerified = termVerified; ///
-
-    if (derivedTypeAssertionVerified) {
-      localContext.debug(`...verified the '${typeAssertionString}' derived type assertion.`, typeAssertionNode);
-    }
-  }
-
-  return derivedTypeAssertionVerified;
-}
-
-function verifyStatedTypeAssertion(typeAssertionNode, assignments, stated, localContext) {
-  let statedTypeAssertionVerified = false;
-
-  if (stated) {
-    const typeAssertionString = localContext.nodeAsString(typeAssertionNode);
-
-    localContext.trace(`Verifying the '${typeAssertionString}' stated type assertion...`, typeAssertionNode);
-
-    const typeNode = typeNodeQuery(typeAssertionNode),
-          type = localContext.findTypeByTypeNode(typeNode);
-
-    if (type === null) {
-      const typeString = localContext.nodeAsString(typeNode);
-
-      localContext.debug(`The '${typeString}' type is not present.`, typeNode);
-    } else {
-      const terms = [],
-            termNode = termNodeQuery(typeAssertionNode),
-            termVerified = verifyTerm(termNode, terms, localContext, () => {
-              let verifiedAhead = false;
-
-              const firstTerm = first(terms),
-                    term = firstTerm, ///
-                    termType = term.getType(),
-                    typeEqualToOrSubTypeOfTermType = type.isEqualToOrSubTypeOf(termType);
-
-              if (typeEqualToOrSubTypeOfTermType) {
-                const variableNode = variableNodeQuery(termNode);
-
-                if (variableNode !== null) {
-                  if (assignments !== null) {
-                    const variable = Variable.fromVariableNodeAndType(variableNode, type),
-                          variableAssignment = VariableAssignment.fromVariable(variable),
-                          assignment = variableAssignment;  ///
-
-                    assignments.push(assignment);
-                  }
-                }
-
-                verifiedAhead = true;
-              }
-
-              return verifiedAhead;
-            });
-
-      statedTypeAssertionVerified = termVerified; ///
-    }
-
-    if (statedTypeAssertionVerified) {
-      localContext.debug(`...verified the '${typeAssertionString}' stated type assertion.`, typeAssertionNode);
-    }
-  }
-
-  return statedTypeAssertionVerified;
-}