occam-verify-cli 0.0.523 → 0.0.524
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/ruleNames.js +4 -4
- package/lib/utilities/string.js +3 -17
- package/package.json +1 -1
- package/src/ruleNames.js +1 -1
- package/src/utilities/string.js +11 -27
package/lib/ruleNames.js
CHANGED
|
@@ -48,8 +48,8 @@ _export(exports, {
|
|
|
48
48
|
UNQUALIFIED_STATEMENT_RULE_NAME: function() {
|
|
49
49
|
return UNQUALIFIED_STATEMENT_RULE_NAME;
|
|
50
50
|
},
|
|
51
|
-
|
|
52
|
-
return
|
|
51
|
+
CONSTRUCTOR_DECLARATIONRULE_NAME: function() {
|
|
52
|
+
return CONSTRUCTOR_DECLARATIONRULE_NAME;
|
|
53
53
|
},
|
|
54
54
|
QUALIFIED_METASTATEMENT_RULE_NAME: function() {
|
|
55
55
|
return QUALIFIED_METASTATEMENT_RULE_NAME;
|
|
@@ -71,8 +71,8 @@ var RULE_SUBPROOF_RULE_NAME = "ruleSubproof";
|
|
|
71
71
|
var META_ARGUMENT_RULE_NAME = "metaArgument";
|
|
72
72
|
var QUALIFIED_STATEMENT_RULE_NAME = "qualifiedStatement";
|
|
73
73
|
var UNQUALIFIED_STATEMENT_RULE_NAME = "unqualifiedStatement";
|
|
74
|
-
var
|
|
74
|
+
var CONSTRUCTOR_DECLARATIONRULE_NAME = "constructorDeclaration";
|
|
75
75
|
var QUALIFIED_METASTATEMENT_RULE_NAME = "qualifiedMetastatement";
|
|
76
76
|
var UNQUALIFIED_METASTATEMENT_RULE_NAME = "unqualifiedMetastatement";
|
|
77
77
|
|
|
78
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
78
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy9ydWxlTmFtZXMuanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmV4cG9ydCBjb25zdCBURVJNX1JVTEVfTkFNRSA9IFwidGVybVwiO1xuZXhwb3J0IGNvbnN0IFRZUEVfUlVMRV9OQU1FID0gXCJ0eXBlXCI7XG5leHBvcnQgY29uc3QgTEFCRUxfUlVMRV9OQU1FID0gXCJsYWJlbFwiO1xuZXhwb3J0IGNvbnN0IEFSR1VNRU5UX1JVTEVfTkFNRSA9IFwiYXJndW1lbnRcIjtcbmV4cG9ydCBjb25zdCBTVUJQUk9PRl9SVUxFX05BTUUgPSBcInN1YnByb29mXCI7XG5leHBvcnQgY29uc3QgVkFSSUFCTEVfUlVMRV9OQU1FID0gXCJ2YXJpYWJsZVwiO1xuZXhwb3J0IGNvbnN0IFNUQVRFTUVOVF9SVUxFX05BTUUgPSBcInN0YXRlbWVudFwiO1xuZXhwb3J0IGNvbnN0IE1FVEFWQVJJQUJMRV9SVUxFX05BTUUgPSBcIm1ldGF2YXJpYWJsZVwiO1xuZXhwb3J0IGNvbnN0IE1FVEFTVEFURU1FTlRfUlVMRV9OQU1FID0gXCJtZXRhc3RhdGVtZW50XCI7XG5leHBvcnQgY29uc3QgUlVMRV9TVUJQUk9PRl9SVUxFX05BTUUgPSBcInJ1bGVTdWJwcm9vZlwiO1xuZXhwb3J0IGNvbnN0IE1FVEFfQVJHVU1FTlRfUlVMRV9OQU1FID0gXCJtZXRhQXJndW1lbnRcIjtcbmV4cG9ydCBjb25zdCBRVUFMSUZJRURfU1RBVEVNRU5UX1JVTEVfTkFNRSA9IFwicXVhbGlmaWVkU3RhdGVtZW50XCI7XG5leHBvcnQgY29uc3QgVU5RVUFMSUZJRURfU1RBVEVNRU5UX1JVTEVfTkFNRSA9IFwidW5xdWFsaWZpZWRTdGF0ZW1lbnRcIjtcbmV4cG9ydCBjb25zdCBDT05TVFJVQ1RPUl9ERUNMQVJBVElPTlJVTEVfTkFNRSA9IFwiY29uc3RydWN0b3JEZWNsYXJhdGlvblwiO1xuZXhwb3J0IGNvbnN0IFFVQUxJRklFRF9NRVRBU1RBVEVNRU5UX1JVTEVfTkFNRSA9IFwicXVhbGlmaWVkTWV0YXN0YXRlbWVudFwiO1xuZXhwb3J0IGNvbnN0IFVOUVVBTElGSUVEX01FVEFTVEFURU1FTlRfUlVMRV9OQU1FID0gXCJ1bnF1YWxpZmllZE1ldGFzdGF0ZW1lbnRcIjtcbiJdLCJuYW1lcyI6WyJURVJNX1JVTEVfTkFNRSIsIlRZUEVfUlVMRV9OQU1FIiwiTEFCRUxfUlVMRV9OQU1FIiwiQVJHVU1FTlRfUlVMRV9OQU1FIiwiU1VCUFJPT0ZfUlVMRV9OQU1FIiwiVkFSSUFCTEVfUlVMRV9OQU1FIiwiU1RBVEVNRU5UX1JVTEVfTkFNRSIsIk1FVEFWQVJJQUJMRV9SVUxFX05BTUUiLCJNRVRBU1RBVEVNRU5UX1JVTEVfTkFNRSIsIlJVTEVfU1VCUFJPT0ZfUlVMRV9OQU1FIiwiTUVUQV9BUkdVTUVOVF9SVUxFX05BTUUiLCJRVUFMSUZJRURfU1RBVEVNRU5UX1JVTEVfTkFNRSIsIlVOUVVBTElGSUVEX1NUQVRFTUVOVF9SVUxFX05BTUUiLCJDT05TVFJVQ1RPUl9ERUNMQVJBVElPTlJVTEVfTkFNRSIsIlFVQUxJRklFRF9NRVRBU1RBVEVNRU5UX1JVTEVfTkFNRSIsIlVOUVVBTElGSUVEX01FVEFTVEFURU1FTlRfUlVMRV9OQU1FIl0sIm1hcHBpbmdzIjoiQUFBQTs7Ozs7Ozs7Ozs7SUFFYUEsY0FBYztlQUFkQTs7SUFDQUMsY0FBYztlQUFkQTs7SUFDQUMsZUFBZTtlQUFmQTs7SUFDQUMsa0JBQWtCO2VBQWxCQTs7SUFDQUMsa0JBQWtCO2VBQWxCQTs7SUFDQUMsa0JBQWtCO2VBQWxCQTs7SUFDQUMsbUJBQW1CO2VBQW5CQTs7SUFDQUMsc0JBQXNCO2VBQXRCQTs7SUFDQUMsdUJBQXVCO2VBQXZCQTs7SUFDQUMsdUJBQXVCO2VBQXZCQTs7SUFDQUMsdUJBQXVCO2VBQXZCQTs7SUFDQUMsNkJBQTZCO2VBQTdCQTs7SUFDQUMsK0JBQStCO2VBQS9CQTs7SUFDQUMsZ0NBQWdDO2VBQWhDQTs7SUFDQUMsaUNBQWlDO2VBQWpDQTs7SUFDQUMsbUNBQW1DO2VBQW5DQTs7O0FBZk4sSUFBTWYsaUJBQWlCO0FBQ3ZCLElBQU1DLGlCQUFpQjtBQUN2QixJQUFNQyxrQkFBa0I7QUFDeEIsSUFBTUMscUJBQXFCO0FBQzNCLElBQU1DLHFCQUFxQjtBQUMzQixJQUFNQyxxQkFBcUI7QUFDM0IsSUFBTUMsc0JBQXNCO0FBQzVCLElBQU1DLHlCQUF5QjtBQUMvQixJQUFNQywwQkFBMEI7QUFDaEMsSUFBTUMsMEJBQTBCO0FBQ2hDLElBQU1DLDBCQUEwQjtBQUNoQyxJQUFNQyxnQ0FBZ0M7QUFDdEMsSUFBTUMsa0NBQWtDO0FBQ3hDLElBQU1DLG1DQUFtQztBQUN6QyxJQUFNQyxvQ0FBb0M7QUFDMUMsSUFBTUMsc0NBQXNDIn0=
|
package/lib/utilities/string.js
CHANGED
|
@@ -26,18 +26,12 @@ _export(exports, {
|
|
|
26
26
|
},
|
|
27
27
|
metastatementNodeFromMetastatementString: function() {
|
|
28
28
|
return metastatementNodeFromMetastatementString;
|
|
29
|
-
},
|
|
30
|
-
unqualifiedStatementNodeFromUnqualifiedStatementString: function() {
|
|
31
|
-
return unqualifiedStatementNodeFromUnqualifiedStatementString;
|
|
32
|
-
},
|
|
33
|
-
conditionalIndicativeNodeFromConditionalIndicativeString: function() {
|
|
34
|
-
return conditionalIndicativeNodeFromConditionalIndicativeString;
|
|
35
29
|
}
|
|
36
30
|
});
|
|
37
31
|
var _constants = require("../constants");
|
|
38
32
|
var _query = require("../utilities/query");
|
|
39
33
|
var _ruleNames = require("../ruleNames");
|
|
40
|
-
var statementNodeQuery = (0, _query.nodeQuery)("/unqualifiedStatement/statement"), metastatementNodeQuery = (0, _query.nodeQuery)("/unqualifiedMetastatement/metastatement");
|
|
34
|
+
var termNodeQuery = (0, _query.nodeQuery)("/constructorDeclaration/term!"), statementNodeQuery = (0, _query.nodeQuery)("/unqualifiedStatement/statement!"), metastatementNodeQuery = (0, _query.nodeQuery)("/unqualifiedMetastatement/metastatement!");
|
|
41
35
|
function nodeAsString(node) {
|
|
42
36
|
var string = null;
|
|
43
37
|
if (node !== null) {
|
|
@@ -68,7 +62,7 @@ function nodesAsString(nodes) {
|
|
|
68
62
|
return string;
|
|
69
63
|
}
|
|
70
64
|
function termNodeFromTermString(termString, releaseContext) {
|
|
71
|
-
var ruleName = _ruleNames.
|
|
65
|
+
var ruleName = _ruleNames.CONSTRUCTOR_DECLARATIONRULE_NAME, content = "Constructor ".concat(termString, "\n"), node = releaseContext.nodeFromContentAndRuleName(content, ruleName), constructorDeclarationNode = node, termNode = termNodeQuery(constructorDeclarationNode);
|
|
72
66
|
return termNode;
|
|
73
67
|
}
|
|
74
68
|
function labelNodeFromLabelString(labelString, releaseContext) {
|
|
@@ -83,13 +77,5 @@ function metastatementNodeFromMetastatementString(metastatementString, releaseCo
|
|
|
83
77
|
var ruleName = _ruleNames.UNQUALIFIED_METASTATEMENT_RULE_NAME, content = "".concat(metastatementString, "\n"), node = releaseContext.nodeFromContentAndRuleName(content, ruleName), unqualifiedMetastatementNode = node, metastatementNode = metastatementNodeQuery(unqualifiedMetastatementNode);
|
|
84
78
|
return metastatementNode;
|
|
85
79
|
}
|
|
86
|
-
function unqualifiedStatementNodeFromUnqualifiedStatementString(unqualifiedStatementString, releaseContext) {
|
|
87
|
-
var ruleName = _ruleNames.UNQUALIFIED_STATEMENT_RULE_NAME, content = unqualifiedStatementString, node = releaseContext.nodeFromContentAndRuleName(content, ruleName), unqualifiedStatementNode = node; ///
|
|
88
|
-
return unqualifiedStatementNode;
|
|
89
|
-
}
|
|
90
|
-
function conditionalIndicativeNodeFromConditionalIndicativeString(conditionalIndicativeString, releaseContext) {
|
|
91
|
-
var ruleName = _ruleNames.CONDITIONAL_INDICATIVE_RULE_NAME, content = conditionalIndicativeString, node = releaseContext.nodeFromContentAndRuleName(content, ruleName), conditionalIndicativeNode = node; ///
|
|
92
|
-
return conditionalIndicativeNode;
|
|
93
|
-
}
|
|
94
80
|
|
|
95
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
81
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlsaXRpZXMvc3RyaW5nLmpzIl0sInNvdXJjZXNDb250ZW50IjpbIlwidXNlIHN0cmljdFwiO1xuXG5pbXBvcnQgeyBDT01NQSB9IGZyb20gXCIuLi9jb25zdGFudHNcIjtcbmltcG9ydCB7IG5vZGVRdWVyeSB9IGZyb20gXCIuLi91dGlsaXRpZXMvcXVlcnlcIjtcbmltcG9ydCB7IExBQkVMX1JVTEVfTkFNRSxcbiAgICAgICAgIFVOUVVBTElGSUVEX1NUQVRFTUVOVF9SVUxFX05BTUUsXG4gICAgICAgICBDT05TVFJVQ1RPUl9ERUNMQVJBVElPTlJVTEVfTkFNRSxcbiAgICAgICAgIFVOUVVBTElGSUVEX01FVEFTVEFURU1FTlRfUlVMRV9OQU1FIH0gZnJvbSBcIi4uL3J1bGVOYW1lc1wiO1xuXG5jb25zdCB0ZXJtTm9kZVF1ZXJ5ID0gbm9kZVF1ZXJ5KFwiL2NvbnN0cnVjdG9yRGVjbGFyYXRpb24vdGVybSFcIiksXG4gICAgICBzdGF0ZW1lbnROb2RlUXVlcnkgPSBub2RlUXVlcnkoXCIvdW5xdWFsaWZpZWRTdGF0ZW1lbnQvc3RhdGVtZW50IVwiKSxcbiAgICAgIG1ldGFzdGF0ZW1lbnROb2RlUXVlcnkgPSBub2RlUXVlcnkoXCIvdW5xdWFsaWZpZWRNZXRhc3RhdGVtZW50L21ldGFzdGF0ZW1lbnQhXCIpO1xuXG5leHBvcnQgZnVuY3Rpb24gbm9kZUFzU3RyaW5nKG5vZGUpIHtcbiAgbGV0IHN0cmluZyA9IG51bGw7XG5cbiAgaWYgKG5vZGUgIT09IG51bGwpIHtcbiAgICBjb25zdCBub2RlVGVybWluYWxOb2RlID0gbm9kZS5pc1Rlcm1pbmFsTm9kZSgpO1xuXG4gICAgaWYgKG5vZGVUZXJtaW5hbE5vZGUpIHtcbiAgICAgIGNvbnN0IHRlcm1pbmFsTm9kZSA9IG5vZGUsICAvLy9cbiAgICAgICAgICAgIGNvbnRlbnQgPSB0ZXJtaW5hbE5vZGUuZ2V0Q29udGVudCgpO1xuXG4gICAgICBzdHJpbmcgPSBjb250ZW50OyAvLy9cbiAgICB9IGVsc2Uge1xuICAgICAgY29uc3Qgbm9uVGVybWluYWxOb2RlID0gbm9kZSwgLy8vXG4gICAgICAgICAgICBjaGlsZE5vZGVzID0gbm9uVGVybWluYWxOb2RlLmdldENoaWxkTm9kZXMoKTtcblxuICAgICAgY2hpbGROb2Rlcy5mb3JFYWNoKChjaGlsZE5vZGUpID0+IHtcbiAgICAgICAgY29uc3Qgbm9kZVN0cmluZyA9IG5vZGVBc1N0cmluZyhjaGlsZE5vZGUpO1xuXG4gICAgICAgIHN0cmluZyA9IChzdHJpbmcgPT09IG51bGwpID9cbiAgICAgICAgICAgICAgICAgICBub2RlU3RyaW5nIDogLy8vXG4gICAgICAgICAgICAgICAgICAgIGAke3N0cmluZ30ke25vZGVTdHJpbmd9YDtcbiAgICAgIH0pO1xuICAgIH1cbiAgfVxuXG4gIHJldHVybiBzdHJpbmc7XG59XG5cbmV4cG9ydCBmdW5jdGlvbiBub2Rlc0FzU3RyaW5nKG5vZGVzKSB7XG4gIGNvbnN0IHN0cmluZyA9IG5vZGVzLnJlZHVjZSgoc3RyaW5nLCBub2RlKSA9PiB7XG4gICAgY29uc3Qgbm9kZVN0cmluZyA9IG5vZGVBc1N0cmluZyhub2RlKTtcblxuICAgIGlmIChzdHJpbmcgPT09IG51bGwpIHtcbiAgICAgIHN0cmluZyA9IG5vZGVTdHJpbmc7ICAvLy9cbiAgICB9IGVsc2Uge1xuICAgICAgc3RyaW5nID0gYCR7c3RyaW5nfSR7Q09NTUF9JHtub2RlU3RyaW5nfWA7XG4gICAgfVxuXG4gICAgcmV0dXJuIHN0cmluZztcbiAgfSwgbnVsbCk7XG5cbiAgcmV0dXJuIHN0cmluZztcbn1cblxuZXhwb3J0IGZ1bmN0aW9uIHRlcm1Ob2RlRnJvbVRlcm1TdHJpbmcodGVybVN0cmluZywgcmVsZWFzZUNvbnRleHQpIHtcbiAgY29uc3QgcnVsZU5hbWUgPSBDT05TVFJVQ1RPUl9ERUNMQVJBVElPTlJVTEVfTkFNRSxcbiAgICAgICAgY29udGVudCA9IGBDb25zdHJ1Y3RvciAke3Rlcm1TdHJpbmd9XG5gLFxuICAgICAgICBub2RlID0gcmVsZWFzZUNvbnRleHQubm9kZUZyb21Db250ZW50QW5kUnVsZU5hbWUoY29udGVudCwgcnVsZU5hbWUpLFxuICAgICAgICBjb25zdHJ1Y3RvckRlY2xhcmF0aW9uTm9kZSA9IG5vZGUsIC8vL1xuICAgICAgICB0ZXJtTm9kZSA9IHRlcm1Ob2RlUXVlcnkoY29uc3RydWN0b3JEZWNsYXJhdGlvbk5vZGUpO1xuXG4gIHJldHVybiB0ZXJtTm9kZTtcbn1cblxuZXhwb3J0IGZ1bmN0aW9uIGxhYmVsTm9kZUZyb21MYWJlbFN0cmluZyhsYWJlbFN0cmluZywgcmVsZWFzZUNvbnRleHQpIHtcbiAgY29uc3QgY29udGVudCA9IGxhYmVsU3RyaW5nLCAvLy9cbiAgICAgICAgcnVsZU5hbWUgPSBMQUJFTF9SVUxFX05BTUUsXG4gICAgICAgIG5vZGUgPSByZWxlYXNlQ29udGV4dC5ub2RlRnJvbUNvbnRlbnRBbmRSdWxlTmFtZShjb250ZW50LCBydWxlTmFtZSksXG4gICAgICAgIGxhYmVsTm9kZSA9IG5vZGU7IC8vL1xuXG4gIHJldHVybiBsYWJlbE5vZGU7XG59XG5cbmV4cG9ydCBmdW5jdGlvbiBzdGF0ZW1lbnROb2RlRnJvbVN0YXRlbWVudFN0cmluZyhzdGF0ZW1lbnRTdHJpbmcsIHJlbGVhc2VDb250ZXh0KSB7XG4gIGNvbnN0IHJ1bGVOYW1lID0gVU5RVUFMSUZJRURfU1RBVEVNRU5UX1JVTEVfTkFNRSxcbiAgICAgICAgY29udGVudCA9IGAke3N0YXRlbWVudFN0cmluZ31cbmAsXG4gICAgICAgIG5vZGUgPSByZWxlYXNlQ29udGV4dC5ub2RlRnJvbUNvbnRlbnRBbmRSdWxlTmFtZShjb250ZW50LCBydWxlTmFtZSksXG4gICAgICAgIHVucXVhbGlmaWVkU3RhdGVtZW50Tm9kZSA9IG5vZGUsICAvLy9cbiAgICAgICAgc3RhdGVtZW50Tm9kZSA9IHN0YXRlbWVudE5vZGVRdWVyeSh1bnF1YWxpZmllZFN0YXRlbWVudE5vZGUpO1xuXG4gIHJldHVybiBzdGF0ZW1lbnROb2RlO1xufVxuXG5leHBvcnQgZnVuY3Rpb24gbWV0YXN0YXRlbWVudE5vZGVGcm9tTWV0YXN0YXRlbWVudFN0cmluZyhtZXRhc3RhdGVtZW50U3RyaW5nLCByZWxlYXNlQ29udGV4dCkge1xuICBjb25zdCBydWxlTmFtZSA9IFVOUVVBTElGSUVEX01FVEFTVEFURU1FTlRfUlVMRV9OQU1FLFxuICAgICAgICBjb250ZW50ID0gYCR7bWV0YXN0YXRlbWVudFN0cmluZ31cbmAsXG4gICAgICAgIG5vZGUgPSByZWxlYXNlQ29udGV4dC5ub2RlRnJvbUNvbnRlbnRBbmRSdWxlTmFtZShjb250ZW50LCBydWxlTmFtZSksXG4gICAgICAgIHVucXVhbGlmaWVkTWV0YXN0YXRlbWVudE5vZGUgPSBub2RlLCAgLy8vXG4gICAgICAgIG1ldGFzdGF0ZW1lbnROb2RlID0gbWV0YXN0YXRlbWVudE5vZGVRdWVyeSh1bnF1YWxpZmllZE1ldGFzdGF0ZW1lbnROb2RlKTtcblxuICByZXR1cm4gbWV0YXN0YXRlbWVudE5vZGU7XG59XG4iXSwibmFtZXMiOlsibm9kZUFzU3RyaW5nIiwibm9kZXNBc1N0cmluZyIsInRlcm1Ob2RlRnJvbVRlcm1TdHJpbmciLCJsYWJlbE5vZGVGcm9tTGFiZWxTdHJpbmciLCJzdGF0ZW1lbnROb2RlRnJvbVN0YXRlbWVudFN0cmluZyIsIm1ldGFzdGF0ZW1lbnROb2RlRnJvbU1ldGFzdGF0ZW1lbnRTdHJpbmciLCJ0ZXJtTm9kZVF1ZXJ5Iiwibm9kZVF1ZXJ5Iiwic3RhdGVtZW50Tm9kZVF1ZXJ5IiwibWV0YXN0YXRlbWVudE5vZGVRdWVyeSIsIm5vZGUiLCJzdHJpbmciLCJub2RlVGVybWluYWxOb2RlIiwiaXNUZXJtaW5hbE5vZGUiLCJ0ZXJtaW5hbE5vZGUiLCJjb250ZW50IiwiZ2V0Q29udGVudCIsIm5vblRlcm1pbmFsTm9kZSIsImNoaWxkTm9kZXMiLCJnZXRDaGlsZE5vZGVzIiwiZm9yRWFjaCIsImNoaWxkTm9kZSIsIm5vZGVTdHJpbmciLCJub2RlcyIsInJlZHVjZSIsIkNPTU1BIiwidGVybVN0cmluZyIsInJlbGVhc2VDb250ZXh0IiwicnVsZU5hbWUiLCJDT05TVFJVQ1RPUl9ERUNMQVJBVElPTlJVTEVfTkFNRSIsIm5vZGVGcm9tQ29udGVudEFuZFJ1bGVOYW1lIiwiY29uc3RydWN0b3JEZWNsYXJhdGlvbk5vZGUiLCJ0ZXJtTm9kZSIsImxhYmVsU3RyaW5nIiwiTEFCRUxfUlVMRV9OQU1FIiwibGFiZWxOb2RlIiwic3RhdGVtZW50U3RyaW5nIiwiVU5RVUFMSUZJRURfU1RBVEVNRU5UX1JVTEVfTkFNRSIsInVucXVhbGlmaWVkU3RhdGVtZW50Tm9kZSIsInN0YXRlbWVudE5vZGUiLCJtZXRhc3RhdGVtZW50U3RyaW5nIiwiVU5RVUFMSUZJRURfTUVUQVNUQVRFTUVOVF9SVUxFX05BTUUiLCJ1bnF1YWxpZmllZE1ldGFzdGF0ZW1lbnROb2RlIiwibWV0YXN0YXRlbWVudE5vZGUiXSwibWFwcGluZ3MiOiJBQUFBOzs7Ozs7Ozs7OztJQWFnQkEsWUFBWTtlQUFaQTs7SUE0QkFDLGFBQWE7ZUFBYkE7O0lBZ0JBQyxzQkFBc0I7ZUFBdEJBOztJQVdBQyx3QkFBd0I7ZUFBeEJBOztJQVNBQyxnQ0FBZ0M7ZUFBaENBOztJQVdBQyx3Q0FBd0M7ZUFBeENBOzs7eUJBdEZNO3FCQUNJO3lCQUkwQjtBQUVwRCxJQUFNQyxnQkFBZ0JDLElBQUFBLGdCQUFTLEVBQUMsa0NBQzFCQyxxQkFBcUJELElBQUFBLGdCQUFTLEVBQUMscUNBQy9CRSx5QkFBeUJGLElBQUFBLGdCQUFTLEVBQUM7QUFFbEMsU0FBU1AsYUFBYVUsSUFBSSxFQUFFO0lBQ2pDLElBQUlDLFNBQVMsSUFBSTtJQUVqQixJQUFJRCxTQUFTLElBQUksRUFBRTtRQUNqQixJQUFNRSxtQkFBbUJGLEtBQUtHLGNBQWM7UUFFNUMsSUFBSUQsa0JBQWtCO1lBQ3BCLElBQU1FLGVBQWVKLE1BQ2ZLLFVBQVVELGFBQWFFLFVBQVU7WUFFdkNMLFNBQVNJLFNBQVMsR0FBRztRQUN2QixPQUFPO1lBQ0wsSUFBTUUsa0JBQWtCUCxNQUNsQlEsYUFBYUQsZ0JBQWdCRSxhQUFhO1lBRWhERCxXQUFXRSxPQUFPLENBQUMsU0FBQ0MsV0FBYztnQkFDaEMsSUFBTUMsYUFBYXRCLGFBQWFxQjtnQkFFaENWLFNBQVMsQUFBQ0EsV0FBVyxJQUFJLEdBQ2RXLGFBQ0MsQUFBQyxHQUFXQSxPQUFUWCxRQUFvQixPQUFYVyxXQUFZO1lBQ3RDO1FBQ0YsQ0FBQztJQUNILENBQUM7SUFFRCxPQUFPWDtBQUNUO0FBRU8sU0FBU1YsY0FBY3NCLEtBQUssRUFBRTtJQUNuQyxJQUFNWixTQUFTWSxNQUFNQyxNQUFNLENBQUMsU0FBQ2IsUUFBUUQsTUFBUztRQUM1QyxJQUFNWSxhQUFhdEIsYUFBYVU7UUFFaEMsSUFBSUMsV0FBVyxJQUFJLEVBQUU7WUFDbkJBLFNBQVNXLFlBQWEsR0FBRztRQUMzQixPQUFPO1lBQ0xYLFNBQVMsQUFBQyxHQUFXYyxPQUFUZCxRQUFpQlcsT0FBUkcsZ0JBQUssRUFBYyxPQUFYSDtRQUMvQixDQUFDO1FBRUQsT0FBT1g7SUFDVCxHQUFHLElBQUk7SUFFUCxPQUFPQTtBQUNUO0FBRU8sU0FBU1QsdUJBQXVCd0IsVUFBVSxFQUFFQyxjQUFjLEVBQUU7SUFDakUsSUFBTUMsV0FBV0MsMkNBQWdDLEVBQzNDZCxVQUFVLEFBQUMsZUFBeUIsT0FBWFcsWUFBVyxPQUVwQ2hCLE9BQU9pQixlQUFlRywwQkFBMEIsQ0FBQ2YsU0FBU2EsV0FDMURHLDZCQUE2QnJCLE1BQzdCc0IsV0FBVzFCLGNBQWN5QjtJQUUvQixPQUFPQztBQUNUO0FBRU8sU0FBUzdCLHlCQUF5QjhCLFdBQVcsRUFBRU4sY0FBYyxFQUFFO0lBQ3BFLElBQU1aLFVBQVVrQixhQUNWTCxXQUFXTSwwQkFBZSxFQUMxQnhCLE9BQU9pQixlQUFlRywwQkFBMEIsQ0FBQ2YsU0FBU2EsV0FDMURPLFlBQVl6QixNQUFNLEdBQUc7SUFFM0IsT0FBT3lCO0FBQ1Q7QUFFTyxTQUFTL0IsaUNBQWlDZ0MsZUFBZSxFQUFFVCxjQUFjLEVBQUU7SUFDaEYsSUFBTUMsV0FBV1MsMENBQStCLEVBQzFDdEIsVUFBVSxBQUFDLEdBQWtCLE9BQWhCcUIsaUJBQWdCLE9BRTdCMUIsT0FBT2lCLGVBQWVHLDBCQUEwQixDQUFDZixTQUFTYSxXQUMxRFUsMkJBQTJCNUIsTUFDM0I2QixnQkFBZ0IvQixtQkFBbUI4QjtJQUV6QyxPQUFPQztBQUNUO0FBRU8sU0FBU2xDLHlDQUF5Q21DLG1CQUFtQixFQUFFYixjQUFjLEVBQUU7SUFDNUYsSUFBTUMsV0FBV2EsOENBQW1DLEVBQzlDMUIsVUFBVSxBQUFDLEdBQXNCLE9BQXBCeUIscUJBQW9CLE9BRWpDOUIsT0FBT2lCLGVBQWVHLDBCQUEwQixDQUFDZixTQUFTYSxXQUMxRGMsK0JBQStCaEMsTUFDL0JpQyxvQkFBb0JsQyx1QkFBdUJpQztJQUVqRCxPQUFPQztBQUNUIn0=
|
package/package.json
CHANGED
package/src/ruleNames.js
CHANGED
|
@@ -13,6 +13,6 @@ export const RULE_SUBPROOF_RULE_NAME = "ruleSubproof";
|
|
|
13
13
|
export const META_ARGUMENT_RULE_NAME = "metaArgument";
|
|
14
14
|
export const QUALIFIED_STATEMENT_RULE_NAME = "qualifiedStatement";
|
|
15
15
|
export const UNQUALIFIED_STATEMENT_RULE_NAME = "unqualifiedStatement";
|
|
16
|
-
export const
|
|
16
|
+
export const CONSTRUCTOR_DECLARATIONRULE_NAME = "constructorDeclaration";
|
|
17
17
|
export const QUALIFIED_METASTATEMENT_RULE_NAME = "qualifiedMetastatement";
|
|
18
18
|
export const UNQUALIFIED_METASTATEMENT_RULE_NAME = "unqualifiedMetastatement";
|
package/src/utilities/string.js
CHANGED
|
@@ -2,14 +2,14 @@
|
|
|
2
2
|
|
|
3
3
|
import { COMMA } from "../constants";
|
|
4
4
|
import { nodeQuery } from "../utilities/query";
|
|
5
|
-
import {
|
|
6
|
-
LABEL_RULE_NAME,
|
|
5
|
+
import { LABEL_RULE_NAME,
|
|
7
6
|
UNQUALIFIED_STATEMENT_RULE_NAME,
|
|
8
|
-
|
|
9
|
-
UNQUALIFIED_METASTATEMENT_RULE_NAME} from "../ruleNames";
|
|
7
|
+
CONSTRUCTOR_DECLARATIONRULE_NAME,
|
|
8
|
+
UNQUALIFIED_METASTATEMENT_RULE_NAME } from "../ruleNames";
|
|
10
9
|
|
|
11
|
-
const
|
|
12
|
-
|
|
10
|
+
const termNodeQuery = nodeQuery("/constructorDeclaration/term!"),
|
|
11
|
+
statementNodeQuery = nodeQuery("/unqualifiedStatement/statement!"),
|
|
12
|
+
metastatementNodeQuery = nodeQuery("/unqualifiedMetastatement/metastatement!");
|
|
13
13
|
|
|
14
14
|
export function nodeAsString(node) {
|
|
15
15
|
let string = null;
|
|
@@ -56,10 +56,12 @@ export function nodesAsString(nodes) {
|
|
|
56
56
|
}
|
|
57
57
|
|
|
58
58
|
export function termNodeFromTermString(termString, releaseContext) {
|
|
59
|
-
const ruleName =
|
|
60
|
-
content = termString
|
|
59
|
+
const ruleName = CONSTRUCTOR_DECLARATIONRULE_NAME,
|
|
60
|
+
content = `Constructor ${termString}
|
|
61
|
+
`,
|
|
61
62
|
node = releaseContext.nodeFromContentAndRuleName(content, ruleName),
|
|
62
|
-
|
|
63
|
+
constructorDeclarationNode = node, ///
|
|
64
|
+
termNode = termNodeQuery(constructorDeclarationNode);
|
|
63
65
|
|
|
64
66
|
return termNode;
|
|
65
67
|
}
|
|
@@ -94,21 +96,3 @@ export function metastatementNodeFromMetastatementString(metastatementString, re
|
|
|
94
96
|
|
|
95
97
|
return metastatementNode;
|
|
96
98
|
}
|
|
97
|
-
|
|
98
|
-
export function unqualifiedStatementNodeFromUnqualifiedStatementString(unqualifiedStatementString, releaseContext) {
|
|
99
|
-
const ruleName = UNQUALIFIED_STATEMENT_RULE_NAME,
|
|
100
|
-
content = unqualifiedStatementString, ///
|
|
101
|
-
node = releaseContext.nodeFromContentAndRuleName(content, ruleName),
|
|
102
|
-
unqualifiedStatementNode = node; ///
|
|
103
|
-
|
|
104
|
-
return unqualifiedStatementNode;
|
|
105
|
-
}
|
|
106
|
-
|
|
107
|
-
export function conditionalIndicativeNodeFromConditionalIndicativeString(conditionalIndicativeString, releaseContext) {
|
|
108
|
-
const ruleName = CONDITIONAL_INDICATIVE_RULE_NAME,
|
|
109
|
-
content = conditionalIndicativeString, ///
|
|
110
|
-
node = releaseContext.nodeFromContentAndRuleName(content, ruleName),
|
|
111
|
-
conditionalIndicativeNode = node; ///
|
|
112
|
-
|
|
113
|
-
return conditionalIndicativeNode;
|
|
114
|
-
}
|