occam-verify-cli 0.0.704 → 0.0.705
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/verifier/node/termAsConstructor.js +15 -7
- package/lib/verifier/nodes/statement.js +33 -42
- package/lib/verifier/nodes/term.js +40 -49
- package/package.json +5 -5
- package/src/verifier/node/termAsConstructor.js +4 -5
- package/src/verifier/nodes/statement.js +29 -36
- package/src/verifier/nodes/term.js +42 -49
|
@@ -2,15 +2,23 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", {
|
|
3
3
|
value: true
|
|
4
4
|
});
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
5
|
+
function _export(target, all) {
|
|
6
|
+
for(var name in all)Object.defineProperty(target, name, {
|
|
7
|
+
enumerable: true,
|
|
8
|
+
get: all[name]
|
|
9
|
+
});
|
|
10
|
+
}
|
|
11
|
+
_export(exports, {
|
|
12
|
+
default: function() {
|
|
8
13
|
return _default;
|
|
14
|
+
},
|
|
15
|
+
verifyArgument: function() {
|
|
16
|
+
return verifyArgument;
|
|
9
17
|
}
|
|
10
18
|
});
|
|
11
19
|
var _node = /*#__PURE__*/ _interop_require_default(require("../../verifier/node"));
|
|
12
|
-
var _givenType = /*#__PURE__*/ _interop_require_default(require("../../verify/givenType"));
|
|
13
20
|
var _query = require("../../utilities/query");
|
|
21
|
+
var _type = require("../../verify/type");
|
|
14
22
|
var _term = require("../../verify/term");
|
|
15
23
|
var _ruleNames = require("../../ruleNames");
|
|
16
24
|
function _assert_this_initialized(self) {
|
|
@@ -173,8 +181,8 @@ function verifyArgument(argumentNode, fileContext, verifyAhead) {
|
|
|
173
181
|
fileContext.trace("Verifying the '".concat(argumentString, "' argument..."), argumentNode);
|
|
174
182
|
var typeNode = typeNodeQuery(argumentNode), termNode = termNodeQuery(argumentNode);
|
|
175
183
|
if (typeNode !== null) {
|
|
176
|
-
var
|
|
177
|
-
argumentVerified =
|
|
184
|
+
var standaloneTypeVerified = (0, _type.verifyStandaloneType)(typeNode, fileContext, verifyAhead);
|
|
185
|
+
argumentVerified = standaloneTypeVerified; ///
|
|
178
186
|
}
|
|
179
187
|
if (termNode !== null) {
|
|
180
188
|
var standaloneTermVerified = (0, _term.verifyStandaloneTerm)(termNode, fileContext, verifyAhead);
|
|
@@ -186,4 +194,4 @@ function verifyArgument(argumentNode, fileContext, verifyAhead) {
|
|
|
186
194
|
return argumentVerified;
|
|
187
195
|
}
|
|
188
196
|
|
|
189
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
197
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy92ZXJpZmllci9ub2RlL3Rlcm1Bc0NvbnN0cnVjdG9yLmpzIl0sInNvdXJjZXNDb250ZW50IjpbIlwidXNlIHN0cmljdFwiO1xuXG5pbXBvcnQgTm9kZVZlcmlmaWVyIGZyb20gXCIuLi8uLi92ZXJpZmllci9ub2RlXCI7XG5cbmltcG9ydCB7IG5vZGVRdWVyeSB9IGZyb20gXCIuLi8uLi91dGlsaXRpZXMvcXVlcnlcIjtcbmltcG9ydCB7IHZlcmlmeVN0YW5kYWxvbmVUeXBlIH0gZnJvbSBcIi4uLy4uL3ZlcmlmeS90eXBlXCI7XG5pbXBvcnQgeyB2ZXJpZnlTdGFuZGFsb25lVGVybSB9IGZyb20gXCIuLi8uLi92ZXJpZnkvdGVybVwiO1xuaW1wb3J0IHsgVEVSTV9SVUxFX05BTUUsIEFSR1VNRU5UX1JVTEVfTkFNRSB9IGZyb20gXCIuLi8uLi9ydWxlTmFtZXNcIjtcblxuY29uc3QgdHlwZU5vZGVRdWVyeSA9IG5vZGVRdWVyeShcIi9hcmd1bWVudC90eXBlXCIpLFxuICAgICAgdGVybU5vZGVRdWVyeSA9IG5vZGVRdWVyeShcIi9hcmd1bWVudC90ZXJtXCIpO1xuXG5jbGFzcyBUZXJtQXNDb25zdHJ1Y3Rvck5vZGVWZXJpZmllciBleHRlbmRzIE5vZGVWZXJpZmllciB7XG4gIHZlcmlmeU5vblRlcm1pbmFsTm9kZShub25UZXJtaW5hbE5vZGUsIGZpbGVDb250ZXh0LCB2ZXJpZnlBaGVhZCkge1xuICAgIGxldCBub25UZXJtaW5hbE5vZGVWZXJpZmllZDtcblxuICAgIGNvbnN0IHJ1bGVOYW1lID0gbm9uVGVybWluYWxOb2RlLmdldFJ1bGVOYW1lKCk7XG5cbiAgICBzd2l0Y2ggKHJ1bGVOYW1lKSB7XG4gICAgICBjYXNlIFRFUk1fUlVMRV9OQU1FOiB7XG4gICAgICAgIGNvbnN0IHRlcm1Ob2RlID0gbm9uVGVybWluYWxOb2RlLCAvLy9cbiAgICAgICAgICAgICAgc3RhbmRhbG9uZVRlcm1WZXJpZmllZCA9IHZlcmlmeVN0YW5kYWxvbmVUZXJtKHRlcm1Ob2RlLCBmaWxlQ29udGV4dCwgdmVyaWZ5QWhlYWQpLFxuICAgICAgICAgICAgICB0ZXJtTm9kZVZlcmlmaWVkID0gc3RhbmRhbG9uZVRlcm1WZXJpZmllZDsgIC8vL1xuXG4gICAgICAgIG5vblRlcm1pbmFsTm9kZVZlcmlmaWVkID0gdGVybU5vZGVWZXJpZmllZDsgLy8vXG5cbiAgICAgICAgYnJlYWs7XG4gICAgICB9XG5cbiAgICAgIGNhc2UgQVJHVU1FTlRfUlVMRV9OQU1FOiB7XG4gICAgICAgIGNvbnN0IGFyZ3VtZW50Tm9kZSA9IG5vblRlcm1pbmFsTm9kZSwgLy8vXG4gICAgICAgICAgICAgIGFyZ3VtZW50VmVyaWZpZWQgPSB2ZXJpZnlBcmd1bWVudChhcmd1bWVudE5vZGUsIGZpbGVDb250ZXh0LCB2ZXJpZnlBaGVhZCksXG4gICAgICAgICAgICAgIGFyZ3VtZW50Tm9kZVZlcmlmaWVkID0gYXJndW1lbnRWZXJpZmllZDsgIC8vL1xuXG4gICAgICAgIG5vblRlcm1pbmFsTm9kZVZlcmlmaWVkID0gYXJndW1lbnROb2RlVmVyaWZpZWQ7IC8vL1xuXG4gICAgICAgIGJyZWFrO1xuICAgICAgfVxuXG4gICAgICBkZWZhdWx0OiB7XG4gICAgICAgIG5vblRlcm1pbmFsTm9kZVZlcmlmaWVkID0gc3VwZXIudmVyaWZ5Tm9uVGVybWluYWxOb2RlKG5vblRlcm1pbmFsTm9kZSwgZmlsZUNvbnRleHQsIHZlcmlmeUFoZWFkKTtcblxuICAgICAgICBicmVhaztcbiAgICAgIH1cbiAgICB9XG5cbiAgICByZXR1cm4gbm9uVGVybWluYWxOb2RlVmVyaWZpZWQ7XG4gIH1cbn1cblxuY29uc3QgdGVybUFzQ29uc3RydWN0b3JOb2RlVmVyaWZpZXIgPSBuZXcgVGVybUFzQ29uc3RydWN0b3JOb2RlVmVyaWZpZXIoKTtcblxuZXhwb3J0IGRlZmF1bHQgdGVybUFzQ29uc3RydWN0b3JOb2RlVmVyaWZpZXI7XG5cbmV4cG9ydCBmdW5jdGlvbiB2ZXJpZnlBcmd1bWVudChhcmd1bWVudE5vZGUsIGZpbGVDb250ZXh0LCB2ZXJpZnlBaGVhZCkge1xuICBsZXQgYXJndW1lbnRWZXJpZmllZDtcblxuICBjb25zdCBhcmd1bWVudFN0cmluZyA9IGZpbGVDb250ZXh0Lm5vZGVBc1N0cmluZyhhcmd1bWVudE5vZGUpO1xuXG4gIGZpbGVDb250ZXh0LnRyYWNlKGBWZXJpZnlpbmcgdGhlICcke2FyZ3VtZW50U3RyaW5nfScgYXJndW1lbnQuLi5gLCBhcmd1bWVudE5vZGUpO1xuXG4gIGNvbnN0IHR5cGVOb2RlID0gdHlwZU5vZGVRdWVyeShhcmd1bWVudE5vZGUpLFxuICAgICAgICB0ZXJtTm9kZSA9IHRlcm1Ob2RlUXVlcnkoYXJndW1lbnROb2RlKTtcblxuICBpZiAodHlwZU5vZGUgIT09IG51bGwpIHtcbiAgICBjb25zdCBzdGFuZGFsb25lVHlwZVZlcmlmaWVkID0gdmVyaWZ5U3RhbmRhbG9uZVR5cGUodHlwZU5vZGUsIGZpbGVDb250ZXh0LCB2ZXJpZnlBaGVhZCk7XG5cbiAgICBhcmd1bWVudFZlcmlmaWVkID0gc3RhbmRhbG9uZVR5cGVWZXJpZmllZDsgLy8vXG4gIH1cblxuICBpZiAodGVybU5vZGUgIT09IG51bGwpIHtcbiAgICBjb25zdCBzdGFuZGFsb25lVGVybVZlcmlmaWVkID0gdmVyaWZ5U3RhbmRhbG9uZVRlcm0odGVybU5vZGUsIGZpbGVDb250ZXh0LCB2ZXJpZnlBaGVhZCk7XG5cbiAgICBhcmd1bWVudFZlcmlmaWVkID0gc3RhbmRhbG9uZVRlcm1WZXJpZmllZDsgIC8vL1xuICB9XG5cbiAgaWYgKGFyZ3VtZW50VmVyaWZpZWQpIHtcbiAgICBmaWxlQ29udGV4dC5kZWJ1ZyhgLi4udmVyaWZpZWQgdGhlICcke2FyZ3VtZW50U3RyaW5nfScgYXJndW1lbnQuYCwgYXJndW1lbnROb2RlKTtcbiAgfVxuXG4gIHJldHVybiBhcmd1bWVudFZlcmlmaWVkO1xufVxuIl0sIm5hbWVzIjpbInZlcmlmeUFyZ3VtZW50IiwidHlwZU5vZGVRdWVyeSIsIm5vZGVRdWVyeSIsInRlcm1Ob2RlUXVlcnkiLCJUZXJtQXNDb25zdHJ1Y3Rvck5vZGVWZXJpZmllciIsInZlcmlmeU5vblRlcm1pbmFsTm9kZSIsIm5vblRlcm1pbmFsTm9kZSIsImZpbGVDb250ZXh0IiwidmVyaWZ5QWhlYWQiLCJub25UZXJtaW5hbE5vZGVWZXJpZmllZCIsInJ1bGVOYW1lIiwiZ2V0UnVsZU5hbWUiLCJURVJNX1JVTEVfTkFNRSIsInRlcm1Ob2RlIiwic3RhbmRhbG9uZVRlcm1WZXJpZmllZCIsInZlcmlmeVN0YW5kYWxvbmVUZXJtIiwidGVybU5vZGVWZXJpZmllZCIsIkFSR1VNRU5UX1JVTEVfTkFNRSIsImFyZ3VtZW50Tm9kZSIsImFyZ3VtZW50VmVyaWZpZWQiLCJhcmd1bWVudE5vZGVWZXJpZmllZCIsIk5vZGVWZXJpZmllciIsInRlcm1Bc0NvbnN0cnVjdG9yTm9kZVZlcmlmaWVyIiwiYXJndW1lbnRTdHJpbmciLCJub2RlQXNTdHJpbmciLCJ0cmFjZSIsInR5cGVOb2RlIiwic3RhbmRhbG9uZVR5cGVWZXJpZmllZCIsInZlcmlmeVN0YW5kYWxvbmVUeXBlIiwiZGVidWciXSwibWFwcGluZ3MiOiJBQUFBOzs7Ozs7Ozs7OztJQW9EQSxPQUE2QztlQUE3Qzs7SUFFZ0JBLGNBQWM7ZUFBZEE7OzsyREFwRFM7cUJBRUM7b0JBQ1c7b0JBQ0E7eUJBQ2M7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUVuRCxJQUFNQyxnQkFBZ0JDLElBQUFBLGdCQUFTLEVBQUMsbUJBQzFCQyxnQkFBZ0JELElBQUFBLGdCQUFTLEVBQUM7QUFFaEMsSUFBQSxBQUFNRSw4Q0FBRCxBQUFMO2NBQU1BOytCQUFBQTthQUFBQTtnQ0FBQUE7OztrQkFBQUE7O1lBQ0pDLEtBQUFBO21CQUFBQSxTQUFBQSxzQkFBc0JDLGVBQWUsRUFBRUMsV0FBVyxFQUFFQyxXQUFXO2dCQUM3RCxJQUFJQztnQkFFSixJQUFNQyxXQUFXSixnQkFBZ0JLLFdBQVc7Z0JBRTVDLE9BQVFEO29CQUNOLEtBQUtFLHlCQUFjO3dCQUFFOzRCQUNuQixJQUFNQyxXQUFXUCxpQkFDWFEseUJBQXlCQyxJQUFBQSwwQkFBb0IsRUFBQ0YsVUFBVU4sYUFBYUMsY0FDckVRLG1CQUFtQkYsd0JBQXlCLEdBQUc7NEJBRXJETCwwQkFBMEJPLGtCQUFrQixHQUFHOzRCQUUvQzt3QkFDRjtvQkFFQSxLQUFLQyw2QkFBa0I7d0JBQUU7NEJBQ3ZCLElBQU1DLGVBQWVaLGlCQUNmYSxtQkFBbUJuQixlQUFla0IsY0FBY1gsYUFBYUMsY0FDN0RZLHVCQUF1QkQsa0JBQW1CLEdBQUc7NEJBRW5EViwwQkFBMEJXLHNCQUFzQixHQUFHOzRCQUVuRDt3QkFDRjtvQkFFQTt3QkFBUzs0QkFDUFgsMEJBQTBCLHVCQTVCNUJMLDBDQTRCa0NDLHlCQUFOLElBQUssYUFBdUJDLGlCQUFpQkMsYUFBYUM7NEJBRXBGO3dCQUNGO2dCQUNGO2dCQUVBLE9BQU9DO1lBQ1Q7OztXQW5DSUw7RUFBc0NpQixhQUFZO0FBc0N4RCxJQUFNQyxnQ0FBZ0MsSUFBSWxCO0lBRTFDLFdBQWVrQjtBQUVSLFNBQVN0QixlQUFla0IsWUFBWSxFQUFFWCxXQUFXLEVBQUVDLFdBQVc7SUFDbkUsSUFBSVc7SUFFSixJQUFNSSxpQkFBaUJoQixZQUFZaUIsWUFBWSxDQUFDTjtJQUVoRFgsWUFBWWtCLEtBQUssQ0FBQyxBQUFDLGtCQUFnQyxPQUFmRixnQkFBZSxrQkFBZ0JMO0lBRW5FLElBQU1RLFdBQVd6QixjQUFjaUIsZUFDekJMLFdBQVdWLGNBQWNlO0lBRS9CLElBQUlRLGFBQWEsTUFBTTtRQUNyQixJQUFNQyx5QkFBeUJDLElBQUFBLDBCQUFvQixFQUFDRixVQUFVbkIsYUFBYUM7UUFFM0VXLG1CQUFtQlEsd0JBQXdCLEdBQUc7SUFDaEQ7SUFFQSxJQUFJZCxhQUFhLE1BQU07UUFDckIsSUFBTUMseUJBQXlCQyxJQUFBQSwwQkFBb0IsRUFBQ0YsVUFBVU4sYUFBYUM7UUFFM0VXLG1CQUFtQkwsd0JBQXlCLEdBQUc7SUFDakQ7SUFFQSxJQUFJSyxrQkFBa0I7UUFDcEJaLFlBQVlzQixLQUFLLENBQUMsQUFBQyxvQkFBa0MsT0FBZk4sZ0JBQWUsZ0JBQWNMO0lBQ3JFO0lBRUEsT0FBT0M7QUFDVCJ9
|
|
@@ -2,23 +2,15 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", {
|
|
3
3
|
value: true
|
|
4
4
|
});
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
get: all[name]
|
|
9
|
-
});
|
|
10
|
-
}
|
|
11
|
-
_export(exports, {
|
|
12
|
-
default: function() {
|
|
5
|
+
Object.defineProperty(exports, "default", {
|
|
6
|
+
enumerable: true,
|
|
7
|
+
get: function() {
|
|
13
8
|
return _default;
|
|
14
|
-
},
|
|
15
|
-
verifyMetaargument: function() {
|
|
16
|
-
return verifyMetaargument;
|
|
17
9
|
}
|
|
18
10
|
});
|
|
19
11
|
var _nodes = /*#__PURE__*/ _interop_require_default(require("../../verifier/nodes"));
|
|
12
|
+
var _term = /*#__PURE__*/ _interop_require_default(require("../../verifier/nodes/term"));
|
|
20
13
|
var _query = require("../../utilities/query");
|
|
21
|
-
var _term = require("../../verifier/nodes/term");
|
|
22
14
|
var _metaTypes = require("../../metaTypes");
|
|
23
15
|
var _ruleNames = require("../../ruleNames");
|
|
24
16
|
function _assert_this_initialized(self) {
|
|
@@ -153,13 +145,13 @@ var StatementNodesVerifier = /*#__PURE__*/ function(NodesVerifier) {
|
|
|
153
145
|
switch(ruleName){
|
|
154
146
|
case _ruleNames.ARGUMENT_RULE_NAME:
|
|
155
147
|
{
|
|
156
|
-
var argumentNode = nonTerminalNode, constructorArgumentNode = combinatorNonTerminalNode,
|
|
157
|
-
nonTerminalNodeVerified =
|
|
148
|
+
var argumentNode = nonTerminalNode, constructorArgumentNode = combinatorNonTerminalNode, argumentNodeVerified = _term.default.verifyArgumentNode(argumentNode, constructorArgumentNode, context, verifyAhead);
|
|
149
|
+
nonTerminalNodeVerified = argumentNodeVerified; ///
|
|
158
150
|
break;
|
|
159
151
|
}
|
|
160
152
|
case _ruleNames.META_ARGUMENT_RULE_NAME:
|
|
161
153
|
{
|
|
162
|
-
var metaArgumentNode = nonTerminalNode, combinatorMetaargumentNode = combinatorNonTerminalNode,
|
|
154
|
+
var metaArgumentNode = nonTerminalNode, combinatorMetaargumentNode = combinatorNonTerminalNode, metaArgumentNodeVerified = this.verifyMetaargumentNode(metaArgumentNode, combinatorMetaargumentNode, context, verifyAhead);
|
|
163
155
|
nonTerminalNodeVerified = metaArgumentNodeVerified; ///
|
|
164
156
|
break;
|
|
165
157
|
}
|
|
@@ -172,37 +164,36 @@ var StatementNodesVerifier = /*#__PURE__*/ function(NodesVerifier) {
|
|
|
172
164
|
}
|
|
173
165
|
return nonTerminalNodeVerified;
|
|
174
166
|
}
|
|
167
|
+
},
|
|
168
|
+
{
|
|
169
|
+
key: "verifyMetaargumentNode",
|
|
170
|
+
value: function verifyMetaargumentNode(metaArgumentNode, combinatorMetaargumentNode, context, verifyAhead) {
|
|
171
|
+
var metaArgumentNodeVerified = false;
|
|
172
|
+
var metaArgumentString = context.nodeAsString(metaArgumentNode);
|
|
173
|
+
var statementNode = statementNodeQuery(metaArgumentNode), combinatorMetaTYpeNode = metaTypeNodeQuery(combinatorMetaargumentNode);
|
|
174
|
+
if (statementNode === null) {
|
|
175
|
+
context.debug("Expected a statement but got a '".concat(metaArgumentString, "' meta-type."), metaArgumentNode);
|
|
176
|
+
} else {
|
|
177
|
+
if (combinatorMetaTYpeNode === null) {
|
|
178
|
+
var combinatorMetaargumentString = context.nodeAsString(combinatorMetaargumentNode);
|
|
179
|
+
context.debug("Expected a meta-type but got a '".concat(combinatorMetaargumentString, "' statement."), metaArgumentNode);
|
|
180
|
+
} else {
|
|
181
|
+
var combinatorMetaTypeTerminalNode = metaTypeTerminalNodeQuery(combinatorMetaTYpeNode), content = combinatorMetaTypeTerminalNode.getContent(), contentStatementMetaType = content === _metaTypes.STATEMENT_META_TYPE;
|
|
182
|
+
if (!contentStatementMetaType) {
|
|
183
|
+
context.debug("Expected the meta-type of the combinator to be '".concat(_metaTypes.STATEMENT_META_TYPE, "' but got '").concat(content, "' instead."), metaArgumentNode);
|
|
184
|
+
} else {
|
|
185
|
+
var verifiedAhead = verifyAhead();
|
|
186
|
+
metaArgumentNodeVerified = verifiedAhead; ///
|
|
187
|
+
}
|
|
188
|
+
}
|
|
189
|
+
}
|
|
190
|
+
return metaArgumentNodeVerified;
|
|
191
|
+
}
|
|
175
192
|
}
|
|
176
193
|
]);
|
|
177
194
|
return StatementNodesVerifier;
|
|
178
195
|
}(_nodes.default);
|
|
179
196
|
var statementNodesVerifier = new StatementNodesVerifier();
|
|
180
197
|
var _default = statementNodesVerifier;
|
|
181
|
-
function verifyMetaargument(metaArgumentNode, combinatorMetaargumentNode, context, verifyAhead) {
|
|
182
|
-
var metaArgumentVerified = false;
|
|
183
|
-
var metaArgumentString = context.nodeAsString(metaArgumentNode);
|
|
184
|
-
context.trace("Verifying the '".concat(metaArgumentString, "' metaargument..."), metaArgumentNode);
|
|
185
|
-
var statementNode = statementNodeQuery(metaArgumentNode), combinatorMetaTYpeNode = metaTypeNodeQuery(combinatorMetaargumentNode);
|
|
186
|
-
if (statementNode === null) {
|
|
187
|
-
context.debug("Expected a statement but got a '".concat(metaArgumentString, "' meta-type."), metaArgumentNode);
|
|
188
|
-
} else {
|
|
189
|
-
if (combinatorMetaTYpeNode === null) {
|
|
190
|
-
var combinatorMetaargumentString = context.nodeAsString(combinatorMetaargumentNode);
|
|
191
|
-
context.debug("Expected a meta-type but got a '".concat(combinatorMetaargumentString, "' statement."), metaArgumentNode);
|
|
192
|
-
} else {
|
|
193
|
-
var combinatorMetaTypeTerminalNode = metaTypeTerminalNodeQuery(combinatorMetaTYpeNode), content = combinatorMetaTypeTerminalNode.getContent(), contentStatementMetaType = content === _metaTypes.STATEMENT_META_TYPE;
|
|
194
|
-
if (!contentStatementMetaType) {
|
|
195
|
-
context.debug("Expected the meta-type of the combinator to be '".concat(_metaTypes.STATEMENT_META_TYPE, "' but got '").concat(content, "' instead."), metaArgumentNode);
|
|
196
|
-
} else {
|
|
197
|
-
var verifiedAhead = verifyAhead();
|
|
198
|
-
metaArgumentVerified = verifiedAhead; ///
|
|
199
|
-
}
|
|
200
|
-
}
|
|
201
|
-
}
|
|
202
|
-
if (metaArgumentVerified) {
|
|
203
|
-
context.debug("...verified the '".concat(metaArgumentString, "' metaargument."), metaArgumentNode);
|
|
204
|
-
}
|
|
205
|
-
return metaArgumentVerified;
|
|
206
|
-
}
|
|
207
198
|
|
|
208
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
199
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../../src/verifier/nodes/statement.js"],"sourcesContent":["\"use strict\";\n\nimport NodesVerifier from \"../../verifier/nodes\";\nimport termNodesVerifier from \"../../verifier/nodes/term\";\n\nimport { nodeQuery } from \"../../utilities/query\";\nimport { STATEMENT_META_TYPE } from \"../../metaTypes\";\nimport { ARGUMENT_RULE_NAME, META_ARGUMENT_RULE_NAME } from \"../../ruleNames\";\n\nconst metaTypeNodeQuery = nodeQuery(\"/metaArgument/metaType!\"),\n      statementNodeQuery = nodeQuery(\"/metaArgument/statement!\"),\n      metaTypeTerminalNodeQuery = nodeQuery(\"/metaType/@meta-type\");\n\nclass StatementNodesVerifier extends NodesVerifier {\n  verifyNonTerminalNode(nonTerminalNodeA, nonTerminalNodeB, context, verifyAhead) {\n    let nonTerminalNodeVerified = false;\n\n    const nonTerminalNode = nonTerminalNodeA, ///\n          combinatorNonTerminalNode = nonTerminalNodeB; ///\n\n    const ruleName = nonTerminalNode.getRuleName(), ///\n          combinatorRuleName = combinatorNonTerminalNode.getRuleName(); ///\n\n    if (ruleName === combinatorRuleName) {\n      switch (ruleName) {\n        case ARGUMENT_RULE_NAME: {\n          const argumentNode = nonTerminalNode, ///\n                constructorArgumentNode = combinatorNonTerminalNode, ///\n                argumentNodeVerified = termNodesVerifier.verifyArgumentNode(argumentNode, constructorArgumentNode, context, verifyAhead);\n\n          nonTerminalNodeVerified = argumentNodeVerified; ///\n\n          break;\n        }\n\n        case META_ARGUMENT_RULE_NAME: {\n          const metaArgumentNode = nonTerminalNode, ///\n                combinatorMetaargumentNode = combinatorNonTerminalNode, ///\n                metaArgumentNodeVerified = this.verifyMetaargumentNode(metaArgumentNode, combinatorMetaargumentNode, context, verifyAhead);\n\n          nonTerminalNodeVerified = metaArgumentNodeVerified; ///\n\n          break;\n        }\n\n        default: {\n          nonTerminalNodeVerified = super.verifyNonTerminalNode(nonTerminalNodeA, nonTerminalNodeB, context, verifyAhead);\n\n          break;\n        }\n      }\n    }\n\n    return nonTerminalNodeVerified;\n  }\n\n  verifyMetaargumentNode(metaArgumentNode, combinatorMetaargumentNode, context, verifyAhead) {\n    let metaArgumentNodeVerified = false;\n\n    const metaArgumentString = context.nodeAsString(metaArgumentNode);\n\n    const statementNode = statementNodeQuery(metaArgumentNode),\n          combinatorMetaTYpeNode = metaTypeNodeQuery(combinatorMetaargumentNode);\n\n    if (statementNode === null) {\n      context.debug(`Expected a statement but got a '${metaArgumentString}' meta-type.`, metaArgumentNode);\n    } else {\n      if (combinatorMetaTYpeNode === null) {\n        const combinatorMetaargumentString = context.nodeAsString(combinatorMetaargumentNode);\n\n        context.debug(`Expected a meta-type but got a '${combinatorMetaargumentString}' statement.`, metaArgumentNode);\n      } else {\n        const combinatorMetaTypeTerminalNode = metaTypeTerminalNodeQuery(combinatorMetaTYpeNode),\n              content = combinatorMetaTypeTerminalNode.getContent(),\n              contentStatementMetaType = (content === STATEMENT_META_TYPE);\n\n        if (!contentStatementMetaType) {\n          context.debug(`Expected the meta-type of the combinator to be '${STATEMENT_META_TYPE}' but got '${content}' instead.`, metaArgumentNode);\n        } else {\n          const verifiedAhead = verifyAhead();\n\n          metaArgumentNodeVerified = verifiedAhead; ///\n        }\n      }\n    }\n\n    return metaArgumentNodeVerified;\n  }\n}\n\nconst statementNodesVerifier = new StatementNodesVerifier();\n\nexport default statementNodesVerifier;\n"],"names":["metaTypeNodeQuery","nodeQuery","statementNodeQuery","metaTypeTerminalNodeQuery","StatementNodesVerifier","verifyNonTerminalNode","nonTerminalNodeA","nonTerminalNodeB","context","verifyAhead","nonTerminalNodeVerified","nonTerminalNode","combinatorNonTerminalNode","ruleName","getRuleName","combinatorRuleName","ARGUMENT_RULE_NAME","argumentNode","constructorArgumentNode","argumentNodeVerified","termNodesVerifier","verifyArgumentNode","META_ARGUMENT_RULE_NAME","metaArgumentNode","combinatorMetaargumentNode","metaArgumentNodeVerified","verifyMetaargumentNode","metaArgumentString","nodeAsString","statementNode","combinatorMetaTYpeNode","debug","combinatorMetaargumentString","combinatorMetaTypeTerminalNode","content","getContent","contentStatementMetaType","STATEMENT_META_TYPE","verifiedAhead","NodesVerifier","statementNodesVerifier"],"mappings":"AAAA;;;;+BA4FA;;;eAAA;;;4DA1F0B;2DACI;qBAEJ;yBACU;yBACwB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAE5D,IAAMA,oBAAoBC,IAAAA,gBAAS,EAAC,4BAC9BC,qBAAqBD,IAAAA,gBAAS,EAAC,6BAC/BE,4BAA4BF,IAAAA,gBAAS,EAAC;AAE5C,IAAA,AAAMG,uCAAD,AAAL;cAAMA;+BAAAA;aAAAA;gCAAAA;;;kBAAAA;;YACJC,KAAAA;mBAAAA,SAAAA,sBAAsBC,gBAAgB,EAAEC,gBAAgB,EAAEC,OAAO,EAAEC,WAAW;gBAC5E,IAAIC,0BAA0B;gBAE9B,IAAMC,kBAAkBL,kBAClBM,4BAA4BL,kBAAkB,GAAG;gBAEvD,IAAMM,WAAWF,gBAAgBG,WAAW,IACtCC,qBAAqBH,0BAA0BE,WAAW,IAAI,GAAG;gBAEvE,IAAID,aAAaE,oBAAoB;oBACnC,OAAQF;wBACN,KAAKG,6BAAkB;4BAAE;gCACvB,IAAMC,eAAeN,iBACfO,0BAA0BN,2BAC1BO,uBAAuBC,aAAiB,CAACC,kBAAkB,CAACJ,cAAcC,yBAAyBV,SAASC;gCAElHC,0BAA0BS,sBAAsB,GAAG;gCAEnD;4BACF;wBAEA,KAAKG,kCAAuB;4BAAE;gCAC5B,IAAMC,mBAAmBZ,iBACnBa,6BAA6BZ,2BAC7Ba,2BAA2B,IAAI,CAACC,sBAAsB,CAACH,kBAAkBC,4BAA4BhB,SAASC;gCAEpHC,0BAA0Be,0BAA0B,GAAG;gCAEvD;4BACF;wBAEA;4BAAS;gCACPf,0BAA0B,uBAjC9BN,mCAiCoCC,yBAAN,IAAK,aAAuBC,kBAAkBC,kBAAkBC,SAASC;gCAEnG;4BACF;oBACF;gBACF;gBAEA,OAAOC;YACT;;;YAEAgB,KAAAA;mBAAAA,SAAAA,uBAAuBH,gBAAgB,EAAEC,0BAA0B,EAAEhB,OAAO,EAAEC,WAAW;gBACvF,IAAIgB,2BAA2B;gBAE/B,IAAME,qBAAqBnB,QAAQoB,YAAY,CAACL;gBAEhD,IAAMM,gBAAgB3B,mBAAmBqB,mBACnCO,yBAAyB9B,kBAAkBwB;gBAEjD,IAAIK,kBAAkB,MAAM;oBAC1BrB,QAAQuB,KAAK,CAAC,AAAC,mCAAqD,OAAnBJ,oBAAmB,iBAAeJ;gBACrF,OAAO;oBACL,IAAIO,2BAA2B,MAAM;wBACnC,IAAME,+BAA+BxB,QAAQoB,YAAY,CAACJ;wBAE1DhB,QAAQuB,KAAK,CAAC,AAAC,mCAA+D,OAA7BC,8BAA6B,iBAAeT;oBAC/F,OAAO;wBACL,IAAMU,iCAAiC9B,0BAA0B2B,yBAC3DI,UAAUD,+BAA+BE,UAAU,IACnDC,2BAA4BF,YAAYG,8BAAmB;wBAEjE,IAAI,CAACD,0BAA0B;4BAC7B5B,QAAQuB,KAAK,CAAC,AAAC,mDAAmFG,OAAjCG,8BAAmB,EAAC,eAAqB,OAARH,SAAQ,eAAaX;wBACzH,OAAO;4BACL,IAAMe,gBAAgB7B;4BAEtBgB,2BAA2Ba,eAAe,GAAG;wBAC/C;oBACF;gBACF;gBAEA,OAAOb;YACT;;;WA1EIrB;EAA+BmC,cAAa;AA6ElD,IAAMC,yBAAyB,IAAIpC;IAEnC,WAAeoC"}
|
|
@@ -2,18 +2,10 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", {
|
|
3
3
|
value: true
|
|
4
4
|
});
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
get: all[name]
|
|
9
|
-
});
|
|
10
|
-
}
|
|
11
|
-
_export(exports, {
|
|
12
|
-
default: function() {
|
|
5
|
+
Object.defineProperty(exports, "default", {
|
|
6
|
+
enumerable: true,
|
|
7
|
+
get: function() {
|
|
13
8
|
return _default;
|
|
14
|
-
},
|
|
15
|
-
verifyArgument: function() {
|
|
16
|
-
return verifyArgument;
|
|
17
9
|
}
|
|
18
10
|
});
|
|
19
11
|
var _nodes = /*#__PURE__*/ _interop_require_default(require("../../verifier/nodes"));
|
|
@@ -151,7 +143,7 @@ var TermNodesVerifier = /*#__PURE__*/ function(NodesVerifier) {
|
|
|
151
143
|
switch(ruleName){
|
|
152
144
|
case _ruleNames.ARGUMENT_RULE_NAME:
|
|
153
145
|
{
|
|
154
|
-
var argumentNode = nonTerminalNode, constructorArgumentNode = constructorNonTerminalNode,
|
|
146
|
+
var argumentNode = nonTerminalNode, constructorArgumentNode = constructorNonTerminalNode, argumentNodeVerified = this.verifyArgumentNode(argumentNode, constructorArgumentNode, context, verifyAhead);
|
|
155
147
|
nonTerminalNodeVerified = argumentNodeVerified; ///
|
|
156
148
|
break;
|
|
157
149
|
}
|
|
@@ -164,47 +156,46 @@ var TermNodesVerifier = /*#__PURE__*/ function(NodesVerifier) {
|
|
|
164
156
|
}
|
|
165
157
|
return nonTerminalNodeVerified;
|
|
166
158
|
}
|
|
159
|
+
},
|
|
160
|
+
{
|
|
161
|
+
key: "verifyArgumentNode",
|
|
162
|
+
value: function verifyArgumentNode(argumentNode, constructorArgumentNode, context, verifyAhead) {
|
|
163
|
+
var argumentNodeVerified = false;
|
|
164
|
+
var argumentString = context.nodeAsString(argumentNode);
|
|
165
|
+
var typeNode = typeNodeQuery(argumentNode);
|
|
166
|
+
if (typeNode !== null) {
|
|
167
|
+
context.debug("The '".concat(argumentString, "' argument should be a term, not a type."), argumentNode);
|
|
168
|
+
} else {
|
|
169
|
+
var termNode = termNodeQuery(argumentNode);
|
|
170
|
+
if (!argumentNodeVerified) {
|
|
171
|
+
var constructorTermNode = termNodeQuery(constructorArgumentNode);
|
|
172
|
+
if (constructorTermNode !== null) {
|
|
173
|
+
var node = termNode, constructorNode = constructorTermNode, nodeVerified = this.verifyNode(node, constructorNode, context, verifyAhead);
|
|
174
|
+
argumentNodeVerified = nodeVerified; ///
|
|
175
|
+
}
|
|
176
|
+
}
|
|
177
|
+
if (!argumentNodeVerified) {
|
|
178
|
+
var constructorTypeNode = typeNodeQuery(constructorArgumentNode);
|
|
179
|
+
if (constructorTypeNode !== null) {
|
|
180
|
+
var verifyTerm = termNodesVerifier.verifyTerm, terms = [], termVerified = verifyTerm(termNode, terms, context, function() {
|
|
181
|
+
var verifiedAhead = false;
|
|
182
|
+
var constructorTypeName = (0, _query.typeNameFromTypeNode)(constructorTypeNode), firstTerm = (0, _array.first)(terms), term = firstTerm, termType = term.getType(), constructorType = context.findTypeByTypeName(constructorTypeName), termTypeEqualToOrSubTypeOfType = termType.isEqualToOrSubTypeOf(constructorType);
|
|
183
|
+
if (termTypeEqualToOrSubTypeOfType) {
|
|
184
|
+
verifiedAhead = verifyAhead();
|
|
185
|
+
}
|
|
186
|
+
return verifiedAhead;
|
|
187
|
+
});
|
|
188
|
+
argumentNodeVerified = termVerified; ///
|
|
189
|
+
}
|
|
190
|
+
}
|
|
191
|
+
}
|
|
192
|
+
return argumentNodeVerified;
|
|
193
|
+
}
|
|
167
194
|
}
|
|
168
195
|
]);
|
|
169
196
|
return TermNodesVerifier;
|
|
170
197
|
}(_nodes.default);
|
|
171
198
|
var termNodesVerifier = new TermNodesVerifier();
|
|
172
199
|
var _default = termNodesVerifier;
|
|
173
|
-
function verifyArgument(argumentNode, constructorArgumentNode, context, verifyAhead) {
|
|
174
|
-
var argumentVerified = false;
|
|
175
|
-
var argumentString = context.nodeAsString(argumentNode);
|
|
176
|
-
context.trace("Verifying the '".concat(argumentString, "' argument..."), argumentNode);
|
|
177
|
-
var typeNode = typeNodeQuery(argumentNode);
|
|
178
|
-
if (typeNode !== null) {
|
|
179
|
-
context.debug("The '".concat(argumentString, "' argument should be a term, not a type."), argumentNode);
|
|
180
|
-
} else {
|
|
181
|
-
var termNode = termNodeQuery(argumentNode);
|
|
182
|
-
if (!argumentVerified) {
|
|
183
|
-
var constructorTermNode = termNodeQuery(constructorArgumentNode);
|
|
184
|
-
if (constructorTermNode !== null) {
|
|
185
|
-
var node = termNode, constructorNode = constructorTermNode, nodeVerified = this.verifyNode(node, constructorNode, context, verifyAhead);
|
|
186
|
-
argumentVerified = nodeVerified; ///
|
|
187
|
-
}
|
|
188
|
-
}
|
|
189
|
-
if (!argumentVerified) {
|
|
190
|
-
var constructorTypeNode = typeNodeQuery(constructorArgumentNode);
|
|
191
|
-
if (constructorTypeNode !== null) {
|
|
192
|
-
var verifyTerm = termNodesVerifier.verifyTerm, terms = [], termVerified = verifyTerm(termNode, terms, context, function() {
|
|
193
|
-
var verifiedAhead = false;
|
|
194
|
-
var constructorTypeName = (0, _query.typeNameFromTypeNode)(constructorTypeNode), firstTerm = (0, _array.first)(terms), term = firstTerm, termType = term.getType(), constructorType = context.findTypeByTypeName(constructorTypeName), termTypeEqualToOrSubTypeOfType = termType.isEqualToOrSubTypeOf(constructorType);
|
|
195
|
-
if (termTypeEqualToOrSubTypeOfType) {
|
|
196
|
-
verifiedAhead = verifyAhead();
|
|
197
|
-
}
|
|
198
|
-
return verifiedAhead;
|
|
199
|
-
});
|
|
200
|
-
argumentVerified = termVerified; ///
|
|
201
|
-
}
|
|
202
|
-
}
|
|
203
|
-
}
|
|
204
|
-
if (argumentVerified) {
|
|
205
|
-
context.debug("...verified the '".concat(argumentString, "' argument."), argumentNode);
|
|
206
|
-
}
|
|
207
|
-
return argumentVerified;
|
|
208
|
-
}
|
|
209
200
|
|
|
210
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
201
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../../src/verifier/nodes/term.js"],"sourcesContent":["\"use strict\";\n\nimport NodesVerifier from \"../../verifier/nodes\";\n\nimport { first } from \"../../utilities/array\";\nimport { ARGUMENT_RULE_NAME } from \"../../ruleNames\";\nimport { nodeQuery, typeNameFromTypeNode } from \"../../utilities/query\";\n\nconst termNodeQuery = nodeQuery(\"/argument/term!\"),\n      typeNodeQuery = nodeQuery(\"/argument/type!\");\n\nclass TermNodesVerifier extends NodesVerifier {\n  verifyNonTerminalNode(nonTerminalNode, constructorNonTerminalNode, context, verifyAhead) {\n    let nonTerminalNodeVerified = false;\n\n    const ruleName = nonTerminalNode.getRuleName(), ///\n          constructorRuleName = constructorNonTerminalNode.getRuleName(); ///\n\n    if (ruleName === constructorRuleName) {\n      switch (ruleName) {\n        case ARGUMENT_RULE_NAME: {\n          const argumentNode = nonTerminalNode, ///\n                constructorArgumentNode = constructorNonTerminalNode, ///\n                argumentNodeVerified = this.verifyArgumentNode(argumentNode, constructorArgumentNode, context, verifyAhead);\n\n          nonTerminalNodeVerified = argumentNodeVerified; ///\n\n          break;\n        }\n\n        default: {\n          nonTerminalNodeVerified = super.verifyNonTerminalNode(nonTerminalNode, constructorNonTerminalNode, context, verifyAhead);\n\n          break;\n        }\n      }\n    }\n\n    return nonTerminalNodeVerified;\n  }\n\n  verifyArgumentNode(argumentNode, constructorArgumentNode, context, verifyAhead) {\n    let argumentNodeVerified = false;\n\n    const argumentString = context.nodeAsString(argumentNode);\n\n    const typeNode = typeNodeQuery(argumentNode);\n\n    if (typeNode !== null) {\n      context.debug(`The '${argumentString}' argument should be a term, not a type.`, argumentNode);\n    } else {\n      const termNode = termNodeQuery(argumentNode);\n\n      if (!argumentNodeVerified) {\n        const constructorTermNode = termNodeQuery(constructorArgumentNode);\n\n        if (constructorTermNode !== null) {\n          const node = termNode,  ///\n                constructorNode = constructorTermNode,  ///\n                nodeVerified = this.verifyNode(node, constructorNode, context, verifyAhead);\n\n          argumentNodeVerified = nodeVerified;  ///\n        }\n      }\n\n      if (!argumentNodeVerified) {\n        const constructorTypeNode = typeNodeQuery(constructorArgumentNode);\n\n        if (constructorTypeNode !== null) {\n          const { verifyTerm } = termNodesVerifier,\n                terms = [],\n                termVerified = verifyTerm(termNode, terms, context, () => {\n                  let verifiedAhead = false;\n\n                  const constructorTypeName = typeNameFromTypeNode(constructorTypeNode),\n                        firstTerm = first(terms),\n                        term = firstTerm, ///\n                        termType = term.getType(),\n                        constructorType = context.findTypeByTypeName(constructorTypeName),\n                        termTypeEqualToOrSubTypeOfType = termType.isEqualToOrSubTypeOf(constructorType);\n\n                  if (termTypeEqualToOrSubTypeOfType) {\n                    verifiedAhead = verifyAhead();\n                  }\n\n                  return verifiedAhead;\n                });\n\n          argumentNodeVerified = termVerified;  ///\n        }\n      }\n    }\n\n    return argumentNodeVerified;\n  }\n}\n\nconst termNodesVerifier = new TermNodesVerifier();\n\nexport default termNodesVerifier;\n"],"names":["termNodeQuery","nodeQuery","typeNodeQuery","TermNodesVerifier","verifyNonTerminalNode","nonTerminalNode","constructorNonTerminalNode","context","verifyAhead","nonTerminalNodeVerified","ruleName","getRuleName","constructorRuleName","ARGUMENT_RULE_NAME","argumentNode","constructorArgumentNode","argumentNodeVerified","verifyArgumentNode","argumentString","nodeAsString","typeNode","debug","termNode","constructorTermNode","node","constructorNode","nodeVerified","verifyNode","constructorTypeNode","verifyTerm","termNodesVerifier","terms","termVerified","verifiedAhead","constructorTypeName","typeNameFromTypeNode","firstTerm","first","term","termType","getType","constructorType","findTypeByTypeName","termTypeEqualToOrSubTypeOfType","isEqualToOrSubTypeOf","NodesVerifier"],"mappings":"AAAA;;;;+BAmGA;;;eAAA;;;4DAjG0B;qBAEJ;yBACa;qBACa;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEhD,IAAMA,gBAAgBC,IAAAA,gBAAS,EAAC,oBAC1BC,gBAAgBD,IAAAA,gBAAS,EAAC;AAEhC,IAAA,AAAME,kCAAD,AAAL;cAAMA;+BAAAA;aAAAA;gCAAAA;;;kBAAAA;;YACJC,KAAAA;mBAAAA,SAAAA,sBAAsBC,eAAe,EAAEC,0BAA0B,EAAEC,OAAO,EAAEC,WAAW;gBACrF,IAAIC,0BAA0B;gBAE9B,IAAMC,WAAWL,gBAAgBM,WAAW,IACtCC,sBAAsBN,2BAA2BK,WAAW,IAAI,GAAG;gBAEzE,IAAID,aAAaE,qBAAqB;oBACpC,OAAQF;wBACN,KAAKG,6BAAkB;4BAAE;gCACvB,IAAMC,eAAeT,iBACfU,0BAA0BT,4BAC1BU,uBAAuB,IAAI,CAACC,kBAAkB,CAACH,cAAcC,yBAAyBR,SAASC;gCAErGC,0BAA0BO,sBAAsB,GAAG;gCAEnD;4BACF;wBAEA;4BAAS;gCACPP,0BAA0B,uBApB9BN,8BAoBoCC,yBAAN,IAAK,aAAuBC,iBAAiBC,4BAA4BC,SAASC;gCAE5G;4BACF;oBACF;gBACF;gBAEA,OAAOC;YACT;;;YAEAQ,KAAAA;mBAAAA,SAAAA,mBAAmBH,YAAY,EAAEC,uBAAuB,EAAER,OAAO,EAAEC,WAAW;gBAC5E,IAAIQ,uBAAuB;gBAE3B,IAAME,iBAAiBX,QAAQY,YAAY,CAACL;gBAE5C,IAAMM,WAAWlB,cAAcY;gBAE/B,IAAIM,aAAa,MAAM;oBACrBb,QAAQc,KAAK,CAAC,AAAC,QAAsB,OAAfH,gBAAe,6CAA2CJ;gBAClF,OAAO;oBACL,IAAMQ,WAAWtB,cAAcc;oBAE/B,IAAI,CAACE,sBAAsB;wBACzB,IAAMO,sBAAsBvB,cAAce;wBAE1C,IAAIQ,wBAAwB,MAAM;4BAChC,IAAMC,OAAOF,UACPG,kBAAkBF,qBAClBG,eAAe,IAAI,CAACC,UAAU,CAACH,MAAMC,iBAAiBlB,SAASC;4BAErEQ,uBAAuBU,cAAe,GAAG;wBAC3C;oBACF;oBAEA,IAAI,CAACV,sBAAsB;wBACzB,IAAMY,sBAAsB1B,cAAca;wBAE1C,IAAIa,wBAAwB,MAAM;4BAChC,IAAM,AAAEC,aAAeC,kBAAfD,YACFE,QAAQ,EAAE,EACVC,eAAeH,WAAWP,UAAUS,OAAOxB,SAAS;gCAClD,IAAI0B,gBAAgB;gCAEpB,IAAMC,sBAAsBC,IAAAA,2BAAoB,EAACP,sBAC3CQ,YAAYC,IAAAA,YAAK,EAACN,QAClBO,OAAOF,WACPG,WAAWD,KAAKE,OAAO,IACvBC,kBAAkBlC,QAAQmC,kBAAkB,CAACR,sBAC7CS,iCAAiCJ,SAASK,oBAAoB,CAACH;gCAErE,IAAIE,gCAAgC;oCAClCV,gBAAgBzB;gCAClB;gCAEA,OAAOyB;4BACT;4BAENjB,uBAAuBgB,cAAe,GAAG;wBAC3C;oBACF;gBACF;gBAEA,OAAOhB;YACT;;;WAnFIb;EAA0B0C,cAAa;AAsF7C,IAAMf,oBAAoB,IAAI3B;IAE9B,WAAe2B"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "occam-verify-cli",
|
|
3
3
|
"author": "James Smith",
|
|
4
|
-
"version": "0.0.
|
|
4
|
+
"version": "0.0.705",
|
|
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.21",
|
|
14
14
|
"necessary": "^13.1.4",
|
|
15
|
-
"occam-custom-grammars": "^5.0.
|
|
15
|
+
"occam-custom-grammars": "^5.0.567",
|
|
16
16
|
"occam-dom": "^3.1.91",
|
|
17
|
-
"occam-entities": "^1.0.
|
|
18
|
-
"occam-file-system": "^6.0.
|
|
19
|
-
"occam-grammar-utilities": "^8.0.
|
|
17
|
+
"occam-entities": "^1.0.31",
|
|
18
|
+
"occam-file-system": "^6.0.78",
|
|
19
|
+
"occam-grammar-utilities": "^8.0.77"
|
|
20
20
|
},
|
|
21
21
|
"devDependencies": {
|
|
22
22
|
"@swc/core": "^1.2.51",
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
3
|
import NodeVerifier from "../../verifier/node";
|
|
4
|
-
import verifyGivenType from "../../verify/givenType";
|
|
5
4
|
|
|
6
5
|
import { nodeQuery } from "../../utilities/query";
|
|
6
|
+
import { verifyStandaloneType } from "../../verify/type";
|
|
7
7
|
import { verifyStandaloneTerm } from "../../verify/term";
|
|
8
8
|
import { TERM_RULE_NAME, ARGUMENT_RULE_NAME } from "../../ruleNames";
|
|
9
9
|
|
|
@@ -52,7 +52,7 @@ const termAsConstructorNodeVerifier = new TermAsConstructorNodeVerifier();
|
|
|
52
52
|
|
|
53
53
|
export default termAsConstructorNodeVerifier;
|
|
54
54
|
|
|
55
|
-
function verifyArgument(argumentNode, fileContext, verifyAhead) {
|
|
55
|
+
export function verifyArgument(argumentNode, fileContext, verifyAhead) {
|
|
56
56
|
let argumentVerified;
|
|
57
57
|
|
|
58
58
|
const argumentString = fileContext.nodeAsString(argumentNode);
|
|
@@ -63,10 +63,9 @@ function verifyArgument(argumentNode, fileContext, verifyAhead) {
|
|
|
63
63
|
termNode = termNodeQuery(argumentNode);
|
|
64
64
|
|
|
65
65
|
if (typeNode !== null) {
|
|
66
|
-
const
|
|
67
|
-
givenTypeVerified = verifyGivenType(typeNode, types, fileContext, verifyAhead);
|
|
66
|
+
const standaloneTypeVerified = verifyStandaloneType(typeNode, fileContext, verifyAhead);
|
|
68
67
|
|
|
69
|
-
argumentVerified =
|
|
68
|
+
argumentVerified = standaloneTypeVerified; ///
|
|
70
69
|
}
|
|
71
70
|
|
|
72
71
|
if (termNode !== null) {
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
3
|
import NodesVerifier from "../../verifier/nodes";
|
|
4
|
+
import termNodesVerifier from "../../verifier/nodes/term";
|
|
4
5
|
|
|
5
6
|
import { nodeQuery } from "../../utilities/query";
|
|
6
|
-
import { verifyArgument } from "../../verifier/nodes/term";
|
|
7
7
|
import { STATEMENT_META_TYPE } from "../../metaTypes";
|
|
8
8
|
import { ARGUMENT_RULE_NAME, META_ARGUMENT_RULE_NAME } from "../../ruleNames";
|
|
9
9
|
|
|
@@ -26,9 +26,9 @@ class StatementNodesVerifier extends NodesVerifier {
|
|
|
26
26
|
case ARGUMENT_RULE_NAME: {
|
|
27
27
|
const argumentNode = nonTerminalNode, ///
|
|
28
28
|
constructorArgumentNode = combinatorNonTerminalNode, ///
|
|
29
|
-
|
|
29
|
+
argumentNodeVerified = termNodesVerifier.verifyArgumentNode(argumentNode, constructorArgumentNode, context, verifyAhead);
|
|
30
30
|
|
|
31
|
-
nonTerminalNodeVerified =
|
|
31
|
+
nonTerminalNodeVerified = argumentNodeVerified; ///
|
|
32
32
|
|
|
33
33
|
break;
|
|
34
34
|
}
|
|
@@ -36,8 +36,7 @@ class StatementNodesVerifier extends NodesVerifier {
|
|
|
36
36
|
case META_ARGUMENT_RULE_NAME: {
|
|
37
37
|
const metaArgumentNode = nonTerminalNode, ///
|
|
38
38
|
combinatorMetaargumentNode = combinatorNonTerminalNode, ///
|
|
39
|
-
|
|
40
|
-
metaArgumentNodeVerified = metaArgumentVerified; ///
|
|
39
|
+
metaArgumentNodeVerified = this.verifyMetaargumentNode(metaArgumentNode, combinatorMetaargumentNode, context, verifyAhead);
|
|
41
40
|
|
|
42
41
|
nonTerminalNodeVerified = metaArgumentNodeVerified; ///
|
|
43
42
|
|
|
@@ -54,47 +53,41 @@ class StatementNodesVerifier extends NodesVerifier {
|
|
|
54
53
|
|
|
55
54
|
return nonTerminalNodeVerified;
|
|
56
55
|
}
|
|
57
|
-
}
|
|
58
|
-
|
|
59
|
-
const statementNodesVerifier = new StatementNodesVerifier();
|
|
60
|
-
|
|
61
|
-
export default statementNodesVerifier;
|
|
62
|
-
|
|
63
|
-
export function verifyMetaargument(metaArgumentNode, combinatorMetaargumentNode, context, verifyAhead) {
|
|
64
|
-
let metaArgumentVerified = false;
|
|
65
56
|
|
|
66
|
-
|
|
57
|
+
verifyMetaargumentNode(metaArgumentNode, combinatorMetaargumentNode, context, verifyAhead) {
|
|
58
|
+
let metaArgumentNodeVerified = false;
|
|
67
59
|
|
|
68
|
-
|
|
60
|
+
const metaArgumentString = context.nodeAsString(metaArgumentNode);
|
|
69
61
|
|
|
70
|
-
|
|
71
|
-
|
|
62
|
+
const statementNode = statementNodeQuery(metaArgumentNode),
|
|
63
|
+
combinatorMetaTYpeNode = metaTypeNodeQuery(combinatorMetaargumentNode);
|
|
72
64
|
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
} else {
|
|
76
|
-
if (combinatorMetaTYpeNode === null) {
|
|
77
|
-
const combinatorMetaargumentString = context.nodeAsString(combinatorMetaargumentNode);
|
|
78
|
-
|
|
79
|
-
context.debug(`Expected a meta-type but got a '${combinatorMetaargumentString}' statement.`, metaArgumentNode);
|
|
65
|
+
if (statementNode === null) {
|
|
66
|
+
context.debug(`Expected a statement but got a '${metaArgumentString}' meta-type.`, metaArgumentNode);
|
|
80
67
|
} else {
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
contentStatementMetaType = (content === STATEMENT_META_TYPE);
|
|
68
|
+
if (combinatorMetaTYpeNode === null) {
|
|
69
|
+
const combinatorMetaargumentString = context.nodeAsString(combinatorMetaargumentNode);
|
|
84
70
|
|
|
85
|
-
|
|
86
|
-
context.debug(`Expected the meta-type of the combinator to be '${STATEMENT_META_TYPE}' but got '${content}' instead.`, metaArgumentNode);
|
|
71
|
+
context.debug(`Expected a meta-type but got a '${combinatorMetaargumentString}' statement.`, metaArgumentNode);
|
|
87
72
|
} else {
|
|
88
|
-
const
|
|
73
|
+
const combinatorMetaTypeTerminalNode = metaTypeTerminalNodeQuery(combinatorMetaTYpeNode),
|
|
74
|
+
content = combinatorMetaTypeTerminalNode.getContent(),
|
|
75
|
+
contentStatementMetaType = (content === STATEMENT_META_TYPE);
|
|
76
|
+
|
|
77
|
+
if (!contentStatementMetaType) {
|
|
78
|
+
context.debug(`Expected the meta-type of the combinator to be '${STATEMENT_META_TYPE}' but got '${content}' instead.`, metaArgumentNode);
|
|
79
|
+
} else {
|
|
80
|
+
const verifiedAhead = verifyAhead();
|
|
89
81
|
|
|
90
|
-
|
|
82
|
+
metaArgumentNodeVerified = verifiedAhead; ///
|
|
83
|
+
}
|
|
91
84
|
}
|
|
92
85
|
}
|
|
93
|
-
}
|
|
94
86
|
|
|
95
|
-
|
|
96
|
-
context.debug(`...verified the '${metaArgumentString}' metaargument.`, metaArgumentNode);
|
|
87
|
+
return metaArgumentNodeVerified;
|
|
97
88
|
}
|
|
98
|
-
|
|
99
|
-
return metaArgumentVerified;
|
|
100
89
|
}
|
|
90
|
+
|
|
91
|
+
const statementNodesVerifier = new StatementNodesVerifier();
|
|
92
|
+
|
|
93
|
+
export default statementNodesVerifier;
|
|
@@ -21,8 +21,7 @@ class TermNodesVerifier extends NodesVerifier {
|
|
|
21
21
|
case ARGUMENT_RULE_NAME: {
|
|
22
22
|
const argumentNode = nonTerminalNode, ///
|
|
23
23
|
constructorArgumentNode = constructorNonTerminalNode, ///
|
|
24
|
-
|
|
25
|
-
argumentNodeVerified = argumentVerified; ///
|
|
24
|
+
argumentNodeVerified = this.verifyArgumentNode(argumentNode, constructorArgumentNode, context, verifyAhead);
|
|
26
25
|
|
|
27
26
|
nonTerminalNodeVerified = argumentNodeVerified; ///
|
|
28
27
|
|
|
@@ -39,69 +38,63 @@ class TermNodesVerifier extends NodesVerifier {
|
|
|
39
38
|
|
|
40
39
|
return nonTerminalNodeVerified;
|
|
41
40
|
}
|
|
42
|
-
}
|
|
43
|
-
|
|
44
|
-
const termNodesVerifier = new TermNodesVerifier();
|
|
45
|
-
|
|
46
|
-
export default termNodesVerifier;
|
|
47
|
-
|
|
48
|
-
export function verifyArgument(argumentNode, constructorArgumentNode, context, verifyAhead) {
|
|
49
|
-
let argumentVerified = false;
|
|
50
41
|
|
|
51
|
-
|
|
42
|
+
verifyArgumentNode(argumentNode, constructorArgumentNode, context, verifyAhead) {
|
|
43
|
+
let argumentNodeVerified = false;
|
|
52
44
|
|
|
53
|
-
|
|
45
|
+
const argumentString = context.nodeAsString(argumentNode);
|
|
54
46
|
|
|
55
|
-
|
|
47
|
+
const typeNode = typeNodeQuery(argumentNode);
|
|
56
48
|
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
49
|
+
if (typeNode !== null) {
|
|
50
|
+
context.debug(`The '${argumentString}' argument should be a term, not a type.`, argumentNode);
|
|
51
|
+
} else {
|
|
52
|
+
const termNode = termNodeQuery(argumentNode);
|
|
61
53
|
|
|
62
|
-
|
|
63
|
-
|
|
54
|
+
if (!argumentNodeVerified) {
|
|
55
|
+
const constructorTermNode = termNodeQuery(constructorArgumentNode);
|
|
64
56
|
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
57
|
+
if (constructorTermNode !== null) {
|
|
58
|
+
const node = termNode, ///
|
|
59
|
+
constructorNode = constructorTermNode, ///
|
|
60
|
+
nodeVerified = this.verifyNode(node, constructorNode, context, verifyAhead);
|
|
69
61
|
|
|
70
|
-
|
|
62
|
+
argumentNodeVerified = nodeVerified; ///
|
|
63
|
+
}
|
|
71
64
|
}
|
|
72
|
-
}
|
|
73
65
|
|
|
74
|
-
|
|
75
|
-
|
|
66
|
+
if (!argumentNodeVerified) {
|
|
67
|
+
const constructorTypeNode = typeNodeQuery(constructorArgumentNode);
|
|
76
68
|
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
69
|
+
if (constructorTypeNode !== null) {
|
|
70
|
+
const { verifyTerm } = termNodesVerifier,
|
|
71
|
+
terms = [],
|
|
72
|
+
termVerified = verifyTerm(termNode, terms, context, () => {
|
|
73
|
+
let verifiedAhead = false;
|
|
82
74
|
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
75
|
+
const constructorTypeName = typeNameFromTypeNode(constructorTypeNode),
|
|
76
|
+
firstTerm = first(terms),
|
|
77
|
+
term = firstTerm, ///
|
|
78
|
+
termType = term.getType(),
|
|
79
|
+
constructorType = context.findTypeByTypeName(constructorTypeName),
|
|
80
|
+
termTypeEqualToOrSubTypeOfType = termType.isEqualToOrSubTypeOf(constructorType);
|
|
89
81
|
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
82
|
+
if (termTypeEqualToOrSubTypeOfType) {
|
|
83
|
+
verifiedAhead = verifyAhead();
|
|
84
|
+
}
|
|
93
85
|
|
|
94
|
-
|
|
95
|
-
|
|
86
|
+
return verifiedAhead;
|
|
87
|
+
});
|
|
96
88
|
|
|
97
|
-
|
|
89
|
+
argumentNodeVerified = termVerified; ///
|
|
90
|
+
}
|
|
98
91
|
}
|
|
99
92
|
}
|
|
100
|
-
}
|
|
101
93
|
|
|
102
|
-
|
|
103
|
-
context.debug(`...verified the '${argumentString}' argument.`, argumentNode);
|
|
94
|
+
return argumentNodeVerified;
|
|
104
95
|
}
|
|
105
|
-
|
|
106
|
-
return argumentVerified;
|
|
107
96
|
}
|
|
97
|
+
|
|
98
|
+
const termNodesVerifier = new TermNodesVerifier();
|
|
99
|
+
|
|
100
|
+
export default termNodesVerifier;
|