occam-verify-cli 0.0.527 → 0.0.529

package/README.md

@@ -44,6 +44,10 @@ Options:
   --help|-h                                       Show this help
 
   --version|-v                                    Show the version
+
+  --tail|-t                                       Sets the size of the tail of the log messages. The default is ten. 
+
+  --follow|-f                                     Show the log messages immediately instead of tailing them. The default is false.
 ```
 
 ## Building

package/bin/abbreviations.js

@@ -1,13 +1,17 @@
 "use strict";
 
-const { HELP_OPTION, VERSION_OPTION, LOG_LEVEL_OPTION } = require("./options");
+const { HELP_OPTION, TAIL_OPTION, FOLLOW_OPTION, VERSION_OPTION, LOG_LEVEL_OPTION } = require("./options");
 
 const h = HELP_OPTION,
+      t = TAIL_OPTION,
+      f = FOLLOW_OPTION,
       v = VERSION_OPTION,
       l = LOG_LEVEL_OPTION
 
 module.exports = {
   h,
+  t,
+  f,
   v,
   l
 };

package/bin/action/help.js

@@ -19,6 +19,10 @@ Options:
 
   --version|-v                                    Show the version
 
+  --tail|-t                                       Sets the size of the tail of the log messages. The default is ten. 
+
+  --follow|-f                                     Show the log messages immediately instead of tailing them. The default is false.
+
 Further information:
 
 Please see the readme file on GitHub:

package/bin/action/verify.js

@@ -1,25 +1,21 @@
 "use strict";
 
 const { Dependency } = require("occam-file-system"),
-      { loggingUtilities } = require("necessary"),
-      { verifyRelease, releaseContextUtilities } = require("../../lib/index");  ///
+      { Log, verifyRelease, releaseContextUtilities } = require("../../lib/index");  ///
 
 const { trimTrailingSlash } = require("../utilities/string"),
       { releaseContextFromDependencyAndDependentNames } = require("../utilities/releaseContext");
 
-const { log } = loggingUtilities,
-      { setLogLevel } = log,
-      { createReleaseContext, initialiseReleaseContext } = releaseContextUtilities;
+const { createReleaseContext, initialiseReleaseContext } = releaseContextUtilities;
 
-function verifyAction(argument, logLevel) {
-  const name = trimTrailingSlash(argument), ///
+function verifyAction(argument, tail, follow, logLevel) {
+  const log = Log.followAndLogLevel(follow, logLevel),
+        name = trimTrailingSlash(argument), ///
         context = {},
         dependency = Dependency.fromName(name),
         dependentNames = [],
         releaseContextMap = {};
 
-  setLogLevel(logLevel);
-
   Object.assign(context, {
     log,
     releaseContextMap,
@@ -30,6 +26,8 @@ function verifyAction(argument, logLevel) {
     if (error) {
       log.error(error);
 
+      tailLogMessages();
+
       return;
     }
 
@@ -38,13 +36,37 @@ function verifyAction(argument, logLevel) {
           releaseContext = releaseContextMap[releaseName],
           verified = releaseContext.isVerified();
 
-    initialiseReleaseContext(dependency, dependentName, verified, context);
+    initialiseReleaseContext(dependency, dependentName, verified, context, (error) => {
+      if (error) {
+        log.error(error);
+
+        tailLogMessages();
+
+        return;
+      }
+
+      delete context.releaseContextMap;
+      delete context.releaseContextFromDependencyAndDependentNames;
 
-    delete context.releaseContextMap;
-    delete context.releaseContextFromDependencyAndDependentNames;
+      verifyRelease(releaseName, releaseContextMap);
 
-    verifyRelease(releaseName, releaseContextMap);
+      tailLogMessages();
+    });
   });
+
+  function tailLogMessages() {
+    if (!follow) {
+      let logMessages = log.getMessages()
+
+      const start = - tail;
+
+      logMessages = logMessages.slice(start);
+
+      logMessages.forEach((logMessage) => {
+        console.log(logMessage);
+      });
+    }
+  }
 }
 
 module.exports = verifyAction;

package/bin/actions.js

@@ -4,7 +4,7 @@ const helpAction = require("./action/help"),
       verifyAction = require("./action/verify"),
       versionAction = require("./action/version");
 
-const { DEFAULT_HELP, DEFAULT_VERSION, DEFAULT_LOG_LEVEL } = require("./defaults"),
+const { DEFAULT_HELP, DEFAULT_TAIL, DEFAULT_FOLLOW, DEFAULT_VERSION, DEFAULT_LOG_LEVEL } = require("./defaults"),
       { HELP_COMMAND,
         VERIFY_COMMAND,
         VERSION_COMMAND } = require("./commands");
@@ -12,6 +12,8 @@ const { DEFAULT_HELP, DEFAULT_VERSION, DEFAULT_LOG_LEVEL } = require("./defaults
 function actions(command, argument, options) {
   const commandMissing = (command === null),
         { help = DEFAULT_HELP,
+          tail = DEFAULT_TAIL,
+          follow = DEFAULT_FOLLOW,
           version = DEFAULT_VERSION,
           logLevel = DEFAULT_LOG_LEVEL } = options;
 
@@ -26,14 +28,17 @@ function actions(command, argument, options) {
   }
 
   switch (command) {
-    case HELP_COMMAND : helpAction(); break;
-    case VERIFY_COMMAND : verifyAction(argument, logLevel); break;
-    case VERSION_COMMAND : versionAction(); break;
+    case HELP_COMMAND: helpAction(); break;
+    case VERIFY_COMMAND: verifyAction(argument, tail, follow, logLevel); break;
+    case VERSION_COMMAND: versionAction(); break;
 
-    default:
+    default: {
       argument = command; ///
 
-      verifyAction(argument, logLevel);
+      verifyAction(argument, tail, follow, logLevel);
+
+      break;
+    }
   }
 }
 

package/bin/defaults.js

@@ -5,11 +5,15 @@ const { levels } = require("necessary");
 const { INFO_LEVEL } = levels;
 
 const DEFAULT_HELP = false,
+      DEFAULT_TAIL = 10,
+      DEFAULT_FOLLOW = false,
       DEFAULT_VERSION = false,
       DEFAULT_LOG_LEVEL = INFO_LEVEL;
 
 module.exports = {
   DEFAULT_HELP,
+  DEFAULT_TAIL,
+  DEFAULT_FOLLOW,
   DEFAULT_VERSION,
   DEFAULT_LOG_LEVEL
 };

package/bin/options.js

@@ -1,11 +1,15 @@
 "use strict";
 
 const HELP_OPTION = "help",
+      TAIL_OPTION = "tail",
+      FOLLOW_OPTION = "follow",
       VERSION_OPTION = "version",
       LOG_LEVEL_OPTION = "log-level";
 
 module.exports = {
   HELP_OPTION,
+  TAIL_OPTION,
+  FOLLOW_OPTION,
   VERSION_OPTION,
   LOG_LEVEL_OPTION
 };

package/bin/utilities/releaseContext.js

@@ -4,8 +4,6 @@ const { FileReleaseContext, DirectoryReleaseContext } = require("../../lib/index
       { Entries, fileSystemUtilities : occamFileSystemUtilities } = require("occam-file-system"),
       { pathUtilities, fileSystemUtilities : necessaryFileSystemUtilities } = require("necessary");
 
-const callbacks = require("../callbacks");
-
 const { loadProject } = occamFileSystemUtilities,
       { concatenatePaths } = pathUtilities,
       { readFile, isEntryFile, checkEntryExists } = necessaryFileSystemUtilities;
@@ -53,8 +51,7 @@ module.exports = {
 function fileReleaseContextFromDependencyAndProjectsDirectoryPath(dependency, projectsDirectoryPath, context) {
   let releaseContext;
 
-  const { log } = context,
-        dependencyName = dependency.getName(),
+  const dependencyName = dependency.getName(),
         filePath = concatenatePaths(projectsDirectoryPath, dependencyName),
         content = readFile(filePath),
         releaseJSONString = content,  ///
@@ -70,8 +67,9 @@ function fileReleaseContextFromDependencyAndProjectsDirectoryPath(dependency, pr
 
   entries = Entries.fromJSON(json);
 
-  const name = dependencyName, ///
-        fileReleaseContext = FileReleaseContext.fromLogNameEntriesCallbacksAndContextJSON(log, name, entries, callbacks, contextJSON);
+  const { log } = context,
+        name = dependencyName, ///
+        fileReleaseContext = FileReleaseContext.fromLogNameEntriesAndContextJSON(log, name, entries, contextJSON);
 
   releaseContext = fileReleaseContext;  ///
 
@@ -89,7 +87,7 @@ function directoryReleaseContextFromDependencyAndProjectsDirectoryPath(dependenc
     const { log } = context,
           name = project.getName(),
           entries = project.getEntries(),
-          directoryReleaseContext = DirectoryReleaseContext.fromLogNameEntriesAndCallbacks(log, name, entries, callbacks);
+          directoryReleaseContext = DirectoryReleaseContext.fromLogNameAndEntries(log, name, entries);
 
     releaseContext = directoryReleaseContext; ///
   }

package/lib/axiom.js

@@ -123,8 +123,8 @@ var Axiom = /*#__PURE__*/ function(AxiomLemmaTheoremConjecture) {
     _createClass(Axiom, null, [
         {
             key: "fromJSON",
-            value: function fromJSON(json, releaseContext) {
-                return _axiomLemmaTheoremConjecture.default.fromJSON(Axiom, json, releaseContext);
+            value: function fromJSON(json, lexer, parser) {
+                return _axiomLemmaTheoremConjecture.default.fromJSON(Axiom, json, lexer, parser);
             }
         },
         {
@@ -138,4 +138,4 @@ var Axiom = /*#__PURE__*/ function(AxiomLemmaTheoremConjecture) {
 }(_axiomLemmaTheoremConjecture.default);
 _defineProperty(Axiom, "kind", _kinds.AXIOM_KIND);
 
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy9heGlvbS5qcyIsIjw8anN4LWNvbmZpZy1wcmFnbWEuanM+PiJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuaW1wb3J0IEF4aW9tTGVtbWFUaGVvcmVtQ29uamVjdHVyZSBmcm9tIFwiLi9heGlvbUxlbW1hVGhlb3JlbUNvbmplY3R1cmVcIjtcblxuaW1wb3J0IHsgQVhJT01fS0lORCB9IGZyb20gXCIuL2tpbmRzXCI7XG5cbmV4cG9ydCBkZWZhdWx0IGNsYXNzIEF4aW9tIGV4dGVuZHMgQXhpb21MZW1tYVRoZW9yZW1Db25qZWN0dXJlIHtcbiAgc3RhdGljIGtpbmQgPSBBWElPTV9LSU5EO1xuXG4gIHN0YXRpYyBmcm9tSlNPTihqc29uLCByZWxlYXNlQ29udGV4dCkgeyByZXR1cm4gQXhpb21MZW1tYVRoZW9yZW1Db25qZWN0dXJlLmZyb21KU09OKEF4aW9tLCBqc29uLCByZWxlYXNlQ29udGV4dCk7IH1cblxuICBzdGF0aWMgZnJvbUxhYmVsc1N1cHBvc2l0aW9uc0FuZENvbnNlcXVlbmNlKGxhYmVscywgc3VwcG9zaXRpb25zLCBjb25zZXF1ZW5jZSkgeyByZXR1cm4gQXhpb21MZW1tYVRoZW9yZW1Db25qZWN0dXJlLmZyb21MYWJlbHNTdXBwb3NpdGlvbnNBbmRDb25zZXF1ZW5jZShBeGlvbSwgbGFiZWxzLCBzdXBwb3NpdGlvbnMsIGNvbnNlcXVlbmNlKTsgfVxufVxuIiwiUmVhY3QuY3JlYXRlRWxlbWVudCJdLCJuYW1lcyI6WyJBeGlvbSIsImZyb21KU09OIiwianNvbiIsInJlbGVhc2VDb250ZXh0IiwiQXhpb21MZW1tYVRoZW9yZW1Db25qZWN0dXJlIiwiZnJvbUxhYmVsc1N1cHBvc2l0aW9uc0FuZENvbnNlcXVlbmNlIiwibGFiZWxzIiwic3VwcG9zaXRpb25zIiwiY29uc2VxdWVuY2UiLCJraW5kIiwiQVhJT01fS0lORCJdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7Ozs7ZUFNcUJBOzs7Z0ZBSm1CO3FCQUViOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUVaLElBQUEsQUFBTUEsc0JBQU47Y0FBTUE7OEJBQUFBO2FBQUFBOzhCQUFBQTs7O2lCQUFBQTs7WUFHWkMsS0FBQUE7bUJBQVAsU0FBT0EsU0FBU0MsSUFBSSxFQUFFQyxjQUFjLEVBQUU7Z0JBQUUsT0FBT0Msb0NBQTJCLENBQUNILFFBQVEsQ0FIaEVELE9BR3dFRSxNQUFNQztZQUFpQjs7O1lBRTNHRSxLQUFBQTttQkFBUCxTQUFPQSxxQ0FBcUNDLE1BQU0sRUFBRUMsWUFBWSxFQUFFQyxXQUFXLEVBQUU7Z0JBQUUsT0FBT0osb0NBQTJCLENBQUNDLG9DQUFvQyxDQUxySUwsT0FLNklNLFFBQVFDLGNBQWNDO1lBQWM7OztXQUxqTFI7RUFBY0ksb0NBQTJCO0FBQzVELGdCQURtQkosT0FDWlMsUUFBT0MsaUJBQVUifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy9heGlvbS5qcyIsIjw8anN4LWNvbmZpZy1wcmFnbWEuanM+PiJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuaW1wb3J0IEF4aW9tTGVtbWFUaGVvcmVtQ29uamVjdHVyZSBmcm9tIFwiLi9heGlvbUxlbW1hVGhlb3JlbUNvbmplY3R1cmVcIjtcblxuaW1wb3J0IHsgQVhJT01fS0lORCB9IGZyb20gXCIuL2tpbmRzXCI7XG5cbmV4cG9ydCBkZWZhdWx0IGNsYXNzIEF4aW9tIGV4dGVuZHMgQXhpb21MZW1tYVRoZW9yZW1Db25qZWN0dXJlIHtcbiAgc3RhdGljIGtpbmQgPSBBWElPTV9LSU5EO1xuXG4gIHN0YXRpYyBmcm9tSlNPTihqc29uLCBsZXhlciwgcGFyc2VyKSB7IHJldHVybiBBeGlvbUxlbW1hVGhlb3JlbUNvbmplY3R1cmUuZnJvbUpTT04oQXhpb20sIGpzb24sIGxleGVyLCBwYXJzZXIpOyB9XG5cbiAgc3RhdGljIGZyb21MYWJlbHNTdXBwb3NpdGlvbnNBbmRDb25zZXF1ZW5jZShsYWJlbHMsIHN1cHBvc2l0aW9ucywgY29uc2VxdWVuY2UpIHsgcmV0dXJuIEF4aW9tTGVtbWFUaGVvcmVtQ29uamVjdHVyZS5mcm9tTGFiZWxzU3VwcG9zaXRpb25zQW5kQ29uc2VxdWVuY2UoQXhpb20sIGxhYmVscywgc3VwcG9zaXRpb25zLCBjb25zZXF1ZW5jZSk7IH1cbn1cbiIsIlJlYWN0LmNyZWF0ZUVsZW1lbnQiXSwibmFtZXMiOlsiQXhpb20iLCJmcm9tSlNPTiIsImpzb24iLCJsZXhlciIsInBhcnNlciIsIkF4aW9tTGVtbWFUaGVvcmVtQ29uamVjdHVyZSIsImZyb21MYWJlbHNTdXBwb3NpdGlvbnNBbmRDb25zZXF1ZW5jZSIsImxhYmVscyIsInN1cHBvc2l0aW9ucyIsImNvbnNlcXVlbmNlIiwia2luZCIsIkFYSU9NX0tJTkQiXSwibWFwcGluZ3MiOiJBQUFBOzs7Ozs7O2VBTXFCQTs7O2dGQUptQjtxQkFFYjs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFFWixJQUFBLEFBQU1BLHNCQUFOO2NBQU1BOzhCQUFBQTthQUFBQTs4QkFBQUE7OztpQkFBQUE7O1lBR1pDLEtBQUFBO21CQUFQLFNBQU9BLFNBQVNDLElBQUksRUFBRUMsS0FBSyxFQUFFQyxNQUFNLEVBQUU7Z0JBQUUsT0FBT0Msb0NBQTJCLENBQUNKLFFBQVEsQ0FIL0RELE9BR3VFRSxNQUFNQyxPQUFPQztZQUFTOzs7WUFFekdFLEtBQUFBO21CQUFQLFNBQU9BLHFDQUFxQ0MsTUFBTSxFQUFFQyxZQUFZLEVBQUVDLFdBQVcsRUFBRTtnQkFBRSxPQUFPSixvQ0FBMkIsQ0FBQ0Msb0NBQW9DLENBTHJJTixPQUs2SU8sUUFBUUMsY0FBY0M7WUFBYzs7O1dBTGpMVDtFQUFjSyxvQ0FBMkI7QUFDNUQsZ0JBRG1CTCxPQUNaVSxRQUFPQyxpQkFBVSJ9

package/lib/axiomLemmaTheoremConjecture.js

@@ -116,23 +116,23 @@ var AxiomLemmaTheoremConjecture = /*#__PURE__*/ function() {
     ], [
         {
             key: "fromJSON",
-            value: function fromJSON(Class, json, releaseContext) {
+            value: function fromJSON(Class, json, lexer, parser) {
                 var labels = json.labels;
                 var labelsJSON = labels; ///
                 labels = labelsJSON.map(function(labelJSON) {
-                    var _$json = labelJSON, label = _label.default.fromJSON(_$json, releaseContext);
+                    var _$json = labelJSON, label = _label.default.fromJSON(_$json, lexer, parser);
                     return label;
                 });
                 var suppositions = json.suppositions;
                 var suppositionsJSON = suppositions; ///
                 suppositions = suppositionsJSON.map(function(suppositionJSON) {
-                    var _$json = suppositionJSON, supposition = _supposition.default.fromJSON(_$json, releaseContext);
+                    var _$json = suppositionJSON, supposition = _supposition.default.fromJSON(_$json, lexer, parser);
                     return supposition;
                 });
                 var consequence = json.consequence;
                 var consequenceJSON = consequence; ///
                 json = consequenceJSON; ///
-                consequence = _consequence.default.fromJSON(json, releaseContext);
+                consequence = _consequence.default.fromJSON(json, lexer, parser);
                 return new Class(labels, suppositions, consequence); ///
             }
         },
@@ -187,4 +187,4 @@ function matchSuppositionsAndConsequence(suppositions, consequence, proofSteps,
     return suppositionsMatchConsequence;
 }
 
-//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../src/axiomLemmaTheoremConjecture.js"],"sourcesContent":["\"use strict\";\n\nimport Label from \"./label\";\nimport Supposition from \"./supposition\";\nimport Consequence from \"./consequence\";\n\nimport { prune } from \"./utilities/array\";\nimport { someSubArray } from \"./utilities/array\";\n\nexport default class AxiomLemmaTheoremConjecture {\n  constructor(labels, suppositions, consequence) {\n    this.labels = labels;\n    this.suppositions = suppositions;\n    this.consequence = consequence;\n  }\n\n  getLabels() {\n    return this.labels;\n  }\n\n  getSuppositions() {\n    return this.suppositions;\n  }\n\n  getConsequence() {\n    return this.consequence;\n  }\n\n  matchLabelName(labelName) {\n    const matchesLabelName = this.labels.some((label) => {\n      const name = labelName, ///\n            labelMatchesName = label.matchName(name);\n\n      if (labelMatchesName) {\n        return true;\n      }\n    });\n\n    return matchesLabelName;\n  }\n\n  matchStatement(statementNode, proofContext) {\n    let statementNatches;\n\n    const suppositionsLength = this.suppositions.length;\n\n    if (suppositionsLength === 0) {\n      const substitutions = [],\n            consequenceMatches = matchConsequence(this.consequence, statementNode, substitutions);\n\n      statementNatches = consequenceMatches; ///\n    } else {\n      const proofSteps = proofContext.getProofSteps();\n\n      statementNatches = someSubArray(proofSteps, suppositionsLength, (proofSteps) => {\n        const suppositionsMatchConsequence = matchSuppositionsAndConsequence(this.suppositions, this.consequence, proofSteps, statementNode);\n\n        if (suppositionsMatchConsequence) {\n          return true;\n        }\n      });\n    }\n\n    return statementNatches;\n  }\n\n  toJSON(tokens) {\n    const { kind } = this.constructor,\n          labelsJSON = this.labels.map((label) => {\n            const labelJSON = label.toJSON(tokens);\n\n            return labelJSON;\n          }),\n          suppositionsJSON = this.suppositions.map((supposition) => {\n            const suppositionJSON = supposition.toJSON(tokens);\n\n            return suppositionJSON;\n          }),\n          consequenceJSON = this.consequence.toJSON(tokens),\n          labels = labelsJSON,  ///\n          suppositions = suppositionsJSON,  ///\n          consequence = consequenceJSON,  ///\n          json = {\n            kind,\n            labels,\n            suppositions,\n            consequence\n          };\n\n    return json;\n  }\n\n  static fromJSON(Class, json, releaseContext) {\n    let { labels } = json;\n\n    const labelsJSON = labels;  ///\n\n    labels = labelsJSON.map((labelJSON) => {\n      const json = labelJSON, ///\n            label = Label.fromJSON(json, releaseContext);\n\n      return label;\n    });\n\n    let { suppositions } = json;\n\n    const suppositionsJSON = suppositions;  ///\n\n    suppositions = suppositionsJSON.map((suppositionJSON) => {\n      const json = suppositionJSON, ///\n            supposition = Supposition.fromJSON(json, releaseContext);\n\n      return supposition;\n    });\n\n    let { consequence } = json;\n\n    const consequenceJSON = consequence;  ///\n\n    json = consequenceJSON;  ///\n\n    consequence = Consequence.fromJSON(json, releaseContext);\n\n    return new Class(labels, suppositions, consequence);  ///\n  }\n\n  static fromLabelsSuppositionsAndConsequence(Class, labels, suppositions, consequence) { return new Class(labels, suppositions, consequence); }\n}\n\nfunction matchSupposition(supposition, proofSteps, substitutions) {\n  const proofStep = prune(proofSteps, (proofStep) => {\n    const subproofNode = proofStep.getSubproofNode(),\n          statementNode = proofStep.getStatementNode();\n\n    if (subproofNode !== null) {\n      const subProofMatches = supposition.matchSubproofNode(subproofNode, substitutions);\n\n      if (!subProofMatches) {  ///\n        return true;\n      }\n    }\n\n    if (statementNode !== null) {\n      const statementMatches = supposition.matchStatementNode(statementNode, substitutions);\n\n      if (!statementMatches) {  ///\n        return true;\n      }\n    }\n\n  }) || null;\n\n  const suppositionMatches = (proofStep !== null);\n\n  return suppositionMatches;\n}\n\nfunction matchSuppositions(supposition, proofSteps, substitutions) {\n  const suppositionsMatch = supposition.every((supposition) => {\n    const suppositionMatches = matchSupposition(supposition, proofSteps, substitutions);\n\n    if (suppositionMatches) {\n      return true;\n    }\n  });\n\n  return suppositionsMatch;\n}\n\nfunction matchConsequence(consequence, statementNode, substitutions) {\n  const nonTerminalNodeMatches = consequence.matchStatementNode(statementNode, substitutions),\n        consequenceMatches = nonTerminalNodeMatches; ///\n\n  return consequenceMatches;\n}\n\nfunction matchSuppositionsAndConsequence(suppositions, consequence, proofSteps, statementNode) {\n  let suppositionsMatchConsequence = false;\n\n  const substitutions = [],\n        suppositionsMatch = matchSuppositions(suppositions, proofSteps, substitutions);\n\n  if (suppositionsMatch) {\n    const consequenceMatches = matchConsequence(consequence, statementNode, substitutions);\n\n    suppositionsMatchConsequence = consequenceMatches;  ///\n  }\n\n  return suppositionsMatchConsequence;\n}\n"],"names":["AxiomLemmaTheoremConjecture","labels","suppositions","consequence","getLabels","getSuppositions","getConsequence","matchLabelName","labelName","matchesLabelName","some","label","name","labelMatchesName","matchName","matchStatement","statementNode","proofContext","statementNatches","suppositionsLength","length","substitutions","consequenceMatches","matchConsequence","proofSteps","getProofSteps","someSubArray","suppositionsMatchConsequence","matchSuppositionsAndConsequence","toJSON","tokens","kind","constructor","labelsJSON","map","labelJSON","suppositionsJSON","supposition","suppositionJSON","consequenceJSON","json","fromJSON","Class","releaseContext","Label","Supposition","Consequence","fromLabelsSuppositionsAndConsequence","matchSupposition","proofStep","prune","subproofNode","getSubproofNode","getStatementNode","subProofMatches","matchSubproofNode","statementMatches","matchStatementNode","suppositionMatches","matchSuppositions","suppositionsMatch","every","nonTerminalNodeMatches"],"mappings":"AAAA;;;;;;;eASqBA;;;0DAPH;gEACM;gEACA;qBAEF;;;;;;;;;;;;;;;;;;;;;;;;;AAGP,IAAA,AAAMA,4CAwHlB,AAxHY;aAAMA,4BACPC,MAAM,EAAEC,YAAY,EAAEC,WAAW;8BAD1BH;QAEjB,IAAI,CAACC,MAAM,GAAGA;QACd,IAAI,CAACC,YAAY,GAAGA;QACpB,IAAI,CAACC,WAAW,GAAGA;;iBAJFH;;YAOnBI,KAAAA;mBAAAA,SAAAA,YAAY;gBACV,OAAO,IAAI,CAACH,MAAM;YACpB;;;YAEAI,KAAAA;mBAAAA,SAAAA,kBAAkB;gBAChB,OAAO,IAAI,CAACH,YAAY;YAC1B;;;YAEAI,KAAAA;mBAAAA,SAAAA,iBAAiB;gBACf,OAAO,IAAI,CAACH,WAAW;YACzB;;;YAEAI,KAAAA;mBAAAA,SAAAA,eAAeC,SAAS,EAAE;gBACxB,IAAMC,mBAAmB,IAAI,CAACR,MAAM,CAACS,IAAI,CAAC,SAACC,OAAU;oBACnD,IAAMC,OAAOJ,WACPK,mBAAmBF,MAAMG,SAAS,CAACF;oBAEzC,IAAIC,kBAAkB;wBACpB,OAAO,IAAI;oBACb,CAAC;gBACH;gBAEA,OAAOJ;YACT;;;YAEAM,KAAAA;mBAAAA,SAAAA,eAAeC,aAAa,EAAEC,YAAY,EAAE;;gBAC1C,IAAIC;gBAEJ,IAAMC,qBAAqB,IAAI,CAACjB,YAAY,CAACkB,MAAM;gBAEnD,IAAID,uBAAuB,GAAG;oBAC5B,IAAME,gBAAgB,EAAE,EAClBC,qBAAqBC,iBAAiB,IAAI,CAACpB,WAAW,EAAEa,eAAeK;oBAE7EH,mBAAmBI,oBAAoB,GAAG;gBAC5C,OAAO;oBACL,IAAME,aAAaP,aAAaQ,aAAa;oBAE7CP,mBAAmBQ,IAAAA,mBAAY,EAACF,YAAYL,oBAAoB,SAACK,YAAe;wBAC9E,IAAMG,+BAA+BC,gCAAgC,MAAK1B,YAAY,EAAE,MAAKC,WAAW,EAAEqB,YAAYR;wBAEtH,IAAIW,8BAA8B;4BAChC,OAAO,IAAI;wBACb,CAAC;oBACH;gBACF,CAAC;gBAED,OAAOT;YACT;;;YAEAW,KAAAA;mBAAAA,SAAAA,OAAOC,MAAM,EAAE;gBACb,IAAM,AAAEC,OAAS,IAAI,CAACC,WAAW,CAAzBD,MACFE,aAAa,IAAI,CAAChC,MAAM,CAACiC,GAAG,CAAC,SAACvB,OAAU;oBACtC,IAAMwB,YAAYxB,MAAMkB,MAAM,CAACC;oBAE/B,OAAOK;gBACT,IACAC,mBAAmB,IAAI,CAAClC,YAAY,CAACgC,GAAG,CAAC,SAACG,aAAgB;oBACxD,IAAMC,kBAAkBD,YAAYR,MAAM,CAACC;oBAE3C,OAAOQ;gBACT,IACAC,kBAAkB,IAAI,CAACpC,WAAW,CAAC0B,MAAM,CAACC,SAC1C7B,SAASgC,YACT/B,eAAekC,kBACfjC,cAAcoC,iBACdC,OAAO;oBACLT,MAAAA;oBACA9B,QAAAA;oBACAC,cAAAA;oBACAC,aAAAA;gBACF;gBAEN,OAAOqC;YACT;;;;YAEOC,KAAAA;mBAAP,SAAOA,SAASC,KAAK,EAAEF,IAAI,EAAEG,cAAc,EAAE;gBAC3C,IAAI,AAAE1C,SAAWuC,KAAXvC;gBAEN,IAAMgC,aAAahC,QAAS,GAAG;gBAE/BA,SAASgC,WAAWC,GAAG,CAAC,SAACC,WAAc;oBACrC,IAAMK,SAAOL,WACPxB,QAAQiC,cAAK,CAACH,QAAQ,CAACD,QAAMG;oBAEnC,OAAOhC;gBACT;gBAEA,IAAI,AAAET,eAAiBsC,KAAjBtC;gBAEN,IAAMkC,mBAAmBlC,cAAe,GAAG;gBAE3CA,eAAekC,iBAAiBF,GAAG,CAAC,SAACI,iBAAoB;oBACvD,IAAME,SAAOF,iBACPD,cAAcQ,oBAAW,CAACJ,QAAQ,CAACD,QAAMG;oBAE/C,OAAON;gBACT;gBAEA,IAAI,AAAElC,cAAgBqC,KAAhBrC;gBAEN,IAAMoC,kBAAkBpC,aAAc,GAAG;gBAEzCqC,OAAOD,iBAAkB,GAAG;gBAE5BpC,cAAc2C,oBAAW,CAACL,QAAQ,CAACD,MAAMG;gBAEzC,OAAO,IAAID,MAAMzC,QAAQC,cAAcC,cAAe,GAAG;YAC3D;;;YAEO4C,KAAAA;mBAAP,SAAOA,qCAAqCL,KAAK,EAAEzC,MAAM,EAAEC,YAAY,EAAEC,WAAW,EAAE;gBAAE,OAAO,IAAIuC,MAAMzC,QAAQC,cAAcC;YAAc;;;WArH1HH;;AAwHrB,SAASgD,iBAAiBX,WAAW,EAAEb,UAAU,EAAEH,aAAa,EAAE;IAChE,IAAM4B,YAAYC,IAAAA,YAAK,EAAC1B,YAAY,SAACyB,WAAc;QACjD,IAAME,eAAeF,UAAUG,eAAe,IACxCpC,gBAAgBiC,UAAUI,gBAAgB;QAEhD,IAAIF,iBAAiB,IAAI,EAAE;YACzB,IAAMG,kBAAkBjB,YAAYkB,iBAAiB,CAACJ,cAAc9B;YAEpE,IAAI,CAACiC,iBAAiB;gBACpB,OAAO,IAAI;YACb,CAAC;QACH,CAAC;QAED,IAAItC,kBAAkB,IAAI,EAAE;YAC1B,IAAMwC,mBAAmBnB,YAAYoB,kBAAkB,CAACzC,eAAeK;YAEvE,IAAI,CAACmC,kBAAkB;gBACrB,OAAO,IAAI;YACb,CAAC;QACH,CAAC;IAEH,MAAM,IAAI;IAEV,IAAME,qBAAsBT,cAAc,IAAI;IAE9C,OAAOS;AACT;AAEA,SAASC,kBAAkBtB,WAAW,EAAEb,UAAU,EAAEH,aAAa,EAAE;IACjE,IAAMuC,oBAAoBvB,YAAYwB,KAAK,CAAC,SAACxB,aAAgB;QAC3D,IAAMqB,qBAAqBV,iBAAiBX,aAAab,YAAYH;QAErE,IAAIqC,oBAAoB;YACtB,OAAO,IAAI;QACb,CAAC;IACH;IAEA,OAAOE;AACT;AAEA,SAASrC,iBAAiBpB,WAAW,EAAEa,aAAa,EAAEK,aAAa,EAAE;IACnE,IAAMyC,yBAAyB3D,YAAYsD,kBAAkB,CAACzC,eAAeK,gBACvEC,qBAAqBwC,wBAAwB,GAAG;IAEtD,OAAOxC;AACT;AAEA,SAASM,gCAAgC1B,YAAY,EAAEC,WAAW,EAAEqB,UAAU,EAAER,aAAa,EAAE;IAC7F,IAAIW,+BAA+B,KAAK;IAExC,IAAMN,gBAAgB,EAAE,EAClBuC,oBAAoBD,kBAAkBzD,cAAcsB,YAAYH;IAEtE,IAAIuC,mBAAmB;QACrB,IAAMtC,qBAAqBC,iBAAiBpB,aAAaa,eAAeK;QAExEM,+BAA+BL,oBAAqB,GAAG;IACzD,CAAC;IAED,OAAOK;AACT"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../src/axiomLemmaTheoremConjecture.js"],"sourcesContent":["\"use strict\";\n\nimport Label from \"./label\";\nimport Supposition from \"./supposition\";\nimport Consequence from \"./consequence\";\n\nimport { prune } from \"./utilities/array\";\nimport { someSubArray } from \"./utilities/array\";\n\nexport default class AxiomLemmaTheoremConjecture {\n  constructor(labels, suppositions, consequence) {\n    this.labels = labels;\n    this.suppositions = suppositions;\n    this.consequence = consequence;\n  }\n\n  getLabels() {\n    return this.labels;\n  }\n\n  getSuppositions() {\n    return this.suppositions;\n  }\n\n  getConsequence() {\n    return this.consequence;\n  }\n\n  matchLabelName(labelName) {\n    const matchesLabelName = this.labels.some((label) => {\n      const name = labelName, ///\n            labelMatchesName = label.matchName(name);\n\n      if (labelMatchesName) {\n        return true;\n      }\n    });\n\n    return matchesLabelName;\n  }\n\n  matchStatement(statementNode, proofContext) {\n    let statementNatches;\n\n    const suppositionsLength = this.suppositions.length;\n\n    if (suppositionsLength === 0) {\n      const substitutions = [],\n            consequenceMatches = matchConsequence(this.consequence, statementNode, substitutions);\n\n      statementNatches = consequenceMatches; ///\n    } else {\n      const proofSteps = proofContext.getProofSteps();\n\n      statementNatches = someSubArray(proofSteps, suppositionsLength, (proofSteps) => {\n        const suppositionsMatchConsequence = matchSuppositionsAndConsequence(this.suppositions, this.consequence, proofSteps, statementNode);\n\n        if (suppositionsMatchConsequence) {\n          return true;\n        }\n      });\n    }\n\n    return statementNatches;\n  }\n\n  toJSON(tokens) {\n    const { kind } = this.constructor,\n          labelsJSON = this.labels.map((label) => {\n            const labelJSON = label.toJSON(tokens);\n\n            return labelJSON;\n          }),\n          suppositionsJSON = this.suppositions.map((supposition) => {\n            const suppositionJSON = supposition.toJSON(tokens);\n\n            return suppositionJSON;\n          }),\n          consequenceJSON = this.consequence.toJSON(tokens),\n          labels = labelsJSON,  ///\n          suppositions = suppositionsJSON,  ///\n          consequence = consequenceJSON,  ///\n          json = {\n            kind,\n            labels,\n            suppositions,\n            consequence\n          };\n\n    return json;\n  }\n\n  static fromJSON(Class, json, lexer, parser) {\n    let { labels } = json;\n\n    const labelsJSON = labels;  ///\n\n    labels = labelsJSON.map((labelJSON) => {\n      const json = labelJSON, ///\n            label = Label.fromJSON(json, lexer, parser);\n\n      return label;\n    });\n\n    let { suppositions } = json;\n\n    const suppositionsJSON = suppositions;  ///\n\n    suppositions = suppositionsJSON.map((suppositionJSON) => {\n      const json = suppositionJSON, ///\n            supposition = Supposition.fromJSON(json, lexer, parser);\n\n      return supposition;\n    });\n\n    let { consequence } = json;\n\n    const consequenceJSON = consequence;  ///\n\n    json = consequenceJSON;  ///\n\n    consequence = Consequence.fromJSON(json, lexer, parser);\n\n    return new Class(labels, suppositions, consequence);  ///\n  }\n\n  static fromLabelsSuppositionsAndConsequence(Class, labels, suppositions, consequence) { return new Class(labels, suppositions, consequence); }\n}\n\nfunction matchSupposition(supposition, proofSteps, substitutions) {\n  const proofStep = prune(proofSteps, (proofStep) => {\n    const subproofNode = proofStep.getSubproofNode(),\n          statementNode = proofStep.getStatementNode();\n\n    if (subproofNode !== null) {\n      const subProofMatches = supposition.matchSubproofNode(subproofNode, substitutions);\n\n      if (!subProofMatches) {  ///\n        return true;\n      }\n    }\n\n    if (statementNode !== null) {\n      const statementMatches = supposition.matchStatementNode(statementNode, substitutions);\n\n      if (!statementMatches) {  ///\n        return true;\n      }\n    }\n\n  }) || null;\n\n  const suppositionMatches = (proofStep !== null);\n\n  return suppositionMatches;\n}\n\nfunction matchSuppositions(supposition, proofSteps, substitutions) {\n  const suppositionsMatch = supposition.every((supposition) => {\n    const suppositionMatches = matchSupposition(supposition, proofSteps, substitutions);\n\n    if (suppositionMatches) {\n      return true;\n    }\n  });\n\n  return suppositionsMatch;\n}\n\nfunction matchConsequence(consequence, statementNode, substitutions) {\n  const nonTerminalNodeMatches = consequence.matchStatementNode(statementNode, substitutions),\n        consequenceMatches = nonTerminalNodeMatches; ///\n\n  return consequenceMatches;\n}\n\nfunction matchSuppositionsAndConsequence(suppositions, consequence, proofSteps, statementNode) {\n  let suppositionsMatchConsequence = false;\n\n  const substitutions = [],\n        suppositionsMatch = matchSuppositions(suppositions, proofSteps, substitutions);\n\n  if (suppositionsMatch) {\n    const consequenceMatches = matchConsequence(consequence, statementNode, substitutions);\n\n    suppositionsMatchConsequence = consequenceMatches;  ///\n  }\n\n  return suppositionsMatchConsequence;\n}\n"],"names":["AxiomLemmaTheoremConjecture","labels","suppositions","consequence","getLabels","getSuppositions","getConsequence","matchLabelName","labelName","matchesLabelName","some","label","name","labelMatchesName","matchName","matchStatement","statementNode","proofContext","statementNatches","suppositionsLength","length","substitutions","consequenceMatches","matchConsequence","proofSteps","getProofSteps","someSubArray","suppositionsMatchConsequence","matchSuppositionsAndConsequence","toJSON","tokens","kind","constructor","labelsJSON","map","labelJSON","suppositionsJSON","supposition","suppositionJSON","consequenceJSON","json","fromJSON","Class","lexer","parser","Label","Supposition","Consequence","fromLabelsSuppositionsAndConsequence","matchSupposition","proofStep","prune","subproofNode","getSubproofNode","getStatementNode","subProofMatches","matchSubproofNode","statementMatches","matchStatementNode","suppositionMatches","matchSuppositions","suppositionsMatch","every","nonTerminalNodeMatches"],"mappings":"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"}

package/lib/combinator.js

@@ -10,6 +10,7 @@ Object.defineProperty(exports, "default", {
 });
 var _string = require("./utilities/string");
 var _kinds = require("./kinds");
+var _node = require("./utilities/node");
 function _classCallCheck(instance, Constructor) {
     if (!(instance instanceof Constructor)) {
         throw new TypeError("Cannot call a class as a function");
@@ -63,8 +64,8 @@ var Combinator = /*#__PURE__*/ function() {
     ], [
         {
             key: "fromJSON",
-            value: function fromJSON(json, releaseContext) {
-                var statement = json.statement, statementString = statement, statementNode = (0, _string.statementNodeFromStatementString)(statementString, releaseContext), combinator = new Combinator(statementNode);
+            value: function fromJSON(json, lexer, parser) {
+                var statement = json.statement, statementString = statement, statementNode = (0, _node.statementNodeFromStatementString)(statementString, lexer, parser), combinator = new Combinator(statementNode);
                 return combinator;
             }
         },
@@ -79,4 +80,4 @@ var Combinator = /*#__PURE__*/ function() {
     return Combinator;
 }();
 
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy9jb21iaW5hdG9yLmpzIiwiPDxqc3gtY29uZmlnLXByYWdtYS5qcz4+Il0sInNvdXJjZXNDb250ZW50IjpbIlwidXNlIHN0cmljdFwiO1xuXG5pbXBvcnQgeyBub2RlQXNTdHJpbmcgfSBmcm9tIFwiLi91dGlsaXRpZXMvc3RyaW5nXCI7XG5pbXBvcnQgeyBDT01CSU5BVE9SX0tJTkQgfSBmcm9tIFwiLi9raW5kc1wiO1xuaW1wb3J0IHsgc3RhdGVtZW50Tm9kZUZyb21TdGF0ZW1lbnRTdHJpbmcgfSBmcm9tIFwiLi91dGlsaXRpZXMvc3RyaW5nXCI7XG5cbmV4cG9ydCBkZWZhdWx0IGNsYXNzIENvbWJpbmF0b3Ige1xuICBjb25zdHJ1Y3RvcihzdGF0ZW1lbnROb2RlKSB7XG4gICAgdGhpcy5zdGF0ZW1lbnROb2RlID0gc3RhdGVtZW50Tm9kZTtcbiAgfVxuXG4gIGdldFN0YXRlbWVudE5vZGUoKSB7XG4gICAgcmV0dXJuIHRoaXMuc3RhdGVtZW50Tm9kZTtcbiAgfVxuXG4gIGFzU3RyaW5nKHRva2Vucykge1xuICAgIGxldCBzdHJpbmc7XG5cbiAgICBjb25zdCBzdGF0ZW1lbnRTdHJpbmcgPSBub2RlQXNTdHJpbmcodGhpcy5zdGF0ZW1lbnROb2RlLCB0b2tlbnMpO1xuXG4gICAgc3RyaW5nID0gYCR7c3RhdGVtZW50U3RyaW5nfWA7XG5cbiAgICByZXR1cm4gc3RyaW5nO1xuICB9XG5cbiAgdG9KU09OKHRva2Vucykge1xuICAgIGNvbnN0IHN0YXRlbWVudFN0cmluZyA9IG5vZGVBc1N0cmluZyh0aGlzLnN0YXRlbWVudE5vZGUsIHRva2VucyksXG4gICAgICAgICAga2luZCA9IENPTUJJTkFUT1JfS0lORCxcbiAgICAgICAgICBzdGF0ZW1lbnQgPSBzdGF0ZW1lbnRTdHJpbmcsICAvLy9cbiAgICAgICAgICBqc29uID0ge1xuICAgICAgICAgICAga2luZCxcbiAgICAgICAgICAgIHN0YXRlbWVudFxuICAgICAgICAgIH07XG5cbiAgICByZXR1cm4ganNvbjtcbiAgfVxuXG4gIHN0YXRpYyBmcm9tSlNPTihqc29uLCByZWxlYXNlQ29udGV4dCkge1xuICAgIGNvbnN0IHsgc3RhdGVtZW50IH0gPSBqc29uLFxuICAgICAgICAgIHN0YXRlbWVudFN0cmluZyA9IHN0YXRlbWVudCwgIC8vL1xuICAgICAgICAgIHN0YXRlbWVudE5vZGUgPSBzdGF0ZW1lbnROb2RlRnJvbVN0YXRlbWVudFN0cmluZyhzdGF0ZW1lbnRTdHJpbmcsIHJlbGVhc2VDb250ZXh0KSxcbiAgICAgICAgICBjb21iaW5hdG9yID0gbmV3IENvbWJpbmF0b3Ioc3RhdGVtZW50Tm9kZSk7XG5cbiAgICByZXR1cm4gY29tYmluYXRvcjtcbiAgfVxuXG4gIHN0YXRpYyBmcm9tU3RhdGVtZW50Tm9kZShzdGF0ZW1lbnROb2RlKSB7XG4gICAgY29uc3QgY29tYmluYXRvciA9IG5ldyBDb21iaW5hdG9yKHN0YXRlbWVudE5vZGUpO1xuXG4gICAgcmV0dXJuIGNvbWJpbmF0b3I7XG4gIH1cbn1cbiIsIlJlYWN0LmNyZWF0ZUVsZW1lbnQiXSwibmFtZXMiOlsiQ29tYmluYXRvciIsInN0YXRlbWVudE5vZGUiLCJnZXRTdGF0ZW1lbnROb2RlIiwiYXNTdHJpbmciLCJ0b2tlbnMiLCJzdHJpbmciLCJzdGF0ZW1lbnRTdHJpbmciLCJub2RlQXNTdHJpbmciLCJ0b0pTT04iLCJraW5kIiwiQ09NQklOQVRPUl9LSU5EIiwic3RhdGVtZW50IiwianNvbiIsImZyb21KU09OIiwicmVsZWFzZUNvbnRleHQiLCJzdGF0ZW1lbnROb2RlRnJvbVN0YXRlbWVudFN0cmluZyIsImNvbWJpbmF0b3IiLCJmcm9tU3RhdGVtZW50Tm9kZSJdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7Ozs7ZUFNcUJBOzs7c0JBSlE7cUJBQ0c7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBR2pCLElBQUEsQUFBTUEsMkJBQU47YUFBTUEsV0FDUEMsYUFBYTs4QkFETkQ7UUFFakIsSUFBSSxDQUFDQyxhQUFhLEdBQUdBOztpQkFGSkQ7O1lBS25CRSxLQUFBQTttQkFBQUEsU0FBQUEsbUJBQW1CO2dCQUNqQixPQUFPLElBQUksQ0FBQ0QsYUFBYTtZQUMzQjs7O1lBRUFFLEtBQUFBO21CQUFBQSxTQUFBQSxTQUFTQyxNQUFNLEVBQUU7Z0JBQ2YsSUFBSUM7Z0JBRUosSUFBTUMsa0JBQWtCQyxJQUFBQSxvQkFBWSxFQUFDLElBQUksQ0FBQ04sYUFBYSxFQUFFRztnQkFFekRDLFNBQVMsQUFBQyxHQUFrQixPQUFoQkM7Z0JBRVosT0FBT0Q7WUFDVDs7O1lBRUFHLEtBQUFBO21CQUFBQSxTQUFBQSxPQUFPSixNQUFNLEVBQUU7Z0JBQ2IsSUFBTUUsa0JBQWtCQyxJQUFBQSxvQkFBWSxFQUFDLElBQUksQ0FBQ04sYUFBYSxFQUFFRyxTQUNuREssT0FBT0Msc0JBQWUsRUFDdEJDLFlBQVlMLGlCQUNaTSxPQUFPO29CQUNMSCxNQUFBQTtvQkFDQUUsV0FBQUE7Z0JBQ0Y7Z0JBRU4sT0FBT0M7WUFDVDs7OztZQUVPQyxLQUFBQTttQkFBUCxTQUFPQSxTQUFTRCxJQUFJLEVBQUVFLGNBQWMsRUFBRTtnQkFDcEMsSUFBTSxBQUFFSCxZQUFjQyxLQUFkRCxXQUNGTCxrQkFBa0JLLFdBQ2xCVixnQkFBZ0JjLElBQUFBLHdDQUFnQyxFQUFDVCxpQkFBaUJRLGlCQUNsRUUsYUFBYSxJQW5DRmhCLFdBbUNpQkM7Z0JBRWxDLE9BQU9lO1lBQ1Q7OztZQUVPQyxLQUFBQTttQkFBUCxTQUFPQSxrQkFBa0JoQixhQUFhLEVBQUU7Z0JBQ3RDLElBQU1lLGFBQWEsSUF6Q0ZoQixXQXlDaUJDO2dCQUVsQyxPQUFPZTtZQUNUOzs7V0E1Q21CaEIifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy9jb21iaW5hdG9yLmpzIiwiPDxqc3gtY29uZmlnLXByYWdtYS5qcz4+Il0sInNvdXJjZXNDb250ZW50IjpbIlwidXNlIHN0cmljdFwiO1xuXG5pbXBvcnQgeyBub2RlQXNTdHJpbmcgfSBmcm9tIFwiLi91dGlsaXRpZXMvc3RyaW5nXCI7XG5pbXBvcnQgeyBDT01CSU5BVE9SX0tJTkQgfSBmcm9tIFwiLi9raW5kc1wiO1xuaW1wb3J0IHsgc3RhdGVtZW50Tm9kZUZyb21TdGF0ZW1lbnRTdHJpbmcgfSBmcm9tIFwiLi91dGlsaXRpZXMvbm9kZVwiO1xuXG5leHBvcnQgZGVmYXVsdCBjbGFzcyBDb21iaW5hdG9yIHtcbiAgY29uc3RydWN0b3Ioc3RhdGVtZW50Tm9kZSkge1xuICAgIHRoaXMuc3RhdGVtZW50Tm9kZSA9IHN0YXRlbWVudE5vZGU7XG4gIH1cblxuICBnZXRTdGF0ZW1lbnROb2RlKCkge1xuICAgIHJldHVybiB0aGlzLnN0YXRlbWVudE5vZGU7XG4gIH1cblxuICBhc1N0cmluZyh0b2tlbnMpIHtcbiAgICBsZXQgc3RyaW5nO1xuXG4gICAgY29uc3Qgc3RhdGVtZW50U3RyaW5nID0gbm9kZUFzU3RyaW5nKHRoaXMuc3RhdGVtZW50Tm9kZSwgdG9rZW5zKTtcblxuICAgIHN0cmluZyA9IGAke3N0YXRlbWVudFN0cmluZ31gO1xuXG4gICAgcmV0dXJuIHN0cmluZztcbiAgfVxuXG4gIHRvSlNPTih0b2tlbnMpIHtcbiAgICBjb25zdCBzdGF0ZW1lbnRTdHJpbmcgPSBub2RlQXNTdHJpbmcodGhpcy5zdGF0ZW1lbnROb2RlLCB0b2tlbnMpLFxuICAgICAgICAgIGtpbmQgPSBDT01CSU5BVE9SX0tJTkQsXG4gICAgICAgICAgc3RhdGVtZW50ID0gc3RhdGVtZW50U3RyaW5nLCAgLy8vXG4gICAgICAgICAganNvbiA9IHtcbiAgICAgICAgICAgIGtpbmQsXG4gICAgICAgICAgICBzdGF0ZW1lbnRcbiAgICAgICAgICB9O1xuXG4gICAgcmV0dXJuIGpzb247XG4gIH1cblxuICBzdGF0aWMgZnJvbUpTT04oanNvbiwgbGV4ZXIsIHBhcnNlcikge1xuICAgIGNvbnN0IHsgc3RhdGVtZW50IH0gPSBqc29uLFxuICAgICAgICAgIHN0YXRlbWVudFN0cmluZyA9IHN0YXRlbWVudCwgIC8vL1xuICAgICAgICAgIHN0YXRlbWVudE5vZGUgPSBzdGF0ZW1lbnROb2RlRnJvbVN0YXRlbWVudFN0cmluZyhzdGF0ZW1lbnRTdHJpbmcsIGxleGVyLCBwYXJzZXIpLFxuICAgICAgICAgIGNvbWJpbmF0b3IgPSBuZXcgQ29tYmluYXRvcihzdGF0ZW1lbnROb2RlKTtcblxuICAgIHJldHVybiBjb21iaW5hdG9yO1xuICB9XG5cbiAgc3RhdGljIGZyb21TdGF0ZW1lbnROb2RlKHN0YXRlbWVudE5vZGUpIHtcbiAgICBjb25zdCBjb21iaW5hdG9yID0gbmV3IENvbWJpbmF0b3Ioc3RhdGVtZW50Tm9kZSk7XG5cbiAgICByZXR1cm4gY29tYmluYXRvcjtcbiAgfVxufVxuIiwiUmVhY3QuY3JlYXRlRWxlbWVudCJdLCJuYW1lcyI6WyJDb21iaW5hdG9yIiwic3RhdGVtZW50Tm9kZSIsImdldFN0YXRlbWVudE5vZGUiLCJhc1N0cmluZyIsInRva2VucyIsInN0cmluZyIsInN0YXRlbWVudFN0cmluZyIsIm5vZGVBc1N0cmluZyIsInRvSlNPTiIsImtpbmQiLCJDT01CSU5BVE9SX0tJTkQiLCJzdGF0ZW1lbnQiLCJqc29uIiwiZnJvbUpTT04iLCJsZXhlciIsInBhcnNlciIsInN0YXRlbWVudE5vZGVGcm9tU3RhdGVtZW50U3RyaW5nIiwiY29tYmluYXRvciIsImZyb21TdGF0ZW1lbnROb2RlIl0sIm1hcHBpbmdzIjoiQUFBQTs7Ozs7OztlQU1xQkE7OztzQkFKUTtxQkFDRztvQkFDaUI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBRWxDLElBQUEsQUFBTUEsMkJBQU47YUFBTUEsV0FDUEMsYUFBYTs4QkFETkQ7UUFFakIsSUFBSSxDQUFDQyxhQUFhLEdBQUdBOztpQkFGSkQ7O1lBS25CRSxLQUFBQTttQkFBQUEsU0FBQUEsbUJBQW1CO2dCQUNqQixPQUFPLElBQUksQ0FBQ0QsYUFBYTtZQUMzQjs7O1lBRUFFLEtBQUFBO21CQUFBQSxTQUFBQSxTQUFTQyxNQUFNLEVBQUU7Z0JBQ2YsSUFBSUM7Z0JBRUosSUFBTUMsa0JBQWtCQyxJQUFBQSxvQkFBWSxFQUFDLElBQUksQ0FBQ04sYUFBYSxFQUFFRztnQkFFekRDLFNBQVMsQUFBQyxHQUFrQixPQUFoQkM7Z0JBRVosT0FBT0Q7WUFDVDs7O1lBRUFHLEtBQUFBO21CQUFBQSxTQUFBQSxPQUFPSixNQUFNLEVBQUU7Z0JBQ2IsSUFBTUUsa0JBQWtCQyxJQUFBQSxvQkFBWSxFQUFDLElBQUksQ0FBQ04sYUFBYSxFQUFFRyxTQUNuREssT0FBT0Msc0JBQWUsRUFDdEJDLFlBQVlMLGlCQUNaTSxPQUFPO29CQUNMSCxNQUFBQTtvQkFDQUUsV0FBQUE7Z0JBQ0Y7Z0JBRU4sT0FBT0M7WUFDVDs7OztZQUVPQyxLQUFBQTttQkFBUCxTQUFPQSxTQUFTRCxJQUFJLEVBQUVFLEtBQUssRUFBRUMsTUFBTSxFQUFFO2dCQUNuQyxJQUFNLEFBQUVKLFlBQWNDLEtBQWRELFdBQ0ZMLGtCQUFrQkssV0FDbEJWLGdCQUFnQmUsSUFBQUEsc0NBQWdDLEVBQUNWLGlCQUFpQlEsT0FBT0MsU0FDekVFLGFBQWEsSUFuQ0ZqQixXQW1DaUJDO2dCQUVsQyxPQUFPZ0I7WUFDVDs7O1lBRU9DLEtBQUFBO21CQUFQLFNBQU9BLGtCQUFrQmpCLGFBQWEsRUFBRTtnQkFDdEMsSUFBTWdCLGFBQWEsSUF6Q0ZqQixXQXlDaUJDO2dCQUVsQyxPQUFPZ0I7WUFDVDs7O1dBNUNtQmpCIn0=

package/lib/conclusion.js

@@ -9,8 +9,9 @@ Object.defineProperty(exports, "default", {
     }
 });
 var _string = require("./utilities/string");
-var _conclusion = require("./matcher/statementForMetavariable/conclusion");
-var _conclusion1 = require("./matcher/metastatementForMetavariable/conclusion");
+var _node = require("./utilities/node");
+var _conclusion = require("./verifier/statementForMetavariable/conclusion");
+var _conclusion1 = require("./verifier/metastatementForMetavariable/conclusion");
 function _classCallCheck(instance, Constructor) {
     if (!(instance instanceof Constructor)) {
         throw new TypeError("Cannot call a class as a function");
@@ -45,14 +46,14 @@ var Conclusion = /*#__PURE__*/ function() {
         {
             key: "matchStatementNode",
             value: function matchStatementNode(statementNode, substitutions) {
-                var nonTerminalNodeA = this.metastatementNode, nonTerminalNodeB = statementNode, nonTerminalNodeMatches = _conclusion.conclusionStatementForMetavariableMatcher.matchNonTerminalNode(nonTerminalNodeA, nonTerminalNodeB, substitutions), statementNodeMatches = nonTerminalNodeMatches; ///
+                var nonTerminalNodeA = this.metastatementNode, nonTerminalNodeB = statementNode, nonTerminalNodeMatches = _conclusion.conclusionStatementForMetavariableVerifier.matchNonTerminalNode(nonTerminalNodeA, nonTerminalNodeB, substitutions), statementNodeMatches = nonTerminalNodeMatches; ///
                 return statementNodeMatches;
             }
         },
         {
             key: "matchMetastatementNode",
             value: function matchMetastatementNode(metastatementNode, substitutions) {
-                var nonTerminalNodeA = this.metastatementNode, nonTerminalNodeB = metastatementNode, nonTerminalNodeMatches = _conclusion1.conclusionMetastatementForMetavariableMatcher.matchNonTerminalNode(nonTerminalNodeA, nonTerminalNodeB, substitutions), metastatementNodeMatches = nonTerminalNodeMatches; ///
+                var nonTerminalNodeA = this.metastatementNode, nonTerminalNodeB = metastatementNode, nonTerminalNodeMatches = _conclusion1.conclusionMetastatementForMetavariableVerifier.matchNonTerminalNode(nonTerminalNodeA, nonTerminalNodeB, substitutions), metastatementNodeMatches = nonTerminalNodeMatches; ///
                 return metastatementNodeMatches;
             }
         },
@@ -68,8 +69,8 @@ var Conclusion = /*#__PURE__*/ function() {
     ], [
         {
             key: "fromJSON",
-            value: function fromJSON(json, releaseContext) {
-                var metastatement = json.metastatement, metastatementString = metastatement, metastatementNode = (0, _string.metastatementNodeFromMetastatementString)(metastatementString, releaseContext), conclusion = new Conclusion(metastatementNode);
+            value: function fromJSON(json, lexer, parser) {
+                var metastatement = json.metastatement, metastatementString = metastatement, metastatementNode = (0, _node.metastatementNodeFromMetastatementString)(metastatementString, lexer, parser), conclusion = new Conclusion(metastatementNode);
                 return conclusion;
             }
         },
@@ -84,4 +85,4 @@ var Conclusion = /*#__PURE__*/ function() {
     return Conclusion;
 }();
 
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy9jb25jbHVzaW9uLmpzIiwiPDxqc3gtY29uZmlnLXByYWdtYS5qcz4+Il0sInNvdXJjZXNDb250ZW50IjpbIlwidXNlIHN0cmljdFwiO1xuXG5pbXBvcnQgeyBub2RlQXNTdHJpbmcgfSBmcm9tIFwiLi91dGlsaXRpZXMvc3RyaW5nXCI7XG5pbXBvcnQgeyBtZXRhc3RhdGVtZW50Tm9kZUZyb21NZXRhc3RhdGVtZW50U3RyaW5nIH0gZnJvbSBcIi4vdXRpbGl0aWVzL3N0cmluZ1wiO1xuaW1wb3J0IHsgY29uY2x1c2lvblN0YXRlbWVudEZvck1ldGF2YXJpYWJsZU1hdGNoZXIgfSBmcm9tIFwiLi9tYXRjaGVyL3N0YXRlbWVudEZvck1ldGF2YXJpYWJsZS9jb25jbHVzaW9uXCI7XG5pbXBvcnQgeyBjb25jbHVzaW9uTWV0YXN0YXRlbWVudEZvck1ldGF2YXJpYWJsZU1hdGNoZXIgfSBmcm9tIFwiLi9tYXRjaGVyL21ldGFzdGF0ZW1lbnRGb3JNZXRhdmFyaWFibGUvY29uY2x1c2lvblwiO1xuXG5leHBvcnQgZGVmYXVsdCBjbGFzcyBDb25jbHVzaW9uIHtcbiAgY29uc3RydWN0b3IobWV0YXN0YXRlbWVudE5vZGUpIHtcbiAgICB0aGlzLm1ldGFzdGF0ZW1lbnROb2RlID0gbWV0YXN0YXRlbWVudE5vZGU7XG4gIH1cblxuICBnZXRNZXRhc3RhdGVtZW50Tm9kZSgpIHtcbiAgICByZXR1cm4gdGhpcy5tZXRhc3RhdGVtZW50Tm9kZTtcbiAgfVxuXG4gIG1hdGNoU3RhdGVtZW50Tm9kZShzdGF0ZW1lbnROb2RlLCBzdWJzdGl0dXRpb25zKSB7XG4gICAgY29uc3Qgbm9uVGVybWluYWxOb2RlQSA9IHRoaXMubWV0YXN0YXRlbWVudE5vZGUsICAvLy9cbiAgICAgICAgICBub25UZXJtaW5hbE5vZGVCID0gc3RhdGVtZW50Tm9kZSwgIC8vL1xuICAgICAgICAgIG5vblRlcm1pbmFsTm9kZU1hdGNoZXMgPSBjb25jbHVzaW9uU3RhdGVtZW50Rm9yTWV0YXZhcmlhYmxlTWF0Y2hlci5tYXRjaE5vblRlcm1pbmFsTm9kZShub25UZXJtaW5hbE5vZGVBLCBub25UZXJtaW5hbE5vZGVCLCBzdWJzdGl0dXRpb25zKSxcbiAgICAgICAgICBzdGF0ZW1lbnROb2RlTWF0Y2hlcyA9IG5vblRlcm1pbmFsTm9kZU1hdGNoZXM7IC8vL1xuXG4gICAgcmV0dXJuIHN0YXRlbWVudE5vZGVNYXRjaGVzO1xuICB9XG5cbiAgbWF0Y2hNZXRhc3RhdGVtZW50Tm9kZShtZXRhc3RhdGVtZW50Tm9kZSwgc3Vic3RpdHV0aW9ucykge1xuICAgIGNvbnN0IG5vblRlcm1pbmFsTm9kZUEgPSB0aGlzLm1ldGFzdGF0ZW1lbnROb2RlLCAgLy8vXG4gICAgICAgICAgbm9uVGVybWluYWxOb2RlQiA9IG1ldGFzdGF0ZW1lbnROb2RlLCAgLy8vXG4gICAgICAgICAgbm9uVGVybWluYWxOb2RlTWF0Y2hlcyA9IGNvbmNsdXNpb25NZXRhc3RhdGVtZW50Rm9yTWV0YXZhcmlhYmxlTWF0Y2hlci5tYXRjaE5vblRlcm1pbmFsTm9kZShub25UZXJtaW5hbE5vZGVBLCBub25UZXJtaW5hbE5vZGVCLCBzdWJzdGl0dXRpb25zKSxcbiAgICAgICAgICBtZXRhc3RhdGVtZW50Tm9kZU1hdGNoZXMgPSBub25UZXJtaW5hbE5vZGVNYXRjaGVzOyAvLy9cblxuICAgIHJldHVybiBtZXRhc3RhdGVtZW50Tm9kZU1hdGNoZXM7XG4gIH1cblxuICB0b0pTT04odG9rZW5zKSB7XG4gICAgY29uc3QgbWV0YXN0YXRlbWVudFN0cmluZyA9IG5vZGVBc1N0cmluZyh0aGlzLm1ldGFzdGF0ZW1lbnROb2RlLCB0b2tlbnMpLFxuICAgICAgICAgIG1ldGFzdGF0ZW1lbnQgPSBtZXRhc3RhdGVtZW50U3RyaW5nLCAgLy8vXG4gICAgICAgICAganNvbiA9IHtcbiAgICAgICAgICAgIG1ldGFzdGF0ZW1lbnRcbiAgICAgICAgICB9O1xuXG4gICAgcmV0dXJuIGpzb247XG4gIH1cblxuICBzdGF0aWMgZnJvbUpTT04oanNvbiwgcmVsZWFzZUNvbnRleHQpIHtcbiAgICBjb25zdCB7IG1ldGFzdGF0ZW1lbnQgfSA9IGpzb24sXG4gICAgICAgICAgbWV0YXN0YXRlbWVudFN0cmluZyA9IG1ldGFzdGF0ZW1lbnQsICAvLy9cbiAgICAgICAgICBtZXRhc3RhdGVtZW50Tm9kZSA9IG1ldGFzdGF0ZW1lbnROb2RlRnJvbU1ldGFzdGF0ZW1lbnRTdHJpbmcobWV0YXN0YXRlbWVudFN0cmluZywgcmVsZWFzZUNvbnRleHQpLFxuICAgICAgICAgIGNvbmNsdXNpb24gPSBuZXcgQ29uY2x1c2lvbihtZXRhc3RhdGVtZW50Tm9kZSk7XG5cbiAgICByZXR1cm4gY29uY2x1c2lvbjtcbiAgfVxuXG4gIHN0YXRpYyBmcm9tTWV0YXN0YXRlbWVudE5vZGUobWV0YXN0YXRlbWVudE5vZGUpIHtcbiAgICBjb25zdCBjb25jbHVzaW9uID0gbmV3IENvbmNsdXNpb24obWV0YXN0YXRlbWVudE5vZGUpO1xuXG4gICAgcmV0dXJuIGNvbmNsdXNpb247XG4gIH1cbn1cbiIsIlJlYWN0LmNyZWF0ZUVsZW1lbnQiXSwibmFtZXMiOlsiQ29uY2x1c2lvbiIsIm1ldGFzdGF0ZW1lbnROb2RlIiwiZ2V0TWV0YXN0YXRlbWVudE5vZGUiLCJtYXRjaFN0YXRlbWVudE5vZGUiLCJzdGF0ZW1lbnROb2RlIiwic3Vic3RpdHV0aW9ucyIsIm5vblRlcm1pbmFsTm9kZUEiLCJub25UZXJtaW5hbE5vZGVCIiwibm9uVGVybWluYWxOb2RlTWF0Y2hlcyIsImNvbmNsdXNpb25TdGF0ZW1lbnRGb3JNZXRhdmFyaWFibGVNYXRjaGVyIiwibWF0Y2hOb25UZXJtaW5hbE5vZGUiLCJzdGF0ZW1lbnROb2RlTWF0Y2hlcyIsIm1hdGNoTWV0YXN0YXRlbWVudE5vZGUiLCJjb25jbHVzaW9uTWV0YXN0YXRlbWVudEZvck1ldGF2YXJpYWJsZU1hdGNoZXIiLCJtZXRhc3RhdGVtZW50Tm9kZU1hdGNoZXMiLCJ0b0pTT04iLCJ0b2tlbnMiLCJtZXRhc3RhdGVtZW50U3RyaW5nIiwibm9kZUFzU3RyaW5nIiwibWV0YXN0YXRlbWVudCIsImpzb24iLCJmcm9tSlNPTiIsInJlbGVhc2VDb250ZXh0IiwibWV0YXN0YXRlbWVudE5vZGVGcm9tTWV0YXN0YXRlbWVudFN0cmluZyIsImNvbmNsdXNpb24iLCJmcm9tTWV0YXN0YXRlbWVudE5vZGUiXSwibWFwcGluZ3MiOiJBQUFBOzs7Ozs7O2VBT3FCQTs7O3NCQUxROzBCQUU2QjsyQkFDSTs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFFL0MsSUFBQSxBQUFNQSwyQkFBTjthQUFNQSxXQUNQQyxpQkFBaUI7OEJBRFZEO1FBRWpCLElBQUksQ0FBQ0MsaUJBQWlCLEdBQUdBOztpQkFGUkQ7O1lBS25CRSxLQUFBQTttQkFBQUEsU0FBQUEsdUJBQXVCO2dCQUNyQixPQUFPLElBQUksQ0FBQ0QsaUJBQWlCO1lBQy9COzs7WUFFQUUsS0FBQUE7bUJBQUFBLFNBQUFBLG1CQUFtQkMsYUFBYSxFQUFFQyxhQUFhLEVBQUU7Z0JBQy9DLElBQU1DLG1CQUFtQixJQUFJLENBQUNMLGlCQUFpQixFQUN6Q00sbUJBQW1CSCxlQUNuQkkseUJBQXlCQyxxREFBeUMsQ0FBQ0Msb0JBQW9CLENBQUNKLGtCQUFrQkMsa0JBQWtCRixnQkFDNUhNLHVCQUF1Qkgsd0JBQXdCLEdBQUc7Z0JBRXhELE9BQU9HO1lBQ1Q7OztZQUVBQyxLQUFBQTttQkFBQUEsU0FBQUEsdUJBQXVCWCxpQkFBaUIsRUFBRUksYUFBYSxFQUFFO2dCQUN2RCxJQUFNQyxtQkFBbUIsSUFBSSxDQUFDTCxpQkFBaUIsRUFDekNNLG1CQUFtQk4sbUJBQ25CTyx5QkFBeUJLLDBEQUE2QyxDQUFDSCxvQkFBb0IsQ0FBQ0osa0JBQWtCQyxrQkFBa0JGLGdCQUNoSVMsMkJBQTJCTix3QkFBd0IsR0FBRztnQkFFNUQsT0FBT007WUFDVDs7O1lBRUFDLEtBQUFBO21CQUFBQSxTQUFBQSxPQUFPQyxNQUFNLEVBQUU7Z0JBQ2IsSUFBTUMsc0JBQXNCQyxJQUFBQSxvQkFBWSxFQUFDLElBQUksQ0FBQ2pCLGlCQUFpQixFQUFFZSxTQUMzREcsZ0JBQWdCRixxQkFDaEJHLE9BQU87b0JBQ0xELGVBQUFBO2dCQUNGO2dCQUVOLE9BQU9DO1lBQ1Q7Ozs7WUFFT0MsS0FBQUE7bUJBQVAsU0FBT0EsU0FBU0QsSUFBSSxFQUFFRSxjQUFjLEVBQUU7Z0JBQ3BDLElBQU0sQUFBRUgsZ0JBQWtCQyxLQUFsQkQsZUFDRkYsc0JBQXNCRSxlQUN0QmxCLG9CQUFvQnNCLElBQUFBLGdEQUF3QyxFQUFDTixxQkFBcUJLLGlCQUNsRkUsYUFBYSxJQXpDRnhCLFdBeUNpQkM7Z0JBRWxDLE9BQU91QjtZQUNUOzs7WUFFT0MsS0FBQUE7bUJBQVAsU0FBT0Esc0JBQXNCeEIsaUJBQWlCLEVBQUU7Z0JBQzlDLElBQU11QixhQUFhLElBL0NGeEIsV0ErQ2lCQztnQkFFbEMsT0FBT3VCO1lBQ1Q7OztXQWxEbUJ4QiJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy9jb25jbHVzaW9uLmpzIiwiPDxqc3gtY29uZmlnLXByYWdtYS5qcz4+Il0sInNvdXJjZXNDb250ZW50IjpbIlwidXNlIHN0cmljdFwiO1xuXG5pbXBvcnQgeyBub2RlQXNTdHJpbmcgfSBmcm9tIFwiLi91dGlsaXRpZXMvc3RyaW5nXCI7XG5pbXBvcnQgeyBtZXRhc3RhdGVtZW50Tm9kZUZyb21NZXRhc3RhdGVtZW50U3RyaW5nIH0gZnJvbSBcIi4vdXRpbGl0aWVzL25vZGVcIjtcbmltcG9ydCB7IGNvbmNsdXNpb25TdGF0ZW1lbnRGb3JNZXRhdmFyaWFibGVWZXJpZmllciB9IGZyb20gXCIuL3ZlcmlmaWVyL3N0YXRlbWVudEZvck1ldGF2YXJpYWJsZS9jb25jbHVzaW9uXCI7XG5pbXBvcnQgeyBjb25jbHVzaW9uTWV0YXN0YXRlbWVudEZvck1ldGF2YXJpYWJsZVZlcmlmaWVyIH0gZnJvbSBcIi4vdmVyaWZpZXIvbWV0YXN0YXRlbWVudEZvck1ldGF2YXJpYWJsZS9jb25jbHVzaW9uXCI7XG5cbmV4cG9ydCBkZWZhdWx0IGNsYXNzIENvbmNsdXNpb24ge1xuICBjb25zdHJ1Y3RvcihtZXRhc3RhdGVtZW50Tm9kZSkge1xuICAgIHRoaXMubWV0YXN0YXRlbWVudE5vZGUgPSBtZXRhc3RhdGVtZW50Tm9kZTtcbiAgfVxuXG4gIGdldE1ldGFzdGF0ZW1lbnROb2RlKCkge1xuICAgIHJldHVybiB0aGlzLm1ldGFzdGF0ZW1lbnROb2RlO1xuICB9XG5cbiAgbWF0Y2hTdGF0ZW1lbnROb2RlKHN0YXRlbWVudE5vZGUsIHN1YnN0aXR1dGlvbnMpIHtcbiAgICBjb25zdCBub25UZXJtaW5hbE5vZGVBID0gdGhpcy5tZXRhc3RhdGVtZW50Tm9kZSwgIC8vL1xuICAgICAgICAgIG5vblRlcm1pbmFsTm9kZUIgPSBzdGF0ZW1lbnROb2RlLCAgLy8vXG4gICAgICAgICAgbm9uVGVybWluYWxOb2RlTWF0Y2hlcyA9IGNvbmNsdXNpb25TdGF0ZW1lbnRGb3JNZXRhdmFyaWFibGVWZXJpZmllci5tYXRjaE5vblRlcm1pbmFsTm9kZShub25UZXJtaW5hbE5vZGVBLCBub25UZXJtaW5hbE5vZGVCLCBzdWJzdGl0dXRpb25zKSxcbiAgICAgICAgICBzdGF0ZW1lbnROb2RlTWF0Y2hlcyA9IG5vblRlcm1pbmFsTm9kZU1hdGNoZXM7IC8vL1xuXG4gICAgcmV0dXJuIHN0YXRlbWVudE5vZGVNYXRjaGVzO1xuICB9XG5cbiAgbWF0Y2hNZXRhc3RhdGVtZW50Tm9kZShtZXRhc3RhdGVtZW50Tm9kZSwgc3Vic3RpdHV0aW9ucykge1xuICAgIGNvbnN0IG5vblRlcm1pbmFsTm9kZUEgPSB0aGlzLm1ldGFzdGF0ZW1lbnROb2RlLCAgLy8vXG4gICAgICAgICAgbm9uVGVybWluYWxOb2RlQiA9IG1ldGFzdGF0ZW1lbnROb2RlLCAgLy8vXG4gICAgICAgICAgbm9uVGVybWluYWxOb2RlTWF0Y2hlcyA9IGNvbmNsdXNpb25NZXRhc3RhdGVtZW50Rm9yTWV0YXZhcmlhYmxlVmVyaWZpZXIubWF0Y2hOb25UZXJtaW5hbE5vZGUobm9uVGVybWluYWxOb2RlQSwgbm9uVGVybWluYWxOb2RlQiwgc3Vic3RpdHV0aW9ucyksXG4gICAgICAgICAgbWV0YXN0YXRlbWVudE5vZGVNYXRjaGVzID0gbm9uVGVybWluYWxOb2RlTWF0Y2hlczsgLy8vXG5cbiAgICByZXR1cm4gbWV0YXN0YXRlbWVudE5vZGVNYXRjaGVzO1xuICB9XG5cbiAgdG9KU09OKHRva2Vucykge1xuICAgIGNvbnN0IG1ldGFzdGF0ZW1lbnRTdHJpbmcgPSBub2RlQXNTdHJpbmcodGhpcy5tZXRhc3RhdGVtZW50Tm9kZSwgdG9rZW5zKSxcbiAgICAgICAgICBtZXRhc3RhdGVtZW50ID0gbWV0YXN0YXRlbWVudFN0cmluZywgIC8vL1xuICAgICAgICAgIGpzb24gPSB7XG4gICAgICAgICAgICBtZXRhc3RhdGVtZW50XG4gICAgICAgICAgfTtcblxuICAgIHJldHVybiBqc29uO1xuICB9XG5cbiAgc3RhdGljIGZyb21KU09OKGpzb24sIGxleGVyLCBwYXJzZXIpIHtcbiAgICBjb25zdCB7IG1ldGFzdGF0ZW1lbnQgfSA9IGpzb24sXG4gICAgICAgICAgbWV0YXN0YXRlbWVudFN0cmluZyA9IG1ldGFzdGF0ZW1lbnQsICAvLy9cbiAgICAgICAgICBtZXRhc3RhdGVtZW50Tm9kZSA9IG1ldGFzdGF0ZW1lbnROb2RlRnJvbU1ldGFzdGF0ZW1lbnRTdHJpbmcobWV0YXN0YXRlbWVudFN0cmluZywgbGV4ZXIsIHBhcnNlciksXG4gICAgICAgICAgY29uY2x1c2lvbiA9IG5ldyBDb25jbHVzaW9uKG1ldGFzdGF0ZW1lbnROb2RlKTtcblxuICAgIHJldHVybiBjb25jbHVzaW9uO1xuICB9XG5cbiAgc3RhdGljIGZyb21NZXRhc3RhdGVtZW50Tm9kZShtZXRhc3RhdGVtZW50Tm9kZSkge1xuICAgIGNvbnN0IGNvbmNsdXNpb24gPSBuZXcgQ29uY2x1c2lvbihtZXRhc3RhdGVtZW50Tm9kZSk7XG5cbiAgICByZXR1cm4gY29uY2x1c2lvbjtcbiAgfVxufVxuIiwiUmVhY3QuY3JlYXRlRWxlbWVudCJdLCJuYW1lcyI6WyJDb25jbHVzaW9uIiwibWV0YXN0YXRlbWVudE5vZGUiLCJnZXRNZXRhc3RhdGVtZW50Tm9kZSIsIm1hdGNoU3RhdGVtZW50Tm9kZSIsInN0YXRlbWVudE5vZGUiLCJzdWJzdGl0dXRpb25zIiwibm9uVGVybWluYWxOb2RlQSIsIm5vblRlcm1pbmFsTm9kZUIiLCJub25UZXJtaW5hbE5vZGVNYXRjaGVzIiwiY29uY2x1c2lvblN0YXRlbWVudEZvck1ldGF2YXJpYWJsZVZlcmlmaWVyIiwibWF0Y2hOb25UZXJtaW5hbE5vZGUiLCJzdGF0ZW1lbnROb2RlTWF0Y2hlcyIsIm1hdGNoTWV0YXN0YXRlbWVudE5vZGUiLCJjb25jbHVzaW9uTWV0YXN0YXRlbWVudEZvck1ldGF2YXJpYWJsZVZlcmlmaWVyIiwibWV0YXN0YXRlbWVudE5vZGVNYXRjaGVzIiwidG9KU09OIiwidG9rZW5zIiwibWV0YXN0YXRlbWVudFN0cmluZyIsIm5vZGVBc1N0cmluZyIsIm1ldGFzdGF0ZW1lbnQiLCJqc29uIiwiZnJvbUpTT04iLCJsZXhlciIsInBhcnNlciIsIm1ldGFzdGF0ZW1lbnROb2RlRnJvbU1ldGFzdGF0ZW1lbnRTdHJpbmciLCJjb25jbHVzaW9uIiwiZnJvbU1ldGFzdGF0ZW1lbnROb2RlIl0sIm1hcHBpbmdzIjoiQUFBQTs7Ozs7OztlQU9xQkE7OztzQkFMUTtvQkFDNEI7MEJBQ0U7MkJBQ0k7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBRWhELElBQUEsQUFBTUEsMkJBQU47YUFBTUEsV0FDUEMsaUJBQWlCOzhCQURWRDtRQUVqQixJQUFJLENBQUNDLGlCQUFpQixHQUFHQTs7aUJBRlJEOztZQUtuQkUsS0FBQUE7bUJBQUFBLFNBQUFBLHVCQUF1QjtnQkFDckIsT0FBTyxJQUFJLENBQUNELGlCQUFpQjtZQUMvQjs7O1lBRUFFLEtBQUFBO21CQUFBQSxTQUFBQSxtQkFBbUJDLGFBQWEsRUFBRUMsYUFBYSxFQUFFO2dCQUMvQyxJQUFNQyxtQkFBbUIsSUFBSSxDQUFDTCxpQkFBaUIsRUFDekNNLG1CQUFtQkgsZUFDbkJJLHlCQUF5QkMsc0RBQTBDLENBQUNDLG9CQUFvQixDQUFDSixrQkFBa0JDLGtCQUFrQkYsZ0JBQzdITSx1QkFBdUJILHdCQUF3QixHQUFHO2dCQUV4RCxPQUFPRztZQUNUOzs7WUFFQUMsS0FBQUE7bUJBQUFBLFNBQUFBLHVCQUF1QlgsaUJBQWlCLEVBQUVJLGFBQWEsRUFBRTtnQkFDdkQsSUFBTUMsbUJBQW1CLElBQUksQ0FBQ0wsaUJBQWlCLEVBQ3pDTSxtQkFBbUJOLG1CQUNuQk8seUJBQXlCSywyREFBOEMsQ0FBQ0gsb0JBQW9CLENBQUNKLGtCQUFrQkMsa0JBQWtCRixnQkFDaklTLDJCQUEyQk4sd0JBQXdCLEdBQUc7Z0JBRTVELE9BQU9NO1lBQ1Q7OztZQUVBQyxLQUFBQTttQkFBQUEsU0FBQUEsT0FBT0MsTUFBTSxFQUFFO2dCQUNiLElBQU1DLHNCQUFzQkMsSUFBQUEsb0JBQVksRUFBQyxJQUFJLENBQUNqQixpQkFBaUIsRUFBRWUsU0FDM0RHLGdCQUFnQkYscUJBQ2hCRyxPQUFPO29CQUNMRCxlQUFBQTtnQkFDRjtnQkFFTixPQUFPQztZQUNUOzs7O1lBRU9DLEtBQUFBO21CQUFQLFNBQU9BLFNBQVNELElBQUksRUFBRUUsS0FBSyxFQUFFQyxNQUFNLEVBQUU7Z0JBQ25DLElBQU0sQUFBRUosZ0JBQWtCQyxLQUFsQkQsZUFDRkYsc0JBQXNCRSxlQUN0QmxCLG9CQUFvQnVCLElBQUFBLDhDQUF3QyxFQUFDUCxxQkFBcUJLLE9BQU9DLFNBQ3pGRSxhQUFhLElBekNGekIsV0F5Q2lCQztnQkFFbEMsT0FBT3dCO1lBQ1Q7OztZQUVPQyxLQUFBQTttQkFBUCxTQUFPQSxzQkFBc0J6QixpQkFBaUIsRUFBRTtnQkFDOUMsSUFBTXdCLGFBQWEsSUEvQ0Z6QixXQStDaUJDO2dCQUVsQyxPQUFPd0I7WUFDVDs7O1dBbERtQnpCIn0=

package/lib/conjecture.js

@@ -123,8 +123,8 @@ var Conjecture = /*#__PURE__*/ function(AxiomLemmaTheoremConjecture) {
     _createClass(Conjecture, null, [
         {
             key: "fromJSON",
-            value: function fromJSON(json, releaseContext) {
-                return _axiomLemmaTheoremConjecture.default.fromJSON(Conjecture, json, releaseContext);
+            value: function fromJSON(json, lexer, parser) {
+                return _axiomLemmaTheoremConjecture.default.fromJSON(Conjecture, json, lexer, parser);
             }
         },
         {
@@ -138,4 +138,4 @@ var Conjecture = /*#__PURE__*/ function(AxiomLemmaTheoremConjecture) {
 }(_axiomLemmaTheoremConjecture.default);
 _defineProperty(Conjecture, "kind", _kinds.CONJECTURE_KIND);
 
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy9jb25qZWN0dXJlLmpzIiwiPDxqc3gtY29uZmlnLXByYWdtYS5qcz4+Il0sInNvdXJjZXNDb250ZW50IjpbIlwidXNlIHN0cmljdFwiO1xuXG5pbXBvcnQgQXhpb21MZW1tYVRoZW9yZW1Db25qZWN0dXJlIGZyb20gXCIuL2F4aW9tTGVtbWFUaGVvcmVtQ29uamVjdHVyZVwiO1xuXG5pbXBvcnQgeyBDT05KRUNUVVJFX0tJTkQgfSBmcm9tIFwiLi9raW5kc1wiO1xuXG5leHBvcnQgZGVmYXVsdCBjbGFzcyBDb25qZWN0dXJlIGV4dGVuZHMgQXhpb21MZW1tYVRoZW9yZW1Db25qZWN0dXJlIHtcbiAgc3RhdGljIGtpbmQgPSBDT05KRUNUVVJFX0tJTkQ7XG5cbiAgc3RhdGljIGZyb21KU09OKGpzb24sIHJlbGVhc2VDb250ZXh0KSB7IHJldHVybiBBeGlvbUxlbW1hVGhlb3JlbUNvbmplY3R1cmUuZnJvbUpTT04oQ29uamVjdHVyZSwganNvbiwgcmVsZWFzZUNvbnRleHQpOyB9XG5cbiAgc3RhdGljIGZyb21MYWJlbHNTdXBwb3NpdGlvbnNBbmRDb25zZXF1ZW5jZShsYWJlbHMsIHN1cHBvc2l0aW9ucywgY29uc2VxdWVuY2UpIHsgcmV0dXJuIEF4aW9tTGVtbWFUaGVvcmVtQ29uamVjdHVyZS5mcm9tTGFiZWxzU3VwcG9zaXRpb25zQW5kQ29uc2VxdWVuY2UoQ29uamVjdHVyZSwgbGFiZWxzLCBzdXBwb3NpdGlvbnMsIGNvbnNlcXVlbmNlKTsgfVxufVxuIiwiUmVhY3QuY3JlYXRlRWxlbWVudCJdLCJuYW1lcyI6WyJDb25qZWN0dXJlIiwiZnJvbUpTT04iLCJqc29uIiwicmVsZWFzZUNvbnRleHQiLCJBeGlvbUxlbW1hVGhlb3JlbUNvbmplY3R1cmUiLCJmcm9tTGFiZWxzU3VwcG9zaXRpb25zQW5kQ29uc2VxdWVuY2UiLCJsYWJlbHMiLCJzdXBwb3NpdGlvbnMiLCJjb25zZXF1ZW5jZSIsImtpbmQiLCJDT05KRUNUVVJFX0tJTkQiXSwibWFwcGluZ3MiOiJBQUFBOzs7Ozs7O2VBTXFCQTs7O2dGQUptQjtxQkFFUjs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFFakIsSUFBQSxBQUFNQSwyQkFBTjtjQUFNQTs4QkFBQUE7YUFBQUE7OEJBQUFBOzs7aUJBQUFBOztZQUdaQyxLQUFBQTttQkFBUCxTQUFPQSxTQUFTQyxJQUFJLEVBQUVDLGNBQWMsRUFBRTtnQkFBRSxPQUFPQyxvQ0FBMkIsQ0FBQ0gsUUFBUSxDQUhoRUQsWUFHNkVFLE1BQU1DO1lBQWlCOzs7WUFFaEhFLEtBQUFBO21CQUFQLFNBQU9BLHFDQUFxQ0MsTUFBTSxFQUFFQyxZQUFZLEVBQUVDLFdBQVcsRUFBRTtnQkFBRSxPQUFPSixvQ0FBMkIsQ0FBQ0Msb0NBQW9DLENBTHJJTCxZQUtrSk0sUUFBUUMsY0FBY0M7WUFBYzs7O1dBTHRMUjtFQUFtQkksb0NBQTJCO0FBQ2pFLGdCQURtQkosWUFDWlMsUUFBT0Msc0JBQWUifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy9jb25qZWN0dXJlLmpzIiwiPDxqc3gtY29uZmlnLXByYWdtYS5qcz4+Il0sInNvdXJjZXNDb250ZW50IjpbIlwidXNlIHN0cmljdFwiO1xuXG5pbXBvcnQgQXhpb21MZW1tYVRoZW9yZW1Db25qZWN0dXJlIGZyb20gXCIuL2F4aW9tTGVtbWFUaGVvcmVtQ29uamVjdHVyZVwiO1xuXG5pbXBvcnQgeyBDT05KRUNUVVJFX0tJTkQgfSBmcm9tIFwiLi9raW5kc1wiO1xuXG5leHBvcnQgZGVmYXVsdCBjbGFzcyBDb25qZWN0dXJlIGV4dGVuZHMgQXhpb21MZW1tYVRoZW9yZW1Db25qZWN0dXJlIHtcbiAgc3RhdGljIGtpbmQgPSBDT05KRUNUVVJFX0tJTkQ7XG5cbiAgc3RhdGljIGZyb21KU09OKGpzb24sIGxleGVyLCBwYXJzZXIpIHsgcmV0dXJuIEF4aW9tTGVtbWFUaGVvcmVtQ29uamVjdHVyZS5mcm9tSlNPTihDb25qZWN0dXJlLCBqc29uLCBsZXhlciwgcGFyc2VyKTsgfVxuXG4gIHN0YXRpYyBmcm9tTGFiZWxzU3VwcG9zaXRpb25zQW5kQ29uc2VxdWVuY2UobGFiZWxzLCBzdXBwb3NpdGlvbnMsIGNvbnNlcXVlbmNlKSB7IHJldHVybiBBeGlvbUxlbW1hVGhlb3JlbUNvbmplY3R1cmUuZnJvbUxhYmVsc1N1cHBvc2l0aW9uc0FuZENvbnNlcXVlbmNlKENvbmplY3R1cmUsIGxhYmVscywgc3VwcG9zaXRpb25zLCBjb25zZXF1ZW5jZSk7IH1cbn1cbiIsIlJlYWN0LmNyZWF0ZUVsZW1lbnQiXSwibmFtZXMiOlsiQ29uamVjdHVyZSIsImZyb21KU09OIiwianNvbiIsImxleGVyIiwicGFyc2VyIiwiQXhpb21MZW1tYVRoZW9yZW1Db25qZWN0dXJlIiwiZnJvbUxhYmVsc1N1cHBvc2l0aW9uc0FuZENvbnNlcXVlbmNlIiwibGFiZWxzIiwic3VwcG9zaXRpb25zIiwiY29uc2VxdWVuY2UiLCJraW5kIiwiQ09OSkVDVFVSRV9LSU5EIl0sIm1hcHBpbmdzIjoiQUFBQTs7Ozs7OztlQU1xQkE7OztnRkFKbUI7cUJBRVI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBRWpCLElBQUEsQUFBTUEsMkJBQU47Y0FBTUE7OEJBQUFBO2FBQUFBOzhCQUFBQTs7O2lCQUFBQTs7WUFHWkMsS0FBQUE7bUJBQVAsU0FBT0EsU0FBU0MsSUFBSSxFQUFFQyxLQUFLLEVBQUVDLE1BQU0sRUFBRTtnQkFBRSxPQUFPQyxvQ0FBMkIsQ0FBQ0osUUFBUSxDQUgvREQsWUFHNEVFLE1BQU1DLE9BQU9DO1lBQVM7OztZQUU5R0UsS0FBQUE7bUJBQVAsU0FBT0EscUNBQXFDQyxNQUFNLEVBQUVDLFlBQVksRUFBRUMsV0FBVyxFQUFFO2dCQUFFLE9BQU9KLG9DQUEyQixDQUFDQyxvQ0FBb0MsQ0FMcklOLFlBS2tKTyxRQUFRQyxjQUFjQztZQUFjOzs7V0FMdExUO0VBQW1CSyxvQ0FBMkI7QUFDakUsZ0JBRG1CTCxZQUNaVSxRQUFPQyxzQkFBZSJ9

package/lib/consequence.js

@@ -9,7 +9,8 @@ Object.defineProperty(exports, "default", {
     }
 });
 var _string = require("./utilities/string");
-var _consequence = require("./matcher/termForVariable/consequence");
+var _node = require("./utilities/node");
+var _consequence = require("./verifier/termForVariable/consequence");
 function _classCallCheck(instance, Constructor) {
     if (!(instance instanceof Constructor)) {
         throw new TypeError("Cannot call a class as a function");
@@ -44,7 +45,7 @@ var Consequence = /*#__PURE__*/ function() {
         {
             key: "matchStatementNode",
             value: function matchStatementNode(statementNode, substitutions) {
-                var nonTerminalNodeA = this.statementNode, nonTerminalNodeB = statementNode, nonTerminalNodeMatches = _consequence.consequenceTermForVariableMatcher.matchNonTerminalNode(nonTerminalNodeA, nonTerminalNodeB, substitutions), statementNodeMatches = nonTerminalNodeMatches; ///
+                var nonTerminalNodeA = this.statementNode, nonTerminalNodeB = statementNode, nonTerminalNodeMatches = _consequence.consequenceTermForVariableVerifier.matchNonTerminalNode(nonTerminalNodeA, nonTerminalNodeB, substitutions), statementNodeMatches = nonTerminalNodeMatches; ///
                 return statementNodeMatches;
             }
         },
@@ -60,8 +61,8 @@ var Consequence = /*#__PURE__*/ function() {
     ], [
         {
             key: "fromJSON",
-            value: function fromJSON(json, releaseContext) {
-                var statement = json.statement, statementString = statement, statementNode = (0, _string.statementNodeFromStatementString)(statementString, releaseContext), consequence = new Consequence(statementNode);
+            value: function fromJSON(json, lexer, parser) {
+                var statement = json.statement, statementString = statement, statementNode = (0, _node.statementNodeFromStatementString)(statementString, lexer, parser), consequence = new Consequence(statementNode);
                 return consequence;
             }
         },
@@ -76,4 +77,4 @@ var Consequence = /*#__PURE__*/ function() {
     return Consequence;
 }();
 
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy9jb25zZXF1ZW5jZS5qcyIsIjw8anN4LWNvbmZpZy1wcmFnbWEuanM+PiJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuaW1wb3J0IHsgbm9kZUFzU3RyaW5nIH0gZnJvbSBcIi4vdXRpbGl0aWVzL3N0cmluZ1wiO1xuaW1wb3J0IHsgc3RhdGVtZW50Tm9kZUZyb21TdGF0ZW1lbnRTdHJpbmcgfSBmcm9tIFwiLi91dGlsaXRpZXMvc3RyaW5nXCI7XG5pbXBvcnQgeyBjb25zZXF1ZW5jZVRlcm1Gb3JWYXJpYWJsZU1hdGNoZXIgfSBmcm9tIFwiLi9tYXRjaGVyL3Rlcm1Gb3JWYXJpYWJsZS9jb25zZXF1ZW5jZVwiO1xuXG5leHBvcnQgZGVmYXVsdCBjbGFzcyBDb25zZXF1ZW5jZSB7XG4gIGNvbnN0cnVjdG9yKHN0YXRlbWVudE5vZGUpIHtcbiAgICB0aGlzLnN0YXRlbWVudE5vZGUgPSBzdGF0ZW1lbnROb2RlO1xuICB9XG5cbiAgZ2V0U3RhdGVtZW50Tm9kZSgpIHtcbiAgICByZXR1cm4gdGhpcy5zdGF0ZW1lbnROb2RlO1xuICB9XG5cbiAgbWF0Y2hTdGF0ZW1lbnROb2RlKHN0YXRlbWVudE5vZGUsIHN1YnN0aXR1dGlvbnMpIHtcbiAgICBjb25zdCBub25UZXJtaW5hbE5vZGVBID0gdGhpcy5zdGF0ZW1lbnROb2RlLCAgLy8vXG4gICAgICAgICAgbm9uVGVybWluYWxOb2RlQiA9IHN0YXRlbWVudE5vZGUsICAvLy9cbiAgICAgICAgICBub25UZXJtaW5hbE5vZGVNYXRjaGVzID0gY29uc2VxdWVuY2VUZXJtRm9yVmFyaWFibGVNYXRjaGVyLm1hdGNoTm9uVGVybWluYWxOb2RlKG5vblRlcm1pbmFsTm9kZUEsIG5vblRlcm1pbmFsTm9kZUIsIHN1YnN0aXR1dGlvbnMpLFxuICAgICAgICAgIHN0YXRlbWVudE5vZGVNYXRjaGVzID0gbm9uVGVybWluYWxOb2RlTWF0Y2hlczsgLy8vXG5cbiAgICByZXR1cm4gc3RhdGVtZW50Tm9kZU1hdGNoZXM7XG4gIH1cblxuICB0b0pTT04odG9rZW5zKSB7XG4gICAgY29uc3Qgc3RhdGVtZW50U3RyaW5nID0gbm9kZUFzU3RyaW5nKHRoaXMuc3RhdGVtZW50Tm9kZSwgdG9rZW5zKSxcbiAgICAgICAgICBzdGF0ZW1lbnQgPSBzdGF0ZW1lbnRTdHJpbmcsICAvLy9cbiAgICAgICAgICBqc29uID0ge1xuICAgICAgICAgICAgc3RhdGVtZW50XG4gICAgICAgICAgfTtcblxuICAgIHJldHVybiBqc29uO1xuICB9XG5cbiAgc3RhdGljIGZyb21KU09OKGpzb24sIHJlbGVhc2VDb250ZXh0KSB7XG4gICAgY29uc3QgeyBzdGF0ZW1lbnQgfSA9IGpzb24sXG4gICAgICAgICAgc3RhdGVtZW50U3RyaW5nID0gc3RhdGVtZW50LCAgLy8vXG4gICAgICAgICAgc3RhdGVtZW50Tm9kZSA9IHN0YXRlbWVudE5vZGVGcm9tU3RhdGVtZW50U3RyaW5nKHN0YXRlbWVudFN0cmluZywgcmVsZWFzZUNvbnRleHQpLFxuICAgICAgICAgIGNvbnNlcXVlbmNlID0gbmV3IENvbnNlcXVlbmNlKHN0YXRlbWVudE5vZGUpO1xuXG4gICAgcmV0dXJuIGNvbnNlcXVlbmNlO1xuICB9XG5cbiAgc3RhdGljIGZyb21TdGF0ZW1lbnROb2RlKHN0YXRlbWVudE5vZGUpIHtcbiAgICBjb25zdCBjb25zZXF1ZW5jZSA9IG5ldyBDb25zZXF1ZW5jZShzdGF0ZW1lbnROb2RlKTtcblxuICAgIHJldHVybiBjb25zZXF1ZW5jZTtcbiAgfVxufVxuIiwiUmVhY3QuY3JlYXRlRWxlbWVudCJdLCJuYW1lcyI6WyJDb25zZXF1ZW5jZSIsInN0YXRlbWVudE5vZGUiLCJnZXRTdGF0ZW1lbnROb2RlIiwibWF0Y2hTdGF0ZW1lbnROb2RlIiwic3Vic3RpdHV0aW9ucyIsIm5vblRlcm1pbmFsTm9kZUEiLCJub25UZXJtaW5hbE5vZGVCIiwibm9uVGVybWluYWxOb2RlTWF0Y2hlcyIsImNvbnNlcXVlbmNlVGVybUZvclZhcmlhYmxlTWF0Y2hlciIsIm1hdGNoTm9uVGVybWluYWxOb2RlIiwic3RhdGVtZW50Tm9kZU1hdGNoZXMiLCJ0b0pTT04iLCJ0b2tlbnMiLCJzdGF0ZW1lbnRTdHJpbmciLCJub2RlQXNTdHJpbmciLCJzdGF0ZW1lbnQiLCJqc29uIiwiZnJvbUpTT04iLCJyZWxlYXNlQ29udGV4dCIsInN0YXRlbWVudE5vZGVGcm9tU3RhdGVtZW50U3RyaW5nIiwiY29uc2VxdWVuY2UiLCJmcm9tU3RhdGVtZW50Tm9kZSJdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7Ozs7ZUFNcUJBOzs7c0JBSlE7MkJBRXFCOzs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUVuQyxJQUFBLEFBQU1BLDRCQUFOO2FBQU1BLFlBQ1BDLGFBQWE7OEJBRE5EO1FBRWpCLElBQUksQ0FBQ0MsYUFBYSxHQUFHQTs7aUJBRkpEOztZQUtuQkUsS0FBQUE7bUJBQUFBLFNBQUFBLG1CQUFtQjtnQkFDakIsT0FBTyxJQUFJLENBQUNELGFBQWE7WUFDM0I7OztZQUVBRSxLQUFBQTttQkFBQUEsU0FBQUEsbUJBQW1CRixhQUFhLEVBQUVHLGFBQWEsRUFBRTtnQkFDL0MsSUFBTUMsbUJBQW1CLElBQUksQ0FBQ0osYUFBYSxFQUNyQ0ssbUJBQW1CTCxlQUNuQk0seUJBQXlCQyw4Q0FBaUMsQ0FBQ0Msb0JBQW9CLENBQUNKLGtCQUFrQkMsa0JBQWtCRixnQkFDcEhNLHVCQUF1Qkgsd0JBQXdCLEdBQUc7Z0JBRXhELE9BQU9HO1lBQ1Q7OztZQUVBQyxLQUFBQTttQkFBQUEsU0FBQUEsT0FBT0MsTUFBTSxFQUFFO2dCQUNiLElBQU1DLGtCQUFrQkMsSUFBQUEsb0JBQVksRUFBQyxJQUFJLENBQUNiLGFBQWEsRUFBRVcsU0FDbkRHLFlBQVlGLGlCQUNaRyxPQUFPO29CQUNMRCxXQUFBQTtnQkFDRjtnQkFFTixPQUFPQztZQUNUOzs7O1lBRU9DLEtBQUFBO21CQUFQLFNBQU9BLFNBQVNELElBQUksRUFBRUUsY0FBYyxFQUFFO2dCQUNwQyxJQUFNLEFBQUVILFlBQWNDLEtBQWRELFdBQ0ZGLGtCQUFrQkUsV0FDbEJkLGdCQUFnQmtCLElBQUFBLHdDQUFnQyxFQUFDTixpQkFBaUJLLGlCQUNsRUUsY0FBYyxJQWhDSHBCLFlBZ0NtQkM7Z0JBRXBDLE9BQU9tQjtZQUNUOzs7WUFFT0MsS0FBQUE7bUJBQVAsU0FBT0Esa0JBQWtCcEIsYUFBYSxFQUFFO2dCQUN0QyxJQUFNbUIsY0FBYyxJQXRDSHBCLFlBc0NtQkM7Z0JBRXBDLE9BQU9tQjtZQUNUOzs7V0F6Q21CcEIifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy9jb25zZXF1ZW5jZS5qcyIsIjw8anN4LWNvbmZpZy1wcmFnbWEuanM+PiJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuaW1wb3J0IHsgbm9kZUFzU3RyaW5nIH0gZnJvbSBcIi4vdXRpbGl0aWVzL3N0cmluZ1wiO1xuaW1wb3J0IHsgc3RhdGVtZW50Tm9kZUZyb21TdGF0ZW1lbnRTdHJpbmcgfSBmcm9tIFwiLi91dGlsaXRpZXMvbm9kZVwiO1xuaW1wb3J0IHsgY29uc2VxdWVuY2VUZXJtRm9yVmFyaWFibGVWZXJpZmllciB9IGZyb20gXCIuL3ZlcmlmaWVyL3Rlcm1Gb3JWYXJpYWJsZS9jb25zZXF1ZW5jZVwiO1xuXG5leHBvcnQgZGVmYXVsdCBjbGFzcyBDb25zZXF1ZW5jZSB7XG4gIGNvbnN0cnVjdG9yKHN0YXRlbWVudE5vZGUpIHtcbiAgICB0aGlzLnN0YXRlbWVudE5vZGUgPSBzdGF0ZW1lbnROb2RlO1xuICB9XG5cbiAgZ2V0U3RhdGVtZW50Tm9kZSgpIHtcbiAgICByZXR1cm4gdGhpcy5zdGF0ZW1lbnROb2RlO1xuICB9XG5cbiAgbWF0Y2hTdGF0ZW1lbnROb2RlKHN0YXRlbWVudE5vZGUsIHN1YnN0aXR1dGlvbnMpIHtcbiAgICBjb25zdCBub25UZXJtaW5hbE5vZGVBID0gdGhpcy5zdGF0ZW1lbnROb2RlLCAgLy8vXG4gICAgICAgICAgbm9uVGVybWluYWxOb2RlQiA9IHN0YXRlbWVudE5vZGUsICAvLy9cbiAgICAgICAgICBub25UZXJtaW5hbE5vZGVNYXRjaGVzID0gY29uc2VxdWVuY2VUZXJtRm9yVmFyaWFibGVWZXJpZmllci5tYXRjaE5vblRlcm1pbmFsTm9kZShub25UZXJtaW5hbE5vZGVBLCBub25UZXJtaW5hbE5vZGVCLCBzdWJzdGl0dXRpb25zKSxcbiAgICAgICAgICBzdGF0ZW1lbnROb2RlTWF0Y2hlcyA9IG5vblRlcm1pbmFsTm9kZU1hdGNoZXM7IC8vL1xuXG4gICAgcmV0dXJuIHN0YXRlbWVudE5vZGVNYXRjaGVzO1xuICB9XG5cbiAgdG9KU09OKHRva2Vucykge1xuICAgIGNvbnN0IHN0YXRlbWVudFN0cmluZyA9IG5vZGVBc1N0cmluZyh0aGlzLnN0YXRlbWVudE5vZGUsIHRva2VucyksXG4gICAgICAgICAgc3RhdGVtZW50ID0gc3RhdGVtZW50U3RyaW5nLCAgLy8vXG4gICAgICAgICAganNvbiA9IHtcbiAgICAgICAgICAgIHN0YXRlbWVudFxuICAgICAgICAgIH07XG5cbiAgICByZXR1cm4ganNvbjtcbiAgfVxuXG4gIHN0YXRpYyBmcm9tSlNPTihqc29uLCBsZXhlciwgcGFyc2VyKSB7XG4gICAgY29uc3QgeyBzdGF0ZW1lbnQgfSA9IGpzb24sXG4gICAgICAgICAgc3RhdGVtZW50U3RyaW5nID0gc3RhdGVtZW50LCAgLy8vXG4gICAgICAgICAgc3RhdGVtZW50Tm9kZSA9IHN0YXRlbWVudE5vZGVGcm9tU3RhdGVtZW50U3RyaW5nKHN0YXRlbWVudFN0cmluZywgbGV4ZXIsIHBhcnNlciksXG4gICAgICAgICAgY29uc2VxdWVuY2UgPSBuZXcgQ29uc2VxdWVuY2Uoc3RhdGVtZW50Tm9kZSk7XG5cbiAgICByZXR1cm4gY29uc2VxdWVuY2U7XG4gIH1cblxuICBzdGF0aWMgZnJvbVN0YXRlbWVudE5vZGUoc3RhdGVtZW50Tm9kZSkge1xuICAgIGNvbnN0IGNvbnNlcXVlbmNlID0gbmV3IENvbnNlcXVlbmNlKHN0YXRlbWVudE5vZGUpO1xuXG4gICAgcmV0dXJuIGNvbnNlcXVlbmNlO1xuICB9XG59XG4iLCJSZWFjdC5jcmVhdGVFbGVtZW50Il0sIm5hbWVzIjpbIkNvbnNlcXVlbmNlIiwic3RhdGVtZW50Tm9kZSIsImdldFN0YXRlbWVudE5vZGUiLCJtYXRjaFN0YXRlbWVudE5vZGUiLCJzdWJzdGl0dXRpb25zIiwibm9uVGVybWluYWxOb2RlQSIsIm5vblRlcm1pbmFsTm9kZUIiLCJub25UZXJtaW5hbE5vZGVNYXRjaGVzIiwiY29uc2VxdWVuY2VUZXJtRm9yVmFyaWFibGVWZXJpZmllciIsIm1hdGNoTm9uVGVybWluYWxOb2RlIiwic3RhdGVtZW50Tm9kZU1hdGNoZXMiLCJ0b0pTT04iLCJ0b2tlbnMiLCJzdGF0ZW1lbnRTdHJpbmciLCJub2RlQXNTdHJpbmciLCJzdGF0ZW1lbnQiLCJqc29uIiwiZnJvbUpTT04iLCJsZXhlciIsInBhcnNlciIsInN0YXRlbWVudE5vZGVGcm9tU3RhdGVtZW50U3RyaW5nIiwiY29uc2VxdWVuY2UiLCJmcm9tU3RhdGVtZW50Tm9kZSJdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7Ozs7ZUFNcUJBOzs7c0JBSlE7b0JBQ29COzJCQUNFOzs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUVwQyxJQUFBLEFBQU1BLDRCQUFOO2FBQU1BLFlBQ1BDLGFBQWE7OEJBRE5EO1FBRWpCLElBQUksQ0FBQ0MsYUFBYSxHQUFHQTs7aUJBRkpEOztZQUtuQkUsS0FBQUE7bUJBQUFBLFNBQUFBLG1CQUFtQjtnQkFDakIsT0FBTyxJQUFJLENBQUNELGFBQWE7WUFDM0I7OztZQUVBRSxLQUFBQTttQkFBQUEsU0FBQUEsbUJBQW1CRixhQUFhLEVBQUVHLGFBQWEsRUFBRTtnQkFDL0MsSUFBTUMsbUJBQW1CLElBQUksQ0FBQ0osYUFBYSxFQUNyQ0ssbUJBQW1CTCxlQUNuQk0seUJBQXlCQywrQ0FBa0MsQ0FBQ0Msb0JBQW9CLENBQUNKLGtCQUFrQkMsa0JBQWtCRixnQkFDckhNLHVCQUF1Qkgsd0JBQXdCLEdBQUc7Z0JBRXhELE9BQU9HO1lBQ1Q7OztZQUVBQyxLQUFBQTttQkFBQUEsU0FBQUEsT0FBT0MsTUFBTSxFQUFFO2dCQUNiLElBQU1DLGtCQUFrQkMsSUFBQUEsb0JBQVksRUFBQyxJQUFJLENBQUNiLGFBQWEsRUFBRVcsU0FDbkRHLFlBQVlGLGlCQUNaRyxPQUFPO29CQUNMRCxXQUFBQTtnQkFDRjtnQkFFTixPQUFPQztZQUNUOzs7O1lBRU9DLEtBQUFBO21CQUFQLFNBQU9BLFNBQVNELElBQUksRUFBRUUsS0FBSyxFQUFFQyxNQUFNLEVBQUU7Z0JBQ25DLElBQU0sQUFBRUosWUFBY0MsS0FBZEQsV0FDRkYsa0JBQWtCRSxXQUNsQmQsZ0JBQWdCbUIsSUFBQUEsc0NBQWdDLEVBQUNQLGlCQUFpQkssT0FBT0MsU0FDekVFLGNBQWMsSUFoQ0hyQixZQWdDbUJDO2dCQUVwQyxPQUFPb0I7WUFDVDs7O1lBRU9DLEtBQUFBO21CQUFQLFNBQU9BLGtCQUFrQnJCLGFBQWEsRUFBRTtnQkFDdEMsSUFBTW9CLGNBQWMsSUF0Q0hyQixZQXNDbUJDO2dCQUVwQyxPQUFPb0I7WUFDVDs7O1dBekNtQnJCIn0=

package/lib/constants.js

@@ -15,32 +15,28 @@ _export(exports, {
     EMPTY_STRING: function() {
         return EMPTY_STRING;
     },
-    LEFT_BRACKET: function() {
-        return LEFT_BRACKET;
-    },
-    RIGHT_BRACKET: function() {
-        return RIGHT_BRACKET;
-    },
     EQUALITY_DEPTH: function() {
         return EQUALITY_DEPTH;
     },
     MAXIMUM_INDEXES_LENGTH: function() {
         return MAXIMUM_INDEXES_LENGTH;
     },
+    BRACKETED_STATEMENT_DEPTH: function() {
+        return BRACKETED_STATEMENT_DEPTH;
+    },
     MAXIMUM_PERMUTATION_LENGTH: function() {
         return MAXIMUM_PERMUTATION_LENGTH;
     },
-    BRACKETED_CHILD_NODES_LENGTH: function() {
-        return BRACKETED_CHILD_NODES_LENGTH;
+    BRACKETED_METASTATEMENT_DEPTH: function() {
+        return BRACKETED_METASTATEMENT_DEPTH;
     }
 });
 var COMMA = ",";
 var EMPTY_STRING = "";
-var LEFT_BRACKET = "(";
-var RIGHT_BRACKET = ")";
 var EQUALITY_DEPTH = 2;
 var MAXIMUM_INDEXES_LENGTH = 10;
+var BRACKETED_STATEMENT_DEPTH = 2;
 var MAXIMUM_PERMUTATION_LENGTH = 5;
-var BRACKETED_CHILD_NODES_LENGTH = 3;
+var BRACKETED_METASTATEMENT_DEPTH = 1;
 
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy9jb25zdGFudHMuanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmV4cG9ydCBjb25zdCBDT01NQSA9ICcsJztcbmV4cG9ydCBjb25zdCBFTVBUWV9TVFJJTkcgPSBcIlwiO1xuZXhwb3J0IGNvbnN0IExFRlRfQlJBQ0tFVCA9IFwiKFwiO1xuZXhwb3J0IGNvbnN0IFJJR0hUX0JSQUNLRVQgPSBcIilcIjtcbmV4cG9ydCBjb25zdCBFUVVBTElUWV9ERVBUSCA9IDI7XG5leHBvcnQgY29uc3QgTUFYSU1VTV9JTkRFWEVTX0xFTkdUSCA9IDEwO1xuZXhwb3J0IGNvbnN0IE1BWElNVU1fUEVSTVVUQVRJT05fTEVOR1RIID0gNTtcbmV4cG9ydCBjb25zdCBCUkFDS0VURURfQ0hJTERfTk9ERVNfTEVOR1RIID0gMztcbiJdLCJuYW1lcyI6WyJDT01NQSIsIkVNUFRZX1NUUklORyIsIkxFRlRfQlJBQ0tFVCIsIlJJR0hUX0JSQUNLRVQiLCJFUVVBTElUWV9ERVBUSCIsIk1BWElNVU1fSU5ERVhFU19MRU5HVEgiLCJNQVhJTVVNX1BFUk1VVEFUSU9OX0xFTkdUSCIsIkJSQUNLRVRFRF9DSElMRF9OT0RFU19MRU5HVEgiXSwibWFwcGluZ3MiOiJBQUFBOzs7Ozs7Ozs7OztJQUVhQSxLQUFLO2VBQUxBOztJQUNBQyxZQUFZO2VBQVpBOztJQUNBQyxZQUFZO2VBQVpBOztJQUNBQyxhQUFhO2VBQWJBOztJQUNBQyxjQUFjO2VBQWRBOztJQUNBQyxzQkFBc0I7ZUFBdEJBOztJQUNBQywwQkFBMEI7ZUFBMUJBOztJQUNBQyw0QkFBNEI7ZUFBNUJBOzs7QUFQTixJQUFNUCxRQUFRO0FBQ2QsSUFBTUMsZUFBZTtBQUNyQixJQUFNQyxlQUFlO0FBQ3JCLElBQU1DLGdCQUFnQjtBQUN0QixJQUFNQyxpQkFBaUI7QUFDdkIsSUFBTUMseUJBQXlCO0FBQy9CLElBQU1DLDZCQUE2QjtBQUNuQyxJQUFNQywrQkFBK0IifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy9jb25zdGFudHMuanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmV4cG9ydCBjb25zdCBDT01NQSA9ICcsJztcbmV4cG9ydCBjb25zdCBFTVBUWV9TVFJJTkcgPSBcIlwiO1xuZXhwb3J0IGNvbnN0IEVRVUFMSVRZX0RFUFRIID0gMjtcbmV4cG9ydCBjb25zdCBNQVhJTVVNX0lOREVYRVNfTEVOR1RIID0gMTA7XG5leHBvcnQgY29uc3QgQlJBQ0tFVEVEX1NUQVRFTUVOVF9ERVBUSCA9IDI7XG5leHBvcnQgY29uc3QgTUFYSU1VTV9QRVJNVVRBVElPTl9MRU5HVEggPSA1O1xuZXhwb3J0IGNvbnN0IEJSQUNLRVRFRF9NRVRBU1RBVEVNRU5UX0RFUFRIID0gMTtcbiJdLCJuYW1lcyI6WyJDT01NQSIsIkVNUFRZX1NUUklORyIsIkVRVUFMSVRZX0RFUFRIIiwiTUFYSU1VTV9JTkRFWEVTX0xFTkdUSCIsIkJSQUNLRVRFRF9TVEFURU1FTlRfREVQVEgiLCJNQVhJTVVNX1BFUk1VVEFUSU9OX0xFTkdUSCIsIkJSQUNLRVRFRF9NRVRBU1RBVEVNRU5UX0RFUFRIIl0sIm1hcHBpbmdzIjoiQUFBQTs7Ozs7Ozs7Ozs7SUFFYUEsS0FBSztlQUFMQTs7SUFDQUMsWUFBWTtlQUFaQTs7SUFDQUMsY0FBYztlQUFkQTs7SUFDQUMsc0JBQXNCO2VBQXRCQTs7SUFDQUMseUJBQXlCO2VBQXpCQTs7SUFDQUMsMEJBQTBCO2VBQTFCQTs7SUFDQUMsNkJBQTZCO2VBQTdCQTs7O0FBTk4sSUFBTU4sUUFBUTtBQUNkLElBQU1DLGVBQWU7QUFDckIsSUFBTUMsaUJBQWlCO0FBQ3ZCLElBQU1DLHlCQUF5QjtBQUMvQixJQUFNQyw0QkFBNEI7QUFDbEMsSUFBTUMsNkJBQTZCO0FBQ25DLElBQU1DLGdDQUFnQyJ9