occam-verify-cli 0.0.1073 → 0.0.1075
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/lib/assertion/type.js +47 -54
- package/lib/assignment/equality.js +8 -2
- package/lib/assignment/variable.js +2 -2
- package/lib/axiom.js +9 -12
- package/lib/combinator/bracketed.js +3 -2
- package/lib/combinator.js +6 -6
- package/lib/conclusion.js +2 -3
- package/lib/conjecture.js +10 -15
- package/lib/consequent.js +2 -3
- package/lib/constructor/bracketed.js +3 -2
- package/lib/constructor.js +6 -6
- package/lib/context/file.js +48 -107
- package/lib/context/local.js +52 -73
- package/lib/declaration/combinator.js +5 -5
- package/lib/declaration/constructor.js +5 -5
- package/lib/declaration/metavariable.js +4 -5
- package/lib/declaration/type.js +3 -3
- package/lib/declaration/variable.js +5 -5
- package/lib/declaration.js +6 -2
- package/lib/derivation.js +6 -2
- package/lib/equality.js +53 -22
- package/lib/equivalence.js +22 -24
- package/lib/frame.js +11 -13
- package/lib/index.js +13 -1
- package/lib/judgement.js +11 -8
- package/lib/label.js +6 -7
- package/lib/lemma.js +10 -15
- package/lib/metaLemma.js +15 -15
- package/lib/metatheorem.js +9 -14
- package/lib/metavariable.js +17 -23
- package/lib/mixins/statement/qualified/unify.js +2 -2
- package/lib/mixins/statement/verify.js +8 -12
- package/lib/mixins/term/verify.js +4 -4
- package/lib/premise.js +2 -3
- package/lib/proof.js +8 -4
- package/lib/proofStep.js +10 -8
- package/lib/reference.js +3 -3
- package/lib/rule.js +11 -16
- package/lib/statement/qualified.js +6 -2
- package/lib/statement/unqualified.js +1 -1
- package/lib/statement.js +5 -5
- package/lib/subDerivation.js +6 -2
- package/lib/subproof.js +10 -7
- package/lib/substitution/statementForMetavariable.js +14 -15
- package/lib/substitution.js +13 -13
- package/lib/substitutions.js +51 -47
- package/lib/supposition.js +2 -3
- package/lib/term.js +5 -5
- package/lib/theorem.js +10 -15
- package/lib/topLevelAssertion.js +3 -3
- package/lib/type.js +15 -22
- package/lib/unifier/equality.js +2 -2
- package/lib/unifier/metaLevel.js +6 -6
- package/lib/unifier/metavariable.js +5 -5
- package/lib/unifier/statementWithCombinator.js +2 -2
- package/lib/utilities/brackets.js +2 -2
- package/lib/utilities/equivalences.js +8 -8
- package/lib/utilities/node.js +2 -7
- package/lib/utilities/nominal.js +26 -0
- package/lib/utilities/subproof.js +2 -2
- package/lib/utilities/tokens.js +3 -7
- package/lib/variable.js +13 -9
- package/lib/verifier/metaLevel.js +2 -2
- package/lib/verifier/statementAsCombinator.js +2 -2
- package/lib/verifier/termAsConstructor.js +2 -2
- package/lib/verifier/topLevel.js +9 -15
- package/package.json +1 -1
- package/src/assertion/type.js +52 -57
- package/src/assignment/equality.js +3 -1
- package/src/assignment/variable.js +2 -1
- package/src/axiom.js +6 -8
- package/src/combinator/bracketed.js +6 -3
- package/src/combinator.js +4 -4
- package/src/conclusion.js +2 -2
- package/src/conjecture.js +8 -11
- package/src/consequent.js +2 -2
- package/src/constructor/bracketed.js +6 -3
- package/src/constructor.js +4 -4
- package/src/context/file.js +46 -90
- package/src/context/local.js +51 -90
- package/src/declaration/combinator.js +5 -4
- package/src/declaration/constructor.js +5 -4
- package/src/declaration/metavariable.js +3 -4
- package/src/declaration/type.js +2 -2
- package/src/declaration/variable.js +5 -4
- package/src/declaration.js +7 -1
- package/src/derivation.js +7 -1
- package/src/equality.js +80 -27
- package/src/equivalence.js +30 -28
- package/src/frame.js +10 -9
- package/src/index.js +12 -0
- package/src/judgement.js +11 -5
- package/src/label.js +5 -5
- package/src/lemma.js +8 -11
- package/src/metaLemma.js +13 -11
- package/src/metatheorem.js +6 -10
- package/src/metavariable.js +18 -34
- package/src/mixins/statement/qualified/unify.js +1 -2
- package/src/mixins/statement/verify.js +19 -18
- package/src/mixins/term/verify.js +4 -3
- package/src/premise.js +2 -2
- package/src/proof.js +10 -3
- package/src/proofStep.js +12 -7
- package/src/reference.js +3 -2
- package/src/rule.js +10 -12
- package/src/statement/qualified.js +7 -1
- package/src/statement/unqualified.js +0 -1
- package/src/statement.js +3 -3
- package/src/subDerivation.js +8 -2
- package/src/subproof.js +12 -5
- package/src/substitution/statementForMetavariable.js +12 -12
- package/src/substitution.js +9 -9
- package/src/substitutions.js +42 -34
- package/src/supposition.js +2 -2
- package/src/term.js +3 -3
- package/src/theorem.js +8 -11
- package/src/topLevelAssertion.js +3 -2
- package/src/type.js +15 -28
- package/src/unifier/equality.js +1 -1
- package/src/unifier/metaLevel.js +8 -10
- package/src/unifier/metavariable.js +5 -5
- package/src/unifier/statementWithCombinator.js +5 -5
- package/src/utilities/brackets.js +2 -2
- package/src/utilities/equivalences.js +9 -9
- package/src/utilities/node.js +1 -10
- package/src/utilities/nominal.js +14 -0
- package/src/utilities/subproof.js +2 -2
- package/src/utilities/tokens.js +2 -9
- package/src/variable.js +16 -11
- package/src/verifier/metaLevel.js +2 -2
- package/src/verifier/statementAsCombinator.js +3 -3
- package/src/verifier/termAsConstructor.js +2 -2
- package/src/verifier/topLevel.js +15 -14
- package/lib/assignment/metavariable.js +0 -62
- package/lib/unifier/intrinsicLevel.js +0 -144
- package/lib/utilities/unify.js +0 -24
- package/lib/verifier/intrinsicLevel.js +0 -140
- package/src/assignment/metavariable.js +0 -30
- package/src/unifier/intrinsicLevel.js +0 -54
- package/src/utilities/unify.js +0 -23
- package/src/verifier/intrinsicLevel.js +0 -42
package/lib/conjecture.js
CHANGED
|
@@ -9,12 +9,7 @@ Object.defineProperty(exports, "default", {
|
|
|
9
9
|
}
|
|
10
10
|
});
|
|
11
11
|
var _shim = /*#__PURE__*/ _interop_require_default(require("./shim"));
|
|
12
|
-
var _label = /*#__PURE__*/ _interop_require_default(require("./label"));
|
|
13
|
-
var _proof = /*#__PURE__*/ _interop_require_default(require("./proof"));
|
|
14
|
-
var _consequent = /*#__PURE__*/ _interop_require_default(require("./consequent"));
|
|
15
|
-
var _supposition = /*#__PURE__*/ _interop_require_default(require("./supposition"));
|
|
16
12
|
var _local = /*#__PURE__*/ _interop_require_default(require("./context/local"));
|
|
17
|
-
var _substitutions = /*#__PURE__*/ _interop_require_default(require("./substitutions"));
|
|
18
13
|
var _topLevelAssertion = /*#__PURE__*/ _interop_require_wildcard(require("./topLevelAssertion"));
|
|
19
14
|
var _query = require("./utilities/query");
|
|
20
15
|
function _assert_this_initialized(self) {
|
|
@@ -151,13 +146,13 @@ var Conjecture = /*#__PURE__*/ function(TopLevelAssertion) {
|
|
|
151
146
|
var verified = false;
|
|
152
147
|
var conjectureString = this.string; ///
|
|
153
148
|
this.fileContext.trace("Verifying the '".concat(conjectureString, "' conjecture..."));
|
|
154
|
-
var
|
|
155
|
-
var
|
|
156
|
-
if (
|
|
149
|
+
var labelsVerifiedWhenDeclared = this.labels.every(function(label) {
|
|
150
|
+
var labelVVerifiedWhenDeclared = label.verifyWhenDeclared(_this.fileContext);
|
|
151
|
+
if (labelVVerifiedWhenDeclared) {
|
|
157
152
|
return true;
|
|
158
153
|
}
|
|
159
154
|
});
|
|
160
|
-
if (
|
|
155
|
+
if (labelsVerifiedWhenDeclared) {
|
|
161
156
|
var localContext = _local.default.fromFileContext(this.fileContext), suppositionsVerified = this.suppositions.every(function(supposition) {
|
|
162
157
|
var suppositionVerified = supposition.verify(localContext);
|
|
163
158
|
if (suppositionVerified) {
|
|
@@ -168,7 +163,7 @@ var Conjecture = /*#__PURE__*/ function(TopLevelAssertion) {
|
|
|
168
163
|
var consequentVerified = this.consequent.verify(localContext);
|
|
169
164
|
if (consequentVerified) {
|
|
170
165
|
if (this.proof !== null) {
|
|
171
|
-
var
|
|
166
|
+
var Substitutions = _shim.default.Substitutions, substitutions = Substitutions.fromNothing();
|
|
172
167
|
this.proof.verify(substitutions, this.consequent, localContext);
|
|
173
168
|
}
|
|
174
169
|
var conjecture = this; ///
|
|
@@ -193,13 +188,13 @@ var Conjecture = /*#__PURE__*/ function(TopLevelAssertion) {
|
|
|
193
188
|
{
|
|
194
189
|
key: "fromConjectureNode",
|
|
195
190
|
value: function fromConjectureNode(conjectureNode, fileContext) {
|
|
196
|
-
var proofNode = proofNodeQuery(conjectureNode), labelNodes = labelNodesQuery(conjectureNode), consequentNode = consequentNodeQuery(conjectureNode), suppositionNodes = suppositionNodesQuery(conjectureNode), labels = labelNodes.map(function(labelNode) {
|
|
197
|
-
var label =
|
|
191
|
+
var Label = _shim.default.Label, Proof = _shim.default.Proof, Supposition = _shim.default.Supposition, Consequent = _shim.default.Consequent, proofNode = proofNodeQuery(conjectureNode), labelNodes = labelNodesQuery(conjectureNode), consequentNode = consequentNodeQuery(conjectureNode), suppositionNodes = suppositionNodesQuery(conjectureNode), labels = labelNodes.map(function(labelNode) {
|
|
192
|
+
var label = Label.fromLabelNode(labelNode, fileContext);
|
|
198
193
|
return label;
|
|
199
194
|
}), suppositions = suppositionNodes.map(function(suppositionNode) {
|
|
200
|
-
var supposition =
|
|
195
|
+
var supposition = Supposition.fromSuppositionNode(suppositionNode, fileContext);
|
|
201
196
|
return supposition;
|
|
202
|
-
}), consequent =
|
|
197
|
+
}), consequent = Consequent.fromConsequentNode(consequentNode, fileContext), string = (0, _topLevelAssertion.stringFromLabels)(labels), proof = Proof.fromProofNode(proofNode, fileContext), conjecture = new Conjecture(fileContext, string, labels, suppositions, consequent, proof);
|
|
203
198
|
return conjecture;
|
|
204
199
|
}
|
|
205
200
|
}
|
|
@@ -211,4 +206,4 @@ Object.assign(_shim.default, {
|
|
|
211
206
|
});
|
|
212
207
|
var _default = Conjecture;
|
|
213
208
|
|
|
214
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
209
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../src/conjecture.js"],"sourcesContent":["\"use strict\";\n\nimport shim from \"./shim\";\nimport LocalContext from \"./context/local\";\nimport TopLevelAssertion from \"./topLevelAssertion\";\n\nimport { stringFromLabels } from \"./topLevelAssertion\";\nimport { nodeQuery, nodesQuery } from \"./utilities/query\";\n\nconst proofNodeQuery = nodeQuery(\"/conjecture/proof\"),\n      labelNodesQuery = nodesQuery(\"/conjecture/label\"),\n      consequentNodeQuery = nodeQuery(\"/conjecture/consequent\"),\n      suppositionNodesQuery = nodesQuery(\"/conjecture/supposition\");\n\nclass Conjecture extends TopLevelAssertion {\n  verify() {\n    let verified = false;\n\n    const conjectureString = this.string; ///\n\n    this.fileContext.trace(`Verifying the '${conjectureString}' conjecture...`);\n\n    const labelsVerifiedWhenDeclared = this.labels.every((label) => {\n      const labelVVerifiedWhenDeclared = label.verifyWhenDeclared(this.fileContext);\n\n      if (labelVVerifiedWhenDeclared) {\n        return true;\n      }\n    });\n\n    if (labelsVerifiedWhenDeclared) {\n      const localContext = LocalContext.fromFileContext(this.fileContext),\n            suppositionsVerified = this.suppositions.every((supposition) => {\n              const suppositionVerified = supposition.verify(localContext);\n\n              if (suppositionVerified) {\n                return true;\n              }\n            });\n\n      if (suppositionsVerified) {\n        const consequentVerified = this.consequent.verify(localContext);\n\n        if (consequentVerified) {\n          if (this.proof !== null) {\n            const { Substitutions } = shim,\n                  substitutions = Substitutions.fromNothing();\n\n            this.proof.verify(substitutions, this.consequent, localContext);\n          }\n\n          const conjecture = this;  ///\n\n          this.fileContext.addConjecture(conjecture);\n\n          verified = true;\n        }\n      }\n    }\n\n    if (verified) {\n      this.fileContext.debug(`...verified the '${conjectureString}' conjecture.`);\n    }\n\n    return verified;\n  }\n\n  static fromJSON(json, fileContext) { return TopLevelAssertion.fromJSON(Conjecture, json, fileContext); }\n\n  static fromConjectureNode(conjectureNode, fileContext) {\n    const { Label, Proof, Supposition, Consequent } = shim,\n          proofNode = proofNodeQuery(conjectureNode),\n          labelNodes = labelNodesQuery(conjectureNode),\n          consequentNode = consequentNodeQuery(conjectureNode),\n          suppositionNodes = suppositionNodesQuery(conjectureNode),\n          labels = labelNodes.map((labelNode) => {\n            const label = Label.fromLabelNode(labelNode, fileContext);\n\n            return label;\n          }),\n          suppositions = suppositionNodes.map((suppositionNode) => {\n            const supposition = Supposition.fromSuppositionNode(suppositionNode, fileContext);\n\n            return supposition;\n          }),\n          consequent = Consequent.fromConsequentNode(consequentNode, fileContext),\n          string = stringFromLabels(labels),\n          proof = Proof.fromProofNode(proofNode, fileContext),\n          conjecture = new Conjecture(fileContext, string, labels, suppositions, consequent, proof);\n\n    return conjecture;\n  }\n}\n\nObject.assign(shim, {\n  Conjecture\n});\n\nexport default Conjecture;\n"],"names":["proofNodeQuery","nodeQuery","labelNodesQuery","nodesQuery","consequentNodeQuery","suppositionNodesQuery","Conjecture","verify","verified","conjectureString","string","fileContext","trace","labelsVerifiedWhenDeclared","labels","every","label","labelVVerifiedWhenDeclared","verifyWhenDeclared","localContext","LocalContext","fromFileContext","suppositionsVerified","suppositions","supposition","suppositionVerified","consequentVerified","consequent","proof","Substitutions","shim","substitutions","fromNothing","conjecture","addConjecture","debug","fromJSON","json","TopLevelAssertion","fromConjectureNode","conjectureNode","Label","Proof","Supposition","Consequent","proofNode","labelNodes","consequentNode","suppositionNodes","map","labelNode","fromLabelNode","suppositionNode","fromSuppositionNode","fromConsequentNode","stringFromLabels","fromProofNode","Object","assign"],"mappings":"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"}
|
package/lib/consequent.js
CHANGED
|
@@ -10,7 +10,6 @@ Object.defineProperty(exports, "default", {
|
|
|
10
10
|
});
|
|
11
11
|
var _shim = /*#__PURE__*/ _interop_require_default(require("./shim"));
|
|
12
12
|
var _local = /*#__PURE__*/ _interop_require_default(require("./context/local"));
|
|
13
|
-
var _unqualified = /*#__PURE__*/ _interop_require_default(require("./statement/unqualified"));
|
|
14
13
|
var _query = require("./utilities/query");
|
|
15
14
|
var _json = require("./utilities/json");
|
|
16
15
|
function _class_call_check(instance, Constructor) {
|
|
@@ -121,7 +120,7 @@ var Consequent = /*#__PURE__*/ function() {
|
|
|
121
120
|
{
|
|
122
121
|
key: "fromConsequentNode",
|
|
123
122
|
value: function fromConsequentNode(consequentNode, fileContext) {
|
|
124
|
-
var unqualifiedStatementNode = unqualifiedStatementNodeQuery(consequentNode), unqualifiedStatement =
|
|
123
|
+
var UnqualifiedStatement = _shim.default.UnqualifiedStatement, unqualifiedStatementNode = unqualifiedStatementNodeQuery(consequentNode), unqualifiedStatement = UnqualifiedStatement.fromUnqualifiedStatementNode(unqualifiedStatementNode, fileContext), consequent = new Consequent(fileContext, unqualifiedStatement);
|
|
125
124
|
return consequent;
|
|
126
125
|
}
|
|
127
126
|
}
|
|
@@ -133,4 +132,4 @@ Object.assign(_shim.default, {
|
|
|
133
132
|
});
|
|
134
133
|
var _default = Consequent;
|
|
135
134
|
|
|
136
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
135
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy9jb25zZXF1ZW50LmpzIl0sInNvdXJjZXNDb250ZW50IjpbIlwidXNlIHN0cmljdFwiO1xuXG5pbXBvcnQgc2hpbSBmcm9tIFwiLi9zaGltXCI7XG5pbXBvcnQgTG9jYWxDb250ZXh0IGZyb20gXCIuL2NvbnRleHQvbG9jYWxcIjtcblxuaW1wb3J0IHsgbm9kZVF1ZXJ5IH0gZnJvbSBcIi4vdXRpbGl0aWVzL3F1ZXJ5XCI7XG5pbXBvcnQgeyB1bnF1YWxpZmllZFN0YXRlbWVudEZyb21KU09OLCB1bnF1YWxpZmllZFN0YXRlbWVudFRvVW5xdWFsaWZpZWRTdGF0ZW1lbnRKU09OIH0gZnJvbSBcIi4vdXRpbGl0aWVzL2pzb25cIjtcblxuY29uc3QgdW5xdWFsaWZpZWRTdGF0ZW1lbnROb2RlUXVlcnkgPSBub2RlUXVlcnkoXCIvY29uc2VxdWVudC91bnF1YWxpZmllZFN0YXRlbWVudFwiKTtcblxuY2xhc3MgQ29uc2VxdWVudCB7XG4gIGNvbnN0cnVjdG9yKGZpbGVDb250ZXh0LCB1bnF1YWxpZmllZFN0YXRlbWVudCkge1xuICAgIHRoaXMuZmlsZUNvbnRleHQgPSBmaWxlQ29udGV4dDtcbiAgICB0aGlzLnVucXVhbGlmaWVkU3RhdGVtZW50ID0gdW5xdWFsaWZpZWRTdGF0ZW1lbnQ7XG4gIH1cblxuICBnZXRGaWxlQ29udGV4dCgpIHtcbiAgICByZXR1cm4gdGhpcy5maWxlQ29udGV4dDtcbiAgfVxuXG4gIGdldFVucXVhbGlmaWVkU3RhdGVtZW50KCkge1xuICAgIHJldHVybiB0aGlzLnVucXVhbGlmaWVkU3RhdGVtZW50O1xuICB9XG5cbiAgZ2V0U3RyaW5nKCkgeyByZXR1cm4gdGhpcy51bnF1YWxpZmllZFN0YXRlbWVudC5nZXRTdHJpbmcoKTsgfVxuXG4gIGdldFN0YXRlbWVudCgpIHsgcmV0dXJuIHRoaXMudW5xdWFsaWZpZWRTdGF0ZW1lbnQuZ2V0U3RhdGVtZW50KCk7IH1cblxuICB1bmlmeVN0YXRlbWVudChzdGF0ZW1lbnQsIHN1YnN0aXR1dGlvbnMsIGxvY2FsQ29udGV4dCkge1xuICAgIGxldCBzdGF0ZW1lbnRVbmlmaWVkO1xuXG4gICAgY29uc3Qgc3RhdGVtZW50U3RyaW5nID0gc3RhdGVtZW50LmdldFN0cmluZygpLFxuICAgICAgICAgIGNvbnNlcXVlbnRTdHJpbmcgPSB0aGlzLmdldFN0cmluZygpO1xuXG4gICAgY29uc3QgbG9jYWxDb250ZXh0QiA9IGxvY2FsQ29udGV4dDsgLy8vXG5cbiAgICBsb2NhbENvbnRleHQgPSBMb2NhbENvbnRleHQuZnJvbUZpbGVDb250ZXh0KHRoaXMuZmlsZUNvbnRleHQpO1xuXG4gICAgY29uc3QgbG9jYWxDb250ZXh0QSA9IGxvY2FsQ29udGV4dDsgLy8vXG5cbiAgICBsb2NhbENvbnRleHRCLnRyYWNlKGBVbmlmeWluZyB0aGUgJyR7c3RhdGVtZW50U3RyaW5nfScgc3RhdGVtZW50IHdpdGggdGhlICcke2NvbnNlcXVlbnRTdHJpbmd9JyBjb25zZXF1ZW50Li4uYCk7XG5cbiAgICBzdGF0ZW1lbnRVbmlmaWVkID0gdGhpcy51bnF1YWxpZmllZFN0YXRlbWVudC51bmlmeVN0YXRlbWVudChzdGF0ZW1lbnQsIHN1YnN0aXR1dGlvbnMsIGxvY2FsQ29udGV4dEEsIGxvY2FsQ29udGV4dEIpO1xuXG4gICAgaWYgKHN0YXRlbWVudFVuaWZpZWQpIHtcbiAgICAgIGxvY2FsQ29udGV4dEIuZGVidWcoYC4uLnVuaWZpZWQgdGhlICcke3N0YXRlbWVudFN0cmluZ30nIHN0YXRlbWVudCB3aXRoIHRoZSAnJHtjb25zZXF1ZW50U3RyaW5nfScgY29uc2VxdWVudC5gKTtcbiAgICB9XG5cbiAgICByZXR1cm4gc3RhdGVtZW50VW5pZmllZDtcbiAgfVxuXG4gIHZlcmlmeShsb2NhbENvbnRleHQpIHtcbiAgICBsZXQgdmVyaWZpZWQgPSBmYWxzZTtcblxuICAgIGNvbnN0IGNvbnNlcXVlbnRTdHJpbmcgPSB0aGlzLmdldFN0cmluZygpOyAgLy8vXG5cbiAgICBsb2NhbENvbnRleHQudHJhY2UoYFZlcmlmeWluZyB0aGUgJyR7Y29uc2VxdWVudFN0cmluZ30nIGNvbnNlcXVlbnQuLi5gKTtcblxuICAgIGNvbnN0IHN0YXRlZCA9IHRydWUsXG4gICAgICAgICAgYXNzaWdubWVudHMgPSBbXSxcbiAgICAgICAgICB1bnF1YWxpZmllZFN0YXRlbWVudFZlcmlmaWVkID0gdGhpcy51bnF1YWxpZmllZFN0YXRlbWVudC52ZXJpZnkoYXNzaWdubWVudHMsIHN0YXRlZCwgbG9jYWxDb250ZXh0KTtcblxuICAgIGlmICh1bnF1YWxpZmllZFN0YXRlbWVudFZlcmlmaWVkKSB7XG4gICAgICB2ZXJpZmllZCA9IHRydWU7XG4gICAgfVxuXG4gICAgaWYgKHZlcmlmaWVkKSB7XG4gICAgICBsb2NhbENvbnRleHQuZGVidWcoYC4uLnZlcmlmaWVkIHRoZSAnJHtjb25zZXF1ZW50U3RyaW5nfScgY29uc2VxdWVudC5gKTtcbiAgICB9XG5cbiAgICByZXR1cm4gdmVyaWZpZWQ7XG4gIH1cblxuICB0b0pTT04oKSB7XG4gICAgY29uc3QgdW5xdWFsaWZpZWRTdGF0ZW1lbnRKU09OID0gdW5xdWFsaWZpZWRTdGF0ZW1lbnRUb1VucXVhbGlmaWVkU3RhdGVtZW50SlNPTih0aGlzLnVucXVhbGlmaWVkU3RhdGVtZW50KSxcbiAgICAgICAgICB1bnF1YWxpZmllZFN0YXRlbWVudCA9IHVucXVhbGlmaWVkU3RhdGVtZW50SlNPTiwgIC8vL1xuICAgICAgICAgIGpzb24gPSB7XG4gICAgICAgICAgICB1bnF1YWxpZmllZFN0YXRlbWVudFxuICAgICAgICAgIH07XG5cbiAgICByZXR1cm4ganNvbjtcbiAgfVxuXG4gIHN0YXRpYyBmcm9tSlNPTihqc29uLCBmaWxlQ29udGV4dCkge1xuICAgIGNvbnN0IHVucXVhbGlmaWVkU3RhdGVtZW50ID0gdW5xdWFsaWZpZWRTdGF0ZW1lbnRGcm9tSlNPTihqc29uLCBmaWxlQ29udGV4dCksXG4gICAgICAgICAgY29uc2VxdWVudCA9IG5ldyBDb25zZXF1ZW50KGZpbGVDb250ZXh0LCB1bnF1YWxpZmllZFN0YXRlbWVudCk7XG5cbiAgICByZXR1cm4gY29uc2VxdWVudDtcbiAgfVxuXG4gIHN0YXRpYyBmcm9tQ29uc2VxdWVudE5vZGUoY29uc2VxdWVudE5vZGUsIGZpbGVDb250ZXh0KSB7XG4gICAgY29uc3QgeyBVbnF1YWxpZmllZFN0YXRlbWVudCB9ID0gc2hpbSxcbiAgICAgICAgICB1bnF1YWxpZmllZFN0YXRlbWVudE5vZGUgPSB1bnF1YWxpZmllZFN0YXRlbWVudE5vZGVRdWVyeShjb25zZXF1ZW50Tm9kZSksXG4gICAgICAgICAgdW5xdWFsaWZpZWRTdGF0ZW1lbnQgPSBVbnF1YWxpZmllZFN0YXRlbWVudC5mcm9tVW5xdWFsaWZpZWRTdGF0ZW1lbnROb2RlKHVucXVhbGlmaWVkU3RhdGVtZW50Tm9kZSwgZmlsZUNvbnRleHQpLFxuICAgICAgICAgIGNvbnNlcXVlbnQgPSBuZXcgQ29uc2VxdWVudChmaWxlQ29udGV4dCwgdW5xdWFsaWZpZWRTdGF0ZW1lbnQpO1xuXG4gICAgcmV0dXJuIGNvbnNlcXVlbnQ7XG4gIH1cbn1cblxuT2JqZWN0LmFzc2lnbihzaGltLCB7XG4gIENvbnNlcXVlbnRcbn0pO1xuXG5leHBvcnQgZGVmYXVsdCBDb25zZXF1ZW50O1xuIl0sIm5hbWVzIjpbInVucXVhbGlmaWVkU3RhdGVtZW50Tm9kZVF1ZXJ5Iiwibm9kZVF1ZXJ5IiwiQ29uc2VxdWVudCIsImZpbGVDb250ZXh0IiwidW5xdWFsaWZpZWRTdGF0ZW1lbnQiLCJnZXRGaWxlQ29udGV4dCIsImdldFVucXVhbGlmaWVkU3RhdGVtZW50IiwiZ2V0U3RyaW5nIiwiZ2V0U3RhdGVtZW50IiwidW5pZnlTdGF0ZW1lbnQiLCJzdGF0ZW1lbnQiLCJzdWJzdGl0dXRpb25zIiwibG9jYWxDb250ZXh0Iiwic3RhdGVtZW50VW5pZmllZCIsInN0YXRlbWVudFN0cmluZyIsImNvbnNlcXVlbnRTdHJpbmciLCJsb2NhbENvbnRleHRCIiwiTG9jYWxDb250ZXh0IiwiZnJvbUZpbGVDb250ZXh0IiwibG9jYWxDb250ZXh0QSIsInRyYWNlIiwiZGVidWciLCJ2ZXJpZnkiLCJ2ZXJpZmllZCIsInN0YXRlZCIsImFzc2lnbm1lbnRzIiwidW5xdWFsaWZpZWRTdGF0ZW1lbnRWZXJpZmllZCIsInRvSlNPTiIsInVucXVhbGlmaWVkU3RhdGVtZW50SlNPTiIsInVucXVhbGlmaWVkU3RhdGVtZW50VG9VbnF1YWxpZmllZFN0YXRlbWVudEpTT04iLCJqc29uIiwiZnJvbUpTT04iLCJ1bnF1YWxpZmllZFN0YXRlbWVudEZyb21KU09OIiwiY29uc2VxdWVudCIsImZyb21Db25zZXF1ZW50Tm9kZSIsImNvbnNlcXVlbnROb2RlIiwiVW5xdWFsaWZpZWRTdGF0ZW1lbnQiLCJzaGltIiwidW5xdWFsaWZpZWRTdGF0ZW1lbnROb2RlIiwiZnJvbVVucXVhbGlmaWVkU3RhdGVtZW50Tm9kZSIsIk9iamVjdCIsImFzc2lnbiJdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7K0JBd0dBOzs7ZUFBQTs7OzJEQXRHaUI7NERBQ1E7cUJBRUM7b0JBQ21FOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBRTdGLElBQU1BLGdDQUFnQ0MsSUFBQUEsZ0JBQVMsRUFBQztBQUVoRCxJQUFBLEFBQU1DLDJCQUFOO2FBQU1BLFdBQ1FDLFdBQVcsRUFBRUMsb0JBQW9CO2dDQUR6Q0Y7UUFFRixJQUFJLENBQUNDLFdBQVcsR0FBR0E7UUFDbkIsSUFBSSxDQUFDQyxvQkFBb0IsR0FBR0E7O2tCQUgxQkY7O1lBTUpHLEtBQUFBO21CQUFBQSxTQUFBQTtnQkFDRSxPQUFPLElBQUksQ0FBQ0YsV0FBVztZQUN6Qjs7O1lBRUFHLEtBQUFBO21CQUFBQSxTQUFBQTtnQkFDRSxPQUFPLElBQUksQ0FBQ0Ysb0JBQW9CO1lBQ2xDOzs7WUFFQUcsS0FBQUE7bUJBQUFBLFNBQUFBO2dCQUFjLE9BQU8sSUFBSSxDQUFDSCxvQkFBb0IsQ0FBQ0csU0FBUztZQUFJOzs7WUFFNURDLEtBQUFBO21CQUFBQSxTQUFBQTtnQkFBaUIsT0FBTyxJQUFJLENBQUNKLG9CQUFvQixDQUFDSSxZQUFZO1lBQUk7OztZQUVsRUMsS0FBQUE7bUJBQUFBLFNBQUFBLGVBQWVDLFNBQVMsRUFBRUMsYUFBYSxFQUFFQyxZQUFZO2dCQUNuRCxJQUFJQztnQkFFSixJQUFNQyxrQkFBa0JKLFVBQVVILFNBQVMsSUFDckNRLG1CQUFtQixJQUFJLENBQUNSLFNBQVM7Z0JBRXZDLElBQU1TLGdCQUFnQkosY0FBYyxHQUFHO2dCQUV2Q0EsZUFBZUssY0FBWSxDQUFDQyxlQUFlLENBQUMsSUFBSSxDQUFDZixXQUFXO2dCQUU1RCxJQUFNZ0IsZ0JBQWdCUCxjQUFjLEdBQUc7Z0JBRXZDSSxjQUFjSSxLQUFLLENBQUMsQUFBQyxpQkFBd0RMLE9BQXhDRCxpQkFBZ0IsMEJBQXlDLE9BQWpCQyxrQkFBaUI7Z0JBRTlGRixtQkFBbUIsSUFBSSxDQUFDVCxvQkFBb0IsQ0FBQ0ssY0FBYyxDQUFDQyxXQUFXQyxlQUFlUSxlQUFlSDtnQkFFckcsSUFBSUgsa0JBQWtCO29CQUNwQkcsY0FBY0ssS0FBSyxDQUFDLEFBQUMsbUJBQTBETixPQUF4Q0QsaUJBQWdCLDBCQUF5QyxPQUFqQkMsa0JBQWlCO2dCQUNsRztnQkFFQSxPQUFPRjtZQUNUOzs7WUFFQVMsS0FBQUE7bUJBQUFBLFNBQUFBLE9BQU9WLFlBQVk7Z0JBQ2pCLElBQUlXLFdBQVc7Z0JBRWYsSUFBTVIsbUJBQW1CLElBQUksQ0FBQ1IsU0FBUyxJQUFLLEdBQUc7Z0JBRS9DSyxhQUFhUSxLQUFLLENBQUMsQUFBQyxrQkFBa0MsT0FBakJMLGtCQUFpQjtnQkFFdEQsSUFBTVMsU0FBUyxNQUNUQyxjQUFjLEVBQUUsRUFDaEJDLCtCQUErQixJQUFJLENBQUN0QixvQkFBb0IsQ0FBQ2tCLE1BQU0sQ0FBQ0csYUFBYUQsUUFBUVo7Z0JBRTNGLElBQUljLDhCQUE4QjtvQkFDaENILFdBQVc7Z0JBQ2I7Z0JBRUEsSUFBSUEsVUFBVTtvQkFDWlgsYUFBYVMsS0FBSyxDQUFDLEFBQUMsb0JBQW9DLE9BQWpCTixrQkFBaUI7Z0JBQzFEO2dCQUVBLE9BQU9RO1lBQ1Q7OztZQUVBSSxLQUFBQTttQkFBQUEsU0FBQUE7Z0JBQ0UsSUFBTUMsMkJBQTJCQyxJQUFBQSxvREFBOEMsRUFBQyxJQUFJLENBQUN6QixvQkFBb0IsR0FDbkdBLHVCQUF1QndCLDBCQUN2QkUsT0FBTztvQkFDTDFCLHNCQUFBQTtnQkFDRjtnQkFFTixPQUFPMEI7WUFDVDs7OztZQUVPQyxLQUFBQTttQkFBUCxTQUFPQSxTQUFTRCxJQUFJLEVBQUUzQixXQUFXO2dCQUMvQixJQUFNQyx1QkFBdUI0QixJQUFBQSxrQ0FBNEIsRUFBQ0YsTUFBTTNCLGNBQzFEOEIsYUFBYSxJQTNFakIvQixXQTJFZ0NDLGFBQWFDO2dCQUUvQyxPQUFPNkI7WUFDVDs7O1lBRU9DLEtBQUFBO21CQUFQLFNBQU9BLG1CQUFtQkMsY0FBYyxFQUFFaEMsV0FBVztnQkFDbkQsSUFBTSxBQUFFaUMsdUJBQXlCQyxhQUFJLENBQTdCRCxzQkFDRkUsMkJBQTJCdEMsOEJBQThCbUMsaUJBQ3pEL0IsdUJBQXVCZ0MscUJBQXFCRyw0QkFBNEIsQ0FBQ0QsMEJBQTBCbkMsY0FDbkc4QixhQUFhLElBcEZqQi9CLFdBb0ZnQ0MsYUFBYUM7Z0JBRS9DLE9BQU82QjtZQUNUOzs7V0F2RkkvQjs7QUEwRk5zQyxPQUFPQyxNQUFNLENBQUNKLGFBQUksRUFBRTtJQUNsQm5DLFlBQUFBO0FBQ0Y7SUFFQSxXQUFlQSJ9
|
|
@@ -19,6 +19,7 @@ _export(exports, {
|
|
|
19
19
|
var _shim = /*#__PURE__*/ _interop_require_default(require("../shim"));
|
|
20
20
|
var _constructor = /*#__PURE__*/ _interop_require_wildcard(require("../constructor"));
|
|
21
21
|
var _typeNames = require("../typeNames");
|
|
22
|
+
var _nominal = require("../utilities/nominal");
|
|
22
23
|
var _tokens = require("../utilities/tokens");
|
|
23
24
|
var _node = require("../utilities/node");
|
|
24
25
|
function _assert_this_initialized(self) {
|
|
@@ -140,7 +141,7 @@ function _is_native_reflect_construct() {
|
|
|
140
141
|
return !!result;
|
|
141
142
|
})();
|
|
142
143
|
}
|
|
143
|
-
var termString = "(".concat(_typeNames.OBJECT_TYPE_NAME, ")"), constructorDeclarationString = (0, _node.constructorDeclarationStringFromTermString)(termString), constructorDeclarationTokens = (0, _tokens.constructorDeclarationTokensFromConstructorDeclarationString)(constructorDeclarationString), constructorDeclarationNode = (0, _node.constructorDeclarationNodeFromConstructorDeclarationTokens)(constructorDeclarationTokens), termNode = (0, _node.termNodeFromConstructorDeclarationNode)(constructorDeclarationNode), termTokens = (0, _tokens.termTokensFromConstructorDeclarationTokens)(constructorDeclarationTokens), nodeAsTokens = function(node) {
|
|
144
|
+
var lexer = _nominal.nominalLexer, parser = _nominal.nominalParser, termString = "(".concat(_typeNames.OBJECT_TYPE_NAME, ")"), constructorDeclarationString = (0, _node.constructorDeclarationStringFromTermString)(termString), constructorDeclarationTokens = (0, _tokens.constructorDeclarationTokensFromConstructorDeclarationString)(constructorDeclarationString, lexer), constructorDeclarationNode = (0, _node.constructorDeclarationNodeFromConstructorDeclarationTokens)(constructorDeclarationTokens, parser), termNode = (0, _node.termNodeFromConstructorDeclarationNode)(constructorDeclarationNode), termTokens = (0, _tokens.termTokensFromConstructorDeclarationTokens)(constructorDeclarationTokens), nodeAsTokens = function(node) {
|
|
144
145
|
var tokens = termTokens; ///
|
|
145
146
|
return tokens;
|
|
146
147
|
}, nodeAsString = function(node) {
|
|
@@ -173,4 +174,4 @@ var BracketedConstructor = /*#__PURE__*/ function(Constructor) {
|
|
|
173
174
|
return BracketedConstructor;
|
|
174
175
|
}(_constructor.default);
|
|
175
176
|
|
|
176
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
177
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jb25zdHJ1Y3Rvci9icmFja2V0ZWQuanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmltcG9ydCBzaGltIGZyb20gXCIuLi9zaGltXCI7XG5pbXBvcnQgQ29uc3RydWN0b3IgZnJvbSBcIi4uL2NvbnN0cnVjdG9yXCI7XG5cbmltcG9ydCB7IE9CSkVDVF9UWVBFX05BTUUgfSBmcm9tIFwiLi4vdHlwZU5hbWVzXCI7XG5pbXBvcnQgeyBzdHJpbmdGcm9tVGVybUFuZFR5cGUgfSBmcm9tIFwiLi4vY29uc3RydWN0b3JcIjtcbmltcG9ydCB7IG5vbWluYWxMZXhlciwgbm9taW5hbFBhcnNlciB9IGZyb20gXCIuLi91dGlsaXRpZXMvbm9taW5hbFwiO1xuaW1wb3J0IHsgdGVybVRva2Vuc0Zyb21Db25zdHJ1Y3RvckRlY2xhcmF0aW9uVG9rZW5zLCBjb25zdHJ1Y3RvckRlY2xhcmF0aW9uVG9rZW5zRnJvbUNvbnN0cnVjdG9yRGVjbGFyYXRpb25TdHJpbmcgfSBmcm9tIFwiLi4vdXRpbGl0aWVzL3Rva2Vuc1wiO1xuaW1wb3J0IHsgdGVybU5vZGVGcm9tQ29uc3RydWN0b3JEZWNsYXJhdGlvbk5vZGUsXG4gICAgICAgICBjb25zdHJ1Y3RvckRlY2xhcmF0aW9uU3RyaW5nRnJvbVRlcm1TdHJpbmcsXG4gICAgICAgICBjb25zdHJ1Y3RvckRlY2xhcmF0aW9uTm9kZUZyb21Db25zdHJ1Y3RvckRlY2xhcmF0aW9uVG9rZW5zIH0gZnJvbSBcIi4uL3V0aWxpdGllcy9ub2RlXCI7XG5cbmNvbnN0IGxleGVyID0gbm9taW5hbExleGVyLCAvLy9cbiAgICAgIHBhcnNlciA9IG5vbWluYWxQYXJzZXIsIC8vL1xuICAgICAgdGVybVN0cmluZyA9IGAoJHtPQkpFQ1RfVFlQRV9OQU1FfSlgLCAgLy8vXG4gICAgICBjb25zdHJ1Y3RvckRlY2xhcmF0aW9uU3RyaW5nID0gY29uc3RydWN0b3JEZWNsYXJhdGlvblN0cmluZ0Zyb21UZXJtU3RyaW5nKHRlcm1TdHJpbmcpLFxuICAgICAgY29uc3RydWN0b3JEZWNsYXJhdGlvblRva2VucyA9IGNvbnN0cnVjdG9yRGVjbGFyYXRpb25Ub2tlbnNGcm9tQ29uc3RydWN0b3JEZWNsYXJhdGlvblN0cmluZyhjb25zdHJ1Y3RvckRlY2xhcmF0aW9uU3RyaW5nLCBsZXhlciksXG4gICAgICBjb25zdHJ1Y3RvckRlY2xhcmF0aW9uTm9kZSA9IGNvbnN0cnVjdG9yRGVjbGFyYXRpb25Ob2RlRnJvbUNvbnN0cnVjdG9yRGVjbGFyYXRpb25Ub2tlbnMoY29uc3RydWN0b3JEZWNsYXJhdGlvblRva2VucywgcGFyc2VyKSxcbiAgICAgIHRlcm1Ob2RlID0gdGVybU5vZGVGcm9tQ29uc3RydWN0b3JEZWNsYXJhdGlvbk5vZGUoY29uc3RydWN0b3JEZWNsYXJhdGlvbk5vZGUpLFxuICAgICAgdGVybVRva2VucyA9IHRlcm1Ub2tlbnNGcm9tQ29uc3RydWN0b3JEZWNsYXJhdGlvblRva2Vucyhjb25zdHJ1Y3RvckRlY2xhcmF0aW9uVG9rZW5zKSxcbiAgICAgIG5vZGVBc1Rva2VucyA9IChub2RlKSA9PiB7XG4gICAgICAgIGNvbnN0IHRva2VucyA9IHRlcm1Ub2tlbnM7IC8vL1xuXG4gICAgICAgIHJldHVybiB0b2tlbnM7XG4gICAgICB9LFxuICAgICAgbm9kZUFzU3RyaW5nID0gKG5vZGUpID0+IHtcbiAgICAgICAgY29uc3Qgc3RyaW5nID0gdGVybVN0cmluZzsgIC8vL1xuXG4gICAgICAgIHJldHVybiBzdHJpbmc7XG4gICAgICB9LFxuICAgICAgdG9rZW5zQXNTdHJpbmcgPSAodG9rZW5zKSA9PiB7XG4gICAgICAgIGNvbnN0IHN0cmluZyA9IHRlcm1Ob2RlOyAgLy8vXG5cbiAgICAgICAgcmV0dXJuIHN0cmluZztcbiAgICAgIH0sXG4gICAgICBsb2NhbENvbnRleHQgPSB7XG4gICAgICAgIG5vZGVBc1Rva2VucyxcbiAgICAgICAgbm9kZUFzU3RyaW5nLFxuICAgICAgICB0b2tlbnNBc1N0cmluZ1xuICAgICAgfTtcblxuZXhwb3J0IGNvbnN0IGJyYWNrZXRlZFRlcm1Ob2RlID0gdGVybU5vZGU7ICAvLy9cblxuZXhwb3J0IGRlZmF1bHQgY2xhc3MgQnJhY2tldGVkQ29uc3RydWN0b3IgZXh0ZW5kcyBDb25zdHJ1Y3RvciB7XG4gIHN0YXRpYyBmcm9tTm90aGluZygpIHtcbiAgICBjb25zdCB7IFRlcm0gfSA9IHNoaW0sXG4gICAgICAgICAgdGVybSA9IFRlcm0uZnJvbVRlcm1Ob2RlKHRlcm1Ob2RlLCBsb2NhbENvbnRleHQpLFxuICAgICAgICAgIHR5cGUgPSBudWxsLFxuICAgICAgICAgIHN0cmluZyA9IHN0cmluZ0Zyb21UZXJtQW5kVHlwZSh0ZXJtLCB0eXBlKSxcbiAgICAgICAgICBicmFja2V0ZWRDb25zdHJ1Y3RvciA9IG5ldyBCcmFja2V0ZWRDb25zdHJ1Y3RvcihzdHJpbmcsIHRlcm0pO1xuXG4gICAgcmV0dXJuIGJyYWNrZXRlZENvbnN0cnVjdG9yO1xuICB9XG59XG4iXSwibmFtZXMiOlsiYnJhY2tldGVkVGVybU5vZGUiLCJCcmFja2V0ZWRDb25zdHJ1Y3RvciIsImxleGVyIiwibm9taW5hbExleGVyIiwicGFyc2VyIiwibm9taW5hbFBhcnNlciIsInRlcm1TdHJpbmciLCJPQkpFQ1RfVFlQRV9OQU1FIiwiY29uc3RydWN0b3JEZWNsYXJhdGlvblN0cmluZyIsImNvbnN0cnVjdG9yRGVjbGFyYXRpb25TdHJpbmdGcm9tVGVybVN0cmluZyIsImNvbnN0cnVjdG9yRGVjbGFyYXRpb25Ub2tlbnMiLCJjb25zdHJ1Y3RvckRlY2xhcmF0aW9uVG9rZW5zRnJvbUNvbnN0cnVjdG9yRGVjbGFyYXRpb25TdHJpbmciLCJjb25zdHJ1Y3RvckRlY2xhcmF0aW9uTm9kZSIsImNvbnN0cnVjdG9yRGVjbGFyYXRpb25Ob2RlRnJvbUNvbnN0cnVjdG9yRGVjbGFyYXRpb25Ub2tlbnMiLCJ0ZXJtTm9kZSIsInRlcm1Ob2RlRnJvbUNvbnN0cnVjdG9yRGVjbGFyYXRpb25Ob2RlIiwidGVybVRva2VucyIsInRlcm1Ub2tlbnNGcm9tQ29uc3RydWN0b3JEZWNsYXJhdGlvblRva2VucyIsIm5vZGVBc1Rva2VucyIsIm5vZGUiLCJ0b2tlbnMiLCJub2RlQXNTdHJpbmciLCJzdHJpbmciLCJ0b2tlbnNBc1N0cmluZyIsImxvY2FsQ29udGV4dCIsImZyb21Ob3RoaW5nIiwiVGVybSIsInNoaW0iLCJ0ZXJtIiwiZnJvbVRlcm1Ob2RlIiwidHlwZSIsInN0cmluZ0Zyb21UZXJtQW5kVHlwZSIsImJyYWNrZXRlZENvbnN0cnVjdG9yIiwiQ29uc3RydWN0b3IiXSwibWFwcGluZ3MiOiJBQUFBOzs7Ozs7Ozs7OztJQTBDYUEsaUJBQWlCO2VBQWpCQTs7O2VBRVFDOzs7MkRBMUNKO21FQUNPO3lCQUVTO3VCQUVXO3NCQUM2RTtvQkFHOUM7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUUzRSxJQUFNQyxRQUFRQyxxQkFBWSxFQUNwQkMsU0FBU0Msc0JBQWEsRUFDdEJDLGFBQWEsQUFBQyxJQUFvQixPQUFqQkMsMkJBQWdCLEVBQUMsTUFDbENDLCtCQUErQkMsSUFBQUEsZ0RBQTBDLEVBQUNILGFBQzFFSSwrQkFBK0JDLElBQUFBLG9FQUE0RCxFQUFDSCw4QkFBOEJOLFFBQzFIVSw2QkFBNkJDLElBQUFBLGdFQUEwRCxFQUFDSCw4QkFBOEJOLFNBQ3RIVSxXQUFXQyxJQUFBQSw0Q0FBc0MsRUFBQ0gsNkJBQ2xESSxhQUFhQyxJQUFBQSxrREFBMEMsRUFBQ1AsK0JBQ3hEUSxlQUFlLFNBQUNDO0lBQ2QsSUFBTUMsU0FBU0osWUFBWSxHQUFHO0lBRTlCLE9BQU9JO0FBQ1QsR0FDQUMsZUFBZSxTQUFDRjtJQUNkLElBQU1HLFNBQVNoQixZQUFhLEdBQUc7SUFFL0IsT0FBT2dCO0FBQ1QsR0FDQUMsaUJBQWlCLFNBQUNIO0lBQ2hCLElBQU1FLFNBQVNSLFVBQVcsR0FBRztJQUU3QixPQUFPUTtBQUNULEdBQ0FFLGVBQWU7SUFDYk4sY0FBQUE7SUFDQUcsY0FBQUE7SUFDQUUsZ0JBQUFBO0FBQ0Y7QUFFQyxJQUFNdkIsb0JBQW9CYyxVQUFXLEdBQUc7QUFFaEMsSUFBQSxBQUFNYixxQ0FBTjtjQUFNQTthQUFBQTtnQ0FBQUE7aUNBQUFBOztrQkFBQUE7O1lBQ1p3QixLQUFBQTttQkFBUCxTQUFPQTtnQkFDTCxJQUFNLEFBQUVDLE9BQVNDLGFBQUksQ0FBYkQsTUFDRkUsT0FBT0YsS0FBS0csWUFBWSxDQUFDZixVQUFVVSxlQUNuQ00sT0FBTyxNQUNQUixTQUFTUyxJQUFBQSxrQ0FBcUIsRUFBQ0gsTUFBTUUsT0FDckNFLHVCQUF1QixJQU5aL0IscUJBTXFDcUIsUUFBUU07Z0JBRTlELE9BQU9JO1lBQ1Q7OztXQVRtQi9CO0VBQTZCZ0Msb0JBQVcifQ==
|
package/lib/constructor.js
CHANGED
|
@@ -71,17 +71,17 @@ var Constructor = /*#__PURE__*/ function() {
|
|
|
71
71
|
}
|
|
72
72
|
},
|
|
73
73
|
{
|
|
74
|
-
key: "
|
|
75
|
-
value: function
|
|
74
|
+
key: "verifyWhenDeclared",
|
|
75
|
+
value: function verifyWhenDeclared(fileContext) {
|
|
76
76
|
var verifiedAtTopLevel;
|
|
77
77
|
var constructorString = this.string; ///
|
|
78
|
-
fileContext.trace("Verifying the '".concat(constructorString, "' constructor
|
|
79
|
-
var termVerifiedAtTopLevel = this.term.
|
|
78
|
+
fileContext.trace("Verifying the '".concat(constructorString, "' constructor when declared..."));
|
|
79
|
+
var termVerifiedAtTopLevel = this.term.verifyWhenDeclared(fileContext);
|
|
80
80
|
if (termVerifiedAtTopLevel) {
|
|
81
81
|
verifiedAtTopLevel = true; ///
|
|
82
82
|
}
|
|
83
83
|
if (verifiedAtTopLevel) {
|
|
84
|
-
fileContext.debug("...verified the '".concat(constructorString, "' constructor
|
|
84
|
+
fileContext.debug("...verified the '".concat(constructorString, "' constructor when declared."));
|
|
85
85
|
}
|
|
86
86
|
return verifiedAtTopLevel;
|
|
87
87
|
}
|
|
@@ -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,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy9jb25zdHJ1Y3Rvci5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuaW1wb3J0IHNoaW0gZnJvbSBcIi4vc2hpbVwiO1xuaW1wb3J0IExvY2FsQ29udGV4dCBmcm9tIFwiLi9jb250ZXh0L2xvY2FsXCI7XG5cbmltcG9ydCB7IG5vZGVRdWVyeSB9IGZyb20gXCIuL3V0aWxpdGllcy9xdWVyeVwiO1xuaW1wb3J0IHsgdGVybUZyb21KU09OLCB0ZXJtVG9UZXJtSlNPTiB9IGZyb20gXCIuL3V0aWxpdGllcy9qc29uXCI7XG5cbmNvbnN0IHRlcm1Ob2RlUXVlcnkgPSBub2RlUXVlcnkoXCIvY29uc3RydWN0b3JEZWNsYXJhdGlvbi90ZXJtXCIpLFxuICAgICAgdHlwZU5vZGVRdWVyeSA9IG5vZGVRdWVyeShcIi9jb25zdHJ1Y3RvckRlY2xhcmF0aW9uL3R5cGVcIik7XG5cbmNsYXNzIENvbnN0cnVjdG9yIHtcbiAgY29uc3RydWN0b3Ioc3RyaW5nLCB0ZXJtKSB7XG4gICAgdGhpcy5zdHJpbmcgPSBzdHJpbmc7XG4gICAgdGhpcy50ZXJtID0gdGVybTtcbiAgfVxuXG4gIGdldFN0cmluZygpIHtcbiAgICByZXR1cm4gdGhpcy5zdHJpbmc7XG4gIH1cblxuICBnZXRUZXJtKCkge1xuICAgIHJldHVybiB0aGlzLnRlcm07XG4gIH1cblxuICBnZXRUeXBlKCkgeyByZXR1cm4gdGhpcy50ZXJtLmdldFR5cGUoKTsgfVxuXG4gIHZlcmlmeVdoZW5EZWNsYXJlZChmaWxlQ29udGV4dCkge1xuICAgIGxldCB2ZXJpZmllZEF0VG9wTGV2ZWw7XG5cbiAgICBjb25zdCBjb25zdHJ1Y3RvclN0cmluZyA9IHRoaXMuc3RyaW5nOyAgLy8vXG5cbiAgICBmaWxlQ29udGV4dC50cmFjZShgVmVyaWZ5aW5nIHRoZSAnJHtjb25zdHJ1Y3RvclN0cmluZ30nIGNvbnN0cnVjdG9yIHdoZW4gZGVjbGFyZWQuLi5gKTtcblxuICAgIGNvbnN0IHRlcm1WZXJpZmllZEF0VG9wTGV2ZWwgPSB0aGlzLnRlcm0udmVyaWZ5V2hlbkRlY2xhcmVkKGZpbGVDb250ZXh0KTtcblxuICAgIGlmICh0ZXJtVmVyaWZpZWRBdFRvcExldmVsKSB7XG4gICAgICB2ZXJpZmllZEF0VG9wTGV2ZWwgPSB0cnVlOyAvLy9cbiAgICB9XG5cbiAgICBpZiAodmVyaWZpZWRBdFRvcExldmVsKSB7XG4gICAgICBmaWxlQ29udGV4dC5kZWJ1ZyhgLi4udmVyaWZpZWQgdGhlICcke2NvbnN0cnVjdG9yU3RyaW5nfScgY29uc3RydWN0b3Igd2hlbiBkZWNsYXJlZC5gKTtcbiAgICB9XG5cbiAgICByZXR1cm4gdmVyaWZpZWRBdFRvcExldmVsO1xuICB9XG5cbiAgdG9KU09OKCkge1xuICAgIGNvbnN0IHRlcm1KU09OID0gdGVybVRvVGVybUpTT04odGhpcy50ZXJtKSxcbiAgICAgICAgICB0ZXJtID0gdGVybUpTT04sICAvLy9cbiAgICAgICAgICBqc29uID0ge1xuICAgICAgICAgICAgdGVybVxuICAgICAgICAgIH07XG5cbiAgICByZXR1cm4ganNvbjtcbiAgfVxuXG4gIHN0YXRpYyBmcm9tSlNPTihqc29uLCBmaWxlQ29udGV4dCkge1xuICAgIGNvbnN0IHRlcm0gPSB0ZXJtRnJvbUpTT04oanNvbiwgZmlsZUNvbnRleHQpLFxuICAgICAgICAgIHR5cGUgPSB0ZXJtLmdldFR5cGUoKSxcbiAgICAgICAgICBzdHJpbmcgPSBzdHJpbmdGcm9tVGVybUFuZFR5cGUodGVybSwgdHlwZSksXG4gICAgICAgICAgY29uc3RydWN0b3IgPSBuZXcgQ29uc3RydWN0b3Ioc3RyaW5nLCB0ZXJtKTtcblxuICAgIHJldHVybiBjb25zdHJ1Y3RvcjtcbiAgfVxuXG4gIHN0YXRpYyBmcm9tQ29uc3RydWN0b3JEZWNsYXJhdGlvbk5vZGUoY29uc3RydWN0b3JEZWNsYXJhdGlvbk5vZGUsIGZpbGVDb250ZXh0KSB7XG4gICAgY29uc3QgeyBUZXJtLCBUeXBlIH0gPSBzaGltLFxuICAgICAgICAgIHRlcm1Ob2RlID0gdGVybU5vZGVRdWVyeShjb25zdHJ1Y3RvckRlY2xhcmF0aW9uTm9kZSksXG4gICAgICAgICAgdHlwZU5vZGUgPSB0eXBlTm9kZVF1ZXJ5KGNvbnN0cnVjdG9yRGVjbGFyYXRpb25Ob2RlKSxcbiAgICAgICAgICB0eXBlID0gVHlwZS5mcm9tVHlwZU5vZGUodHlwZU5vZGUpLFxuICAgICAgICAgIGxvY2FsQ29udGV4dCA9IExvY2FsQ29udGV4dC5mcm9tRmlsZUNvbnRleHQoZmlsZUNvbnRleHQpLFxuICAgICAgICAgIHRlcm0gPSBUZXJtLmZyb21UZXJtTm9kZUFuZFR5cGUodGVybU5vZGUsIHR5cGUsIGxvY2FsQ29udGV4dCksXG4gICAgICAgICAgc3RyaW5nID0gc3RyaW5nRnJvbVRlcm1BbmRUeXBlKHRlcm0sIHR5cGUpLFxuICAgICAgICAgIGNvbnN0cnVjdG9yID0gbmV3IENvbnN0cnVjdG9yKHN0cmluZywgdGVybSk7XG5cbiAgICByZXR1cm4gY29uc3RydWN0b3I7XG4gIH1cbn1cblxuT2JqZWN0LmFzc2lnbihzaGltLCB7XG4gIENvbnN0cnVjdG9yXG59KTtcblxuZXhwb3J0IGRlZmF1bHQgQ29uc3RydWN0b3I7XG5cbmV4cG9ydCBmdW5jdGlvbiBzdHJpbmdGcm9tVGVybUFuZFR5cGUodGVybSwgdHlwZSkge1xuICBsZXQgc3RyaW5nO1xuXG4gIGNvbnN0IHRlcm1TdHJpbmcgPSB0ZXJtLmdldFN0cmluZygpO1xuXG4gIGlmICh0eXBlID09PSBudWxsKSB7XG4gICAgc3RyaW5nID0gYCR7dGVybVN0cmluZ31gO1xuICB9IGVsc2Uge1xuICAgIGNvbnN0IHR5cGVOYW1lID0gdHlwZS5nZXROYW1lKCk7XG5cbiAgICBzdHJpbmcgPSBgJHt0ZXJtU3RyaW5nfToke3R5cGVOYW1lfWA7XG4gIH1cblxuICByZXR1cm4gc3RyaW5nO1xufVxuIl0sIm5hbWVzIjpbInN0cmluZ0Zyb21UZXJtQW5kVHlwZSIsInRlcm1Ob2RlUXVlcnkiLCJub2RlUXVlcnkiLCJ0eXBlTm9kZVF1ZXJ5IiwiQ29uc3RydWN0b3IiLCJzdHJpbmciLCJ0ZXJtIiwiZ2V0U3RyaW5nIiwiZ2V0VGVybSIsImdldFR5cGUiLCJ2ZXJpZnlXaGVuRGVjbGFyZWQiLCJmaWxlQ29udGV4dCIsInZlcmlmaWVkQXRUb3BMZXZlbCIsImNvbnN0cnVjdG9yU3RyaW5nIiwidHJhY2UiLCJ0ZXJtVmVyaWZpZWRBdFRvcExldmVsIiwiZGVidWciLCJ0b0pTT04iLCJ0ZXJtSlNPTiIsInRlcm1Ub1Rlcm1KU09OIiwianNvbiIsImZyb21KU09OIiwidGVybUZyb21KU09OIiwidHlwZSIsImNvbnN0cnVjdG9yIiwiZnJvbUNvbnN0cnVjdG9yRGVjbGFyYXRpb25Ob2RlIiwiY29uc3RydWN0b3JEZWNsYXJhdGlvbk5vZGUiLCJUZXJtIiwic2hpbSIsIlR5cGUiLCJ0ZXJtTm9kZSIsInR5cGVOb2RlIiwiZnJvbVR5cGVOb2RlIiwibG9jYWxDb250ZXh0IiwiTG9jYWxDb250ZXh0IiwiZnJvbUZpbGVDb250ZXh0IiwiZnJvbVRlcm1Ob2RlQW5kVHlwZSIsIk9iamVjdCIsImFzc2lnbiIsInRlcm1TdHJpbmciLCJ0eXBlTmFtZSIsImdldE5hbWUiXSwibWFwcGluZ3MiOiJBQUFBOzs7Ozs7Ozs7OztJQW9GQSxPQUEyQjtlQUEzQjs7SUFFZ0JBLHFCQUFxQjtlQUFyQkE7OzsyREFwRkM7NERBQ1E7cUJBRUM7b0JBQ21COzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBRTdDLElBQU1DLGdCQUFnQkMsSUFBQUEsZ0JBQVMsRUFBQyxpQ0FDMUJDLGdCQUFnQkQsSUFBQUEsZ0JBQVMsRUFBQztBQUVoQyxJQUFBLEFBQU1FLDRCQUFOO2FBQU1BLFlBQ1FDLE1BQU0sRUFBRUMsSUFBSTtnQ0FEcEJGO1FBRUYsSUFBSSxDQUFDQyxNQUFNLEdBQUdBO1FBQ2QsSUFBSSxDQUFDQyxJQUFJLEdBQUdBOztrQkFIVkY7O1lBTUpHLEtBQUFBO21CQUFBQSxTQUFBQTtnQkFDRSxPQUFPLElBQUksQ0FBQ0YsTUFBTTtZQUNwQjs7O1lBRUFHLEtBQUFBO21CQUFBQSxTQUFBQTtnQkFDRSxPQUFPLElBQUksQ0FBQ0YsSUFBSTtZQUNsQjs7O1lBRUFHLEtBQUFBO21CQUFBQSxTQUFBQTtnQkFBWSxPQUFPLElBQUksQ0FBQ0gsSUFBSSxDQUFDRyxPQUFPO1lBQUk7OztZQUV4Q0MsS0FBQUE7bUJBQUFBLFNBQUFBLG1CQUFtQkMsV0FBVztnQkFDNUIsSUFBSUM7Z0JBRUosSUFBTUMsb0JBQW9CLElBQUksQ0FBQ1IsTUFBTSxFQUFHLEdBQUc7Z0JBRTNDTSxZQUFZRyxLQUFLLENBQUMsQUFBQyxrQkFBbUMsT0FBbEJELG1CQUFrQjtnQkFFdEQsSUFBTUUseUJBQXlCLElBQUksQ0FBQ1QsSUFBSSxDQUFDSSxrQkFBa0IsQ0FBQ0M7Z0JBRTVELElBQUlJLHdCQUF3QjtvQkFDMUJILHFCQUFxQixNQUFNLEdBQUc7Z0JBQ2hDO2dCQUVBLElBQUlBLG9CQUFvQjtvQkFDdEJELFlBQVlLLEtBQUssQ0FBQyxBQUFDLG9CQUFxQyxPQUFsQkgsbUJBQWtCO2dCQUMxRDtnQkFFQSxPQUFPRDtZQUNUOzs7WUFFQUssS0FBQUE7bUJBQUFBLFNBQUFBO2dCQUNFLElBQU1DLFdBQVdDLElBQUFBLG9CQUFjLEVBQUMsSUFBSSxDQUFDYixJQUFJLEdBQ25DQSxPQUFPWSxVQUNQRSxPQUFPO29CQUNMZCxNQUFBQTtnQkFDRjtnQkFFTixPQUFPYztZQUNUOzs7O1lBRU9DLEtBQUFBO21CQUFQLFNBQU9BLFNBQVNELElBQUksRUFBRVQsV0FBVztnQkFDL0IsSUFBTUwsT0FBT2dCLElBQUFBLGtCQUFZLEVBQUNGLE1BQU1ULGNBQzFCWSxPQUFPakIsS0FBS0csT0FBTyxJQUNuQkosU0FBU0wsc0JBQXNCTSxNQUFNaUIsT0FDckNDLGNBQWMsSUFsRGxCcEIsWUFrRGtDQyxRQUFRQztnQkFFNUMsT0FBT2tCO1lBQ1Q7OztZQUVPQyxLQUFBQTttQkFBUCxTQUFPQSwrQkFBK0JDLDBCQUEwQixFQUFFZixXQUFXO2dCQUMzRSxJQUFRZ0IsT0FBZUMsYUFBSSxDQUFuQkQsTUFBTUUsT0FBU0QsYUFBSSxDQUFiQyxNQUNSQyxXQUFXN0IsY0FBY3lCLDZCQUN6QkssV0FBVzVCLGNBQWN1Qiw2QkFDekJILE9BQU9NLEtBQUtHLFlBQVksQ0FBQ0QsV0FDekJFLGVBQWVDLGNBQVksQ0FBQ0MsZUFBZSxDQUFDeEIsY0FDNUNMLE9BQU9xQixLQUFLUyxtQkFBbUIsQ0FBQ04sVUFBVVAsTUFBTVUsZUFDaEQ1QixTQUFTTCxzQkFBc0JNLE1BQU1pQixPQUNyQ0MsY0FBYyxJQS9EbEJwQixZQStEa0NDLFFBQVFDO2dCQUU1QyxPQUFPa0I7WUFDVDs7O1dBbEVJcEI7O0FBcUVOaUMsT0FBT0MsTUFBTSxDQUFDVixhQUFJLEVBQUU7SUFDbEJ4QixhQUFBQTtBQUNGO0lBRUEsV0FBZUE7QUFFUixTQUFTSixzQkFBc0JNLElBQUksRUFBRWlCLElBQUk7SUFDOUMsSUFBSWxCO0lBRUosSUFBTWtDLGFBQWFqQyxLQUFLQyxTQUFTO0lBRWpDLElBQUlnQixTQUFTLE1BQU07UUFDakJsQixTQUFTLEFBQUMsR0FBYSxPQUFYa0M7SUFDZCxPQUFPO1FBQ0wsSUFBTUMsV0FBV2pCLEtBQUtrQixPQUFPO1FBRTdCcEMsU0FBUyxBQUFDLEdBQWdCbUMsT0FBZEQsWUFBVyxLQUFZLE9BQVRDO0lBQzVCO0lBRUEsT0FBT25DO0FBQ1QifQ==
|