occam-verify-cli 0.0.922 → 0.0.924
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/axiom.js +9 -9
- package/lib/conclusion.js +11 -41
- package/lib/conjecture.js +9 -9
- package/lib/constants.js +1 -13
- package/lib/context/file.js +3 -3
- package/lib/context/local.js +19 -59
- package/lib/declaration.js +15 -15
- package/lib/lemma.js +9 -9
- package/lib/metaLemma.js +7 -7
- package/lib/metatheorem.js +7 -7
- package/lib/metavariable.js +8 -1
- package/lib/mixins/nodesVerifier/metaLevel.js +6 -6
- package/lib/premise.js +14 -91
- package/lib/{step/proof.js → proofStep.js} +1 -1
- package/lib/rule.js +1 -45
- package/lib/ruleNames.js +1 -9
- package/lib/substitution/statementForMetavariable.js +9 -1
- package/lib/substitution.js +1 -8
- package/lib/supposition.js +55 -1
- package/lib/theorem.js +9 -9
- package/lib/topLevelAssertion.js +186 -0
- package/lib/utilities/customGrammar.js +2 -2
- package/lib/utilities/match.js +13 -50
- package/lib/utilities/node.js +2 -27
- package/lib/utilities/tokens.js +1 -8
- package/lib/utilities/verify.js +8 -24
- package/lib/verifier/nodes/intrinsicLevelAgainstMetaLevel.js +29 -29
- package/lib/verifier/nodes/metaLevel.js +13 -13
- package/lib/verify/axiom.js +4 -4
- package/lib/verify/conclusion.js +10 -11
- package/lib/verify/conjecture.js +4 -4
- package/lib/verify/containedAssertion.js +91 -0
- package/lib/verify/declaration.js +7 -7
- package/lib/verify/definedAssertion.js +115 -0
- package/lib/verify/derivation.js +7 -7
- package/lib/verify/frame.js +2 -2
- package/lib/verify/judgement.js +2 -2
- package/lib/verify/lemma.js +5 -5
- package/lib/verify/metaLemma.js +12 -12
- package/lib/verify/metastatement.js +48 -67
- package/lib/verify/metatheorem.js +12 -12
- package/lib/verify/metavariable.js +2 -2
- package/lib/verify/premise.js +11 -30
- package/lib/verify/proof.js +3 -3
- package/lib/verify/proofStep.js +8 -8
- package/lib/verify/rule.js +10 -10
- package/lib/verify/statement/qualified.js +38 -15
- package/lib/verify/statement/unqualified.js +38 -10
- package/lib/verify/statement.js +85 -92
- package/lib/verify/subDerivation.js +3 -3
- package/lib/verify/subproof.js +3 -3
- package/lib/verify/supposition.js +3 -3
- package/lib/verify/termAsConstructor.js +2 -2
- package/lib/verify/theorem.js +4 -4
- package/package.json +2 -2
- package/src/axiom.js +4 -4
- package/src/conclusion.js +13 -52
- package/src/conjecture.js +4 -4
- package/src/constants.js +0 -3
- package/src/context/file.js +2 -2
- package/src/context/local.js +21 -67
- package/src/declaration.js +19 -19
- package/src/lemma.js +4 -4
- package/src/metaLemma.js +4 -4
- package/src/metatheorem.js +4 -4
- package/src/metavariable.js +6 -0
- package/src/mixins/nodesVerifier/metaLevel.js +8 -8
- package/src/premise.js +20 -137
- package/src/rule.js +0 -67
- package/src/ruleNames.js +0 -2
- package/src/substitution/statementForMetavariable.js +14 -0
- package/src/substitution.js +0 -6
- package/src/supposition.js +46 -0
- package/src/theorem.js +4 -4
- package/src/{axiomLemmaTheoremConjecture.js → topLevelAssertion.js} +36 -23
- package/src/utilities/customGrammar.js +1 -2
- package/src/utilities/match.js +13 -60
- package/src/utilities/node.js +3 -32
- package/src/utilities/tokens.js +0 -8
- package/src/utilities/verify.js +4 -20
- package/src/verifier/nodes/intrinsicLevelAgainstMetaLevel.js +36 -37
- package/src/verifier/nodes/metaLevel.js +17 -17
- package/src/verify/axiom.js +5 -4
- package/src/verify/conclusion.js +9 -13
- package/src/verify/conjecture.js +5 -4
- package/src/verify/{statementAsContainedAssertion.js → containedAssertion.js} +20 -36
- package/src/verify/declaration.js +8 -8
- package/src/verify/{statementAsDefinedAssertion.js → definedAssertion.js} +22 -37
- package/src/verify/derivation.js +6 -6
- package/src/verify/frame.js +1 -1
- package/src/verify/judgement.js +1 -1
- package/src/verify/lemma.js +8 -5
- package/src/verify/metaLemma.js +24 -24
- package/src/verify/metastatement.js +48 -76
- package/src/verify/metatheorem.js +23 -23
- package/src/verify/metavariable.js +1 -1
- package/src/verify/premise.js +14 -46
- package/src/verify/proof.js +2 -2
- package/src/verify/proofStep.js +4 -4
- package/src/verify/rule.js +11 -11
- package/src/verify/statement/qualified.js +56 -21
- package/src/verify/statement/unqualified.js +52 -10
- package/src/verify/statement.js +133 -39
- package/src/verify/subDerivation.js +2 -2
- package/src/verify/subproof.js +2 -2
- package/src/verify/supposition.js +1 -1
- package/src/verify/termAsConstructor.js +2 -2
- package/src/verify/theorem.js +7 -4
- package/lib/axiomLemmaTheoremConjecture.js +0 -174
- package/lib/metaConsequent.js +0 -108
- package/lib/metaLemmaMetatheorem.js +0 -191
- package/lib/metaSupposition.js +0 -160
- package/lib/node/metastatement/bracketed.js +0 -16
- package/lib/step/metaproof.js +0 -106
- package/lib/substitution/metastatementForMetavariable.js +0 -173
- package/lib/verify/metaConsequent.js +0 -50
- package/lib/verify/metaDerivation.js +0 -31
- package/lib/verify/metaSubDerivation.js +0 -25
- package/lib/verify/metaSubproof.js +0 -34
- package/lib/verify/metaSupposition.js +0 -61
- package/lib/verify/metaSuppositions.js +0 -28
- package/lib/verify/metaproof.js +0 -31
- package/lib/verify/metaproofStep.js +0 -98
- package/lib/verify/metastatement/qualified.js +0 -95
- package/lib/verify/metastatement/unqualified.js +0 -37
- package/lib/verify/metastatementAsContainedAssertion.js +0 -109
- package/lib/verify/metastatementAsDefinedAssertion.js +0 -132
- package/lib/verify/metavariableAgainstMetastatement.js +0 -44
- package/lib/verify/statementAsContainedAssertion.js +0 -109
- package/lib/verify/statementAsDefinedAssertion.js +0 -132
- package/src/metaConsequent.js +0 -83
- package/src/metaLemmaMetatheorem.js +0 -188
- package/src/metaSupposition.js +0 -127
- package/src/node/metastatement/bracketed.js +0 -9
- package/src/step/metaproof.js +0 -73
- package/src/substitution/metastatementForMetavariable.js +0 -90
- package/src/verify/metaConsequent.js +0 -61
- package/src/verify/metaDerivation.js +0 -23
- package/src/verify/metaSubDerivation.js +0 -22
- package/src/verify/metaSubproof.js +0 -32
- package/src/verify/metaSupposition.js +0 -78
- package/src/verify/metaSuppositions.js +0 -17
- package/src/verify/metaproof.js +0 -28
- package/src/verify/metaproofStep.js +0 -137
- package/src/verify/metastatement/qualified.js +0 -130
- package/src/verify/metastatement/unqualified.js +0 -34
- package/src/verify/metastatementAsContainedAssertion.js +0 -127
- package/src/verify/metastatementAsDefinedAssertion.js +0 -156
- package/src/verify/metavariableAgainstMetastatement.js +0 -42
- /package/src/{step/proof.js → proofStep.js} +0 -0
package/lib/supposition.js
CHANGED
|
@@ -8,9 +8,21 @@ Object.defineProperty(exports, "default", {
|
|
|
8
8
|
return Supposition;
|
|
9
9
|
}
|
|
10
10
|
});
|
|
11
|
+
var _local = /*#__PURE__*/ _interop_require_default(require("./context/local"));
|
|
12
|
+
var _metaLevel = /*#__PURE__*/ _interop_require_default(require("./verifier/nodes/metaLevel"));
|
|
11
13
|
var _intrinsicLevel = /*#__PURE__*/ _interop_require_default(require("./verifier/nodes/intrinsicLevel"));
|
|
14
|
+
var _array = require("./utilities/array");
|
|
12
15
|
var _string = require("./utilities/string");
|
|
13
16
|
var _node = require("./utilities/node");
|
|
17
|
+
var _query = require("./utilities/query");
|
|
18
|
+
function _array_like_to_array(arr, len) {
|
|
19
|
+
if (len == null || len > arr.length) len = arr.length;
|
|
20
|
+
for(var i = 0, arr2 = new Array(len); i < len; i++)arr2[i] = arr[i];
|
|
21
|
+
return arr2;
|
|
22
|
+
}
|
|
23
|
+
function _array_without_holes(arr) {
|
|
24
|
+
if (Array.isArray(arr)) return _array_like_to_array(arr);
|
|
25
|
+
}
|
|
14
26
|
function _class_call_check(instance, Constructor) {
|
|
15
27
|
if (!(instance instanceof Constructor)) {
|
|
16
28
|
throw new TypeError("Cannot call a class as a function");
|
|
@@ -35,6 +47,24 @@ function _interop_require_default(obj) {
|
|
|
35
47
|
default: obj
|
|
36
48
|
};
|
|
37
49
|
}
|
|
50
|
+
function _iterable_to_array(iter) {
|
|
51
|
+
if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter);
|
|
52
|
+
}
|
|
53
|
+
function _non_iterable_spread() {
|
|
54
|
+
throw new TypeError("Invalid attempt to spread non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
|
|
55
|
+
}
|
|
56
|
+
function _to_consumable_array(arr) {
|
|
57
|
+
return _array_without_holes(arr) || _iterable_to_array(arr) || _unsupported_iterable_to_array(arr) || _non_iterable_spread();
|
|
58
|
+
}
|
|
59
|
+
function _unsupported_iterable_to_array(o, minLen) {
|
|
60
|
+
if (!o) return;
|
|
61
|
+
if (typeof o === "string") return _array_like_to_array(o, minLen);
|
|
62
|
+
var n = Object.prototype.toString.call(o).slice(8, -1);
|
|
63
|
+
if (n === "Object" && o.constructor) n = o.constructor.name;
|
|
64
|
+
if (n === "Map" || n === "Set") return Array.from(n);
|
|
65
|
+
if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _array_like_to_array(o, minLen);
|
|
66
|
+
}
|
|
67
|
+
var subproofAssertionNodeQuery = (0, _query.nodeQuery)("/statement/subproofAssertion!"), subproofAssertionStatementNodesQuery = (0, _query.nodesQuery)("/subproofAssertion/statement"), subproofSuppositionStatementNodesQuery = (0, _query.nodesQuery)("/subproof/supposition/unqualifiedStatement/statement!"), subproofLastProofStepStatementNodeQuery = (0, _query.nodeQuery)("/subproof/subDerivation/lastProofStep/unqualifiedStatement|qualifiedStatement/statement!");
|
|
38
68
|
var Supposition = /*#__PURE__*/ function() {
|
|
39
69
|
function Supposition(statementNode) {
|
|
40
70
|
_class_call_check(this, Supposition);
|
|
@@ -57,6 +87,30 @@ var Supposition = /*#__PURE__*/ function() {
|
|
|
57
87
|
return matchesStatementNode;
|
|
58
88
|
}
|
|
59
89
|
},
|
|
90
|
+
{
|
|
91
|
+
key: "matchSubproofNode",
|
|
92
|
+
value: function matchSubproofNode(subproofNode, substitutions, fileContext, localContext) {
|
|
93
|
+
var matchesSubproofNode = false;
|
|
94
|
+
if (this.statementNode !== null) {
|
|
95
|
+
var subproofAssertionNode = subproofAssertionNodeQuery(this.statementNode);
|
|
96
|
+
if (subproofAssertionNode !== null) {
|
|
97
|
+
var subproofSuppositionStatementNodes = subproofSuppositionStatementNodesQuery(subproofNode), subproofLastProofStepStatementNode = subproofLastProofStepStatementNodeQuery(subproofNode), subproofStatementNodes = _to_consumable_array(subproofSuppositionStatementNodes).concat([
|
|
98
|
+
subproofLastProofStepStatementNode
|
|
99
|
+
]), subproofAssertionStatementNodes = subproofAssertionStatementNodesQuery(subproofAssertionNode);
|
|
100
|
+
matchesSubproofNode = (0, _array.match)(subproofAssertionStatementNodes, subproofStatementNodes, function(subproofAssertionStatementNode, ruleSubproofStatementNode) {
|
|
101
|
+
var fileContextA = fileContext, nonTerminalNodeA = subproofAssertionStatementNode, nonTerminalNodeB = ruleSubproofStatementNode, localContextA = _local.default.fromFileContext(fileContextA), localContextB = localContext, nonTerminalNodeVerified = _metaLevel.default.verifyNonTerminalNode(nonTerminalNodeA, nonTerminalNodeB, substitutions, localContextA, localContextB, function() {
|
|
102
|
+
var verifiedAhead = true;
|
|
103
|
+
return verifiedAhead;
|
|
104
|
+
});
|
|
105
|
+
if (nonTerminalNodeVerified) {
|
|
106
|
+
return true;
|
|
107
|
+
}
|
|
108
|
+
});
|
|
109
|
+
}
|
|
110
|
+
}
|
|
111
|
+
return matchesSubproofNode;
|
|
112
|
+
}
|
|
113
|
+
},
|
|
60
114
|
{
|
|
61
115
|
key: "toJSON",
|
|
62
116
|
value: function toJSON(tokens) {
|
|
@@ -85,4 +139,4 @@ var Supposition = /*#__PURE__*/ function() {
|
|
|
85
139
|
return Supposition;
|
|
86
140
|
}();
|
|
87
141
|
|
|
88
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
142
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../src/supposition.js"],"sourcesContent":["\"use strict\";\n\nimport LocalContext from \"./context/local\";\nimport metaLevelNodesVerifier from \"./verifier/nodes/metaLevel\";\nimport intrinsicLevelNodesVerifier from \"./verifier/nodes/intrinsicLevel\";\n\nimport { match } from \"./utilities/array\";\nimport { nodeAsString } from \"./utilities/string\";\nimport { statementNodeFromStatementString } from \"./utilities/node\";\nimport {nodeQuery, nodesQuery} from \"./utilities/query\";\n\nconst subproofAssertionNodeQuery = nodeQuery(\"/statement/subproofAssertion!\"),\n      subproofAssertionStatementNodesQuery = nodesQuery(\"/subproofAssertion/statement\"),\n      subproofSuppositionStatementNodesQuery = nodesQuery(\"/subproof/supposition/unqualifiedStatement/statement!\"),\n      subproofLastProofStepStatementNodeQuery = nodeQuery(\"/subproof/subDerivation/lastProofStep/unqualifiedStatement|qualifiedStatement/statement!\");\n\nexport default class Supposition {\n  constructor(statementNode) {\n    this.statementNode = statementNode;\n  }\n\n  getStatementNode() {\n    return this.statementNode;\n  }\n\n  matchStatementNode(statementNode, substitutions, localContext, statementLocalContext) {\n    const nonTerminalNodeA = this.statementNode,  ///\n          nonTerminalNodeB = statementNode,  ///\n          localContextA = localContext, ///\n          localContextB = statementLocalContext,  ///\n          nonTerminalNodeVerified = intrinsicLevelNodesVerifier.verifyNonTerminalNode(nonTerminalNodeA, nonTerminalNodeB, substitutions, localContextA, localContextB, () => {\n            const verifiedAhead = true;\n\n            return verifiedAhead;\n          }),\n          matchesStatementNode = nonTerminalNodeVerified; ///\n\n    return matchesStatementNode;\n  }\n\n  matchSubproofNode(subproofNode, substitutions, fileContext, localContext) {\n    let matchesSubproofNode = false;\n\n    if (this.statementNode !== null) {\n      const subproofAssertionNode = subproofAssertionNodeQuery(this.statementNode);\n\n      if (subproofAssertionNode !== null) {\n        const subproofSuppositionStatementNodes = subproofSuppositionStatementNodesQuery(subproofNode),\n              subproofLastProofStepStatementNode = subproofLastProofStepStatementNodeQuery(subproofNode),\n              subproofStatementNodes = [\n                ...subproofSuppositionStatementNodes,\n                subproofLastProofStepStatementNode\n              ],\n              subproofAssertionStatementNodes = subproofAssertionStatementNodesQuery(subproofAssertionNode);\n\n        matchesSubproofNode = match(subproofAssertionStatementNodes, subproofStatementNodes, (subproofAssertionStatementNode, ruleSubproofStatementNode) => {\n          const fileContextA = fileContext, ///\n                nonTerminalNodeA = subproofAssertionStatementNode,  ///\n                nonTerminalNodeB = ruleSubproofStatementNode, ///\n                localContextA = LocalContext.fromFileContext(fileContextA),  ///\n                localContextB = localContext,  ///\n                nonTerminalNodeVerified = metaLevelNodesVerifier.verifyNonTerminalNode(nonTerminalNodeA, nonTerminalNodeB, substitutions, localContextA, localContextB, () => {\n                  const verifiedAhead = true;\n\n                  return verifiedAhead;\n                });\n\n          if (nonTerminalNodeVerified) {\n            return true;\n          }\n        });\n      }\n    }\n\n    return matchesSubproofNode;\n  }\n\n  toJSON(tokens) {\n    const statementString = nodeAsString(this.statementNode, tokens),\n          statement = statementString, ///\n          json = {\n            statement\n          };\n\n    return json;\n  }\n\n  static fromStatementNode(statementNode) {\n    const supposition = new Supposition(statementNode);\n\n    return supposition;\n  }\n\n  static fromJSONAndFileContext(json, fileContext) {\n    const { statement } = json,\n          statementString = statement,  ///\n          lexer = fileContext.getLexer(),\n          parser = fileContext.getParser(),\n          statementNode = statementNodeFromStatementString(statementString, lexer, parser),\n          supposition = new Supposition(statementNode);\n\n    return supposition;\n  }\n}\n"],"names":["Supposition","subproofAssertionNodeQuery","nodeQuery","subproofAssertionStatementNodesQuery","nodesQuery","subproofSuppositionStatementNodesQuery","subproofLastProofStepStatementNodeQuery","statementNode","getStatementNode","matchStatementNode","substitutions","localContext","statementLocalContext","nonTerminalNodeA","nonTerminalNodeB","localContextA","localContextB","nonTerminalNodeVerified","intrinsicLevelNodesVerifier","verifyNonTerminalNode","verifiedAhead","matchesStatementNode","matchSubproofNode","subproofNode","fileContext","matchesSubproofNode","subproofAssertionNode","subproofSuppositionStatementNodes","subproofLastProofStepStatementNode","subproofStatementNodes","subproofAssertionStatementNodes","match","subproofAssertionStatementNode","ruleSubproofStatementNode","fileContextA","LocalContext","fromFileContext","metaLevelNodesVerifier","toJSON","tokens","statementString","nodeAsString","statement","json","fromStatementNode","supposition","fromJSONAndFileContext","lexer","getLexer","parser","getParser","statementNodeFromStatementString"],"mappings":"AAAA;;;;;;;eAgBqBA;;;4DAdI;gEACU;qEACK;qBAElB;sBACO;oBACoB;qBACb;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEpC,IAAMC,6BAA6BC,IAAAA,gBAAS,EAAC,kCACvCC,uCAAuCC,IAAAA,iBAAU,EAAC,iCAClDC,yCAAyCD,IAAAA,iBAAU,EAAC,0DACpDE,0CAA0CJ,IAAAA,gBAAS,EAAC;AAE3C,IAAA,AAAMF,4BAAD,AAAL;aAAMA,YACPO,aAAa;gCADNP;QAEjB,IAAI,CAACO,aAAa,GAAGA;;kBAFJP;;YAKnBQ,KAAAA;mBAAAA,SAAAA;gBACE,OAAO,IAAI,CAACD,aAAa;YAC3B;;;YAEAE,KAAAA;mBAAAA,SAAAA,mBAAmBF,aAAa,EAAEG,aAAa,EAAEC,YAAY,EAAEC,qBAAqB;gBAClF,IAAMC,mBAAmB,IAAI,CAACN,aAAa,EACrCO,mBAAmBP,eACnBQ,gBAAgBJ,cAChBK,gBAAgBJ,uBAChBK,0BAA0BC,uBAA2B,CAACC,qBAAqB,CAACN,kBAAkBC,kBAAkBJ,eAAeK,eAAeC,eAAe;oBAC3J,IAAMI,gBAAgB;oBAEtB,OAAOA;gBACT,IACAC,uBAAuBJ,yBAAyB,GAAG;gBAEzD,OAAOI;YACT;;;YAEAC,KAAAA;mBAAAA,SAAAA,kBAAkBC,YAAY,EAAEb,aAAa,EAAEc,WAAW,EAAEb,YAAY;gBACtE,IAAIc,sBAAsB;gBAE1B,IAAI,IAAI,CAAClB,aAAa,KAAK,MAAM;oBAC/B,IAAMmB,wBAAwBzB,2BAA2B,IAAI,CAACM,aAAa;oBAE3E,IAAImB,0BAA0B,MAAM;wBAClC,IAAMC,oCAAoCtB,uCAAuCkB,eAC3EK,qCAAqCtB,wCAAwCiB,eAC7EM,yBAAyB,AACvB,qBAAGF,0CADoB;4BAEvBC;yBACD,GACDE,kCAAkC3B,qCAAqCuB;wBAE7ED,sBAAsBM,IAAAA,YAAK,EAACD,iCAAiCD,wBAAwB,SAACG,gCAAgCC;4BACpH,IAAMC,eAAeV,aACfX,mBAAmBmB,gCACnBlB,mBAAmBmB,2BACnBlB,gBAAgBoB,cAAY,CAACC,eAAe,CAACF,eAC7ClB,gBAAgBL,cAChBM,0BAA0BoB,kBAAsB,CAAClB,qBAAqB,CAACN,kBAAkBC,kBAAkBJ,eAAeK,eAAeC,eAAe;gCACtJ,IAAMI,gBAAgB;gCAEtB,OAAOA;4BACT;4BAEN,IAAIH,yBAAyB;gCAC3B,OAAO;4BACT;wBACF;oBACF;gBACF;gBAEA,OAAOQ;YACT;;;YAEAa,KAAAA;mBAAAA,SAAAA,OAAOC,MAAM;gBACX,IAAMC,kBAAkBC,IAAAA,oBAAY,EAAC,IAAI,CAAClC,aAAa,EAAEgC,SACnDG,YAAYF,iBACZG,OAAO;oBACLD,WAAAA;gBACF;gBAEN,OAAOC;YACT;;;;YAEOC,KAAAA;mBAAP,SAAOA,kBAAkBrC,aAAa;gBACpC,IAAMsC,cAAc,IAxEH7C,YAwEmBO;gBAEpC,OAAOsC;YACT;;;YAEOC,KAAAA;mBAAP,SAAOA,uBAAuBH,IAAI,EAAEnB,WAAW;gBAC7C,IAAM,AAAEkB,YAAcC,KAAdD,WACFF,kBAAkBE,WAClBK,QAAQvB,YAAYwB,QAAQ,IAC5BC,SAASzB,YAAY0B,SAAS,IAC9B3C,gBAAgB4C,IAAAA,sCAAgC,EAACX,iBAAiBO,OAAOE,SACzEJ,cAAc,IAnFH7C,YAmFmBO;gBAEpC,OAAOsC;YACT;;;WAtFmB7C"}
|
package/lib/theorem.js
CHANGED
|
@@ -8,7 +8,7 @@ Object.defineProperty(exports, "default", {
|
|
|
8
8
|
return Theorem;
|
|
9
9
|
}
|
|
10
10
|
});
|
|
11
|
-
var
|
|
11
|
+
var _topLevelAssertion = /*#__PURE__*/ _interop_require_default(require("./topLevelAssertion"));
|
|
12
12
|
function _assert_this_initialized(self) {
|
|
13
13
|
if (self === void 0) {
|
|
14
14
|
throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
|
|
@@ -87,8 +87,8 @@ function _is_native_reflect_construct() {
|
|
|
87
87
|
return !!result;
|
|
88
88
|
})();
|
|
89
89
|
}
|
|
90
|
-
var Theorem = /*#__PURE__*/ function(
|
|
91
|
-
_inherits(Theorem,
|
|
90
|
+
var Theorem = /*#__PURE__*/ function(TopLevelAssertion) {
|
|
91
|
+
_inherits(Theorem, TopLevelAssertion);
|
|
92
92
|
function Theorem() {
|
|
93
93
|
_class_call_check(this, Theorem);
|
|
94
94
|
return _call_super(this, Theorem, arguments);
|
|
@@ -97,17 +97,17 @@ var Theorem = /*#__PURE__*/ function(AxiomLemmaTheoremConjecture) {
|
|
|
97
97
|
{
|
|
98
98
|
key: "fromJSONAndFileContext",
|
|
99
99
|
value: function fromJSONAndFileContext(json, fileContext) {
|
|
100
|
-
return
|
|
100
|
+
return _topLevelAssertion.default.fromJSONAndFileContext(Theorem, json, fileContext);
|
|
101
101
|
}
|
|
102
102
|
},
|
|
103
103
|
{
|
|
104
|
-
key: "
|
|
105
|
-
value: function
|
|
106
|
-
return
|
|
104
|
+
key: "fromLabelsSuppositionsConsequentSubstitutionsAndFileContext",
|
|
105
|
+
value: function fromLabelsSuppositionsConsequentSubstitutionsAndFileContext(labels, suppositions, consequent, substitutions, fileContext) {
|
|
106
|
+
return _topLevelAssertion.default.fromLabelsSuppositionsConsequentSubstitutionsAndFileContext(Theorem, labels, suppositions, consequent, substitutions, fileContext);
|
|
107
107
|
}
|
|
108
108
|
}
|
|
109
109
|
]);
|
|
110
110
|
return Theorem;
|
|
111
|
-
}(
|
|
111
|
+
}(_topLevelAssertion.default);
|
|
112
112
|
|
|
113
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
113
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy90aGVvcmVtLmpzIl0sInNvdXJjZXNDb250ZW50IjpbIlwidXNlIHN0cmljdFwiO1xuXG5pbXBvcnQgVG9wTGV2ZWxBc3NlcnRpb24gZnJvbSBcIi4vdG9wTGV2ZWxBc3NlcnRpb25cIjtcblxuZXhwb3J0IGRlZmF1bHQgY2xhc3MgVGhlb3JlbSBleHRlbmRzIFRvcExldmVsQXNzZXJ0aW9uIHtcbiAgc3RhdGljIGZyb21KU09OQW5kRmlsZUNvbnRleHQoanNvbiwgZmlsZUNvbnRleHQpIHsgcmV0dXJuIFRvcExldmVsQXNzZXJ0aW9uLmZyb21KU09OQW5kRmlsZUNvbnRleHQoVGhlb3JlbSwganNvbiwgZmlsZUNvbnRleHQpOyB9XG5cbiAgc3RhdGljIGZyb21MYWJlbHNTdXBwb3NpdGlvbnNDb25zZXF1ZW50U3Vic3RpdHV0aW9uc0FuZEZpbGVDb250ZXh0KGxhYmVscywgc3VwcG9zaXRpb25zLCBjb25zZXF1ZW50LCBzdWJzdGl0dXRpb25zLCBmaWxlQ29udGV4dCkgeyByZXR1cm4gVG9wTGV2ZWxBc3NlcnRpb24uZnJvbUxhYmVsc1N1cHBvc2l0aW9uc0NvbnNlcXVlbnRTdWJzdGl0dXRpb25zQW5kRmlsZUNvbnRleHQoVGhlb3JlbSwgbGFiZWxzLCBzdXBwb3NpdGlvbnMsIGNvbnNlcXVlbnQsIHN1YnN0aXR1dGlvbnMsIGZpbGVDb250ZXh0KTsgfVxufVxuIl0sIm5hbWVzIjpbIlRoZW9yZW0iLCJmcm9tSlNPTkFuZEZpbGVDb250ZXh0IiwianNvbiIsImZpbGVDb250ZXh0IiwiVG9wTGV2ZWxBc3NlcnRpb24iLCJmcm9tTGFiZWxzU3VwcG9zaXRpb25zQ29uc2VxdWVudFN1YnN0aXR1dGlvbnNBbmRGaWxlQ29udGV4dCIsImxhYmVscyIsInN1cHBvc2l0aW9ucyIsImNvbnNlcXVlbnQiLCJzdWJzdGl0dXRpb25zIl0sIm1hcHBpbmdzIjoiQUFBQTs7Ozs7OztlQUlxQkE7Ozt3RUFGUzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUVmLElBQUEsQUFBTUEsd0JBQUQsQUFBTDtjQUFNQTthQUFBQTtnQ0FBQUE7aUNBQUFBOztrQkFBQUE7O1lBQ1pDLEtBQUFBO21CQUFQLFNBQU9BLHVCQUF1QkMsSUFBSSxFQUFFQyxXQUFXO2dCQUFJLE9BQU9DLDBCQUFpQixDQUFDSCxzQkFBc0IsQ0FEL0VELFNBQ3lGRSxNQUFNQztZQUFjOzs7WUFFekhFLEtBQUFBO21CQUFQLFNBQU9BLDREQUE0REMsTUFBTSxFQUFFQyxZQUFZLEVBQUVDLFVBQVUsRUFBRUMsYUFBYSxFQUFFTixXQUFXO2dCQUFJLE9BQU9DLDBCQUFpQixDQUFDQywyREFBMkQsQ0FIcE1MLFNBRzhNTSxRQUFRQyxjQUFjQyxZQUFZQyxlQUFlTjtZQUFjOzs7V0FIN1FIO0VBQWdCSSwwQkFBaUIifQ==
|
|
@@ -0,0 +1,186 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", {
|
|
3
|
+
value: true
|
|
4
|
+
});
|
|
5
|
+
Object.defineProperty(exports, "default", {
|
|
6
|
+
enumerable: true,
|
|
7
|
+
get: function() {
|
|
8
|
+
return TopLevelAssertion;
|
|
9
|
+
}
|
|
10
|
+
});
|
|
11
|
+
var _label = /*#__PURE__*/ _interop_require_default(require("./label"));
|
|
12
|
+
var _consequent = /*#__PURE__*/ _interop_require_default(require("./consequent"));
|
|
13
|
+
var _supposition = /*#__PURE__*/ _interop_require_default(require("./supposition"));
|
|
14
|
+
var _statementForMetavariable = /*#__PURE__*/ _interop_require_default(require("./substitution/statementForMetavariable"));
|
|
15
|
+
var _array = require("./utilities/array");
|
|
16
|
+
function _class_call_check(instance, Constructor) {
|
|
17
|
+
if (!(instance instanceof Constructor)) {
|
|
18
|
+
throw new TypeError("Cannot call a class as a function");
|
|
19
|
+
}
|
|
20
|
+
}
|
|
21
|
+
function _defineProperties(target, props) {
|
|
22
|
+
for(var i = 0; i < props.length; i++){
|
|
23
|
+
var descriptor = props[i];
|
|
24
|
+
descriptor.enumerable = descriptor.enumerable || false;
|
|
25
|
+
descriptor.configurable = true;
|
|
26
|
+
if ("value" in descriptor) descriptor.writable = true;
|
|
27
|
+
Object.defineProperty(target, descriptor.key, descriptor);
|
|
28
|
+
}
|
|
29
|
+
}
|
|
30
|
+
function _create_class(Constructor, protoProps, staticProps) {
|
|
31
|
+
if (protoProps) _defineProperties(Constructor.prototype, protoProps);
|
|
32
|
+
if (staticProps) _defineProperties(Constructor, staticProps);
|
|
33
|
+
return Constructor;
|
|
34
|
+
}
|
|
35
|
+
function _interop_require_default(obj) {
|
|
36
|
+
return obj && obj.__esModule ? obj : {
|
|
37
|
+
default: obj
|
|
38
|
+
};
|
|
39
|
+
}
|
|
40
|
+
var TopLevelAssertion = /*#__PURE__*/ function() {
|
|
41
|
+
function TopLevelAssertion(labels, suppositions, consequent, substitutions, fileContext) {
|
|
42
|
+
_class_call_check(this, TopLevelAssertion);
|
|
43
|
+
this.labels = labels;
|
|
44
|
+
this.suppositions = suppositions;
|
|
45
|
+
this.consequent = consequent;
|
|
46
|
+
this.substitutions = substitutions;
|
|
47
|
+
this.fileContext = fileContext;
|
|
48
|
+
}
|
|
49
|
+
_create_class(TopLevelAssertion, [
|
|
50
|
+
{
|
|
51
|
+
key: "getLabels",
|
|
52
|
+
value: function getLabels() {
|
|
53
|
+
return this.labels;
|
|
54
|
+
}
|
|
55
|
+
},
|
|
56
|
+
{
|
|
57
|
+
key: "getSuppositions",
|
|
58
|
+
value: function getSuppositions() {
|
|
59
|
+
return this.suppositions;
|
|
60
|
+
}
|
|
61
|
+
},
|
|
62
|
+
{
|
|
63
|
+
key: "getConsequent",
|
|
64
|
+
value: function getConsequent() {
|
|
65
|
+
return this.consequent;
|
|
66
|
+
}
|
|
67
|
+
},
|
|
68
|
+
{
|
|
69
|
+
key: "getSubstitutions",
|
|
70
|
+
value: function getSubstitutions() {
|
|
71
|
+
return this.substitutions;
|
|
72
|
+
}
|
|
73
|
+
},
|
|
74
|
+
{
|
|
75
|
+
key: "getFileContext",
|
|
76
|
+
value: function getFileContext() {
|
|
77
|
+
return this.fileContext;
|
|
78
|
+
}
|
|
79
|
+
},
|
|
80
|
+
{
|
|
81
|
+
key: "matchStatement",
|
|
82
|
+
value: function matchStatement(statementNode, localContext) {
|
|
83
|
+
var statementNatches = false;
|
|
84
|
+
var proofSteps = localContext.getProofSteps(), substitutions = [], suppositionsMatch = matchSuppositions(this.suppositions, proofSteps, substitutions, this.fileContext, localContext);
|
|
85
|
+
if (suppositionsMatch) {
|
|
86
|
+
var consequentMatches = matchConsequent(this.consequent, statementNode, substitutions, this.fileContext, localContext);
|
|
87
|
+
statementNatches = consequentMatches; ///
|
|
88
|
+
}
|
|
89
|
+
return statementNatches;
|
|
90
|
+
}
|
|
91
|
+
},
|
|
92
|
+
{
|
|
93
|
+
key: "matchMetavariableNode",
|
|
94
|
+
value: function matchMetavariableNode(metavariableNode) {
|
|
95
|
+
var matchesMetavariableNode = this.labels.some(function(label) {
|
|
96
|
+
var labelMatchesMetavariableNode = label.matchMetavariableNode(metavariableNode);
|
|
97
|
+
if (labelMatchesMetavariableNode) {
|
|
98
|
+
return true;
|
|
99
|
+
}
|
|
100
|
+
});
|
|
101
|
+
return matchesMetavariableNode;
|
|
102
|
+
}
|
|
103
|
+
},
|
|
104
|
+
{
|
|
105
|
+
key: "toJSON",
|
|
106
|
+
value: function toJSON(tokens) {
|
|
107
|
+
var labelsJSON = this.labels.map(function(label) {
|
|
108
|
+
var labelJSON = label.toJSON(tokens);
|
|
109
|
+
return labelJSON;
|
|
110
|
+
}), suppositionsJSON = this.suppositions.map(function(supposition) {
|
|
111
|
+
var suppositionJSON = supposition.toJSON(tokens);
|
|
112
|
+
return suppositionJSON;
|
|
113
|
+
}), consequentJSON = this.consequent.toJSON(tokens), substitutionsJSON = this.substitutions.map(function(substitution) {
|
|
114
|
+
var substitutionJSON = substitution.toJSON();
|
|
115
|
+
return substitutionJSON;
|
|
116
|
+
}), labels = labelsJSON, suppositions = suppositionsJSON, consequent = consequentJSON, substitutions = substitutionsJSON, json = {
|
|
117
|
+
labels: labels,
|
|
118
|
+
suppositions: suppositions,
|
|
119
|
+
consequent: consequent,
|
|
120
|
+
substitutions: substitutions
|
|
121
|
+
};
|
|
122
|
+
return json;
|
|
123
|
+
}
|
|
124
|
+
}
|
|
125
|
+
], [
|
|
126
|
+
{
|
|
127
|
+
key: "fromJSONAndFileContext",
|
|
128
|
+
value: function fromJSONAndFileContext(Class, json, fileContext) {
|
|
129
|
+
var labels = json.labels;
|
|
130
|
+
var labelsJSON = labels; ///
|
|
131
|
+
labels = labelsJSON.map(function(labelJSON) {
|
|
132
|
+
var _$json = labelJSON, label = _label.default.fromJSONAndFileContext(_$json, fileContext);
|
|
133
|
+
return label;
|
|
134
|
+
});
|
|
135
|
+
var suppositions = json.suppositions, consequent = json.consequent, substitutions = json.substitutions;
|
|
136
|
+
var suppositionsJSON = suppositions; ///
|
|
137
|
+
suppositions = suppositionsJSON.map(function(suppositionJSON) {
|
|
138
|
+
var _$json = suppositionJSON, supposition = _supposition.default.fromJSONAndFileContext(_$json, fileContext);
|
|
139
|
+
return supposition;
|
|
140
|
+
});
|
|
141
|
+
var consequentJSON = consequent; ///
|
|
142
|
+
json = consequentJSON; ///
|
|
143
|
+
consequent = _consequent.default.fromJSONAndFileContext(json, fileContext);
|
|
144
|
+
var substitutionsJSON = substitutions; ///
|
|
145
|
+
substitutions = substitutionsJSON.map(function(substitutionJSON) {
|
|
146
|
+
var _$json = substitutionJSON, statementForMetavariableSubstitution = _statementForMetavariable.default.fromJSONAndFileContext(_$json, fileContext), substitution = statementForMetavariableSubstitution; ///
|
|
147
|
+
return substitution;
|
|
148
|
+
});
|
|
149
|
+
return new Class(labels, suppositions, consequent, substitutions, fileContext); ///
|
|
150
|
+
}
|
|
151
|
+
},
|
|
152
|
+
{
|
|
153
|
+
key: "fromLabelsSuppositionsConsequentSubstitutionsAndFileContext",
|
|
154
|
+
value: function fromLabelsSuppositionsConsequentSubstitutionsAndFileContext(Class, labels, suppositions, consequent, substitutions, fileContext) {
|
|
155
|
+
return new Class(labels, suppositions, consequent, substitutions, fileContext);
|
|
156
|
+
}
|
|
157
|
+
}
|
|
158
|
+
]);
|
|
159
|
+
return TopLevelAssertion;
|
|
160
|
+
}();
|
|
161
|
+
function matchSuppositions(suppositions, proofSteps, substitutions, fileContext, localContext) {
|
|
162
|
+
suppositions = (0, _array.reverse)(suppositions); ///
|
|
163
|
+
proofSteps = (0, _array.reverse)(proofSteps); ///
|
|
164
|
+
var suppositionsMatch = (0, _array.correlate)(suppositions, proofSteps, function(supposition, proofStep) {
|
|
165
|
+
var suppositionMatches = matchSupposition(supposition, proofStep, substitutions, fileContext, localContext);
|
|
166
|
+
if (suppositionMatches) {
|
|
167
|
+
return true;
|
|
168
|
+
}
|
|
169
|
+
});
|
|
170
|
+
return suppositionsMatch;
|
|
171
|
+
}
|
|
172
|
+
function matchSupposition(supposition, proofStep, substitutions, fileContext, localContext) {
|
|
173
|
+
var suppositionMatches = false;
|
|
174
|
+
var statementNode = proofStep.getStatementNode();
|
|
175
|
+
if (statementNode !== null) {
|
|
176
|
+
var suppositionMatchesStatementNode = supposition.matchStatementNode(statementNode, substitutions, fileContext, localContext);
|
|
177
|
+
suppositionMatches = suppositionMatchesStatementNode; ///
|
|
178
|
+
}
|
|
179
|
+
return suppositionMatches;
|
|
180
|
+
}
|
|
181
|
+
function matchConsequent(consequent, statementNode, substitutions, fileContext, localContext) {
|
|
182
|
+
var consequentMatchesStatementNode = consequent.matchStatementNode(statementNode, substitutions, fileContext, localContext), consequentMatches = consequentMatchesStatementNode; ///
|
|
183
|
+
return consequentMatches;
|
|
184
|
+
}
|
|
185
|
+
|
|
186
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../src/topLevelAssertion.js"],"sourcesContent":["\"use strict\";\n\nimport Label from \"./label\";\nimport Consequent from \"./consequent\";\nimport Supposition from \"./supposition\";\nimport StatementForMetavariableSubstitution from \"./substitution/statementForMetavariable\";\n\nimport { reverse, correlate } from \"./utilities/array\";\n\nexport default class TopLevelAssertion {\n  constructor(labels, suppositions, consequent, substitutions, fileContext) {\n    this.labels = labels;\n    this.suppositions = suppositions;\n    this.consequent = consequent;\n    this.substitutions = substitutions;\n    this.fileContext = fileContext;\n  }\n\n  getLabels() {\n    return this.labels;\n  }\n\n  getSuppositions() {\n    return this.suppositions;\n  }\n\n  getConsequent() {\n    return this.consequent;\n  }\n\n  getSubstitutions() {\n    return this.substitutions;\n  }\n\n  getFileContext() {\n    return this.fileContext;\n  }\n\n  matchStatement(statementNode, localContext) {\n    let statementNatches = false;\n\n    const proofSteps = localContext.getProofSteps(),\n          substitutions = [],\n          suppositionsMatch = matchSuppositions(this.suppositions, proofSteps, substitutions, this.fileContext, localContext);\n\n    if (suppositionsMatch) {\n      const consequentMatches = matchConsequent(this.consequent, statementNode, substitutions, this.fileContext, localContext);\n\n      statementNatches = consequentMatches;  ///\n    }\n\n    return statementNatches;\n  }\n\n  matchMetavariableNode(metavariableNode) {\n    const matchesMetavariableNode = this.labels.some((label) => {\n      const labelMatchesMetavariableNode = label.matchMetavariableNode(metavariableNode);\n\n      if (labelMatchesMetavariableNode) {\n        return true;\n      }\n    });\n\n    return matchesMetavariableNode;\n  }\n\n  toJSON(tokens) {\n    const labelsJSON = this.labels.map((label) => {\n            const labelJSON = label.toJSON(tokens);\n\n            return labelJSON;\n          }),\n          suppositionsJSON = this.suppositions.map((supposition) => {\n            const suppositionJSON = supposition.toJSON(tokens);\n\n            return suppositionJSON;\n          }),\n          consequentJSON = this.consequent.toJSON(tokens),\n          substitutionsJSON = this.substitutions.map((substitution) => {\n        const substitutionJSON = substitution.toJSON();\n\n        return substitutionJSON;\n      }),\n          labels = labelsJSON,  ///\n          suppositions = suppositionsJSON,  ///\n          consequent = consequentJSON,  ///\n          substitutions = substitutionsJSON,  ///\n          json = {\n            labels,\n            suppositions,\n            consequent,\n            substitutions\n          };\n\n    return json;\n  }\n\n  static fromJSONAndFileContext(Class, json, fileContext) {\n    let { labels } = json;\n\n    const labelsJSON = labels;  ///\n\n    labels = labelsJSON.map((labelJSON) => {\n      const json = labelJSON, ///\n            label = Label.fromJSONAndFileContext(json, fileContext);\n\n      return label;\n    });\n\n    let { suppositions, consequent, substitutions } = json;\n\n    const suppositionsJSON = suppositions;  ///\n\n    suppositions = suppositionsJSON.map((suppositionJSON) => {\n      const json = suppositionJSON, ///\n            supposition = Supposition.fromJSONAndFileContext(json, fileContext);\n\n      return supposition;\n    });\n\n    const consequentJSON = consequent;  ///\n\n    json = consequentJSON;  ///\n\n    consequent = Consequent.fromJSONAndFileContext(json, fileContext);\n\n    const substitutionsJSON = substitutions;  ///\n\n    substitutions = substitutionsJSON.map((substitutionJSON) => {\n      const json = substitutionJSON,  ///\n            statementForMetavariableSubstitution = StatementForMetavariableSubstitution.fromJSONAndFileContext(json, fileContext),\n            substitution = statementForMetavariableSubstitution;  ///\n\n      return substitution;\n    });\n\n    return new Class(labels, suppositions, consequent, substitutions, fileContext);  ///\n  }\n\n  static fromLabelsSuppositionsConsequentSubstitutionsAndFileContext(Class, labels, suppositions, consequent, substitutions, fileContext) { return new Class(labels, suppositions, consequent, substitutions, fileContext); }\n}\n\nfunction matchSuppositions(suppositions, proofSteps, substitutions, fileContext, localContext) {\n  suppositions = reverse(suppositions); ///\n\n  proofSteps = reverse(proofSteps); ///\n\n  const suppositionsMatch = correlate(suppositions, proofSteps, (supposition, proofStep) => {\n    const suppositionMatches = matchSupposition(supposition, proofStep, substitutions, fileContext, localContext);\n\n    if (suppositionMatches) {\n      return true;\n    }\n  });\n\n  return suppositionsMatch;\n}\n\nfunction matchSupposition(supposition, proofStep, substitutions, fileContext, localContext) {\n  let suppositionMatches = false;\n\n  const statementNode = proofStep.getStatementNode();\n\n  if (statementNode !== null) {\n    const suppositionMatchesStatementNode = supposition.matchStatementNode(statementNode, substitutions, fileContext, localContext);\n\n    suppositionMatches = suppositionMatchesStatementNode;  ///\n  }\n\n  return suppositionMatches;\n}\n\nfunction matchConsequent(consequent, statementNode, substitutions, fileContext, localContext) {\n  const consequentMatchesStatementNode = consequent.matchStatementNode(statementNode, substitutions, fileContext, localContext),\n        consequentMatches = consequentMatchesStatementNode; ///\n\n  return consequentMatches;\n}\n"],"names":["TopLevelAssertion","labels","suppositions","consequent","substitutions","fileContext","getLabels","getSuppositions","getConsequent","getSubstitutions","getFileContext","matchStatement","statementNode","localContext","statementNatches","proofSteps","getProofSteps","suppositionsMatch","matchSuppositions","consequentMatches","matchConsequent","matchMetavariableNode","metavariableNode","matchesMetavariableNode","some","label","labelMatchesMetavariableNode","toJSON","tokens","labelsJSON","map","labelJSON","suppositionsJSON","supposition","suppositionJSON","consequentJSON","substitutionsJSON","substitution","substitutionJSON","json","fromJSONAndFileContext","Class","Label","Supposition","Consequent","statementForMetavariableSubstitution","StatementForMetavariableSubstitution","fromLabelsSuppositionsConsequentSubstitutionsAndFileContext","reverse","correlate","proofStep","suppositionMatches","matchSupposition","getStatementNode","suppositionMatchesStatementNode","matchStatementNode","consequentMatchesStatementNode"],"mappings":"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"}
|
|
@@ -24,7 +24,7 @@ _export(exports, {
|
|
|
24
24
|
});
|
|
25
25
|
var _occamcustomgrammars = require("occam-custom-grammars");
|
|
26
26
|
function customGrammarFromNameAndEntries(name, entries) {
|
|
27
|
-
var termBNF = entries.getTermBNF(), statementBNF = entries.getStatementBNF(),
|
|
27
|
+
var termBNF = entries.getTermBNF(), statementBNF = entries.getStatementBNF(), typePattern = entries.getTypePattern(), symbolPattern = entries.getSymbolPattern(), operatorPattern = entries.getOperatorPattern(), customGrammar = _occamcustomgrammars.CustomGrammar.fromNameTermBNFStatementBNFTypePatternSymbolPatternAndOperatorPattern(name, termBNF, statementBNF, typePattern, symbolPattern, operatorPattern);
|
|
28
28
|
return customGrammar;
|
|
29
29
|
}
|
|
30
30
|
function combinedCustomGrammarFromNothing() {
|
|
@@ -46,4 +46,4 @@ var _default = {
|
|
|
46
46
|
combinedCustomGrammarFromReleaseContexts: combinedCustomGrammarFromReleaseContexts
|
|
47
47
|
};
|
|
48
48
|
|
|
49
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
49
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlsaXRpZXMvY3VzdG9tR3JhbW1hci5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuaW1wb3J0IHsgQ3VzdG9tR3JhbW1hciwgQ29tYmluZWRDdXN0b21HcmFtbWFyIH0gZnJvbSBcIm9jY2FtLWN1c3RvbS1ncmFtbWFyc1wiO1xuXG5leHBvcnQgZnVuY3Rpb24gY3VzdG9tR3JhbW1hckZyb21OYW1lQW5kRW50cmllcyhuYW1lLCBlbnRyaWVzKSB7XG4gIGNvbnN0IHRlcm1CTkYgPSBlbnRyaWVzLmdldFRlcm1CTkYoKSxcbiAgICAgICAgc3RhdGVtZW50Qk5GID0gZW50cmllcy5nZXRTdGF0ZW1lbnRCTkYoKSxcbiAgICAgICAgdHlwZVBhdHRlcm4gPSBlbnRyaWVzLmdldFR5cGVQYXR0ZXJuKCksXG4gICAgICAgIHN5bWJvbFBhdHRlcm4gPSBlbnRyaWVzLmdldFN5bWJvbFBhdHRlcm4oKSxcbiAgICAgICAgb3BlcmF0b3JQYXR0ZXJuID0gZW50cmllcy5nZXRPcGVyYXRvclBhdHRlcm4oKSxcbiAgICAgICAgY3VzdG9tR3JhbW1hciA9IEN1c3RvbUdyYW1tYXIuZnJvbU5hbWVUZXJtQk5GU3RhdGVtZW50Qk5GVHlwZVBhdHRlcm5TeW1ib2xQYXR0ZXJuQW5kT3BlcmF0b3JQYXR0ZXJuKG5hbWUsIHRlcm1CTkYsIHN0YXRlbWVudEJORiwgdHlwZVBhdHRlcm4sIHN5bWJvbFBhdHRlcm4sIG9wZXJhdG9yUGF0dGVybik7XG5cbiAgcmV0dXJuIGN1c3RvbUdyYW1tYXI7XG59XG5cbmV4cG9ydCBmdW5jdGlvbiBjb21iaW5lZEN1c3RvbUdyYW1tYXJGcm9tTm90aGluZygpIHtcbiAgY29uc3QgY3VzdG9tR3JhbW1hcnMgPSBbXSxcbiAgICAgICAgY29tYmluZWRDdXN0b21HcmFtbWFyID0gQ29tYmluZWRDdXN0b21HcmFtbWFyLmZyb21DdXN0b21HcmFtbWFycyhjdXN0b21HcmFtbWFycyk7XG5cbiAgcmV0dXJuIGNvbWJpbmVkQ3VzdG9tR3JhbW1hcjtcbn1cblxuZXhwb3J0IGZ1bmN0aW9uIGNvbWJpbmVkQ3VzdG9tR3JhbW1hckZyb21SZWxlYXNlQ29udGV4dHMocmVsZWFzZUNvbnRleHRzKSB7XG4gIGNvbnN0IGN1c3RvbUdyYW1tYXJzID0gcmVsZWFzZUNvbnRleHRzLm1hcCgocmVsZWFzZUNvbnRleHQpID0+IHtcbiAgICAgICAgICBjb25zdCBjdXN0b21HcmFtbWFyID0gcmVsZWFzZUNvbnRleHQuZ2V0Q3VzdG9tR3JhbW1hcigpO1xuXG4gICAgICAgICAgcmV0dXJuIGN1c3RvbUdyYW1tYXI7XG4gICAgICAgIH0pO1xuXG4gIGN1c3RvbUdyYW1tYXJzLnJldmVyc2UoKTsgLy8vXG5cbiAgY29uc3QgY29tYmluZWRDdXN0b21HcmFtbWFyID0gQ29tYmluZWRDdXN0b21HcmFtbWFyLmZyb21DdXN0b21HcmFtbWFycyhjdXN0b21HcmFtbWFycyk7XG5cbiAgcmV0dXJuIGNvbWJpbmVkQ3VzdG9tR3JhbW1hcjtcbn1cblxuZXhwb3J0IGRlZmF1bHQge1xuICBjdXN0b21HcmFtbWFyRnJvbU5hbWVBbmRFbnRyaWVzLFxuICBjb21iaW5lZEN1c3RvbUdyYW1tYXJGcm9tTm90aGluZyxcbiAgY29tYmluZWRDdXN0b21HcmFtbWFyRnJvbVJlbGVhc2VDb250ZXh0c1xufTtcbiJdLCJuYW1lcyI6WyJjb21iaW5lZEN1c3RvbUdyYW1tYXJGcm9tTm90aGluZyIsImNvbWJpbmVkQ3VzdG9tR3JhbW1hckZyb21SZWxlYXNlQ29udGV4dHMiLCJjdXN0b21HcmFtbWFyRnJvbU5hbWVBbmRFbnRyaWVzIiwibmFtZSIsImVudHJpZXMiLCJ0ZXJtQk5GIiwiZ2V0VGVybUJORiIsInN0YXRlbWVudEJORiIsImdldFN0YXRlbWVudEJORiIsInR5cGVQYXR0ZXJuIiwiZ2V0VHlwZVBhdHRlcm4iLCJzeW1ib2xQYXR0ZXJuIiwiZ2V0U3ltYm9sUGF0dGVybiIsIm9wZXJhdG9yUGF0dGVybiIsImdldE9wZXJhdG9yUGF0dGVybiIsImN1c3RvbUdyYW1tYXIiLCJDdXN0b21HcmFtbWFyIiwiZnJvbU5hbWVUZXJtQk5GU3RhdGVtZW50Qk5GVHlwZVBhdHRlcm5TeW1ib2xQYXR0ZXJuQW5kT3BlcmF0b3JQYXR0ZXJuIiwiY3VzdG9tR3JhbW1hcnMiLCJjb21iaW5lZEN1c3RvbUdyYW1tYXIiLCJDb21iaW5lZEN1c3RvbUdyYW1tYXIiLCJmcm9tQ3VzdG9tR3JhbW1hcnMiLCJyZWxlYXNlQ29udGV4dHMiLCJtYXAiLCJyZWxlYXNlQ29udGV4dCIsImdldEN1c3RvbUdyYW1tYXIiLCJyZXZlcnNlIl0sIm1hcHBpbmdzIjoiQUFBQTs7Ozs7Ozs7Ozs7SUFlZ0JBLGdDQUFnQztlQUFoQ0E7O0lBT0FDLHdDQUF3QztlQUF4Q0E7O0lBbEJBQywrQkFBK0I7ZUFBL0JBOztJQWdDaEIsT0FJRTtlQUpGOzs7bUNBbENxRDtBQUU5QyxTQUFTQSxnQ0FBZ0NDLElBQUksRUFBRUMsT0FBTztJQUMzRCxJQUFNQyxVQUFVRCxRQUFRRSxVQUFVLElBQzVCQyxlQUFlSCxRQUFRSSxlQUFlLElBQ3RDQyxjQUFjTCxRQUFRTSxjQUFjLElBQ3BDQyxnQkFBZ0JQLFFBQVFRLGdCQUFnQixJQUN4Q0Msa0JBQWtCVCxRQUFRVSxrQkFBa0IsSUFDNUNDLGdCQUFnQkMsa0NBQWEsQ0FBQ0MscUVBQXFFLENBQUNkLE1BQU1FLFNBQVNFLGNBQWNFLGFBQWFFLGVBQWVFO0lBRW5LLE9BQU9FO0FBQ1Q7QUFFTyxTQUFTZjtJQUNkLElBQU1rQixpQkFBaUIsRUFBRSxFQUNuQkMsd0JBQXdCQywwQ0FBcUIsQ0FBQ0Msa0JBQWtCLENBQUNIO0lBRXZFLE9BQU9DO0FBQ1Q7QUFFTyxTQUFTbEIseUNBQXlDcUIsZUFBZTtJQUN0RSxJQUFNSixpQkFBaUJJLGdCQUFnQkMsR0FBRyxDQUFDLFNBQUNDO1FBQ3BDLElBQU1ULGdCQUFnQlMsZUFBZUMsZ0JBQWdCO1FBRXJELE9BQU9WO0lBQ1Q7SUFFTkcsZUFBZVEsT0FBTyxJQUFJLEdBQUc7SUFFN0IsSUFBTVAsd0JBQXdCQywwQ0FBcUIsQ0FBQ0Msa0JBQWtCLENBQUNIO0lBRXZFLE9BQU9DO0FBQ1Q7SUFFQSxXQUFlO0lBQ2JqQixpQ0FBQUE7SUFDQUYsa0NBQUFBO0lBQ0FDLDBDQUFBQTtBQUNGIn0=
|
package/lib/utilities/match.js
CHANGED
|
@@ -9,21 +9,14 @@ function _export(target, all) {
|
|
|
9
9
|
});
|
|
10
10
|
}
|
|
11
11
|
_export(exports, {
|
|
12
|
-
bracketedMetastatementChildNodeFromMetastatementNode: function() {
|
|
13
|
-
return bracketedMetastatementChildNodeFromMetastatementNode;
|
|
14
|
-
},
|
|
15
12
|
bracketedStatementChildNodeFromStatementNode: function() {
|
|
16
13
|
return bracketedStatementChildNodeFromStatementNode;
|
|
17
14
|
},
|
|
18
|
-
matchMetastatementModuloBrackets: function() {
|
|
19
|
-
return matchMetastatementModuloBrackets;
|
|
20
|
-
},
|
|
21
15
|
matchStatementModuloBrackets: function() {
|
|
22
16
|
return matchStatementModuloBrackets;
|
|
23
17
|
}
|
|
24
18
|
});
|
|
25
19
|
var _bracketed = /*#__PURE__*/ _interop_require_default(require("../node/statement/bracketed"));
|
|
26
|
-
var _bracketed1 = /*#__PURE__*/ _interop_require_default(require("../node/metastatement/bracketed"));
|
|
27
20
|
var _query = require("../utilities/query");
|
|
28
21
|
var _constants = require("../constants");
|
|
29
22
|
function _interop_require_default(obj) {
|
|
@@ -31,50 +24,28 @@ function _interop_require_default(obj) {
|
|
|
31
24
|
default: obj
|
|
32
25
|
};
|
|
33
26
|
}
|
|
34
|
-
var bracketedStatementChildNodeQuery = (0, _query.nodeQuery)("/statement/
|
|
27
|
+
var bracketedStatementChildNodeQuery = (0, _query.nodeQuery)("/statement/statement!");
|
|
35
28
|
function matchStatementModuloBrackets(statementNodeA, statementNodeB) {
|
|
36
|
-
var
|
|
37
|
-
if (!
|
|
38
|
-
var
|
|
39
|
-
|
|
29
|
+
var statementMatches = false;
|
|
30
|
+
if (!statementMatches) {
|
|
31
|
+
var statementNodeMatches = statementNodeA.match(statementNodeB);
|
|
32
|
+
statementMatches = statementNodeMatches; ///
|
|
40
33
|
}
|
|
41
|
-
if (!
|
|
34
|
+
if (!statementMatches) {
|
|
42
35
|
var bracketedStatementChildNodeA = bracketedStatementChildNodeFromStatementNode(statementNodeA);
|
|
43
36
|
if (bracketedStatementChildNodeA !== null) {
|
|
44
|
-
var
|
|
45
|
-
|
|
37
|
+
var bracketedStatementChildNodeAMatchesStatementNodeB = bracketedStatementChildNodeA.match(statementNodeB);
|
|
38
|
+
statementMatches = bracketedStatementChildNodeAMatchesStatementNodeB; ///
|
|
46
39
|
}
|
|
47
40
|
}
|
|
48
|
-
if (!
|
|
41
|
+
if (!statementMatches) {
|
|
49
42
|
var bracketedStatementChildNodeB = bracketedStatementChildNodeFromStatementNode(statementNodeB);
|
|
50
43
|
if (bracketedStatementChildNodeB !== null) {
|
|
51
|
-
var
|
|
52
|
-
|
|
53
|
-
}
|
|
54
|
-
}
|
|
55
|
-
return statementMatchesModuloBrackets;
|
|
56
|
-
}
|
|
57
|
-
function matchMetastatementModuloBrackets(metastatementNodeA, metastatementNodeB) {
|
|
58
|
-
var metastatementMatches = false;
|
|
59
|
-
if (!metastatementMatches) {
|
|
60
|
-
var metastatementNodeMatches = metastatementNodeA.match(metastatementNodeB);
|
|
61
|
-
metastatementMatches = metastatementNodeMatches; ///
|
|
62
|
-
}
|
|
63
|
-
if (!metastatementMatches) {
|
|
64
|
-
var bracketedMetastatementChildNodeA = bracketedMetastatementChildNodeFromMetastatementNode(metastatementNodeA);
|
|
65
|
-
if (bracketedMetastatementChildNodeA !== null) {
|
|
66
|
-
var bracketedMetastatementChildNodeAMatchesMetastatementNodeB = bracketedMetastatementChildNodeA.match(metastatementNodeB);
|
|
67
|
-
metastatementMatches = bracketedMetastatementChildNodeAMatchesMetastatementNodeB; ///
|
|
68
|
-
}
|
|
69
|
-
}
|
|
70
|
-
if (!metastatementMatches) {
|
|
71
|
-
var bracketedMetastatementChildNodeB = bracketedMetastatementChildNodeFromMetastatementNode(metastatementNodeB);
|
|
72
|
-
if (bracketedMetastatementChildNodeB !== null) {
|
|
73
|
-
var metastatementNodeAMatchesBracketedMetastatementChildNodeB = metastatementNodeA.match(bracketedMetastatementChildNodeB);
|
|
74
|
-
metastatementMatches = metastatementNodeAMatchesBracketedMetastatementChildNodeB; ///
|
|
44
|
+
var statementNodeAMatchesBracketedStatementChildNodeB = statementNodeA.match(bracketedStatementChildNodeB);
|
|
45
|
+
statementMatches = statementNodeAMatchesBracketedStatementChildNodeB; ///
|
|
75
46
|
}
|
|
76
47
|
}
|
|
77
|
-
return
|
|
48
|
+
return statementMatches;
|
|
78
49
|
}
|
|
79
50
|
function bracketedStatementChildNodeFromStatementNode(statementNode) {
|
|
80
51
|
var bracketedStatementChildNode = null;
|
|
@@ -84,13 +55,5 @@ function bracketedStatementChildNodeFromStatementNode(statementNode) {
|
|
|
84
55
|
}
|
|
85
56
|
return bracketedStatementChildNode;
|
|
86
57
|
}
|
|
87
|
-
function bracketedMetastatementChildNodeFromMetastatementNode(metastatementNode) {
|
|
88
|
-
var bracketedMetastatementChildNode = null;
|
|
89
|
-
var depth = _constants.BRACKETED_METASTATEMENT_DEPTH, metastatementNodeMatchesBracketedMetastatementNode = metastatementNode.match(_bracketed1.default, depth);
|
|
90
|
-
if (metastatementNodeMatchesBracketedMetastatementNode) {
|
|
91
|
-
bracketedMetastatementChildNode = bracketedMetastatementChildNodeQuery(metastatementNode);
|
|
92
|
-
}
|
|
93
|
-
return bracketedMetastatementChildNode;
|
|
94
|
-
}
|
|
95
58
|
|
|
96
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
59
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlsaXRpZXMvbWF0Y2guanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmltcG9ydCBicmFja2V0ZWRTdGF0ZW1lbnROb2RlIGZyb20gXCIuLi9ub2RlL3N0YXRlbWVudC9icmFja2V0ZWRcIjtcblxuaW1wb3J0IHsgbm9kZVF1ZXJ5IH0gZnJvbSBcIi4uL3V0aWxpdGllcy9xdWVyeVwiO1xuaW1wb3J0IHsgQlJBQ0tFVEVEX1NUQVRFTUVOVF9ERVBUSCB9IGZyb20gXCIuLi9jb25zdGFudHNcIjtcblxuY29uc3QgYnJhY2tldGVkU3RhdGVtZW50Q2hpbGROb2RlUXVlcnkgPSBub2RlUXVlcnkoXCIvc3RhdGVtZW50L3N0YXRlbWVudCFcIik7XG5cbmV4cG9ydCBmdW5jdGlvbiBtYXRjaFN0YXRlbWVudE1vZHVsb0JyYWNrZXRzKHN0YXRlbWVudE5vZGVBLCBzdGF0ZW1lbnROb2RlQikge1xuICBsZXQgc3RhdGVtZW50TWF0Y2hlcyA9IGZhbHNlO1xuXG4gIGlmICghc3RhdGVtZW50TWF0Y2hlcykge1xuICAgIGNvbnN0IHN0YXRlbWVudE5vZGVNYXRjaGVzID0gc3RhdGVtZW50Tm9kZUEubWF0Y2goc3RhdGVtZW50Tm9kZUIpO1xuXG4gICAgc3RhdGVtZW50TWF0Y2hlcyA9IHN0YXRlbWVudE5vZGVNYXRjaGVzOyAgLy8vXG4gIH1cblxuICBpZiAoIXN0YXRlbWVudE1hdGNoZXMpIHtcbiAgICBjb25zdCBicmFja2V0ZWRTdGF0ZW1lbnRDaGlsZE5vZGVBID0gYnJhY2tldGVkU3RhdGVtZW50Q2hpbGROb2RlRnJvbVN0YXRlbWVudE5vZGUoc3RhdGVtZW50Tm9kZUEpO1xuXG4gICAgaWYgKGJyYWNrZXRlZFN0YXRlbWVudENoaWxkTm9kZUEgIT09IG51bGwpIHtcbiAgICAgIGNvbnN0IGJyYWNrZXRlZFN0YXRlbWVudENoaWxkTm9kZUFNYXRjaGVzU3RhdGVtZW50Tm9kZUIgPSBicmFja2V0ZWRTdGF0ZW1lbnRDaGlsZE5vZGVBLm1hdGNoKHN0YXRlbWVudE5vZGVCKTtcblxuICAgICAgc3RhdGVtZW50TWF0Y2hlcyA9IGJyYWNrZXRlZFN0YXRlbWVudENoaWxkTm9kZUFNYXRjaGVzU3RhdGVtZW50Tm9kZUI7IC8vL1xuICAgIH1cbiAgfVxuXG4gIGlmICghc3RhdGVtZW50TWF0Y2hlcykge1xuICAgIGNvbnN0IGJyYWNrZXRlZFN0YXRlbWVudENoaWxkTm9kZUIgPSBicmFja2V0ZWRTdGF0ZW1lbnRDaGlsZE5vZGVGcm9tU3RhdGVtZW50Tm9kZShzdGF0ZW1lbnROb2RlQik7XG5cbiAgICBpZiAoYnJhY2tldGVkU3RhdGVtZW50Q2hpbGROb2RlQiAhPT0gbnVsbCkge1xuICAgICAgY29uc3Qgc3RhdGVtZW50Tm9kZUFNYXRjaGVzQnJhY2tldGVkU3RhdGVtZW50Q2hpbGROb2RlQiA9IHN0YXRlbWVudE5vZGVBLm1hdGNoKGJyYWNrZXRlZFN0YXRlbWVudENoaWxkTm9kZUIpO1xuXG4gICAgICBzdGF0ZW1lbnRNYXRjaGVzID0gc3RhdGVtZW50Tm9kZUFNYXRjaGVzQnJhY2tldGVkU3RhdGVtZW50Q2hpbGROb2RlQjsgLy8vXG4gICAgfVxuICB9XG5cbiAgcmV0dXJuIHN0YXRlbWVudE1hdGNoZXM7XG59XG5cbmV4cG9ydCBmdW5jdGlvbiBicmFja2V0ZWRTdGF0ZW1lbnRDaGlsZE5vZGVGcm9tU3RhdGVtZW50Tm9kZShzdGF0ZW1lbnROb2RlKSB7XG4gIGxldCBicmFja2V0ZWRTdGF0ZW1lbnRDaGlsZE5vZGUgPSBudWxsO1xuXG4gIGNvbnN0IGRlcHRoID0gQlJBQ0tFVEVEX1NUQVRFTUVOVF9ERVBUSCxcbiAgICAgICAgc3RhdGVtZW50Tm9kZU1hdGNoQnJhY2tldGVkU3RhdGVtZW50Tm9kZSA9IHN0YXRlbWVudE5vZGUubWF0Y2goYnJhY2tldGVkU3RhdGVtZW50Tm9kZSwgZGVwdGgpO1xuXG4gIGlmIChzdGF0ZW1lbnROb2RlTWF0Y2hCcmFja2V0ZWRTdGF0ZW1lbnROb2RlKSB7XG4gICAgYnJhY2tldGVkU3RhdGVtZW50Q2hpbGROb2RlID0gYnJhY2tldGVkU3RhdGVtZW50Q2hpbGROb2RlUXVlcnkoc3RhdGVtZW50Tm9kZSk7XG4gIH1cblxuICByZXR1cm4gYnJhY2tldGVkU3RhdGVtZW50Q2hpbGROb2RlO1xufVxuIl0sIm5hbWVzIjpbImJyYWNrZXRlZFN0YXRlbWVudENoaWxkTm9kZUZyb21TdGF0ZW1lbnROb2RlIiwibWF0Y2hTdGF0ZW1lbnRNb2R1bG9CcmFja2V0cyIsImJyYWNrZXRlZFN0YXRlbWVudENoaWxkTm9kZVF1ZXJ5Iiwibm9kZVF1ZXJ5Iiwic3RhdGVtZW50Tm9kZUEiLCJzdGF0ZW1lbnROb2RlQiIsInN0YXRlbWVudE1hdGNoZXMiLCJzdGF0ZW1lbnROb2RlTWF0Y2hlcyIsIm1hdGNoIiwiYnJhY2tldGVkU3RhdGVtZW50Q2hpbGROb2RlQSIsImJyYWNrZXRlZFN0YXRlbWVudENoaWxkTm9kZUFNYXRjaGVzU3RhdGVtZW50Tm9kZUIiLCJicmFja2V0ZWRTdGF0ZW1lbnRDaGlsZE5vZGVCIiwic3RhdGVtZW50Tm9kZUFNYXRjaGVzQnJhY2tldGVkU3RhdGVtZW50Q2hpbGROb2RlQiIsInN0YXRlbWVudE5vZGUiLCJicmFja2V0ZWRTdGF0ZW1lbnRDaGlsZE5vZGUiLCJkZXB0aCIsIkJSQUNLRVRFRF9TVEFURU1FTlRfREVQVEgiLCJzdGF0ZW1lbnROb2RlTWF0Y2hCcmFja2V0ZWRTdGF0ZW1lbnROb2RlIiwiYnJhY2tldGVkU3RhdGVtZW50Tm9kZSJdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7Ozs7Ozs7O0lBeUNnQkEsNENBQTRDO2VBQTVDQTs7SUFoQ0FDLDRCQUE0QjtlQUE1QkE7OztnRUFQbUI7cUJBRVQ7eUJBQ2dCOzs7Ozs7QUFFMUMsSUFBTUMsbUNBQW1DQyxJQUFBQSxnQkFBUyxFQUFDO0FBRTVDLFNBQVNGLDZCQUE2QkcsY0FBYyxFQUFFQyxjQUFjO0lBQ3pFLElBQUlDLG1CQUFtQjtJQUV2QixJQUFJLENBQUNBLGtCQUFrQjtRQUNyQixJQUFNQyx1QkFBdUJILGVBQWVJLEtBQUssQ0FBQ0g7UUFFbERDLG1CQUFtQkMsc0JBQXVCLEdBQUc7SUFDL0M7SUFFQSxJQUFJLENBQUNELGtCQUFrQjtRQUNyQixJQUFNRywrQkFBK0JULDZDQUE2Q0k7UUFFbEYsSUFBSUssaUNBQWlDLE1BQU07WUFDekMsSUFBTUMsb0RBQW9ERCw2QkFBNkJELEtBQUssQ0FBQ0g7WUFFN0ZDLG1CQUFtQkksbURBQW1ELEdBQUc7UUFDM0U7SUFDRjtJQUVBLElBQUksQ0FBQ0osa0JBQWtCO1FBQ3JCLElBQU1LLCtCQUErQlgsNkNBQTZDSztRQUVsRixJQUFJTSxpQ0FBaUMsTUFBTTtZQUN6QyxJQUFNQyxvREFBb0RSLGVBQWVJLEtBQUssQ0FBQ0c7WUFFL0VMLG1CQUFtQk0sbURBQW1ELEdBQUc7UUFDM0U7SUFDRjtJQUVBLE9BQU9OO0FBQ1Q7QUFFTyxTQUFTTiw2Q0FBNkNhLGFBQWE7SUFDeEUsSUFBSUMsOEJBQThCO0lBRWxDLElBQU1DLFFBQVFDLG9DQUF5QixFQUNqQ0MsMkNBQTJDSixjQUFjTCxLQUFLLENBQUNVLGtCQUFzQixFQUFFSDtJQUU3RixJQUFJRSwwQ0FBMEM7UUFDNUNILDhCQUE4QlosaUNBQWlDVztJQUNqRTtJQUVBLE9BQU9DO0FBQ1QifQ==
|