occam-verify-cli 0.0.923 → 0.0.925

package/lib/verify/statement.js

@@ -23,93 +23,32 @@ _export(exports, {
     }
 });
 var _equality = /*#__PURE__*/ _interop_require_default(require("../verify/equality"));
-var _bracketed = /*#__PURE__*/ _interop_require_default(require("../ocmbinator/bracketed"));
-var _typeAssertion = /*#__PURE__*/ _interop_require_default(require("../verify/typeAssertion"));
-var _statementAsDefinedAssertion = /*#__PURE__*/ _interop_require_wildcard(require("../verify/statementAsDefinedAssertion"));
-var _statementAsContainedAssertion = /*#__PURE__*/ _interop_require_wildcard(require("../verify/statementAsContainedAssertion"));
+var _judgement = /*#__PURE__*/ _interop_require_default(require("../verify/judgement"));
+var _type = /*#__PURE__*/ _interop_require_default(require("../verify/assertion/type"));
+var _defined = /*#__PURE__*/ _interop_require_default(require("../verify/assertion/defined"));
+var _subproof = /*#__PURE__*/ _interop_require_default(require("../verify/assertion/subproof"));
+var _contained = /*#__PURE__*/ _interop_require_default(require("../verify/assertion/contained"));
 var _statementAgainstCombinator = /*#__PURE__*/ _interop_require_default(require("../verifier/nodes/statementAgainstCombinator"));
 var _query = require("../utilities/query");
-function _array_like_to_array(arr, len) {
-    if (len == null || len > arr.length) len = arr.length;
-    for(var i = 0, arr2 = new Array(len); i < len; i++)arr2[i] = arr[i];
-    return arr2;
-}
-function _array_without_holes(arr) {
-    if (Array.isArray(arr)) return _array_like_to_array(arr);
-}
+var _metaTypeNames = require("../metaTypeNames");
 function _interop_require_default(obj) {
     return obj && obj.__esModule ? obj : {
         default: obj
     };
 }
-function _getRequireWildcardCache(nodeInterop) {
-    if (typeof WeakMap !== "function") return null;
-    var cacheBabelInterop = new WeakMap();
-    var cacheNodeInterop = new WeakMap();
-    return (_getRequireWildcardCache = function(nodeInterop) {
-        return nodeInterop ? cacheNodeInterop : cacheBabelInterop;
-    })(nodeInterop);
-}
-function _interop_require_wildcard(obj, nodeInterop) {
-    if (!nodeInterop && obj && obj.__esModule) {
-        return obj;
-    }
-    if (obj === null || typeof obj !== "object" && typeof obj !== "function") {
-        return {
-            default: obj
-        };
-    }
-    var cache = _getRequireWildcardCache(nodeInterop);
-    if (cache && cache.has(obj)) {
-        return cache.get(obj);
-    }
-    var newObj = {
-        __proto__: null
-    };
-    var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor;
-    for(var key in obj){
-        if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) {
-            var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null;
-            if (desc && (desc.get || desc.set)) {
-                Object.defineProperty(newObj, key, desc);
-            } else {
-                newObj[key] = obj[key];
-            }
-        }
-    }
-    newObj.default = obj;
-    if (cache) {
-        cache.set(obj, newObj);
-    }
-    return newObj;
-}
-function _iterable_to_array(iter) {
-    if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter);
-}
-function _non_iterable_spread() {
-    throw new TypeError("Invalid attempt to spread non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
-}
-function _to_consumable_array(arr) {
-    return _array_without_holes(arr) || _iterable_to_array(arr) || _unsupported_iterable_to_array(arr) || _non_iterable_spread();
-}
-function _unsupported_iterable_to_array(o, minLen) {
-    if (!o) return;
-    if (typeof o === "string") return _array_like_to_array(o, minLen);
-    var n = Object.prototype.toString.call(o).slice(8, -1);
-    if (n === "Object" && o.constructor) n = o.constructor.name;
-    if (n === "Map" || n === "Set") return Array.from(n);
-    if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _array_like_to_array(o, minLen);
-}
-var equalityNodeQuery = (0, _query.nodeQuery)("/statement/equality!"), typeAssertionNodeQuery = (0, _query.nodeQuery)("/statement/typeAssertion!");
+var equalityNodeQuery = (0, _query.nodeQuery)("/statement/equality!"), judgementNodeQuery = (0, _query.nodeQuery)("/statement/judgement!"), metavariableNodeQuery = (0, _query.nodeQuery)("/statement/metavariable!"), typeAssertionNodeQuery = (0, _query.nodeQuery)("/statement/typeAssertion!"), definedAssertionNodeQuery = (0, _query.nodeQuery)("/statement/definedAssertion!"), subproofAssertionNodeQuery = (0, _query.nodeQuery)("/statement/subproofAssertion!"), containedAssertionNodeQuery = (0, _query.nodeQuery)("/statement/containedAssertion!");
 function verifyStatement(statementNode, assignments, derived, localContext) {
     var statementVerified;
     var statementString = localContext.nodeAsString(statementNode);
     localContext.trace("Verifying the '".concat(statementString, "' statement..."), statementNode);
     var verifyStatementFunctions = [
+        verifyStatementAsMetavariable,
         verifyStatementAsEquality,
+        verifyStatementAsJudgement,
         verifyStatementAsTypeAssertion,
-        _statementAsDefinedAssertion.default,
-        _statementAsContainedAssertion.default,
+        verifyStatementAsDefinedAssertion,
+        verifyStatementAsSubproofAssertion,
+        verifyStatementAsContainedAssertion,
         verifyStatementAgainstCombinators
     ];
     statementVerified = verifyStatementFunctions.some(function(verifyStatementFunction) {
@@ -127,7 +66,7 @@ function verifyStandaloneStatement(statementNode, localContext, verifyAhead) {
     var standaloneStatementVerified = false;
     var statementString = localContext.nodeAsString(statementNode);
     localContext.trace("Verifying the '".concat(statementString, "' standalone statement..."), statementNode);
-    var derived = false, assignments = [], statementVerified = verifyStatement(statementNode, assignments, derived);
+    var derived = false, assignments = [], statementVerified = verifyStatement(statementNode, assignments, derived, localContext);
     if (statementVerified) {
         var verifiedAhead = verifyAhead();
         standaloneStatementVerified = verifiedAhead; ///
@@ -143,11 +82,11 @@ Object.assign(_statementAgainstCombinator.default, {
 var _default = verifyStatement;
 function verifyStatementAsEquality(statementNode, assignments, derived, localContext) {
     var statementVerifiedAsEquality = false;
-    var statementEquality = isStatementEquality(statementNode);
-    if (statementEquality) {
+    var equalityNode = equalityNodeQuery(statementNode);
+    if (equalityNode !== null) {
         var statementString = localContext.nodeAsString(statementNode);
         localContext.trace("Verifying the '".concat(statementString, "' statement as an equality..."), statementNode);
-        var equalityNode = equalityNodeQuery(statementNode), equalityVerified = (0, _equality.default)(equalityNode, assignments, derived, localContext, function() {
+        var equalityVerified = (0, _equality.default)(equalityNode, assignments, derived, localContext, function() {
             var verifiedAhead = true;
             return verifiedAhead;
         });
@@ -160,14 +99,11 @@ function verifyStatementAsEquality(statementNode, assignments, derived, localCon
 }
 function verifyStatementAsTypeAssertion(statementNode, assignments, derived, localContext) {
     var statementVerifiedAsTypeAssertion = false;
-    var statementTypeAssertion = isStatementTypeAssertion(statementNode);
-    if (statementTypeAssertion) {
+    var typeAssertionNode = typeAssertionNodeQuery(statementNode);
+    if (typeAssertionNode !== null) {
         var statementString = localContext.nodeAsString(statementNode);
         localContext.trace("Verifying the '".concat(statementString, "' statement as a type assertion..."), statementNode);
-        var typeAssertionNode = typeAssertionNodeQuery(statementNode), typeAssertionVerified = (0, _typeAssertion.default)(typeAssertionNode, assignments, derived, localContext, function() {
-            var verifiedAhead = true;
-            return verifiedAhead;
-        });
+        var typeAssertionVerified = (0, _type.default)(typeAssertionNode, assignments, derived, localContext);
         statementVerifiedAsTypeAssertion = typeAssertionVerified; ///
         if (statementVerifiedAsTypeAssertion) {
             localContext.debug("...verified the '".concat(statementString, "' statement as a type assertion."), statementNode);
@@ -175,14 +111,95 @@ function verifyStatementAsTypeAssertion(statementNode, assignments, derived, loc
     }
     return statementVerifiedAsTypeAssertion;
 }
+function verifyStatementAsJudgement(statementNode, assignments, derived, localContext) {
+    var statementVerifiedAsJudgement = false;
+    var judgementNode = judgementNodeQuery(statementNode);
+    if (judgementNode !== null) {
+        var statementString = localContext.nodeAsString(statementNode);
+        localContext.trace("Verifying the '".concat(statementString, "' statement as a judgement..."), statementNode);
+        var judgementVerified = (0, _judgement.default)(judgementNode, assignments, derived, localContext);
+        statementVerifiedAsJudgement = judgementVerified; ///
+        if (statementVerifiedAsJudgement) {
+            localContext.debug("...verified the '".concat(statementString, "' statement as a judgement."), statementNode);
+        }
+    }
+    return statementVerifiedAsJudgement;
+}
+function verifyStatementAsMetavariable(statementNode, assignments, derived, localContext) {
+    var statementVerifiedAsMetavariable = false;
+    var metavariableNode = metavariableNodeQuery(statementNode);
+    if (metavariableNode !== null) {
+        var statementString = localContext.nodeAsString(statementNode);
+        localContext.trace("Verifying the '".concat(statementString, "' statement as a metavariable..."), statementNode);
+        var metavariable = localContext.findMetavariableByMetavariableNode(metavariableNode);
+        if (metavariable !== null) {
+            var metaTypeName = metavariable.getMetaTypeName();
+            if (metaTypeName === _metaTypeNames.STATEMENT_META_TYPE_NAME) {
+                statementVerifiedAsMetavariable = true;
+            }
+        }
+        if (statementVerifiedAsMetavariable) {
+            localContext.debug("...verified the '".concat(statementString, "' statement as a metavariable."), statementNode);
+        }
+    }
+    return statementVerifiedAsMetavariable;
+}
+function verifyStatementAsDefinedAssertion(statementNode, assignments, derived, localContext) {
+    var statementVerifiedAsDefinedAssertion = false;
+    var definedAssertionNode = definedAssertionNodeQuery(statementNode);
+    if (definedAssertionNode !== null) {
+        var statementString = localContext.nodeAsString(statementNode);
+        localContext.trace("Verifying the '".concat(statementString, "' statement as a defined assertion..."), statementNode);
+        var definedAssertionVerified = (0, _defined.default)(definedAssertionNode, assignments, derived, localContext, function() {
+            var verifiedAhead = true;
+            return verifiedAhead;
+        });
+        statementVerifiedAsDefinedAssertion = definedAssertionVerified; ///
+        if (statementVerifiedAsDefinedAssertion) {
+            localContext.debug("...verified the '".concat(statementString, "' statement as a defined assertion."), statementNode);
+        }
+    }
+    return statementVerifiedAsDefinedAssertion;
+}
+function verifyStatementAsSubproofAssertion(statementNode, assignments, derived, localContext) {
+    var statementVerifiedAsSubproofAssertion = false;
+    var subproofAssertionNode = subproofAssertionNodeQuery(statementNode);
+    if (subproofAssertionNode !== null) {
+        var statementString = localContext.nodeAsString(statementNode);
+        localContext.trace("Verifying the '".concat(statementString, "' statement as a subproof assertion..."), statementNode);
+        var subproofAssertionVerified = (0, _subproof.default)(subproofAssertionNode, assignments, derived, localContext, function() {
+            var verifiedAhead = true;
+            return verifiedAhead;
+        });
+        statementVerifiedAsSubproofAssertion = subproofAssertionVerified; ///
+        if (statementVerifiedAsSubproofAssertion) {
+            localContext.debug("...verified the '".concat(statementString, "' statement as a defined assertion."), statementNode);
+        }
+    }
+    return statementVerifiedAsSubproofAssertion;
+}
+function verifyStatementAsContainedAssertion(statementNode, assignments, derived, localContext) {
+    var statementVerifiedAsContainedAssertion = false;
+    var containedAssertionNode = containedAssertionNodeQuery(statementNode);
+    if (containedAssertionNode !== null) {
+        var statementString = localContext.nodeAsString(statementNode);
+        localContext.trace("Verifying the '".concat(statementString, "' statement as a defined assertion..."), statementNode);
+        var containedAssertionVerified = (0, _contained.default)(containedAssertionNode, assignments, derived, localContext, function() {
+            var verifiedAhead = true;
+            return verifiedAhead;
+        });
+        statementVerifiedAsContainedAssertion = containedAssertionVerified; ///
+        if (statementVerifiedAsContainedAssertion) {
+            localContext.debug("...verified the '".concat(statementString, "' statement as a defined assertion."), statementNode);
+        }
+    }
+    return statementVerifiedAsContainedAssertion;
+}
 function verifyStatementAgainstCombinators(statementNode, assignments, derived, localContext) {
     var statementVerifiedAgainstCombinators = false;
-    var statementEquality = isStatementEquality(statementNode), statementTypeAssertion = isStatementTypeAssertion(statementNode), statementDefinedAssertion = (0, _statementAsDefinedAssertion.isStatementDefinedAssertion)(statementNode), statementContainedAssertion = (0, _statementAsContainedAssertion.isStatementContainedAssertion)(statementNode);
-    if (!statementEquality && !statementTypeAssertion && !statementDefinedAssertion && !statementContainedAssertion) {
+    var equalityNode = equalityNodeQuery(statementNode), judgementNode = judgementNodeQuery(statementNode), metavariableNode = metavariableNodeQuery(statementNode), typeAssertionNode = typeAssertionNodeQuery(statementNode), definedAssertionNode = definedAssertionNodeQuery(statementNode), subproofAssertionNode = subproofAssertionNodeQuery(statementNode), containedAssertionNode = containedAssertionNodeQuery(statementNode);
+    if (equalityNode === null && judgementNode === null && metavariableNode === null && typeAssertionNode === null && definedAssertionNode === null && subproofAssertionNode === null && containedAssertionNode === null) {
         var combinators = localContext.getCombinators();
-        combinators = [
-            _bracketed.default
-        ].concat(_to_consumable_array(combinators));
         statementVerifiedAgainstCombinators = combinators.some(function(combinator) {
             var statementVerifiedAgainstCombinator = verifyStatementAgainstCombinator(statementNode, combinator, localContext);
             if (statementVerifiedAgainstCombinator) {
@@ -206,13 +223,5 @@ function verifyStatementAgainstCombinator(statementNode, combinator, localContex
     }
     return statementVerifiedAgainstCombinator;
 }
-function isStatementEquality(statementNode) {
-    var equalityNode = equalityNodeQuery(statementNode), statementEquality = equalityNode !== null;
-    return statementEquality;
-}
-function isStatementTypeAssertion(statementNode) {
-    var typeAssertionNode = typeAssertionNodeQuery(statementNode), statementTypeAssertion = typeAssertionNode !== null;
-    return statementTypeAssertion;
-}
 
-//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/verify/statement.js"],"sourcesContent":["\"use strict\";\n\nimport verifyEquality from \"../verify/equality\";\nimport bracketedCombinator from \"../ocmbinator/bracketed\";\nimport verifyTypeAssertion from \"../verify/typeAssertion\";\nimport verifyStatementAsDefinedAssertion from \"../verify/statementAsDefinedAssertion\";\nimport verifyStatementAsContainedAssertion from \"../verify/statementAsContainedAssertion\";\nimport statementAgainstCombinatorNodesVerifier from \"../verifier/nodes/statementAgainstCombinator\";\n\nimport { nodeQuery } from \"../utilities/query\";\nimport { isStatementDefinedAssertion } from \"../verify/statementAsDefinedAssertion\";\nimport { isStatementContainedAssertion } from \"../verify/statementAsContainedAssertion\";\n\nconst equalityNodeQuery = nodeQuery(\"/statement/equality!\"),\n      typeAssertionNodeQuery = nodeQuery(\"/statement/typeAssertion!\");\n\nfunction verifyStatement(statementNode, assignments, derived, localContext) {\n  let statementVerified;\n\n  const statementString = localContext.nodeAsString(statementNode);\n\n  localContext.trace(`Verifying the '${statementString}' statement...`, statementNode);\n\n  const verifyStatementFunctions = [\n    verifyStatementAsEquality,\n    verifyStatementAsTypeAssertion,\n    verifyStatementAsDefinedAssertion,\n    verifyStatementAsContainedAssertion,\n    verifyStatementAgainstCombinators\n  ];\n\n  statementVerified = verifyStatementFunctions.some((verifyStatementFunction) => {\n    const statementVerified = verifyStatementFunction(statementNode, assignments, derived, localContext);\n\n    if (statementVerified) {\n      return true;\n    }\n  });\n\n  if (statementVerified) {\n    localContext.debug(`...verified the '${statementString}' statement.`, statementNode);\n  }\n\n  return statementVerified;\n}\n\nexport function verifyStandaloneStatement(statementNode, localContext, verifyAhead) {\n  let standaloneStatementVerified = false;\n\n  const statementString = localContext.nodeAsString(statementNode);\n\n  localContext.trace(`Verifying the '${statementString}' standalone statement...`, statementNode);\n\n  const derived = false,\n        assignments = [],\n        statementVerified = verifyStatement(statementNode, assignments, derived);\n\n  if (statementVerified) {\n    const verifiedAhead = verifyAhead();\n\n    standaloneStatementVerified = verifiedAhead; ///\n  }\n\n  if (standaloneStatementVerified) {\n    localContext.debug(`...verified the '${statementString}' standalone statement.`, statementNode);\n  }\n\n  return standaloneStatementVerified;\n}\n\nObject.assign(statementAgainstCombinatorNodesVerifier, {\n  verifyStatement\n});\n\nexport default verifyStatement;\n\nexport function verifyStatementAsEquality(statementNode, assignments, derived, localContext) {\n  let statementVerifiedAsEquality = false;\n\n  const statementEquality = isStatementEquality(statementNode);\n\n  if (statementEquality) {\n    const statementString = localContext.nodeAsString(statementNode);\n\n    localContext.trace(`Verifying the '${statementString}' statement as an equality...`, statementNode);\n\n    const equalityNode = equalityNodeQuery(statementNode),\n          equalityVerified = verifyEquality(equalityNode, assignments, derived, localContext, () => {\n            const verifiedAhead = true;\n\n            return verifiedAhead;\n          });\n\n    statementVerifiedAsEquality = equalityVerified; ///\n\n    if (statementVerifiedAsEquality) {\n      localContext.debug(`...verified the '${statementString}' statement as an equality.`, statementNode);\n    }\n  }\n\n  return statementVerifiedAsEquality;\n}\n\nexport function verifyStatementAsTypeAssertion(statementNode, assignments, derived, localContext) {\n  let statementVerifiedAsTypeAssertion = false;\n\n  const statementTypeAssertion = isStatementTypeAssertion(statementNode);\n\n  if (statementTypeAssertion) {\n    const statementString = localContext.nodeAsString(statementNode);\n\n    localContext.trace(`Verifying the '${statementString}' statement as a type assertion...`, statementNode);\n\n    const typeAssertionNode = typeAssertionNodeQuery(statementNode),\n          typeAssertionVerified = verifyTypeAssertion(typeAssertionNode, assignments, derived, localContext, () => {\n            const verifiedAhead = true;\n\n            return verifiedAhead;\n          });\n\n    statementVerifiedAsTypeAssertion = typeAssertionVerified; ///\n\n    if (statementVerifiedAsTypeAssertion) {\n      localContext.debug(`...verified the '${statementString}' statement as a type assertion.`, statementNode);\n    }\n  }\n\n  return statementVerifiedAsTypeAssertion;\n}\n\nfunction verifyStatementAgainstCombinators(statementNode, assignments, derived, localContext) {\n  let statementVerifiedAgainstCombinators = false;\n\n  const statementEquality = isStatementEquality(statementNode),\n        statementTypeAssertion = isStatementTypeAssertion(statementNode),\n        statementDefinedAssertion = isStatementDefinedAssertion(statementNode),\n        statementContainedAssertion = isStatementContainedAssertion(statementNode);\n\n  if (!statementEquality && !statementTypeAssertion && !statementDefinedAssertion && !statementContainedAssertion) {\n    let combinators = localContext.getCombinators();\n\n    combinators = [ ///\n      bracketedCombinator,\n      ...combinators\n    ];\n\n    statementVerifiedAgainstCombinators = combinators.some((combinator) => {\n      const statementVerifiedAgainstCombinator = verifyStatementAgainstCombinator(statementNode, combinator, localContext);\n\n      if (statementVerifiedAgainstCombinator) {\n        return true;\n      }\n    });\n  }\n\n  return statementVerifiedAgainstCombinators;\n}\n\nfunction verifyStatementAgainstCombinator(statementNode, combinator, localContext) {\n  let statementVerifiedAgainstCombinator;\n\n  const statementString = localContext.nodeAsString(statementNode),\n        combinatorString = combinator.getString();\n\n  localContext.trace(`Verifying the '${statementString}' statement against the '${combinatorString}' combinator...`, statementNode);\n\n  const combinatorStatementNode = combinator.getStatementNode(),\n        nonTerminalNodeA = statementNode, ///\n        nonTerminalNodeB = combinatorStatementNode, ///\n        nonTerminalNodeVerified = statementAgainstCombinatorNodesVerifier.verifyNonTerminalNode(nonTerminalNodeA, nonTerminalNodeB, localContext, () => {\n          const verifiedAhead = true;\n\n          return verifiedAhead;\n        });\n\n  statementVerifiedAgainstCombinator = nonTerminalNodeVerified;  ///\n\n  if (statementVerifiedAgainstCombinator) {\n    localContext.debug(`...verified the '${statementString}' statement against the '${combinatorString}' combinator.`, statementNode);\n  }\n\n  return statementVerifiedAgainstCombinator;\n}\n\nfunction isStatementEquality(statementNode) {\n  const equalityNode = equalityNodeQuery(statementNode),\n        statementEquality = (equalityNode !== null);\n\n  return statementEquality;\n}\n\nfunction isStatementTypeAssertion(statementNode) {\n  const typeAssertionNode = typeAssertionNodeQuery(statementNode),\n        statementTypeAssertion = (typeAssertionNode !== null);\n\n  return statementTypeAssertion;\n}\n"],"names":["verifyStandaloneStatement","verifyStatementAsEquality","verifyStatementAsTypeAssertion","equalityNodeQuery","nodeQuery","typeAssertionNodeQuery","verifyStatement","statementNode","assignments","derived","localContext","statementVerified","statementString","nodeAsString","trace","verifyStatementFunctions","verifyStatementAsDefinedAssertion","verifyStatementAsContainedAssertion","verifyStatementAgainstCombinators","some","verifyStatementFunction","debug","verifyAhead","standaloneStatementVerified","verifiedAhead","Object","assign","statementAgainstCombinatorNodesVerifier","statementVerifiedAsEquality","statementEquality","isStatementEquality","equalityNode","equalityVerified","verifyEquality","statementVerifiedAsTypeAssertion","statementTypeAssertion","isStatementTypeAssertion","typeAssertionNode","typeAssertionVerified","verifyTypeAssertion","statementVerifiedAgainstCombinators","statementDefinedAssertion","isStatementDefinedAssertion","statementContainedAssertion","isStatementContainedAssertion","combinators","getCombinators","bracketedCombinator","combinator","statementVerifiedAgainstCombinator","verifyStatementAgainstCombinator","combinatorString","getString","combinatorStatementNode","getStatementNode","nonTerminalNodeA","nonTerminalNodeB","nonTerminalNodeVerified","verifyNonTerminalNode"],"mappings":"AAAA;;;;;;;;;;;IA0EA,OAA+B;eAA/B;;IA5BgBA,yBAAyB;eAAzBA;;IA8BAC,yBAAyB;eAAzBA;;IA2BAC,8BAA8B;eAA9BA;;;+DArGW;gEACK;oEACA;mFACc;qFACE;iFACI;qBAE1B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAI1B,IAAMC,oBAAoBC,IAAAA,gBAAS,EAAC,yBAC9BC,yBAAyBD,IAAAA,gBAAS,EAAC;AAEzC,SAASE,gBAAgBC,aAAa,EAAEC,WAAW,EAAEC,OAAO,EAAEC,YAAY;IACxE,IAAIC;IAEJ,IAAMC,kBAAkBF,aAAaG,YAAY,CAACN;IAElDG,aAAaI,KAAK,CAAC,AAAC,kBAAiC,OAAhBF,iBAAgB,mBAAiBL;IAEtE,IAAMQ,2BAA2B;QAC/Bd;QACAC;QACAc,oCAAiC;QACjCC,sCAAmC;QACnCC;KACD;IAEDP,oBAAoBI,yBAAyBI,IAAI,CAAC,SAACC;QACjD,IAAMT,oBAAoBS,wBAAwBb,eAAeC,aAAaC,SAASC;QAEvF,IAAIC,mBAAmB;YACrB,OAAO;QACT;IACF;IAEA,IAAIA,mBAAmB;QACrBD,aAAaW,KAAK,CAAC,AAAC,oBAAmC,OAAhBT,iBAAgB,iBAAeL;IACxE;IAEA,OAAOI;AACT;AAEO,SAASX,0BAA0BO,aAAa,EAAEG,YAAY,EAAEY,WAAW;IAChF,IAAIC,8BAA8B;IAElC,IAAMX,kBAAkBF,aAAaG,YAAY,CAACN;IAElDG,aAAaI,KAAK,CAAC,AAAC,kBAAiC,OAAhBF,iBAAgB,8BAA4BL;IAEjF,IAAME,UAAU,OACVD,cAAc,EAAE,EAChBG,oBAAoBL,gBAAgBC,eAAeC,aAAaC;IAEtE,IAAIE,mBAAmB;QACrB,IAAMa,gBAAgBF;QAEtBC,8BAA8BC,eAAe,GAAG;IAClD;IAEA,IAAID,6BAA6B;QAC/Bb,aAAaW,KAAK,CAAC,AAAC,oBAAmC,OAAhBT,iBAAgB,4BAA0BL;IACnF;IAEA,OAAOgB;AACT;AAEAE,OAAOC,MAAM,CAACC,mCAAuC,EAAE;IACrDrB,iBAAAA;AACF;IAEA,WAAeA;AAER,SAASL,0BAA0BM,aAAa,EAAEC,WAAW,EAAEC,OAAO,EAAEC,YAAY;IACzF,IAAIkB,8BAA8B;IAElC,IAAMC,oBAAoBC,oBAAoBvB;IAE9C,IAAIsB,mBAAmB;QACrB,IAAMjB,kBAAkBF,aAAaG,YAAY,CAACN;QAElDG,aAAaI,KAAK,CAAC,AAAC,kBAAiC,OAAhBF,iBAAgB,kCAAgCL;QAErF,IAAMwB,eAAe5B,kBAAkBI,gBACjCyB,mBAAmBC,IAAAA,iBAAc,EAACF,cAAcvB,aAAaC,SAASC,cAAc;YAClF,IAAMc,gBAAgB;YAEtB,OAAOA;QACT;QAENI,8BAA8BI,kBAAkB,GAAG;QAEnD,IAAIJ,6BAA6B;YAC/BlB,aAAaW,KAAK,CAAC,AAAC,oBAAmC,OAAhBT,iBAAgB,gCAA8BL;QACvF;IACF;IAEA,OAAOqB;AACT;AAEO,SAAS1B,+BAA+BK,aAAa,EAAEC,WAAW,EAAEC,OAAO,EAAEC,YAAY;IAC9F,IAAIwB,mCAAmC;IAEvC,IAAMC,yBAAyBC,yBAAyB7B;IAExD,IAAI4B,wBAAwB;QAC1B,IAAMvB,kBAAkBF,aAAaG,YAAY,CAACN;QAElDG,aAAaI,KAAK,CAAC,AAAC,kBAAiC,OAAhBF,iBAAgB,uCAAqCL;QAE1F,IAAM8B,oBAAoBhC,uBAAuBE,gBAC3C+B,wBAAwBC,IAAAA,sBAAmB,EAACF,mBAAmB7B,aAAaC,SAASC,cAAc;YACjG,IAAMc,gBAAgB;YAEtB,OAAOA;QACT;QAENU,mCAAmCI,uBAAuB,GAAG;QAE7D,IAAIJ,kCAAkC;YACpCxB,aAAaW,KAAK,CAAC,AAAC,oBAAmC,OAAhBT,iBAAgB,qCAAmCL;QAC5F;IACF;IAEA,OAAO2B;AACT;AAEA,SAAShB,kCAAkCX,aAAa,EAAEC,WAAW,EAAEC,OAAO,EAAEC,YAAY;IAC1F,IAAI8B,sCAAsC;IAE1C,IAAMX,oBAAoBC,oBAAoBvB,gBACxC4B,yBAAyBC,yBAAyB7B,gBAClDkC,4BAA4BC,IAAAA,wDAA2B,EAACnC,gBACxDoC,8BAA8BC,IAAAA,4DAA6B,EAACrC;IAElE,IAAI,CAACsB,qBAAqB,CAACM,0BAA0B,CAACM,6BAA6B,CAACE,6BAA6B;QAC/G,IAAIE,cAAcnC,aAAaoC,cAAc;QAE7CD,cAAc;YACZE,kBAAmB;SAEpB,CAHa,OAEZ,qBAAGF;QAGLL,sCAAsCK,YAAY1B,IAAI,CAAC,SAAC6B;YACtD,IAAMC,qCAAqCC,iCAAiC3C,eAAeyC,YAAYtC;YAEvG,IAAIuC,oCAAoC;gBACtC,OAAO;YACT;QACF;IACF;IAEA,OAAOT;AACT;AAEA,SAASU,iCAAiC3C,aAAa,EAAEyC,UAAU,EAAEtC,YAAY;IAC/E,IAAIuC;IAEJ,IAAMrC,kBAAkBF,aAAaG,YAAY,CAACN,gBAC5C4C,mBAAmBH,WAAWI,SAAS;IAE7C1C,aAAaI,KAAK,CAAC,AAAC,kBAA4DqC,OAA3CvC,iBAAgB,6BAA4C,OAAjBuC,kBAAiB,oBAAkB5C;IAEnH,IAAM8C,0BAA0BL,WAAWM,gBAAgB,IACrDC,mBAAmBhD,eACnBiD,mBAAmBH,yBACnBI,0BAA0B9B,mCAAuC,CAAC+B,qBAAqB,CAACH,kBAAkBC,kBAAkB9C,cAAc;QACxI,IAAMc,gBAAgB;QAEtB,OAAOA;IACT;IAENyB,qCAAqCQ,yBAA0B,GAAG;IAElE,IAAIR,oCAAoC;QACtCvC,aAAaW,KAAK,CAAC,AAAC,oBAA8D8B,OAA3CvC,iBAAgB,6BAA4C,OAAjBuC,kBAAiB,kBAAgB5C;IACrH;IAEA,OAAO0C;AACT;AAEA,SAASnB,oBAAoBvB,aAAa;IACxC,IAAMwB,eAAe5B,kBAAkBI,gBACjCsB,oBAAqBE,iBAAiB;IAE5C,OAAOF;AACT;AAEA,SAASO,yBAAyB7B,aAAa;IAC7C,IAAM8B,oBAAoBhC,uBAAuBE,gBAC3C4B,yBAA0BE,sBAAsB;IAEtD,OAAOF;AACT"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/verify/statement.js"],"sourcesContent":["\"use strict\";\n\nimport verifyEquality from \"../verify/equality\";\nimport verifyJudgement from \"../verify/judgement\";\nimport verifyTypeAssertion from \"../verify/assertion/type\";\nimport verifyDefinedAssertion from \"../verify/assertion/defined\";\nimport verifySubproofAssertion from \"../verify/assertion/subproof\";\nimport verifyContainedAssertion from \"../verify/assertion/contained\";\nimport statementAgainstCombinatorNodesVerifier from \"../verifier/nodes/statementAgainstCombinator\";\n\nimport { nodeQuery } from \"../utilities/query\";\nimport { STATEMENT_META_TYPE_NAME } from \"../metaTypeNames\";\n\nconst equalityNodeQuery = nodeQuery(\"/statement/equality!\"),\n      judgementNodeQuery = nodeQuery(\"/statement/judgement!\"),\n      metavariableNodeQuery = nodeQuery(\"/statement/metavariable!\"),\n      typeAssertionNodeQuery = nodeQuery(\"/statement/typeAssertion!\"),\n      definedAssertionNodeQuery = nodeQuery(\"/statement/definedAssertion!\"),\n      subproofAssertionNodeQuery = nodeQuery(\"/statement/subproofAssertion!\"),\n      containedAssertionNodeQuery = nodeQuery(\"/statement/containedAssertion!\");\n\nfunction verifyStatement(statementNode, assignments, derived, localContext) {\n  let statementVerified;\n\n  const statementString = localContext.nodeAsString(statementNode);\n\n  localContext.trace(`Verifying the '${statementString}' statement...`, statementNode);\n\n  const verifyStatementFunctions = [\n    verifyStatementAsMetavariable,\n    verifyStatementAsEquality,\n    verifyStatementAsJudgement,\n    verifyStatementAsTypeAssertion,\n    verifyStatementAsDefinedAssertion,\n    verifyStatementAsSubproofAssertion,\n    verifyStatementAsContainedAssertion,\n    verifyStatementAgainstCombinators\n  ];\n\n  statementVerified = verifyStatementFunctions.some((verifyStatementFunction) => {\n    const statementVerified = verifyStatementFunction(statementNode, assignments, derived, localContext);\n\n    if (statementVerified) {\n      return true;\n    }\n  });\n\n  if (statementVerified) {\n    localContext.debug(`...verified the '${statementString}' statement.`, statementNode);\n  }\n\n  return statementVerified;\n}\n\nexport function verifyStandaloneStatement(statementNode, localContext, verifyAhead) {\n  let standaloneStatementVerified = false;\n\n  const statementString = localContext.nodeAsString(statementNode);\n\n  localContext.trace(`Verifying the '${statementString}' standalone statement...`, statementNode);\n\n  const derived = false,\n        assignments = [],\n        statementVerified = verifyStatement(statementNode, assignments, derived, localContext);\n\n  if (statementVerified) {\n    const verifiedAhead = verifyAhead();\n\n    standaloneStatementVerified = verifiedAhead; ///\n  }\n\n  if (standaloneStatementVerified) {\n    localContext.debug(`...verified the '${statementString}' standalone statement.`, statementNode);\n  }\n\n  return standaloneStatementVerified;\n}\n\nObject.assign(statementAgainstCombinatorNodesVerifier, {\n  verifyStatement\n});\n\nexport default verifyStatement;\n\nexport function verifyStatementAsEquality(statementNode, assignments, derived, localContext) {\n  let statementVerifiedAsEquality = false;\n\n  const equalityNode = equalityNodeQuery(statementNode);\n\n  if (equalityNode !== null) {\n    const statementString = localContext.nodeAsString(statementNode);\n\n    localContext.trace(`Verifying the '${statementString}' statement as an equality...`, statementNode);\n\n    const equalityVerified = verifyEquality(equalityNode, assignments, derived, localContext, () => {\n            const verifiedAhead = true;\n\n            return verifiedAhead;\n          });\n\n    statementVerifiedAsEquality = equalityVerified; ///\n\n    if (statementVerifiedAsEquality) {\n      localContext.debug(`...verified the '${statementString}' statement as an equality.`, statementNode);\n    }\n  }\n\n  return statementVerifiedAsEquality;\n}\n\nexport function verifyStatementAsTypeAssertion(statementNode, assignments, derived, localContext) {\n  let statementVerifiedAsTypeAssertion = false;\n\n  const typeAssertionNode = typeAssertionNodeQuery(statementNode);\n\n  if (typeAssertionNode !== null) {\n    const statementString = localContext.nodeAsString(statementNode);\n\n    localContext.trace(`Verifying the '${statementString}' statement as a type assertion...`, statementNode);\n\n    const typeAssertionVerified = verifyTypeAssertion(typeAssertionNode, assignments, derived, localContext);\n\n    statementVerifiedAsTypeAssertion = typeAssertionVerified; ///\n\n    if (statementVerifiedAsTypeAssertion) {\n      localContext.debug(`...verified the '${statementString}' statement as a type assertion.`, statementNode);\n    }\n  }\n\n  return statementVerifiedAsTypeAssertion;\n}\n\nfunction verifyStatementAsJudgement(statementNode, assignments, derived, localContext) {\n  let statementVerifiedAsJudgement = false;\n\n  const judgementNode = judgementNodeQuery(statementNode);\n\n  if (judgementNode !== null) {\n    const statementString = localContext.nodeAsString(statementNode);\n\n    localContext.trace(`Verifying the '${statementString}' statement as a judgement...`, statementNode);\n\n    const judgementVerified = verifyJudgement(judgementNode, assignments, derived, localContext);\n\n    statementVerifiedAsJudgement = judgementVerified;  ///\n\n    if (statementVerifiedAsJudgement) {\n      localContext.debug(`...verified the '${statementString}' statement as a judgement.`, statementNode);\n    }\n  }\n\n  return statementVerifiedAsJudgement;\n}\n\nfunction verifyStatementAsMetavariable(statementNode, assignments, derived, localContext) {\n  let statementVerifiedAsMetavariable = false;\n\n  const metavariableNode = metavariableNodeQuery(statementNode);\n\n  if (metavariableNode !== null) {\n    const statementString = localContext.nodeAsString(statementNode);\n\n    localContext.trace(`Verifying the '${statementString}' statement as a metavariable...`, statementNode);\n\n    const metavariable = localContext.findMetavariableByMetavariableNode(metavariableNode);\n\n    if (metavariable !== null) {\n      const metaTypeName  = metavariable.getMetaTypeName();\n\n      if (metaTypeName === STATEMENT_META_TYPE_NAME) {\n        statementVerifiedAsMetavariable = true;\n      }\n    }\n\n    if (statementVerifiedAsMetavariable) {\n      localContext.debug(`...verified the '${statementString}' statement as a metavariable.`, statementNode);\n    }\n  }\n\n  return statementVerifiedAsMetavariable;\n}\n\nfunction verifyStatementAsDefinedAssertion(statementNode, assignments, derived, localContext) {\n  let statementVerifiedAsDefinedAssertion = false;\n\n  const definedAssertionNode = definedAssertionNodeQuery(statementNode);\n\n  if (definedAssertionNode !== null) {\n    const statementString = localContext.nodeAsString(statementNode);\n\n    localContext.trace(`Verifying the '${statementString}' statement as a defined assertion...`, statementNode);\n\n    const definedAssertionVerified = verifyDefinedAssertion(definedAssertionNode, assignments, derived, localContext, () => {\n      const verifiedAhead = true;\n\n      return verifiedAhead;\n    });\n\n    statementVerifiedAsDefinedAssertion = definedAssertionVerified; ///\n\n    if (statementVerifiedAsDefinedAssertion) {\n      localContext.debug(`...verified the '${statementString}' statement as a defined assertion.`, statementNode);\n    }\n  }\n\n  return statementVerifiedAsDefinedAssertion;\n}\n\nfunction verifyStatementAsSubproofAssertion(statementNode, assignments, derived, localContext) {\n  let statementVerifiedAsSubproofAssertion = false;\n\n  const subproofAssertionNode = subproofAssertionNodeQuery(statementNode);\n\n  if (subproofAssertionNode !== null) {\n    const statementString = localContext.nodeAsString(statementNode);\n\n    localContext.trace(`Verifying the '${statementString}' statement as a subproof assertion...`, statementNode);\n\n    const subproofAssertionVerified = verifySubproofAssertion(subproofAssertionNode, assignments, derived, localContext, () => {\n      const verifiedAhead = true;\n\n      return verifiedAhead;\n    });\n\n    statementVerifiedAsSubproofAssertion = subproofAssertionVerified; ///\n\n    if (statementVerifiedAsSubproofAssertion) {\n      localContext.debug(`...verified the '${statementString}' statement as a defined assertion.`, statementNode);\n    }\n  }\n\n  return statementVerifiedAsSubproofAssertion;\n}\n\nfunction verifyStatementAsContainedAssertion(statementNode, assignments, derived, localContext) {\n  let statementVerifiedAsContainedAssertion = false;\n\n  const containedAssertionNode = containedAssertionNodeQuery(statementNode);\n\n  if (containedAssertionNode !== null) {\n    const statementString = localContext.nodeAsString(statementNode);\n\n    localContext.trace(`Verifying the '${statementString}' statement as a defined assertion...`, statementNode);\n\n    const containedAssertionVerified = verifyContainedAssertion(containedAssertionNode, assignments, derived, localContext, () => {\n      const verifiedAhead = true;\n\n      return verifiedAhead;\n    });\n\n    statementVerifiedAsContainedAssertion = containedAssertionVerified; ///\n\n    if (statementVerifiedAsContainedAssertion) {\n      localContext.debug(`...verified the '${statementString}' statement as a defined assertion.`, statementNode);\n    }\n  }\n\n  return statementVerifiedAsContainedAssertion;\n}\n\nfunction verifyStatementAgainstCombinators(statementNode, assignments, derived, localContext) {\n  let statementVerifiedAgainstCombinators = false;\n\n  const equalityNode = equalityNodeQuery(statementNode),\n        judgementNode = judgementNodeQuery(statementNode),\n        metavariableNode = metavariableNodeQuery(statementNode),\n        typeAssertionNode = typeAssertionNodeQuery(statementNode),\n        definedAssertionNode = definedAssertionNodeQuery(statementNode),\n        subproofAssertionNode = subproofAssertionNodeQuery(statementNode),\n        containedAssertionNode = containedAssertionNodeQuery(statementNode);\n\n  if (  (equalityNode === null) &&\n        (judgementNode === null) &&\n        (metavariableNode === null) &&\n        (typeAssertionNode === null) &&\n        (definedAssertionNode === null) &&\n        (subproofAssertionNode === null) &&\n        (containedAssertionNode === null) ) {\n\n    const combinators = localContext.getCombinators();\n\n    statementVerifiedAgainstCombinators = combinators.some((combinator) => {\n      const statementVerifiedAgainstCombinator = verifyStatementAgainstCombinator(statementNode, combinator, localContext);\n\n      if (statementVerifiedAgainstCombinator) {\n        return true;\n      }\n    });\n  }\n\n  return statementVerifiedAgainstCombinators;\n}\n\nfunction verifyStatementAgainstCombinator(statementNode, combinator, localContext) {\n  let statementVerifiedAgainstCombinator;\n\n  const statementString = localContext.nodeAsString(statementNode),\n        combinatorString = combinator.getString();\n\n  localContext.trace(`Verifying the '${statementString}' statement against the '${combinatorString}' combinator...`, statementNode);\n\n  const combinatorStatementNode = combinator.getStatementNode(),\n        nonTerminalNodeA = statementNode, ///\n        nonTerminalNodeB = combinatorStatementNode, ///\n        nonTerminalNodeVerified = statementAgainstCombinatorNodesVerifier.verifyNonTerminalNode(nonTerminalNodeA, nonTerminalNodeB, localContext, () => {\n          const verifiedAhead = true;\n\n          return verifiedAhead;\n        });\n\n  statementVerifiedAgainstCombinator = nonTerminalNodeVerified;  ///\n\n  if (statementVerifiedAgainstCombinator) {\n    localContext.debug(`...verified the '${statementString}' statement against the '${combinatorString}' combinator.`, statementNode);\n  }\n\n  return statementVerifiedAgainstCombinator;\n}"],"names":["verifyStandaloneStatement","verifyStatementAsEquality","verifyStatementAsTypeAssertion","equalityNodeQuery","nodeQuery","judgementNodeQuery","metavariableNodeQuery","typeAssertionNodeQuery","definedAssertionNodeQuery","subproofAssertionNodeQuery","containedAssertionNodeQuery","verifyStatement","statementNode","assignments","derived","localContext","statementVerified","statementString","nodeAsString","trace","verifyStatementFunctions","verifyStatementAsMetavariable","verifyStatementAsJudgement","verifyStatementAsDefinedAssertion","verifyStatementAsSubproofAssertion","verifyStatementAsContainedAssertion","verifyStatementAgainstCombinators","some","verifyStatementFunction","debug","verifyAhead","standaloneStatementVerified","verifiedAhead","Object","assign","statementAgainstCombinatorNodesVerifier","statementVerifiedAsEquality","equalityNode","equalityVerified","verifyEquality","statementVerifiedAsTypeAssertion","typeAssertionNode","typeAssertionVerified","verifyTypeAssertion","statementVerifiedAsJudgement","judgementNode","judgementVerified","verifyJudgement","statementVerifiedAsMetavariable","metavariableNode","metavariable","findMetavariableByMetavariableNode","metaTypeName","getMetaTypeName","STATEMENT_META_TYPE_NAME","statementVerifiedAsDefinedAssertion","definedAssertionNode","definedAssertionVerified","verifyDefinedAssertion","statementVerifiedAsSubproofAssertion","subproofAssertionNode","subproofAssertionVerified","verifySubproofAssertion","statementVerifiedAsContainedAssertion","containedAssertionNode","containedAssertionVerified","verifyContainedAssertion","statementVerifiedAgainstCombinators","combinators","getCombinators","combinator","statementVerifiedAgainstCombinator","verifyStatementAgainstCombinator","combinatorString","getString","combinatorStatementNode","getStatementNode","nonTerminalNodeA","nonTerminalNodeB","nonTerminalNodeVerified","verifyNonTerminalNode"],"mappings":"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"}

package/lib/verify/subDerivation.js

@@ -10,11 +10,11 @@ Object.defineProperty(exports, "default", {
 });
 var _query = require("../utilities/query");
 var proofStepNodesQuery = (0, _query.nodesQuery)("/subDerivation/proofStep|lastProofStep");
-function verifySubDerivation(subDerivationNode, localContext) {
+function verifySubDerivation(subDerivationNode, substitutions, localContext) {
     var subDerivationVerified;
     var proofStepNodes = proofStepNodesQuery(subDerivationNode);
     subDerivationVerified = proofStepNodes.every(function(proofStepNode) {
-        var verifyProofStep = verifySubDerivation.verifyProofStep, proofStepVerified = verifyProofStep(proofStepNode, localContext);
+        var verifyProofStep = verifySubDerivation.verifyProofStep, proofStepVerified = verifyProofStep(proofStepNode, substitutions, localContext);
         if (proofStepVerified) {
             return true;
         }
@@ -22,4 +22,4 @@ function verifySubDerivation(subDerivationNode, localContext) {
     return subDerivationVerified;
 }
 
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy92ZXJpZnkvc3ViRGVyaXZhdGlvbi5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuaW1wb3J0IHsgbm9kZXNRdWVyeSB9IGZyb20gXCIuLi91dGlsaXRpZXMvcXVlcnlcIjtcblxuY29uc3QgcHJvb2ZTdGVwTm9kZXNRdWVyeSA9IG5vZGVzUXVlcnkoXCIvc3ViRGVyaXZhdGlvbi9wcm9vZlN0ZXB8bGFzdFByb29mU3RlcFwiKTtcblxuZXhwb3J0IGRlZmF1bHQgZnVuY3Rpb24gdmVyaWZ5U3ViRGVyaXZhdGlvbihzdWJEZXJpdmF0aW9uTm9kZSwgbG9jYWxDb250ZXh0KSB7XG4gIGxldCBzdWJEZXJpdmF0aW9uVmVyaWZpZWQ7XG5cbiAgY29uc3QgcHJvb2ZTdGVwTm9kZXMgPSBwcm9vZlN0ZXBOb2Rlc1F1ZXJ5KHN1YkRlcml2YXRpb25Ob2RlKTtcblxuICBzdWJEZXJpdmF0aW9uVmVyaWZpZWQgPSBwcm9vZlN0ZXBOb2Rlcy5ldmVyeSgocHJvb2ZTdGVwTm9kZSkgPT4ge1xuICAgIGNvbnN0IHsgdmVyaWZ5UHJvb2ZTdGVwIH0gPSB2ZXJpZnlTdWJEZXJpdmF0aW9uLFxuICAgICAgICAgIHByb29mU3RlcFZlcmlmaWVkID0gdmVyaWZ5UHJvb2ZTdGVwKHByb29mU3RlcE5vZGUsIGxvY2FsQ29udGV4dCk7XG5cbiAgICBpZiAocHJvb2ZTdGVwVmVyaWZpZWQpIHtcbiAgICAgIHJldHVybiB0cnVlO1xuICAgIH1cbiAgfSk7XG5cbiAgcmV0dXJuIHN1YkRlcml2YXRpb25WZXJpZmllZDtcbn1cbiJdLCJuYW1lcyI6WyJ2ZXJpZnlTdWJEZXJpdmF0aW9uIiwicHJvb2ZTdGVwTm9kZXNRdWVyeSIsIm5vZGVzUXVlcnkiLCJzdWJEZXJpdmF0aW9uTm9kZSIsImxvY2FsQ29udGV4dCIsInN1YkRlcml2YXRpb25WZXJpZmllZCIsInByb29mU3RlcE5vZGVzIiwiZXZlcnkiLCJwcm9vZlN0ZXBOb2RlIiwidmVyaWZ5UHJvb2ZTdGVwIiwicHJvb2ZTdGVwVmVyaWZpZWQiXSwibWFwcGluZ3MiOiJBQUFBOzs7OytCQU1BOzs7ZUFBd0JBOzs7cUJBSkc7QUFFM0IsSUFBTUMsc0JBQXNCQyxJQUFBQSxpQkFBVSxFQUFDO0FBRXhCLFNBQVNGLG9CQUFvQkcsaUJBQWlCLEVBQUVDLFlBQVk7SUFDekUsSUFBSUM7SUFFSixJQUFNQyxpQkFBaUJMLG9CQUFvQkU7SUFFM0NFLHdCQUF3QkMsZUFBZUMsS0FBSyxDQUFDLFNBQUNDO1FBQzVDLElBQU0sQUFBRUMsa0JBQW9CVCxvQkFBcEJTLGlCQUNGQyxvQkFBb0JELGdCQUFnQkQsZUFBZUo7UUFFekQsSUFBSU0sbUJBQW1CO1lBQ3JCLE9BQU87UUFDVDtJQUNGO0lBRUEsT0FBT0w7QUFDVCJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy92ZXJpZnkvc3ViRGVyaXZhdGlvbi5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuaW1wb3J0IHsgbm9kZXNRdWVyeSB9IGZyb20gXCIuLi91dGlsaXRpZXMvcXVlcnlcIjtcblxuY29uc3QgcHJvb2ZTdGVwTm9kZXNRdWVyeSA9IG5vZGVzUXVlcnkoXCIvc3ViRGVyaXZhdGlvbi9wcm9vZlN0ZXB8bGFzdFByb29mU3RlcFwiKTtcblxuZXhwb3J0IGRlZmF1bHQgZnVuY3Rpb24gdmVyaWZ5U3ViRGVyaXZhdGlvbihzdWJEZXJpdmF0aW9uTm9kZSwgc3Vic3RpdHV0aW9ucywgbG9jYWxDb250ZXh0KSB7XG4gIGxldCBzdWJEZXJpdmF0aW9uVmVyaWZpZWQ7XG5cbiAgY29uc3QgcHJvb2ZTdGVwTm9kZXMgPSBwcm9vZlN0ZXBOb2Rlc1F1ZXJ5KHN1YkRlcml2YXRpb25Ob2RlKTtcblxuICBzdWJEZXJpdmF0aW9uVmVyaWZpZWQgPSBwcm9vZlN0ZXBOb2Rlcy5ldmVyeSgocHJvb2ZTdGVwTm9kZSkgPT4ge1xuICAgIGNvbnN0IHsgdmVyaWZ5UHJvb2ZTdGVwIH0gPSB2ZXJpZnlTdWJEZXJpdmF0aW9uLFxuICAgICAgICAgIHByb29mU3RlcFZlcmlmaWVkID0gdmVyaWZ5UHJvb2ZTdGVwKHByb29mU3RlcE5vZGUsIHN1YnN0aXR1dGlvbnMsIGxvY2FsQ29udGV4dCk7XG5cbiAgICBpZiAocHJvb2ZTdGVwVmVyaWZpZWQpIHtcbiAgICAgIHJldHVybiB0cnVlO1xuICAgIH1cbiAgfSk7XG5cbiAgcmV0dXJuIHN1YkRlcml2YXRpb25WZXJpZmllZDtcbn1cbiJdLCJuYW1lcyI6WyJ2ZXJpZnlTdWJEZXJpdmF0aW9uIiwicHJvb2ZTdGVwTm9kZXNRdWVyeSIsIm5vZGVzUXVlcnkiLCJzdWJEZXJpdmF0aW9uTm9kZSIsInN1YnN0aXR1dGlvbnMiLCJsb2NhbENvbnRleHQiLCJzdWJEZXJpdmF0aW9uVmVyaWZpZWQiLCJwcm9vZlN0ZXBOb2RlcyIsImV2ZXJ5IiwicHJvb2ZTdGVwTm9kZSIsInZlcmlmeVByb29mU3RlcCIsInByb29mU3RlcFZlcmlmaWVkIl0sIm1hcHBpbmdzIjoiQUFBQTs7OzsrQkFNQTs7O2VBQXdCQTs7O3FCQUpHO0FBRTNCLElBQU1DLHNCQUFzQkMsSUFBQUEsaUJBQVUsRUFBQztBQUV4QixTQUFTRixvQkFBb0JHLGlCQUFpQixFQUFFQyxhQUFhLEVBQUVDLFlBQVk7SUFDeEYsSUFBSUM7SUFFSixJQUFNQyxpQkFBaUJOLG9CQUFvQkU7SUFFM0NHLHdCQUF3QkMsZUFBZUMsS0FBSyxDQUFDLFNBQUNDO1FBQzVDLElBQU0sQUFBRUMsa0JBQW9CVixvQkFBcEJVLGlCQUNGQyxvQkFBb0JELGdCQUFnQkQsZUFBZUwsZUFBZUM7UUFFeEUsSUFBSU0sbUJBQW1CO1lBQ3JCLE9BQU87UUFDVDtJQUNGO0lBRUEsT0FBT0w7QUFDVCJ9

package/lib/verify/subproof.js

@@ -18,12 +18,12 @@ function _interop_require_default(obj) {
     };
 }
 var suppositionNodesQuery = (0, _query.nodesQuery)("/subproof/supposition"), subDerivationNodeQuery = (0, _query.nodeQuery)("/subproof/subDerivation");
-function verifySubproof(subproofNode, localContext) {
+function verifySubproof(subproofNode, substitutions, localContext) {
     var subproofVerified = false;
     localContext = _local.default.fromLocalContext(localContext); ///
     var suppositions = [], suppositionNodes = suppositionNodesQuery(subproofNode), suppositionsVerified = (0, _suppositions.default)(suppositionNodes, suppositions, localContext);
     if (suppositionsVerified) {
-        var subDerivationNode = subDerivationNodeQuery(subproofNode), subDerivationVerified = (0, _subDerivation.default)(subDerivationNode, localContext);
+        var subDerivationNode = subDerivationNodeQuery(subproofNode), subDerivationVerified = (0, _subDerivation.default)(subDerivationNode, substitutions, localContext);
         if (subDerivationVerified) {
             subproofVerified = true;
         }
@@ -31,4 +31,4 @@ function verifySubproof(subproofNode, localContext) {
     return subproofVerified;
 }
 
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy92ZXJpZnkvc3VicHJvb2YuanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmltcG9ydCBMb2NhbENvbnRleHQgZnJvbSBcIi4uL2NvbnRleHQvbG9jYWxcIjtcbmltcG9ydCB2ZXJpZnlTdXBwb3NpdGlvbnMgZnJvbSBcIi4uL3ZlcmlmeS9zdXBwb3NpdGlvbnNcIjtcbmltcG9ydCB2ZXJpZnlTdWJEZXJpdmF0aW9uIGZyb20gXCIuLi92ZXJpZnkvc3ViRGVyaXZhdGlvblwiO1xuXG5pbXBvcnQgeyBub2RlUXVlcnksIG5vZGVzUXVlcnkgfSBmcm9tIFwiLi4vdXRpbGl0aWVzL3F1ZXJ5XCI7XG5cbmNvbnN0IHN1cHBvc2l0aW9uTm9kZXNRdWVyeSA9IG5vZGVzUXVlcnkoXCIvc3VicHJvb2Yvc3VwcG9zaXRpb25cIiksXG4gICAgICBzdWJEZXJpdmF0aW9uTm9kZVF1ZXJ5ID0gbm9kZVF1ZXJ5KFwiL3N1YnByb29mL3N1YkRlcml2YXRpb25cIik7XG5cbmV4cG9ydCBkZWZhdWx0IGZ1bmN0aW9uIHZlcmlmeVN1YnByb29mKHN1YnByb29mTm9kZSwgbG9jYWxDb250ZXh0KSB7XG4gIGxldCBzdWJwcm9vZlZlcmlmaWVkID0gZmFsc2U7XG5cbiAgbG9jYWxDb250ZXh0ID0gTG9jYWxDb250ZXh0LmZyb21Mb2NhbENvbnRleHQobG9jYWxDb250ZXh0KTsgIC8vL1xuXG4gIGNvbnN0IHN1cHBvc2l0aW9ucyA9IFtdLFxuICAgICAgICBzdXBwb3NpdGlvbk5vZGVzID0gc3VwcG9zaXRpb25Ob2Rlc1F1ZXJ5KHN1YnByb29mTm9kZSksXG4gICAgICAgIHN1cHBvc2l0aW9uc1ZlcmlmaWVkID0gdmVyaWZ5U3VwcG9zaXRpb25zKHN1cHBvc2l0aW9uTm9kZXMsIHN1cHBvc2l0aW9ucywgbG9jYWxDb250ZXh0KTtcblxuICBpZiAoc3VwcG9zaXRpb25zVmVyaWZpZWQpIHtcbiAgICBjb25zdCBzdWJEZXJpdmF0aW9uTm9kZSA9IHN1YkRlcml2YXRpb25Ob2RlUXVlcnkoc3VicHJvb2ZOb2RlKSxcbiAgICAgICAgICBzdWJEZXJpdmF0aW9uVmVyaWZpZWQgPSB2ZXJpZnlTdWJEZXJpdmF0aW9uKHN1YkRlcml2YXRpb25Ob2RlLCBsb2NhbENvbnRleHQpO1xuXG4gICAgaWYgKHN1YkRlcml2YXRpb25WZXJpZmllZCkge1xuICAgICAgc3VicHJvb2ZWZXJpZmllZCA9IHRydWU7XG4gICAgfVxuICB9XG5cbiAgcmV0dXJuIHN1YnByb29mVmVyaWZpZWQ7XG59XG5cbiJdLCJuYW1lcyI6WyJ2ZXJpZnlTdWJwcm9vZiIsInN1cHBvc2l0aW9uTm9kZXNRdWVyeSIsIm5vZGVzUXVlcnkiLCJzdWJEZXJpdmF0aW9uTm9kZVF1ZXJ5Iiwibm9kZVF1ZXJ5Iiwic3VicHJvb2ZOb2RlIiwibG9jYWxDb250ZXh0Iiwic3VicHJvb2ZWZXJpZmllZCIsIkxvY2FsQ29udGV4dCIsImZyb21Mb2NhbENvbnRleHQiLCJzdXBwb3NpdGlvbnMiLCJzdXBwb3NpdGlvbk5vZGVzIiwic3VwcG9zaXRpb25zVmVyaWZpZWQiLCJ2ZXJpZnlTdXBwb3NpdGlvbnMiLCJzdWJEZXJpdmF0aW9uTm9kZSIsInN1YkRlcml2YXRpb25WZXJpZmllZCIsInZlcmlmeVN1YkRlcml2YXRpb24iXSwibWFwcGluZ3MiOiJBQUFBOzs7OytCQVdBOzs7ZUFBd0JBOzs7NERBVEM7bUVBQ007b0VBQ0M7cUJBRU07Ozs7OztBQUV0QyxJQUFNQyx3QkFBd0JDLElBQUFBLGlCQUFVLEVBQUMsMEJBQ25DQyx5QkFBeUJDLElBQUFBLGdCQUFTLEVBQUM7QUFFMUIsU0FBU0osZUFBZUssWUFBWSxFQUFFQyxZQUFZO0lBQy9ELElBQUlDLG1CQUFtQjtJQUV2QkQsZUFBZUUsY0FBWSxDQUFDQyxnQkFBZ0IsQ0FBQ0gsZUFBZ0IsR0FBRztJQUVoRSxJQUFNSSxlQUFlLEVBQUUsRUFDakJDLG1CQUFtQlYsc0JBQXNCSSxlQUN6Q08sdUJBQXVCQyxJQUFBQSxxQkFBa0IsRUFBQ0Ysa0JBQWtCRCxjQUFjSjtJQUVoRixJQUFJTSxzQkFBc0I7UUFDeEIsSUFBTUUsb0JBQW9CWCx1QkFBdUJFLGVBQzNDVSx3QkFBd0JDLElBQUFBLHNCQUFtQixFQUFDRixtQkFBbUJSO1FBRXJFLElBQUlTLHVCQUF1QjtZQUN6QlIsbUJBQW1CO1FBQ3JCO0lBQ0Y7SUFFQSxPQUFPQTtBQUNUIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy92ZXJpZnkvc3VicHJvb2YuanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmltcG9ydCBMb2NhbENvbnRleHQgZnJvbSBcIi4uL2NvbnRleHQvbG9jYWxcIjtcbmltcG9ydCB2ZXJpZnlTdXBwb3NpdGlvbnMgZnJvbSBcIi4uL3ZlcmlmeS9zdXBwb3NpdGlvbnNcIjtcbmltcG9ydCB2ZXJpZnlTdWJEZXJpdmF0aW9uIGZyb20gXCIuLi92ZXJpZnkvc3ViRGVyaXZhdGlvblwiO1xuXG5pbXBvcnQgeyBub2RlUXVlcnksIG5vZGVzUXVlcnkgfSBmcm9tIFwiLi4vdXRpbGl0aWVzL3F1ZXJ5XCI7XG5cbmNvbnN0IHN1cHBvc2l0aW9uTm9kZXNRdWVyeSA9IG5vZGVzUXVlcnkoXCIvc3VicHJvb2Yvc3VwcG9zaXRpb25cIiksXG4gICAgICBzdWJEZXJpdmF0aW9uTm9kZVF1ZXJ5ID0gbm9kZVF1ZXJ5KFwiL3N1YnByb29mL3N1YkRlcml2YXRpb25cIik7XG5cbmV4cG9ydCBkZWZhdWx0IGZ1bmN0aW9uIHZlcmlmeVN1YnByb29mKHN1YnByb29mTm9kZSwgc3Vic3RpdHV0aW9ucywgbG9jYWxDb250ZXh0KSB7XG4gIGxldCBzdWJwcm9vZlZlcmlmaWVkID0gZmFsc2U7XG5cbiAgbG9jYWxDb250ZXh0ID0gTG9jYWxDb250ZXh0LmZyb21Mb2NhbENvbnRleHQobG9jYWxDb250ZXh0KTsgIC8vL1xuXG4gIGNvbnN0IHN1cHBvc2l0aW9ucyA9IFtdLFxuICAgICAgICBzdXBwb3NpdGlvbk5vZGVzID0gc3VwcG9zaXRpb25Ob2Rlc1F1ZXJ5KHN1YnByb29mTm9kZSksXG4gICAgICAgIHN1cHBvc2l0aW9uc1ZlcmlmaWVkID0gdmVyaWZ5U3VwcG9zaXRpb25zKHN1cHBvc2l0aW9uTm9kZXMsIHN1cHBvc2l0aW9ucywgbG9jYWxDb250ZXh0KTtcblxuICBpZiAoc3VwcG9zaXRpb25zVmVyaWZpZWQpIHtcbiAgICBjb25zdCBzdWJEZXJpdmF0aW9uTm9kZSA9IHN1YkRlcml2YXRpb25Ob2RlUXVlcnkoc3VicHJvb2ZOb2RlKSxcbiAgICAgICAgICBzdWJEZXJpdmF0aW9uVmVyaWZpZWQgPSB2ZXJpZnlTdWJEZXJpdmF0aW9uKHN1YkRlcml2YXRpb25Ob2RlLCBzdWJzdGl0dXRpb25zLCBsb2NhbENvbnRleHQpO1xuXG4gICAgaWYgKHN1YkRlcml2YXRpb25WZXJpZmllZCkge1xuICAgICAgc3VicHJvb2ZWZXJpZmllZCA9IHRydWU7XG4gICAgfVxuICB9XG5cbiAgcmV0dXJuIHN1YnByb29mVmVyaWZpZWQ7XG59XG5cbiJdLCJuYW1lcyI6WyJ2ZXJpZnlTdWJwcm9vZiIsInN1cHBvc2l0aW9uTm9kZXNRdWVyeSIsIm5vZGVzUXVlcnkiLCJzdWJEZXJpdmF0aW9uTm9kZVF1ZXJ5Iiwibm9kZVF1ZXJ5Iiwic3VicHJvb2ZOb2RlIiwic3Vic3RpdHV0aW9ucyIsImxvY2FsQ29udGV4dCIsInN1YnByb29mVmVyaWZpZWQiLCJMb2NhbENvbnRleHQiLCJmcm9tTG9jYWxDb250ZXh0Iiwic3VwcG9zaXRpb25zIiwic3VwcG9zaXRpb25Ob2RlcyIsInN1cHBvc2l0aW9uc1ZlcmlmaWVkIiwidmVyaWZ5U3VwcG9zaXRpb25zIiwic3ViRGVyaXZhdGlvbk5vZGUiLCJzdWJEZXJpdmF0aW9uVmVyaWZpZWQiLCJ2ZXJpZnlTdWJEZXJpdmF0aW9uIl0sIm1hcHBpbmdzIjoiQUFBQTs7OzsrQkFXQTs7O2VBQXdCQTs7OzREQVRDO21FQUNNO29FQUNDO3FCQUVNOzs7Ozs7QUFFdEMsSUFBTUMsd0JBQXdCQyxJQUFBQSxpQkFBVSxFQUFDLDBCQUNuQ0MseUJBQXlCQyxJQUFBQSxnQkFBUyxFQUFDO0FBRTFCLFNBQVNKLGVBQWVLLFlBQVksRUFBRUMsYUFBYSxFQUFFQyxZQUFZO0lBQzlFLElBQUlDLG1CQUFtQjtJQUV2QkQsZUFBZUUsY0FBWSxDQUFDQyxnQkFBZ0IsQ0FBQ0gsZUFBZ0IsR0FBRztJQUVoRSxJQUFNSSxlQUFlLEVBQUUsRUFDakJDLG1CQUFtQlgsc0JBQXNCSSxlQUN6Q1EsdUJBQXVCQyxJQUFBQSxxQkFBa0IsRUFBQ0Ysa0JBQWtCRCxjQUFjSjtJQUVoRixJQUFJTSxzQkFBc0I7UUFDeEIsSUFBTUUsb0JBQW9CWix1QkFBdUJFLGVBQzNDVyx3QkFBd0JDLElBQUFBLHNCQUFtQixFQUFDRixtQkFBbUJULGVBQWVDO1FBRXBGLElBQUlTLHVCQUF1QjtZQUN6QlIsbUJBQW1CO1FBQ3JCO0lBQ0Y7SUFFQSxPQUFPQTtBQUNUIn0=

package/lib/verify/termAsConstructor.js

@@ -20,7 +20,7 @@ function verifyTermAsConstructor(termNode, typeNode, fileContext) {
     var termVerifiedAsConstructor = false;
     var termString = fileContext.nodeAsString(termNode);
     fileContext.debug("Verifying the '".concat(termString, "' term as a constructor..."), termNode);
-    var nonTerminalNode = termNode, childNodes = nonTerminalNode.getChildNodes(), localContext = _local.default.fromFileContext(fileContext), childNodesVerified = _termAsConstructor.default.verifyChildNodes(childNodes, localContext, function() {
+    var localContext = _local.default.fromFileContext(fileContext), nonTerminalNode = termNode, childNodes = nonTerminalNode.getChildNodes(), childNodesVerified = _termAsConstructor.default.verifyChildNodes(childNodes, localContext, function() {
         var verifiedAhead = true;
         return verifiedAhead;
     });
@@ -48,4 +48,4 @@ function verifyTermAsConstructor(termNode, typeNode, fileContext) {
     return termVerifiedAsConstructor;
 }
 
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy92ZXJpZnkvdGVybUFzQ29uc3RydWN0b3IuanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmltcG9ydCBDb25zdHJ1Y3RvciBmcm9tIFwiLi4vY29uc3RydWN0b3JcIjtcbmltcG9ydCBMb2NhbENvbnRleHQgZnJvbSBcIi4uL2NvbnRleHQvbG9jYWxcIjtcbmltcG9ydCB0ZXJtQXNDb25zdHJ1Y3Rvck5vZGVWZXJpZmllciBmcm9tIFwiLi4vdmVyaWZpZXIvbm9kZS90ZXJtQXNDb25zdHJ1Y3RvclwiO1xuXG5leHBvcnQgZGVmYXVsdCBmdW5jdGlvbiB2ZXJpZnlUZXJtQXNDb25zdHJ1Y3Rvcih0ZXJtTm9kZSwgdHlwZU5vZGUsIGZpbGVDb250ZXh0KSB7XG4gIGxldCB0ZXJtVmVyaWZpZWRBc0NvbnN0cnVjdG9yID0gZmFsc2U7XG5cbiAgY29uc3QgdGVybVN0cmluZyA9IGZpbGVDb250ZXh0Lm5vZGVBc1N0cmluZyh0ZXJtTm9kZSk7XG5cbiAgZmlsZUNvbnRleHQuZGVidWcoYFZlcmlmeWluZyB0aGUgJyR7dGVybVN0cmluZ30nIHRlcm0gYXMgYSBjb25zdHJ1Y3Rvci4uLmAsIHRlcm1Ob2RlKTtcblxuICBjb25zdCBub25UZXJtaW5hbE5vZGUgPSB0ZXJtTm9kZSwgLy8vXG4gICAgICAgIGNoaWxkTm9kZXMgPSBub25UZXJtaW5hbE5vZGUuZ2V0Q2hpbGROb2RlcygpLFxuICAgICAgICBsb2NhbENvbnRleHQgPSBMb2NhbENvbnRleHQuZnJvbUZpbGVDb250ZXh0KGZpbGVDb250ZXh0KSxcbiAgICAgICAgY2hpbGROb2Rlc1ZlcmlmaWVkID0gdGVybUFzQ29uc3RydWN0b3JOb2RlVmVyaWZpZXIudmVyaWZ5Q2hpbGROb2RlcyhjaGlsZE5vZGVzLCBsb2NhbENvbnRleHQsICgpID0+IHtcbiAgICAgICAgICBjb25zdCB2ZXJpZmllZEFoZWFkID0gdHJ1ZTtcblxuICAgICAgICAgIHJldHVybiB2ZXJpZmllZEFoZWFkO1xuICAgICAgICB9KTtcblxuICBpZiAoY2hpbGROb2Rlc1ZlcmlmaWVkKSB7XG4gICAgbGV0IHR5cGUgPSBudWxsO1xuXG4gICAgaWYgKHR5cGVOb2RlID09PSBudWxsKSB7XG4gICAgICB0ZXJtVmVyaWZpZWRBc0NvbnN0cnVjdG9yID0gdHJ1ZTtcbiAgICB9IGVsc2Uge1xuICAgICAgdHlwZSA9IGZpbGVDb250ZXh0LmZpbmRUeXBlQnlUeXBlTm9kZSh0eXBlTm9kZSk7XG5cbiAgICAgIGlmICh0eXBlICE9PSBudWxsKSB7XG4gICAgICAgIHRlcm1WZXJpZmllZEFzQ29uc3RydWN0b3IgPSB0cnVlO1xuICAgICAgfSBlbHNlIHtcbiAgICAgICAgY29uc3QgdHlwZVN0cmluZyA9IGZpbGVDb250ZXh0Lm5vZGVBc1N0cmluZyh0eXBlTm9kZSk7XG5cbiAgICAgICAgZmlsZUNvbnRleHQuZGVidWcoYFRoZSAnJHt0ZXJtU3RyaW5nfScgY29uc3RydWN0b3IncyAnJHt0eXBlU3RyaW5nfScgdHlwZSBpcyBub3QgcHJlc2VudC5gLCB0ZXJtTm9kZSk7XG4gICAgICB9XG4gICAgfVxuXG4gICAgaWYgKHRlcm1WZXJpZmllZEFzQ29uc3RydWN0b3IpIHtcbiAgICAgIGNvbnN0IHRva2VucyA9IGZpbGVDb250ZXh0LmdldFRva2VucygpLFxuICAgICAgICAgICAgY29uc3RydWN0b3IgPSBDb25zdHJ1Y3Rvci5mcm9tVGVybU5vZGVUeXBlQW5kVG9rZW5zKHRlcm1Ob2RlLCB0eXBlLCB0b2tlbnMpO1xuXG4gICAgICBmaWxlQ29udGV4dC5hZGRDb25zdHJ1Y3Rvcihjb25zdHJ1Y3Rvcik7XG4gICAgfVxuICB9XG5cbiAgaWYgKHRlcm1WZXJpZmllZEFzQ29uc3RydWN0b3IpIHtcbiAgICBmaWxlQ29udGV4dC5kZWJ1ZyhgLi4udmVyaWZpZWQgdGhlICcke3Rlcm1TdHJpbmd9JyB0ZXJtIGFzIGEgY29uc3RydWN0b3IuYCwgdGVybU5vZGUpO1xuICB9XG5cbiAgcmV0dXJuIHRlcm1WZXJpZmllZEFzQ29uc3RydWN0b3I7XG59XG4iXSwibmFtZXMiOlsidmVyaWZ5VGVybUFzQ29uc3RydWN0b3IiLCJ0ZXJtTm9kZSIsInR5cGVOb2RlIiwiZmlsZUNvbnRleHQiLCJ0ZXJtVmVyaWZpZWRBc0NvbnN0cnVjdG9yIiwidGVybVN0cmluZyIsIm5vZGVBc1N0cmluZyIsImRlYnVnIiwibm9uVGVybWluYWxOb2RlIiwiY2hpbGROb2RlcyIsImdldENoaWxkTm9kZXMiLCJsb2NhbENvbnRleHQiLCJMb2NhbENvbnRleHQiLCJmcm9tRmlsZUNvbnRleHQiLCJjaGlsZE5vZGVzVmVyaWZpZWQiLCJ0ZXJtQXNDb25zdHJ1Y3Rvck5vZGVWZXJpZmllciIsInZlcmlmeUNoaWxkTm9kZXMiLCJ2ZXJpZmllZEFoZWFkIiwidHlwZSIsImZpbmRUeXBlQnlUeXBlTm9kZSIsInR5cGVTdHJpbmciLCJ0b2tlbnMiLCJnZXRUb2tlbnMiLCJjb25zdHJ1Y3RvciIsIkNvbnN0cnVjdG9yIiwiZnJvbVRlcm1Ob2RlVHlwZUFuZFRva2VucyIsImFkZENvbnN0cnVjdG9yIl0sIm1hcHBpbmdzIjoiQUFBQTs7OzsrQkFNQTs7O2VBQXdCQTs7O2tFQUpBOzREQUNDO3dFQUNpQjs7Ozs7O0FBRTNCLFNBQVNBLHdCQUF3QkMsUUFBUSxFQUFFQyxRQUFRLEVBQUVDLFdBQVc7SUFDN0UsSUFBSUMsNEJBQTRCO0lBRWhDLElBQU1DLGFBQWFGLFlBQVlHLFlBQVksQ0FBQ0w7SUFFNUNFLFlBQVlJLEtBQUssQ0FBQyxBQUFDLGtCQUE0QixPQUFYRixZQUFXLCtCQUE2Qko7SUFFNUUsSUFBTU8sa0JBQWtCUCxVQUNsQlEsYUFBYUQsZ0JBQWdCRSxhQUFhLElBQzFDQyxlQUFlQyxjQUFZLENBQUNDLGVBQWUsQ0FBQ1YsY0FDNUNXLHFCQUFxQkMsMEJBQTZCLENBQUNDLGdCQUFnQixDQUFDUCxZQUFZRSxjQUFjO1FBQzVGLElBQU1NLGdCQUFnQjtRQUV0QixPQUFPQTtJQUNUO0lBRU4sSUFBSUgsb0JBQW9CO1FBQ3RCLElBQUlJLE9BQU87UUFFWCxJQUFJaEIsYUFBYSxNQUFNO1lBQ3JCRSw0QkFBNEI7UUFDOUIsT0FBTztZQUNMYyxPQUFPZixZQUFZZ0Isa0JBQWtCLENBQUNqQjtZQUV0QyxJQUFJZ0IsU0FBUyxNQUFNO2dCQUNqQmQsNEJBQTRCO1lBQzlCLE9BQU87Z0JBQ0wsSUFBTWdCLGFBQWFqQixZQUFZRyxZQUFZLENBQUNKO2dCQUU1Q0MsWUFBWUksS0FBSyxDQUFDLEFBQUMsUUFBcUNhLE9BQTlCZixZQUFXLHFCQUE4QixPQUFYZSxZQUFXLDJCQUF5Qm5CO1lBQzlGO1FBQ0Y7UUFFQSxJQUFJRywyQkFBMkI7WUFDN0IsSUFBTWlCLFNBQVNsQixZQUFZbUIsU0FBUyxJQUM5QkMsY0FBY0Msb0JBQVcsQ0FBQ0MseUJBQXlCLENBQUN4QixVQUFVaUIsTUFBTUc7WUFFMUVsQixZQUFZdUIsY0FBYyxDQUFDSDtRQUM3QjtJQUNGO0lBRUEsSUFBSW5CLDJCQUEyQjtRQUM3QkQsWUFBWUksS0FBSyxDQUFDLEFBQUMsb0JBQThCLE9BQVhGLFlBQVcsNkJBQTJCSjtJQUM5RTtJQUVBLE9BQU9HO0FBQ1QifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy92ZXJpZnkvdGVybUFzQ29uc3RydWN0b3IuanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmltcG9ydCBDb25zdHJ1Y3RvciBmcm9tIFwiLi4vY29uc3RydWN0b3JcIjtcbmltcG9ydCBMb2NhbENvbnRleHQgZnJvbSBcIi4uL2NvbnRleHQvbG9jYWxcIjtcbmltcG9ydCB0ZXJtQXNDb25zdHJ1Y3Rvck5vZGVWZXJpZmllciBmcm9tIFwiLi4vdmVyaWZpZXIvbm9kZS90ZXJtQXNDb25zdHJ1Y3RvclwiO1xuXG5leHBvcnQgZGVmYXVsdCBmdW5jdGlvbiB2ZXJpZnlUZXJtQXNDb25zdHJ1Y3Rvcih0ZXJtTm9kZSwgdHlwZU5vZGUsIGZpbGVDb250ZXh0KSB7XG4gIGxldCB0ZXJtVmVyaWZpZWRBc0NvbnN0cnVjdG9yID0gZmFsc2U7XG5cbiAgY29uc3QgdGVybVN0cmluZyA9IGZpbGVDb250ZXh0Lm5vZGVBc1N0cmluZyh0ZXJtTm9kZSk7XG5cbiAgZmlsZUNvbnRleHQuZGVidWcoYFZlcmlmeWluZyB0aGUgJyR7dGVybVN0cmluZ30nIHRlcm0gYXMgYSBjb25zdHJ1Y3Rvci4uLmAsIHRlcm1Ob2RlKTtcblxuICBjb25zdCBsb2NhbENvbnRleHQgPSBMb2NhbENvbnRleHQuZnJvbUZpbGVDb250ZXh0KGZpbGVDb250ZXh0KSxcbiAgICAgICAgbm9uVGVybWluYWxOb2RlID0gdGVybU5vZGUsIC8vL1xuICAgICAgICBjaGlsZE5vZGVzID0gbm9uVGVybWluYWxOb2RlLmdldENoaWxkTm9kZXMoKSxcbiAgICAgICAgY2hpbGROb2Rlc1ZlcmlmaWVkID0gdGVybUFzQ29uc3RydWN0b3JOb2RlVmVyaWZpZXIudmVyaWZ5Q2hpbGROb2RlcyhjaGlsZE5vZGVzLCBsb2NhbENvbnRleHQsICgpID0+IHtcbiAgICAgICAgICBjb25zdCB2ZXJpZmllZEFoZWFkID0gdHJ1ZTtcblxuICAgICAgICAgIHJldHVybiB2ZXJpZmllZEFoZWFkO1xuICAgICAgICB9KTtcblxuICBpZiAoY2hpbGROb2Rlc1ZlcmlmaWVkKSB7XG4gICAgbGV0IHR5cGUgPSBudWxsO1xuXG4gICAgaWYgKHR5cGVOb2RlID09PSBudWxsKSB7XG4gICAgICB0ZXJtVmVyaWZpZWRBc0NvbnN0cnVjdG9yID0gdHJ1ZTtcbiAgICB9IGVsc2Uge1xuICAgICAgdHlwZSA9IGZpbGVDb250ZXh0LmZpbmRUeXBlQnlUeXBlTm9kZSh0eXBlTm9kZSk7XG5cbiAgICAgIGlmICh0eXBlICE9PSBudWxsKSB7XG4gICAgICAgIHRlcm1WZXJpZmllZEFzQ29uc3RydWN0b3IgPSB0cnVlO1xuICAgICAgfSBlbHNlIHtcbiAgICAgICAgY29uc3QgdHlwZVN0cmluZyA9IGZpbGVDb250ZXh0Lm5vZGVBc1N0cmluZyh0eXBlTm9kZSk7XG5cbiAgICAgICAgZmlsZUNvbnRleHQuZGVidWcoYFRoZSAnJHt0ZXJtU3RyaW5nfScgY29uc3RydWN0b3IncyAnJHt0eXBlU3RyaW5nfScgdHlwZSBpcyBub3QgcHJlc2VudC5gLCB0ZXJtTm9kZSk7XG4gICAgICB9XG4gICAgfVxuXG4gICAgaWYgKHRlcm1WZXJpZmllZEFzQ29uc3RydWN0b3IpIHtcbiAgICAgIGNvbnN0IHRva2VucyA9IGZpbGVDb250ZXh0LmdldFRva2VucygpLFxuICAgICAgICAgICAgY29uc3RydWN0b3IgPSBDb25zdHJ1Y3Rvci5mcm9tVGVybU5vZGVUeXBlQW5kVG9rZW5zKHRlcm1Ob2RlLCB0eXBlLCB0b2tlbnMpO1xuXG4gICAgICBmaWxlQ29udGV4dC5hZGRDb25zdHJ1Y3Rvcihjb25zdHJ1Y3Rvcik7XG4gICAgfVxuICB9XG5cbiAgaWYgKHRlcm1WZXJpZmllZEFzQ29uc3RydWN0b3IpIHtcbiAgICBmaWxlQ29udGV4dC5kZWJ1ZyhgLi4udmVyaWZpZWQgdGhlICcke3Rlcm1TdHJpbmd9JyB0ZXJtIGFzIGEgY29uc3RydWN0b3IuYCwgdGVybU5vZGUpO1xuICB9XG5cbiAgcmV0dXJuIHRlcm1WZXJpZmllZEFzQ29uc3RydWN0b3I7XG59XG4iXSwibmFtZXMiOlsidmVyaWZ5VGVybUFzQ29uc3RydWN0b3IiLCJ0ZXJtTm9kZSIsInR5cGVOb2RlIiwiZmlsZUNvbnRleHQiLCJ0ZXJtVmVyaWZpZWRBc0NvbnN0cnVjdG9yIiwidGVybVN0cmluZyIsIm5vZGVBc1N0cmluZyIsImRlYnVnIiwibG9jYWxDb250ZXh0IiwiTG9jYWxDb250ZXh0IiwiZnJvbUZpbGVDb250ZXh0Iiwibm9uVGVybWluYWxOb2RlIiwiY2hpbGROb2RlcyIsImdldENoaWxkTm9kZXMiLCJjaGlsZE5vZGVzVmVyaWZpZWQiLCJ0ZXJtQXNDb25zdHJ1Y3Rvck5vZGVWZXJpZmllciIsInZlcmlmeUNoaWxkTm9kZXMiLCJ2ZXJpZmllZEFoZWFkIiwidHlwZSIsImZpbmRUeXBlQnlUeXBlTm9kZSIsInR5cGVTdHJpbmciLCJ0b2tlbnMiLCJnZXRUb2tlbnMiLCJjb25zdHJ1Y3RvciIsIkNvbnN0cnVjdG9yIiwiZnJvbVRlcm1Ob2RlVHlwZUFuZFRva2VucyIsImFkZENvbnN0cnVjdG9yIl0sIm1hcHBpbmdzIjoiQUFBQTs7OzsrQkFNQTs7O2VBQXdCQTs7O2tFQUpBOzREQUNDO3dFQUNpQjs7Ozs7O0FBRTNCLFNBQVNBLHdCQUF3QkMsUUFBUSxFQUFFQyxRQUFRLEVBQUVDLFdBQVc7SUFDN0UsSUFBSUMsNEJBQTRCO0lBRWhDLElBQU1DLGFBQWFGLFlBQVlHLFlBQVksQ0FBQ0w7SUFFNUNFLFlBQVlJLEtBQUssQ0FBQyxBQUFDLGtCQUE0QixPQUFYRixZQUFXLCtCQUE2Qko7SUFFNUUsSUFBTU8sZUFBZUMsY0FBWSxDQUFDQyxlQUFlLENBQUNQLGNBQzVDUSxrQkFBa0JWLFVBQ2xCVyxhQUFhRCxnQkFBZ0JFLGFBQWEsSUFDMUNDLHFCQUFxQkMsMEJBQTZCLENBQUNDLGdCQUFnQixDQUFDSixZQUFZSixjQUFjO1FBQzVGLElBQU1TLGdCQUFnQjtRQUV0QixPQUFPQTtJQUNUO0lBRU4sSUFBSUgsb0JBQW9CO1FBQ3RCLElBQUlJLE9BQU87UUFFWCxJQUFJaEIsYUFBYSxNQUFNO1lBQ3JCRSw0QkFBNEI7UUFDOUIsT0FBTztZQUNMYyxPQUFPZixZQUFZZ0Isa0JBQWtCLENBQUNqQjtZQUV0QyxJQUFJZ0IsU0FBUyxNQUFNO2dCQUNqQmQsNEJBQTRCO1lBQzlCLE9BQU87Z0JBQ0wsSUFBTWdCLGFBQWFqQixZQUFZRyxZQUFZLENBQUNKO2dCQUU1Q0MsWUFBWUksS0FBSyxDQUFDLEFBQUMsUUFBcUNhLE9BQTlCZixZQUFXLHFCQUE4QixPQUFYZSxZQUFXLDJCQUF5Qm5CO1lBQzlGO1FBQ0Y7UUFFQSxJQUFJRywyQkFBMkI7WUFDN0IsSUFBTWlCLFNBQVNsQixZQUFZbUIsU0FBUyxJQUM5QkMsY0FBY0Msb0JBQVcsQ0FBQ0MseUJBQXlCLENBQUN4QixVQUFVaUIsTUFBTUc7WUFFMUVsQixZQUFZdUIsY0FBYyxDQUFDSDtRQUM3QjtJQUNGO0lBRUEsSUFBSW5CLDJCQUEyQjtRQUM3QkQsWUFBWUksS0FBSyxDQUFDLEFBQUMsb0JBQThCLE9BQVhGLFlBQVcsNkJBQTJCSjtJQUM5RTtJQUVBLE9BQU9HO0FBQ1QifQ==

package/lib/verify/theorem.js

@@ -28,13 +28,13 @@ function verifyTheorem(theoremNode, fileContext) {
     fileContext.trace("Verifying the '".concat(labelsString, "' theorem..."), theoremNode);
     var labels = [], labelsVerified = (0, _labels.default)(labelNodes, labels, fileContext);
     if (labelsVerified) {
-        var suppositionNodes = suppositionsNodeQuery(theoremNode), suppositions = [], localContext = _local.default.fromFileContext(fileContext), suppositionsVerified = (0, _suppositions.default)(suppositionNodes, suppositions, localContext);
+        var localContext = _local.default.fromFileContext(fileContext), 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) {
-                var proofNode = proofNodeQuery(theoremNode), firstConsequent = (0, _array.first)(consequents), consequent = firstConsequent, proofVerified = (0, _proof.default)(proofNode, consequent, localContext);
+                var proofNode = proofNodeQuery(theoremNode), firstConsequent = (0, _array.first)(consequents), consequent = firstConsequent, statementNode = consequent.getStatementNode(), substitutions = [], proofVerified = (0, _proof.default)(proofNode, statementNode, substitutions, localContext);
                 if (proofVerified) {
-                    var theorem = _theorem.default.fromLabelsSuppositionsConsequentAndLocalContext(labels, suppositions, consequent, localContext);
+                    var substitutions1 = [], theorem = _theorem.default.fromLabelsSuppositionsConsequentSubstitutionsAndFileContext(labels, suppositions, consequent, substitutions1, fileContext);
                     fileContext.addTheorem(theorem);
                     theoremVerified = true;
                 }
@@ -47,4 +47,4 @@ function verifyTheorem(theoremNode, fileContext) {
     return theoremVerified;
 }
 
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy92ZXJpZnkvdGhlb3JlbS5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuaW1wb3J0IFRoZW9yZW0gZnJvbSBcIi4uL3RoZW9yZW1cIjtcbmltcG9ydCB2ZXJpZnlQcm9vZiBmcm9tIFwiLi4vdmVyaWZ5L3Byb29mXCI7XG5pbXBvcnQgdmVyaWZ5TGFiZWxzIGZyb20gXCIuLi92ZXJpZnkvbGFiZWxzXCI7XG5pbXBvcnQgTG9jYWxDb250ZXh0IGZyb20gXCIuLi9jb250ZXh0L2xvY2FsXCI7XG5pbXBvcnQgdmVyaWZ5Q29uc2VxdWVudCBmcm9tIFwiLi4vdmVyaWZ5L2NvbnNlcXVlbnRcIjtcbmltcG9ydCB2ZXJpZnlTdXBwb3NpdGlvbnMgZnJvbSBcIi4uL3ZlcmlmeS9zdXBwb3NpdGlvbnNcIjtcblxuaW1wb3J0IHsgZmlyc3QgfSBmcm9tIFwiLi4vdXRpbGl0aWVzL2FycmF5XCI7XG5pbXBvcnQgeyBub2RlUXVlcnksIG5vZGVzUXVlcnkgfSBmcm9tIFwiLi4vdXRpbGl0aWVzL3F1ZXJ5XCI7XG5cbmNvbnN0IHByb29mTm9kZVF1ZXJ5ID0gbm9kZVF1ZXJ5KFwiL3RoZW9yZW0vcHJvb2YhXCIpLFxuICAgICAgbGFiZWxOb2Rlc1F1ZXJ5ID0gbm9kZXNRdWVyeShcIi90aGVvcmVtL2xhYmVsXCIpLFxuICAgICAgY29uc2VxdWVudE5vZGVRdWVyeSA9IG5vZGVRdWVyeShcIi90aGVvcmVtL2NvbnNlcXVlbnQhXCIpLFxuICAgICAgc3VwcG9zaXRpb25zTm9kZVF1ZXJ5ID0gbm9kZXNRdWVyeShcIi90aGVvcmVtL3N1cHBvc2l0aW9uXCIpO1xuXG5leHBvcnQgZGVmYXVsdCBmdW5jdGlvbiB2ZXJpZnlUaGVvcmVtKHRoZW9yZW1Ob2RlLCBmaWxlQ29udGV4dCkge1xuICBsZXQgdGhlb3JlbVZlcmlmaWVkID0gZmFsc2U7XG5cbiAgY29uc3QgbGFiZWxOb2RlcyA9IGxhYmVsTm9kZXNRdWVyeSh0aGVvcmVtTm9kZSksXG4gICAgICAgIGxhYmVsc1N0cmluZyA9IGZpbGVDb250ZXh0Lm5vZGVzQXNTdHJpbmcobGFiZWxOb2Rlcyk7XG5cbiAgZmlsZUNvbnRleHQudHJhY2UoYFZlcmlmeWluZyB0aGUgJyR7bGFiZWxzU3RyaW5nfScgdGhlb3JlbS4uLmAsIHRoZW9yZW1Ob2RlKTtcblxuICBjb25zdCBsYWJlbHMgPSBbXSxcbiAgICAgICAgbGFiZWxzVmVyaWZpZWQgPSB2ZXJpZnlMYWJlbHMobGFiZWxOb2RlcywgbGFiZWxzLCBmaWxlQ29udGV4dCk7XG5cbiAgaWYgKGxhYmVsc1ZlcmlmaWVkKSB7XG4gICAgY29uc3Qgc3VwcG9zaXRpb25Ob2RlcyA9IHN1cHBvc2l0aW9uc05vZGVRdWVyeSh0aGVvcmVtTm9kZSksXG4gICAgICAgICAgc3VwcG9zaXRpb25zID0gW10sXG4gICAgICAgICAgbG9jYWxDb250ZXh0ID0gTG9jYWxDb250ZXh0LmZyb21GaWxlQ29udGV4dChmaWxlQ29udGV4dCksXG4gICAgICAgICAgc3VwcG9zaXRpb25zVmVyaWZpZWQgPSB2ZXJpZnlTdXBwb3NpdGlvbnMoc3VwcG9zaXRpb25Ob2Rlcywgc3VwcG9zaXRpb25zLCBsb2NhbENvbnRleHQpO1xuXG4gICAgaWYgKHN1cHBvc2l0aW9uc1ZlcmlmaWVkKSB7XG4gICAgICBjb25zdCBjb25zZXF1ZW50cyA9IFtdLFxuICAgICAgICAgICAgY29uc2VxdWVudE5vZGUgPSBjb25zZXF1ZW50Tm9kZVF1ZXJ5KHRoZW9yZW1Ob2RlKSxcbiAgICAgICAgICAgIGNvbnNlcXVlbnRWZXJpZmllZCA9IHZlcmlmeUNvbnNlcXVlbnQoY29uc2VxdWVudE5vZGUsIGNvbnNlcXVlbnRzLCBsb2NhbENvbnRleHQpO1xuXG4gICAgICBpZiAoY29uc2VxdWVudFZlcmlmaWVkKSB7XG4gICAgICAgIGNvbnN0IHByb29mTm9kZSA9IHByb29mTm9kZVF1ZXJ5KHRoZW9yZW1Ob2RlKSxcbiAgICAgICAgICAgICAgZmlyc3RDb25zZXF1ZW50ID0gZmlyc3QoY29uc2VxdWVudHMpLFxuICAgICAgICAgICAgICBjb25zZXF1ZW50ID0gZmlyc3RDb25zZXF1ZW50LCAvLy9cbiAgICAgICAgICAgICAgcHJvb2ZWZXJpZmllZCA9IHZlcmlmeVByb29mKHByb29mTm9kZSwgY29uc2VxdWVudCwgbG9jYWxDb250ZXh0KTtcblxuICAgICAgICBpZiAocHJvb2ZWZXJpZmllZCkge1xuICAgICAgICAgIGNvbnN0IHRoZW9yZW0gPSBUaGVvcmVtLmZyb21MYWJlbHNTdXBwb3NpdGlvbnNDb25zZXF1ZW50QW5kTG9jYWxDb250ZXh0KGxhYmVscywgc3VwcG9zaXRpb25zLCBjb25zZXF1ZW50LCBsb2NhbENvbnRleHQpO1xuXG4gICAgICAgICAgZmlsZUNvbnRleHQuYWRkVGhlb3JlbSh0aGVvcmVtKTtcblxuICAgICAgICAgIHRoZW9yZW1WZXJpZmllZCA9IHRydWU7XG4gICAgICAgIH1cbiAgICAgIH1cbiAgICB9XG4gIH1cblxuICBpZiAodGhlb3JlbVZlcmlmaWVkKSB7XG4gICAgZmlsZUNvbnRleHQuZGVidWcoYC4uLnZlcmlmaWVkIHRoZSAnJHtsYWJlbHNTdHJpbmd9JyB0aGVvcmVtLmAsIHRoZW9yZW1Ob2RlKTtcbiAgfVxuXG4gIHJldHVybiB0aGVvcmVtVmVyaWZpZWQ7XG59XG4iXSwibmFtZXMiOlsidmVyaWZ5VGhlb3JlbSIsInByb29mTm9kZVF1ZXJ5Iiwibm9kZVF1ZXJ5IiwibGFiZWxOb2Rlc1F1ZXJ5Iiwibm9kZXNRdWVyeSIsImNvbnNlcXVlbnROb2RlUXVlcnkiLCJzdXBwb3NpdGlvbnNOb2RlUXVlcnkiLCJ0aGVvcmVtTm9kZSIsImZpbGVDb250ZXh0IiwidGhlb3JlbVZlcmlmaWVkIiwibGFiZWxOb2RlcyIsImxhYmVsc1N0cmluZyIsIm5vZGVzQXNTdHJpbmciLCJ0cmFjZSIsImxhYmVscyIsImxhYmVsc1ZlcmlmaWVkIiwidmVyaWZ5TGFiZWxzIiwic3VwcG9zaXRpb25Ob2RlcyIsInN1cHBvc2l0aW9ucyIsImxvY2FsQ29udGV4dCIsIkxvY2FsQ29udGV4dCIsImZyb21GaWxlQ29udGV4dCIsInN1cHBvc2l0aW9uc1ZlcmlmaWVkIiwidmVyaWZ5U3VwcG9zaXRpb25zIiwiY29uc2VxdWVudHMiLCJjb25zZXF1ZW50Tm9kZSIsImNvbnNlcXVlbnRWZXJpZmllZCIsInZlcmlmeUNvbnNlcXVlbnQiLCJwcm9vZk5vZGUiLCJmaXJzdENvbnNlcXVlbnQiLCJmaXJzdCIsImNvbnNlcXVlbnQiLCJwcm9vZlZlcmlmaWVkIiwidmVyaWZ5UHJvb2YiLCJ0aGVvcmVtIiwiVGhlb3JlbSIsImZyb21MYWJlbHNTdXBwb3NpdGlvbnNDb25zZXF1ZW50QW5kTG9jYWxDb250ZXh0IiwiYWRkVGhlb3JlbSIsImRlYnVnIl0sIm1hcHBpbmdzIjoiQUFBQTs7OzsrQkFpQkE7OztlQUF3QkE7Ozs4REFmSjs0REFDSTs2REFDQzs0REFDQTtpRUFDSTttRUFDRTtxQkFFVDtxQkFDZ0I7Ozs7OztBQUV0QyxJQUFNQyxpQkFBaUJDLElBQUFBLGdCQUFTLEVBQUMsb0JBQzNCQyxrQkFBa0JDLElBQUFBLGlCQUFVLEVBQUMsbUJBQzdCQyxzQkFBc0JILElBQUFBLGdCQUFTLEVBQUMseUJBQ2hDSSx3QkFBd0JGLElBQUFBLGlCQUFVLEVBQUM7QUFFMUIsU0FBU0osY0FBY08sV0FBVyxFQUFFQyxXQUFXO0lBQzVELElBQUlDLGtCQUFrQjtJQUV0QixJQUFNQyxhQUFhUCxnQkFBZ0JJLGNBQzdCSSxlQUFlSCxZQUFZSSxhQUFhLENBQUNGO0lBRS9DRixZQUFZSyxLQUFLLENBQUMsQUFBQyxrQkFBOEIsT0FBYkYsY0FBYSxpQkFBZUo7SUFFaEUsSUFBTU8sU0FBUyxFQUFFLEVBQ1hDLGlCQUFpQkMsSUFBQUEsZUFBWSxFQUFDTixZQUFZSSxRQUFRTjtJQUV4RCxJQUFJTyxnQkFBZ0I7UUFDbEIsSUFBTUUsbUJBQW1CWCxzQkFBc0JDLGNBQ3pDVyxlQUFlLEVBQUUsRUFDakJDLGVBQWVDLGNBQVksQ0FBQ0MsZUFBZSxDQUFDYixjQUM1Q2MsdUJBQXVCQyxJQUFBQSxxQkFBa0IsRUFBQ04sa0JBQWtCQyxjQUFjQztRQUVoRixJQUFJRyxzQkFBc0I7WUFDeEIsSUFBTUUsY0FBYyxFQUFFLEVBQ2hCQyxpQkFBaUJwQixvQkFBb0JFLGNBQ3JDbUIscUJBQXFCQyxJQUFBQSxtQkFBZ0IsRUFBQ0YsZ0JBQWdCRCxhQUFhTDtZQUV6RSxJQUFJTyxvQkFBb0I7Z0JBQ3RCLElBQU1FLFlBQVkzQixlQUFlTSxjQUMzQnNCLGtCQUFrQkMsSUFBQUEsWUFBSyxFQUFDTixjQUN4Qk8sYUFBYUYsaUJBQ2JHLGdCQUFnQkMsSUFBQUEsY0FBVyxFQUFDTCxXQUFXRyxZQUFZWjtnQkFFekQsSUFBSWEsZUFBZTtvQkFDakIsSUFBTUUsVUFBVUMsZ0JBQU8sQ0FBQ0MsK0NBQStDLENBQUN0QixRQUFRSSxjQUFjYSxZQUFZWjtvQkFFMUdYLFlBQVk2QixVQUFVLENBQUNIO29CQUV2QnpCLGtCQUFrQjtnQkFDcEI7WUFDRjtRQUNGO0lBQ0Y7SUFFQSxJQUFJQSxpQkFBaUI7UUFDbkJELFlBQVk4QixLQUFLLENBQUMsQUFBQyxvQkFBZ0MsT0FBYjNCLGNBQWEsZUFBYUo7SUFDbEU7SUFFQSxPQUFPRTtBQUNUIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy92ZXJpZnkvdGhlb3JlbS5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuaW1wb3J0IFRoZW9yZW0gZnJvbSBcIi4uL3RoZW9yZW1cIjtcbmltcG9ydCB2ZXJpZnlQcm9vZiBmcm9tIFwiLi4vdmVyaWZ5L3Byb29mXCI7XG5pbXBvcnQgdmVyaWZ5TGFiZWxzIGZyb20gXCIuLi92ZXJpZnkvbGFiZWxzXCI7XG5pbXBvcnQgTG9jYWxDb250ZXh0IGZyb20gXCIuLi9jb250ZXh0L2xvY2FsXCI7XG5pbXBvcnQgdmVyaWZ5Q29uc2VxdWVudCBmcm9tIFwiLi4vdmVyaWZ5L2NvbnNlcXVlbnRcIjtcbmltcG9ydCB2ZXJpZnlTdXBwb3NpdGlvbnMgZnJvbSBcIi4uL3ZlcmlmeS9zdXBwb3NpdGlvbnNcIjtcblxuaW1wb3J0IHsgZmlyc3QgfSBmcm9tIFwiLi4vdXRpbGl0aWVzL2FycmF5XCI7XG5pbXBvcnQgeyBub2RlUXVlcnksIG5vZGVzUXVlcnkgfSBmcm9tIFwiLi4vdXRpbGl0aWVzL3F1ZXJ5XCI7XG5cbmNvbnN0IHByb29mTm9kZVF1ZXJ5ID0gbm9kZVF1ZXJ5KFwiL3RoZW9yZW0vcHJvb2YhXCIpLFxuICAgICAgbGFiZWxOb2Rlc1F1ZXJ5ID0gbm9kZXNRdWVyeShcIi90aGVvcmVtL2xhYmVsXCIpLFxuICAgICAgY29uc2VxdWVudE5vZGVRdWVyeSA9IG5vZGVRdWVyeShcIi90aGVvcmVtL2NvbnNlcXVlbnQhXCIpLFxuICAgICAgc3VwcG9zaXRpb25zTm9kZVF1ZXJ5ID0gbm9kZXNRdWVyeShcIi90aGVvcmVtL3N1cHBvc2l0aW9uXCIpO1xuXG5leHBvcnQgZGVmYXVsdCBmdW5jdGlvbiB2ZXJpZnlUaGVvcmVtKHRoZW9yZW1Ob2RlLCBmaWxlQ29udGV4dCkge1xuICBsZXQgdGhlb3JlbVZlcmlmaWVkID0gZmFsc2U7XG5cbiAgY29uc3QgbGFiZWxOb2RlcyA9IGxhYmVsTm9kZXNRdWVyeSh0aGVvcmVtTm9kZSksXG4gICAgICAgIGxhYmVsc1N0cmluZyA9IGZpbGVDb250ZXh0Lm5vZGVzQXNTdHJpbmcobGFiZWxOb2Rlcyk7XG5cbiAgZmlsZUNvbnRleHQudHJhY2UoYFZlcmlmeWluZyB0aGUgJyR7bGFiZWxzU3RyaW5nfScgdGhlb3JlbS4uLmAsIHRoZW9yZW1Ob2RlKTtcblxuICBjb25zdCBsYWJlbHMgPSBbXSxcbiAgICAgICAgbGFiZWxzVmVyaWZpZWQgPSB2ZXJpZnlMYWJlbHMobGFiZWxOb2RlcywgbGFiZWxzLCBmaWxlQ29udGV4dCk7XG5cbiAgaWYgKGxhYmVsc1ZlcmlmaWVkKSB7XG4gICAgY29uc3QgbG9jYWxDb250ZXh0ID0gTG9jYWxDb250ZXh0LmZyb21GaWxlQ29udGV4dChmaWxlQ29udGV4dCksXG4gICAgICAgICAgc3VwcG9zaXRpb25zID0gW10sXG4gICAgICAgICAgc3VwcG9zaXRpb25Ob2RlcyA9IHN1cHBvc2l0aW9uc05vZGVRdWVyeSh0aGVvcmVtTm9kZSksXG4gICAgICAgICAgc3VwcG9zaXRpb25zVmVyaWZpZWQgPSB2ZXJpZnlTdXBwb3NpdGlvbnMoc3VwcG9zaXRpb25Ob2Rlcywgc3VwcG9zaXRpb25zLCBsb2NhbENvbnRleHQpO1xuXG4gICAgaWYgKHN1cHBvc2l0aW9uc1ZlcmlmaWVkKSB7XG4gICAgICBjb25zdCBjb25zZXF1ZW50cyA9IFtdLFxuICAgICAgICAgICAgY29uc2VxdWVudE5vZGUgPSBjb25zZXF1ZW50Tm9kZVF1ZXJ5KHRoZW9yZW1Ob2RlKSxcbiAgICAgICAgICAgIGNvbnNlcXVlbnRWZXJpZmllZCA9IHZlcmlmeUNvbnNlcXVlbnQoY29uc2VxdWVudE5vZGUsIGNvbnNlcXVlbnRzLCBsb2NhbENvbnRleHQpO1xuXG4gICAgICBpZiAoY29uc2VxdWVudFZlcmlmaWVkKSB7XG4gICAgICAgIGNvbnN0IHByb29mTm9kZSA9IHByb29mTm9kZVF1ZXJ5KHRoZW9yZW1Ob2RlKSxcbiAgICAgICAgICAgICAgZmlyc3RDb25zZXF1ZW50ID0gZmlyc3QoY29uc2VxdWVudHMpLFxuICAgICAgICAgICAgICBjb25zZXF1ZW50ID0gZmlyc3RDb25zZXF1ZW50LCAvLy9cbiAgICAgICAgICAgICAgc3RhdGVtZW50Tm9kZSA9IGNvbnNlcXVlbnQuZ2V0U3RhdGVtZW50Tm9kZSgpLFxuICAgICAgICAgICAgICBzdWJzdGl0dXRpb25zID0gW10sXG4gICAgICAgICAgICAgIHByb29mVmVyaWZpZWQgPSB2ZXJpZnlQcm9vZihwcm9vZk5vZGUsIHN0YXRlbWVudE5vZGUsIHN1YnN0aXR1dGlvbnMsIGxvY2FsQ29udGV4dCk7XG5cbiAgICAgICAgaWYgKHByb29mVmVyaWZpZWQpIHtcbiAgICAgICAgICBjb25zdCBzdWJzdGl0dXRpb25zID0gW10sXG4gICAgICAgICAgICAgICAgdGhlb3JlbSA9IFRoZW9yZW0uZnJvbUxhYmVsc1N1cHBvc2l0aW9uc0NvbnNlcXVlbnRTdWJzdGl0dXRpb25zQW5kRmlsZUNvbnRleHQobGFiZWxzLCBzdXBwb3NpdGlvbnMsIGNvbnNlcXVlbnQsIHN1YnN0aXR1dGlvbnMsIGZpbGVDb250ZXh0KTtcblxuICAgICAgICAgIGZpbGVDb250ZXh0LmFkZFRoZW9yZW0odGhlb3JlbSk7XG5cbiAgICAgICAgICB0aGVvcmVtVmVyaWZpZWQgPSB0cnVlO1xuICAgICAgICB9XG4gICAgICB9XG4gICAgfVxuICB9XG5cbiAgaWYgKHRoZW9yZW1WZXJpZmllZCkge1xuICAgIGZpbGVDb250ZXh0LmRlYnVnKGAuLi52ZXJpZmllZCB0aGUgJyR7bGFiZWxzU3RyaW5nfScgdGhlb3JlbS5gLCB0aGVvcmVtTm9kZSk7XG4gIH1cblxuICByZXR1cm4gdGhlb3JlbVZlcmlmaWVkO1xufVxuIl0sIm5hbWVzIjpbInZlcmlmeVRoZW9yZW0iLCJwcm9vZk5vZGVRdWVyeSIsIm5vZGVRdWVyeSIsImxhYmVsTm9kZXNRdWVyeSIsIm5vZGVzUXVlcnkiLCJjb25zZXF1ZW50Tm9kZVF1ZXJ5Iiwic3VwcG9zaXRpb25zTm9kZVF1ZXJ5IiwidGhlb3JlbU5vZGUiLCJmaWxlQ29udGV4dCIsInRoZW9yZW1WZXJpZmllZCIsImxhYmVsTm9kZXMiLCJsYWJlbHNTdHJpbmciLCJub2Rlc0FzU3RyaW5nIiwidHJhY2UiLCJsYWJlbHMiLCJsYWJlbHNWZXJpZmllZCIsInZlcmlmeUxhYmVscyIsImxvY2FsQ29udGV4dCIsIkxvY2FsQ29udGV4dCIsImZyb21GaWxlQ29udGV4dCIsInN1cHBvc2l0aW9ucyIsInN1cHBvc2l0aW9uTm9kZXMiLCJzdXBwb3NpdGlvbnNWZXJpZmllZCIsInZlcmlmeVN1cHBvc2l0aW9ucyIsImNvbnNlcXVlbnRzIiwiY29uc2VxdWVudE5vZGUiLCJjb25zZXF1ZW50VmVyaWZpZWQiLCJ2ZXJpZnlDb25zZXF1ZW50IiwicHJvb2ZOb2RlIiwiZmlyc3RDb25zZXF1ZW50IiwiZmlyc3QiLCJjb25zZXF1ZW50Iiwic3RhdGVtZW50Tm9kZSIsImdldFN0YXRlbWVudE5vZGUiLCJzdWJzdGl0dXRpb25zIiwicHJvb2ZWZXJpZmllZCIsInZlcmlmeVByb29mIiwidGhlb3JlbSIsIlRoZW9yZW0iLCJmcm9tTGFiZWxzU3VwcG9zaXRpb25zQ29uc2VxdWVudFN1YnN0aXR1dGlvbnNBbmRGaWxlQ29udGV4dCIsImFkZFRoZW9yZW0iLCJkZWJ1ZyJdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7K0JBaUJBOzs7ZUFBd0JBOzs7OERBZko7NERBQ0k7NkRBQ0M7NERBQ0E7aUVBQ0k7bUVBQ0U7cUJBRVQ7cUJBQ2dCOzs7Ozs7QUFFdEMsSUFBTUMsaUJBQWlCQyxJQUFBQSxnQkFBUyxFQUFDLG9CQUMzQkMsa0JBQWtCQyxJQUFBQSxpQkFBVSxFQUFDLG1CQUM3QkMsc0JBQXNCSCxJQUFBQSxnQkFBUyxFQUFDLHlCQUNoQ0ksd0JBQXdCRixJQUFBQSxpQkFBVSxFQUFDO0FBRTFCLFNBQVNKLGNBQWNPLFdBQVcsRUFBRUMsV0FBVztJQUM1RCxJQUFJQyxrQkFBa0I7SUFFdEIsSUFBTUMsYUFBYVAsZ0JBQWdCSSxjQUM3QkksZUFBZUgsWUFBWUksYUFBYSxDQUFDRjtJQUUvQ0YsWUFBWUssS0FBSyxDQUFDLEFBQUMsa0JBQThCLE9BQWJGLGNBQWEsaUJBQWVKO0lBRWhFLElBQU1PLFNBQVMsRUFBRSxFQUNYQyxpQkFBaUJDLElBQUFBLGVBQVksRUFBQ04sWUFBWUksUUFBUU47SUFFeEQsSUFBSU8sZ0JBQWdCO1FBQ2xCLElBQU1FLGVBQWVDLGNBQVksQ0FBQ0MsZUFBZSxDQUFDWCxjQUM1Q1ksZUFBZSxFQUFFLEVBQ2pCQyxtQkFBbUJmLHNCQUFzQkMsY0FDekNlLHVCQUF1QkMsSUFBQUEscUJBQWtCLEVBQUNGLGtCQUFrQkQsY0FBY0g7UUFFaEYsSUFBSUssc0JBQXNCO1lBQ3hCLElBQU1FLGNBQWMsRUFBRSxFQUNoQkMsaUJBQWlCcEIsb0JBQW9CRSxjQUNyQ21CLHFCQUFxQkMsSUFBQUEsbUJBQWdCLEVBQUNGLGdCQUFnQkQsYUFBYVA7WUFFekUsSUFBSVMsb0JBQW9CO2dCQUN0QixJQUFNRSxZQUFZM0IsZUFBZU0sY0FDM0JzQixrQkFBa0JDLElBQUFBLFlBQUssRUFBQ04sY0FDeEJPLGFBQWFGLGlCQUNiRyxnQkFBZ0JELFdBQVdFLGdCQUFnQixJQUMzQ0MsZ0JBQWdCLEVBQUUsRUFDbEJDLGdCQUFnQkMsSUFBQUEsY0FBVyxFQUFDUixXQUFXSSxlQUFlRSxlQUFlakI7Z0JBRTNFLElBQUlrQixlQUFlO29CQUNqQixJQUFNRCxpQkFBZ0IsRUFBRSxFQUNsQkcsVUFBVUMsZ0JBQU8sQ0FBQ0MsMkRBQTJELENBQUN6QixRQUFRTSxjQUFjVyxZQUFZRyxnQkFBZTFCO29CQUVySUEsWUFBWWdDLFVBQVUsQ0FBQ0g7b0JBRXZCNUIsa0JBQWtCO2dCQUNwQjtZQUNGO1FBQ0Y7SUFDRjtJQUVBLElBQUlBLGlCQUFpQjtRQUNuQkQsWUFBWWlDLEtBQUssQ0FBQyxBQUFDLG9CQUFnQyxPQUFiOUIsY0FBYSxlQUFhSjtJQUNsRTtJQUVBLE9BQU9FO0FBQ1QifQ==

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "occam-verify-cli",
   "author": "James Smith",
-  "version": "0.0.923",
+  "version": "0.0.925",
   "license": "MIT, Anti-996",
   "homepage": "https://github.com/djalbat/occam-verify-cli",
   "description": "Occam's Verifier",
@@ -12,7 +12,7 @@
   "dependencies": {
     "argumentative": "^2.0.28",
     "necessary": "^14.0.1",
-    "occam-custom-grammars": "^5.0.825",
+    "occam-custom-grammars": "^5.0.829",
     "occam-entities": "^1.0.149",
     "occam-file-system": "^6.0.190",
     "occam-grammar-utilities": "^8.0.207",

package/src/axiom.js

@@ -1,9 +1,9 @@
 "use strict";
 
-import AxiomLemmaTheoremConjecture from "./axiomLemmaTheoremConjecture";
+import TopLevelAssertion from "./topLevelAssertion";
 
-export default class Axiom extends AxiomLemmaTheoremConjecture {
-  static fromJSONAndFileContext(json, fileContext) { return AxiomLemmaTheoremConjecture.fromJSONAndFileContext(Axiom, json, fileContext); }
+export default class Axiom extends TopLevelAssertion {
+  static fromJSONAndFileContext(json, fileContext) { return TopLevelAssertion.fromJSONAndFileContext(Axiom, json, fileContext); }
 
-  static fromLabelsSuppositionsConsequentAndLocalContext(labels, suppositions, consequent, localContext) { return AxiomLemmaTheoremConjecture.fromLabelsSuppositionsConsequentAndLocalContext(Axiom, labels, suppositions, consequent, localContext); }
+  static fromLabelsSuppositionsConsequentSubstitutionsAndFileContext(labels, suppositions, consequent, substitutions, fileContext) { return TopLevelAssertion.fromLabelsSuppositionsConsequentSubstitutionsAndFileContext(Axiom, labels, suppositions, consequent, substitutions, fileContext); }
 }

package/src/conjecture.js

@@ -1,9 +1,9 @@
 "use strict";
 
-import AxiomLemmaTheoremConjecture from "./axiomLemmaTheoremConjecture";
+import TopLevelAssertion from "./topLevelAssertion";
 
-export default class Conjecture extends AxiomLemmaTheoremConjecture {
-  static fromJSONAndFileContext(json, fileContext) { return AxiomLemmaTheoremConjecture.fromJSONAndFileContext(Conjecture, json, fileContext); }
+export default class Conjecture extends TopLevelAssertion {
+  static fromJSONAndFileContext(json, fileContext) { return TopLevelAssertion.fromJSONAndFileContext(Conjecture, json, fileContext); }
 
-  static fromLabelsSuppositionsConsequentAndLocalContext(labels, suppositions, consequent, localContext) { return AxiomLemmaTheoremConjecture.fromLabelsSuppositionsConsequentAndLocalContext(Conjecture, labels, suppositions, consequent, localContext); }
+  static fromLabelsSuppositionsConsequentSubstitutionsAndFileContext(labels, suppositions, consequent, substitutions, fileContext) { return TopLevelAssertion.fromLabelsSuppositionsConsequentSubstitutionsAndFileContext(Conjecture, labels, suppositions, consequent, substitutions, fileContext); }
 }

package/src/constants.js

@@ -2,7 +2,5 @@
 
 export const NOT = "not";
 export const COMMA = ",";
-export const DEFINED = "defined";
-export const CONTAINED = "contained";
 export const EMPTY_STRING = "";
 export const BRACKETED_STATEMENT_DEPTH = 2;

package/src/context/file.js

@@ -513,8 +513,8 @@ export default class FileContext {
     return labelPresent;
   }
 
-  isMetavariablePresentByMetavariableNode(metavariableNode, localContext) {
-    const metavariable = this.findMetavariableByMetavariableNode(metavariableNode, localContext),
+  isMetavariablePresentByMetavariableNode(metavariableNode) {
+    const metavariable = this.findMetavariableByMetavariableNode(metavariableNode),
           metavariablePresent = (metavariable !== null);
 
     return metavariablePresent;

package/src/context/local.js

@@ -305,8 +305,8 @@ class LocalContext {
     return judgementPresent;
   }
 
-  isMetavariablePresentByMetavariableNode(metavariableNode, localContext) {
-    const metavariable = this.findMetavariableByMetavariableNode(metavariableNode, localContext),
+  isMetavariablePresentByMetavariableNode(metavariableNode) {
+    const metavariable = this.findMetavariableByMetavariableNode(metavariableNode),
           metavariablePresent = (metavariable !== null);
 
     return metavariablePresent;
@@ -339,8 +339,9 @@ class LocalContext {
     return judgement;
   }
 
-  findMetavariableByMetavariableNode(metavariableNode, localContext) {
+  findMetavariableByMetavariableNode(metavariableNode) {
     const node = metavariableNode,  ///
+          localContext = this,  ///
           metavariables = this.getMetavariables(),
           metavariable = metavariables.find((metavariable) => {
             const matches = metavariable.matchNode(node, localContext);

package/src/lemma.js

@@ -1,9 +1,9 @@
 "use strict";
 
-import AxiomLemmaTheoremConjecture from "./axiomLemmaTheoremConjecture";
+import TopLevelAssertion from "./topLevelAssertion";
 
-export default class Lemma extends AxiomLemmaTheoremConjecture {
-  static fromJSONAndFileContext(json, fileContext) { return AxiomLemmaTheoremConjecture.fromJSONAndFileContext(Lemma,json, fileContext); }
+export default class Lemma extends TopLevelAssertion {
+  static fromJSONAndFileContext(json, fileContext) { return TopLevelAssertion.fromJSONAndFileContext(Lemma,json, fileContext); }
 
-  static fromLabelsSuppositionsConsequentAndLocalContext(labels, suppositions, consequent, localContext) { return AxiomLemmaTheoremConjecture.fromLabelsSuppositionsConsequentAndLocalContext(Lemma, labels, suppositions, consequent, localContext); }
+  static fromLabelsSuppositionsConsequentSubstitutionsAndFileContext(labels, suppositions, consequent, substitutions, fileContext) { return TopLevelAssertion.fromLabelsSuppositionsConsequentSubstitutionsAndFileContext(Lemma, labels, suppositions, consequent, substitutions, fileContext); }
 }