occam-verify-cli 0.0.525 → 0.0.527
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 +10 -40
- package/lib/axiom.js +7 -7
- package/lib/axiomLemmaTheoremConjecture.js +190 -0
- package/lib/combinator.js +5 -5
- package/lib/conclusion.js +3 -3
- package/lib/conjecture.js +141 -0
- package/lib/consequence.js +5 -5
- package/lib/constants.js +4 -16
- package/lib/constructor.js +6 -6
- package/lib/context/file.js +85 -32
- package/lib/context/metaproof.js +46 -4
- package/lib/context/proof.js +38 -93
- package/lib/context/release/directory.js +20 -1
- package/lib/context/release/file.js +27 -3
- package/lib/equality.js +78 -51
- package/lib/index.js +1 -13
- package/lib/kinds.js +5 -1
- package/lib/label.js +5 -5
- package/lib/lemma.js +7 -7
- package/lib/matcher/metastatementForMetavariable.js +16 -19
- package/lib/matcher/statementForMetavariable.js +22 -20
- package/lib/matcher/{statementForVariable → termForVariable}/consequence.js +13 -13
- package/lib/matcher/{statementForVariable → termForVariable}/supposition.js +13 -13
- package/lib/matcher/termForVariable.js +198 -0
- package/lib/matcher.js +23 -64
- package/lib/mixins/file.js +62 -2
- package/lib/premise.js +6 -6
- package/lib/rule.js +5 -5
- package/lib/ruleNames.js +1 -9
- package/lib/step/proof.js +22 -1
- package/lib/substitution/statementForMetavariable.js +12 -8
- package/lib/substitution/termForVariable.js +86 -0
- package/lib/supposition.js +6 -6
- package/lib/theorem.js +7 -7
- package/lib/type.js +13 -6
- package/lib/utilities/string.js +17 -16
- package/lib/utilities/substitution.js +4 -5
- package/lib/variable.js +5 -39
- package/lib/verify/assertion/type.js +60 -37
- package/lib/verify/axiom.js +2 -3
- package/lib/verify/conclusion.js +2 -3
- package/lib/verify/conjecture.js +56 -0
- package/lib/verify/consequence.js +3 -4
- package/lib/verify/declaration/topLevel.js +7 -3
- package/lib/verify/label.js +2 -3
- package/lib/verify/lemma.js +2 -3
- package/lib/verify/metastatement/qualified.js +3 -4
- package/lib/verify/metastatement/unqualified.js +3 -4
- package/lib/verify/premise.js +3 -4
- package/lib/verify/rule.js +2 -3
- package/lib/verify/statement/qualified.js +41 -12
- package/lib/verify/statement/unqualified.js +3 -4
- package/lib/verify/statement.js +47 -51
- package/lib/verify/statementAsCombinator.js +2 -3
- package/lib/verify/supposition.js +3 -4
- package/lib/verify/term.js +3 -4
- package/lib/verify/termAsConstructor.js +4 -5
- package/lib/verify/theorem.js +2 -3
- package/lib/verify/type.js +2 -3
- package/lib/verify/variable.js +2 -3
- package/package.json +1 -1
- package/src/assertion/type.js +7 -32
- package/src/axiom.js +4 -4
- package/src/{axiomLemmaTheorem.js → axiomLemmaTheoremConjecture.js} +9 -9
- package/src/combinator.js +4 -4
- package/src/conclusion.js +2 -2
- package/src/conjecture.js +13 -0
- package/src/consequence.js +4 -4
- package/src/constants.js +1 -4
- package/src/constructor.js +6 -6
- package/src/context/file.js +89 -32
- package/src/context/metaproof.js +44 -3
- package/src/context/proof.js +42 -37
- package/src/context/release/directory.js +24 -0
- package/src/context/release/file.js +34 -3
- package/src/equality.js +110 -61
- package/src/index.js +0 -3
- package/src/kinds.js +1 -0
- package/src/label.js +4 -4
- package/src/lemma.js +4 -4
- package/src/matcher/metastatementForMetavariable.js +22 -32
- package/src/matcher/statementForMetavariable.js +40 -34
- package/src/matcher/termForVariable/consequence.js +9 -0
- package/src/matcher/termForVariable/supposition.js +9 -0
- package/src/matcher/termForVariable.js +89 -0
- package/src/matcher.js +28 -22
- package/src/mixins/file.js +46 -1
- package/src/premise.js +6 -6
- package/src/rule.js +4 -4
- package/src/ruleNames.js +0 -2
- package/src/step/proof.js +27 -0
- package/src/substitution/statementForMetavariable.js +17 -10
- package/src/substitution/termForVariable.js +64 -0
- package/src/supposition.js +5 -5
- package/src/theorem.js +4 -4
- package/src/type.js +18 -8
- package/src/utilities/string.js +27 -21
- package/src/utilities/substitution.js +6 -4
- package/src/variable.js +5 -38
- package/src/verify/assertion/type.js +71 -65
- package/src/verify/axiom.js +1 -2
- package/src/verify/conclusion.js +1 -2
- package/src/verify/conjecture.js +73 -0
- package/src/verify/consequence.js +2 -3
- package/src/verify/declaration/topLevel.js +7 -0
- package/src/verify/label.js +1 -2
- package/src/verify/lemma.js +1 -2
- package/src/verify/metastatement/qualified.js +2 -3
- package/src/verify/metastatement/unqualified.js +2 -3
- package/src/verify/premise.js +2 -3
- package/src/verify/rule.js +1 -2
- package/src/verify/statement/qualified.js +55 -15
- package/src/verify/statement/unqualified.js +2 -3
- package/src/verify/statement.js +49 -70
- package/src/verify/statementAsCombinator.js +1 -2
- package/src/verify/supposition.js +2 -3
- package/src/verify/term.js +2 -3
- package/src/verify/termAsConstructor.js +3 -4
- package/src/verify/theorem.js +1 -2
- package/src/verify/type.js +1 -2
- package/src/verify/variable.js +1 -2
- package/lib/axiomLemmaTheorem.js +0 -190
- package/lib/jsonTypes.js +0 -30
- package/lib/matcher/statementForVariable.js +0 -201
- package/lib/substitution/statementForVariable.js +0 -86
- package/lib/utilities/json.js +0 -187
- package/lib/utilities/version.js +0 -32
- package/lib/versionChanges.js +0 -34
- package/src/jsonTypes.js +0 -6
- package/src/matcher/statementForVariable/consequence.js +0 -9
- package/src/matcher/statementForVariable/supposition.js +0 -9
- package/src/matcher/statementForVariable.js +0 -99
- package/src/substitution/statementForVariable.js +0 -64
- package/src/utilities/json.js +0 -264
- package/src/utilities/version.js +0 -30
- package/src/versionChanges.js +0 -11
package/lib/supposition.js
CHANGED
|
@@ -10,7 +10,7 @@ Object.defineProperty(exports, "default", {
|
|
|
10
10
|
});
|
|
11
11
|
var _string = require("./utilities/string");
|
|
12
12
|
var _query = require("./utilities/query");
|
|
13
|
-
var _supposition = require("./matcher/
|
|
13
|
+
var _supposition = require("./matcher/termForVariable/supposition");
|
|
14
14
|
function _arrayLikeToArray(arr, len) {
|
|
15
15
|
if (len == null || len > arr.length) len = arr.length;
|
|
16
16
|
for(var i = 0, arr2 = new Array(len); i < len; i++)arr2[i] = arr[i];
|
|
@@ -79,7 +79,7 @@ var Supposition = /*#__PURE__*/ function() {
|
|
|
79
79
|
]), subproofAssertionStatementNodes = subproofAssertionStatementNodesQuery(subproofAssertionNode), subproofStatementNodesLength = subproofStatementNodes.length, subproofAssertionStatementNodesLength = subproofAssertionStatementNodes.length;
|
|
80
80
|
if (subproofStatementNodesLength === subproofAssertionStatementNodesLength) {
|
|
81
81
|
subproofNodeMatches = subproofAssertionStatementNodes.every(function(subproofAssertionStatementNode, index) {
|
|
82
|
-
var subproofStatementNode = subproofStatementNodes[index], nonTerminalNodeA = subproofAssertionStatementNode, nonTerminalNodeB = subproofStatementNode, nonTerminalNodeMatches = _supposition.
|
|
82
|
+
var subproofStatementNode = subproofStatementNodes[index], nonTerminalNodeA = subproofAssertionStatementNode, nonTerminalNodeB = subproofStatementNode, nonTerminalNodeMatches = _supposition.suppositionTermForVariableMatcher.matchNonTerminalNode(nonTerminalNodeA, nonTerminalNodeB, substitutions);
|
|
83
83
|
if (nonTerminalNodeMatches) {
|
|
84
84
|
return true;
|
|
85
85
|
}
|
|
@@ -92,14 +92,14 @@ var Supposition = /*#__PURE__*/ function() {
|
|
|
92
92
|
{
|
|
93
93
|
key: "matchStatementNode",
|
|
94
94
|
value: function matchStatementNode(statementNode, substitutions) {
|
|
95
|
-
var nonTerminalNodeA = this.statementNode, nonTerminalNodeB = statementNode, nonTerminalNodeMatches = _supposition.
|
|
95
|
+
var nonTerminalNodeA = this.statementNode, nonTerminalNodeB = statementNode, nonTerminalNodeMatches = _supposition.suppositionTermForVariableMatcher.matchNonTerminalNode(nonTerminalNodeA, nonTerminalNodeB, substitutions), statementNodeMatches = nonTerminalNodeMatches; ///
|
|
96
96
|
return statementNodeMatches;
|
|
97
97
|
}
|
|
98
98
|
},
|
|
99
99
|
{
|
|
100
100
|
key: "toJSON",
|
|
101
|
-
value: function toJSON() {
|
|
102
|
-
var statementString = (0, _string.nodeAsString)(this.statementNode), statement = statementString, json = {
|
|
101
|
+
value: function toJSON(tokens) {
|
|
102
|
+
var statementString = (0, _string.nodeAsString)(this.statementNode, tokens), statement = statementString, json = {
|
|
103
103
|
statement: statement
|
|
104
104
|
};
|
|
105
105
|
return json;
|
|
@@ -124,4 +124,4 @@ var Supposition = /*#__PURE__*/ function() {
|
|
|
124
124
|
return Supposition;
|
|
125
125
|
}();
|
|
126
126
|
|
|
127
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy9zdXBwb3NpdGlvbi5qcyIsIjw8anN4LWNvbmZpZy1wcmFnbWEuanM+
|
|
127
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../src/supposition.js","<<jsx-config-pragma.js>>"],"sourcesContent":["\"use strict\";\n\nimport { nodeAsString } from \"./utilities/string\";\nimport { nodeQuery, nodesQuery } from \"./utilities/query\";\nimport { statementNodeFromStatementString } from \"./utilities/string\";\nimport { suppositionTermForVariableMatcher } from \"./matcher/termForVariable/supposition\";\n\nconst subproofAssertionNodeQuery = nodeQuery(\"/statement/subproofAssertion!\"),\n      subproofAssertionStatementNodesQuery = nodesQuery(\"/subproofAssertion/statement\"),\n      subproofSuppositionStatementNodesQuery = nodesQuery(\"/subproof/supposition/unqualifiedStatement/statement!\"),\n      subproofSubDerivationLastStatementNodeQuery = nodeQuery(\"/subproof/subDerivation/qualifiedStatement|unqualifiedStatement[-1]/statement!\");\n\nexport default class Supposition {\n  constructor(statementNode) {\n    this.statementNode = statementNode;\n  }\n\n  getStatementNode() {\n    return this.statementNode;\n  }\n\n  matchSubproofNode(subproofNode, substitutions) {\n    let subproofNodeMatches = false;\n\n    const subproofAssertionNode = subproofAssertionNodeQuery(this.statementNode);\n\n    if (subproofAssertionNode !== null) {\n      const subproofSuppositionStatementNodes = subproofSuppositionStatementNodesQuery(subproofNode),\n            subproofSubDerivationLastStatementNode = subproofSubDerivationLastStatementNodeQuery(subproofNode),\n            subproofStatementNodes = [\n              ...subproofSuppositionStatementNodes,\n              subproofSubDerivationLastStatementNode\n            ],\n            subproofAssertionStatementNodes = subproofAssertionStatementNodesQuery(subproofAssertionNode),\n            subproofStatementNodesLength = subproofStatementNodes.length,\n            subproofAssertionStatementNodesLength = subproofAssertionStatementNodes.length;\n\n      if (subproofStatementNodesLength === subproofAssertionStatementNodesLength) {\n        subproofNodeMatches = subproofAssertionStatementNodes.every((subproofAssertionStatementNode, index) => {\n                                const subproofStatementNode = subproofStatementNodes[index],\n                                      nonTerminalNodeA = subproofAssertionStatementNode,  ///\n                                      nonTerminalNodeB = subproofStatementNode, ///\n                                      nonTerminalNodeMatches = suppositionTermForVariableMatcher.matchNonTerminalNode(nonTerminalNodeA, nonTerminalNodeB, substitutions);\n\n                                if (nonTerminalNodeMatches) {\n                                  return true;\n                                }\n                              });\n      }\n    }\n\n    return subproofNodeMatches;\n  }\n\n  matchStatementNode(statementNode, substitutions) {\n    const nonTerminalNodeA = this.statementNode,  ///\n          nonTerminalNodeB = statementNode,  ///\n          nonTerminalNodeMatches = suppositionTermForVariableMatcher.matchNonTerminalNode(nonTerminalNodeA, nonTerminalNodeB, substitutions),\n          statementNodeMatches = nonTerminalNodeMatches; ///\n\n    return statementNodeMatches;\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 fromJSON(json, releaseContext) {\n    const { statement } = json,\n          statementString = statement,  ///\n          statementNode = statementNodeFromStatementString(statementString, releaseContext),\n          supposition = new Supposition(statementNode);\n\n    return supposition;\n  }\n\n  static fromStatementNode(statementNode) {\n    const supposition = new Supposition(statementNode);\n\n    return supposition;\n  }\n}\n","React.createElement"],"names":["Supposition","subproofAssertionNodeQuery","nodeQuery","subproofAssertionStatementNodesQuery","nodesQuery","subproofSuppositionStatementNodesQuery","subproofSubDerivationLastStatementNodeQuery","statementNode","getStatementNode","matchSubproofNode","subproofNode","substitutions","subproofNodeMatches","subproofAssertionNode","subproofSuppositionStatementNodes","subproofSubDerivationLastStatementNode","subproofStatementNodes","subproofAssertionStatementNodes","subproofStatementNodesLength","length","subproofAssertionStatementNodesLength","every","subproofAssertionStatementNode","index","subproofStatementNode","nonTerminalNodeA","nonTerminalNodeB","nonTerminalNodeMatches","suppositionTermForVariableMatcher","matchNonTerminalNode","matchStatementNode","statementNodeMatches","toJSON","tokens","statementString","nodeAsString","statement","json","fromJSON","releaseContext","statementNodeFromStatementString","supposition","fromStatementNode"],"mappings":"AAAA;;;;;;;eAYqBA;;;sBAVQ;qBACS;2BAEY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAElD,IAAMC,6BAA6BC,IAAAA,gBAAS,EAAC,kCACvCC,uCAAuCC,IAAAA,iBAAU,EAAC,iCAClDC,yCAAyCD,IAAAA,iBAAU,EAAC,0DACpDE,8CAA8CJ,IAAAA,gBAAS,EAAC;AAE/C,IAAA,AAAMF,4BAAN;aAAMA,YACPO,aAAa;8BADNP;QAEjB,IAAI,CAACO,aAAa,GAAGA;;iBAFJP;;YAKnBQ,KAAAA;mBAAAA,SAAAA,mBAAmB;gBACjB,OAAO,IAAI,CAACD,aAAa;YAC3B;;;YAEAE,KAAAA;mBAAAA,SAAAA,kBAAkBC,YAAY,EAAEC,aAAa,EAAE;gBAC7C,IAAIC,sBAAsB,KAAK;gBAE/B,IAAMC,wBAAwBZ,2BAA2B,IAAI,CAACM,aAAa;gBAE3E,IAAIM,0BAA0B,IAAI,EAAE;oBAClC,IAAMC,oCAAoCT,uCAAuCK,eAC3EK,yCAAyCT,4CAA4CI,eACrFM,yBAAyB,AACvB,mBAAGF,0CADoB;wBAEvBC;qBACD,GACDE,kCAAkCd,qCAAqCU,wBACvEK,+BAA+BF,uBAAuBG,MAAM,EAC5DC,wCAAwCH,gCAAgCE,MAAM;oBAEpF,IAAID,iCAAiCE,uCAAuC;wBAC1ER,sBAAsBK,gCAAgCI,KAAK,CAAC,SAACC,gCAAgCC,OAAU;4BAC/E,IAAMC,wBAAwBR,sBAAsB,CAACO,MAAM,EACrDE,mBAAmBH,gCACnBI,mBAAmBF,uBACnBG,yBAAyBC,8CAAiC,CAACC,oBAAoB,CAACJ,kBAAkBC,kBAAkBf;4BAE1H,IAAIgB,wBAAwB;gCAC1B,OAAO,IAAI;4BACb,CAAC;wBACH;oBACxB,CAAC;gBACH,CAAC;gBAED,OAAOf;YACT;;;YAEAkB,KAAAA;mBAAAA,SAAAA,mBAAmBvB,aAAa,EAAEI,aAAa,EAAE;gBAC/C,IAAMc,mBAAmB,IAAI,CAAClB,aAAa,EACrCmB,mBAAmBnB,eACnBoB,yBAAyBC,8CAAiC,CAACC,oBAAoB,CAACJ,kBAAkBC,kBAAkBf,gBACpHoB,uBAAuBJ,wBAAwB,GAAG;gBAExD,OAAOI;YACT;;;YAEAC,KAAAA;mBAAAA,SAAAA,OAAOC,MAAM,EAAE;gBACb,IAAMC,kBAAkBC,IAAAA,oBAAY,EAAC,IAAI,CAAC5B,aAAa,EAAE0B,SACnDG,YAAYF,iBACZG,OAAO;oBACLD,WAAAA;gBACF;gBAEN,OAAOC;YACT;;;;YAEOC,KAAAA;mBAAP,SAAOA,SAASD,IAAI,EAAEE,cAAc,EAAE;gBACpC,IAAM,AAAEH,YAAcC,KAAdD,WACFF,kBAAkBE,WAClB7B,gBAAgBiC,IAAAA,wCAAgC,EAACN,iBAAiBK,iBAClEE,cAAc,IAjEHzC,YAiEmBO;gBAEpC,OAAOkC;YACT;;;YAEOC,KAAAA;mBAAP,SAAOA,kBAAkBnC,aAAa,EAAE;gBACtC,IAAMkC,cAAc,IAvEHzC,YAuEmBO;gBAEpC,OAAOkC;YACT;;;WA1EmBzC"}
|
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 _axiomLemmaTheoremConjecture = /*#__PURE__*/ _interopRequireDefault(require("./axiomLemmaTheoremConjecture"));
|
|
12
12
|
var _kinds = require("./kinds");
|
|
13
13
|
function _assertThisInitialized(self) {
|
|
14
14
|
if (self === void 0) {
|
|
@@ -113,8 +113,8 @@ function _createSuper(Derived) {
|
|
|
113
113
|
return _possibleConstructorReturn(this, result);
|
|
114
114
|
};
|
|
115
115
|
}
|
|
116
|
-
var Theorem = /*#__PURE__*/ function(
|
|
117
|
-
_inherits(Theorem,
|
|
116
|
+
var Theorem = /*#__PURE__*/ function(AxiomLemmaTheoremConjecture) {
|
|
117
|
+
_inherits(Theorem, AxiomLemmaTheoremConjecture);
|
|
118
118
|
var _super = _createSuper(Theorem);
|
|
119
119
|
function Theorem() {
|
|
120
120
|
_classCallCheck(this, Theorem);
|
|
@@ -124,18 +124,18 @@ var Theorem = /*#__PURE__*/ function(AxiomLemmaTheorem) {
|
|
|
124
124
|
{
|
|
125
125
|
key: "fromJSON",
|
|
126
126
|
value: function fromJSON(json, releaseContext) {
|
|
127
|
-
return
|
|
127
|
+
return _axiomLemmaTheoremConjecture.default.fromJSON(Theorem, json, releaseContext);
|
|
128
128
|
}
|
|
129
129
|
},
|
|
130
130
|
{
|
|
131
131
|
key: "fromLabelsSuppositionsAndConsequence",
|
|
132
132
|
value: function fromLabelsSuppositionsAndConsequence(labels, suppositions, consequence) {
|
|
133
|
-
return
|
|
133
|
+
return _axiomLemmaTheoremConjecture.default.fromLabelsSuppositionsAndConsequence(Theorem, labels, suppositions, consequence);
|
|
134
134
|
}
|
|
135
135
|
}
|
|
136
136
|
]);
|
|
137
137
|
return Theorem;
|
|
138
|
-
}(
|
|
138
|
+
}(_axiomLemmaTheoremConjecture.default);
|
|
139
139
|
_defineProperty(Theorem, "kind", _kinds.THEOREM_KIND);
|
|
140
140
|
|
|
141
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy90aGVvcmVtLmpzIiwiPDxqc3gtY29uZmlnLXByYWdtYS5qcz4+
|
|
141
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy90aGVvcmVtLmpzIiwiPDxqc3gtY29uZmlnLXByYWdtYS5qcz4+Il0sInNvdXJjZXNDb250ZW50IjpbIlwidXNlIHN0cmljdFwiO1xuXG5pbXBvcnQgQXhpb21MZW1tYVRoZW9yZW1Db25qZWN0dXJlIGZyb20gXCIuL2F4aW9tTGVtbWFUaGVvcmVtQ29uamVjdHVyZVwiO1xuXG5pbXBvcnQgeyBUSEVPUkVNX0tJTkQgfSBmcm9tIFwiLi9raW5kc1wiO1xuXG5leHBvcnQgZGVmYXVsdCBjbGFzcyBUaGVvcmVtIGV4dGVuZHMgQXhpb21MZW1tYVRoZW9yZW1Db25qZWN0dXJlIHtcbiAgc3RhdGljIGtpbmQgPSBUSEVPUkVNX0tJTkQ7XG5cbiAgc3RhdGljIGZyb21KU09OKGpzb24sIHJlbGVhc2VDb250ZXh0KSB7IHJldHVybiBBeGlvbUxlbW1hVGhlb3JlbUNvbmplY3R1cmUuZnJvbUpTT04oVGhlb3JlbSwganNvbiwgcmVsZWFzZUNvbnRleHQpOyB9XG5cbiAgc3RhdGljIGZyb21MYWJlbHNTdXBwb3NpdGlvbnNBbmRDb25zZXF1ZW5jZShsYWJlbHMsIHN1cHBvc2l0aW9ucywgY29uc2VxdWVuY2UpIHsgcmV0dXJuIEF4aW9tTGVtbWFUaGVvcmVtQ29uamVjdHVyZS5mcm9tTGFiZWxzU3VwcG9zaXRpb25zQW5kQ29uc2VxdWVuY2UoVGhlb3JlbSwgbGFiZWxzLCBzdXBwb3NpdGlvbnMsIGNvbnNlcXVlbmNlKTsgfVxufVxuIiwiUmVhY3QuY3JlYXRlRWxlbWVudCJdLCJuYW1lcyI6WyJUaGVvcmVtIiwiZnJvbUpTT04iLCJqc29uIiwicmVsZWFzZUNvbnRleHQiLCJBeGlvbUxlbW1hVGhlb3JlbUNvbmplY3R1cmUiLCJmcm9tTGFiZWxzU3VwcG9zaXRpb25zQW5kQ29uc2VxdWVuY2UiLCJsYWJlbHMiLCJzdXBwb3NpdGlvbnMiLCJjb25zZXF1ZW5jZSIsImtpbmQiLCJUSEVPUkVNX0tJTkQiXSwibWFwcGluZ3MiOiJBQUFBOzs7Ozs7O2VBTXFCQTs7O2dGQUptQjtxQkFFWDs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFFZCxJQUFBLEFBQU1BLHdCQUFOO2NBQU1BOzhCQUFBQTthQUFBQTs4QkFBQUE7OztpQkFBQUE7O1lBR1pDLEtBQUFBO21CQUFQLFNBQU9BLFNBQVNDLElBQUksRUFBRUMsY0FBYyxFQUFFO2dCQUFFLE9BQU9DLG9DQUEyQixDQUFDSCxRQUFRLENBSGhFRCxTQUcwRUUsTUFBTUM7WUFBaUI7OztZQUU3R0UsS0FBQUE7bUJBQVAsU0FBT0EscUNBQXFDQyxNQUFNLEVBQUVDLFlBQVksRUFBRUMsV0FBVyxFQUFFO2dCQUFFLE9BQU9KLG9DQUEyQixDQUFDQyxvQ0FBb0MsQ0FMcklMLFNBSytJTSxRQUFRQyxjQUFjQztZQUFjOzs7V0FMbkxSO0VBQWdCSSxvQ0FBMkI7QUFDOUQsZ0JBRG1CSixTQUNaUyxRQUFPQyxtQkFBWSJ9
|
package/lib/type.js
CHANGED
|
@@ -196,7 +196,7 @@ var Type = /*#__PURE__*/ function() {
|
|
|
196
196
|
},
|
|
197
197
|
{
|
|
198
198
|
key: "asString",
|
|
199
|
-
value: function asString(noSuperType) {
|
|
199
|
+
value: function asString(tokens, noSuperType) {
|
|
200
200
|
var string;
|
|
201
201
|
if (noSuperType) {
|
|
202
202
|
string = "".concat(this.name);
|
|
@@ -209,8 +209,8 @@ var Type = /*#__PURE__*/ function() {
|
|
|
209
209
|
},
|
|
210
210
|
{
|
|
211
211
|
key: "toJSON",
|
|
212
|
-
value: function toJSON() {
|
|
213
|
-
var superTypeJSON = this.superType.toJSON(), kind = _kinds.TYPE_KIND, name = this.name, superType = superTypeJSON, json = {
|
|
212
|
+
value: function toJSON(tokens) {
|
|
213
|
+
var superTypeJSON = this.superType.toJSON(tokens), kind = _kinds.TYPE_KIND, name = this.name, superType = superTypeJSON, json = {
|
|
214
214
|
kind: kind,
|
|
215
215
|
name: name,
|
|
216
216
|
superType: superType
|
|
@@ -258,7 +258,7 @@ var ObjectType = /*#__PURE__*/ function(Type) {
|
|
|
258
258
|
_createClass(ObjectType, [
|
|
259
259
|
{
|
|
260
260
|
key: "toJSON",
|
|
261
|
-
value: function toJSON() {
|
|
261
|
+
value: function toJSON(tokens) {
|
|
262
262
|
var kind = _kinds.TYPE_KIND, name = this.name, superType = null, json = {
|
|
263
263
|
kind: kind,
|
|
264
264
|
name: name,
|
|
@@ -280,8 +280,15 @@ var ObjectType = /*#__PURE__*/ function(Type) {
|
|
|
280
280
|
}(Type);
|
|
281
281
|
var objectType = ObjectType.fromNothing();
|
|
282
282
|
function superTypeFromSuperTypeJSON(superTypeJSON, releaseContext) {
|
|
283
|
-
var
|
|
283
|
+
var superType;
|
|
284
|
+
var json = superTypeJSON, name = json.name;
|
|
285
|
+
if (name === _typeNames.OBJECT_TYPE_NAME) {
|
|
286
|
+
superType = objectType; ///
|
|
287
|
+
} else {
|
|
288
|
+
var typeName = name, type = releaseContext.findTypeByTypeName(typeName);
|
|
289
|
+
superType = type !== null ? type : Type.fromJSON(json, releaseContext); ///
|
|
290
|
+
}
|
|
284
291
|
return superType;
|
|
285
292
|
}
|
|
286
293
|
|
|
287
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../src/type.js"],"sourcesContent":["\"use strict\";\n\nimport { TYPE_KIND } from \"./kinds\";\nimport { OBJECT_TYPE_NAME } from \"./typeNames\";\n\nexport default class Type {\n  constructor(name, superType) {\n    this.name = name;\n    this.superType = superType;\n  }\n\n  getName() {\n    return this.name;\n  }\n\n  getSuperType() {\n    return this.superType;\n  }\n\n  isEqualTo(type) {\n    const equalTo = (this === type);\n\n    return equalTo;\n  }\n\n  isSubTypeOf(type) {\n    let subTypeOf = false;\n\n    let superType = this.superType;\n\n    while (superType !== null) {\n      if (superType === type) {\n        subTypeOf = true;\n\n        break;\n      }\n\n      superType = superType.getSuperType();\n    }\n\n    return subTypeOf;\n  }\n\n  isSuperTypeOf(type) {\n    let superTypeOf = false;\n\n    let superType = type.getSuperType();\n\n    while (superType !== null) {\n      if (superType === this) {\n        superTypeOf = true;\n\n        break;\n      }\n\n      superType = superType.getSuperType();\n    }\n\n    return superTypeOf;\n  }\n\n  isEqualToOrSubTypeOf(type) {\n    const equalToType = this.isEqualTo(type),\n          subTypeOfType = this.isSubTypeOf(type),\n          equalToTypeOrSubTypeOf = (equalToType || subTypeOfType);\n\n    return equalToTypeOrSubTypeOf;\n  }\n\n  isEqualToOrSuperTypeOf(type) {\n    const equalToType = this.isEqualTo(type),\n          superTypeOfType = this.isSuperTypeOf(type),\n          equalToTypeOrSuperTypeOf = (equalToType || superTypeOfType);\n\n    return equalToTypeOrSuperTypeOf;\n  }\n\n  match(type) {\n    const equalToType = this.isEqualTo(type),\n          subTypeOfType = this.isSubTypeOf(type),\n          superTypeOfType = this.isSuperTypeOf(type),\n          matches = (equalToType || subTypeOfType || superTypeOfType);\n\n    return matches;\n  }\n\n  matchName(name) {\n    const matchesName = (this.name === name);\n\n    return matchesName;\n  }\n\n  matchTypeName(typeName) {\n    const matchesTypeName = (this.name === typeName);\n\n    return matchesTypeName;\n  }\n\n  asString(noSuperType) {\n    let string;\n\n    if (noSuperType) {\n      string = `${this.name}`;\n    } else {\n      const superTypeName = this.superType.getName();\n\n      string = `${this.name}:${superTypeName}`;\n    }\n\n    return string;\n  }\n\n  toJSON() {\n    const superTypeJSON = this.superType.toJSON(),\n          kind = TYPE_KIND,\n          name = this.name,\n          superType = superTypeJSON,  ///\n          json = {\n            kind,\n            name,\n            superType\n          };\n\n    return json;\n  }\n\n  static fromJSON(json, releaseContext) {\n    let type;\n\n    let { superType } = json;\n\n    const superTypeJSON = superType;  ///\n\n    superType = superTypeFromSuperTypeJSON(superTypeJSON, releaseContext);\n\n    const { name } = json;\n\n    type = new Type(name, superType);\n\n    return type;\n  }\n\n  static fromTypeName(typeName) {\n    const name = typeName,  ///\n          superType = objectType, ///\n          type = new Type(name, superType);\n\n    return type;\n  }\n\n  static fromTypeNameAndSuperType(typeName, superType) {\n    const name = typeName,  ///\n          type = new Type(name, superType);\n\n    return type;\n  }\n}\n\nclass ObjectType extends Type {\n  toJSON() {\n    const kind = TYPE_KIND,\n          name = this.name,\n          superType = null,  ///\n          json = {\n            kind,\n            name,\n            superType\n          };\n\n    return json;\n  }\n\n  static fromNothing() {\n    const name = OBJECT_TYPE_NAME,\n          superType = null,\n          objectType = new ObjectType(name, superType);\n\n    return objectType;\n  }\n}\n\nexport const objectType = ObjectType.fromNothing();\n\nfunction superTypeFromSuperTypeJSON(superTypeJSON, releaseContext) {\n  const json = superTypeJSON, ///\n        { name } = json,\n        superType = (name === OBJECT_TYPE_NAME) ?\n          objectType :\n            Type.fromJSON(json, releaseContext);\n\n  return superType;\n}\n"],"names":["Type","objectType","name","superType","getName","getSuperType","isEqualTo","type","equalTo","isSubTypeOf","subTypeOf","isSuperTypeOf","superTypeOf","isEqualToOrSubTypeOf","equalToType","subTypeOfType","equalToTypeOrSubTypeOf","isEqualToOrSuperTypeOf","superTypeOfType","equalToTypeOrSuperTypeOf","match","matches","matchName","matchesName","matchTypeName","typeName","matchesTypeName","asString","noSuperType","string","superTypeName","toJSON","superTypeJSON","kind","TYPE_KIND","json","fromJSON","releaseContext","superTypeFromSuperTypeJSON","fromTypeName","fromTypeNameAndSuperType","ObjectType","fromNothing","OBJECT_TYPE_NAME"],"mappings":"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"}
|
|
294
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../src/type.js"],"sourcesContent":["\"use strict\";\n\nimport { TYPE_KIND } from \"./kinds\";\nimport { OBJECT_TYPE_NAME } from \"./typeNames\";\n\nexport default class Type {\n  constructor(name, superType) {\n    this.name = name;\n    this.superType = superType;\n  }\n\n  getName() {\n    return this.name;\n  }\n\n  getSuperType() {\n    return this.superType;\n  }\n\n  isEqualTo(type) {\n    const equalTo = (this === type);\n\n    return equalTo;\n  }\n\n  isSubTypeOf(type) {\n    let subTypeOf = false;\n\n    let superType = this.superType;\n\n    while (superType !== null) {\n      if (superType === type) {\n        subTypeOf = true;\n\n        break;\n      }\n\n      superType = superType.getSuperType();\n    }\n\n    return subTypeOf;\n  }\n\n  isSuperTypeOf(type) {\n    let superTypeOf = false;\n\n    let superType = type.getSuperType();\n\n    while (superType !== null) {\n      if (superType === this) {\n        superTypeOf = true;\n\n        break;\n      }\n\n      superType = superType.getSuperType();\n    }\n\n    return superTypeOf;\n  }\n\n  isEqualToOrSubTypeOf(type) {\n    const equalToType = this.isEqualTo(type),\n          subTypeOfType = this.isSubTypeOf(type),\n          equalToTypeOrSubTypeOf = (equalToType || subTypeOfType);\n\n    return equalToTypeOrSubTypeOf;\n  }\n\n  isEqualToOrSuperTypeOf(type) {\n    const equalToType = this.isEqualTo(type),\n          superTypeOfType = this.isSuperTypeOf(type),\n          equalToTypeOrSuperTypeOf = (equalToType || superTypeOfType);\n\n    return equalToTypeOrSuperTypeOf;\n  }\n\n  match(type) {\n    const equalToType = this.isEqualTo(type),\n          subTypeOfType = this.isSubTypeOf(type),\n          superTypeOfType = this.isSuperTypeOf(type),\n          matches = (equalToType || subTypeOfType || superTypeOfType);\n\n    return matches;\n  }\n\n  matchName(name) {\n    const matchesName = (this.name === name);\n\n    return matchesName;\n  }\n\n  matchTypeName(typeName) {\n    const matchesTypeName = (this.name === typeName);\n\n    return matchesTypeName;\n  }\n\n  asString(tokens, noSuperType) {\n    let string;\n\n    if (noSuperType) {\n      string = `${this.name}`;\n    } else {\n      const superTypeName = this.superType.getName();\n\n      string = `${this.name}:${superTypeName}`;\n    }\n\n    return string;\n  }\n\n  toJSON(tokens) {\n    const superTypeJSON = this.superType.toJSON(tokens),\n          kind = TYPE_KIND,\n          name = this.name,\n          superType = superTypeJSON,  ///\n          json = {\n            kind,\n            name,\n            superType\n          };\n\n    return json;\n  }\n\n  static fromJSON(json, releaseContext) {\n    let type;\n\n    let { superType } = json;\n\n    const superTypeJSON = superType;  ///\n\n    superType = superTypeFromSuperTypeJSON(superTypeJSON, releaseContext);\n\n    const { name } = json;\n\n    type = new Type(name, superType);\n\n    return type;\n  }\n\n  static fromTypeName(typeName) {\n    const name = typeName,  ///\n          superType = objectType, ///\n          type = new Type(name, superType);\n\n    return type;\n  }\n\n  static fromTypeNameAndSuperType(typeName, superType) {\n    const name = typeName,  ///\n          type = new Type(name, superType);\n\n    return type;\n  }\n}\n\nclass ObjectType extends Type {\n  toJSON(tokens) {\n    const kind = TYPE_KIND,\n          name = this.name,\n          superType = null,  ///\n          json = {\n            kind,\n            name,\n            superType\n          };\n\n    return json;\n  }\n\n  static fromNothing() {\n    const name = OBJECT_TYPE_NAME,\n          superType = null,\n          objectType = new ObjectType(name, superType);\n\n    return objectType;\n  }\n}\n\nexport const objectType = ObjectType.fromNothing();\n\nfunction superTypeFromSuperTypeJSON(superTypeJSON, releaseContext) {\n  let superType;\n\n  const json = superTypeJSON, ///\n        { name } = json;\n\n  if (name === OBJECT_TYPE_NAME) {\n    superType = objectType; ///\n  } else {\n    const typeName = name,  ///\n          type = releaseContext.findTypeByTypeName(typeName);\n\n    superType = (type !== null) ?\n                  type :  ///\n                    Type.fromJSON(json, releaseContext);  ///\n  }\n\n  return superType;\n}\n"],"names":["Type","objectType","name","superType","getName","getSuperType","isEqualTo","type","equalTo","isSubTypeOf","subTypeOf","isSuperTypeOf","superTypeOf","isEqualToOrSubTypeOf","equalToType","subTypeOfType","equalToTypeOrSubTypeOf","isEqualToOrSuperTypeOf","superTypeOfType","equalToTypeOrSuperTypeOf","match","matches","matchName","matchesName","matchTypeName","typeName","matchesTypeName","asString","tokens","noSuperType","string","superTypeName","toJSON","superTypeJSON","kind","TYPE_KIND","json","fromJSON","releaseContext","superTypeFromSuperTypeJSON","fromTypeName","fromTypeNameAndSuperType","ObjectType","fromNothing","OBJECT_TYPE_NAME","findTypeByTypeName"],"mappings":"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"}
|
package/lib/utilities/string.js
CHANGED
|
@@ -28,11 +28,11 @@ _export(exports, {
|
|
|
28
28
|
return metastatementNodeFromMetastatementString;
|
|
29
29
|
}
|
|
30
30
|
});
|
|
31
|
-
var _constants = require("../constants");
|
|
32
31
|
var _query = require("../utilities/query");
|
|
32
|
+
var _constants = require("../constants");
|
|
33
33
|
var _ruleNames = require("../ruleNames");
|
|
34
34
|
var termNodeQuery = (0, _query.nodeQuery)("/constructorDeclaration/term!"), statementNodeQuery = (0, _query.nodeQuery)("/unqualifiedStatement/statement!"), metastatementNodeQuery = (0, _query.nodeQuery)("/unqualifiedMetastatement/metastatement!");
|
|
35
|
-
function nodeAsString(node) {
|
|
35
|
+
function nodeAsString(node, tokens) {
|
|
36
36
|
var string = null;
|
|
37
37
|
if (node !== null) {
|
|
38
38
|
var nodeTerminalNode = node.isTerminalNode();
|
|
@@ -40,25 +40,26 @@ function nodeAsString(node) {
|
|
|
40
40
|
var terminalNode = node, content = terminalNode.getContent();
|
|
41
41
|
string = content; ///
|
|
42
42
|
} else {
|
|
43
|
-
var nonTerminalNode = node,
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
43
|
+
var nonTerminalNode = node, firstSignificantToken = nonTerminalNode.getFirstSignificantToken(), lastSignificantToken = nonTerminalNode.getLastSignificantToken(), firstSignificantTokenIndex = tokens.indexOf(firstSignificantToken), lastSignificantTokenIndex = tokens.indexOf(lastSignificantToken), start = firstSignificantTokenIndex, end = lastSignificantTokenIndex + 1;
|
|
44
|
+
tokens = tokens.slice(start, end); ///
|
|
45
|
+
string = tokens.reduce(function(string, token) {
|
|
46
|
+
var content = token.getContent();
|
|
47
|
+
string = "".concat(string).concat(content);
|
|
48
|
+
return string;
|
|
49
|
+
}, _constants.EMPTY_STRING);
|
|
48
50
|
}
|
|
49
51
|
}
|
|
52
|
+
if (string !== null) {
|
|
53
|
+
string = string.replace(/[\r\n]/, _constants.EMPTY_STRING);
|
|
54
|
+
}
|
|
50
55
|
return string;
|
|
51
56
|
}
|
|
52
|
-
function nodesAsString(nodes) {
|
|
57
|
+
function nodesAsString(nodes, tokens) {
|
|
53
58
|
var string = nodes.reduce(function(string, node) {
|
|
54
|
-
var nodeString = nodeAsString(node);
|
|
55
|
-
|
|
56
|
-
string = nodeString; ///
|
|
57
|
-
} else {
|
|
58
|
-
string = "".concat(string).concat(_constants.COMMA).concat(nodeString);
|
|
59
|
-
}
|
|
59
|
+
var nodeString = nodeAsString(node, tokens);
|
|
60
|
+
string = string === _constants.EMPTY_STRING ? nodeString : "".concat(string).concat(_constants.COMMA).concat(nodeString);
|
|
60
61
|
return string;
|
|
61
|
-
},
|
|
62
|
+
}, _constants.EMPTY_STRING);
|
|
62
63
|
return string;
|
|
63
64
|
}
|
|
64
65
|
function termNodeFromTermString(termString, releaseContext) {
|
|
@@ -78,4 +79,4 @@ function metastatementNodeFromMetastatementString(metastatementString, releaseCo
|
|
|
78
79
|
return metastatementNode;
|
|
79
80
|
}
|
|
80
81
|
|
|
81
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
82
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/utilities/string.js"],"sourcesContent":["\"use strict\";\n\nimport { nodeQuery } from \"../utilities/query\";\nimport { COMMA, EMPTY_STRING } from \"../constants\";\nimport { LABEL_RULE_NAME, UNQUALIFIED_STATEMENT_RULE_NAME, CONSTRUCTOR_DECLARATIONRULE_NAME, UNQUALIFIED_METASTATEMENT_RULE_NAME } from \"../ruleNames\";\n\nconst termNodeQuery = nodeQuery(\"/constructorDeclaration/term!\"),\n      statementNodeQuery = nodeQuery(\"/unqualifiedStatement/statement!\"),\n      metastatementNodeQuery = nodeQuery(\"/unqualifiedMetastatement/metastatement!\");\n\nexport function nodeAsString(node, tokens) {\n  let string = null;\n\n  if (node !== null) {\n    const nodeTerminalNode = node.isTerminalNode();\n\n    if (nodeTerminalNode) {\n      const terminalNode = node,  ///\n            content = terminalNode.getContent();\n\n      string = content; ///\n    } else {\n      const nonTerminalNode = node, ///\n            firstSignificantToken = nonTerminalNode.getFirstSignificantToken(),\n            lastSignificantToken = nonTerminalNode.getLastSignificantToken(),\n            firstSignificantTokenIndex = tokens.indexOf(firstSignificantToken),\n            lastSignificantTokenIndex = tokens.indexOf(lastSignificantToken),\n            start = firstSignificantTokenIndex, ///\n            end = lastSignificantTokenIndex + 1;\n\n      tokens = tokens.slice(start, end);  ///\n\n      string = tokens.reduce((string, token) => {\n        const content = token.getContent();\n\n        string = `${string}${content}`;\n\n        return string;\n      }, EMPTY_STRING);\n    }\n  }\n\n  if (string !== null) {\n    string = string.replace(/[\\r\\n]/, EMPTY_STRING)\n  }\n\n  return string;\n}\n\nexport function nodesAsString(nodes, tokens) {\n  const string = nodes.reduce((string, node) => {\n    const nodeString = nodeAsString(node, tokens);\n\n    string = (string === EMPTY_STRING) ?\n               nodeString :\n                `${string}${COMMA}${nodeString}`;\n\n    return string;\n  }, EMPTY_STRING);\n\n  return string;\n}\n\nexport function termNodeFromTermString(termString, releaseContext) {\n  const ruleName = CONSTRUCTOR_DECLARATIONRULE_NAME,\n        content = `Constructor ${termString}\n`,\n        node = releaseContext.nodeFromContentAndRuleName(content, ruleName),\n        constructorDeclarationNode = node, ///\n        termNode = termNodeQuery(constructorDeclarationNode);\n\n  return termNode;\n}\n\nexport function labelNodeFromLabelString(labelString, releaseContext) {\n  const content = labelString, ///\n        ruleName = LABEL_RULE_NAME,\n        node = releaseContext.nodeFromContentAndRuleName(content, ruleName),\n        labelNode = node; ///\n\n  return labelNode;\n}\n\nexport function statementNodeFromStatementString(statementString, releaseContext) {\n  const ruleName = UNQUALIFIED_STATEMENT_RULE_NAME,\n        content = `${statementString}\n`,\n        node = releaseContext.nodeFromContentAndRuleName(content, ruleName),\n        unqualifiedStatementNode = node,  ///\n        statementNode = statementNodeQuery(unqualifiedStatementNode);\n\n  return statementNode;\n}\n\nexport function metastatementNodeFromMetastatementString(metastatementString, releaseContext) {\n  const ruleName = UNQUALIFIED_METASTATEMENT_RULE_NAME,\n        content = `${metastatementString}\n`,\n        node = releaseContext.nodeFromContentAndRuleName(content, ruleName),\n        unqualifiedMetastatementNode = node,  ///\n        metastatementNode = metastatementNodeQuery(unqualifiedMetastatementNode);\n\n  return metastatementNode;\n}\n"],"names":["nodeAsString","nodesAsString","termNodeFromTermString","labelNodeFromLabelString","statementNodeFromStatementString","metastatementNodeFromMetastatementString","termNodeQuery","nodeQuery","statementNodeQuery","metastatementNodeQuery","node","tokens","string","nodeTerminalNode","isTerminalNode","terminalNode","content","getContent","nonTerminalNode","firstSignificantToken","getFirstSignificantToken","lastSignificantToken","getLastSignificantToken","firstSignificantTokenIndex","indexOf","lastSignificantTokenIndex","start","end","slice","reduce","token","EMPTY_STRING","replace","nodes","nodeString","COMMA","termString","releaseContext","ruleName","CONSTRUCTOR_DECLARATIONRULE_NAME","nodeFromContentAndRuleName","constructorDeclarationNode","termNode","labelString","LABEL_RULE_NAME","labelNode","statementString","UNQUALIFIED_STATEMENT_RULE_NAME","unqualifiedStatementNode","statementNode","metastatementString","UNQUALIFIED_METASTATEMENT_RULE_NAME","unqualifiedMetastatementNode","metastatementNode"],"mappings":"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"}
|
|
@@ -27,14 +27,14 @@ function matchBracketedNonTerminalNode(nonTerminalNodeA, nonTerminalNodeB) {
|
|
|
27
27
|
bracketedNodeMatches = nonTerminalNodeMatches; ///
|
|
28
28
|
}
|
|
29
29
|
if (!bracketedNodeMatches) {
|
|
30
|
-
var nonTerminalNodeAChildNodes = nonTerminalNodeA.getChildNodes(), childNodesA = nonTerminalNodeAChildNodes, bracketedNonTerminalChildNodeA = bracketedNonTerminalChildNodeFromChildNodes(childNodesA);
|
|
30
|
+
var nonTerminalNodeAChildNodes = nonTerminalNodeA.getChildNodes(), childNodesA = nonTerminalNodeAChildNodes, ruleName = _ruleNames.METASTATEMENT_RULE_NAME, bracketedNonTerminalChildNodeA = bracketedNonTerminalChildNodeFromChildNodes(childNodesA, ruleName);
|
|
31
31
|
if (bracketedNonTerminalChildNodeA !== null) {
|
|
32
32
|
var nodeA = bracketedNonTerminalChildNodeA, nodeB = nonTerminalNodeB, nodeMatches = _matcher.matcher.matchNode(nodeA, nodeB);
|
|
33
33
|
bracketedNodeMatches = nodeMatches; ///
|
|
34
34
|
}
|
|
35
35
|
}
|
|
36
36
|
if (!bracketedNodeMatches) {
|
|
37
|
-
var nonTerminalNodeBChildNodes = nonTerminalNodeB.getChildNodes(), childNodesB = nonTerminalNodeBChildNodes, bracketedNonTerminalChildNodeB = bracketedNonTerminalChildNodeFromChildNodes(childNodesB);
|
|
37
|
+
var nonTerminalNodeBChildNodes = nonTerminalNodeB.getChildNodes(), childNodesB = nonTerminalNodeBChildNodes, ruleName1 = _ruleNames.METASTATEMENT_RULE_NAME, bracketedNonTerminalChildNodeB = bracketedNonTerminalChildNodeFromChildNodes(childNodesB, ruleName1);
|
|
38
38
|
if (bracketedNonTerminalChildNodeB !== null) {
|
|
39
39
|
var nodeB1 = bracketedNonTerminalChildNodeB, nodeA1 = nonTerminalNodeA, nodeMatches1 = matchNode(nodeA1, nodeB1);
|
|
40
40
|
bracketedNodeMatches = nodeMatches1; ///
|
|
@@ -42,8 +42,7 @@ function matchBracketedNonTerminalNode(nonTerminalNodeA, nonTerminalNodeB) {
|
|
|
42
42
|
}
|
|
43
43
|
return bracketedNodeMatches;
|
|
44
44
|
}
|
|
45
|
-
function bracketedNonTerminalChildNodeFromChildNodes(childNodes) {
|
|
46
|
-
var ruleName = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : _ruleNames.METASTATEMENT_RULE_NAME;
|
|
45
|
+
function bracketedNonTerminalChildNodeFromChildNodes(childNodes, ruleName) {
|
|
47
46
|
var bracketedNonTerminalChildNode = null;
|
|
48
47
|
var childNodesLength = childNodes.length;
|
|
49
48
|
if (childNodesLength === _constants.BRACKETED_CHILD_NODES_LENGTH) {
|
|
@@ -58,4 +57,4 @@ function bracketedNonTerminalChildNodeFromChildNodes(childNodes) {
|
|
|
58
57
|
return bracketedNonTerminalChildNode;
|
|
59
58
|
}
|
|
60
59
|
|
|
61
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
60
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/utilities/substitution.js"],"sourcesContent":["    \"use strict\";\n\nimport { matcher } from \"../matcher\";\nimport { first, second, third } from \"../utilities/array\";\nimport { METASTATEMENT_RULE_NAME } from \"../ruleNames\";\nimport { BRACKETED_CHILD_NODES_LENGTH, LEFT_BRACKET, RIGHT_BRACKET } from \"../constants\";\n\nexport function matchBracketedNonTerminalNode(nonTerminalNodeA, nonTerminalNodeB) {\n  let bracketedNodeMatches = false;\n\n  if (!bracketedNodeMatches) {\n    const nonTerminalNodeMatches = matcher.matchNonTerminalNode(nonTerminalNodeA, nonTerminalNodeB);\n\n    bracketedNodeMatches = nonTerminalNodeMatches;  ///\n  }\n\n  if (!bracketedNodeMatches) {\n    const nonTerminalNodeAChildNodes = nonTerminalNodeA.getChildNodes(),\n          childNodesA = nonTerminalNodeAChildNodes, ///\n          ruleName = METASTATEMENT_RULE_NAME,\n          bracketedNonTerminalChildNodeA = bracketedNonTerminalChildNodeFromChildNodes(childNodesA, ruleName);\n\n    if (bracketedNonTerminalChildNodeA !== null) {\n      const nodeA = bracketedNonTerminalChildNodeA,  ///\n            nodeB = nonTerminalNodeB, ///\n            nodeMatches = matcher.matchNode(nodeA, nodeB);\n\n      bracketedNodeMatches = nodeMatches; ///\n    }\n  }\n\n  if (!bracketedNodeMatches) {\n    const nonTerminalNodeBChildNodes = nonTerminalNodeB.getChildNodes(),\n          childNodesB = nonTerminalNodeBChildNodes, ///\n          ruleName = METASTATEMENT_RULE_NAME,\n          bracketedNonTerminalChildNodeB = bracketedNonTerminalChildNodeFromChildNodes(childNodesB, ruleName);\n\n    if (bracketedNonTerminalChildNodeB !== null) {\n      const nodeB = bracketedNonTerminalChildNodeB,  ///\n            nodeA = nonTerminalNodeA, ///\n            nodeMatches = matchNode(nodeA, nodeB);\n\n      bracketedNodeMatches = nodeMatches; ///\n    }\n  }\n\n  return bracketedNodeMatches;\n}\n\nexport function bracketedNonTerminalChildNodeFromChildNodes(childNodes, ruleName) {\n  let bracketedNonTerminalChildNode = null;\n\n  const childNodesLength = childNodes.length;\n\n  if (childNodesLength === BRACKETED_CHILD_NODES_LENGTH) {\n    const firstChildNode = first(childNodes),\n          thirdChildNode = third(childNodes),\n          secondChildNode = second(childNodes),\n          firstChildNodeTerminalNode = firstChildNode.isTerminalNode(),\n          thirdChildNodeTerminalNode = thirdChildNode.isTerminalNode(),\n          secondChildNodeNonTerminalNode = secondChildNode.isNonTerminalNode();\n\n    if (firstChildNodeTerminalNode && secondChildNodeNonTerminalNode && thirdChildNodeTerminalNode) {\n      const nonTerminalNode = secondChildNode,  ///\n            firstTerminalNode = firstChildNode, ///\n            secondTerminalNode = thirdChildNode,  ///\n            nonTerminalNodeRuleName = nonTerminalNode.getRuleName(),\n            firstTerminalNodeContent = firstTerminalNode.getContent(),\n            secondTerminalNodeContent = secondTerminalNode.getContent(),\n            nonTerminalNodeRuleNameRuleName = (nonTerminalNodeRuleName === ruleName),\n            firstTerminalNodeContentLeftBracket = (firstTerminalNodeContent === LEFT_BRACKET),\n            secondTerminalNodeContentRightBracket = (secondTerminalNodeContent === RIGHT_BRACKET);\n\n      if (nonTerminalNodeRuleNameRuleName && firstTerminalNodeContentLeftBracket && secondTerminalNodeContentRightBracket) {\n        bracketedNonTerminalChildNode = nonTerminalNode;  ///\n      }\n    }\n  }\n\n  return bracketedNonTerminalChildNode;\n}\n"],"names":["matchBracketedNonTerminalNode","bracketedNonTerminalChildNodeFromChildNodes","nonTerminalNodeA","nonTerminalNodeB","bracketedNodeMatches","nonTerminalNodeMatches","matcher","matchNonTerminalNode","nonTerminalNodeAChildNodes","getChildNodes","childNodesA","ruleName","METASTATEMENT_RULE_NAME","bracketedNonTerminalChildNodeA","nodeA","nodeB","nodeMatches","matchNode","nonTerminalNodeBChildNodes","childNodesB","bracketedNonTerminalChildNodeB","childNodes","bracketedNonTerminalChildNode","childNodesLength","length","BRACKETED_CHILD_NODES_LENGTH","firstChildNode","first","thirdChildNode","third","secondChildNode","second","firstChildNodeTerminalNode","isTerminalNode","thirdChildNodeTerminalNode","secondChildNodeNonTerminalNode","isNonTerminalNode","nonTerminalNode","firstTerminalNode","secondTerminalNode","nonTerminalNodeRuleName","getRuleName","firstTerminalNodeContent","getContent","secondTerminalNodeContent","nonTerminalNodeRuleNameRuleName","firstTerminalNodeContentLeftBracket","LEFT_BRACKET","secondTerminalNodeContentRightBracket","RIGHT_BRACKET"],"mappings":"AAAI;;;;;;;;;;;IAOYA,6BAA6B;eAA7BA;;IA0CAC,2CAA2C;eAA3CA;;;uBA/CQ;qBACa;yBACG;yBACkC;AAEnE,SAASD,8BAA8BE,gBAAgB,EAAEC,gBAAgB,EAAE;IAChF,IAAIC,uBAAuB,KAAK;IAEhC,IAAI,CAACA,sBAAsB;QACzB,IAAMC,yBAAyBC,gBAAO,CAACC,oBAAoB,CAACL,kBAAkBC;QAE9EC,uBAAuBC,wBAAyB,GAAG;IACrD,CAAC;IAED,IAAI,CAACD,sBAAsB;QACzB,IAAMI,6BAA6BN,iBAAiBO,aAAa,IAC3DC,cAAcF,4BACdG,WAAWC,kCAAuB,EAClCC,iCAAiCZ,4CAA4CS,aAAaC;QAEhG,IAAIE,mCAAmC,IAAI,EAAE;YAC3C,IAAMC,QAAQD,gCACRE,QAAQZ,kBACRa,cAAcV,gBAAO,CAACW,SAAS,CAACH,OAAOC;YAE7CX,uBAAuBY,aAAa,GAAG;QACzC,CAAC;IACH,CAAC;IAED,IAAI,CAACZ,sBAAsB;QACzB,IAAMc,6BAA6Bf,iBAAiBM,aAAa,IAC3DU,cAAcD,4BACdP,YAAWC,kCAAuB,EAClCQ,iCAAiCnB,4CAA4CkB,aAAaR;QAEhG,IAAIS,mCAAmC,IAAI,EAAE;YAC3C,IAAML,SAAQK,gCACRN,SAAQZ,kBACRc,eAAcC,UAAUH,QAAOC;YAErCX,uBAAuBY,cAAa,GAAG;QACzC,CAAC;IACH,CAAC;IAED,OAAOZ;AACT;AAEO,SAASH,4CAA4CoB,UAAU,EAAEV,QAAQ,EAAE;IAChF,IAAIW,gCAAgC,IAAI;IAExC,IAAMC,mBAAmBF,WAAWG,MAAM;IAE1C,IAAID,qBAAqBE,uCAA4B,EAAE;QACrD,IAAMC,iBAAiBC,IAAAA,YAAK,EAACN,aACvBO,iBAAiBC,IAAAA,YAAK,EAACR,aACvBS,kBAAkBC,IAAAA,aAAM,EAACV,aACzBW,6BAA6BN,eAAeO,cAAc,IAC1DC,6BAA6BN,eAAeK,cAAc,IAC1DE,iCAAiCL,gBAAgBM,iBAAiB;QAExE,IAAIJ,8BAA8BG,kCAAkCD,4BAA4B;YAC9F,IAAMG,kBAAkBP,iBAClBQ,oBAAoBZ,gBACpBa,qBAAqBX,gBACrBY,0BAA0BH,gBAAgBI,WAAW,IACrDC,2BAA2BJ,kBAAkBK,UAAU,IACvDC,4BAA4BL,mBAAmBI,UAAU,IACzDE,kCAAmCL,4BAA4B7B,UAC/DmC,sCAAuCJ,6BAA6BK,uBAAY,EAChFC,wCAAyCJ,8BAA8BK,wBAAa;YAE1F,IAAIJ,mCAAmCC,uCAAuCE,uCAAuC;gBACnH1B,gCAAgCe,iBAAkB,GAAG;YACvD,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAOf;AACT"}
|
package/lib/variable.js
CHANGED
|
@@ -28,11 +28,10 @@ function _createClass(Constructor, protoProps, staticProps) {
|
|
|
28
28
|
return Constructor;
|
|
29
29
|
}
|
|
30
30
|
var Variable = /*#__PURE__*/ function() {
|
|
31
|
-
function Variable(type, name
|
|
31
|
+
function Variable(type, name) {
|
|
32
32
|
_classCallCheck(this, Variable);
|
|
33
33
|
this.type = type;
|
|
34
34
|
this.name = name;
|
|
35
|
-
this.termNode = termNode;
|
|
36
35
|
}
|
|
37
36
|
_createClass(Variable, [
|
|
38
37
|
{
|
|
@@ -47,18 +46,6 @@ var Variable = /*#__PURE__*/ function() {
|
|
|
47
46
|
return this.name;
|
|
48
47
|
}
|
|
49
48
|
},
|
|
50
|
-
{
|
|
51
|
-
key: "getTermNode",
|
|
52
|
-
value: function getTermNode() {
|
|
53
|
-
return this.termNode;
|
|
54
|
-
}
|
|
55
|
-
},
|
|
56
|
-
{
|
|
57
|
-
key: "setTermNode",
|
|
58
|
-
value: function setTermNode(termNode) {
|
|
59
|
-
this.termNode = termNode;
|
|
60
|
-
}
|
|
61
|
-
},
|
|
62
49
|
{
|
|
63
50
|
key: "matchName",
|
|
64
51
|
value: function matchName(name) {
|
|
@@ -66,31 +53,10 @@ var Variable = /*#__PURE__*/ function() {
|
|
|
66
53
|
return matchesName;
|
|
67
54
|
}
|
|
68
55
|
},
|
|
69
|
-
{
|
|
70
|
-
key: "isEqualTo",
|
|
71
|
-
value: function isEqualTo(variable) {
|
|
72
|
-
var equalTo = false;
|
|
73
|
-
if (variable === this) {
|
|
74
|
-
equalTo = true;
|
|
75
|
-
} else {
|
|
76
|
-
var termNode = variable.getTermNode();
|
|
77
|
-
if (termNode === this.termNode) {
|
|
78
|
-
equalTo = true;
|
|
79
|
-
}
|
|
80
|
-
}
|
|
81
|
-
return equalTo;
|
|
82
|
-
}
|
|
83
|
-
},
|
|
84
56
|
{
|
|
85
57
|
key: "asString",
|
|
86
|
-
value: function asString() {
|
|
87
|
-
var string;
|
|
88
|
-
if (this.type === null) {
|
|
89
|
-
string = this.name;
|
|
90
|
-
} else {
|
|
91
|
-
var typeName = this.type.getName();
|
|
92
|
-
string = "".concat(this.name, ":").concat(typeName);
|
|
93
|
-
}
|
|
58
|
+
value: function asString(tokens) {
|
|
59
|
+
var typeName = this.type.getName(), string = "".concat(this.name, ":").concat(typeName);
|
|
94
60
|
return string;
|
|
95
61
|
}
|
|
96
62
|
}
|
|
@@ -98,7 +64,7 @@ var Variable = /*#__PURE__*/ function() {
|
|
|
98
64
|
{
|
|
99
65
|
key: "fromTypeAndName",
|
|
100
66
|
value: function fromTypeAndName(type, name) {
|
|
101
|
-
var
|
|
67
|
+
var variable = new Variable(type, name);
|
|
102
68
|
return variable;
|
|
103
69
|
}
|
|
104
70
|
}
|
|
@@ -106,4 +72,4 @@ var Variable = /*#__PURE__*/ function() {
|
|
|
106
72
|
return Variable;
|
|
107
73
|
}();
|
|
108
74
|
|
|
109
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy92YXJpYWJsZS5qcyIsIjw8anN4LWNvbmZpZy1wcmFnbWEuanM+
|
|
75
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy92YXJpYWJsZS5qcyIsIjw8anN4LWNvbmZpZy1wcmFnbWEuanM+PiJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuZXhwb3J0IGRlZmF1bHQgY2xhc3MgVmFyaWFibGUge1xuICBjb25zdHJ1Y3Rvcih0eXBlLCBuYW1lKSB7XG4gICAgdGhpcy50eXBlID0gdHlwZTtcbiAgICB0aGlzLm5hbWUgPSBuYW1lO1xuICB9XG5cbiAgZ2V0VHlwZSgpIHtcbiAgICByZXR1cm4gdGhpcy50eXBlO1xuICB9XG5cbiAgZ2V0TmFtZSgpIHtcbiAgICByZXR1cm4gdGhpcy5uYW1lO1xuICB9XG5cbiAgbWF0Y2hOYW1lKG5hbWUpIHtcbiAgICBjb25zdCBtYXRjaGVzTmFtZSA9ICh0aGlzLm5hbWUgPT09IG5hbWUpO1xuXG4gICAgcmV0dXJuIG1hdGNoZXNOYW1lO1xuICB9XG5cbiAgYXNTdHJpbmcodG9rZW5zKSB7XG4gICAgY29uc3QgdHlwZU5hbWUgPSB0aGlzLnR5cGUuZ2V0TmFtZSgpLFxuICAgICAgICAgIHN0cmluZyA9IGAke3RoaXMubmFtZX06JHt0eXBlTmFtZX1gO1xuXG4gICAgcmV0dXJuIHN0cmluZztcbiAgfVxuXG4gIHN0YXRpYyBmcm9tVHlwZUFuZE5hbWUodHlwZSwgbmFtZSkge1xuICAgIGNvbnN0IHZhcmlhYmxlID0gbmV3IFZhcmlhYmxlKHR5cGUsIG5hbWUpO1xuXG4gICAgcmV0dXJuIHZhcmlhYmxlO1xuICB9XG59XG4iLCJSZWFjdC5jcmVhdGVFbGVtZW50Il0sIm5hbWVzIjpbIlZhcmlhYmxlIiwidHlwZSIsIm5hbWUiLCJnZXRUeXBlIiwiZ2V0TmFtZSIsIm1hdGNoTmFtZSIsIm1hdGNoZXNOYW1lIiwiYXNTdHJpbmciLCJ0b2tlbnMiLCJ0eXBlTmFtZSIsInN0cmluZyIsImZyb21UeXBlQW5kTmFtZSIsInZhcmlhYmxlIl0sIm1hcHBpbmdzIjoiQUFBQTs7Ozs7OztlQUVxQkE7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBTixJQUFBLEFBQU1BLHlCQUFOO2FBQU1BLFNBQ1BDLElBQUksRUFBRUMsSUFBSTs4QkFESEY7UUFFakIsSUFBSSxDQUFDQyxJQUFJLEdBQUdBO1FBQ1osSUFBSSxDQUFDQyxJQUFJLEdBQUdBOztpQkFIS0Y7O1lBTW5CRyxLQUFBQTttQkFBQUEsU0FBQUEsVUFBVTtnQkFDUixPQUFPLElBQUksQ0FBQ0YsSUFBSTtZQUNsQjs7O1lBRUFHLEtBQUFBO21CQUFBQSxTQUFBQSxVQUFVO2dCQUNSLE9BQU8sSUFBSSxDQUFDRixJQUFJO1lBQ2xCOzs7WUFFQUcsS0FBQUE7bUJBQUFBLFNBQUFBLFVBQVVILElBQUksRUFBRTtnQkFDZCxJQUFNSSxjQUFlLElBQUksQ0FBQ0osSUFBSSxLQUFLQTtnQkFFbkMsT0FBT0k7WUFDVDs7O1lBRUFDLEtBQUFBO21CQUFBQSxTQUFBQSxTQUFTQyxNQUFNLEVBQUU7Z0JBQ2YsSUFBTUMsV0FBVyxJQUFJLENBQUNSLElBQUksQ0FBQ0csT0FBTyxJQUM1Qk0sU0FBUyxBQUFDLEdBQWVELE9BQWIsSUFBSSxDQUFDUCxJQUFJLEVBQUMsS0FBWSxPQUFUTztnQkFFL0IsT0FBT0M7WUFDVDs7OztZQUVPQyxLQUFBQTttQkFBUCxTQUFPQSxnQkFBZ0JWLElBQUksRUFBRUMsSUFBSSxFQUFFO2dCQUNqQyxJQUFNVSxXQUFXLElBNUJBWixTQTRCYUMsTUFBTUM7Z0JBRXBDLE9BQU9VO1lBQ1Q7OztXQS9CbUJaIn0=
|