occam-verify-cli 0.0.698 → 0.0.700

package/lib/verify/term.js

@@ -69,10 +69,9 @@ function verifyTermAsVariable(termNode, variables, context, verifyAhead) {
     if (variableNode !== null) {
         var termString = context.nodeAsString(termNode);
         context.trace("Verifying the '".concat(termString, "' term as a variable..."), termNode);
-        var variablePresent = context.isVariablePresentByVariableNode(variableNode);
-        if (variablePresent) {
+        var variable = context.findVariableByVariableNode(variableNode);
+        if (variable !== null) {
             var verifiedAhead;
-            var variable = context.findVariableByVariableNode(variableNode);
             variables.push(variable);
             verifiedAhead = verifyAhead();
             if (!verifiedAhead) {
@@ -127,4 +126,4 @@ function verifyTermAgainstConstructor(termNode, terms, constructor, context, ver
     return termVerifiedAgainstConstructor;
 }
 
-//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/verify/term.js"],"sourcesContent":["\"use strict\";\n\nimport Term from \"../term\";\nimport termNodesVerifier from \"../verifier/nodes/term\";\n\nimport { first } from \"../utilities/array\";\nimport { nodeQuery } from \"../utilities/query\";\n\nconst variableNodeQuery = nodeQuery(\"/term/variable!\");\n\nfunction verifyTerm(termNode, terms, context, verifyAhead) {\n  let termVerified;\n\n  const termString = context.nodeAsString(termNode);\n\n  context.trace(`Verifying the '${termString}' term...`, termNode);\n\n  const verifyTermFunctions = [\n    verifyTermAsStandaloneVariable,\n    verifyTermAgainstConstructors\n  ];\n\n  termVerified = verifyTermFunctions.some((verifyTermFunction) => {\n    const termVerified = verifyTermFunction(termNode, terms, context, verifyAhead);\n\n    if (termVerified) {\n      return true;\n    }\n  });\n\n  if (termVerified) {\n    context.debug(`...verified the '${termString}' term.`, termNode);\n  }\n\n  return termVerified;\n}\n\nObject.assign(termNodesVerifier, {\n  verifyTerm\n});\n\nexport default verifyTerm;\n\nexport function verifyTermAgainstConstructors(termNode, terms, context, verifyAhead) {\n  let termVerifiedAgainstConstructors;\n\n  const constructors = context.getConstructors();\n\n  termVerifiedAgainstConstructors = constructors.some((constructor) => {\n    const termVerifiedAgainstConstructor = verifyTermAgainstConstructor(termNode, terms, constructor, context, verifyAhead);\n\n    if (termVerifiedAgainstConstructor) {\n      return true;\n    }\n  });\n\n  return termVerifiedAgainstConstructors;\n}\n\nexport function verifyTermAsVariable(termNode, variables, context, verifyAhead) {\n  let termVerifiedAsVariable = false;\n\n  const variableNode = variableNodeQuery(termNode);\n\n  if (variableNode !== null) {\n    const termString = context.nodeAsString(termNode);\n\n    context.trace(`Verifying the '${termString}' term as a variable...`, termNode);\n\n    const variablePresent = context.isVariablePresentByVariableNode(variableNode);\n\n    if (variablePresent) {\n      let verifiedAhead;\n\n      const variable = context.findVariableByVariableNode(variableNode);\n\n      variables.push(variable);\n\n      verifiedAhead = verifyAhead();\n\n      if (!verifiedAhead) {\n        variables.pop();\n      }\n\n      termVerifiedAsVariable = verifiedAhead; ///\n    }\n\n    if (termVerifiedAsVariable) {\n      context.debug(`...verified the '${termString}' term as a variable.`, termNode);\n    }\n  }\n\n  return termVerifiedAsVariable;\n}\n\nfunction verifyTermAsStandaloneVariable(termNode, terms, context, verifyAhead) {\n  let termVerifiedAsStandaloneVariable;\n\n  const termString = context.nodeAsString(termNode);\n\n  context.trace(`Verifying the '${termString}' term as a standalone variable...`, termNode);\n\n  const variables = [],\n        termVerifiedAsVariable = verifyTermAsVariable(termNode, variables, context, () => {\n          let verifiedAhead;\n\n          const firstVariable = first(variables),\n                variable = firstVariable, ///\n                type = variable.getType(),\n                term = Term.fromTermNodeAndType(termNode, type);\n\n          terms.push(term);\n\n          verifiedAhead = verifyAhead();\n\n          if (!verifiedAhead) {\n            terms.pop();\n          }\n\n          return verifiedAhead;\n        });\n\n  termVerifiedAsStandaloneVariable = termVerifiedAsVariable;  ///\n\n  if (termVerifiedAsStandaloneVariable) {\n    context.debug(`...verified the '${termString}' term as a standalone variable.`, termNode);\n  }\n\n  return termVerifiedAsStandaloneVariable;\n}\n\nfunction verifyTermAgainstConstructor(termNode, terms, constructor, context, verifyAhead) {\n  let termVerifiedAgainstConstructor;\n\n  const termString = context.nodeAsString(termNode),\n        constructorString = constructor.getString();\n\n  context.trace(`Verifying the '${termString}' term against the '${constructorString}' constructor...`, termNode);\n\n  const constructorTermNode = constructor.getTermNode(),\n        nonTerminalNNdeA = termNode,  ///\n        nonTerminalNodeB = constructorTermNode,  ///\n        nodeVerified = termNodesVerifier.verifyNonTerminalNode(nonTerminalNNdeA, nonTerminalNodeB, context, () => {\n          let verifiedAhead;\n\n          const type = constructor.getType(),\n                term = Term.fromTermNodeAndType(termNode, type);\n\n          terms.push(term);\n\n          verifiedAhead = verifyAhead();\n\n          if (!verifiedAhead) {\n            terms.pop();\n          }\n\n          return verifiedAhead;\n        });\n\n  termVerifiedAgainstConstructor = nodeVerified;  ///\n\n  if (termVerifiedAgainstConstructor) {\n    context.debug(`...verified the '${termString}' term against the '${constructorString}' constructor.`, termNode);\n  }\n\n  return termVerifiedAgainstConstructor;\n}\n"],"names":["verifyTermAgainstConstructors","verifyTermAsVariable","variableNodeQuery","nodeQuery","verifyTerm","termNode","terms","context","verifyAhead","termVerified","termString","nodeAsString","trace","verifyTermFunctions","verifyTermAsStandaloneVariable","some","verifyTermFunction","debug","Object","assign","termNodesVerifier","termVerifiedAgainstConstructors","constructors","getConstructors","constructor","termVerifiedAgainstConstructor","verifyTermAgainstConstructor","variables","termVerifiedAsVariable","variableNode","variablePresent","isVariablePresentByVariableNode","verifiedAhead","variable","findVariableByVariableNode","push","pop","termVerifiedAsStandaloneVariable","firstVariable","first","type","getType","term","Term","fromTermNodeAndType","constructorString","getString","constructorTermNode","getTermNode","nonTerminalNNdeA","nonTerminalNodeB","nodeVerified","verifyNonTerminalNode"],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/verify/term.js"],"sourcesContent":["\"use strict\";\n\nimport Term from \"../term\";\nimport termNodesVerifier from \"../verifier/nodes/term\";\n\nimport { first } from \"../utilities/array\";\nimport { nodeQuery } from \"../utilities/query\";\n\nconst variableNodeQuery = nodeQuery(\"/term/variable!\");\n\nfunction verifyTerm(termNode, terms, context, verifyAhead) {\n  let termVerified;\n\n  const termString = context.nodeAsString(termNode);\n\n  context.trace(`Verifying the '${termString}' term...`, termNode);\n\n  const verifyTermFunctions = [\n    verifyTermAsStandaloneVariable,\n    verifyTermAgainstConstructors\n  ];\n\n  termVerified = verifyTermFunctions.some((verifyTermFunction) => {\n    const termVerified = verifyTermFunction(termNode, terms, context, verifyAhead);\n\n    if (termVerified) {\n      return true;\n    }\n  });\n\n  if (termVerified) {\n    context.debug(`...verified the '${termString}' term.`, termNode);\n  }\n\n  return termVerified;\n}\n\nObject.assign(termNodesVerifier, {\n  verifyTerm\n});\n\nexport default verifyTerm;\n\nexport function verifyTermAgainstConstructors(termNode, terms, context, verifyAhead) {\n  let termVerifiedAgainstConstructors;\n\n  const constructors = context.getConstructors();\n\n  termVerifiedAgainstConstructors = constructors.some((constructor) => {\n    const termVerifiedAgainstConstructor = verifyTermAgainstConstructor(termNode, terms, constructor, context, verifyAhead);\n\n    if (termVerifiedAgainstConstructor) {\n      return true;\n    }\n  });\n\n  return termVerifiedAgainstConstructors;\n}\n\nexport function verifyTermAsVariable(termNode, variables, context, verifyAhead) {\n  let termVerifiedAsVariable = false;\n\n  const variableNode = variableNodeQuery(termNode);\n\n  if (variableNode !== null) {\n    const termString = context.nodeAsString(termNode);\n\n    context.trace(`Verifying the '${termString}' term as a variable...`, termNode);\n\n    const variable = context.findVariableByVariableNode(variableNode);\n\n    if (variable !== null) {\n      let verifiedAhead;\n\n      variables.push(variable);\n\n      verifiedAhead = verifyAhead();\n\n      if (!verifiedAhead) {\n        variables.pop();\n      }\n\n      termVerifiedAsVariable = verifiedAhead; ///\n    }\n\n    if (termVerifiedAsVariable) {\n      context.debug(`...verified the '${termString}' term as a variable.`, termNode);\n    }\n  }\n\n  return termVerifiedAsVariable;\n}\n\nfunction verifyTermAsStandaloneVariable(termNode, terms, context, verifyAhead) {\n  let termVerifiedAsStandaloneVariable;\n\n  const termString = context.nodeAsString(termNode);\n\n  context.trace(`Verifying the '${termString}' term as a standalone variable...`, termNode);\n\n  const variables = [],\n        termVerifiedAsVariable = verifyTermAsVariable(termNode, variables, context, () => {\n          let verifiedAhead;\n\n          const firstVariable = first(variables),\n                variable = firstVariable, ///\n                type = variable.getType(),\n                term = Term.fromTermNodeAndType(termNode, type);\n\n          terms.push(term);\n\n          verifiedAhead = verifyAhead();\n\n          if (!verifiedAhead) {\n            terms.pop();\n          }\n\n          return verifiedAhead;\n        });\n\n  termVerifiedAsStandaloneVariable = termVerifiedAsVariable;  ///\n\n  if (termVerifiedAsStandaloneVariable) {\n    context.debug(`...verified the '${termString}' term as a standalone variable.`, termNode);\n  }\n\n  return termVerifiedAsStandaloneVariable;\n}\n\nfunction verifyTermAgainstConstructor(termNode, terms, constructor, context, verifyAhead) {\n  let termVerifiedAgainstConstructor;\n\n  const termString = context.nodeAsString(termNode),\n        constructorString = constructor.getString();\n\n  context.trace(`Verifying the '${termString}' term against the '${constructorString}' constructor...`, termNode);\n\n  const constructorTermNode = constructor.getTermNode(),\n        nonTerminalNNdeA = termNode,  ///\n        nonTerminalNodeB = constructorTermNode,  ///\n        nodeVerified = termNodesVerifier.verifyNonTerminalNode(nonTerminalNNdeA, nonTerminalNodeB, context, () => {\n          let verifiedAhead;\n\n          const type = constructor.getType(),\n                term = Term.fromTermNodeAndType(termNode, type);\n\n          terms.push(term);\n\n          verifiedAhead = verifyAhead();\n\n          if (!verifiedAhead) {\n            terms.pop();\n          }\n\n          return verifiedAhead;\n        });\n\n  termVerifiedAgainstConstructor = nodeVerified;  ///\n\n  if (termVerifiedAgainstConstructor) {\n    context.debug(`...verified the '${termString}' term against the '${constructorString}' constructor.`, termNode);\n  }\n\n  return termVerifiedAgainstConstructor;\n}\n"],"names":["verifyTermAgainstConstructors","verifyTermAsVariable","variableNodeQuery","nodeQuery","verifyTerm","termNode","terms","context","verifyAhead","termVerified","termString","nodeAsString","trace","verifyTermFunctions","verifyTermAsStandaloneVariable","some","verifyTermFunction","debug","Object","assign","termNodesVerifier","termVerifiedAgainstConstructors","constructors","getConstructors","constructor","termVerifiedAgainstConstructor","verifyTermAgainstConstructor","variables","termVerifiedAsVariable","variableNode","variable","findVariableByVariableNode","verifiedAhead","push","pop","termVerifiedAsStandaloneVariable","firstVariable","first","type","getType","term","Term","fromTermNodeAndType","constructorString","getString","constructorTermNode","getTermNode","nonTerminalNNdeA","nonTerminalNodeB","nodeVerified","verifyNonTerminalNode"],"mappings":"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"}

package/lib/verify/theorem.js

@@ -13,7 +13,7 @@ var _proof = /*#__PURE__*/ _interop_require_default(require("../verify/proof"));
 var _local = /*#__PURE__*/ _interop_require_default(require("../context/local"));
 var _labels = /*#__PURE__*/ _interop_require_default(require("../verify/labels"));
 var _consequent = /*#__PURE__*/ _interop_require_default(require("../verify/consequent"));
-var _supposition = /*#__PURE__*/ _interop_require_default(require("../verify/supposition"));
+var _suppositions = /*#__PURE__*/ _interop_require_default(require("../verify/suppositions"));
 var _array = require("../utilities/array");
 var _query = require("../utilities/query");
 function _interop_require_default(obj) {
@@ -28,12 +28,7 @@ function verifyTheorem(theoremNode, fileContext) {
     fileContext.trace("Verifying the '".concat(labelsString, "' theorem..."), theoremNode);
     var labels = [], labelsVerified = (0, _labels.default)(labelNodes, labels, fileContext);
     if (labelsVerified) {
-        var suppositions = [], suppositionNodes = suppositionsNodeQuery(theoremNode), suppositionsVerified = suppositionNodes.every(function(suppositionNode) {
-            var suppositionVerified = (0, _supposition.default)(suppositionNode, suppositions, localContext);
-            if (suppositionVerified) {
-                return true;
-            }
-        });
+        var suppositions = [], suppositionNodes = suppositionsNodeQuery(theoremNode), suppositionsVerified = (0, _suppositions.default)(suppositionNodes, suppositions, localContext);
         if (suppositionsVerified) {
             var consequents = [], consequentNode = consequentNodeQuery(theoremNode), consequentVerified = (0, _consequent.default)(consequentNode, consequents, localContext);
             if (consequentVerified) {
@@ -52,4 +47,4 @@ function verifyTheorem(theoremNode, fileContext) {
     return theoremVerified;
 }
 
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy92ZXJpZnkvdGhlb3JlbS5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuaW1wb3J0IFRoZW9yZW0gZnJvbSBcIi4uL3RoZW9yZW1cIjtcbmltcG9ydCB2ZXJpZnlQcm9vZiBmcm9tIFwiLi4vdmVyaWZ5L3Byb29mXCI7XG5pbXBvcnQgTG9jYWxDb250ZXh0IGZyb20gXCIuLi9jb250ZXh0L2xvY2FsXCI7XG5pbXBvcnQgdmVyaWZ5TGFiZWxzIGZyb20gXCIuLi92ZXJpZnkvbGFiZWxzXCI7XG5pbXBvcnQgdmVyaWZ5Q29uc2VxdWVudCBmcm9tIFwiLi4vdmVyaWZ5L2NvbnNlcXVlbnRcIjtcbmltcG9ydCB2ZXJpZnlTdXBwb3NpdGlvbiBmcm9tIFwiLi4vdmVyaWZ5L3N1cHBvc2l0aW9uXCI7XG5cbmltcG9ydCB7IGZpcnN0IH0gZnJvbSBcIi4uL3V0aWxpdGllcy9hcnJheVwiO1xuaW1wb3J0IHsgbm9kZVF1ZXJ5LCBub2Rlc1F1ZXJ5IH0gZnJvbSBcIi4uL3V0aWxpdGllcy9xdWVyeVwiO1xuXG5jb25zdCBwcm9vZk5vZGVRdWVyeSA9IG5vZGVRdWVyeShcIi90aGVvcmVtL3Byb29mIVwiKSxcbiAgICAgIGxhYmVsTm9kZXNRdWVyeSA9IG5vZGVzUXVlcnkoXCIvdGhlb3JlbS9sYWJlbHMvbGFiZWxcIiksXG4gICAgICBjb25zZXF1ZW50Tm9kZVF1ZXJ5ID0gbm9kZVF1ZXJ5KFwiL3RoZW9yZW0vY29uc2VxdWVudCFcIiksXG4gICAgICBzdXBwb3NpdGlvbnNOb2RlUXVlcnkgPSBub2Rlc1F1ZXJ5KFwiL3RoZW9yZW0vc3VwcG9zaXRpb25cIik7XG5cbmV4cG9ydCBkZWZhdWx0IGZ1bmN0aW9uIHZlcmlmeVRoZW9yZW0odGhlb3JlbU5vZGUsIGZpbGVDb250ZXh0KSB7XG4gIGxldCB0aGVvcmVtVmVyaWZpZWQgPSBmYWxzZTtcblxuICBjb25zdCBsYWJlbE5vZGVzID0gbGFiZWxOb2Rlc1F1ZXJ5KHRoZW9yZW1Ob2RlKSxcbiAgICAgICAgbGFiZWxzU3RyaW5nID0gZmlsZUNvbnRleHQubm9kZXNBc1N0cmluZyhsYWJlbE5vZGVzKSxcbiAgICAgICAgbG9jYWxDb250ZXh0ID0gTG9jYWxDb250ZXh0LmZyb21GaWxlQ29udGV4dChmaWxlQ29udGV4dCk7XG5cbiAgZmlsZUNvbnRleHQudHJhY2UoYFZlcmlmeWluZyB0aGUgJyR7bGFiZWxzU3RyaW5nfScgdGhlb3JlbS4uLmAsIHRoZW9yZW1Ob2RlKTtcblxuICBjb25zdCBsYWJlbHMgPSBbXSxcbiAgICAgICAgbGFiZWxzVmVyaWZpZWQgPSB2ZXJpZnlMYWJlbHMobGFiZWxOb2RlcywgbGFiZWxzLCBmaWxlQ29udGV4dCk7XG5cbiAgaWYgKGxhYmVsc1ZlcmlmaWVkKSB7XG4gICAgY29uc3Qgc3VwcG9zaXRpb25zID0gW10sXG4gICAgICAgICAgc3VwcG9zaXRpb25Ob2RlcyA9IHN1cHBvc2l0aW9uc05vZGVRdWVyeSh0aGVvcmVtTm9kZSksXG4gICAgICAgICAgc3VwcG9zaXRpb25zVmVyaWZpZWQgPSBzdXBwb3NpdGlvbk5vZGVzLmV2ZXJ5KChzdXBwb3NpdGlvbk5vZGUpID0+IHtcbiAgICAgICAgICAgIGNvbnN0IHN1cHBvc2l0aW9uVmVyaWZpZWQgPSB2ZXJpZnlTdXBwb3NpdGlvbihzdXBwb3NpdGlvbk5vZGUsIHN1cHBvc2l0aW9ucywgbG9jYWxDb250ZXh0KTtcblxuICAgICAgICAgICAgaWYgKHN1cHBvc2l0aW9uVmVyaWZpZWQpIHtcbiAgICAgICAgICAgICAgcmV0dXJuIHRydWU7XG4gICAgICAgICAgICB9XG4gICAgICAgICAgfSk7XG5cbiAgICBpZiAoc3VwcG9zaXRpb25zVmVyaWZpZWQpIHtcbiAgICAgIGNvbnN0IGNvbnNlcXVlbnRzID0gW10sXG4gICAgICAgICAgICBjb25zZXF1ZW50Tm9kZSA9IGNvbnNlcXVlbnROb2RlUXVlcnkodGhlb3JlbU5vZGUpLFxuICAgICAgICAgICAgY29uc2VxdWVudFZlcmlmaWVkID0gdmVyaWZ5Q29uc2VxdWVudChjb25zZXF1ZW50Tm9kZSwgY29uc2VxdWVudHMsIGxvY2FsQ29udGV4dCk7XG5cbiAgICAgIGlmIChjb25zZXF1ZW50VmVyaWZpZWQpIHtcbiAgICAgICAgY29uc3QgcHJvb2ZOb2RlID0gcHJvb2ZOb2RlUXVlcnkodGhlb3JlbU5vZGUpLFxuICAgICAgICAgICAgICBmaXJzdENvbnNlcXVlbnQgPSBmaXJzdChjb25zZXF1ZW50cyksXG4gICAgICAgICAgICAgIGNvbnNlcXVlbnQgPSBmaXJzdENvbnNlcXVlbnQsIC8vL1xuICAgICAgICAgICAgICBwcm9vZlZlcmlmaWVkID0gdmVyaWZ5UHJvb2YocHJvb2ZOb2RlLCBjb25zZXF1ZW50LCBsb2NhbENvbnRleHQpO1xuXG4gICAgICAgIGlmIChwcm9vZlZlcmlmaWVkKSB7XG4gICAgICAgICAgY29uc3QgdGhlb3JlbSA9IFRoZW9yZW0uZnJvbUxhYmVsc1N1cHBvc2l0aW9uc0NvbnNlcXVlbnRBbmRMb2NhbENvbnRleHQobGFiZWxzLCBzdXBwb3NpdGlvbnMsIGNvbnNlcXVlbnQsIGxvY2FsQ29udGV4dCk7XG5cbiAgICAgICAgICBmaWxlQ29udGV4dC5hZGRUaGVvcmVtKHRoZW9yZW0pO1xuXG4gICAgICAgICAgdGhlb3JlbVZlcmlmaWVkID0gdHJ1ZTtcbiAgICAgICAgfVxuICAgICAgfVxuICAgIH1cbiAgfVxuXG4gIGlmICh0aGVvcmVtVmVyaWZpZWQpIHtcbiAgICBmaWxlQ29udGV4dC5kZWJ1ZyhgLi4udmVyaWZpZWQgdGhlICcke2xhYmVsc1N0cmluZ30nIHRoZW9yZW0uYCwgdGhlb3JlbU5vZGUpO1xuICB9XG5cbiAgcmV0dXJuIHRoZW9yZW1WZXJpZmllZDtcbn1cbiJdLCJuYW1lcyI6WyJ2ZXJpZnlUaGVvcmVtIiwicHJvb2ZOb2RlUXVlcnkiLCJub2RlUXVlcnkiLCJsYWJlbE5vZGVzUXVlcnkiLCJub2Rlc1F1ZXJ5IiwiY29uc2VxdWVudE5vZGVRdWVyeSIsInN1cHBvc2l0aW9uc05vZGVRdWVyeSIsInRoZW9yZW1Ob2RlIiwiZmlsZUNvbnRleHQiLCJ0aGVvcmVtVmVyaWZpZWQiLCJsYWJlbE5vZGVzIiwibGFiZWxzU3RyaW5nIiwibm9kZXNBc1N0cmluZyIsImxvY2FsQ29udGV4dCIsIkxvY2FsQ29udGV4dCIsImZyb21GaWxlQ29udGV4dCIsInRyYWNlIiwibGFiZWxzIiwibGFiZWxzVmVyaWZpZWQiLCJ2ZXJpZnlMYWJlbHMiLCJzdXBwb3NpdGlvbnMiLCJzdXBwb3NpdGlvbk5vZGVzIiwic3VwcG9zaXRpb25zVmVyaWZpZWQiLCJldmVyeSIsInN1cHBvc2l0aW9uTm9kZSIsInN1cHBvc2l0aW9uVmVyaWZpZWQiLCJ2ZXJpZnlTdXBwb3NpdGlvbiIsImNvbnNlcXVlbnRzIiwiY29uc2VxdWVudE5vZGUiLCJjb25zZXF1ZW50VmVyaWZpZWQiLCJ2ZXJpZnlDb25zZXF1ZW50IiwicHJvb2ZOb2RlIiwiZmlyc3RDb25zZXF1ZW50IiwiZmlyc3QiLCJjb25zZXF1ZW50IiwicHJvb2ZWZXJpZmllZCIsInZlcmlmeVByb29mIiwidGhlb3JlbSIsIlRoZW9yZW0iLCJmcm9tTGFiZWxzU3VwcG9zaXRpb25zQ29uc2VxdWVudEFuZExvY2FsQ29udGV4dCIsImFkZFRoZW9yZW0iLCJkZWJ1ZyJdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7K0JBaUJBOzs7ZUFBd0JBOzs7OERBZko7NERBQ0k7NERBQ0M7NkRBQ0E7aUVBQ0k7a0VBQ0M7cUJBRVI7cUJBQ2dCOzs7Ozs7QUFFdEMsSUFBTUMsaUJBQWlCQyxJQUFBQSxnQkFBUyxFQUFDLG9CQUMzQkMsa0JBQWtCQyxJQUFBQSxpQkFBVSxFQUFDLDBCQUM3QkMsc0JBQXNCSCxJQUFBQSxnQkFBUyxFQUFDLHlCQUNoQ0ksd0JBQXdCRixJQUFBQSxpQkFBVSxFQUFDO0FBRTFCLFNBQVNKLGNBQWNPLFdBQVcsRUFBRUMsV0FBVztJQUM1RCxJQUFJQyxrQkFBa0I7SUFFdEIsSUFBTUMsYUFBYVAsZ0JBQWdCSSxjQUM3QkksZUFBZUgsWUFBWUksYUFBYSxDQUFDRixhQUN6Q0csZUFBZUMsY0FBWSxDQUFDQyxlQUFlLENBQUNQO0lBRWxEQSxZQUFZUSxLQUFLLENBQUMsQUFBQyxrQkFBOEIsT0FBYkwsY0FBYSxpQkFBZUo7SUFFaEUsSUFBTVUsU0FBUyxFQUFFLEVBQ1hDLGlCQUFpQkMsSUFBQUEsZUFBWSxFQUFDVCxZQUFZTyxRQUFRVDtJQUV4RCxJQUFJVSxnQkFBZ0I7UUFDbEIsSUFBTUUsZUFBZSxFQUFFLEVBQ2pCQyxtQkFBbUJmLHNCQUFzQkMsY0FDekNlLHVCQUF1QkQsaUJBQWlCRSxLQUFLLENBQUMsU0FBQ0M7WUFDN0MsSUFBTUMsc0JBQXNCQyxJQUFBQSxvQkFBaUIsRUFBQ0YsaUJBQWlCSixjQUFjUDtZQUU3RSxJQUFJWSxxQkFBcUI7Z0JBQ3ZCLE9BQU87WUFDVDtRQUNGO1FBRU4sSUFBSUgsc0JBQXNCO1lBQ3hCLElBQU1LLGNBQWMsRUFBRSxFQUNoQkMsaUJBQWlCdkIsb0JBQW9CRSxjQUNyQ3NCLHFCQUFxQkMsSUFBQUEsbUJBQWdCLEVBQUNGLGdCQUFnQkQsYUFBYWQ7WUFFekUsSUFBSWdCLG9CQUFvQjtnQkFDdEIsSUFBTUUsWUFBWTlCLGVBQWVNLGNBQzNCeUIsa0JBQWtCQyxJQUFBQSxZQUFLLEVBQUNOLGNBQ3hCTyxhQUFhRixpQkFDYkcsZ0JBQWdCQyxJQUFBQSxjQUFXLEVBQUNMLFdBQVdHLFlBQVlyQjtnQkFFekQsSUFBSXNCLGVBQWU7b0JBQ2pCLElBQU1FLFVBQVVDLGdCQUFPLENBQUNDLCtDQUErQyxDQUFDdEIsUUFBUUcsY0FBY2MsWUFBWXJCO29CQUUxR0wsWUFBWWdDLFVBQVUsQ0FBQ0g7b0JBRXZCNUIsa0JBQWtCO2dCQUNwQjtZQUNGO1FBQ0Y7SUFDRjtJQUVBLElBQUlBLGlCQUFpQjtRQUNuQkQsWUFBWWlDLEtBQUssQ0FBQyxBQUFDLG9CQUFnQyxPQUFiOUIsY0FBYSxlQUFhSjtJQUNsRTtJQUVBLE9BQU9FO0FBQ1QifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy92ZXJpZnkvdGhlb3JlbS5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuaW1wb3J0IFRoZW9yZW0gZnJvbSBcIi4uL3RoZW9yZW1cIjtcbmltcG9ydCB2ZXJpZnlQcm9vZiBmcm9tIFwiLi4vdmVyaWZ5L3Byb29mXCI7XG5pbXBvcnQgTG9jYWxDb250ZXh0IGZyb20gXCIuLi9jb250ZXh0L2xvY2FsXCI7XG5pbXBvcnQgdmVyaWZ5TGFiZWxzIGZyb20gXCIuLi92ZXJpZnkvbGFiZWxzXCI7XG5pbXBvcnQgdmVyaWZ5Q29uc2VxdWVudCBmcm9tIFwiLi4vdmVyaWZ5L2NvbnNlcXVlbnRcIjtcbmltcG9ydCB2ZXJpZnlTdXBwb3NpdGlvbnMgZnJvbSBcIi4uL3ZlcmlmeS9zdXBwb3NpdGlvbnNcIjtcblxuaW1wb3J0IHsgZmlyc3QgfSBmcm9tIFwiLi4vdXRpbGl0aWVzL2FycmF5XCI7XG5pbXBvcnQgeyBub2RlUXVlcnksIG5vZGVzUXVlcnkgfSBmcm9tIFwiLi4vdXRpbGl0aWVzL3F1ZXJ5XCI7XG5cbmNvbnN0IHByb29mTm9kZVF1ZXJ5ID0gbm9kZVF1ZXJ5KFwiL3RoZW9yZW0vcHJvb2YhXCIpLFxuICAgICAgbGFiZWxOb2Rlc1F1ZXJ5ID0gbm9kZXNRdWVyeShcIi90aGVvcmVtL2xhYmVscy9sYWJlbFwiKSxcbiAgICAgIGNvbnNlcXVlbnROb2RlUXVlcnkgPSBub2RlUXVlcnkoXCIvdGhlb3JlbS9jb25zZXF1ZW50IVwiKSxcbiAgICAgIHN1cHBvc2l0aW9uc05vZGVRdWVyeSA9IG5vZGVzUXVlcnkoXCIvdGhlb3JlbS9zdXBwb3NpdGlvblwiKTtcblxuZXhwb3J0IGRlZmF1bHQgZnVuY3Rpb24gdmVyaWZ5VGhlb3JlbSh0aGVvcmVtTm9kZSwgZmlsZUNvbnRleHQpIHtcbiAgbGV0IHRoZW9yZW1WZXJpZmllZCA9IGZhbHNlO1xuXG4gIGNvbnN0IGxhYmVsTm9kZXMgPSBsYWJlbE5vZGVzUXVlcnkodGhlb3JlbU5vZGUpLFxuICAgICAgICBsYWJlbHNTdHJpbmcgPSBmaWxlQ29udGV4dC5ub2Rlc0FzU3RyaW5nKGxhYmVsTm9kZXMpLFxuICAgICAgICBsb2NhbENvbnRleHQgPSBMb2NhbENvbnRleHQuZnJvbUZpbGVDb250ZXh0KGZpbGVDb250ZXh0KTtcblxuICBmaWxlQ29udGV4dC50cmFjZShgVmVyaWZ5aW5nIHRoZSAnJHtsYWJlbHNTdHJpbmd9JyB0aGVvcmVtLi4uYCwgdGhlb3JlbU5vZGUpO1xuXG4gIGNvbnN0IGxhYmVscyA9IFtdLFxuICAgICAgICBsYWJlbHNWZXJpZmllZCA9IHZlcmlmeUxhYmVscyhsYWJlbE5vZGVzLCBsYWJlbHMsIGZpbGVDb250ZXh0KTtcblxuICBpZiAobGFiZWxzVmVyaWZpZWQpIHtcbiAgICBjb25zdCBzdXBwb3NpdGlvbnMgPSBbXSxcbiAgICAgICAgICBzdXBwb3NpdGlvbk5vZGVzID0gc3VwcG9zaXRpb25zTm9kZVF1ZXJ5KHRoZW9yZW1Ob2RlKSxcbiAgICAgICAgICBzdXBwb3NpdGlvbnNWZXJpZmllZCA9IHZlcmlmeVN1cHBvc2l0aW9ucyhzdXBwb3NpdGlvbk5vZGVzLCBzdXBwb3NpdGlvbnMsIGxvY2FsQ29udGV4dCk7XG5cbiAgICBpZiAoc3VwcG9zaXRpb25zVmVyaWZpZWQpIHtcbiAgICAgIGNvbnN0IGNvbnNlcXVlbnRzID0gW10sXG4gICAgICAgICAgICBjb25zZXF1ZW50Tm9kZSA9IGNvbnNlcXVlbnROb2RlUXVlcnkodGhlb3JlbU5vZGUpLFxuICAgICAgICAgICAgY29uc2VxdWVudFZlcmlmaWVkID0gdmVyaWZ5Q29uc2VxdWVudChjb25zZXF1ZW50Tm9kZSwgY29uc2VxdWVudHMsIGxvY2FsQ29udGV4dCk7XG5cbiAgICAgIGlmIChjb25zZXF1ZW50VmVyaWZpZWQpIHtcbiAgICAgICAgY29uc3QgcHJvb2ZOb2RlID0gcHJvb2ZOb2RlUXVlcnkodGhlb3JlbU5vZGUpLFxuICAgICAgICAgICAgICBmaXJzdENvbnNlcXVlbnQgPSBmaXJzdChjb25zZXF1ZW50cyksXG4gICAgICAgICAgICAgIGNvbnNlcXVlbnQgPSBmaXJzdENvbnNlcXVlbnQsIC8vL1xuICAgICAgICAgICAgICBwcm9vZlZlcmlmaWVkID0gdmVyaWZ5UHJvb2YocHJvb2ZOb2RlLCBjb25zZXF1ZW50LCBsb2NhbENvbnRleHQpO1xuXG4gICAgICAgIGlmIChwcm9vZlZlcmlmaWVkKSB7XG4gICAgICAgICAgY29uc3QgdGhlb3JlbSA9IFRoZW9yZW0uZnJvbUxhYmVsc1N1cHBvc2l0aW9uc0NvbnNlcXVlbnRBbmRMb2NhbENvbnRleHQobGFiZWxzLCBzdXBwb3NpdGlvbnMsIGNvbnNlcXVlbnQsIGxvY2FsQ29udGV4dCk7XG5cbiAgICAgICAgICBmaWxlQ29udGV4dC5hZGRUaGVvcmVtKHRoZW9yZW0pO1xuXG4gICAgICAgICAgdGhlb3JlbVZlcmlmaWVkID0gdHJ1ZTtcbiAgICAgICAgfVxuICAgICAgfVxuICAgIH1cbiAgfVxuXG4gIGlmICh0aGVvcmVtVmVyaWZpZWQpIHtcbiAgICBmaWxlQ29udGV4dC5kZWJ1ZyhgLi4udmVyaWZpZWQgdGhlICcke2xhYmVsc1N0cmluZ30nIHRoZW9yZW0uYCwgdGhlb3JlbU5vZGUpO1xuICB9XG5cbiAgcmV0dXJuIHRoZW9yZW1WZXJpZmllZDtcbn1cbiJdLCJuYW1lcyI6WyJ2ZXJpZnlUaGVvcmVtIiwicHJvb2ZOb2RlUXVlcnkiLCJub2RlUXVlcnkiLCJsYWJlbE5vZGVzUXVlcnkiLCJub2Rlc1F1ZXJ5IiwiY29uc2VxdWVudE5vZGVRdWVyeSIsInN1cHBvc2l0aW9uc05vZGVRdWVyeSIsInRoZW9yZW1Ob2RlIiwiZmlsZUNvbnRleHQiLCJ0aGVvcmVtVmVyaWZpZWQiLCJsYWJlbE5vZGVzIiwibGFiZWxzU3RyaW5nIiwibm9kZXNBc1N0cmluZyIsImxvY2FsQ29udGV4dCIsIkxvY2FsQ29udGV4dCIsImZyb21GaWxlQ29udGV4dCIsInRyYWNlIiwibGFiZWxzIiwibGFiZWxzVmVyaWZpZWQiLCJ2ZXJpZnlMYWJlbHMiLCJzdXBwb3NpdGlvbnMiLCJzdXBwb3NpdGlvbk5vZGVzIiwic3VwcG9zaXRpb25zVmVyaWZpZWQiLCJ2ZXJpZnlTdXBwb3NpdGlvbnMiLCJjb25zZXF1ZW50cyIsImNvbnNlcXVlbnROb2RlIiwiY29uc2VxdWVudFZlcmlmaWVkIiwidmVyaWZ5Q29uc2VxdWVudCIsInByb29mTm9kZSIsImZpcnN0Q29uc2VxdWVudCIsImZpcnN0IiwiY29uc2VxdWVudCIsInByb29mVmVyaWZpZWQiLCJ2ZXJpZnlQcm9vZiIsInRoZW9yZW0iLCJUaGVvcmVtIiwiZnJvbUxhYmVsc1N1cHBvc2l0aW9uc0NvbnNlcXVlbnRBbmRMb2NhbENvbnRleHQiLCJhZGRUaGVvcmVtIiwiZGVidWciXSwibWFwcGluZ3MiOiJBQUFBOzs7OytCQWlCQTs7O2VBQXdCQTs7OzhEQWZKOzREQUNJOzREQUNDOzZEQUNBO2lFQUNJO21FQUNFO3FCQUVUO3FCQUNnQjs7Ozs7O0FBRXRDLElBQU1DLGlCQUFpQkMsSUFBQUEsZ0JBQVMsRUFBQyxvQkFDM0JDLGtCQUFrQkMsSUFBQUEsaUJBQVUsRUFBQywwQkFDN0JDLHNCQUFzQkgsSUFBQUEsZ0JBQVMsRUFBQyx5QkFDaENJLHdCQUF3QkYsSUFBQUEsaUJBQVUsRUFBQztBQUUxQixTQUFTSixjQUFjTyxXQUFXLEVBQUVDLFdBQVc7SUFDNUQsSUFBSUMsa0JBQWtCO0lBRXRCLElBQU1DLGFBQWFQLGdCQUFnQkksY0FDN0JJLGVBQWVILFlBQVlJLGFBQWEsQ0FBQ0YsYUFDekNHLGVBQWVDLGNBQVksQ0FBQ0MsZUFBZSxDQUFDUDtJQUVsREEsWUFBWVEsS0FBSyxDQUFDLEFBQUMsa0JBQThCLE9BQWJMLGNBQWEsaUJBQWVKO0lBRWhFLElBQU1VLFNBQVMsRUFBRSxFQUNYQyxpQkFBaUJDLElBQUFBLGVBQVksRUFBQ1QsWUFBWU8sUUFBUVQ7SUFFeEQsSUFBSVUsZ0JBQWdCO1FBQ2xCLElBQU1FLGVBQWUsRUFBRSxFQUNqQkMsbUJBQW1CZixzQkFBc0JDLGNBQ3pDZSx1QkFBdUJDLElBQUFBLHFCQUFrQixFQUFDRixrQkFBa0JELGNBQWNQO1FBRWhGLElBQUlTLHNCQUFzQjtZQUN4QixJQUFNRSxjQUFjLEVBQUUsRUFDaEJDLGlCQUFpQnBCLG9CQUFvQkUsY0FDckNtQixxQkFBcUJDLElBQUFBLG1CQUFnQixFQUFDRixnQkFBZ0JELGFBQWFYO1lBRXpFLElBQUlhLG9CQUFvQjtnQkFDdEIsSUFBTUUsWUFBWTNCLGVBQWVNLGNBQzNCc0Isa0JBQWtCQyxJQUFBQSxZQUFLLEVBQUNOLGNBQ3hCTyxhQUFhRixpQkFDYkcsZ0JBQWdCQyxJQUFBQSxjQUFXLEVBQUNMLFdBQVdHLFlBQVlsQjtnQkFFekQsSUFBSW1CLGVBQWU7b0JBQ2pCLElBQU1FLFVBQVVDLGdCQUFPLENBQUNDLCtDQUErQyxDQUFDbkIsUUFBUUcsY0FBY1csWUFBWWxCO29CQUUxR0wsWUFBWTZCLFVBQVUsQ0FBQ0g7b0JBRXZCekIsa0JBQWtCO2dCQUNwQjtZQUNGO1FBQ0Y7SUFDRjtJQUVBLElBQUlBLGlCQUFpQjtRQUNuQkQsWUFBWThCLEtBQUssQ0FBQyxBQUFDLG9CQUFnQyxPQUFiM0IsY0FBYSxlQUFhSjtJQUNsRTtJQUVBLE9BQU9FO0FBQ1QifQ==

package/lib/verify/typeAssertion.js

@@ -8,7 +8,8 @@ Object.defineProperty(exports, "default", {
         return verifyTypeAssertion;
     }
 });
-var _variable = /*#__PURE__*/ _interop_require_default(require("../assignment/variable"));
+var _variable = /*#__PURE__*/ _interop_require_default(require("../variable"));
+var _variable1 = /*#__PURE__*/ _interop_require_default(require("../assignment/variable"));
 var _termAndStandaloneType = /*#__PURE__*/ _interop_require_default(require("../verify/termAndStandaloneType"));
 var _termAsVariableAndStandaloneType = /*#__PURE__*/ _interop_require_default(require("../verify/termAsVariableAndStandaloneType"));
 var _array = require("../utilities/array");
@@ -25,7 +26,7 @@ function verifyTypeAssertion(typeAssertionNode, assignments, derived, context, v
     context.trace("Verifying the '".concat(typeAssertionString, "' type assertion..."), typeAssertionNode);
     var verifyTypeAssertionFunctions = [
         verifyDerivedTypeAssertion,
-        verifyStandaloneTypeAssertion
+        verifyGivenTypeAssertion
     ];
     typeAssertionVerified = verifyTypeAssertionFunctions.some(function(verifyTypeAssertionFunction) {
         var typeAssertionVerified = verifyTypeAssertionFunction(typeAssertionNode, assignments, derived, context, verifyAhead);
@@ -61,16 +62,19 @@ function verifyDerivedTypeAssertion(typeAssertionNode, assignments, derived, con
     }
     return derivedTypeAssertionVerified;
 }
-function verifyStandaloneTypeAssertion(typeAssertionNode, assignments, derived, context, verifyAhead) {
-    var standaloneTypeAssertionVerified = false;
+function verifyGivenTypeAssertion(typeAssertionNode, assignments, derived, context, verifyAhead) {
+    var givenTypeAssertionVerified = false;
     if (!derived) {
         var typeAssertionString = context.nodeAsString(typeAssertionNode);
-        context.trace("Verifying the '".concat(typeAssertionString, "' standalone type assertion..."), typeAssertionNode);
+        context.trace("Verifying the '".concat(typeAssertionString, "' given type assertion..."), typeAssertionNode);
         var types = [], variables = [], termNode = termNodeQuery(typeAssertionNode), typeNode = typeNodeQuery(typeAssertionNode), termAsVariableAndStandaloneTypeVerified = (0, _termAsVariableAndStandaloneType.default)(termNode, typeNode, variables, types, context, function() {
             var verifiedAhead = false;
-            var firstVariable = (0, _array.first)(variables), firstType = (0, _array.first)(types), variable = firstVariable, type = firstType, variableType = variable.getType(), variableTypeEqualToOrSuperTypeOfType = variableType.isEqualToOrSuperTypeOf(type);
+            var firstVariable = (0, _array.first)(variables);
+            var variable = firstVariable; ///
+            var firstType = (0, _array.first)(types), type = firstType, variableType = variable.getType(), variableTypeEqualToOrSuperTypeOfType = variableType.isEqualToOrSuperTypeOf(type);
             if (variableTypeEqualToOrSuperTypeOfType) {
-                var variableAssignment = _variable.default.fromVariable(variable), assignment = variableAssignment; ///
+                variable = _variable.default.fromVariableAndType(variable, type); ///
+                var variableAssignment = _variable1.default.fromVariable(variable), assignment = variableAssignment; ///
                 assignments.push(assignment);
                 verifiedAhead = verifyAhead();
                 if (!verifiedAhead) {
@@ -79,12 +83,12 @@ function verifyStandaloneTypeAssertion(typeAssertionNode, assignments, derived,
             }
             return verifiedAhead;
         });
-        standaloneTypeAssertionVerified = termAsVariableAndStandaloneTypeVerified; ///
-        if (standaloneTypeAssertionVerified) {
-            context.trace("...verified the '".concat(typeAssertionString, "' standalone type assertion."), typeAssertionNode);
+        givenTypeAssertionVerified = termAsVariableAndStandaloneTypeVerified; ///
+        if (givenTypeAssertionVerified) {
+            context.trace("...verified the '".concat(typeAssertionString, "' given type assertion."), typeAssertionNode);
         }
     }
-    return standaloneTypeAssertionVerified;
+    return givenTypeAssertionVerified;
 }
 
-//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/verify/typeAssertion.js"],"sourcesContent":["\"use strict\";\n\nimport VariableAssignment from \"../assignment/variable\";\nimport verifyTermAndStandaloneType from \"../verify/termAndStandaloneType\";\nimport verifyTermAsVariableAndStandaloneType from \"../verify/termAsVariableAndStandaloneType\";\n\nimport { first } from \"../utilities/array\";\nimport { nodeQuery } from \"../utilities/query\";\n\nconst termNodeQuery = nodeQuery(\"/typeAssertion/term!\"),\n      typeNodeQuery = nodeQuery(\"/typeAssertion/type!\");\n\nexport default function verifyTypeAssertion(typeAssertionNode, assignments, derived, context, verifyAhead) {\n  let typeAssertionVerified;\n\n  const typeAssertionString = context.nodeAsString(typeAssertionNode);\n\n  context.trace(`Verifying the '${typeAssertionString}' type assertion...`, typeAssertionNode);\n\n  const verifyTypeAssertionFunctions = [\n    verifyDerivedTypeAssertion,\n    verifyStandaloneTypeAssertion\n  ];\n\n  typeAssertionVerified = verifyTypeAssertionFunctions.some((verifyTypeAssertionFunction) => {\n    const typeAssertionVerified = verifyTypeAssertionFunction(typeAssertionNode, assignments, derived, context, verifyAhead);\n\n    if (typeAssertionVerified) {\n      return true;\n    }\n  });\n\n  if (typeAssertionVerified) {\n    context.debug(`...verified the '${typeAssertionString}' type assertion.`, typeAssertionNode);\n  }\n\n  return typeAssertionVerified;\n}\n\nfunction verifyDerivedTypeAssertion(typeAssertionNode, assignments, derived, context, verifyAhead) {\n  let derivedTypeAssertionVerified = false;\n\n  if (derived) {\n    const typeAssertionString = context.nodeAsString(typeAssertionNode);\n\n    context.trace(`Verifying the '${typeAssertionString}' derived type assertion...`, typeAssertionNode);\n\n    const terms = [],\n          types = [],\n          termNode = termNodeQuery(typeAssertionNode),\n          typeNode = typeNodeQuery(typeAssertionNode),\n          termAndStandaloneTypeVerified = verifyTermAndStandaloneType(termNode, typeNode, terms, types, context, () => {\n            let verifiedAhead = false;\n\n            const firstTerm = first(terms),\n                  firstType = first(types),\n                  term = firstTerm, ///\n                  type = firstType, ///\n                  termType = term.getType(),\n                  termTypeEqualToOrSuperTypeOfType = termType.isEqualToOrSuperTypeOf(type);\n\n            if (termTypeEqualToOrSuperTypeOfType) {\n              debugger\n\n              if (false) {  ///\n                verifiedAhead = verifyAhead();\n              }\n            }\n\n            return verifiedAhead;\n          });\n\n    derivedTypeAssertionVerified = termAndStandaloneTypeVerified; ///\n\n    if (derivedTypeAssertionVerified) {\n      context.trace(`...verified the '${typeAssertionString}' derived type assertion.`, typeAssertionNode);\n    }\n  }\n\n  return derivedTypeAssertionVerified;\n}\n\nfunction verifyStandaloneTypeAssertion(typeAssertionNode, assignments, derived, context, verifyAhead) {\n  let standaloneTypeAssertionVerified = false;\n\n  if (!derived) {\n    const typeAssertionString = context.nodeAsString(typeAssertionNode);\n\n    context.trace(`Verifying the '${typeAssertionString}' standalone type assertion...`, typeAssertionNode);\n\n    const types = [],\n          variables = [],\n          termNode = termNodeQuery(typeAssertionNode),\n          typeNode = typeNodeQuery(typeAssertionNode),\n          termAsVariableAndStandaloneTypeVerified = verifyTermAsVariableAndStandaloneType(termNode, typeNode, variables, types, context, () => {\n            let verifiedAhead = false;\n\n            const firstVariable = first(variables),\n                  firstType = first(types),\n                  variable = firstVariable, ///\n                  type = firstType, ///\n                  variableType = variable.getType(),\n                  variableTypeEqualToOrSuperTypeOfType = variableType.isEqualToOrSuperTypeOf(type);\n\n            if (variableTypeEqualToOrSuperTypeOfType) {\n              const variableAssignment = VariableAssignment.fromVariable(variable),\n                    assignment = variableAssignment; ///\n\n              assignments.push(assignment);\n\n              verifiedAhead = verifyAhead();\n\n              if (!verifiedAhead) {\n                assignments.pop();\n              }\n            }\n\n            return verifiedAhead;\n          });\n\n    standaloneTypeAssertionVerified = termAsVariableAndStandaloneTypeVerified; ///\n\n    if (standaloneTypeAssertionVerified) {\n      context.trace(`...verified the '${typeAssertionString}' standalone type assertion.`, typeAssertionNode);\n    }\n  }\n\n  return standaloneTypeAssertionVerified;\n}\n"],"names":["verifyTypeAssertion","termNodeQuery","nodeQuery","typeNodeQuery","typeAssertionNode","assignments","derived","context","verifyAhead","typeAssertionVerified","typeAssertionString","nodeAsString","trace","verifyTypeAssertionFunctions","verifyDerivedTypeAssertion","verifyStandaloneTypeAssertion","some","verifyTypeAssertionFunction","debug","derivedTypeAssertionVerified","terms","types","termNode","typeNode","termAndStandaloneTypeVerified","verifyTermAndStandaloneType","verifiedAhead","firstTerm","first","firstType","term","type","termType","getType","termTypeEqualToOrSuperTypeOfType","isEqualToOrSuperTypeOf","standaloneTypeAssertionVerified","variables","termAsVariableAndStandaloneTypeVerified","verifyTermAsVariableAndStandaloneType","firstVariable","variable","variableType","variableTypeEqualToOrSuperTypeOfType","variableAssignment","VariableAssignment","fromVariable","assignment","push","pop"],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/verify/typeAssertion.js"],"sourcesContent":["\"use strict\";\n\nimport Variable from \"../variable\";\nimport VariableAssignment from \"../assignment/variable\";\nimport verifyTermAndStandaloneType from \"../verify/termAndStandaloneType\";\nimport verifyTermAsVariableAndStandaloneType from \"../verify/termAsVariableAndStandaloneType\";\n\nimport { first } from \"../utilities/array\";\nimport { nodeQuery } from \"../utilities/query\";\n\nconst termNodeQuery = nodeQuery(\"/typeAssertion/term!\"),\n      typeNodeQuery = nodeQuery(\"/typeAssertion/type!\");\n\nexport default function verifyTypeAssertion(typeAssertionNode, assignments, derived, context, verifyAhead) {\n  let typeAssertionVerified;\n\n  const typeAssertionString = context.nodeAsString(typeAssertionNode);\n\n  context.trace(`Verifying the '${typeAssertionString}' type assertion...`, typeAssertionNode);\n\n  const verifyTypeAssertionFunctions = [\n    verifyDerivedTypeAssertion,\n    verifyGivenTypeAssertion\n  ];\n\n  typeAssertionVerified = verifyTypeAssertionFunctions.some((verifyTypeAssertionFunction) => {\n    const typeAssertionVerified = verifyTypeAssertionFunction(typeAssertionNode, assignments, derived, context, verifyAhead);\n\n    if (typeAssertionVerified) {\n      return true;\n    }\n  });\n\n  if (typeAssertionVerified) {\n    context.debug(`...verified the '${typeAssertionString}' type assertion.`, typeAssertionNode);\n  }\n\n  return typeAssertionVerified;\n}\n\nfunction verifyDerivedTypeAssertion(typeAssertionNode, assignments, derived, context, verifyAhead) {\n  let derivedTypeAssertionVerified = false;\n\n  if (derived) {\n    const typeAssertionString = context.nodeAsString(typeAssertionNode);\n\n    context.trace(`Verifying the '${typeAssertionString}' derived type assertion...`, typeAssertionNode);\n\n    const terms = [],\n          types = [],\n          termNode = termNodeQuery(typeAssertionNode),\n          typeNode = typeNodeQuery(typeAssertionNode),\n          termAndStandaloneTypeVerified = verifyTermAndStandaloneType(termNode, typeNode, terms, types, context, () => {\n            let verifiedAhead = false;\n\n            const firstTerm = first(terms),\n                  firstType = first(types),\n                  term = firstTerm, ///\n                  type = firstType, ///\n                  termType = term.getType(),\n                  termTypeEqualToOrSuperTypeOfType = termType.isEqualToOrSuperTypeOf(type);\n\n            if (termTypeEqualToOrSuperTypeOfType) {\n              debugger\n\n              if (false) {  ///\n                verifiedAhead = verifyAhead();\n              }\n            }\n\n            return verifiedAhead;\n          });\n\n    derivedTypeAssertionVerified = termAndStandaloneTypeVerified; ///\n\n    if (derivedTypeAssertionVerified) {\n      context.trace(`...verified the '${typeAssertionString}' derived type assertion.`, typeAssertionNode);\n    }\n  }\n\n  return derivedTypeAssertionVerified;\n}\n\nfunction verifyGivenTypeAssertion(typeAssertionNode, assignments, derived, context, verifyAhead) {\n  let givenTypeAssertionVerified = false;\n\n  if (!derived) {\n    const typeAssertionString = context.nodeAsString(typeAssertionNode);\n\n    context.trace(`Verifying the '${typeAssertionString}' given type assertion...`, typeAssertionNode);\n\n    const types = [],\n          variables = [],\n          termNode = termNodeQuery(typeAssertionNode),\n          typeNode = typeNodeQuery(typeAssertionNode),\n          termAsVariableAndStandaloneTypeVerified = verifyTermAsVariableAndStandaloneType(termNode, typeNode, variables, types, context, () => {\n            let verifiedAhead = false;\n\n            const firstVariable = first(variables);\n\n            let variable = firstVariable; ///\n\n            const firstType = first(types),\n                  type = firstType, ///\n                  variableType = variable.getType(),\n                  variableTypeEqualToOrSuperTypeOfType = variableType.isEqualToOrSuperTypeOf(type);\n\n            if (variableTypeEqualToOrSuperTypeOfType) {\n              variable = Variable.fromVariableAndType(variable, type);  ///\n\n              const variableAssignment = VariableAssignment.fromVariable(variable),\n                    assignment = variableAssignment; ///\n\n              assignments.push(assignment);\n\n              verifiedAhead = verifyAhead();\n\n              if (!verifiedAhead) {\n                assignments.pop();\n              }\n            }\n\n            return verifiedAhead;\n          });\n\n    givenTypeAssertionVerified = termAsVariableAndStandaloneTypeVerified; ///\n\n    if (givenTypeAssertionVerified) {\n      context.trace(`...verified the '${typeAssertionString}' given type assertion.`, typeAssertionNode);\n    }\n  }\n\n  return givenTypeAssertionVerified;\n}\n"],"names":["verifyTypeAssertion","termNodeQuery","nodeQuery","typeNodeQuery","typeAssertionNode","assignments","derived","context","verifyAhead","typeAssertionVerified","typeAssertionString","nodeAsString","trace","verifyTypeAssertionFunctions","verifyDerivedTypeAssertion","verifyGivenTypeAssertion","some","verifyTypeAssertionFunction","debug","derivedTypeAssertionVerified","terms","types","termNode","typeNode","termAndStandaloneTypeVerified","verifyTermAndStandaloneType","verifiedAhead","firstTerm","first","firstType","term","type","termType","getType","termTypeEqualToOrSuperTypeOfType","isEqualToOrSuperTypeOf","givenTypeAssertionVerified","variables","termAsVariableAndStandaloneTypeVerified","verifyTermAsVariableAndStandaloneType","firstVariable","variable","variableType","variableTypeEqualToOrSuperTypeOfType","Variable","fromVariableAndType","variableAssignment","VariableAssignment","fromVariable","assignment","push","pop"],"mappings":"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"}

package/package.json

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

package/src/assignment/equality.js

@@ -9,15 +9,15 @@ export default class EqualityAssignment {
     return this.equality;
   }
 
-  assign(localContext) {
-    const equalityAdded = localContext.addEquality(this.equality),
+  assign(context) {
+    const equalityAdded = context.addEquality(this.equality),
           equalityNode = this.equality.getNode(),
-          equalityString = localContext.nodeAsString(equalityNode),
+          equalityString = context.nodeAsString(equalityNode),
           equalityAssigned = equalityAdded; ///
 
     equalityAssigned ?
-      localContext.debug(`Able to assign the '${equalityString}' equality.`, equalityNode) :
-        localContext.trace(`Unable to assign the '${equalityString}' equality.`, equalityNode);
+      context.debug(`Able to assign the '${equalityString}' equality.`, equalityNode) :
+        context.trace(`Unable to assign the '${equalityString}' equality.`, equalityNode);
 
     return equalityAssigned;
   }

package/src/assignment/metavariable.js

@@ -9,15 +9,15 @@ export default class MetavariableAssignment {
     return this.metavariable;
   }
 
-  assign(localContext) {
-    const metavariableAdded = localContext.addMetavariable(this.metavariable),
+  assign(fileContext) {
+    const metavariableAdded = fileContext.addMetavariable(this.metavariable),
           metavariableNode = this.metavariable.getNode(),
-          metavariableString = localContext.nodeAsString(metavariableNode),
+          metavariableString = fileContext.nodeAsString(metavariableNode),
           metavariableAssigned = metavariableAdded; ///
 
     metavariableAssigned ?
-      localContext.debug(`Able to assign the '${metavariableString}' metavariable.`, metavariableNode) :
-        localContext.trace(`Unable to assign the '${metavariableString}' metavariable.`, metavariableNode);
+      fileContext.debug(`Able to assign the '${metavariableString}' metavariable.`, metavariableNode) :
+        fileContext.trace(`Unable to assign the '${metavariableString}' metavariable.`, metavariableNode);
 
     return metavariableAssigned;
   }

package/src/assignment/variable.js

@@ -9,15 +9,17 @@ export default class VariableAssignment {
     return this.variable;
   }
 
-  assign(localContext) {
-    const variableAdded = localContext.addVariable(this.variable),
+  assign(context) {
+    const variableAdded = context.addVariable(this.variable),
           variableNode = this.variable.getNode(),
-          variableString = localContext.nodeAsString(variableNode),
+          variableType = this.variable.getType(),
+          variableString = context.nodeAsString(variableNode),
+          variableTypeName = variableType.getName(),
           variableAssigned = variableAdded; ///
 
     variableAssigned ?
-      localContext.debug(`Able to assign the '${variableString}' variable.`, variableNode) :
-        localContext.trace(`Unable to assign the '${variableString}' variable.`, variableNode);
+      context.debug(`Able to assign the '${variableString}' variable with type '${variableTypeName}'.`, variableNode) :
+        context.trace(`Unable to assign the '${variableString}' variable with type '${variableTypeName}'.`, variableNode);
 
     return variableAssigned;
   }

package/src/constructor.js

@@ -1,8 +1,7 @@
 "use strict";
 
-import Type from "./type";
-
 import { nodeAsString } from "./utilities/string";
+import { typeFromJSONAndFileContext } from "./type";
 import { termNodeFromConstructorDeclarationTokens } from "./utilities/node";
 import { constructorDeclarationTokensFromTermString } from "./utilities/tokens";
 
@@ -62,11 +61,7 @@ export default class Constructor {
 
       json = typeJSON;  ///
 
-      type = Type.fromJSONAndFileContext(json, fileContext);
-
-      const typeName = type.getName();
-
-      type = fileContext.findTypeByTypeName(typeName); ///
+      type = typeFromJSONAndFileContext(json, fileContext);
     }
 
     const tokens = constructorDeclarationTokens,  ///

package/src/context/file.js

@@ -1,6 +1,5 @@
 "use strict";
 
-import Type from "../type";
 import Rule from "../rule";
 import Axiom from "../axiom";
 import Lemma from "../lemma";
@@ -11,9 +10,10 @@ import Combinator from "../combinator";
 import Constructor from "../constructor";
 import Metavariable from "../metavariable";
 
+import { push } from "../utilities/array";
 import { objectType } from "../type";
-import { push, filter } from "../utilities/array";
 import { statementMetaType } from "../metaType";
+import { typeFromJSONAndFileContext } from "../type";
 import { nodeAsString, nodesAsString } from "../utilities/string";
 
 const metaTypes = [
@@ -259,18 +259,15 @@ export default class FileContext {
   findTypeByTypeName(typeName) {
     let types = this.getTypes();
 
-    types = [ ///
-      ...types,
-      objectType
-    ];
+    types.push(objectType);
 
     const type = types.find((type) => {
-            const matches = type.matchTypeName(typeName);
+      const matches = type.matchTypeName(typeName);
 
-            if (matches) {
-              return true;
-            }
-          }) || null;
+      if (matches) {
+        return true;
+      }
+    }) || null;
 
     return type;
   }
@@ -632,7 +629,7 @@ export default class FileContext {
 
     typesJSON.forEach((typeJSON) => {
       const json = typeJSON,  ///
-            type = Type.fromJSONAndFileContext(json, fileContext);
+            type = typeFromJSONAndFileContext(json, fileContext);
 
       this.types.push(type);
     });

package/src/context/local.js

@@ -2,8 +2,7 @@
 
 import Variable from "../variable";
 import Collection from "../collection";
-import fileMixins from "../mixins/file";
-import loggingMixins from "../mixins/logging";
+import contextMixins from "../mixins/context";
 
 import { last } from "../utilities/array";
 import { mergeCollections, findCollectionByType, findCollectionByTerm, findCollectionByTerms } from "../utilities/collection";
@@ -24,8 +23,8 @@ class LocalContext {
     let variables = this.context.getVariables();
 
     variables = [ ///
-      ...variables,
-      ...this.variables
+      ...this.variables,
+      ...variables
     ];
 
     return variables;
@@ -35,8 +34,8 @@ class LocalContext {
     let proofSteps = this.context.getProofSteps();
 
     proofSteps = [  ///
-      ...proofSteps,
-      ...this.proofSteps
+      ...this.proofSteps,
+      ...proofSteps
     ];
 
     return proofSteps;
@@ -306,7 +305,6 @@ class LocalContext {
   }
 }
 
-Object.assign(LocalContext.prototype, fileMixins);
-Object.assign(LocalContext.prototype, loggingMixins);
+Object.assign(LocalContext.prototype, contextMixins);
 
 export default LocalContext;

package/src/context/localMeta.js

@@ -1,7 +1,6 @@
 "use strict";
 
-import fileMixins from "../mixins/file";
-import loggingMixins from "../mixins/logging";
+import contextMixins from "../mixins/context";
 
 import { last } from "../utilities/array";
 
@@ -20,8 +19,8 @@ class LocalMetaContext {
     let metavariables = this.context.getMetavariables();
 
     metavariables = [ ///
+      ...this.metavariables,
       ...metavariables,
-      this.metavariables
     ]
 
     return metavariables;
@@ -31,8 +30,8 @@ class LocalMetaContext {
     let metaproofSteps = this.context.getMetaproofSteps();
 
     metaproofSteps = [  ///
-      ...metaproofSteps,
-      ...this.metaproofSteps
+      ...this.metaproofSteps,
+      ...metaproofSteps
     ];
 
     return metaproofSteps;
@@ -140,7 +139,6 @@ class LocalMetaContext {
   }
 }
 
-Object.assign(LocalMetaContext.prototype, fileMixins);
-Object.assign(LocalMetaContext.prototype, loggingMixins);
+Object.assign(LocalMetaContext.prototype, contextMixins);
 
 export default LocalMetaContext;

package/src/context/release.js

@@ -277,18 +277,15 @@ export default class ReleaseContext {
   findTypeByTypeName(typeName) {
     let types = this.getTypes();
 
-    types = [ ///
-      ...types,
-      objectType
-    ];
+    types.push(objectType);
 
     const type = types.find((type) => {
-            const matches = type.matchTypeName(typeName);
+      const matches = type.matchTypeName(typeName);
 
-            if (matches) {
-              return true;
-            }
-          }) || null;
+      if (matches) {
+        return true;
+      }
+    }) || null;
 
     return type;
   }

package/src/equality.js

@@ -31,9 +31,9 @@ export default class Equality {
 
     const leftTermType = leftTerm.getType(),
           rightTermType = rightTerm.getType(),
-          leftTermTypeEqualToSubTypeOfOrSuperTypeOfRightTermType = leftTermType.isEqualToSubTypeOfOrSuperTypeOf(rightTermType);
+          leftTermTypeComparableToRightTermType = leftTermType.isComparableTo(rightTermType);
 
-    if (leftTermTypeEqualToSubTypeOfOrSuperTypeOfRightTermType) {
+    if (leftTermTypeComparableToRightTermType) {
       const node = equalityNode;  ///
 
       equality = new Equality(node, leftTerm, rightTerm);

package/src/metaType.js

@@ -57,16 +57,6 @@ export default class MetaType {
 
     return metaType;
   }
-
-  static fromJSONAndFileContext(json, fileContext) {
-    let metaType;
-
-    const { name } = json;
-
-    metaType = new MetaType(name);
-
-    return metaType;
-  }
 }
 
 class StatementMetaType extends MetaType {
@@ -79,3 +69,13 @@ class StatementMetaType extends MetaType {
 }
 
 export const statementMetaType = StatementMetaType.fromNothing();
+
+export function metaTypeFromJSONAndFileContext(json, fileContext) {
+  let metaType;
+
+  const { name } = json;
+
+  metaType = new MetaType(name);
+
+  return metaType;
+}

package/src/metavariable.js

@@ -1,8 +1,7 @@
 "use strict";
 
-import MetaType from "./metaType";
-
 import { nodeAsString } from "./utilities/string";
+import { metaTypeFromJSONAndFileContext } from "./metaType";
 
 export default class Metavariable {
   constructor(node, metaType) {
@@ -54,11 +53,7 @@ export default class Metavariable {
 
     json = metaType;  ///
 
-    metaType = MetaType.fromJSONAndFileContext(json, fileContext);
-
-    const metaTypeName = metaType.getName();
-
-    metaType = fileContext.findMetaTypeByMetaTypeName(metaTypeName); ///
+    metaType = metaTypeFromJSONAndFileContext(json, fileContext);
 
     const metavariable = new Metavariable(node, metaType);
 

package/src/mixins/{file.js → context.js}

@@ -1,5 +1,17 @@
 "use strict";
 
+function trace(node, message) { this.context.trace(node, message); }
+
+function debug(node, message) { this.context.debug(node, message); }
+
+function info(node, message) { this.context.info(node, message); }
+
+function warning(node, message) { this.context.warning(node, message); }
+
+function error(node, message) { this.context.error(node, message); }
+
+function fatal(node, message) { this.context.fatal(node, message); }
+
 function getAxioms() { return this.context.getAxioms(); }
 
 function getLemmas() { return this.context.getLemmas(); }
@@ -34,7 +46,13 @@ function nodeAsString(node) { return this.context.nodeAsString(node); }
 
 function nodesAsString(node) { return this.context.nodesAsString(node); }
 
-const fileMixins = {
+const contextMixins = {
+  trace,
+  debug,
+  info,
+  warning,
+  error,
+  fatal,
   getAxioms,
   getLemmas,
   getTheorems,
@@ -54,4 +72,4 @@ const fileMixins = {
   nodesAsString
 };
 
-export default fileMixins;
+export default contextMixins;

package/src/ruleNames.js

@@ -13,7 +13,9 @@ export const METASTATEMENT_RULE_NAME = "metastatement";
 export const RULE_SUBPROOF_RULE_NAME = "ruleSubproof";
 export const META_ARGUMENT_RULE_NAME = "metaArgument";
 export const QUALIFIED_STATEMENT_RULE_NAME = "qualifiedStatement";
+export const VARIABLE_DECLARATION_RULE_NAME = "variableDeclaration";
 export const UNQUALIFIED_STATEMENT_RULE_NAME = "unqualifiedStatement";
 export const CONSTRUCTOR_DECLARATION_RULE_NAME = "constructorDeclaration";
 export const QUALIFIED_METASTATEMENT_RULE_NAME = "qualifiedMetastatement";
+export const METAVARIABLE_DECLARATION_RULE_NAME = "metavariableDeclaration";
 export const UNQUALIFIED_METASTATEMENT_RULE_NAME = "unqualifiedMetastatement";