occam-verify-cli 0.0.1137 → 0.0.1138

package/lib/substitution/statement.js

@@ -10,7 +10,7 @@ Object.defineProperty(exports, "default", {
 });
 var _substitution = /*#__PURE__*/ _interop_require_default(require("../substitution"));
 var _substitutions = /*#__PURE__*/ _interop_require_default(require("../substitutions"));
-var _statement = /*#__PURE__*/ _interop_require_default(require("../nodeAndTokens/substitution/statement"));
+var _statement = /*#__PURE__*/ _interop_require_default(require("../context/partial/substitution/statement"));
 var _unification = require("../utilities/unification");
 var _brackets = require("../utilities/brackets");
 var _json = require("../utilities/json");
@@ -242,7 +242,7 @@ var StatementSubstitution = /*#__PURE__*/ function(Substitution) {
         {
             key: "fromJSON",
             value: function fromJSON(json, fileContext) {
-                var string = json.string, context = fileContext, statementSubstitutionNodeAndTokens = _statement.default.fromString(string, context), node = statementSubstitutionNodeAndTokens.getNode(), tokens = statementSubstitutionNodeAndTokens.getTokens(), resolved = true, statement = (0, _json.statementFromJSON)(json, fileContext), metavariable = (0, _json.metavariableFromJSON)(json, fileContext), substitution = null, statementSubstitution = new StatementSubstitution(string, node, tokens, resolved, statement, metavariable, substitution);
+                var string = json.string, lexer = fileContext.getLexer(), parser = fileContext.getParser(), statementSubstitutionPartialContext = _statement.default.fromStringLexerAndParser(string, lexer, parser), node = statementSubstitutionPartialContext.getNode(), tokens = statementSubstitutionPartialContext.getTokens(), resolved = true, statement = (0, _json.statementFromJSON)(json, fileContext), metavariable = (0, _json.metavariableFromJSON)(json, fileContext), substitution = null, statementSubstitution = new StatementSubstitution(string, node, tokens, resolved, statement, metavariable, substitution);
                 return statementSubstitution;
             }
         },
@@ -250,7 +250,7 @@ var StatementSubstitution = /*#__PURE__*/ function(Substitution) {
             key: "fromStatementAndMetavariable",
             value: function fromStatementAndMetavariable(statement, metavariable, context) {
                 statement = (0, _brackets.stripBracketsFromStatement)(statement, context); ///
-                var string = stringFromStatementAndMetavariable(statement, metavariable), statementSubstitutionNodeAndTokens = _statement.default.fromString(string, context), node = statementSubstitutionNodeAndTokens.getNode(), tokens = statementSubstitutionNodeAndTokens.getTokens(), resolved = true, substitution = null, statementSubstitution = new StatementSubstitution(string, node, tokens, resolved, statement, metavariable, substitution);
+                var string = stringFromStatementAndMetavariable(statement, metavariable), lexer = context.getLexer(), parser = context.getParser(), statementSubstitutionPartialContext = _statement.default.fromStringLexerAndParser(string, lexer, parser), node = statementSubstitutionPartialContext.getNode(), tokens = statementSubstitutionPartialContext.getTokens(), resolved = true, substitution = null, statementSubstitution = new StatementSubstitution(string, node, tokens, resolved, statement, metavariable, substitution);
                 return statementSubstitution;
             }
         },
@@ -258,7 +258,7 @@ var StatementSubstitution = /*#__PURE__*/ function(Substitution) {
             key: "fromStatementMetavariableAndSubstitution",
             value: function fromStatementMetavariableAndSubstitution(statement, metavariable, substitution, context) {
                 statement = (0, _brackets.stripBracketsFromStatement)(statement, context); ///
-                var string = stringFromStatementMetavariableAndSubstitution(statement, metavariable, substitution, context), statementSubstitutionNodeAndTokens = _statement.default.fromString(string, context), node = statementSubstitutionNodeAndTokens.getNode(), tokens = statementSubstitutionNodeAndTokens.getTokens(), resolved = false, statementSubstitution = new StatementSubstitution(string, node, tokens, resolved, statement, metavariable, substitution);
+                var string = stringFromStatementMetavariableAndSubstitution(statement, metavariable, substitution, context), lexer = context.getLexer(), parser = context.getParser(), statementSubstitutionPartialContext = _statement.default.fromStringLexerAndParser(string, lexer, parser), node = statementSubstitutionPartialContext.getNode(), tokens = statementSubstitutionPartialContext.getTokens(), resolved = false, statementSubstitution = new StatementSubstitution(string, node, tokens, resolved, statement, metavariable, substitution);
                 return statementSubstitution;
             }
         }
@@ -281,4 +281,4 @@ function stringFromStatementMetavariableAndSubstitution(statement, metavariable,
     return string;
 }
 
-//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/substitution/statement.js"],"sourcesContent":["\"use strict\";\n\nimport Substitution from \"../substitution\";\nimport Substitutions from \"../substitutions\";\nimport StatementSubstitutionNodeAndTokens from \"../nodeAndTokens/substitution/statement\";\n\nimport { unifySubstitution } from \"../utilities/unification\";\nimport { stripBracketsFromStatement } from \"../utilities/brackets\";\nimport { statementFromJSON, statementToStatementJSON, metavariableFromJSON, metavariableToMetavariableJSON } from \"../utilities/json\";\n\nexport default class StatementSubstitution extends Substitution {\n  constructor(string, node, tokens, resolved, statement, metavariable, substitution) {\n    super(string, node, tokens);\n\n    this.resolved = resolved;\n    this.statement = statement;\n    this.metavariable = metavariable;\n    this.substitution = substitution;\n  }\n\n  isResolved() {\n    return this.resolved;\n  }\n\n  getStatement() {\n    return this.statement;\n  }\n\n  getMetavariable() {\n    return this.metavariable;\n  }\n\n  getSubstitution() {\n    return this.substitution;\n  }\n\n  isStatementEqualTo(statement, context) {\n    statement = stripBracketsFromStatement(statement, context); ///\n\n    const statementEqualTo = this.statement.isEqualTo(statement);\n\n    return statementEqualTo;\n  }\n\n  isMetavariableEqualTo(metavariable) { return this.metavariable.isEqualTo(metavariable); }\n\n  isSubstitutionEqualTo(substitution) {\n    let substitutionEqualTo;\n\n    if (false) {\n      ///\n    } else if ((substitution === null) && (this.substitution === null)) {\n      substitutionEqualTo = true;\n    } else if ((substitution !== null) && (this.substitution === null)) {\n      substitutionEqualTo = false;\n    } else if ((substitution === null) && (this.substitution !== null)) {\n      substitutionEqualTo = false;\n    } else {\n      substitutionEqualTo = this.substitution.isEqualTo(substitution);\n    }\n\n    return substitutionEqualTo;\n  }\n\n  isSimple() {\n    const simple = (this.substitution === null);\n\n    return simple;\n  }\n\n  resolve(substitutions, generalContext, specificContext) {\n    const substitutionString = this.string;\n\n    const metavariable = this.getMetavariable(),\n          simpleSubstitution = substitutions.findSimpleSubstitutionByMetavariable(metavariable);\n\n    if (simpleSubstitution !== null) {\n      specificContext.trace(`Resolving the ${substitutionString} substitution...`);\n\n      const substitution = simpleSubstitution,  ///\n            substitutionResolved = substitution.resolveSubstitution(this.substitution, this.statement, substitutions, generalContext, specificContext);\n\n      this.resolved = substitutionResolved; ///\n\n      if (this.resolved) {\n        specificContext.debug(`...resolved the ${substitutionString} substitution.`);\n      }\n    }\n  }\n\n  resolveSubstitution(substitution, statement, substitutions, generalContext, specificContext) {\n    let substitutionResolved = false;\n\n    const substitutionString = substitution.getString();\n\n    specificContext.trace(`Resolving the ${substitutionString} substitution...`);\n\n    const generalSubstitution = substitution, ///\n          specificSubstitution = this.unifyStatement(statement, specificContext, specificContext);  ///\n\n    if (specificSubstitution !== null) {\n      substitutions.snapshot();\n\n      const generalSubstitutionString = generalSubstitution.getString(),\n            specificSubstitutionString = specificSubstitution.getString();\n\n      specificContext.trace(`Unifying the '${specificSubstitutionString}' substitution with the '${generalSubstitutionString}' substitution...`);\n\n      const substitutionUnified = unifySubstitution(generalSubstitution, specificSubstitution, substitutions, generalContext, specificContext);\n\n\n      if (substitutionUnified) {\n        specificContext.trace(`...unified the '${specificSubstitutionString}' substitution with the '${generalSubstitutionString}' substitution.`);\n      }\n\n      const context = specificContext;  ///\n\n      substitutionUnified ?\n        substitutions.continue() :\n          substitutions.rollback(context);\n\n      substitutionResolved = substitutionUnified;  ///\n    }\n\n    if (substitutionResolved) {\n      specificContext.debug(`...resolved the ${substitutionString} substitution.`);\n    }\n\n    return substitutionResolved;\n  }\n\n  unifyStatement(statement, generalContext, specificContext) {\n    let specificSubstitution = null;\n\n    const substitutions = Substitutions.fromNothing(),\n          statementUnified = this.statement.unifyStatement(statement, substitutions, generalContext, specificContext);\n\n    if (statementUnified) {\n      const substitutionsLength = substitutions.getLength();\n\n      if (substitutionsLength === 1) {\n        const firstSubstitution = substitutions.getFirstSubstitution();\n\n        specificSubstitution = firstSubstitution; ///\n      }\n    }\n\n    return specificSubstitution;\n  }\n\n  toJSON() {\n    const metavariableJSON = metavariableToMetavariableJSON(this.metavariable),\n          statementJSON = statementToStatementJSON(this.statement),\n          metavariable = metavariableJSON,  ///\n          statement = statementJSON,  ///\n          string = this.string,\n          json = {\n            string,\n            statement,\n            metavariable\n          };\n\n    return json;\n  }\n\n  static fromJSON(json, fileContext) {\n    const { string } = json,\n          context = fileContext,  ///\n          statementSubstitutionNodeAndTokens = StatementSubstitutionNodeAndTokens.fromString(string, context),\n          node = statementSubstitutionNodeAndTokens.getNode(),\n          tokens = statementSubstitutionNodeAndTokens.getTokens(),\n          resolved = true,\n          statement = statementFromJSON(json, fileContext),\n          metavariable = metavariableFromJSON(json, fileContext),\n          substitution = null,  ///\n          statementSubstitution = new StatementSubstitution(string, node, tokens, resolved, statement, metavariable, substitution);\n\n    return statementSubstitution;\n  }\n\n  static fromStatementAndMetavariable(statement, metavariable, context) {\n    statement = stripBracketsFromStatement(statement, context); ///\n\n    const string = stringFromStatementAndMetavariable(statement, metavariable),\n          statementSubstitutionNodeAndTokens = StatementSubstitutionNodeAndTokens.fromString(string, context),\n          node = statementSubstitutionNodeAndTokens.getNode(),\n          tokens = statementSubstitutionNodeAndTokens.getTokens(),\n          resolved = true,\n          substitution = null,\n          statementSubstitution = new StatementSubstitution(string, node, tokens, resolved, statement, metavariable, substitution);\n\n    return statementSubstitution;\n  }\n\n  static fromStatementMetavariableAndSubstitution(statement, metavariable, substitution, context) {\n    statement = stripBracketsFromStatement(statement, context); ///\n\n    const string = stringFromStatementMetavariableAndSubstitution(statement, metavariable, substitution, context),\n          statementSubstitutionNodeAndTokens = StatementSubstitutionNodeAndTokens.fromString(string, context),\n          node = statementSubstitutionNodeAndTokens.getNode(),\n          tokens = statementSubstitutionNodeAndTokens.getTokens(),\n          resolved = false,\n          statementSubstitution = new StatementSubstitution(string, node, tokens, resolved, statement, metavariable, substitution);\n\n    return statementSubstitution;\n  }\n}\n\nfunction stringFromStatementAndMetavariable(statement, metavariable) {\n  const statementString = statement.getString(),\n        metavariableString = metavariable.getString(),\n        string = `[${statementString} for ${metavariableString}]`;\n\n  return string;\n}\n\nfunction stringFromStatementMetavariableAndSubstitution(statement, metavariable, substitution) {\n  let string;\n\n  const statementString = statement.getString(),\n        metavariableString = metavariable.getString();\n\n  if (substitution === null) {\n    string = `[${statementString} for ${metavariableString}]`;\n  } else {\n    const substitutionString = substitution.getString();\n\n    string = `[${statementString} for ${metavariableString}${substitutionString}]`;\n  }\n\n  return string;\n}\n"],"names":["StatementSubstitution","string","node","tokens","resolved","statement","metavariable","substitution","isResolved","getStatement","getMetavariable","getSubstitution","isStatementEqualTo","context","stripBracketsFromStatement","statementEqualTo","isEqualTo","isMetavariableEqualTo","isSubstitutionEqualTo","substitutionEqualTo","isSimple","simple","resolve","substitutions","generalContext","specificContext","substitutionString","simpleSubstitution","findSimpleSubstitutionByMetavariable","trace","substitutionResolved","resolveSubstitution","debug","getString","generalSubstitution","specificSubstitution","unifyStatement","snapshot","generalSubstitutionString","specificSubstitutionString","substitutionUnified","unifySubstitution","continue","rollback","Substitutions","fromNothing","statementUnified","substitutionsLength","getLength","firstSubstitution","getFirstSubstitution","toJSON","metavariableJSON","metavariableToMetavariableJSON","statementJSON","statementToStatementJSON","json","fromJSON","fileContext","statementSubstitutionNodeAndTokens","StatementSubstitutionNodeAndTokens","fromString","getNode","getTokens","statementFromJSON","metavariableFromJSON","statementSubstitution","fromStatementAndMetavariable","stringFromStatementAndMetavariable","fromStatementMetavariableAndSubstitution","stringFromStatementMetavariableAndSubstitution","Substitution","statementString","metavariableString"],"mappings":"AAAA;;;;;;;eAUqBA;;;mEARI;oEACC;gEACqB;2BAEb;wBACS;oBACuE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEnG,IAAA,AAAMA,sCAAN;cAAMA;aAAAA,sBACPC,MAAM,EAAEC,IAAI,EAAEC,MAAM,EAAEC,QAAQ,EAAEC,SAAS,EAAEC,YAAY,EAAEC,YAAY;gCAD9DP;;gBAEjB,kBAFiBA;YAEXC;YAAQC;YAAMC;;QAEpB,MAAKC,QAAQ,GAAGA;QAChB,MAAKC,SAAS,GAAGA;QACjB,MAAKC,YAAY,GAAGA;QACpB,MAAKC,YAAY,GAAGA;;;kBAPHP;;YAUnBQ,KAAAA;mBAAAA,SAAAA;gBACE,OAAO,IAAI,CAACJ,QAAQ;YACtB;;;YAEAK,KAAAA;mBAAAA,SAAAA;gBACE,OAAO,IAAI,CAACJ,SAAS;YACvB;;;YAEAK,KAAAA;mBAAAA,SAAAA;gBACE,OAAO,IAAI,CAACJ,YAAY;YAC1B;;;YAEAK,KAAAA;mBAAAA,SAAAA;gBACE,OAAO,IAAI,CAACJ,YAAY;YAC1B;;;YAEAK,KAAAA;mBAAAA,SAAAA,mBAAmBP,SAAS,EAAEQ,OAAO;gBACnCR,YAAYS,IAAAA,oCAA0B,EAACT,WAAWQ,UAAU,GAAG;gBAE/D,IAAME,mBAAmB,IAAI,CAACV,SAAS,CAACW,SAAS,CAACX;gBAElD,OAAOU;YACT;;;YAEAE,KAAAA;mBAAAA,SAAAA,sBAAsBX,YAAY;gBAAI,OAAO,IAAI,CAACA,YAAY,CAACU,SAAS,CAACV;YAAe;;;YAExFY,KAAAA;mBAAAA,SAAAA,sBAAsBX,YAAY;gBAChC,IAAIY;gBAEJ,IAAI,OAAO;gBACT,GAAG;gBACL,OAAO,IAAI,AAACZ,iBAAiB,QAAU,IAAI,CAACA,YAAY,KAAK,MAAO;oBAClEY,sBAAsB;gBACxB,OAAO,IAAI,AAACZ,iBAAiB,QAAU,IAAI,CAACA,YAAY,KAAK,MAAO;oBAClEY,sBAAsB;gBACxB,OAAO,IAAI,AAACZ,iBAAiB,QAAU,IAAI,CAACA,YAAY,KAAK,MAAO;oBAClEY,sBAAsB;gBACxB,OAAO;oBACLA,sBAAsB,IAAI,CAACZ,YAAY,CAACS,SAAS,CAACT;gBACpD;gBAEA,OAAOY;YACT;;;YAEAC,KAAAA;mBAAAA,SAAAA;gBACE,IAAMC,SAAU,IAAI,CAACd,YAAY,KAAK;gBAEtC,OAAOc;YACT;;;YAEAC,KAAAA;mBAAAA,SAAAA,QAAQC,aAAa,EAAEC,cAAc,EAAEC,eAAe;gBACpD,IAAMC,qBAAqB,IAAI,CAACzB,MAAM;gBAEtC,IAAMK,eAAe,IAAI,CAACI,eAAe,IACnCiB,qBAAqBJ,cAAcK,oCAAoC,CAACtB;gBAE9E,IAAIqB,uBAAuB,MAAM;oBAC/BF,gBAAgBI,KAAK,CAAC,AAAC,iBAAmC,OAAnBH,oBAAmB;oBAE1D,IAAMnB,eAAeoB,oBACfG,uBAAuBvB,aAAawB,mBAAmB,CAAC,IAAI,CAACxB,YAAY,EAAE,IAAI,CAACF,SAAS,EAAEkB,eAAeC,gBAAgBC;oBAEhI,IAAI,CAACrB,QAAQ,GAAG0B,sBAAsB,GAAG;oBAEzC,IAAI,IAAI,CAAC1B,QAAQ,EAAE;wBACjBqB,gBAAgBO,KAAK,CAAC,AAAC,mBAAqC,OAAnBN,oBAAmB;oBAC9D;gBACF;YACF;;;YAEAK,KAAAA;mBAAAA,SAAAA,oBAAoBxB,YAAY,EAAEF,SAAS,EAAEkB,aAAa,EAAEC,cAAc,EAAEC,eAAe;gBACzF,IAAIK,uBAAuB;gBAE3B,IAAMJ,qBAAqBnB,aAAa0B,SAAS;gBAEjDR,gBAAgBI,KAAK,CAAC,AAAC,iBAAmC,OAAnBH,oBAAmB;gBAE1D,IAAMQ,sBAAsB3B,cACtB4B,uBAAuB,IAAI,CAACC,cAAc,CAAC/B,WAAWoB,iBAAiBA,kBAAmB,GAAG;gBAEnG,IAAIU,yBAAyB,MAAM;oBACjCZ,cAAcc,QAAQ;oBAEtB,IAAMC,4BAA4BJ,oBAAoBD,SAAS,IACzDM,6BAA6BJ,qBAAqBF,SAAS;oBAEjER,gBAAgBI,KAAK,CAAC,AAAC,iBAAsES,OAAtDC,4BAA2B,6BAAqD,OAA1BD,2BAA0B;oBAEvH,IAAME,sBAAsBC,IAAAA,8BAAiB,EAACP,qBAAqBC,sBAAsBZ,eAAeC,gBAAgBC;oBAGxH,IAAIe,qBAAqB;wBACvBf,gBAAgBI,KAAK,CAAC,AAAC,mBAAwES,OAAtDC,4BAA2B,6BAAqD,OAA1BD,2BAA0B;oBAC3H;oBAEA,IAAMzB,UAAUY,iBAAkB,GAAG;oBAErCe,sBACEjB,cAAcmB,QAAQ,KACpBnB,cAAcoB,QAAQ,CAAC9B;oBAE3BiB,uBAAuBU,qBAAsB,GAAG;gBAClD;gBAEA,IAAIV,sBAAsB;oBACxBL,gBAAgBO,KAAK,CAAC,AAAC,mBAAqC,OAAnBN,oBAAmB;gBAC9D;gBAEA,OAAOI;YACT;;;YAEAM,KAAAA;mBAAAA,SAAAA,eAAe/B,SAAS,EAAEmB,cAAc,EAAEC,eAAe;gBACvD,IAAIU,uBAAuB;gBAE3B,IAAMZ,gBAAgBqB,sBAAa,CAACC,WAAW,IACzCC,mBAAmB,IAAI,CAACzC,SAAS,CAAC+B,cAAc,CAAC/B,WAAWkB,eAAeC,gBAAgBC;gBAEjG,IAAIqB,kBAAkB;oBACpB,IAAMC,sBAAsBxB,cAAcyB,SAAS;oBAEnD,IAAID,wBAAwB,GAAG;wBAC7B,IAAME,oBAAoB1B,cAAc2B,oBAAoB;wBAE5Df,uBAAuBc,mBAAmB,GAAG;oBAC/C;gBACF;gBAEA,OAAOd;YACT;;;YAEAgB,KAAAA;mBAAAA,SAAAA;gBACE,IAAMC,mBAAmBC,IAAAA,oCAA8B,EAAC,IAAI,CAAC/C,YAAY,GACnEgD,gBAAgBC,IAAAA,8BAAwB,EAAC,IAAI,CAAClD,SAAS,GACvDC,eAAe8C,kBACf/C,YAAYiD,eACZrD,SAAS,IAAI,CAACA,MAAM,EACpBuD,OAAO;oBACLvD,QAAAA;oBACAI,WAAAA;oBACAC,cAAAA;gBACF;gBAEN,OAAOkD;YACT;;;;YAEOC,KAAAA;mBAAP,SAAOA,SAASD,IAAI,EAAEE,WAAW;gBAC/B,IAAM,AAAEzD,SAAWuD,KAAXvD,QACFY,UAAU6C,aACVC,qCAAqCC,kBAAkC,CAACC,UAAU,CAAC5D,QAAQY,UAC3FX,OAAOyD,mCAAmCG,OAAO,IACjD3D,SAASwD,mCAAmCI,SAAS,IACrD3D,WAAW,MACXC,YAAY2D,IAAAA,uBAAiB,EAACR,MAAME,cACpCpD,eAAe2D,IAAAA,0BAAoB,EAACT,MAAME,cAC1CnD,eAAe,MACf2D,wBAAwB,IArKblE,sBAqKuCC,QAAQC,MAAMC,QAAQC,UAAUC,WAAWC,cAAcC;gBAEjH,OAAO2D;YACT;;;YAEOC,KAAAA;mBAAP,SAAOA,6BAA6B9D,SAAS,EAAEC,YAAY,EAAEO,OAAO;gBAClER,YAAYS,IAAAA,oCAA0B,EAACT,WAAWQ,UAAU,GAAG;gBAE/D,IAAMZ,SAASmE,mCAAmC/D,WAAWC,eACvDqD,qCAAqCC,kBAAkC,CAACC,UAAU,CAAC5D,QAAQY,UAC3FX,OAAOyD,mCAAmCG,OAAO,IACjD3D,SAASwD,mCAAmCI,SAAS,IACrD3D,WAAW,MACXG,eAAe,MACf2D,wBAAwB,IAnLblE,sBAmLuCC,QAAQC,MAAMC,QAAQC,UAAUC,WAAWC,cAAcC;gBAEjH,OAAO2D;YACT;;;YAEOG,KAAAA;mBAAP,SAAOA,yCAAyChE,SAAS,EAAEC,YAAY,EAAEC,YAAY,EAAEM,OAAO;gBAC5FR,YAAYS,IAAAA,oCAA0B,EAACT,WAAWQ,UAAU,GAAG;gBAE/D,IAAMZ,SAASqE,+CAA+CjE,WAAWC,cAAcC,cAAcM,UAC/F8C,qCAAqCC,kBAAkC,CAACC,UAAU,CAAC5D,QAAQY,UAC3FX,OAAOyD,mCAAmCG,OAAO,IACjD3D,SAASwD,mCAAmCI,SAAS,IACrD3D,WAAW,OACX8D,wBAAwB,IAhMblE,sBAgMuCC,QAAQC,MAAMC,QAAQC,UAAUC,WAAWC,cAAcC;gBAEjH,OAAO2D;YACT;;;WAnMmBlE;EAA8BuE,qBAAY;AAsM/D,SAASH,mCAAmC/D,SAAS,EAAEC,YAAY;IACjE,IAAMkE,kBAAkBnE,UAAU4B,SAAS,IACrCwC,qBAAqBnE,aAAa2B,SAAS,IAC3ChC,SAAS,AAAC,IAA0BwE,OAAvBD,iBAAgB,SAA0B,OAAnBC,oBAAmB;IAE7D,OAAOxE;AACT;AAEA,SAASqE,+CAA+CjE,SAAS,EAAEC,YAAY,EAAEC,YAAY;IAC3F,IAAIN;IAEJ,IAAMuE,kBAAkBnE,UAAU4B,SAAS,IACrCwC,qBAAqBnE,aAAa2B,SAAS;IAEjD,IAAI1B,iBAAiB,MAAM;QACzBN,SAAS,AAAC,IAA0BwE,OAAvBD,iBAAgB,SAA0B,OAAnBC,oBAAmB;IACzD,OAAO;QACL,IAAM/C,qBAAqBnB,aAAa0B,SAAS;QAEjDhC,SAAS,AAAC,IAA0BwE,OAAvBD,iBAAgB,SAA4B9C,OAArB+C,oBAAwC,OAAnB/C,oBAAmB;IAC9E;IAEA,OAAOzB;AACT"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/substitution/statement.js"],"sourcesContent":["\"use strict\";\n\nimport Substitution from \"../substitution\";\nimport Substitutions from \"../substitutions\";\nimport StatementSubstitutionPartialContext from \"../context/partial/substitution/statement\";\n\nimport { unifySubstitution } from \"../utilities/unification\";\nimport { stripBracketsFromStatement } from \"../utilities/brackets\";\nimport { statementFromJSON, statementToStatementJSON, metavariableFromJSON, metavariableToMetavariableJSON } from \"../utilities/json\";\n\nexport default class StatementSubstitution extends Substitution {\n  constructor(string, node, tokens, resolved, statement, metavariable, substitution) {\n    super(string, node, tokens);\n\n    this.resolved = resolved;\n    this.statement = statement;\n    this.metavariable = metavariable;\n    this.substitution = substitution;\n  }\n\n  isResolved() {\n    return this.resolved;\n  }\n\n  getStatement() {\n    return this.statement;\n  }\n\n  getMetavariable() {\n    return this.metavariable;\n  }\n\n  getSubstitution() {\n    return this.substitution;\n  }\n\n  isStatementEqualTo(statement, context) {\n    statement = stripBracketsFromStatement(statement, context); ///\n\n    const statementEqualTo = this.statement.isEqualTo(statement);\n\n    return statementEqualTo;\n  }\n\n  isMetavariableEqualTo(metavariable) { return this.metavariable.isEqualTo(metavariable); }\n\n  isSubstitutionEqualTo(substitution) {\n    let substitutionEqualTo;\n\n    if (false) {\n      ///\n    } else if ((substitution === null) && (this.substitution === null)) {\n      substitutionEqualTo = true;\n    } else if ((substitution !== null) && (this.substitution === null)) {\n      substitutionEqualTo = false;\n    } else if ((substitution === null) && (this.substitution !== null)) {\n      substitutionEqualTo = false;\n    } else {\n      substitutionEqualTo = this.substitution.isEqualTo(substitution);\n    }\n\n    return substitutionEqualTo;\n  }\n\n  isSimple() {\n    const simple = (this.substitution === null);\n\n    return simple;\n  }\n\n  resolve(substitutions, generalContext, specificContext) {\n    const substitutionString = this.string;\n\n    const metavariable = this.getMetavariable(),\n          simpleSubstitution = substitutions.findSimpleSubstitutionByMetavariable(metavariable);\n\n    if (simpleSubstitution !== null) {\n      specificContext.trace(`Resolving the ${substitutionString} substitution...`);\n\n      const substitution = simpleSubstitution,  ///\n            substitutionResolved = substitution.resolveSubstitution(this.substitution, this.statement, substitutions, generalContext, specificContext);\n\n      this.resolved = substitutionResolved; ///\n\n      if (this.resolved) {\n        specificContext.debug(`...resolved the ${substitutionString} substitution.`);\n      }\n    }\n  }\n\n  resolveSubstitution(substitution, statement, substitutions, generalContext, specificContext) {\n    let substitutionResolved = false;\n\n    const substitutionString = substitution.getString();\n\n    specificContext.trace(`Resolving the ${substitutionString} substitution...`);\n\n    const generalSubstitution = substitution, ///\n          specificSubstitution = this.unifyStatement(statement, specificContext, specificContext);  ///\n\n    if (specificSubstitution !== null) {\n      substitutions.snapshot();\n\n      const generalSubstitutionString = generalSubstitution.getString(),\n            specificSubstitutionString = specificSubstitution.getString();\n\n      specificContext.trace(`Unifying the '${specificSubstitutionString}' substitution with the '${generalSubstitutionString}' substitution...`);\n\n      const substitutionUnified = unifySubstitution(generalSubstitution, specificSubstitution, substitutions, generalContext, specificContext);\n\n\n      if (substitutionUnified) {\n        specificContext.trace(`...unified the '${specificSubstitutionString}' substitution with the '${generalSubstitutionString}' substitution.`);\n      }\n\n      const context = specificContext;  ///\n\n      substitutionUnified ?\n        substitutions.continue() :\n          substitutions.rollback(context);\n\n      substitutionResolved = substitutionUnified;  ///\n    }\n\n    if (substitutionResolved) {\n      specificContext.debug(`...resolved the ${substitutionString} substitution.`);\n    }\n\n    return substitutionResolved;\n  }\n\n  unifyStatement(statement, generalContext, specificContext) {\n    let specificSubstitution = null;\n\n    const substitutions = Substitutions.fromNothing(),\n          statementUnified = this.statement.unifyStatement(statement, substitutions, generalContext, specificContext);\n\n    if (statementUnified) {\n      const substitutionsLength = substitutions.getLength();\n\n      if (substitutionsLength === 1) {\n        const firstSubstitution = substitutions.getFirstSubstitution();\n\n        specificSubstitution = firstSubstitution; ///\n      }\n    }\n\n    return specificSubstitution;\n  }\n\n  toJSON() {\n    const metavariableJSON = metavariableToMetavariableJSON(this.metavariable),\n          statementJSON = statementToStatementJSON(this.statement),\n          metavariable = metavariableJSON,  ///\n          statement = statementJSON,  ///\n          string = this.string,\n          json = {\n            string,\n            statement,\n            metavariable\n          };\n\n    return json;\n  }\n\n  static fromJSON(json, fileContext) {\n    const { string } = json,\n          lexer = fileContext.getLexer(),\n          parser = fileContext.getParser(),\n          statementSubstitutionPartialContext = StatementSubstitutionPartialContext.fromStringLexerAndParser(string, lexer, parser),\n          node = statementSubstitutionPartialContext.getNode(),\n          tokens = statementSubstitutionPartialContext.getTokens(),\n          resolved = true,\n          statement = statementFromJSON(json, fileContext),\n          metavariable = metavariableFromJSON(json, fileContext),\n          substitution = null,  ///\n          statementSubstitution = new StatementSubstitution(string, node, tokens, resolved, statement, metavariable, substitution);\n\n    return statementSubstitution;\n  }\n\n  static fromStatementAndMetavariable(statement, metavariable, context) {\n    statement = stripBracketsFromStatement(statement, context); ///\n\n    const string = stringFromStatementAndMetavariable(statement, metavariable),\n          lexer = context.getLexer(),\n          parser = context.getParser(),\n          statementSubstitutionPartialContext = StatementSubstitutionPartialContext.fromStringLexerAndParser(string, lexer, parser),\n          node = statementSubstitutionPartialContext.getNode(),\n          tokens = statementSubstitutionPartialContext.getTokens(),\n          resolved = true,\n          substitution = null,\n          statementSubstitution = new StatementSubstitution(string, node, tokens, resolved, statement, metavariable, substitution);\n\n    return statementSubstitution;\n  }\n\n  static fromStatementMetavariableAndSubstitution(statement, metavariable, substitution, context) {\n    statement = stripBracketsFromStatement(statement, context); ///\n\n    const string = stringFromStatementMetavariableAndSubstitution(statement, metavariable, substitution, context),\n          lexer = context.getLexer(),\n          parser = context.getParser(),\n          statementSubstitutionPartialContext = StatementSubstitutionPartialContext.fromStringLexerAndParser(string, lexer, parser),\n          node = statementSubstitutionPartialContext.getNode(),\n          tokens = statementSubstitutionPartialContext.getTokens(),\n          resolved = false,\n          statementSubstitution = new StatementSubstitution(string, node, tokens, resolved, statement, metavariable, substitution);\n\n    return statementSubstitution;\n  }\n}\n\nfunction stringFromStatementAndMetavariable(statement, metavariable) {\n  const statementString = statement.getString(),\n        metavariableString = metavariable.getString(),\n        string = `[${statementString} for ${metavariableString}]`;\n\n  return string;\n}\n\nfunction stringFromStatementMetavariableAndSubstitution(statement, metavariable, substitution) {\n  let string;\n\n  const statementString = statement.getString(),\n        metavariableString = metavariable.getString();\n\n  if (substitution === null) {\n    string = `[${statementString} for ${metavariableString}]`;\n  } else {\n    const substitutionString = substitution.getString();\n\n    string = `[${statementString} for ${metavariableString}${substitutionString}]`;\n  }\n\n  return string;\n}\n"],"names":["StatementSubstitution","string","node","tokens","resolved","statement","metavariable","substitution","isResolved","getStatement","getMetavariable","getSubstitution","isStatementEqualTo","context","stripBracketsFromStatement","statementEqualTo","isEqualTo","isMetavariableEqualTo","isSubstitutionEqualTo","substitutionEqualTo","isSimple","simple","resolve","substitutions","generalContext","specificContext","substitutionString","simpleSubstitution","findSimpleSubstitutionByMetavariable","trace","substitutionResolved","resolveSubstitution","debug","getString","generalSubstitution","specificSubstitution","unifyStatement","snapshot","generalSubstitutionString","specificSubstitutionString","substitutionUnified","unifySubstitution","continue","rollback","Substitutions","fromNothing","statementUnified","substitutionsLength","getLength","firstSubstitution","getFirstSubstitution","toJSON","metavariableJSON","metavariableToMetavariableJSON","statementJSON","statementToStatementJSON","json","fromJSON","fileContext","lexer","getLexer","parser","getParser","statementSubstitutionPartialContext","StatementSubstitutionPartialContext","fromStringLexerAndParser","getNode","getTokens","statementFromJSON","metavariableFromJSON","statementSubstitution","fromStatementAndMetavariable","stringFromStatementAndMetavariable","fromStatementMetavariableAndSubstitution","stringFromStatementMetavariableAndSubstitution","Substitution","statementString","metavariableString"],"mappings":"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"}

package/lib/substitution/term.js

@@ -10,7 +10,7 @@ Object.defineProperty(exports, "default", {
 });
 var _dom = /*#__PURE__*/ _interop_require_default(require("../dom"));
 var _substitution = /*#__PURE__*/ _interop_require_default(require("../substitution"));
-var _term = /*#__PURE__*/ _interop_require_default(require("../nodeAndTokens/substitution/term"));
+var _term = /*#__PURE__*/ _interop_require_default(require("../context/partial/substitution/term"));
 var _query = require("../utilities/query");
 var _brackets = require("../utilities/brackets");
 function _assert_this_initialized(self) {
@@ -170,7 +170,7 @@ var TermSubstitution = /*#__PURE__*/ function(Substitution) {
                 termNode = (0, _brackets.stripBracketsFromTermNode)(termNode); ///
                 var Term = _dom.default.Term;
                 term = Term.fromTermNode(termNode, context);
-                var string = stringFromTermAndVariable(term, variable), termSubstitutionNodeAndTokens = _term.default.fromString(string, context), node = termSubstitutionNodeAndTokens.getNode(), tokens = termSubstitutionNodeAndTokens.getTokens(), termSubstitution = new TermSubstitution(string, node, tokens, term, variable);
+                var string = stringFromTermAndVariable(term, variable), lexer = context.getLexer(), parser = context.getParser(), termSubstitutionPartialContext = _term.default.fromStringLexerAndParser(string, lexer, parser), node = termSubstitutionPartialContext.getNode(), tokens = termSubstitutionPartialContext.getTokens(), termSubstitution = new TermSubstitution(string, node, tokens, term, variable);
                 return termSubstitution;
             }
         }
@@ -182,4 +182,4 @@ function stringFromTermAndVariable(term, variable) {
     return string;
 }
 
-//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/substitution/term.js"],"sourcesContent":["\"use strict\";\n\nimport dom from \"../dom\";\nimport Substitution from \"../substitution\";\nimport TermSubstitutionNodeAndTokens from \"../nodeAndTokens/substitution/term\";\n\nimport { nodeQuery } from \"../utilities/query\";\nimport { stripBracketsFromTerm } from \"../utilities/brackets\";\nimport { stripBracketsFromTermNode } from \"../utilities/brackets\";\n\nconst termNodeQuery = nodeQuery(\"/termSubstitution/term[0]\"),\n      variableNodeQuery = nodeQuery(\"/termSubstitution/term[1]/variable!\"),\n      termSubstitutionNodeQuery = nodeQuery(\"/statement/termSubstitution\");\n\nexport default class TermSubstitution extends Substitution {\n  constructor(string, node, tokens, term, variable) {\n    super(string, node, tokens);\n\n    this.term = term;\n    this.variable = variable;\n  }\n\n  getTerm() {\n    return this.term;\n  }\n\n  getVariable() {\n    return this.variable;\n  }\n\n  isTermEqualTo(term, context) {\n    term = stripBracketsFromTerm(term); ///\n\n    const termEqualTo = this.term.isEqualTo(term);\n\n    return termEqualTo;\n  }\n\n  isVariableEqualTo(variable) { return this.variable.isEqualTo(variable); }\n\n  unifyWithEquivalence(equivalence) {\n    let unifiedWithEquivalence;\n\n    const termNode = this.term.getNode(),\n          equivalenceMatchesTermNode = equivalence.matchTermNode(termNode);\n\n    if (equivalenceMatchesTermNode) {\n      const variableNode = this.variable.getNode(),\n            equivalenceMatchesVariableNode = equivalence.matchVariableNode(variableNode);\n\n      if (equivalenceMatchesVariableNode) {\n          unifiedWithEquivalence = true;\n        }\n    }\n\n    return unifiedWithEquivalence;\n  }\n\n  static fromStatementNode(statementNode, context) {\n    let termSubstitution = null;\n\n    const termSubstitutionNode = termSubstitutionNodeQuery(statementNode);\n\n    if (termSubstitutionNode !== null) {\n      const termNode = termNodeQuery(termSubstitutionNode),\n            variableNode = variableNodeQuery(termSubstitutionNode);\n\n      if ((termNode !== null) && (variableNode !== null)) {\n        const { Term, Variable } = dom,\n              term = Term.fromTermNode(termNode, context),\n              variable = Variable.fromVariableNode(variableNode, context),\n              node = termSubstitutionNode,  ///\n              tokens = context.nodeAsTokens(node),\n              string = stringFromTermAndVariable(term, variable);\n\n        termSubstitution = new TermSubstitution(string, node, tokens, term, variable);\n      }\n    }\n\n    return termSubstitution;\n  }\n\n  static fromTernAndVariable(term, variable, context) {\n    let termNode = term.getNode();\n\n    termNode = stripBracketsFromTermNode(termNode); ///\n\n    const { Term } = dom;\n\n    term = Term.fromTermNode(termNode, context);\n\n    const string = stringFromTermAndVariable(term, variable),\n          termSubstitutionNodeAndTokens = TermSubstitutionNodeAndTokens.fromString(string, context),\n          node = termSubstitutionNodeAndTokens.getNode(),\n          tokens = termSubstitutionNodeAndTokens.getTokens(),\n          termSubstitution = new TermSubstitution(string, node, tokens, term, variable);\n\n    return termSubstitution;\n  }\n}\n\nfunction stringFromTermAndVariable(term, variable) {\n  const termString = term.getString(),\n        variableString = variable.getString(),\n        string = `[${termString} for ${variableString}]`;\n\n  return string;\n}\n"],"names":["TermSubstitution","termNodeQuery","nodeQuery","variableNodeQuery","termSubstitutionNodeQuery","string","node","tokens","term","variable","getTerm","getVariable","isTermEqualTo","context","stripBracketsFromTerm","termEqualTo","isEqualTo","isVariableEqualTo","unifyWithEquivalence","equivalence","unifiedWithEquivalence","termNode","getNode","equivalenceMatchesTermNode","matchTermNode","variableNode","equivalenceMatchesVariableNode","matchVariableNode","fromStatementNode","statementNode","termSubstitution","termSubstitutionNode","Term","dom","Variable","fromTermNode","fromVariableNode","nodeAsTokens","stringFromTermAndVariable","fromTernAndVariable","stripBracketsFromTermNode","termSubstitutionNodeAndTokens","TermSubstitutionNodeAndTokens","fromString","getTokens","Substitution","termString","getString","variableString"],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/substitution/term.js"],"sourcesContent":["\"use strict\";\n\nimport dom from \"../dom\";\nimport Substitution from \"../substitution\";\nimport TermSubstitutionPartialContext from \"../context/partial/substitution/term\";\n\nimport { nodeQuery } from \"../utilities/query\";\nimport { stripBracketsFromTerm } from \"../utilities/brackets\";\nimport { stripBracketsFromTermNode } from \"../utilities/brackets\";\n\nconst termNodeQuery = nodeQuery(\"/termSubstitution/term[0]\"),\n      variableNodeQuery = nodeQuery(\"/termSubstitution/term[1]/variable!\"),\n      termSubstitutionNodeQuery = nodeQuery(\"/statement/termSubstitution\");\n\nexport default class TermSubstitution extends Substitution {\n  constructor(string, node, tokens, term, variable) {\n    super(string, node, tokens);\n\n    this.term = term;\n    this.variable = variable;\n  }\n\n  getTerm() {\n    return this.term;\n  }\n\n  getVariable() {\n    return this.variable;\n  }\n\n  isTermEqualTo(term, context) {\n    term = stripBracketsFromTerm(term); ///\n\n    const termEqualTo = this.term.isEqualTo(term);\n\n    return termEqualTo;\n  }\n\n  isVariableEqualTo(variable) { return this.variable.isEqualTo(variable); }\n\n  unifyWithEquivalence(equivalence) {\n    let unifiedWithEquivalence;\n\n    const termNode = this.term.getNode(),\n          equivalenceMatchesTermNode = equivalence.matchTermNode(termNode);\n\n    if (equivalenceMatchesTermNode) {\n      const variableNode = this.variable.getNode(),\n            equivalenceMatchesVariableNode = equivalence.matchVariableNode(variableNode);\n\n      if (equivalenceMatchesVariableNode) {\n          unifiedWithEquivalence = true;\n        }\n    }\n\n    return unifiedWithEquivalence;\n  }\n\n  static fromStatementNode(statementNode, context) {\n    let termSubstitution = null;\n\n    const termSubstitutionNode = termSubstitutionNodeQuery(statementNode);\n\n    if (termSubstitutionNode !== null) {\n      const termNode = termNodeQuery(termSubstitutionNode),\n            variableNode = variableNodeQuery(termSubstitutionNode);\n\n      if ((termNode !== null) && (variableNode !== null)) {\n        const { Term, Variable } = dom,\n              term = Term.fromTermNode(termNode, context),\n              variable = Variable.fromVariableNode(variableNode, context),\n              node = termSubstitutionNode,  ///\n              tokens = context.nodeAsTokens(node),\n              string = stringFromTermAndVariable(term, variable);\n\n        termSubstitution = new TermSubstitution(string, node, tokens, term, variable);\n      }\n    }\n\n    return termSubstitution;\n  }\n\n  static fromTernAndVariable(term, variable, context) {\n    let termNode = term.getNode();\n\n    termNode = stripBracketsFromTermNode(termNode); ///\n\n    const { Term } = dom;\n\n    term = Term.fromTermNode(termNode, context);\n\n    const string = stringFromTermAndVariable(term, variable),\n          lexer = context.getLexer(),\n          parser = context.getParser(),\n          termSubstitutionPartialContext = TermSubstitutionPartialContext.fromStringLexerAndParser(string, lexer, parser),\n          node = termSubstitutionPartialContext.getNode(),\n          tokens = termSubstitutionPartialContext.getTokens(),\n          termSubstitution = new TermSubstitution(string, node, tokens, term, variable);\n\n    return termSubstitution;\n  }\n}\n\nfunction stringFromTermAndVariable(term, variable) {\n  const termString = term.getString(),\n        variableString = variable.getString(),\n        string = `[${termString} for ${variableString}]`;\n\n  return string;\n}\n"],"names":["TermSubstitution","termNodeQuery","nodeQuery","variableNodeQuery","termSubstitutionNodeQuery","string","node","tokens","term","variable","getTerm","getVariable","isTermEqualTo","context","stripBracketsFromTerm","termEqualTo","isEqualTo","isVariableEqualTo","unifyWithEquivalence","equivalence","unifiedWithEquivalence","termNode","getNode","equivalenceMatchesTermNode","matchTermNode","variableNode","equivalenceMatchesVariableNode","matchVariableNode","fromStatementNode","statementNode","termSubstitution","termSubstitutionNode","Term","dom","Variable","fromTermNode","fromVariableNode","nodeAsTokens","stringFromTermAndVariable","fromTernAndVariable","stripBracketsFromTermNode","lexer","getLexer","parser","getParser","termSubstitutionPartialContext","TermSubstitutionPartialContext","fromStringLexerAndParser","getTokens","Substitution","termString","getString","variableString"],"mappings":"AAAA;;;;;;;eAcqBA;;;0DAZL;mEACS;2DACkB;qBAEjB;wBACY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAGtC,IAAMC,gBAAgBC,IAAAA,gBAAS,EAAC,8BAC1BC,oBAAoBD,IAAAA,gBAAS,EAAC,wCAC9BE,4BAA4BF,IAAAA,gBAAS,EAAC;AAE7B,IAAA,AAAMF,iCAAN;cAAMA;aAAAA,iBACPK,MAAM,EAAEC,IAAI,EAAEC,MAAM,EAAEC,IAAI,EAAEC,QAAQ;gCAD7BT;;gBAEjB,kBAFiBA;YAEXK;YAAQC;YAAMC;;QAEpB,MAAKC,IAAI,GAAGA;QACZ,MAAKC,QAAQ,GAAGA;;;kBALCT;;YAQnBU,KAAAA;mBAAAA,SAAAA;gBACE,OAAO,IAAI,CAACF,IAAI;YAClB;;;YAEAG,KAAAA;mBAAAA,SAAAA;gBACE,OAAO,IAAI,CAACF,QAAQ;YACtB;;;YAEAG,KAAAA;mBAAAA,SAAAA,cAAcJ,IAAI,EAAEK,OAAO;gBACzBL,OAAOM,IAAAA,+BAAqB,EAACN,OAAO,GAAG;gBAEvC,IAAMO,cAAc,IAAI,CAACP,IAAI,CAACQ,SAAS,CAACR;gBAExC,OAAOO;YACT;;;YAEAE,KAAAA;mBAAAA,SAAAA,kBAAkBR,QAAQ;gBAAI,OAAO,IAAI,CAACA,QAAQ,CAACO,SAAS,CAACP;YAAW;;;YAExES,KAAAA;mBAAAA,SAAAA,qBAAqBC,WAAW;gBAC9B,IAAIC;gBAEJ,IAAMC,WAAW,IAAI,CAACb,IAAI,CAACc,OAAO,IAC5BC,6BAA6BJ,YAAYK,aAAa,CAACH;gBAE7D,IAAIE,4BAA4B;oBAC9B,IAAME,eAAe,IAAI,CAAChB,QAAQ,CAACa,OAAO,IACpCI,iCAAiCP,YAAYQ,iBAAiB,CAACF;oBAErE,IAAIC,gCAAgC;wBAChCN,yBAAyB;oBAC3B;gBACJ;gBAEA,OAAOA;YACT;;;;YAEOQ,KAAAA;mBAAP,SAAOA,kBAAkBC,aAAa,EAAEhB,OAAO;gBAC7C,IAAIiB,mBAAmB;gBAEvB,IAAMC,uBAAuB3B,0BAA0ByB;gBAEvD,IAAIE,yBAAyB,MAAM;oBACjC,IAAMV,WAAWpB,cAAc8B,uBACzBN,eAAetB,kBAAkB4B;oBAEvC,IAAI,AAACV,aAAa,QAAUI,iBAAiB,MAAO;wBAClD,IAAQO,OAAmBC,YAAG,CAAtBD,MAAME,WAAaD,YAAG,CAAhBC,UACR1B,OAAOwB,KAAKG,YAAY,CAACd,UAAUR,UACnCJ,WAAWyB,SAASE,gBAAgB,CAACX,cAAcZ,UACnDP,OAAOyB,sBACPxB,SAASM,QAAQwB,YAAY,CAAC/B,OAC9BD,SAASiC,0BAA0B9B,MAAMC;wBAE/CqB,mBAAmB,IA7DN9B,iBA6D2BK,QAAQC,MAAMC,QAAQC,MAAMC;oBACtE;gBACF;gBAEA,OAAOqB;YACT;;;YAEOS,KAAAA;mBAAP,SAAOA,oBAAoB/B,IAAI,EAAEC,QAAQ,EAAEI,OAAO;gBAChD,IAAIQ,WAAWb,KAAKc,OAAO;gBAE3BD,WAAWmB,IAAAA,mCAAyB,EAACnB,WAAW,GAAG;gBAEnD,IAAM,AAAEW,OAASC,YAAG,CAAZD;gBAERxB,OAAOwB,KAAKG,YAAY,CAACd,UAAUR;gBAEnC,IAAMR,SAASiC,0BAA0B9B,MAAMC,WACzCgC,QAAQ5B,QAAQ6B,QAAQ,IACxBC,SAAS9B,QAAQ+B,SAAS,IAC1BC,iCAAiCC,aAA8B,CAACC,wBAAwB,CAAC1C,QAAQoC,OAAOE,SACxGrC,OAAOuC,+BAA+BvB,OAAO,IAC7Cf,SAASsC,+BAA+BG,SAAS,IACjDlB,mBAAmB,IAnFR9B,iBAmF6BK,QAAQC,MAAMC,QAAQC,MAAMC;gBAE1E,OAAOqB;YACT;;;WAtFmB9B;EAAyBiD,qBAAY;AAyF1D,SAASX,0BAA0B9B,IAAI,EAAEC,QAAQ;IAC/C,IAAMyC,aAAa1C,KAAK2C,SAAS,IAC3BC,iBAAiB3C,SAAS0C,SAAS,IACnC9C,SAAS,AAAC,IAAqB+C,OAAlBF,YAAW,SAAsB,OAAfE,gBAAe;IAEpD,OAAO/C;AACT"}

package/package.json

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

package/src/context/bracketed/combinator.js

@@ -1,9 +1,10 @@
 "use strict";
 
 import BracketedContext from "../../context/bracketted";
-import StatementNodeAndTokens from "../../nodeAndTokens/statement";
+import StatementPartialContext from "../../context/partial/statement";
 
 import { STATEMENT_META_TYPE_NAME } from "../../metaTypeNames";
+import { nominalLexer, nominalParser } from "../../utilities/nominal";
 
 class CombinatorBracketedContext extends BracketedContext {
   getBracketedStatementNode() {
@@ -15,8 +16,11 @@ class CombinatorBracketedContext extends BracketedContext {
 
   static fromNothing() {
     const string = `(${STATEMENT_META_TYPE_NAME})`,
-          NodeAndTokens = StatementNodeAndTokens,
-          combinatorBracketedContext = BracketedContext.fromStringAndNodeAndTokens(CombinatorBracketedContext, string, NodeAndTokens);
+          lexer = nominalLexer, ///
+          parser = nominalParser, ///
+          statementPartialContext = StatementPartialContext.fromStringLexerAndParser(string, lexer, parser),
+          context = statementPartialContext,  ///
+          combinatorBracketedContext = BracketedContext.fromString(CombinatorBracketedContext, string, context);
 
     return combinatorBracketedContext;
   }

package/src/context/bracketed/constructor.js

@@ -1,9 +1,10 @@
 "use strict";
 
 import BracketedContext from "../../context/bracketted";
-import TermNodeAndTokens from "../../nodeAndTokens/term";
+import TermPartialContext from "../../context/partial/term";
 
 import { OBJECT_TYPE_NAME } from "../../typeNames";
+import { nominalLexer, nominalParser } from "../../utilities/nominal";
 
 class ConstructorBracketedContext extends BracketedContext {
   getBracketedTermNode() {
@@ -15,8 +16,11 @@ class ConstructorBracketedContext extends BracketedContext {
 
   static fromNothing() {
     const string = `(${OBJECT_TYPE_NAME})`,
-          NodeAndTokens = TermNodeAndTokens,
-          constructorBracketedContext = BracketedContext.fromStringAndNodeAndTokens(ConstructorBracketedContext, string, NodeAndTokens);
+          lexer = nominalLexer, ///
+          parser = nominalParser, ///
+          termPartialContext = TermPartialContext.fromStringLexerAndParser(string, lexer, parser),
+          context = termPartialContext,
+          constructorBracketedContext = BracketedContext.fromString(ConstructorBracketedContext, string, context);
 
     return constructorBracketedContext;
   }

package/src/context/bracketted.js

@@ -1,7 +1,5 @@
 "use strict";
 
-import { nominalLexer, nominalParser } from "../utilities/nominal";
-
 export default class BracketedContext {
   constructor(string, node, tokens) {
     this.string = string;
@@ -33,29 +31,11 @@ export default class BracketedContext {
     return this.string;
   }
 
-  static fromStringAndNodeAndTokens(Class, string, NodeAndTokens) {
-    const context = { ///
-            getLexer,
-            getParser
-          },
-          nodeAndTokens = NodeAndTokens.fromString(string, context),
-          node = nodeAndTokens.getNode(),
-          tokens = nodeAndTokens.getTokens(),
+  static fromString(Class, string, context) {
+    const node = context.getNode(),
+          tokens = context.getTokens(),
           bracketedContext = new Class(string, node, tokens);
 
     return bracketedContext;
   }
 }
-
-function getLexer() {
-  const lexer = nominalLexer; //'
-
-  return lexer;
-}
-
-function getParser() {
-  const parser = nominalParser; //'
-
-  return parser;
-}
-

package/src/context/partial/metavariable.js

@@ -0,0 +1,39 @@
+"use strict";
+
+import PartialContext from "../../context/partial";
+
+import { ruleFromBNF } from "../../context/partial";
+
+const bnf = `
+
+        _ ::= metavariable... <END_OF_LINE> ;
+        
+      `,
+      rule = ruleFromBNF(bnf);
+
+export default class MetavariablePartialContext extends PartialContext {
+  getMetavariableNode() {
+    const metavariableNode = this.node; ///
+
+    return metavariableNode;
+  }
+
+  getMetavariableTokens() {
+    const metavariableTokens = this.tokens; ///
+
+    return metavariableTokens;
+  }
+
+  static rule = rule;
+
+  static fromMetavariable(metavariable, context) {
+    const string = metavariable.getString(),
+          lexer = context.getLexer(),
+          parser = context.getParser(),
+          metavariablePartialContext = PartialContext.fromStringLexerAndParser(MetavariablePartialContext, string, lexer, parser);
+
+    return metavariablePartialContext;
+  }
+
+  static fromStringLexerAndParser(string, lexer, parser) { return PartialContext.fromStringLexerAndParser(MetavariablePartialContext, string, lexer, parser); }
+}

package/src/context/partial/statement.js

@@ -0,0 +1,39 @@
+"use strict";
+
+import PartialContext from "../../context/partial";
+
+import { ruleFromBNF } from "../../context/partial";
+
+const bnf = `
+
+        _ ::= statement... <END_OF_LINE> ;
+        
+      `,
+      rule = ruleFromBNF(bnf);
+
+export default class StatementPartialContext extends PartialContext {
+  getStatementNode() {
+    const statementNode = this.node; ///
+
+    return statementNode;
+  }
+
+  getStatementTokens() {
+    const statementTokens = this.tokens; ///
+
+    return statementTokens;
+  }
+
+  static rule = rule;
+
+  static fromStatement(statement, context) {
+    const string = statement.getString(),
+          lexer = context.getLexer(),
+          parser = context.getParser(),
+          statementPartialContext = PartialContext.fromStringLexerAndParser(StatementPartialContext, string, lexer, parser);
+
+    return statementPartialContext;
+  }
+
+  static fromStringLexerAndParser(string, lexer, parser) { return PartialContext.fromStringLexerAndParser(StatementPartialContext, string, lexer, parser); }
+}

package/src/context/partial/substitution/frame.js

@@ -0,0 +1,18 @@
+"use strict";
+
+import PartialContext from "../../../context/partial";
+
+import { ruleFromBNF } from "../../../context/partial";
+
+const bnf = `
+
+        _ ::= frameSubstitution... <END_OF_LINE> ;
+            
+      `,
+      rule = ruleFromBNF(bnf);
+
+export default class FrameSubstitutionPartialContext extends PartialContext {
+  static rule = rule;
+
+  static fromStringLexerAndParser(string, lexer, parser) { return PartialContext.fromStringLexerAndParser(FrameSubstitutionPartialContext, string, lexer, parser); }
+}

package/src/context/partial/substitution/reference.js

@@ -0,0 +1,18 @@
+"use strict";
+
+import PartialContext from "../../../context/partial";
+
+import { ruleFromBNF } from "../../../context/partial";
+
+const bnf = `
+
+        _ ::= referenceSubstitution... <END_OF_LINE> ;
+            
+      `,
+      rule = ruleFromBNF(bnf);
+
+export default class ReferenceSubstitutionPartialContext extends PartialContext {
+  static rule = rule;
+
+  static fromStringLexerAndParser(string, lexer, parser) { return PartialContext.fromStringLexerAndParser(ReferenceSubstitutionPartialContext, string, lexer, parser); }
+}

package/src/context/partial/substitution/statement.js

@@ -0,0 +1,18 @@
+"use strict";
+
+import PartialContext from "../../../context/partial";
+
+import { ruleFromBNF } from "../../../context/partial";
+
+const bnf = `
+
+        _ ::= statementSubstitution... <END_OF_LINE> ;
+            
+      `,
+      rule = ruleFromBNF(bnf);
+
+export default class StatementSubstitutionPartialContext extends PartialContext {
+  static rule = rule;
+
+  static fromStringLexerAndParser(string, lexer, parser) { return PartialContext.fromStringLexerAndParser(StatementSubstitutionPartialContext, string, lexer, parser); }
+}

package/src/context/partial/substitution/term.js

@@ -0,0 +1,18 @@
+"use strict";
+
+import PartialContext from "../../../context/partial";
+
+import { ruleFromBNF } from "../../../context/partial";
+
+const bnf = `
+
+        _ ::= termSubstitution... <END_OF_LINE> ;
+            
+      `,
+      rule = ruleFromBNF(bnf);
+
+export default class TermSubstitutionPartialContext extends PartialContext {
+  static rule = rule;
+
+  static fromStringLexerAndParser(string, lexer, parser) { return PartialContext.fromStringLexerAndParser(TermSubstitutionPartialContext, string, lexer, parser); }
+}

package/src/context/partial/term.js

@@ -0,0 +1,49 @@
+"use strict";
+
+import PartialContext from "../../context/partial";
+
+import { ruleFromBNF } from "../../context/partial";
+
+const bnf = `
+
+        _ ::= term... <END_OF_LINE> ;
+        
+      `,
+      rule = ruleFromBNF(bnf);
+
+export default class TermPartialContext extends PartialContext {
+  getTermNode() {
+    const termNode = this.node; ///
+
+    return termNode;
+  }
+
+  getTermTokens() {
+    const termTokens = this.tokens; ///
+
+    return termTokens;
+  }
+
+  static rule = rule;
+
+  static fromTerm(term, context) {
+    const string = term.getString(),
+          lexer = context.getLexer(),
+          parser = context.getParser(),
+          termPartialContext = PartialContext.fromStringLexerAndParser(TermPartialContext, string, lexer, parser);
+
+    return termPartialContext;
+  }
+
+  static fromStringLexerAndParser(string, lexer, parser) { return PartialContext.fromStringLexerAndParser(TermPartialContext, string, lexer, parser); }
+}
+
+export function termNodeFromTermString(termString, context) {
+  const string = termString,  ///
+        lexer = context.getLexer(),
+        parser = context.getParser(),
+        termPartialContext = TermPartialContext.fromStringLexerAndParser(string, lexer, parser),
+        termNode = termPartialContext.getTermNode();
+
+  return termNode;
+}

package/src/context/partial/variable.js

@@ -0,0 +1,49 @@
+"use strict";
+
+import PartialContext from "../../context/partial";
+
+import { ruleFromBNF } from "../../context/partial";
+
+const bnf = `
+
+        _ ::= variable... <END_OF_LINE> ;
+        
+      `,
+      rule = ruleFromBNF(bnf);
+
+export default class VariablePartialContext extends PartialContext {
+  getVariableNode() {
+    const variableNode = this.node; ///
+
+    return variableNode;
+  }
+
+  getVariableTokens() {
+    const variableTokens = this.tokens; ///
+
+    return variableTokens;
+  }
+
+  static rule = rule;
+
+  static fromVariable(variable, context) {
+    const string = variable.getString(),
+          lexer = context.getLexer(),
+          parser = context.getParser(),
+          variablePartialContext = PartialContext.fromStringLexerAndParser(VariablePartialContext, string, context, lexer, parser);
+
+    return variablePartialContext;
+  }
+
+  static fromStringLexerAndParser(string, lexer, parser) { return PartialContext.fromStringLexerAndParser(VariablePartialContext, string, lexer, parser); }
+}
+
+export function variableNodeFromVariableString(variableString, context) {
+  const string = variableString,  ///
+        lexer = context.getLexer(),
+        parser = context.getParser(),
+        variablePartialContext = VariablePartialContext.fromStringLexerAndParser(string, lexer, parser),
+        variableNode = variablePartialContext.getVariableNode();
+
+  return variableNode;
+}

package/src/{nodeAndTokens.js → context/partial.js}

@@ -4,7 +4,7 @@ import { BNFLexer } from "occam-lexers";
 import { BNFParser } from "occam-parsers";
 import { arrayUtilities } from "necessary";
 
-import { nodeQuery } from "./utilities/query";
+import { nodeQuery } from "../utilities/query";
 
 const { first } = arrayUtilities;
 
@@ -13,7 +13,7 @@ const bnfLexer = BNFLexer.fromNothing(),
 
 const childNodeQuery = nodeQuery("/*/*!");
 
-export default class NodeAndTokens {
+export default class PartialContext {
   constructor(node, tokens) {
     this.node = node;
     this.tokens = tokens;
@@ -27,10 +27,8 @@ export default class NodeAndTokens {
     return this.tokens;
   }
 
-  static fromString(Class, string, context) {
+  static fromStringLexerAndParser(Class, string, lexer, parser) {
     const { rule } = Class,
-          lexer = context.getLexer(),
-          parser = context.getParser(),
           ruleMap = parser.getRuleMap(),
           ruleName = rule.getName();
 
@@ -51,9 +49,9 @@ export default class NodeAndTokens {
 
     tokens = tokensFromTokensAndNode(tokens, node);  ///
 
-    const nodeAndTokens = new Class(node, tokens);
+    const partialContext = new Class(node, tokens);
 
-    return nodeAndTokens;
+    return partialContext;
   }
 }