occam-furtle 3.0.333 → 3.0.335
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/node/term.js +5 -3
- package/package.json +3 -3
- package/src/node/term.js +4 -1
package/lib/node/term.js
CHANGED
|
@@ -9,8 +9,9 @@ Object.defineProperty(exports, "default", {
|
|
|
9
9
|
}
|
|
10
10
|
});
|
|
11
11
|
const _occamlanguages = require("occam-languages");
|
|
12
|
+
const _occamgrammarutilities = require("occam-grammar-utilities");
|
|
12
13
|
const _ruleNames = require("../ruleNames");
|
|
13
|
-
class TermNode extends
|
|
14
|
+
class TermNode extends _occamgrammarutilities.NonTerminalNode {
|
|
14
15
|
getVariableNode() {
|
|
15
16
|
const ruleName = _ruleNames.VARIABLE_RULE_NAME, variableNode = this.getNodeByRuleName(ruleName);
|
|
16
17
|
return variableNode;
|
|
@@ -43,9 +44,10 @@ class TermNode extends _occamlanguages.NonTerminalNode {
|
|
|
43
44
|
ruleName = Class; ///
|
|
44
45
|
Class = TermNode;
|
|
45
46
|
}
|
|
46
|
-
const termNode =
|
|
47
|
+
const termNode = _occamgrammarutilities.NonTerminalNode.fromRuleNameChildNodesOpacityAndPrecedence(Class, ruleName, childNodes, opacity, precedence);
|
|
47
48
|
return termNode;
|
|
48
49
|
}
|
|
49
50
|
}
|
|
51
|
+
Object.assign(TermNode.prototype, _occamlanguages.nodeMixins);
|
|
50
52
|
|
|
51
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
53
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9ub2RlL3Rlcm0uanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmltcG9ydCB7IG5vZGVNaXhpbnMgfSBmcm9tIFwib2NjYW0tbGFuZ3VhZ2VzXCI7XG5pbXBvcnQgeyBOb25UZXJtaW5hbE5vZGUgfSBmcm9tIFwib2NjYW0tZ3JhbW1hci11dGlsaXRpZXNcIjtcblxuaW1wb3J0IHsgVkFSSUFCTEVfUlVMRV9OQU1FLFxuICAgICAgICAgUFJJTUlUSVZFX1JVTEVfTkFNRSxcbiAgICAgICAgIE5FR0FURURfVEVSTV9SVUxFX05BTUUsXG4gICAgICAgICBMT0dJQ0FMX1RFUk1fUlVMRV9OQU1FLFxuICAgICAgICAgQlJBQ0tFVEVEX1RFUk1fUlVMRV9OQU1FLFxuICAgICAgICAgQ09NUEFSSVNPTl9URVJNX1JVTEVfTkFNRSB9IGZyb20gXCIuLi9ydWxlTmFtZXNcIjtcblxuZXhwb3J0IGRlZmF1bHQgY2xhc3MgVGVybU5vZGUgZXh0ZW5kcyBOb25UZXJtaW5hbE5vZGUge1xuICBnZXRWYXJpYWJsZU5vZGUoKSB7XG4gICAgY29uc3QgcnVsZU5hbWUgPSBWQVJJQUJMRV9SVUxFX05BTUUsXG4gICAgICAgICAgdmFyaWFibGVOb2RlID0gdGhpcy5nZXROb2RlQnlSdWxlTmFtZShydWxlTmFtZSk7XG5cbiAgICByZXR1cm4gdmFyaWFibGVOb2RlO1xuICB9XG5cbiAgZ2V0UHJpbWl0aXZlTm9kZSgpIHtcbiAgICBjb25zdCBydWxlTmFtZSA9IFBSSU1JVElWRV9SVUxFX05BTUUsXG4gICAgICAgICAgcHJpbWl0aXZlTm9kZSA9IHRoaXMuZ2V0Tm9kZUJ5UnVsZU5hbWUocnVsZU5hbWUpO1xuXG4gICAgcmV0dXJuIHByaW1pdGl2ZU5vZGU7XG4gIH1cblxuICBnZXROZWdhdGVkVGVybU5vZGUoKSB7XG4gICAgY29uc3QgcnVsZU5hbWUgPSBORUdBVEVEX1RFUk1fUlVMRV9OQU1FLFxuICAgICAgICAgIG5lZ2F0ZWRUZXJtTm9kZSA9IHRoaXMuZ2V0Tm9kZUJ5UnVsZU5hbWUocnVsZU5hbWUpO1xuXG4gICAgcmV0dXJuIG5lZ2F0ZWRUZXJtTm9kZTtcbiAgfVxuXG4gIGdldExvZ2ljYWxUZXJtTm9kZSgpIHtcbiAgICBjb25zdCBydWxlTmFtZSA9IExPR0lDQUxfVEVSTV9SVUxFX05BTUUsXG4gICAgICAgICAgbG9naWNhbFRlcm1SdWxlTmFtZSA9IHRoaXMuZ2V0Tm9kZUJ5UnVsZU5hbWUocnVsZU5hbWUpO1xuXG4gICAgcmV0dXJuIGxvZ2ljYWxUZXJtUnVsZU5hbWU7XG4gIH1cblxuICBnZXRCcmFja2V0ZWRUZXJtTm9kZSgpIHtcbiAgICBjb25zdCBydWxlTmFtZSA9IEJSQUNLRVRFRF9URVJNX1JVTEVfTkFNRSxcbiAgICAgICAgICBicmFja2V0ZWRUZXJtUnVsZU5hbWUgPSB0aGlzLmdldE5vZGVCeVJ1bGVOYW1lKHJ1bGVOYW1lKTtcblxuICAgIHJldHVybiBicmFja2V0ZWRUZXJtUnVsZU5hbWU7XG4gIH1cblxuICBnZXRDb21wYXJpc29uVGVybU5vZGUoKSB7XG4gICAgY29uc3QgcnVsZU5hbWUgPSBDT01QQVJJU09OX1RFUk1fUlVMRV9OQU1FLFxuICAgICAgICAgIGNvbXBhcmlzb25Ob2RlID0gdGhpcy5nZXROb2RlQnlSdWxlTmFtZShydWxlTmFtZSk7XG5cbiAgICByZXR1cm4gY29tcGFyaXNvbk5vZGU7XG4gIH1cblxuICBzdGF0aWMgZnJvbVJ1bGVOYW1lQ2hpbGROb2Rlc09wYWNpdHlBbmRQcmVjZWRlbmNlKENsYXNzLCBydWxlTmFtZSwgY2hpbGROb2Rlcywgb3BhY2l0eSwgcHJlY2VkZW5jZSkge1xuICAgIGlmIChwcmVjZWRlbmNlID09PSB1bmRlZmluZWQpIHtcbiAgICAgIHByZWNlZGVuY2UgPSBvcGFjaXR5OyAvLy9cblxuICAgICAgb3BhY2l0eSA9IGNoaWxkTm9kZXM7IC8vL1xuXG4gICAgICBjaGlsZE5vZGVzID0gcnVsZU5hbWU7ICAvLy9cblxuICAgICAgcnVsZU5hbWUgPSBDbGFzczsgLy8vXG5cbiAgICAgIENsYXNzID0gVGVybU5vZGU7XG4gICAgfVxuXG4gICAgY29uc3QgdGVybU5vZGUgPSBOb25UZXJtaW5hbE5vZGUuZnJvbVJ1bGVOYW1lQ2hpbGROb2Rlc09wYWNpdHlBbmRQcmVjZWRlbmNlKENsYXNzLCBydWxlTmFtZSwgY2hpbGROb2Rlcywgb3BhY2l0eSwgcHJlY2VkZW5jZSk7XG5cbiAgICByZXR1cm4gdGVybU5vZGU7XG4gIH1cbn1cblxuT2JqZWN0LmFzc2lnbihUZXJtTm9kZS5wcm90b3R5cGUsIG5vZGVNaXhpbnMpO1xuIl0sIm5hbWVzIjpbIlRlcm1Ob2RlIiwiTm9uVGVybWluYWxOb2RlIiwiZ2V0VmFyaWFibGVOb2RlIiwicnVsZU5hbWUiLCJWQVJJQUJMRV9SVUxFX05BTUUiLCJ2YXJpYWJsZU5vZGUiLCJnZXROb2RlQnlSdWxlTmFtZSIsImdldFByaW1pdGl2ZU5vZGUiLCJQUklNSVRJVkVfUlVMRV9OQU1FIiwicHJpbWl0aXZlTm9kZSIsImdldE5lZ2F0ZWRUZXJtTm9kZSIsIk5FR0FURURfVEVSTV9SVUxFX05BTUUiLCJuZWdhdGVkVGVybU5vZGUiLCJnZXRMb2dpY2FsVGVybU5vZGUiLCJMT0dJQ0FMX1RFUk1fUlVMRV9OQU1FIiwibG9naWNhbFRlcm1SdWxlTmFtZSIsImdldEJyYWNrZXRlZFRlcm1Ob2RlIiwiQlJBQ0tFVEVEX1RFUk1fUlVMRV9OQU1FIiwiYnJhY2tldGVkVGVybVJ1bGVOYW1lIiwiZ2V0Q29tcGFyaXNvblRlcm1Ob2RlIiwiQ09NUEFSSVNPTl9URVJNX1JVTEVfTkFNRSIsImNvbXBhcmlzb25Ob2RlIiwiZnJvbVJ1bGVOYW1lQ2hpbGROb2Rlc09wYWNpdHlBbmRQcmVjZWRlbmNlIiwiQ2xhc3MiLCJjaGlsZE5vZGVzIiwib3BhY2l0eSIsInByZWNlZGVuY2UiLCJ1bmRlZmluZWQiLCJ0ZXJtTm9kZSIsIk9iamVjdCIsImFzc2lnbiIsInByb3RvdHlwZSIsIm5vZGVNaXhpbnMiXSwibWFwcGluZ3MiOiJBQUFBOzs7OytCQVlBOzs7ZUFBcUJBOzs7Z0NBVk07dUNBQ0s7MkJBT1U7QUFFM0IsTUFBTUEsaUJBQWlCQyxzQ0FBZTtJQUNuREMsa0JBQWtCO1FBQ2hCLE1BQU1DLFdBQVdDLDZCQUFrQixFQUM3QkMsZUFBZSxJQUFJLENBQUNDLGlCQUFpQixDQUFDSDtRQUU1QyxPQUFPRTtJQUNUO0lBRUFFLG1CQUFtQjtRQUNqQixNQUFNSixXQUFXSyw4QkFBbUIsRUFDOUJDLGdCQUFnQixJQUFJLENBQUNILGlCQUFpQixDQUFDSDtRQUU3QyxPQUFPTTtJQUNUO0lBRUFDLHFCQUFxQjtRQUNuQixNQUFNUCxXQUFXUSxpQ0FBc0IsRUFDakNDLGtCQUFrQixJQUFJLENBQUNOLGlCQUFpQixDQUFDSDtRQUUvQyxPQUFPUztJQUNUO0lBRUFDLHFCQUFxQjtRQUNuQixNQUFNVixXQUFXVyxpQ0FBc0IsRUFDakNDLHNCQUFzQixJQUFJLENBQUNULGlCQUFpQixDQUFDSDtRQUVuRCxPQUFPWTtJQUNUO0lBRUFDLHVCQUF1QjtRQUNyQixNQUFNYixXQUFXYyxtQ0FBd0IsRUFDbkNDLHdCQUF3QixJQUFJLENBQUNaLGlCQUFpQixDQUFDSDtRQUVyRCxPQUFPZTtJQUNUO0lBRUFDLHdCQUF3QjtRQUN0QixNQUFNaEIsV0FBV2lCLG9DQUF5QixFQUNwQ0MsaUJBQWlCLElBQUksQ0FBQ2YsaUJBQWlCLENBQUNIO1FBRTlDLE9BQU9rQjtJQUNUO0lBRUEsT0FBT0MsMkNBQTJDQyxLQUFLLEVBQUVwQixRQUFRLEVBQUVxQixVQUFVLEVBQUVDLE9BQU8sRUFBRUMsVUFBVSxFQUFFO1FBQ2xHLElBQUlBLGVBQWVDLFdBQVc7WUFDNUJELGFBQWFELFNBQVMsR0FBRztZQUV6QkEsVUFBVUQsWUFBWSxHQUFHO1lBRXpCQSxhQUFhckIsVUFBVyxHQUFHO1lBRTNCQSxXQUFXb0IsT0FBTyxHQUFHO1lBRXJCQSxRQUFRdkI7UUFDVjtRQUVBLE1BQU00QixXQUFXM0Isc0NBQWUsQ0FBQ3FCLDBDQUEwQyxDQUFDQyxPQUFPcEIsVUFBVXFCLFlBQVlDLFNBQVNDO1FBRWxILE9BQU9FO0lBQ1Q7QUFDRjtBQUVBQyxPQUFPQyxNQUFNLENBQUM5QixTQUFTK0IsU0FBUyxFQUFFQywwQkFBVSJ9
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "occam-furtle",
|
|
3
3
|
"author": "James Smith",
|
|
4
|
-
"version": "3.0.
|
|
4
|
+
"version": "3.0.335",
|
|
5
5
|
"license": "MIT, Anti-996",
|
|
6
6
|
"homepage": "https://github.com/djalbat/occam-furtle",
|
|
7
7
|
"description": "Occam's Furtle language.",
|
|
@@ -11,7 +11,7 @@
|
|
|
11
11
|
},
|
|
12
12
|
"dependencies": {
|
|
13
13
|
"necessary": "^17.2.10",
|
|
14
|
-
"occam-languages": "^
|
|
14
|
+
"occam-languages": "^1.0.3",
|
|
15
15
|
"occam-lexers": "^23.1.75",
|
|
16
16
|
"occam-parsers": "^23.1.201",
|
|
17
17
|
"occam-query": "^4.1.187"
|
|
@@ -26,7 +26,7 @@
|
|
|
26
26
|
"express": "^4.17.1",
|
|
27
27
|
"juxtapose": "^4.0.138",
|
|
28
28
|
"lively-cli": "^3.0.3",
|
|
29
|
-
"occam-grammar-utilities": "^8.1.
|
|
29
|
+
"occam-grammar-utilities": "^8.1.4",
|
|
30
30
|
"occam-model": "^1.0.547",
|
|
31
31
|
"occam-server": "^7.0.47",
|
|
32
32
|
"watchful-cli": "^1.7.98"
|
package/src/node/term.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
import {
|
|
3
|
+
import { nodeMixins } from "occam-languages";
|
|
4
|
+
import { NonTerminalNode } from "occam-grammar-utilities";
|
|
4
5
|
|
|
5
6
|
import { VARIABLE_RULE_NAME,
|
|
6
7
|
PRIMITIVE_RULE_NAME,
|
|
@@ -70,3 +71,5 @@ export default class TermNode extends NonTerminalNode {
|
|
|
70
71
|
return termNode;
|
|
71
72
|
}
|
|
72
73
|
}
|
|
74
|
+
|
|
75
|
+
Object.assign(TermNode.prototype, nodeMixins);
|