occam-verify-cli 1.0.276 → 1.0.278
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/metavariable.js +3 -18
- package/package.json +6 -6
- package/src/node/metavariable.js +5 -22
package/lib/node/metavariable.js
CHANGED
|
@@ -98,32 +98,17 @@ var MetavariableNode = /*#__PURE__*/ function(NonTerminalNode) {
|
|
|
98
98
|
{
|
|
99
99
|
key: "getTermNode",
|
|
100
100
|
value: function getTermNode() {
|
|
101
|
-
var termNode =
|
|
102
|
-
var argumentNode = this.getArgumentNode();
|
|
103
|
-
if (argumentNode !== null) {
|
|
104
|
-
termNode = argumentNode.getTermNode();
|
|
105
|
-
}
|
|
101
|
+
var ruleName = _ruleNames.TERM_RULE_NAME, termNode = this.getNodeByRuleName(ruleName);
|
|
106
102
|
return termNode;
|
|
107
103
|
}
|
|
108
104
|
},
|
|
109
105
|
{
|
|
110
106
|
key: "getTypeNode",
|
|
111
107
|
value: function getTypeNode() {
|
|
112
|
-
var typeNode =
|
|
113
|
-
var argumentNode = this.getArgumentNode();
|
|
114
|
-
if (argumentNode !== null) {
|
|
115
|
-
typeNode = argumentNode.getTypeNode();
|
|
116
|
-
}
|
|
108
|
+
var ruleName = _ruleNames.TYPE_RULE_NAME, typeNode = this.getNodeByRuleName(ruleName);
|
|
117
109
|
return typeNode;
|
|
118
110
|
}
|
|
119
111
|
},
|
|
120
|
-
{
|
|
121
|
-
key: "getArgumentNode",
|
|
122
|
-
value: function getArgumentNode() {
|
|
123
|
-
var ruleName = _ruleNames.ARGUMENT_RULE_NAME, argumentNode = this.getNodeByRuleName(ruleName);
|
|
124
|
-
return argumentNode;
|
|
125
|
-
}
|
|
126
|
-
},
|
|
127
112
|
{
|
|
128
113
|
key: "getMetavariableName",
|
|
129
114
|
value: function getMetavariableName() {
|
|
@@ -150,4 +135,4 @@ var MetavariableNode = /*#__PURE__*/ function(NonTerminalNode) {
|
|
|
150
135
|
return MetavariableNode;
|
|
151
136
|
}(_nonTerminal.default);
|
|
152
137
|
|
|
153
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
138
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9ub2RlL21ldGF2YXJpYWJsZS5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuaW1wb3J0IE5vblRlcm1pbmFsTm9kZSBmcm9tIFwiLi4vbm9kZS9ub25UZXJtaW5hbFwiO1xuXG5pbXBvcnQgeyBURVJNX1JVTEVfTkFNRSwgVFlQRV9SVUxFX05BTUUgfSBmcm9tIFwiLi4vcnVsZU5hbWVzXCI7XG5cbmV4cG9ydCBkZWZhdWx0IGNsYXNzIE1ldGF2YXJpYWJsZU5vZGUgZXh0ZW5kcyBOb25UZXJtaW5hbE5vZGUge1xuICBnZXRUZXJtTm9kZSgpIHtcbiAgICBjb25zdCBydWxlTmFtZSA9IFRFUk1fUlVMRV9OQU1FLFxuICAgICAgICAgIHRlcm1Ob2RlID0gdGhpcy5nZXROb2RlQnlSdWxlTmFtZShydWxlTmFtZSk7XG5cbiAgICByZXR1cm4gdGVybU5vZGU7XG4gIH1cblxuICBnZXRUeXBlTm9kZSgpIHtcbiAgICBjb25zdCBydWxlTmFtZSA9IFRZUEVfUlVMRV9OQU1FLFxuICAgICAgICAgIHR5cGVOb2RlID0gdGhpcy5nZXROb2RlQnlSdWxlTmFtZShydWxlTmFtZSk7XG5cbiAgICByZXR1cm4gdHlwZU5vZGU7XG4gIH1cblxuICBnZXRNZXRhdmFyaWFibGVOYW1lKCkge1xuICAgIGxldCBtZXRhVmFyaWFibGVOYW1lO1xuXG4gICAgdGhpcy5zb21lQ2hpbGROb2RlKChjaGlsZE5vZGUpID0+IHtcbiAgICAgIGNvbnN0IGNoaWxkTm9kZVRlcm1pbmFsTm9kZSA9IGNoaWxkTm9kZS5pc1Rlcm1pbmFsTm9kZSgpO1xuXG4gICAgICBpZiAoY2hpbGROb2RlVGVybWluYWxOb2RlKSB7XG4gICAgICAgIGNvbnN0IHRlcm1pbmFsTm9kZSA9IGNoaWxkTm9kZSwgLy8vXG4gICAgICAgICAgICAgIGNvbnRlbnQgPSB0ZXJtaW5hbE5vZGUuZ2V0Q29udGVudCgpO1xuXG4gICAgICAgIG1ldGFWYXJpYWJsZU5hbWUgPSBjb250ZW50OyAvLy9cblxuICAgICAgICByZXR1cm4gdHJ1ZTtcbiAgICAgIH1cbiAgICB9KTtcblxuICAgIHJldHVybiBtZXRhVmFyaWFibGVOYW1lO1xuICB9XG5cbiAgc3RhdGljIGZyb21SdWxlTmFtZUNoaWxkTm9kZXNPcGFjaXR5QW5kUHJlY2VkZW5jZShydWxlTmFtZSwgY2hpbGROb2Rlcywgb3BhY2l0eSwgcHJlY2VkZW5jZSkgeyByZXR1cm4gTm9uVGVybWluYWxOb2RlLmZyb21SdWxlTmFtZUNoaWxkTm9kZXNPcGFjaXR5QW5kUHJlY2VkZW5jZShNZXRhdmFyaWFibGVOb2RlLCBydWxlTmFtZSwgY2hpbGROb2Rlcywgb3BhY2l0eSwgcHJlY2VkZW5jZSk7IH1cbn1cbiJdLCJuYW1lcyI6WyJNZXRhdmFyaWFibGVOb2RlIiwiZ2V0VGVybU5vZGUiLCJydWxlTmFtZSIsIlRFUk1fUlVMRV9OQU1FIiwidGVybU5vZGUiLCJnZXROb2RlQnlSdWxlTmFtZSIsImdldFR5cGVOb2RlIiwiVFlQRV9SVUxFX05BTUUiLCJ0eXBlTm9kZSIsImdldE1ldGF2YXJpYWJsZU5hbWUiLCJtZXRhVmFyaWFibGVOYW1lIiwic29tZUNoaWxkTm9kZSIsImNoaWxkTm9kZSIsImNoaWxkTm9kZVRlcm1pbmFsTm9kZSIsImlzVGVybWluYWxOb2RlIiwidGVybWluYWxOb2RlIiwiY29udGVudCIsImdldENvbnRlbnQiLCJmcm9tUnVsZU5hbWVDaGlsZE5vZGVzT3BhY2l0eUFuZFByZWNlZGVuY2UiLCJjaGlsZE5vZGVzIiwib3BhY2l0eSIsInByZWNlZGVuY2UiLCJOb25UZXJtaW5hbE5vZGUiXSwibWFwcGluZ3MiOiJBQUFBOzs7Ozs7O2VBTXFCQTs7O2tFQUpPO3lCQUVtQjs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUVoQyxJQUFBLEFBQU1BLGlDQUFOO2NBQU1BO2FBQUFBO2dDQUFBQTtRQUFOLE9BQUEsa0JBQU1BOztrQkFBQUE7O1lBQ25CQyxLQUFBQTttQkFBQUEsU0FBQUE7Z0JBQ0UsSUFBTUMsV0FBV0MseUJBQWMsRUFDekJDLFdBQVcsSUFBSSxDQUFDQyxpQkFBaUIsQ0FBQ0g7Z0JBRXhDLE9BQU9FO1lBQ1Q7OztZQUVBRSxLQUFBQTttQkFBQUEsU0FBQUE7Z0JBQ0UsSUFBTUosV0FBV0sseUJBQWMsRUFDekJDLFdBQVcsSUFBSSxDQUFDSCxpQkFBaUIsQ0FBQ0g7Z0JBRXhDLE9BQU9NO1lBQ1Q7OztZQUVBQyxLQUFBQTttQkFBQUEsU0FBQUE7Z0JBQ0UsSUFBSUM7Z0JBRUosSUFBSSxDQUFDQyxhQUFhLENBQUMsU0FBQ0M7b0JBQ2xCLElBQU1DLHdCQUF3QkQsVUFBVUUsY0FBYztvQkFFdEQsSUFBSUQsdUJBQXVCO3dCQUN6QixJQUFNRSxlQUFlSCxXQUNmSSxVQUFVRCxhQUFhRSxVQUFVO3dCQUV2Q1AsbUJBQW1CTSxTQUFTLEdBQUc7d0JBRS9CLE9BQU87b0JBQ1Q7Z0JBQ0Y7Z0JBRUEsT0FBT047WUFDVDs7OztZQUVPUSxLQUFBQTttQkFBUCxTQUFPQSwyQ0FBMkNoQixRQUFRLEVBQUVpQixVQUFVLEVBQUVDLE9BQU8sRUFBRUMsVUFBVTtnQkFBSSxPQUFPQyxvQkFBZSxDQUFDSiwwQ0FBMEMsQ0FsQzdJbEIsa0JBa0NnS0UsVUFBVWlCLFlBQVlDLFNBQVNDO1lBQWE7OztXQWxDNU1yQjtFQUF5QnNCLG9CQUFlIn0=
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "occam-verify-cli",
|
|
3
3
|
"author": "James Smith",
|
|
4
|
-
"version": "1.0.
|
|
4
|
+
"version": "1.0.278",
|
|
5
5
|
"license": "MIT, Anti-996",
|
|
6
6
|
"homepage": "https://github.com/djalbat/occam-verify-cli",
|
|
7
7
|
"description": "Occam's Verifier",
|
|
@@ -12,11 +12,11 @@
|
|
|
12
12
|
"dependencies": {
|
|
13
13
|
"argumentative": "^2.0.32",
|
|
14
14
|
"necessary": "^15.0.1",
|
|
15
|
-
"occam-custom-grammars": "^5.0.
|
|
16
|
-
"occam-entities": "^1.0.
|
|
17
|
-
"occam-file-system": "^6.0.
|
|
18
|
-
"occam-furtle": "^2.0.
|
|
19
|
-
"occam-grammars": "^1.3.
|
|
15
|
+
"occam-custom-grammars": "^5.0.1255",
|
|
16
|
+
"occam-entities": "^1.0.393",
|
|
17
|
+
"occam-file-system": "^6.0.408",
|
|
18
|
+
"occam-furtle": "^2.0.209",
|
|
19
|
+
"occam-grammars": "^1.3.337",
|
|
20
20
|
"occam-lexers": "^23.1.3",
|
|
21
21
|
"occam-parsers": "^23.1.5",
|
|
22
22
|
"occam-query": "^4.1.110"
|
package/src/node/metavariable.js
CHANGED
|
@@ -2,40 +2,23 @@
|
|
|
2
2
|
|
|
3
3
|
import NonTerminalNode from "../node/nonTerminal";
|
|
4
4
|
|
|
5
|
-
import {
|
|
5
|
+
import { TERM_RULE_NAME, TYPE_RULE_NAME } from "../ruleNames";
|
|
6
6
|
|
|
7
7
|
export default class MetavariableNode extends NonTerminalNode {
|
|
8
8
|
getTermNode() {
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
const argumentNode = this.getArgumentNode();
|
|
12
|
-
|
|
13
|
-
if (argumentNode !== null) {
|
|
14
|
-
termNode = argumentNode.getTermNode();
|
|
15
|
-
}
|
|
9
|
+
const ruleName = TERM_RULE_NAME,
|
|
10
|
+
termNode = this.getNodeByRuleName(ruleName);
|
|
16
11
|
|
|
17
12
|
return termNode;
|
|
18
13
|
}
|
|
19
14
|
|
|
20
15
|
getTypeNode() {
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
const argumentNode = this.getArgumentNode();
|
|
24
|
-
|
|
25
|
-
if (argumentNode !== null) {
|
|
26
|
-
typeNode = argumentNode.getTypeNode();
|
|
27
|
-
}
|
|
16
|
+
const ruleName = TYPE_RULE_NAME,
|
|
17
|
+
typeNode = this.getNodeByRuleName(ruleName);
|
|
28
18
|
|
|
29
19
|
return typeNode;
|
|
30
20
|
}
|
|
31
21
|
|
|
32
|
-
getArgumentNode() {
|
|
33
|
-
const ruleName = ARGUMENT_RULE_NAME,
|
|
34
|
-
argumentNode = this.getNodeByRuleName(ruleName);
|
|
35
|
-
|
|
36
|
-
return argumentNode;
|
|
37
|
-
}
|
|
38
|
-
|
|
39
22
|
getMetavariableName() {
|
|
40
23
|
let metaVariableName;
|
|
41
24
|
|