occam-verify-cli 0.0.1089 → 0.0.1091
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/bin/action/verify.js +2 -2
- package/lib/assertion/contained.js +35 -41
- package/lib/assertion/defined.js +24 -24
- package/lib/assertion/subproof.js +24 -24
- package/lib/assertion/type.js +23 -23
- package/lib/assignment/equality.js +4 -10
- package/lib/assignment/judgement.js +4 -4
- package/lib/assignment/variable.js +4 -4
- package/lib/combinator/bracketed.js +3 -3
- package/lib/conclusion.js +11 -13
- package/lib/consequent.js +11 -13
- package/lib/constructor/bracketed.js +3 -3
- package/lib/constructor.js +2 -2
- package/lib/context/file.js +28 -27
- package/lib/context/local.js +31 -32
- package/lib/context/release.js +6 -3
- package/lib/declaration.js +18 -18
- package/lib/derivation.js +3 -3
- package/lib/equality.js +24 -24
- package/lib/equivalence.js +13 -13
- package/lib/frame.js +43 -43
- package/lib/index.js +2 -1
- package/lib/judgement.js +20 -20
- package/lib/label.js +9 -1
- package/lib/metaType.js +2 -2
- package/lib/metavariable.js +40 -39
- package/lib/mixins/statement/qualified/unify.js +19 -19
- package/lib/mixins/statement/resolve.js +11 -11
- package/lib/mixins/statement/unify.js +12 -12
- package/lib/mixins/statement/verify.js +36 -36
- package/lib/mixins/term/verify.js +2 -2
- package/lib/premise.js +31 -40
- package/lib/proof.js +6 -5
- package/lib/proofStep.js +17 -17
- package/lib/reference.js +8 -8
- package/lib/rule.js +21 -21
- package/lib/statement/qualified.js +17 -17
- package/lib/statement/unqualified.js +19 -19
- package/lib/statement.js +52 -54
- package/lib/subDerivation.js +3 -3
- package/lib/subproof.js +6 -5
- package/lib/substitution/frameForMetavariable.js +16 -39
- package/lib/substitution/statementForMetavariable.js +88 -74
- package/lib/substitution/termForVariable.js +15 -41
- package/lib/substitution.js +20 -6
- package/lib/substitutions.js +13 -13
- package/lib/supposition.js +31 -40
- package/lib/term.js +28 -28
- package/lib/topLevelAssertion.js +33 -21
- package/lib/unifier/equality.js +8 -8
- package/lib/unifier/intrinsicLevel.js +149 -0
- package/lib/unifier/metaLevel.js +41 -31
- package/lib/unifier/metavariable.js +14 -8
- package/lib/unifier/statementWithCombinator.js +16 -16
- package/lib/unifier/termWithConstructor.js +6 -6
- package/lib/unifier.js +47 -47
- package/lib/utilities/assignments.js +3 -3
- package/lib/utilities/equivalences.js +14 -14
- package/lib/utilities/json.js +22 -21
- package/lib/utilities/unifier.js +7 -8
- package/lib/variable.js +33 -33
- package/lib/verifier/statementAsCombinator.js +2 -2
- package/lib/verifier/termAsConstructor.js +2 -2
- package/package.json +2 -2
- package/src/assertion/contained.js +37 -45
- package/src/assertion/defined.js +25 -25
- package/src/assertion/subproof.js +25 -28
- package/src/assertion/type.js +23 -23
- package/src/assignment/equality.js +4 -6
- package/src/assignment/judgement.js +4 -4
- package/src/assignment/variable.js +4 -4
- package/src/combinator/bracketed.js +2 -2
- package/src/conclusion.js +14 -15
- package/src/consequent.js +14 -15
- package/src/constructor/bracketed.js +2 -2
- package/src/constructor.js +3 -2
- package/src/context/file.js +26 -25
- package/src/context/local.js +21 -23
- package/src/context/release.js +5 -3
- package/src/declaration.js +20 -20
- package/src/derivation.js +2 -2
- package/src/equality.js +26 -26
- package/src/equivalence.js +12 -12
- package/src/frame.js +42 -42
- package/src/index.js +1 -0
- package/src/judgement.js +25 -25
- package/src/label.js +14 -0
- package/src/metaType.js +1 -1
- package/src/metavariable.js +51 -43
- package/src/mixins/statement/qualified/unify.js +21 -21
- package/src/mixins/statement/resolve.js +12 -12
- package/src/mixins/statement/unify.js +11 -11
- package/src/mixins/statement/verify.js +35 -35
- package/src/mixins/term/verify.js +1 -1
- package/src/premise.js +42 -53
- package/src/proof.js +6 -4
- package/src/proofStep.js +21 -21
- package/src/reference.js +12 -11
- package/src/rule.js +20 -20
- package/src/statement/qualified.js +18 -17
- package/src/statement/unqualified.js +19 -18
- package/src/statement.js +63 -66
- package/src/subDerivation.js +2 -3
- package/src/subproof.js +6 -4
- package/src/substitution/frameForMetavariable.js +29 -45
- package/src/substitution/statementForMetavariable.js +136 -86
- package/src/substitution/termForVariable.js +28 -49
- package/src/substitution.js +15 -5
- package/src/substitutions.js +12 -12
- package/src/supposition.js +41 -53
- package/src/term.js +27 -27
- package/src/topLevelAssertion.js +32 -19
- package/src/unifier/equality.js +7 -7
- package/src/unifier/intrinsicLevel.js +61 -0
- package/src/unifier/metaLevel.js +60 -46
- package/src/unifier/metavariable.js +22 -13
- package/src/unifier/statementWithCombinator.js +28 -28
- package/src/unifier/termWithConstructor.js +8 -8
- package/src/unifier.js +55 -55
- package/src/utilities/assignments.js +2 -2
- package/src/utilities/equivalences.js +13 -13
- package/src/utilities/json.js +76 -66
- package/src/utilities/unifier.js +10 -12
- package/src/variable.js +43 -40
- package/src/verifier/statementAsCombinator.js +2 -1
- package/src/verifier/termAsConstructor.js +2 -1
package/lib/conclusion.js
CHANGED
|
@@ -70,32 +70,30 @@ var Conclusion = /*#__PURE__*/ function() {
|
|
|
70
70
|
},
|
|
71
71
|
{
|
|
72
72
|
key: "unifyStatement",
|
|
73
|
-
value: function unifyStatement(statement, substitutions,
|
|
73
|
+
value: function unifyStatement(statement, substitutions, context) {
|
|
74
74
|
var statementUnified;
|
|
75
|
-
var
|
|
76
|
-
var
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
localContextB.trace("Unifying the '".concat(statementString, "' statement with the '").concat(conclusionString, "' conclusion..."));
|
|
80
|
-
statementUnified = this.unqualifiedStatement.unifyStatement(statement, substitutions, localContextA, localContextB);
|
|
75
|
+
var localContext = _local.default.fromFileContext(this.fileContext), generalContext = localContext, specificContext = context; ///
|
|
76
|
+
var conclusion = this, statementString = statement.getString(), conclusionString = conclusion.getString();
|
|
77
|
+
specificContext.trace("Unifying the '".concat(statementString, "' statement with the '").concat(conclusionString, "' conclusion..."));
|
|
78
|
+
statementUnified = this.unqualifiedStatement.unifyStatement(statement, substitutions, generalContext, specificContext);
|
|
81
79
|
if (statementUnified) {
|
|
82
|
-
|
|
80
|
+
specificContext.debug("...unified the '".concat(statementString, "' statement with the '").concat(conclusionString, "' conclusion."));
|
|
83
81
|
}
|
|
84
82
|
return statementUnified;
|
|
85
83
|
}
|
|
86
84
|
},
|
|
87
85
|
{
|
|
88
86
|
key: "verify",
|
|
89
|
-
value: function verify(
|
|
87
|
+
value: function verify(context) {
|
|
90
88
|
var verified = false;
|
|
91
89
|
var conclusionString = this.getString(); ///
|
|
92
|
-
|
|
93
|
-
var stated = true, assignments = [], unqualifiedStatementVerified = this.unqualifiedStatement.verify(assignments, stated,
|
|
90
|
+
context.trace("Verifying the '".concat(conclusionString, "' conclusion..."));
|
|
91
|
+
var stated = true, assignments = [], unqualifiedStatementVerified = this.unqualifiedStatement.verify(assignments, stated, context);
|
|
94
92
|
if (unqualifiedStatementVerified) {
|
|
95
93
|
verified = true;
|
|
96
94
|
}
|
|
97
95
|
if (verified) {
|
|
98
|
-
|
|
96
|
+
context.debug("...verified the '".concat(conclusionString, "' conclusion."));
|
|
99
97
|
}
|
|
100
98
|
return verified;
|
|
101
99
|
}
|
|
@@ -132,4 +130,4 @@ Object.assign(_shim.default, {
|
|
|
132
130
|
});
|
|
133
131
|
var _default = Conclusion;
|
|
134
132
|
|
|
135
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
133
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../src/conclusion.js"],"sourcesContent":["\"use strict\";\n\nimport shim from \"./shim\";\nimport LocalContext from \"./context/local\";\n\nimport { nodeQuery } from \"./utilities/query\";\nimport { unqualifiedStatementFromJSON, unqualifiedStatementToUnqualifiedStatementJSON } from \"./utilities/json\";\n\nconst unqualifiedStatementNodeQuery = nodeQuery(\"/conclusion/unqualifiedStatement\");\n\nclass Conclusion {\n  constructor(fileContext, unqualifiedStatement) {\n    this.fileContext = fileContext;\n    this.unqualifiedStatement = unqualifiedStatement;\n  }\n\n  getFileContext() {\n    return this.fileContext;\n  }\n\n  getUnqualifiedStatement() {\n    return this.unqualifiedStatement;\n  }\n\n  getString() { return this.unqualifiedStatement.getString(); }\n\n  getStatement() { return this.unqualifiedStatement.getStatement(); }\n\n  unifyStatement(statement, substitutions, context) {\n    let statementUnified;\n\n    const localContext = LocalContext.fromFileContext(this.fileContext),\n          generalContext = localContext, ///\n          specificContext = context; ///\n\n    const conclusion = this,  ///\n          statementString = statement.getString(),\n          conclusionString = conclusion.getString();\n\n    specificContext.trace(`Unifying the '${statementString}' statement with the '${conclusionString}' conclusion...`);\n\n    statementUnified = this.unqualifiedStatement.unifyStatement(statement, substitutions, generalContext, specificContext);\n\n    if (statementUnified) {\n      specificContext.debug(`...unified the '${statementString}' statement with the '${conclusionString}' conclusion.`);\n    }\n\n    return statementUnified;\n  }\n\n  verify(context) {\n    let verified = false;\n\n    const conclusionString = this.getString();  ///\n\n    context.trace(`Verifying the '${conclusionString}' conclusion...`);\n\n    const stated = true,\n          assignments = [],\n          unqualifiedStatementVerified = this.unqualifiedStatement.verify(assignments, stated, context);\n\n    if (unqualifiedStatementVerified) {\n      verified = true;\n    }\n\n    if (verified) {\n      context.debug(`...verified the '${conclusionString}' conclusion.`);\n    }\n\n    return verified;\n  }\n\n  toJSON() {\n    const unqualifiedStatementJSON = unqualifiedStatementToUnqualifiedStatementJSON(this.unqualifiedStatement),\n          unqualifiedStatement = unqualifiedStatementJSON,  ///\n          json = {\n            unqualifiedStatement\n          };\n\n    return json;\n  }\n\n  static fromJSON(json, fileContext) {\n    const unqualifiedStatement = unqualifiedStatementFromJSON(json, fileContext),\n          conclusion = new Conclusion(fileContext, unqualifiedStatement);\n\n    return conclusion;\n  }\n\n  static fromConclusionNode(conclusionNode, fileContext) {\n    const { UnqualifiedStatement } = shim,\n          unqualifiedStatementNode = unqualifiedStatementNodeQuery(conclusionNode),\n          unqualifiedStatement = UnqualifiedStatement.fromUnqualifiedStatementNode(unqualifiedStatementNode, fileContext),\n          conclusion = new Conclusion(fileContext, unqualifiedStatement);\n\n    return conclusion;\n  }\n}\n\nObject.assign(shim, {\n  Conclusion\n});\n\nexport default Conclusion;\n"],"names":["unqualifiedStatementNodeQuery","nodeQuery","Conclusion","fileContext","unqualifiedStatement","getFileContext","getUnqualifiedStatement","getString","getStatement","unifyStatement","statement","substitutions","context","statementUnified","localContext","LocalContext","fromFileContext","generalContext","specificContext","conclusion","statementString","conclusionString","trace","debug","verify","verified","stated","assignments","unqualifiedStatementVerified","toJSON","unqualifiedStatementJSON","unqualifiedStatementToUnqualifiedStatementJSON","json","fromJSON","unqualifiedStatementFromJSON","fromConclusionNode","conclusionNode","UnqualifiedStatement","shim","unqualifiedStatementNode","fromUnqualifiedStatementNode","Object","assign"],"mappings":"AAAA;;;;+BAuGA;;;eAAA;;;2DArGiB;4DACQ;qBAEC;oBACmE;;;;;;;;;;;;;;;;;;;;;;;;;AAE7F,IAAMA,gCAAgCC,IAAAA,gBAAS,EAAC;AAEhD,IAAA,AAAMC,2BAAN;aAAMA,WACQC,WAAW,EAAEC,oBAAoB;gCADzCF;QAEF,IAAI,CAACC,WAAW,GAAGA;QACnB,IAAI,CAACC,oBAAoB,GAAGA;;kBAH1BF;;YAMJG,KAAAA;mBAAAA,SAAAA;gBACE,OAAO,IAAI,CAACF,WAAW;YACzB;;;YAEAG,KAAAA;mBAAAA,SAAAA;gBACE,OAAO,IAAI,CAACF,oBAAoB;YAClC;;;YAEAG,KAAAA;mBAAAA,SAAAA;gBAAc,OAAO,IAAI,CAACH,oBAAoB,CAACG,SAAS;YAAI;;;YAE5DC,KAAAA;mBAAAA,SAAAA;gBAAiB,OAAO,IAAI,CAACJ,oBAAoB,CAACI,YAAY;YAAI;;;YAElEC,KAAAA;mBAAAA,SAAAA,eAAeC,SAAS,EAAEC,aAAa,EAAEC,OAAO;gBAC9C,IAAIC;gBAEJ,IAAMC,eAAeC,cAAY,CAACC,eAAe,CAAC,IAAI,CAACb,WAAW,GAC5Dc,iBAAiBH,cACjBI,kBAAkBN,SAAS,GAAG;gBAEpC,IAAMO,aAAa,IAAI,EACjBC,kBAAkBV,UAAUH,SAAS,IACrCc,mBAAmBF,WAAWZ,SAAS;gBAE7CW,gBAAgBI,KAAK,CAAC,AAAC,iBAAwDD,OAAxCD,iBAAgB,0BAAyC,OAAjBC,kBAAiB;gBAEhGR,mBAAmB,IAAI,CAACT,oBAAoB,CAACK,cAAc,CAACC,WAAWC,eAAeM,gBAAgBC;gBAEtG,IAAIL,kBAAkB;oBACpBK,gBAAgBK,KAAK,CAAC,AAAC,mBAA0DF,OAAxCD,iBAAgB,0BAAyC,OAAjBC,kBAAiB;gBACpG;gBAEA,OAAOR;YACT;;;YAEAW,KAAAA;mBAAAA,SAAAA,OAAOZ,OAAO;gBACZ,IAAIa,WAAW;gBAEf,IAAMJ,mBAAmB,IAAI,CAACd,SAAS,IAAK,GAAG;gBAE/CK,QAAQU,KAAK,CAAC,AAAC,kBAAkC,OAAjBD,kBAAiB;gBAEjD,IAAMK,SAAS,MACTC,cAAc,EAAE,EAChBC,+BAA+B,IAAI,CAACxB,oBAAoB,CAACoB,MAAM,CAACG,aAAaD,QAAQd;gBAE3F,IAAIgB,8BAA8B;oBAChCH,WAAW;gBACb;gBAEA,IAAIA,UAAU;oBACZb,QAAQW,KAAK,CAAC,AAAC,oBAAoC,OAAjBF,kBAAiB;gBACrD;gBAEA,OAAOI;YACT;;;YAEAI,KAAAA;mBAAAA,SAAAA;gBACE,IAAMC,2BAA2BC,IAAAA,oDAA8C,EAAC,IAAI,CAAC3B,oBAAoB,GACnGA,uBAAuB0B,0BACvBE,OAAO;oBACL5B,sBAAAA;gBACF;gBAEN,OAAO4B;YACT;;;;YAEOC,KAAAA;mBAAP,SAAOA,SAASD,IAAI,EAAE7B,WAAW;gBAC/B,IAAMC,uBAAuB8B,IAAAA,kCAA4B,EAACF,MAAM7B,cAC1DgB,aAAa,IA1EjBjB,WA0EgCC,aAAaC;gBAE/C,OAAOe;YACT;;;YAEOgB,KAAAA;mBAAP,SAAOA,mBAAmBC,cAAc,EAAEjC,WAAW;gBACnD,IAAM,AAAEkC,uBAAyBC,aAAI,CAA7BD,sBACFE,2BAA2BvC,8BAA8BoC,iBACzDhC,uBAAuBiC,qBAAqBG,4BAA4B,CAACD,0BAA0BpC,cACnGgB,aAAa,IAnFjBjB,WAmFgCC,aAAaC;gBAE/C,OAAOe;YACT;;;WAtFIjB;;AAyFNuC,OAAOC,MAAM,CAACJ,aAAI,EAAE;IAClBpC,YAAAA;AACF;IAEA,WAAeA"}
|
package/lib/consequent.js
CHANGED
|
@@ -70,32 +70,30 @@ var Consequent = /*#__PURE__*/ function() {
|
|
|
70
70
|
},
|
|
71
71
|
{
|
|
72
72
|
key: "unifyStatement",
|
|
73
|
-
value: function unifyStatement(statement, substitutions,
|
|
73
|
+
value: function unifyStatement(statement, substitutions, context) {
|
|
74
74
|
var statementUnified;
|
|
75
|
-
var
|
|
76
|
-
var
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
localContextB.trace("Unifying the '".concat(statementString, "' statement with the '").concat(consequentString, "' consequent..."));
|
|
80
|
-
statementUnified = this.unqualifiedStatement.unifyStatement(statement, substitutions, localContextA, localContextB);
|
|
75
|
+
var localContext = _local.default.fromFileContext(this.fileContext), generalContext = localContext, specificContext = context; ///
|
|
76
|
+
var consequent = this, statementString = statement.getString(), consequentString = consequent.getString();
|
|
77
|
+
specificContext.trace("Unifying the '".concat(statementString, "' statement with the '").concat(consequentString, "' consequent..."));
|
|
78
|
+
statementUnified = this.unqualifiedStatement.unifyStatement(statement, substitutions, generalContext, specificContext);
|
|
81
79
|
if (statementUnified) {
|
|
82
|
-
|
|
80
|
+
specificContext.debug("...unified the '".concat(statementString, "' statement with the '").concat(consequentString, "' consequent."));
|
|
83
81
|
}
|
|
84
82
|
return statementUnified;
|
|
85
83
|
}
|
|
86
84
|
},
|
|
87
85
|
{
|
|
88
86
|
key: "verify",
|
|
89
|
-
value: function verify(
|
|
87
|
+
value: function verify(context) {
|
|
90
88
|
var verified = false;
|
|
91
89
|
var consequentString = this.getString(); ///
|
|
92
|
-
|
|
93
|
-
var stated = true, assignments = [], unqualifiedStatementVerified = this.unqualifiedStatement.verify(assignments, stated,
|
|
90
|
+
context.trace("Verifying the '".concat(consequentString, "' consequent..."));
|
|
91
|
+
var stated = true, assignments = [], unqualifiedStatementVerified = this.unqualifiedStatement.verify(assignments, stated, context);
|
|
94
92
|
if (unqualifiedStatementVerified) {
|
|
95
93
|
verified = true;
|
|
96
94
|
}
|
|
97
95
|
if (verified) {
|
|
98
|
-
|
|
96
|
+
context.debug("...verified the '".concat(consequentString, "' consequent."));
|
|
99
97
|
}
|
|
100
98
|
return verified;
|
|
101
99
|
}
|
|
@@ -132,4 +130,4 @@ Object.assign(_shim.default, {
|
|
|
132
130
|
});
|
|
133
131
|
var _default = Consequent;
|
|
134
132
|
|
|
135
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
133
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../src/consequent.js"],"sourcesContent":["\"use strict\";\n\nimport shim from \"./shim\";\nimport LocalContext from \"./context/local\";\n\nimport { nodeQuery } from \"./utilities/query\";\nimport { unqualifiedStatementFromJSON, unqualifiedStatementToUnqualifiedStatementJSON } from \"./utilities/json\";\n\nconst unqualifiedStatementNodeQuery = nodeQuery(\"/consequent/unqualifiedStatement\");\n\nclass Consequent {\n  constructor(fileContext, unqualifiedStatement) {\n    this.fileContext = fileContext;\n    this.unqualifiedStatement = unqualifiedStatement;\n  }\n\n  getFileContext() {\n    return this.fileContext;\n  }\n\n  getUnqualifiedStatement() {\n    return this.unqualifiedStatement;\n  }\n\n  getString() { return this.unqualifiedStatement.getString(); }\n\n  getStatement() { return this.unqualifiedStatement.getStatement(); }\n\n  unifyStatement(statement, substitutions, context) {\n    let statementUnified;\n\n    const localContext = LocalContext.fromFileContext(this.fileContext),\n          generalContext = localContext, ///\n          specificContext = context; ///\n\n    const consequent = this,  ///\n          statementString = statement.getString(),\n          consequentString = consequent.getString();\n\n    specificContext.trace(`Unifying the '${statementString}' statement with the '${consequentString}' consequent...`);\n\n    statementUnified = this.unqualifiedStatement.unifyStatement(statement, substitutions, generalContext, specificContext);\n\n    if (statementUnified) {\n      specificContext.debug(`...unified the '${statementString}' statement with the '${consequentString}' consequent.`);\n    }\n\n    return statementUnified;\n  }\n\n  verify(context) {\n    let verified = false;\n\n    const consequentString = this.getString();  ///\n\n    context.trace(`Verifying the '${consequentString}' consequent...`);\n\n    const stated = true,\n          assignments = [],\n          unqualifiedStatementVerified = this.unqualifiedStatement.verify(assignments, stated, context);\n\n    if (unqualifiedStatementVerified) {\n      verified = true;\n    }\n\n    if (verified) {\n      context.debug(`...verified the '${consequentString}' consequent.`);\n    }\n\n    return verified;\n  }\n\n  toJSON() {\n    const unqualifiedStatementJSON = unqualifiedStatementToUnqualifiedStatementJSON(this.unqualifiedStatement),\n          unqualifiedStatement = unqualifiedStatementJSON,  ///\n          json = {\n            unqualifiedStatement\n          };\n\n    return json;\n  }\n\n  static fromJSON(json, fileContext) {\n    const unqualifiedStatement = unqualifiedStatementFromJSON(json, fileContext),\n          consequent = new Consequent(fileContext, unqualifiedStatement);\n\n    return consequent;\n  }\n\n  static fromConsequentNode(consequentNode, fileContext) {\n    const { UnqualifiedStatement } = shim,\n          unqualifiedStatementNode = unqualifiedStatementNodeQuery(consequentNode),\n          unqualifiedStatement = UnqualifiedStatement.fromUnqualifiedStatementNode(unqualifiedStatementNode, fileContext),\n          consequent = new Consequent(fileContext, unqualifiedStatement);\n\n    return consequent;\n  }\n}\n\nObject.assign(shim, {\n  Consequent\n});\n\nexport default Consequent;\n"],"names":["unqualifiedStatementNodeQuery","nodeQuery","Consequent","fileContext","unqualifiedStatement","getFileContext","getUnqualifiedStatement","getString","getStatement","unifyStatement","statement","substitutions","context","statementUnified","localContext","LocalContext","fromFileContext","generalContext","specificContext","consequent","statementString","consequentString","trace","debug","verify","verified","stated","assignments","unqualifiedStatementVerified","toJSON","unqualifiedStatementJSON","unqualifiedStatementToUnqualifiedStatementJSON","json","fromJSON","unqualifiedStatementFromJSON","fromConsequentNode","consequentNode","UnqualifiedStatement","shim","unqualifiedStatementNode","fromUnqualifiedStatementNode","Object","assign"],"mappings":"AAAA;;;;+BAuGA;;;eAAA;;;2DArGiB;4DACQ;qBAEC;oBACmE;;;;;;;;;;;;;;;;;;;;;;;;;AAE7F,IAAMA,gCAAgCC,IAAAA,gBAAS,EAAC;AAEhD,IAAA,AAAMC,2BAAN;aAAMA,WACQC,WAAW,EAAEC,oBAAoB;gCADzCF;QAEF,IAAI,CAACC,WAAW,GAAGA;QACnB,IAAI,CAACC,oBAAoB,GAAGA;;kBAH1BF;;YAMJG,KAAAA;mBAAAA,SAAAA;gBACE,OAAO,IAAI,CAACF,WAAW;YACzB;;;YAEAG,KAAAA;mBAAAA,SAAAA;gBACE,OAAO,IAAI,CAACF,oBAAoB;YAClC;;;YAEAG,KAAAA;mBAAAA,SAAAA;gBAAc,OAAO,IAAI,CAACH,oBAAoB,CAACG,SAAS;YAAI;;;YAE5DC,KAAAA;mBAAAA,SAAAA;gBAAiB,OAAO,IAAI,CAACJ,oBAAoB,CAACI,YAAY;YAAI;;;YAElEC,KAAAA;mBAAAA,SAAAA,eAAeC,SAAS,EAAEC,aAAa,EAAEC,OAAO;gBAC9C,IAAIC;gBAEJ,IAAMC,eAAeC,cAAY,CAACC,eAAe,CAAC,IAAI,CAACb,WAAW,GAC5Dc,iBAAiBH,cACjBI,kBAAkBN,SAAS,GAAG;gBAEpC,IAAMO,aAAa,IAAI,EACjBC,kBAAkBV,UAAUH,SAAS,IACrCc,mBAAmBF,WAAWZ,SAAS;gBAE7CW,gBAAgBI,KAAK,CAAC,AAAC,iBAAwDD,OAAxCD,iBAAgB,0BAAyC,OAAjBC,kBAAiB;gBAEhGR,mBAAmB,IAAI,CAACT,oBAAoB,CAACK,cAAc,CAACC,WAAWC,eAAeM,gBAAgBC;gBAEtG,IAAIL,kBAAkB;oBACpBK,gBAAgBK,KAAK,CAAC,AAAC,mBAA0DF,OAAxCD,iBAAgB,0BAAyC,OAAjBC,kBAAiB;gBACpG;gBAEA,OAAOR;YACT;;;YAEAW,KAAAA;mBAAAA,SAAAA,OAAOZ,OAAO;gBACZ,IAAIa,WAAW;gBAEf,IAAMJ,mBAAmB,IAAI,CAACd,SAAS,IAAK,GAAG;gBAE/CK,QAAQU,KAAK,CAAC,AAAC,kBAAkC,OAAjBD,kBAAiB;gBAEjD,IAAMK,SAAS,MACTC,cAAc,EAAE,EAChBC,+BAA+B,IAAI,CAACxB,oBAAoB,CAACoB,MAAM,CAACG,aAAaD,QAAQd;gBAE3F,IAAIgB,8BAA8B;oBAChCH,WAAW;gBACb;gBAEA,IAAIA,UAAU;oBACZb,QAAQW,KAAK,CAAC,AAAC,oBAAoC,OAAjBF,kBAAiB;gBACrD;gBAEA,OAAOI;YACT;;;YAEAI,KAAAA;mBAAAA,SAAAA;gBACE,IAAMC,2BAA2BC,IAAAA,oDAA8C,EAAC,IAAI,CAAC3B,oBAAoB,GACnGA,uBAAuB0B,0BACvBE,OAAO;oBACL5B,sBAAAA;gBACF;gBAEN,OAAO4B;YACT;;;;YAEOC,KAAAA;mBAAP,SAAOA,SAASD,IAAI,EAAE7B,WAAW;gBAC/B,IAAMC,uBAAuB8B,IAAAA,kCAA4B,EAACF,MAAM7B,cAC1DgB,aAAa,IA1EjBjB,WA0EgCC,aAAaC;gBAE/C,OAAOe;YACT;;;YAEOgB,KAAAA;mBAAP,SAAOA,mBAAmBC,cAAc,EAAEjC,WAAW;gBACnD,IAAM,AAAEkC,uBAAyBC,aAAI,CAA7BD,sBACFE,2BAA2BvC,8BAA8BoC,iBACzDhC,uBAAuBiC,qBAAqBG,4BAA4B,CAACD,0BAA0BpC,cACnGgB,aAAa,IAnFjBjB,WAmFgCC,aAAaC;gBAE/C,OAAOe;YACT;;;WAtFIjB;;AAyFNuC,OAAOC,MAAM,CAACJ,aAAI,EAAE;IAClBpC,YAAAA;AACF;IAEA,WAAeA"}
|
|
@@ -150,7 +150,7 @@ var lexer = _nominal.nominalLexer, parser = _nominal.nominalParser, termString =
|
|
|
150
150
|
}, tokensAsString = function(tokens) {
|
|
151
151
|
var string = termNode; ///
|
|
152
152
|
return string;
|
|
153
|
-
},
|
|
153
|
+
}, context = {
|
|
154
154
|
nodeAsTokens: nodeAsTokens,
|
|
155
155
|
nodeAsString: nodeAsString,
|
|
156
156
|
tokensAsString: tokensAsString
|
|
@@ -166,7 +166,7 @@ var BracketedConstructor = /*#__PURE__*/ function(Constructor) {
|
|
|
166
166
|
{
|
|
167
167
|
key: "fromNothing",
|
|
168
168
|
value: function fromNothing() {
|
|
169
|
-
var Term = _shim.default.Term, term = Term.fromTermNode(termNode,
|
|
169
|
+
var Term = _shim.default.Term, term = Term.fromTermNode(termNode, context), type = null, string = (0, _constructor.stringFromTermAndType)(term, type), bracketedConstructor = new BracketedConstructor(string, term);
|
|
170
170
|
return bracketedConstructor;
|
|
171
171
|
}
|
|
172
172
|
}
|
|
@@ -174,4 +174,4 @@ var BracketedConstructor = /*#__PURE__*/ function(Constructor) {
|
|
|
174
174
|
return BracketedConstructor;
|
|
175
175
|
}(_constructor.default);
|
|
176
176
|
|
|
177
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jb25zdHJ1Y3Rvci9icmFja2V0ZWQuanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmltcG9ydCBzaGltIGZyb20gXCIuLi9zaGltXCI7XG5pbXBvcnQgQ29uc3RydWN0b3IgZnJvbSBcIi4uL2NvbnN0cnVjdG9yXCI7XG5cbmltcG9ydCB7IE9CSkVDVF9UWVBFX05BTUUgfSBmcm9tIFwiLi4vdHlwZU5hbWVzXCI7XG5pbXBvcnQgeyBzdHJpbmdGcm9tVGVybUFuZFR5cGUgfSBmcm9tIFwiLi4vY29uc3RydWN0b3JcIjtcbmltcG9ydCB7IG5vbWluYWxMZXhlciwgbm9taW5hbFBhcnNlciB9IGZyb20gXCIuLi91dGlsaXRpZXMvbm9taW5hbFwiO1xuaW1wb3J0IHsgdGVybVRva2Vuc0Zyb21Db25zdHJ1Y3RvckRlY2xhcmF0aW9uVG9rZW5zLCBjb25zdHJ1Y3RvckRlY2xhcmF0aW9uVG9rZW5zRnJvbUNvbnN0cnVjdG9yRGVjbGFyYXRpb25TdHJpbmcgfSBmcm9tIFwiLi4vdXRpbGl0aWVzL3Rva2Vuc1wiO1xuaW1wb3J0IHsgdGVybU5vZGVGcm9tQ29uc3RydWN0b3JEZWNsYXJhdGlvbk5vZGUsXG4gICAgICAgICBjb25zdHJ1Y3RvckRlY2xhcmF0aW9uU3RyaW5nRnJvbVRlcm1TdHJpbmcsXG4gICAgICAgICBjb25zdHJ1Y3RvckRlY2xhcmF0aW9uTm9kZUZyb21Db25zdHJ1Y3RvckRlY2xhcmF0aW9uVG9rZW5zIH0gZnJvbSBcIi4uL3V0aWxpdGllcy9ub2RlXCI7XG5cbmNvbnN0IGxleGVyID0gbm9taW5hbExleGVyLCAvLy9cbiAgICAgIHBhcnNlciA9IG5vbWluYWxQYXJzZXIsIC8vL1xuICAgICAgdGVybVN0cmluZyA9IGAoJHtPQkpFQ1RfVFlQRV9OQU1FfSlgLCAgLy8vXG4gICAgICBjb25zdHJ1Y3RvckRlY2xhcmF0aW9uU3RyaW5nID0gY29uc3RydWN0b3JEZWNsYXJhdGlvblN0cmluZ0Zyb21UZXJtU3RyaW5nKHRlcm1TdHJpbmcpLFxuICAgICAgY29uc3RydWN0b3JEZWNsYXJhdGlvblRva2VucyA9IGNvbnN0cnVjdG9yRGVjbGFyYXRpb25Ub2tlbnNGcm9tQ29uc3RydWN0b3JEZWNsYXJhdGlvblN0cmluZyhjb25zdHJ1Y3RvckRlY2xhcmF0aW9uU3RyaW5nLCBsZXhlciksXG4gICAgICBjb25zdHJ1Y3RvckRlY2xhcmF0aW9uTm9kZSA9IGNvbnN0cnVjdG9yRGVjbGFyYXRpb25Ob2RlRnJvbUNvbnN0cnVjdG9yRGVjbGFyYXRpb25Ub2tlbnMoY29uc3RydWN0b3JEZWNsYXJhdGlvblRva2VucywgcGFyc2VyKSxcbiAgICAgIHRlcm1Ob2RlID0gdGVybU5vZGVGcm9tQ29uc3RydWN0b3JEZWNsYXJhdGlvbk5vZGUoY29uc3RydWN0b3JEZWNsYXJhdGlvbk5vZGUpLFxuICAgICAgdGVybVRva2VucyA9IHRlcm1Ub2tlbnNGcm9tQ29uc3RydWN0b3JEZWNsYXJhdGlvblRva2Vucyhjb25zdHJ1Y3RvckRlY2xhcmF0aW9uVG9rZW5zKSxcbiAgICAgIG5vZGVBc1Rva2VucyA9IChub2RlKSA9PiB7XG4gICAgICAgIGNvbnN0IHRva2VucyA9IHRlcm1Ub2tlbnM7IC8vL1xuXG4gICAgICAgIHJldHVybiB0b2tlbnM7XG4gICAgICB9LFxuICAgICAgbm9kZUFzU3RyaW5nID0gKG5vZGUpID0+
|
|
177
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jb25zdHJ1Y3Rvci9icmFja2V0ZWQuanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmltcG9ydCBzaGltIGZyb20gXCIuLi9zaGltXCI7XG5pbXBvcnQgQ29uc3RydWN0b3IgZnJvbSBcIi4uL2NvbnN0cnVjdG9yXCI7XG5cbmltcG9ydCB7IE9CSkVDVF9UWVBFX05BTUUgfSBmcm9tIFwiLi4vdHlwZU5hbWVzXCI7XG5pbXBvcnQgeyBzdHJpbmdGcm9tVGVybUFuZFR5cGUgfSBmcm9tIFwiLi4vY29uc3RydWN0b3JcIjtcbmltcG9ydCB7IG5vbWluYWxMZXhlciwgbm9taW5hbFBhcnNlciB9IGZyb20gXCIuLi91dGlsaXRpZXMvbm9taW5hbFwiO1xuaW1wb3J0IHsgdGVybVRva2Vuc0Zyb21Db25zdHJ1Y3RvckRlY2xhcmF0aW9uVG9rZW5zLCBjb25zdHJ1Y3RvckRlY2xhcmF0aW9uVG9rZW5zRnJvbUNvbnN0cnVjdG9yRGVjbGFyYXRpb25TdHJpbmcgfSBmcm9tIFwiLi4vdXRpbGl0aWVzL3Rva2Vuc1wiO1xuaW1wb3J0IHsgdGVybU5vZGVGcm9tQ29uc3RydWN0b3JEZWNsYXJhdGlvbk5vZGUsXG4gICAgICAgICBjb25zdHJ1Y3RvckRlY2xhcmF0aW9uU3RyaW5nRnJvbVRlcm1TdHJpbmcsXG4gICAgICAgICBjb25zdHJ1Y3RvckRlY2xhcmF0aW9uTm9kZUZyb21Db25zdHJ1Y3RvckRlY2xhcmF0aW9uVG9rZW5zIH0gZnJvbSBcIi4uL3V0aWxpdGllcy9ub2RlXCI7XG5cbmNvbnN0IGxleGVyID0gbm9taW5hbExleGVyLCAvLy9cbiAgICAgIHBhcnNlciA9IG5vbWluYWxQYXJzZXIsIC8vL1xuICAgICAgdGVybVN0cmluZyA9IGAoJHtPQkpFQ1RfVFlQRV9OQU1FfSlgLCAgLy8vXG4gICAgICBjb25zdHJ1Y3RvckRlY2xhcmF0aW9uU3RyaW5nID0gY29uc3RydWN0b3JEZWNsYXJhdGlvblN0cmluZ0Zyb21UZXJtU3RyaW5nKHRlcm1TdHJpbmcpLFxuICAgICAgY29uc3RydWN0b3JEZWNsYXJhdGlvblRva2VucyA9IGNvbnN0cnVjdG9yRGVjbGFyYXRpb25Ub2tlbnNGcm9tQ29uc3RydWN0b3JEZWNsYXJhdGlvblN0cmluZyhjb25zdHJ1Y3RvckRlY2xhcmF0aW9uU3RyaW5nLCBsZXhlciksXG4gICAgICBjb25zdHJ1Y3RvckRlY2xhcmF0aW9uTm9kZSA9IGNvbnN0cnVjdG9yRGVjbGFyYXRpb25Ob2RlRnJvbUNvbnN0cnVjdG9yRGVjbGFyYXRpb25Ub2tlbnMoY29uc3RydWN0b3JEZWNsYXJhdGlvblRva2VucywgcGFyc2VyKSxcbiAgICAgIHRlcm1Ob2RlID0gdGVybU5vZGVGcm9tQ29uc3RydWN0b3JEZWNsYXJhdGlvbk5vZGUoY29uc3RydWN0b3JEZWNsYXJhdGlvbk5vZGUpLFxuICAgICAgdGVybVRva2VucyA9IHRlcm1Ub2tlbnNGcm9tQ29uc3RydWN0b3JEZWNsYXJhdGlvblRva2Vucyhjb25zdHJ1Y3RvckRlY2xhcmF0aW9uVG9rZW5zKSxcbiAgICAgIG5vZGVBc1Rva2VucyA9IChub2RlKSA9PiB7XG4gICAgICAgIGNvbnN0IHRva2VucyA9IHRlcm1Ub2tlbnM7IC8vL1xuXG4gICAgICAgIHJldHVybiB0b2tlbnM7XG4gICAgICB9LFxuICAgICAgbm9kZUFzU3RyaW5nID0gKG5vZGUpID0+IHtcbiAgICAgICAgY29uc3Qgc3RyaW5nID0gdGVybVN0cmluZzsgIC8vL1xuXG4gICAgICAgIHJldHVybiBzdHJpbmc7XG4gICAgICB9LFxuICAgICAgdG9rZW5zQXNTdHJpbmcgPSAodG9rZW5zKSA9PiB7XG4gICAgICAgIGNvbnN0IHN0cmluZyA9IHRlcm1Ob2RlOyAgLy8vXG5cbiAgICAgICAgcmV0dXJuIHN0cmluZztcbiAgICAgIH0sXG4gICAgICBjb250ZXh0ID0ge1xuICAgICAgICBub2RlQXNUb2tlbnMsXG4gICAgICAgIG5vZGVBc1N0cmluZyxcbiAgICAgICAgdG9rZW5zQXNTdHJpbmdcbiAgICAgIH07XG5cbmV4cG9ydCBjb25zdCBicmFja2V0ZWRUZXJtTm9kZSA9IHRlcm1Ob2RlOyAgLy8vXG5cbmV4cG9ydCBkZWZhdWx0IGNsYXNzIEJyYWNrZXRlZENvbnN0cnVjdG9yIGV4dGVuZHMgQ29uc3RydWN0b3Ige1xuICBzdGF0aWMgZnJvbU5vdGhpbmcoKSB7XG4gICAgY29uc3QgeyBUZXJtIH0gPSBzaGltLFxuICAgICAgICAgIHRlcm0gPSBUZXJtLmZyb21UZXJtTm9kZSh0ZXJtTm9kZSwgY29udGV4dCksXG4gICAgICAgICAgdHlwZSA9IG51bGwsXG4gICAgICAgICAgc3RyaW5nID0gc3RyaW5nRnJvbVRlcm1BbmRUeXBlKHRlcm0sIHR5cGUpLFxuICAgICAgICAgIGJyYWNrZXRlZENvbnN0cnVjdG9yID0gbmV3IEJyYWNrZXRlZENvbnN0cnVjdG9yKHN0cmluZywgdGVybSk7XG5cbiAgICByZXR1cm4gYnJhY2tldGVkQ29uc3RydWN0b3I7XG4gIH1cbn1cbiJdLCJuYW1lcyI6WyJicmFja2V0ZWRUZXJtTm9kZSIsIkJyYWNrZXRlZENvbnN0cnVjdG9yIiwibGV4ZXIiLCJub21pbmFsTGV4ZXIiLCJwYXJzZXIiLCJub21pbmFsUGFyc2VyIiwidGVybVN0cmluZyIsIk9CSkVDVF9UWVBFX05BTUUiLCJjb25zdHJ1Y3RvckRlY2xhcmF0aW9uU3RyaW5nIiwiY29uc3RydWN0b3JEZWNsYXJhdGlvblN0cmluZ0Zyb21UZXJtU3RyaW5nIiwiY29uc3RydWN0b3JEZWNsYXJhdGlvblRva2VucyIsImNvbnN0cnVjdG9yRGVjbGFyYXRpb25Ub2tlbnNGcm9tQ29uc3RydWN0b3JEZWNsYXJhdGlvblN0cmluZyIsImNvbnN0cnVjdG9yRGVjbGFyYXRpb25Ob2RlIiwiY29uc3RydWN0b3JEZWNsYXJhdGlvbk5vZGVGcm9tQ29uc3RydWN0b3JEZWNsYXJhdGlvblRva2VucyIsInRlcm1Ob2RlIiwidGVybU5vZGVGcm9tQ29uc3RydWN0b3JEZWNsYXJhdGlvbk5vZGUiLCJ0ZXJtVG9rZW5zIiwidGVybVRva2Vuc0Zyb21Db25zdHJ1Y3RvckRlY2xhcmF0aW9uVG9rZW5zIiwibm9kZUFzVG9rZW5zIiwibm9kZSIsInRva2VucyIsIm5vZGVBc1N0cmluZyIsInN0cmluZyIsInRva2Vuc0FzU3RyaW5nIiwiY29udGV4dCIsImZyb21Ob3RoaW5nIiwiVGVybSIsInNoaW0iLCJ0ZXJtIiwiZnJvbVRlcm1Ob2RlIiwidHlwZSIsInN0cmluZ0Zyb21UZXJtQW5kVHlwZSIsImJyYWNrZXRlZENvbnN0cnVjdG9yIiwiQ29uc3RydWN0b3IiXSwibWFwcGluZ3MiOiJBQUFBOzs7Ozs7Ozs7OztJQTBDYUEsaUJBQWlCO2VBQWpCQTs7O2VBRVFDOzs7MkRBMUNKO21FQUNPO3lCQUVTO3VCQUVXO3NCQUM2RTtvQkFHOUM7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUUzRSxJQUFNQyxRQUFRQyxxQkFBWSxFQUNwQkMsU0FBU0Msc0JBQWEsRUFDdEJDLGFBQWEsQUFBQyxJQUFvQixPQUFqQkMsMkJBQWdCLEVBQUMsTUFDbENDLCtCQUErQkMsSUFBQUEsZ0RBQTBDLEVBQUNILGFBQzFFSSwrQkFBK0JDLElBQUFBLG9FQUE0RCxFQUFDSCw4QkFBOEJOLFFBQzFIVSw2QkFBNkJDLElBQUFBLGdFQUEwRCxFQUFDSCw4QkFBOEJOLFNBQ3RIVSxXQUFXQyxJQUFBQSw0Q0FBc0MsRUFBQ0gsNkJBQ2xESSxhQUFhQyxJQUFBQSxrREFBMEMsRUFBQ1AsK0JBQ3hEUSxlQUFlLFNBQUNDO0lBQ2QsSUFBTUMsU0FBU0osWUFBWSxHQUFHO0lBRTlCLE9BQU9JO0FBQ1QsR0FDQUMsZUFBZSxTQUFDRjtJQUNkLElBQU1HLFNBQVNoQixZQUFhLEdBQUc7SUFFL0IsT0FBT2dCO0FBQ1QsR0FDQUMsaUJBQWlCLFNBQUNIO0lBQ2hCLElBQU1FLFNBQVNSLFVBQVcsR0FBRztJQUU3QixPQUFPUTtBQUNULEdBQ0FFLFVBQVU7SUFDUk4sY0FBQUE7SUFDQUcsY0FBQUE7SUFDQUUsZ0JBQUFBO0FBQ0Y7QUFFQyxJQUFNdkIsb0JBQW9CYyxVQUFXLEdBQUc7QUFFaEMsSUFBQSxBQUFNYixxQ0FBTjtjQUFNQTthQUFBQTtnQ0FBQUE7aUNBQUFBOztrQkFBQUE7O1lBQ1p3QixLQUFBQTttQkFBUCxTQUFPQTtnQkFDTCxJQUFNLEFBQUVDLE9BQVNDLGFBQUksQ0FBYkQsTUFDRkUsT0FBT0YsS0FBS0csWUFBWSxDQUFDZixVQUFVVSxVQUNuQ00sT0FBTyxNQUNQUixTQUFTUyxJQUFBQSxrQ0FBcUIsRUFBQ0gsTUFBTUUsT0FDckNFLHVCQUF1QixJQU5aL0IscUJBTXFDcUIsUUFBUU07Z0JBRTlELE9BQU9JO1lBQ1Q7OztXQVRtQi9CO0VBQTZCZ0Msb0JBQVcifQ==
|
package/lib/constructor.js
CHANGED
|
@@ -106,7 +106,7 @@ var Constructor = /*#__PURE__*/ function() {
|
|
|
106
106
|
{
|
|
107
107
|
key: "fromConstructorDeclarationNode",
|
|
108
108
|
value: function fromConstructorDeclarationNode(constructorDeclarationNode, fileContext) {
|
|
109
|
-
var Term = _shim.default.Term, Type = _shim.default.Type, termNode = termNodeQuery(constructorDeclarationNode), typeNode = typeNodeQuery(constructorDeclarationNode),
|
|
109
|
+
var Term = _shim.default.Term, Type = _shim.default.Type, termNode = termNodeQuery(constructorDeclarationNode), typeNode = typeNodeQuery(constructorDeclarationNode), localContext = _local.default.fromFileContext(fileContext), context = localContext, type = Type.fromTypeNode(typeNode), term = Term.fromTermNodeAndType(termNode, type, context), string = stringFromTermAndType(term, type), constructor = new Constructor(string, term);
|
|
110
110
|
return constructor;
|
|
111
111
|
}
|
|
112
112
|
}
|
|
@@ -129,4 +129,4 @@ function stringFromTermAndType(term, type) {
|
|
|
129
129
|
return string;
|
|
130
130
|
}
|
|
131
131
|
|
|
132
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
132
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy9jb25zdHJ1Y3Rvci5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuaW1wb3J0IHNoaW0gZnJvbSBcIi4vc2hpbVwiO1xuaW1wb3J0IExvY2FsQ29udGV4dCBmcm9tIFwiLi9jb250ZXh0L2xvY2FsXCI7XG5cbmltcG9ydCB7IG5vZGVRdWVyeSB9IGZyb20gXCIuL3V0aWxpdGllcy9xdWVyeVwiO1xuaW1wb3J0IHsgdGVybUZyb21KU09OLCB0ZXJtVG9UZXJtSlNPTiB9IGZyb20gXCIuL3V0aWxpdGllcy9qc29uXCI7XG5cbmNvbnN0IHRlcm1Ob2RlUXVlcnkgPSBub2RlUXVlcnkoXCIvY29uc3RydWN0b3JEZWNsYXJhdGlvbi90ZXJtXCIpLFxuICAgICAgdHlwZU5vZGVRdWVyeSA9IG5vZGVRdWVyeShcIi9jb25zdHJ1Y3RvckRlY2xhcmF0aW9uL3R5cGVcIik7XG5cbmNsYXNzIENvbnN0cnVjdG9yIHtcbiAgY29uc3RydWN0b3Ioc3RyaW5nLCB0ZXJtKSB7XG4gICAgdGhpcy5zdHJpbmcgPSBzdHJpbmc7XG4gICAgdGhpcy50ZXJtID0gdGVybTtcbiAgfVxuXG4gIGdldFN0cmluZygpIHtcbiAgICByZXR1cm4gdGhpcy5zdHJpbmc7XG4gIH1cblxuICBnZXRUZXJtKCkge1xuICAgIHJldHVybiB0aGlzLnRlcm07XG4gIH1cblxuICBnZXRUeXBlKCkgeyByZXR1cm4gdGhpcy50ZXJtLmdldFR5cGUoKTsgfVxuXG4gIHZlcmlmeVdoZW5EZWNsYXJlZChmaWxlQ29udGV4dCkge1xuICAgIGxldCB2ZXJpZmllZEF0VG9wTGV2ZWw7XG5cbiAgICBjb25zdCBjb25zdHJ1Y3RvclN0cmluZyA9IHRoaXMuc3RyaW5nOyAgLy8vXG5cbiAgICBmaWxlQ29udGV4dC50cmFjZShgVmVyaWZ5aW5nIHRoZSAnJHtjb25zdHJ1Y3RvclN0cmluZ30nIGNvbnN0cnVjdG9yIHdoZW4gZGVjbGFyZWQuLi5gKTtcblxuICAgIGNvbnN0IHRlcm1WZXJpZmllZEF0VG9wTGV2ZWwgPSB0aGlzLnRlcm0udmVyaWZ5V2hlbkRlY2xhcmVkKGZpbGVDb250ZXh0KTtcblxuICAgIGlmICh0ZXJtVmVyaWZpZWRBdFRvcExldmVsKSB7XG4gICAgICB2ZXJpZmllZEF0VG9wTGV2ZWwgPSB0cnVlOyAvLy9cbiAgICB9XG5cbiAgICBpZiAodmVyaWZpZWRBdFRvcExldmVsKSB7XG4gICAgICBmaWxlQ29udGV4dC5kZWJ1ZyhgLi4udmVyaWZpZWQgdGhlICcke2NvbnN0cnVjdG9yU3RyaW5nfScgY29uc3RydWN0b3Igd2hlbiBkZWNsYXJlZC5gKTtcbiAgICB9XG5cbiAgICByZXR1cm4gdmVyaWZpZWRBdFRvcExldmVsO1xuICB9XG5cbiAgdG9KU09OKCkge1xuICAgIGNvbnN0IHRlcm1KU09OID0gdGVybVRvVGVybUpTT04odGhpcy50ZXJtKSxcbiAgICAgICAgICB0ZXJtID0gdGVybUpTT04sICAvLy9cbiAgICAgICAgICBqc29uID0ge1xuICAgICAgICAgICAgdGVybVxuICAgICAgICAgIH07XG5cbiAgICByZXR1cm4ganNvbjtcbiAgfVxuXG4gIHN0YXRpYyBmcm9tSlNPTihqc29uLCBmaWxlQ29udGV4dCkge1xuICAgIGNvbnN0IHRlcm0gPSB0ZXJtRnJvbUpTT04oanNvbiwgZmlsZUNvbnRleHQpLFxuICAgICAgICAgIHR5cGUgPSB0ZXJtLmdldFR5cGUoKSxcbiAgICAgICAgICBzdHJpbmcgPSBzdHJpbmdGcm9tVGVybUFuZFR5cGUodGVybSwgdHlwZSksXG4gICAgICAgICAgY29uc3RydWN0b3IgPSBuZXcgQ29uc3RydWN0b3Ioc3RyaW5nLCB0ZXJtKTtcblxuICAgIHJldHVybiBjb25zdHJ1Y3RvcjtcbiAgfVxuXG4gIHN0YXRpYyBmcm9tQ29uc3RydWN0b3JEZWNsYXJhdGlvbk5vZGUoY29uc3RydWN0b3JEZWNsYXJhdGlvbk5vZGUsIGZpbGVDb250ZXh0KSB7XG4gICAgY29uc3QgeyBUZXJtLCBUeXBlIH0gPSBzaGltLFxuICAgICAgICAgIHRlcm1Ob2RlID0gdGVybU5vZGVRdWVyeShjb25zdHJ1Y3RvckRlY2xhcmF0aW9uTm9kZSksXG4gICAgICAgICAgdHlwZU5vZGUgPSB0eXBlTm9kZVF1ZXJ5KGNvbnN0cnVjdG9yRGVjbGFyYXRpb25Ob2RlKSxcbiAgICAgICAgICBsb2NhbENvbnRleHQgPSBMb2NhbENvbnRleHQuZnJvbUZpbGVDb250ZXh0KGZpbGVDb250ZXh0KSxcbiAgICAgICAgICBjb250ZXh0ID0gbG9jYWxDb250ZXh0LCAvLy9cbiAgICAgICAgICB0eXBlID0gVHlwZS5mcm9tVHlwZU5vZGUodHlwZU5vZGUpLFxuICAgICAgICAgIHRlcm0gPSBUZXJtLmZyb21UZXJtTm9kZUFuZFR5cGUodGVybU5vZGUsIHR5cGUsIGNvbnRleHQpLFxuICAgICAgICAgIHN0cmluZyA9IHN0cmluZ0Zyb21UZXJtQW5kVHlwZSh0ZXJtLCB0eXBlKSxcbiAgICAgICAgICBjb25zdHJ1Y3RvciA9IG5ldyBDb25zdHJ1Y3RvcihzdHJpbmcsIHRlcm0pO1xuXG4gICAgcmV0dXJuIGNvbnN0cnVjdG9yO1xuICB9XG59XG5cbk9iamVjdC5hc3NpZ24oc2hpbSwge1xuICBDb25zdHJ1Y3RvclxufSk7XG5cbmV4cG9ydCBkZWZhdWx0IENvbnN0cnVjdG9yO1xuXG5leHBvcnQgZnVuY3Rpb24gc3RyaW5nRnJvbVRlcm1BbmRUeXBlKHRlcm0sIHR5cGUpIHtcbiAgbGV0IHN0cmluZztcblxuICBjb25zdCB0ZXJtU3RyaW5nID0gdGVybS5nZXRTdHJpbmcoKTtcblxuICBpZiAodHlwZSA9PT0gbnVsbCkge1xuICAgIHN0cmluZyA9IGAke3Rlcm1TdHJpbmd9YDtcbiAgfSBlbHNlIHtcbiAgICBjb25zdCB0eXBlTmFtZSA9IHR5cGUuZ2V0TmFtZSgpO1xuXG4gICAgc3RyaW5nID0gYCR7dGVybVN0cmluZ306JHt0eXBlTmFtZX1gO1xuICB9XG5cbiAgcmV0dXJuIHN0cmluZztcbn1cbiJdLCJuYW1lcyI6WyJzdHJpbmdGcm9tVGVybUFuZFR5cGUiLCJ0ZXJtTm9kZVF1ZXJ5Iiwibm9kZVF1ZXJ5IiwidHlwZU5vZGVRdWVyeSIsIkNvbnN0cnVjdG9yIiwic3RyaW5nIiwidGVybSIsImdldFN0cmluZyIsImdldFRlcm0iLCJnZXRUeXBlIiwidmVyaWZ5V2hlbkRlY2xhcmVkIiwiZmlsZUNvbnRleHQiLCJ2ZXJpZmllZEF0VG9wTGV2ZWwiLCJjb25zdHJ1Y3RvclN0cmluZyIsInRyYWNlIiwidGVybVZlcmlmaWVkQXRUb3BMZXZlbCIsImRlYnVnIiwidG9KU09OIiwidGVybUpTT04iLCJ0ZXJtVG9UZXJtSlNPTiIsImpzb24iLCJmcm9tSlNPTiIsInRlcm1Gcm9tSlNPTiIsInR5cGUiLCJjb25zdHJ1Y3RvciIsImZyb21Db25zdHJ1Y3RvckRlY2xhcmF0aW9uTm9kZSIsImNvbnN0cnVjdG9yRGVjbGFyYXRpb25Ob2RlIiwiVGVybSIsInNoaW0iLCJUeXBlIiwidGVybU5vZGUiLCJ0eXBlTm9kZSIsImxvY2FsQ29udGV4dCIsIkxvY2FsQ29udGV4dCIsImZyb21GaWxlQ29udGV4dCIsImNvbnRleHQiLCJmcm9tVHlwZU5vZGUiLCJmcm9tVGVybU5vZGVBbmRUeXBlIiwiT2JqZWN0IiwiYXNzaWduIiwidGVybVN0cmluZyIsInR5cGVOYW1lIiwiZ2V0TmFtZSJdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7Ozs7Ozs7O0lBcUZBLE9BQTJCO2VBQTNCOztJQUVnQkEscUJBQXFCO2VBQXJCQTs7OzJEQXJGQzs0REFDUTtxQkFFQztvQkFDbUI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFFN0MsSUFBTUMsZ0JBQWdCQyxJQUFBQSxnQkFBUyxFQUFDLGlDQUMxQkMsZ0JBQWdCRCxJQUFBQSxnQkFBUyxFQUFDO0FBRWhDLElBQUEsQUFBTUUsNEJBQU47YUFBTUEsWUFDUUMsTUFBTSxFQUFFQyxJQUFJO2dDQURwQkY7UUFFRixJQUFJLENBQUNDLE1BQU0sR0FBR0E7UUFDZCxJQUFJLENBQUNDLElBQUksR0FBR0E7O2tCQUhWRjs7WUFNSkcsS0FBQUE7bUJBQUFBLFNBQUFBO2dCQUNF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
|