occam-verify-cli 0.0.678 → 0.0.680
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/bin/action/verify.js +13 -3
- package/lib/axiomLemmaTheoremConjecture.js +3 -3
- package/lib/conclusion.js +16 -5
- package/lib/consequent.js +11 -3
- package/lib/context/file.js +73 -3
- package/lib/context/release.js +7 -2
- package/lib/equality.js +13 -199
- package/lib/premise.js +24 -7
- package/lib/supposition.js +15 -4
- package/lib/type.js +3 -8
- package/lib/utilities/array.js +5 -2
- package/lib/utilities/string.js +26 -13
- package/lib/verifier/node/metastatement.js +176 -0
- package/lib/verifier/node/statementAsCombinator.js +186 -0
- package/lib/verifier/node/termAsConstructor.js +224 -0
- package/lib/verifier/node.js +158 -0
- package/lib/verifier/nodes/equality.js +155 -0
- package/lib/verifier/{metastatementForMetavariable → nodes/metastatementForMetavariable}/conclusion.js +13 -12
- package/lib/verifier/{metastatementForMetavariable → nodes/metastatementForMetavariable}/premise.js +13 -12
- package/lib/verifier/nodes/metastatementForMetavariable.js +198 -0
- package/lib/verifier/nodes/statement.js +200 -0
- package/lib/verifier/{statementForMetavariable → nodes/statementForMetavariable}/conclusion.js +13 -12
- package/lib/verifier/{statementForMetavariable → nodes/statementForMetavariable}/premise.js +13 -12
- package/lib/verifier/nodes/statementForMetavariable.js +203 -0
- package/lib/verifier/nodes/term.js +210 -0
- package/lib/verifier/{termForVariable/supposition.js → nodes/termForVariable/consequent.js} +13 -12
- package/lib/verifier/{termForVariable/consequent.js → nodes/termForVariable/supposition.js} +13 -12
- package/lib/verifier/nodes/termForVariable.js +217 -0
- package/lib/verifier/nodes.js +175 -0
- package/lib/verify/axiom.js +3 -3
- package/lib/verify/conclusion.js +3 -3
- package/lib/verify/conjecture.js +3 -3
- package/lib/verify/consequent.js +3 -3
- package/lib/verify/declaration/combinator.js +7 -2
- package/lib/verify/declaration/constructor.js +8 -2
- package/lib/verify/declaration/metavariable.js +7 -2
- package/lib/verify/declaration/type.js +7 -2
- package/lib/verify/declaration/variable.js +8 -2
- package/lib/verify/file.js +3 -3
- package/lib/verify/label.js +9 -4
- package/lib/verify/lemma.js +3 -3
- package/lib/verify/metastatement/qualified.js +5 -6
- package/lib/verify/metastatement/unqualified.js +9 -7
- package/lib/verify/metastatement.js +36 -156
- package/lib/verify/metavariable.js +6 -4
- package/lib/verify/premise.js +3 -3
- package/lib/verify/release.js +3 -3
- package/lib/verify/rule.js +3 -3
- package/lib/verify/statement/qualified.js +5 -6
- package/lib/verify/statement/unqualified.js +9 -7
- package/lib/verify/statement.js +86 -332
- package/lib/verify/statementAsCombinator.js +8 -82
- package/lib/verify/supposition.js +3 -3
- package/lib/verify/term.js +79 -215
- package/lib/verify/termAsConstructor.js +15 -89
- package/lib/verify/terms.js +45 -0
- package/lib/verify/theorem.js +3 -3
- package/lib/verify/type.js +7 -5
- package/lib/verify/typeAssertion.js +124 -0
- package/lib/verify/variable.js +7 -5
- package/package.json +5 -5
- package/src/axiomLemmaTheoremConjecture.js +2 -2
- package/src/conclusion.js +13 -4
- package/src/consequent.js +9 -2
- package/src/context/file.js +9 -2
- package/src/context/release.js +9 -2
- package/src/equality.js +17 -143
- package/src/premise.js +23 -6
- package/src/supposition.js +12 -3
- package/src/type.js +3 -8
- package/src/utilities/array.js +1 -1
- package/src/utilities/string.js +34 -23
- package/src/verifier/node/metastatement.js +61 -0
- package/src/verifier/node/statementAsCombinator.js +80 -0
- package/src/verifier/node/termAsConstructor.js +124 -0
- package/src/verifier/node.js +85 -0
- package/src/verifier/nodes/equality.js +68 -0
- package/src/verifier/nodes/metastatementForMetavariable/conclusion.js +11 -0
- package/src/verifier/nodes/metastatementForMetavariable/premise.js +11 -0
- package/src/verifier/{metastatementForMetavariable.js → nodes/metastatementForMetavariable.js} +13 -13
- package/src/verifier/nodes/statement.js +100 -0
- package/src/verifier/nodes/statementForMetavariable/conclusion.js +11 -0
- package/src/verifier/nodes/statementForMetavariable/premise.js +11 -0
- package/src/verifier/{statementForMetavariable.js → nodes/statementForMetavariable.js} +10 -10
- package/src/verifier/nodes/term.js +106 -0
- package/src/verifier/nodes/termForVariable/consequent.js +11 -0
- package/src/verifier/nodes/termForVariable/supposition.js +11 -0
- package/src/verifier/{termForVariable.js → nodes/termForVariable.js} +42 -30
- package/src/verifier/nodes.js +111 -0
- package/src/verify/axiom.js +2 -2
- package/src/verify/conclusion.js +2 -2
- package/src/verify/conjecture.js +2 -2
- package/src/verify/consequent.js +2 -2
- package/src/verify/declaration/combinator.js +9 -1
- package/src/verify/declaration/constructor.js +15 -1
- package/src/verify/declaration/metavariable.js +9 -1
- package/src/verify/declaration/type.js +14 -1
- package/src/verify/declaration/variable.js +15 -1
- package/src/verify/file.js +2 -2
- package/src/verify/label.js +10 -2
- package/src/verify/lemma.js +4 -4
- package/src/verify/metastatement/qualified.js +4 -6
- package/src/verify/metastatement/unqualified.js +9 -7
- package/src/verify/metastatement.js +35 -56
- package/src/verify/metavariable.js +6 -3
- package/src/verify/premise.js +2 -2
- package/src/verify/release.js +2 -2
- package/src/verify/rule.js +2 -2
- package/src/verify/statement/qualified.js +4 -6
- package/src/verify/statement/unqualified.js +9 -7
- package/src/verify/statement.js +109 -302
- package/src/verify/statementAsCombinator.js +9 -129
- package/src/verify/supposition.js +2 -2
- package/src/verify/term.js +99 -156
- package/src/verify/termAsConstructor.js +20 -135
- package/src/verify/terms.js +54 -0
- package/src/verify/theorem.js +2 -2
- package/src/verify/type.js +7 -4
- package/src/verify/typeAssertion.js +164 -0
- package/src/verify/variable.js +7 -4
- package/lib/node/statement/combinator/equality.js +0 -21
- package/lib/ocmbinator/equality.js +0 -126
- package/lib/tokens/statement/combinator/equality.js +0 -17
- package/lib/verifier/metastatementForMetavariable.js +0 -198
- package/lib/verifier/statementForMetavariable.js +0 -203
- package/lib/verifier/termForVariable.js +0 -209
- package/lib/verifier.js +0 -138
- package/lib/verify/assertion/type.js +0 -115
- package/lib/verify/typeInference.js +0 -132
- package/src/node/statement/combinator/equality.js +0 -9
- package/src/ocmbinator/equality.js +0 -23
- package/src/tokens/statement/combinator/equality.js +0 -10
- package/src/verifier/metastatementForMetavariable/conclusion.js +0 -9
- package/src/verifier/metastatementForMetavariable/premise.js +0 -9
- package/src/verifier/statementForMetavariable/conclusion.js +0 -9
- package/src/verifier/statementForMetavariable/premise.js +0 -9
- package/src/verifier/termForVariable/consequent.js +0 -9
- package/src/verifier/termForVariable/supposition.js +0 -9
- package/src/verifier.js +0 -74
- package/src/verify/assertion/type.js +0 -153
- package/src/verify/typeInference.js +0 -146
|
@@ -8,23 +8,24 @@ Object.defineProperty(exports, "default", {
|
|
|
8
8
|
return verifyTermAsConstructor;
|
|
9
9
|
}
|
|
10
10
|
});
|
|
11
|
-
var _term = /*#__PURE__*/ _interop_require_default(require("../verify/term"));
|
|
12
11
|
var _constructor = /*#__PURE__*/ _interop_require_default(require("../constructor"));
|
|
13
|
-
var
|
|
12
|
+
var _termAsConstructor = /*#__PURE__*/ _interop_require_default(require("../verifier/node/termAsConstructor"));
|
|
14
13
|
var _query = require("../utilities/query");
|
|
15
|
-
var _ruleNames = require("../ruleNames");
|
|
16
14
|
function _interop_require_default(obj) {
|
|
17
15
|
return obj && obj.__esModule ? obj : {
|
|
18
16
|
default: obj
|
|
19
17
|
};
|
|
20
18
|
}
|
|
21
|
-
var typeNodeQuery = (0, _query.nodeQuery)("/argument/type"), termNodeQuery = (0, _query.nodeQuery)("/argument/term");
|
|
22
19
|
function verifyTermAsConstructor(termNode, typeNode, fileContext) {
|
|
23
20
|
var termVerifiedAsConstructor = false;
|
|
24
|
-
var
|
|
25
|
-
|
|
26
|
-
var childNodes = nonTerminalNode.getChildNodes(), childNodesVerified = verifyChildNodes(childNodes, fileContext)
|
|
21
|
+
var termString = fileContext.nodeAsString(termNode);
|
|
22
|
+
fileContext.debug("Verifying the '".concat(termString, "' term as a constructor..."), termNode);
|
|
23
|
+
var nonTerminalNode = termNode, childNodes = nonTerminalNode.getChildNodes(), childNodesVerified = _termAsConstructor.default.verifyChildNodes(childNodes, fileContext, function() {
|
|
24
|
+
var verifiedAhead = true;
|
|
25
|
+
return verifiedAhead;
|
|
26
|
+
});
|
|
27
27
|
if (childNodesVerified) {
|
|
28
|
+
var type = null;
|
|
28
29
|
if (typeNode === null) {
|
|
29
30
|
termVerifiedAsConstructor = true;
|
|
30
31
|
} else {
|
|
@@ -33,93 +34,18 @@ function verifyTermAsConstructor(termNode, typeNode, fileContext) {
|
|
|
33
34
|
if (type !== null) {
|
|
34
35
|
termVerifiedAsConstructor = true;
|
|
35
36
|
} else {
|
|
36
|
-
fileContext.
|
|
37
|
+
fileContext.debug("The '".concat(termString, "' constructor's '").concat(typeName, "' type is not present."), termNode);
|
|
37
38
|
}
|
|
38
39
|
}
|
|
40
|
+
if (termVerifiedAsConstructor) {
|
|
41
|
+
var tokens = fileContext.getTokens(), constructor = _constructor.default.fromTermNodeTypeAndTokens(termNode, type, tokens);
|
|
42
|
+
fileContext.addConstructor(constructor);
|
|
43
|
+
}
|
|
39
44
|
}
|
|
40
45
|
if (termVerifiedAsConstructor) {
|
|
41
|
-
|
|
42
|
-
fileContext.addConstructor(constructor);
|
|
43
|
-
}
|
|
44
|
-
if (termVerifiedAsConstructor) {
|
|
45
|
-
fileContext.info("Verified the '".concat(termString, "' constructor."), termNode);
|
|
46
|
+
fileContext.debug("...verified the '".concat(termString, "' term as a constructor."), termNode);
|
|
46
47
|
}
|
|
47
48
|
return termVerifiedAsConstructor;
|
|
48
49
|
}
|
|
49
|
-
function verifyNode(node, fileContext) {
|
|
50
|
-
var nodeVerified;
|
|
51
|
-
var nodeTerminalNode = node.isTerminalNode();
|
|
52
|
-
if (nodeTerminalNode) {
|
|
53
|
-
var terminalNode = node, terminalNodeVerified = verifyTerminalNode(terminalNode, fileContext);
|
|
54
|
-
nodeVerified = terminalNodeVerified; ///
|
|
55
|
-
} else {
|
|
56
|
-
var nonTerminalNode = node, nonTerminalNodeVerified = verifyNonTerminalNode(nonTerminalNode, fileContext);
|
|
57
|
-
nodeVerified = nonTerminalNodeVerified; ///
|
|
58
|
-
}
|
|
59
|
-
return nodeVerified;
|
|
60
|
-
}
|
|
61
|
-
function verifyChildNodes(childNodes, fileContext) {
|
|
62
|
-
var childNodesVerified = childNodes.every(function(childNode) {
|
|
63
|
-
var node = childNode, nodeVerified = verifyNode(node, fileContext);
|
|
64
|
-
if (nodeVerified) {
|
|
65
|
-
return true;
|
|
66
|
-
}
|
|
67
|
-
});
|
|
68
|
-
return childNodesVerified;
|
|
69
|
-
}
|
|
70
|
-
function verifyTerminalNode(terminalNode, fileContext) {
|
|
71
|
-
var terminalNodeVerified = true;
|
|
72
|
-
return terminalNodeVerified;
|
|
73
|
-
}
|
|
74
|
-
function verifyNonTerminalNode(nonTerminalNode, fileContext) {
|
|
75
|
-
var nonTerminalNodeVerified;
|
|
76
|
-
var ruleName = nonTerminalNode.getRuleName();
|
|
77
|
-
switch(ruleName){
|
|
78
|
-
case _ruleNames.ARGUMENT_RULE_NAME:
|
|
79
|
-
{
|
|
80
|
-
var argumentNode = nonTerminalNode, argumentNodeVerified = verifyArgumentNode(argumentNode, fileContext);
|
|
81
|
-
nonTerminalNodeVerified = argumentNodeVerified; ///
|
|
82
|
-
break;
|
|
83
|
-
}
|
|
84
|
-
case _ruleNames.TERM_RULE_NAME:
|
|
85
|
-
{
|
|
86
|
-
var termNode = nonTerminalNode, types = [], context = fileContext, termVerified = (0, _term.default)(termNode, types, context);
|
|
87
|
-
if (termVerified) {
|
|
88
|
-
var firstType = (0, _array.first)(types), type = firstType; ///
|
|
89
|
-
if (type !== null) {
|
|
90
|
-
var termString = fileContext.nodeAsString(termNode);
|
|
91
|
-
fileContext.error("The type of the constructor's compound '".concat(termString, "' term node is not null."), termNode);
|
|
92
|
-
} else {
|
|
93
|
-
nonTerminalNodeVerified = true; ///
|
|
94
|
-
}
|
|
95
|
-
}
|
|
96
|
-
break;
|
|
97
|
-
}
|
|
98
|
-
default:
|
|
99
|
-
{
|
|
100
|
-
var childNodes = nonTerminalNode.getChildNodes(), childNodesVerified = verifyChildNodes(childNodes, fileContext);
|
|
101
|
-
nonTerminalNodeVerified = childNodesVerified; ///
|
|
102
|
-
break;
|
|
103
|
-
}
|
|
104
|
-
}
|
|
105
|
-
return nonTerminalNodeVerified;
|
|
106
|
-
}
|
|
107
|
-
function verifyArgumentNode(argumentNode, fileContext) {
|
|
108
|
-
var argumentNodeVerified = false;
|
|
109
|
-
var typeNode = typeNodeQuery(argumentNode), termNode = termNodeQuery(argumentNode);
|
|
110
|
-
if (false) {
|
|
111
|
-
///
|
|
112
|
-
} else if (typeNode !== null) {
|
|
113
|
-
var typeName = (0, _query.typeNameFromTypeNode)(typeNode), typePresent = fileContext.isTypePresentByTypeName(typeName);
|
|
114
|
-
if (!typePresent) {
|
|
115
|
-
fileContext.error("The type '".concat(typeName, "' is not present."), argumentNode);
|
|
116
|
-
}
|
|
117
|
-
argumentNodeVerified = typePresent; ///
|
|
118
|
-
} else if (termNode !== null) {
|
|
119
|
-
var node = termNode, nodeVerified = verifyNode(node, fileContext);
|
|
120
|
-
argumentNodeVerified = nodeVerified; ///
|
|
121
|
-
}
|
|
122
|
-
return argumentNodeVerified;
|
|
123
|
-
}
|
|
124
50
|
|
|
125
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/verify/termAsConstructor.js"],"sourcesContent":["\"use strict\";\n\nimport verifyTerm from \"../verify/term\";\nimport Constructor from \"../constructor\";\n\nimport { first } from \"../utilities/array\";\nimport { nodeQuery, typeNameFromTypeNode } from \"../utilities/query\";\nimport { TERM_RULE_NAME, ARGUMENT_RULE_NAME } from \"../ruleNames\";\n\nconst typeNodeQuery = nodeQuery(\"/argument/type\"),\n      termNodeQuery = nodeQuery(\"/argument/term\");\n\nexport default function verifyTermAsConstructor(termNode, typeNode, fileContext) {\n  let termVerifiedAsConstructor = false;\n\n  let type = null;\n\n  const nonTerminalNode = termNode,  ///\n        termString = fileContext.nodeAsString(termNode);\n\n  const childNodes = nonTerminalNode.getChildNodes(),\n        childNodesVerified = verifyChildNodes(childNodes, fileContext);\n\n  if (childNodesVerified) {\n    if (typeNode === null) {\n      termVerifiedAsConstructor = true;\n    } else {\n      const typeName = typeNameFromTypeNode(typeNode);\n\n      type = fileContext.findTypeByTypeName(typeName);\n\n      if (type !== null) {\n        termVerifiedAsConstructor = true;\n      } else {\n        fileContext.error(`The '${termString}' constructor's '${typeName}' type is not present.`, termNode);\n      }\n    }\n  }\n\n  if (termVerifiedAsConstructor) {\n    const tokens = fileContext.getTokens(),\n          constructor = Constructor.fromTermNodeTypeAndTokens(termNode, type, tokens);\n\n    fileContext.addConstructor(constructor);\n  }\n\n  if (termVerifiedAsConstructor) {\n    fileContext.info(`Verified the '${termString}' constructor.`, termNode);\n  }\n\n  return termVerifiedAsConstructor;\n}\n\nfunction verifyNode(node, fileContext) {\n  let nodeVerified;\n\n  const nodeTerminalNode = node.isTerminalNode();\n\n  if (nodeTerminalNode) {\n    const terminalNode = node,  ///\n          terminalNodeVerified = verifyTerminalNode(terminalNode, fileContext);\n\n    nodeVerified = terminalNodeVerified;  ///\n  } else {\n    const nonTerminalNode = node, ///\n          nonTerminalNodeVerified = verifyNonTerminalNode(nonTerminalNode, fileContext);\n\n    nodeVerified = nonTerminalNodeVerified; ///\n  }\n\n  return nodeVerified;\n}\n\nfunction verifyChildNodes(childNodes, fileContext) {\n  const childNodesVerified = childNodes.every((childNode) => {\n    const node = childNode, ///\n          nodeVerified = verifyNode(node, fileContext);\n\n    if (nodeVerified) {\n      return true;\n    }\n  });\n\n  return childNodesVerified;\n}\n\nfunction verifyTerminalNode(terminalNode, fileContext) {\n  const terminalNodeVerified = true;\n\n  return terminalNodeVerified;\n}\n\nfunction verifyNonTerminalNode(nonTerminalNode, fileContext) {\n  let nonTerminalNodeVerified;\n\n  const ruleName = nonTerminalNode.getRuleName();\n\n  switch (ruleName) {\n    case ARGUMENT_RULE_NAME: {\n      const argumentNode = nonTerminalNode, ///\n            argumentNodeVerified = verifyArgumentNode(argumentNode, fileContext);\n\n      nonTerminalNodeVerified = argumentNodeVerified; ///\n\n      break;\n    }\n\n    case TERM_RULE_NAME: {\n      const termNode = nonTerminalNode, ///\n            types = [],\n            context = fileContext,  ///\n            termVerified = verifyTerm(termNode, types, context);\n\n      if (termVerified) {\n        const firstType = first(types),\n              type = firstType; ///\n\n        if (type !== null) {\n          const termString = fileContext.nodeAsString(termNode);\n\n          fileContext.error(`The type of the constructor's compound '${termString}' term node is not null.`, termNode);\n        } else {\n          nonTerminalNodeVerified = true; ///\n        }\n      }\n\n      break;\n    }\n\n    default: {\n      const childNodes = nonTerminalNode.getChildNodes(),\n            childNodesVerified = verifyChildNodes(childNodes, fileContext);\n\n      nonTerminalNodeVerified = childNodesVerified; ///\n\n      break;\n    }\n  }\n\n  return nonTerminalNodeVerified;\n}\n\nfunction verifyArgumentNode(argumentNode, fileContext) {\n  let argumentNodeVerified = false;\n\n  const typeNode = typeNodeQuery(argumentNode),\n        termNode = termNodeQuery(argumentNode);\n\n  if (false) {\n    ///\n  } else if (typeNode !== null) {\n    const typeName = typeNameFromTypeNode(typeNode),\n          typePresent = fileContext.isTypePresentByTypeName(typeName);\n\n    if (!typePresent) {\n      fileContext.error(`The type '${typeName}' is not present.`, argumentNode);\n    }\n\n    argumentNodeVerified = typePresent; ///\n  } else if (termNode !== null) {\n    const node = termNode,  ///\n          nodeVerified = verifyNode(node, fileContext);\n\n    argumentNodeVerified = nodeVerified;  ///\n  }\n\n  return argumentNodeVerified;\n}\n"],"names":["verifyTermAsConstructor","typeNodeQuery","nodeQuery","termNodeQuery","termNode","typeNode","fileContext","termVerifiedAsConstructor","type","nonTerminalNode","termString","nodeAsString","childNodes","getChildNodes","childNodesVerified","verifyChildNodes","typeName","typeNameFromTypeNode","findTypeByTypeName","error","tokens","getTokens","constructor","Constructor","fromTermNodeTypeAndTokens","addConstructor","info","verifyNode","node","nodeVerified","nodeTerminalNode","isTerminalNode","terminalNode","terminalNodeVerified","verifyTerminalNode","nonTerminalNodeVerified","verifyNonTerminalNode","every","childNode","ruleName","getRuleName","ARGUMENT_RULE_NAME","argumentNode","argumentNodeVerified","verifyArgumentNode","TERM_RULE_NAME","types","context","termVerified","verifyTerm","firstType","first","typePresent","isTypePresentByTypeName"],"mappings":"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"}
|
|
51
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy92ZXJpZnkvdGVybUFzQ29uc3RydWN0b3IuanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmltcG9ydCBDb25zdHJ1Y3RvciBmcm9tIFwiLi4vY29uc3RydWN0b3JcIjtcbmltcG9ydCB0ZXJtQXNDb25zdHJ1Y3Rvck5vZGVWZXJpZmllciBmcm9tIFwiLi4vdmVyaWZpZXIvbm9kZS90ZXJtQXNDb25zdHJ1Y3RvclwiO1xuXG5pbXBvcnQgeyB0eXBlTmFtZUZyb21UeXBlTm9kZSB9IGZyb20gXCIuLi91dGlsaXRpZXMvcXVlcnlcIjtcblxuZXhwb3J0IGRlZmF1bHQgZnVuY3Rpb24gdmVyaWZ5VGVybUFzQ29uc3RydWN0b3IodGVybU5vZGUsIHR5cGVOb2RlLCBmaWxlQ29udGV4dCkge1xuICBsZXQgdGVybVZlcmlmaWVkQXNDb25zdHJ1Y3RvciA9IGZhbHNlO1xuXG4gIGNvbnN0IHRlcm1TdHJpbmcgPSBmaWxlQ29udGV4dC5ub2RlQXNTdHJpbmcodGVybU5vZGUpO1xuXG4gIGZpbGVDb250ZXh0LmRlYnVnKGBWZXJpZnlpbmcgdGhlICcke3Rlcm1TdHJpbmd9JyB0ZXJtIGFzIGEgY29uc3RydWN0b3IuLi5gLCB0ZXJtTm9kZSk7XG5cbiAgY29uc3Qgbm9uVGVybWluYWxOb2RlID0gdGVybU5vZGUsIC8vL1xuICAgICAgICBjaGlsZE5vZGVzID0gbm9uVGVybWluYWxOb2RlLmdldENoaWxkTm9kZXMoKSxcbiAgICAgICAgY2hpbGROb2Rlc1ZlcmlmaWVkID0gdGVybUFzQ29uc3RydWN0b3JOb2RlVmVyaWZpZXIudmVyaWZ5Q2hpbGROb2RlcyhjaGlsZE5vZGVzLCBmaWxlQ29udGV4dCwgKCkgPT4ge1xuICAgICAgICAgIGNvbnN0IHZlcmlmaWVkQWhlYWQgPSB0cnVlO1xuXG4gICAgICAgICAgcmV0dXJuIHZlcmlmaWVkQWhlYWQ7XG4gICAgICAgIH0pO1xuXG4gIGlmIChjaGlsZE5vZGVzVmVyaWZpZWQpIHtcbiAgICBsZXQgdHlwZSA9IG51bGw7XG5cbiAgICBpZiAodHlwZU5vZGUgPT09IG51bGwpIHtcbiAgICAgIHRlcm1WZXJpZmllZEFzQ29uc3RydWN0b3IgPSB0cnVlO1xuICAgIH0gZWxzZSB7XG4gICAgICBjb25zdCB0eXBlTmFtZSA9IHR5cGVOYW1lRnJvbVR5cGVOb2RlKHR5cGVOb2RlKTtcblxuICAgICAgdHlwZSA9IGZpbGVDb250ZXh0LmZpbmRUeXBlQnlUeXBlTmFtZSh0eXBlTmFtZSk7XG5cbiAgICAgIGlmICh0eXBlICE9PSBudWxsKSB7XG4gICAgICAgIHRlcm1WZXJpZmllZEFzQ29uc3RydWN0b3IgPSB0cnVlO1xuICAgICAgfSBlbHNlIHtcbiAgICAgICAgZmlsZUNvbnRleHQuZGVidWcoYFRoZSAnJHt0ZXJtU3RyaW5nfScgY29uc3RydWN0b3IncyAnJHt0eXBlTmFtZX0nIHR5cGUgaXMgbm90IHByZXNlbnQuYCwgdGVybU5vZGUpO1xuICAgICAgfVxuICAgIH1cblxuICAgIGlmICh0ZXJtVmVyaWZpZWRBc0NvbnN0cnVjdG9yKSB7XG4gICAgICBjb25zdCB0b2tlbnMgPSBmaWxlQ29udGV4dC5nZXRUb2tlbnMoKSxcbiAgICAgICAgICAgIGNvbnN0cnVjdG9yID0gQ29uc3RydWN0b3IuZnJvbVRlcm1Ob2RlVHlwZUFuZFRva2Vucyh0ZXJtTm9kZSwgdHlwZSwgdG9rZW5zKTtcblxuICAgICAgZmlsZUNvbnRleHQuYWRkQ29uc3RydWN0b3IoY29uc3RydWN0b3IpO1xuICAgIH1cbiAgfVxuXG4gIGlmICh0ZXJtVmVyaWZpZWRBc0NvbnN0cnVjdG9yKSB7XG4gICAgZmlsZUNvbnRleHQuZGVidWcoYC4uLnZlcmlmaWVkIHRoZSAnJHt0ZXJtU3RyaW5nfScgdGVybSBhcyBhIGNvbnN0cnVjdG9yLmAsIHRlcm1Ob2RlKTtcbiAgfVxuXG4gIHJldHVybiB0ZXJtVmVyaWZpZWRBc0NvbnN0cnVjdG9yO1xufVxuIl0sIm5hbWVzIjpbInZlcmlmeVRlcm1Bc0NvbnN0cnVjdG9yIiwidGVybU5vZGUiLCJ0eXBlTm9kZSIsImZpbGVDb250ZXh0IiwidGVybVZlcmlmaWVkQXNDb25zdHJ1Y3RvciIsInRlcm1TdHJpbmciLCJub2RlQXNTdHJpbmciLCJkZWJ1ZyIsIm5vblRlcm1pbmFsTm9kZSIsImNoaWxkTm9kZXMiLCJnZXRDaGlsZE5vZGVzIiwiY2hpbGROb2Rlc1ZlcmlmaWVkIiwidGVybUFzQ29uc3RydWN0b3JOb2RlVmVyaWZpZXIiLCJ2ZXJpZnlDaGlsZE5vZGVzIiwidmVyaWZpZWRBaGVhZCIsInR5cGUiLCJ0eXBlTmFtZSIsInR5cGVOYW1lRnJvbVR5cGVOb2RlIiwiZmluZFR5cGVCeVR5cGVOYW1lIiwidG9rZW5zIiwiZ2V0VG9rZW5zIiwiY29uc3RydWN0b3IiLCJDb25zdHJ1Y3RvciIsImZyb21UZXJtTm9kZVR5cGVBbmRUb2tlbnMiLCJhZGRDb25zdHJ1Y3RvciJdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7K0JBT0E7OztlQUF3QkE7OztrRUFMQTt3RUFDa0I7cUJBRUw7Ozs7OztBQUV0QixTQUFTQSx3QkFBd0JDLFFBQVEsRUFBRUMsUUFBUSxFQUFFQyxXQUFXO0lBQzdFLElBQUlDLDRCQUE0QjtJQUVoQyxJQUFNQyxhQUFhRixZQUFZRyxZQUFZLENBQUNMO0lBRTVDRSxZQUFZSSxLQUFLLENBQUMsQUFBQyxrQkFBNEIsT0FBWEYsWUFBVywrQkFBNkJKO0lBRTVFLElBQU1PLGtCQUFrQlAsVUFDbEJRLGFBQWFELGdCQUFnQkUsYUFBYSxJQUMxQ0MscUJBQXFCQywwQkFBNkIsQ0FBQ0MsZ0JBQWdCLENBQUNKLFlBQVlOLGFBQWE7UUFDM0YsSUFBTVcsZ0JBQWdCO1FBRXRCLE9BQU9BO0lBQ1Q7SUFFTixJQUFJSCxvQkFBb0I7UUFDdEIsSUFBSUksT0FBTztRQUVYLElBQUliLGFBQWEsTUFBTTtZQUNyQkUsNEJBQTRCO1FBQzlCLE9BQU87WUFDTCxJQUFNWSxXQUFXQyxJQUFBQSwyQkFBb0IsRUFBQ2Y7WUFFdENhLE9BQU9aLFlBQVllLGtCQUFrQixDQUFDRjtZQUV0QyxJQUFJRCxTQUFTLE1BQU07Z0JBQ2pCWCw0QkFBNEI7WUFDOUIsT0FBTztnQkFDTEQsWUFBWUksS0FBSyxDQUFDLEFBQUMsUUFBcUNTLE9BQTlCWCxZQUFXLHFCQUE0QixPQUFUVyxVQUFTLDJCQUF5QmY7WUFDNUY7UUFDRjtRQUVBLElBQUlHLDJCQUEyQjtZQUM3QixJQUFNZSxTQUFTaEIsWUFBWWlCLFNBQVMsSUFDOUJDLGNBQWNDLG9CQUFXLENBQUNDLHlCQUF5QixDQUFDdEIsVUFBVWMsTUFBTUk7WUFFMUVoQixZQUFZcUIsY0FBYyxDQUFDSDtRQUM3QjtJQUNGO0lBRUEsSUFBSWpCLDJCQUEyQjtRQUM3QkQsWUFBWUksS0FBSyxDQUFDLEFBQUMsb0JBQThCLE9BQVhGLFlBQVcsNkJBQTJCSjtJQUM5RTtJQUVBLE9BQU9HO0FBQ1QifQ==
|
|
@@ -0,0 +1,45 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", {
|
|
3
|
+
value: true
|
|
4
|
+
});
|
|
5
|
+
Object.defineProperty(exports, "default", {
|
|
6
|
+
enumerable: true,
|
|
7
|
+
get: function() {
|
|
8
|
+
return verifyTerms;
|
|
9
|
+
}
|
|
10
|
+
});
|
|
11
|
+
var _term = /*#__PURE__*/ _interop_require_default(require("../verify/term"));
|
|
12
|
+
var _array = require("../utilities/array");
|
|
13
|
+
function _interop_require_default(obj) {
|
|
14
|
+
return obj && obj.__esModule ? obj : {
|
|
15
|
+
default: obj
|
|
16
|
+
};
|
|
17
|
+
}
|
|
18
|
+
function verifyTerms(leftTermNode, rightTermNode, context, verifyAhead) {
|
|
19
|
+
var termsVerified;
|
|
20
|
+
var leftTermString = context.nodeAsString(leftTermNode), rightTermString = context.nodeAsString(rightTermNode);
|
|
21
|
+
context.trace("Verifying the '".concat(leftTermString, "' and '").concat(rightTermString, "' terms..."), leftTermNode);
|
|
22
|
+
var types = [], leftTermVerified = (0, _term.default)(leftTermNode, types, context, function() {
|
|
23
|
+
var verifiedAhead;
|
|
24
|
+
var rightTermVerified = (0, _term.default)(rightTermNode, types, context, function() {
|
|
25
|
+
var verifiedAhead = false;
|
|
26
|
+
var firstType = (0, _array.first)(types), secondType = (0, _array.second)(types), leftType = firstType, rightType = secondType, leftTypeEqualToOrSubTypeOfOfSuperTypeOfRightType = leftType.isEqualToOrSubTypeOfOfSuperTypeOf(rightType);
|
|
27
|
+
if (!leftTypeEqualToOrSubTypeOfOfSuperTypeOfRightType) {
|
|
28
|
+
var leftTypeName = leftType.getName(), rightTypeName = rightType.getName(), leftTermString = context.nodeAsString(leftTermNode), rightTermString = context.nodeAsString(rightTermNode);
|
|
29
|
+
context.debug("The left '".concat(leftTermString, "' term's '").concat(leftTypeName, "' type is not equal to, a sub-type of nor a super-type of the right '").concat(rightTermString, "' term's '").concat(rightTypeName, "' type."), statementNode);
|
|
30
|
+
} else {
|
|
31
|
+
verifiedAhead = verifyAhead();
|
|
32
|
+
}
|
|
33
|
+
return verifiedAhead;
|
|
34
|
+
});
|
|
35
|
+
verifiedAhead = rightTermVerified; ///
|
|
36
|
+
return verifiedAhead;
|
|
37
|
+
});
|
|
38
|
+
if (termsVerified) {
|
|
39
|
+
context.debug("...verified the '".concat(leftTermString, "' and '").concat(rightTermString, "' terms."), leftTermNode);
|
|
40
|
+
}
|
|
41
|
+
termsVerified = leftTermVerified; ///
|
|
42
|
+
return termsVerified;
|
|
43
|
+
}
|
|
44
|
+
|
|
45
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy92ZXJpZnkvdGVybXMuanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmltcG9ydCB2ZXJpZnlUZXJtIGZyb20gXCIuLi92ZXJpZnkvdGVybVwiO1xuXG5pbXBvcnQgeyBmaXJzdCwgc2Vjb25kIH0gZnJvbSBcIi4uL3V0aWxpdGllcy9hcnJheVwiO1xuXG5leHBvcnQgZGVmYXVsdCBmdW5jdGlvbiB2ZXJpZnlUZXJtcyhsZWZ0VGVybU5vZGUsIHJpZ2h0VGVybU5vZGUsIGNvbnRleHQsIHZlcmlmeUFoZWFkKSB7XG4gIGxldCB0ZXJtc1ZlcmlmaWVkO1xuXG4gIGNvbnN0IGxlZnRUZXJtU3RyaW5nID0gY29udGV4dC5ub2RlQXNTdHJpbmcobGVmdFRlcm1Ob2RlKSxcbiAgICAgICAgcmlnaHRUZXJtU3RyaW5nID0gY29udGV4dC5ub2RlQXNTdHJpbmcocmlnaHRUZXJtTm9kZSk7XG5cbiAgY29udGV4dC50cmFjZShgVmVyaWZ5aW5nIHRoZSAnJHtsZWZ0VGVybVN0cmluZ30nIGFuZCAnJHtyaWdodFRlcm1TdHJpbmd9JyB0ZXJtcy4uLmAsIGxlZnRUZXJtTm9kZSk7XG5cbiAgY29uc3QgdHlwZXMgPSBbXSxcbiAgICAgICAgbGVmdFRlcm1WZXJpZmllZCA9IHZlcmlmeVRlcm0obGVmdFRlcm1Ob2RlLCB0eXBlcywgY29udGV4dCwgKCkgPT4ge1xuICAgICAgICAgIGxldCB2ZXJpZmllZEFoZWFkO1xuXG4gICAgICAgICAgY29uc3QgcmlnaHRUZXJtVmVyaWZpZWQgPSB2ZXJpZnlUZXJtKHJpZ2h0VGVybU5vZGUsIHR5cGVzLCBjb250ZXh0LCAoKSA9PiB7XG4gICAgICAgICAgICBsZXQgdmVyaWZpZWRBaGVhZCA9IGZhbHNlO1xuXG4gICAgICAgICAgICBjb25zdCBmaXJzdFR5cGUgPSBmaXJzdCh0eXBlcyksXG4gICAgICAgICAgICAgICAgICBzZWNvbmRUeXBlID0gc2Vjb25kKHR5cGVzKSxcbiAgICAgICAgICAgICAgICAgIGxlZnRUeXBlID0gZmlyc3RUeXBlLCAvLy9cbiAgICAgICAgICAgICAgICAgIHJpZ2h0VHlwZSA9IHNlY29uZFR5cGUsIC8vL1xuICAgICAgICAgICAgICAgICAgbGVmdFR5cGVFcXVhbFRvT3JTdWJUeXBlT2ZPZlN1cGVyVHlwZU9mUmlnaHRUeXBlID0gbGVmdFR5cGUuaXNFcXVhbFRvT3JTdWJUeXBlT2ZPZlN1cGVyVHlwZU9mKHJpZ2h0VHlwZSk7XG5cbiAgICAgICAgICAgIGlmICghbGVmdFR5cGVFcXVhbFRvT3JTdWJUeXBlT2ZPZlN1cGVyVHlwZU9mUmlnaHRUeXBlKSB7XG4gICAgICAgICAgICAgIGNvbnN0IGxlZnRUeXBlTmFtZSA9IGxlZnRUeXBlLmdldE5hbWUoKSxcbiAgICAgICAgICAgICAgICAgICAgcmlnaHRUeXBlTmFtZSA9IHJpZ2h0VHlwZS5nZXROYW1lKCksXG4gICAgICAgICAgICAgICAgICAgIGxlZnRUZXJtU3RyaW5nID0gY29udGV4dC5ub2RlQXNTdHJpbmcobGVmdFRlcm1Ob2RlKSxcbiAgICAgICAgICAgICAgICAgICAgcmlnaHRUZXJtU3RyaW5nID0gY29udGV4dC5ub2RlQXNTdHJpbmcocmlnaHRUZXJtTm9kZSk7XG5cbiAgICAgICAgICAgICAgY29udGV4dC5kZWJ1ZyhgVGhlIGxlZnQgJyR7bGVmdFRlcm1TdHJpbmd9JyB0ZXJtJ3MgJyR7bGVmdFR5cGVOYW1lfScgdHlwZSBpcyBub3QgZXF1YWwgdG8sIGEgc3ViLXR5cGUgb2Ygbm9yIGEgc3VwZXItdHlwZSBvZiB0aGUgcmlnaHQgJyR7cmlnaHRUZXJtU3RyaW5nfScgdGVybSdzICcke3JpZ2h0VHlwZU5hbWV9JyB0eXBlLmAsIHN0YXRlbWVudE5vZGUpO1xuICAgICAgICAgICAgfSBlbHNlIHtcbiAgICAgICAgICAgICAgdmVyaWZpZWRBaGVhZCA9IHZlcmlmeUFoZWFkKCk7XG4gICAgICAgICAgICB9XG5cbiAgICAgICAgICAgIHJldHVybiB2ZXJpZmllZEFoZWFkO1xuICAgICAgICAgIH0pO1xuXG4gICAgICAgICAgdmVyaWZpZWRBaGVhZCA9IHJpZ2h0VGVybVZlcmlmaWVkOyAgLy8vXG5cbiAgICAgICAgICByZXR1cm4gdmVyaWZpZWRBaGVhZDtcbiAgICAgICAgfSk7XG5cbiAgaWYgKHRlcm1zVmVyaWZpZWQpIHtcbiAgICBjb250ZXh0LmRlYnVnKGAuLi52ZXJpZmllZCB0aGUgJyR7bGVmdFRlcm1TdHJpbmd9JyBhbmQgJyR7cmlnaHRUZXJtU3RyaW5nfScgdGVybXMuYCwgbGVmdFRlcm1Ob2RlKTtcbiAgfVxuXG4gIHRlcm1zVmVyaWZpZWQgPSBsZWZ0VGVybVZlcmlmaWVkOyAvLy9cblxuICByZXR1cm4gdGVybXNWZXJpZmllZFxufVxuIl0sIm5hbWVzIjpbInZlcmlmeVRlcm1zIiwibGVmdFRlcm1Ob2RlIiwicmlnaHRUZXJtTm9kZSIsImNvbnRleHQiLCJ2ZXJpZnlBaGVhZCIsInRlcm1zVmVyaWZpZWQiLCJsZWZ0VGVybVN0cmluZyIsIm5vZGVBc1N0cmluZyIsInJpZ2h0VGVybVN0cmluZyIsInRyYWNlIiwidHlwZXMiLCJsZWZ0VGVybVZlcmlmaWVkIiwidmVyaWZ5VGVybSIsInZlcmlmaWVkQWhlYWQiLCJyaWdodFRlcm1WZXJpZmllZCIsImZpcnN0VHlwZSIsImZpcnN0Iiwic2Vjb25kVHlwZSIsInNlY29uZCIsImxlZnRUeXBlIiwicmlnaHRUeXBlIiwibGVmdFR5cGVFcXVhbFRvT3JTdWJUeXBlT2ZPZlN1cGVyVHlwZU9mUmlnaHRUeXBlIiwiaXNFcXVhbFRvT3JTdWJUeXBlT2ZPZlN1cGVyVHlwZU9mIiwibGVmdFR5cGVOYW1lIiwiZ2V0TmFtZSIsInJpZ2h0VHlwZU5hbWUiLCJkZWJ1ZyIsInN0YXRlbWVudE5vZGUiXSwibWFwcGluZ3MiOiJBQUFBOzs7OytCQU1BOzs7ZUFBd0JBOzs7MkRBSkQ7cUJBRU87Ozs7OztBQUVmLFNBQVNBLFlBQVlDLFlBQVksRUFBRUMsYUFBYSxFQUFFQyxPQUFPLEVBQUVDLFdBQVc7SUFDbkYsSUFBSUM7SUFFSixJQUFNQyxpQkFBaUJILFFBQVFJLFlBQVksQ0FBQ04sZUFDdENPLGtCQUFrQkwsUUFBUUksWUFBWSxDQUFDTDtJQUU3Q0MsUUFBUU0sS0FBSyxDQUFDLEFBQUMsa0JBQXlDRCxPQUF4QkYsZ0JBQWUsV0FBeUIsT0FBaEJFLGlCQUFnQixlQUFhUDtJQUVyRixJQUFNUyxRQUFRLEVBQUUsRUFDVkMsbUJBQW1CQyxJQUFBQSxhQUFVLEVBQUNYLGNBQWNTLE9BQU9QLFNBQVM7UUFDMUQsSUFBSVU7UUFFSixJQUFNQyxvQkFBb0JGLElBQUFBLGFBQVUsRUFBQ1YsZUFBZVEsT0FBT1AsU0FBUztZQUNsRSxJQUFJVSxnQkFBZ0I7WUFFcEIsSUFBTUUsWUFBWUMsSUFBQUEsWUFBSyxFQUFDTixRQUNsQk8sYUFBYUMsSUFBQUEsYUFBTSxFQUFDUixRQUNwQlMsV0FBV0osV0FDWEssWUFBWUgsWUFDWkksbURBQW1ERixTQUFTRyxpQ0FBaUMsQ0FBQ0Y7WUFFcEcsSUFBSSxDQUFDQyxrREFBa0Q7Z0JBQ3JELElBQU1FLGVBQWVKLFNBQVNLLE9BQU8sSUFDL0JDLGdCQUFnQkwsVUFBVUksT0FBTyxJQUNqQ2xCLGlCQUFpQkgsUUFBUUksWUFBWSxDQUFDTixlQUN0Q08sa0JBQWtCTCxRQUFRSSxZQUFZLENBQUNMO2dCQUU3Q0MsUUFBUXVCLEtBQUssQ0FBQyxBQUFDLGFBQXVDSCxPQUEzQmpCLGdCQUFlLGNBQWdHRSxPQUFwRmUsY0FBYSx5RUFBbUdFLE9BQTVCakIsaUJBQWdCLGNBQTBCLE9BQWRpQixlQUFjLFlBQVVFO1lBQ2hNLE9BQU87Z0JBQ0xkLGdCQUFnQlQ7WUFDbEI7WUFFQSxPQUFPUztRQUNUO1FBRUFBLGdCQUFnQkMsbUJBQW9CLEdBQUc7UUFFdkMsT0FBT0Q7SUFDVDtJQUVOLElBQUlSLGVBQWU7UUFDakJGLFFBQVF1QixLQUFLLENBQUMsQUFBQyxvQkFBMkNsQixPQUF4QkYsZ0JBQWUsV0FBeUIsT0FBaEJFLGlCQUFnQixhQUFXUDtJQUN2RjtJQUVBSSxnQkFBZ0JNLGtCQUFrQixHQUFHO0lBRXJDLE9BQU9OO0FBQ1QifQ==
|
package/lib/verify/theorem.js
CHANGED
|
@@ -25,7 +25,7 @@ var proofNodeQuery = (0, _query.nodeQuery)("/theorem/proof!"), labelNodesQuery =
|
|
|
25
25
|
function verifyTheorem(theoremNode, fileContext) {
|
|
26
26
|
var theoremVerified = false;
|
|
27
27
|
var labelNodes = labelNodesQuery(theoremNode), labelsString = fileContext.nodesAsString(labelNodes), proofContext = _proof1.default.fromFileContext(fileContext);
|
|
28
|
-
fileContext.
|
|
28
|
+
fileContext.trace("Verifying the '".concat(labelsString, "' theorem..."), theoremNode);
|
|
29
29
|
var labels = [], labelsVerified = (0, _labels.default)(labelNodes, labels, fileContext);
|
|
30
30
|
if (labelsVerified) {
|
|
31
31
|
var suppositions = [], suppositionNodes = suppositionsNodeQuery(theoremNode), suppositionsVerified = suppositionNodes.every(function(suppositionNode) {
|
|
@@ -47,9 +47,9 @@ function verifyTheorem(theoremNode, fileContext) {
|
|
|
47
47
|
}
|
|
48
48
|
}
|
|
49
49
|
if (theoremVerified) {
|
|
50
|
-
fileContext.
|
|
50
|
+
fileContext.debug("...verified the '".concat(labelsString, "' theorem."), theoremNode);
|
|
51
51
|
}
|
|
52
52
|
return theoremVerified;
|
|
53
53
|
}
|
|
54
54
|
|
|
55
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
55
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy92ZXJpZnkvdGhlb3JlbS5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuaW1wb3J0IFRoZW9yZW0gZnJvbSBcIi4uL3RoZW9yZW1cIjtcbmltcG9ydCB2ZXJpZnlQcm9vZiBmcm9tIFwiLi4vdmVyaWZ5L3Byb29mXCI7XG5pbXBvcnQgUHJvb2ZDb250ZXh0IGZyb20gXCIuLi9jb250ZXh0L3Byb29mXCI7XG5pbXBvcnQgdmVyaWZ5TGFiZWxzIGZyb20gXCIuLi92ZXJpZnkvbGFiZWxzXCI7XG5pbXBvcnQgdmVyaWZ5Q29uc2VxdWVudCBmcm9tIFwiLi9jb25zZXF1ZW50XCI7XG5pbXBvcnQgdmVyaWZ5U3VwcG9zaXRpb24gZnJvbSBcIi4vc3VwcG9zaXRpb25cIjtcblxuaW1wb3J0IHsgZmlyc3QgfSBmcm9tIFwiLi4vdXRpbGl0aWVzL2FycmF5XCI7XG5pbXBvcnQgeyBub2RlUXVlcnksIG5vZGVzUXVlcnkgfSBmcm9tIFwiLi4vdXRpbGl0aWVzL3F1ZXJ5XCI7XG5cbmNvbnN0IHByb29mTm9kZVF1ZXJ5ID0gbm9kZVF1ZXJ5KFwiL3RoZW9yZW0vcHJvb2YhXCIpLFxuICAgICAgbGFiZWxOb2Rlc1F1ZXJ5ID0gbm9kZXNRdWVyeShcIi90aGVvcmVtL2xhYmVscy9sYWJlbFwiKSxcbiAgICAgIGNvbnNlcXVlbnROb2RlUXVlcnkgPSBub2RlUXVlcnkoXCIvdGhlb3JlbS9jb25zZXF1ZW50IVwiKSxcbiAgICAgIHN1cHBvc2l0aW9uc05vZGVRdWVyeSA9IG5vZGVzUXVlcnkoXCIvdGhlb3JlbS9zdXBwb3NpdGlvblwiKTtcblxuZXhwb3J0IGRlZmF1bHQgZnVuY3Rpb24gdmVyaWZ5VGhlb3JlbSh0aGVvcmVtTm9kZSwgZmlsZUNvbnRleHQpIHtcbiAgbGV0IHRoZW9yZW1WZXJpZmllZCA9IGZhbHNlO1xuXG4gIGNvbnN0IGxhYmVsTm9kZXMgPSBsYWJlbE5vZGVzUXVlcnkodGhlb3JlbU5vZGUpLFxuICAgICAgICBsYWJlbHNTdHJpbmcgPSBmaWxlQ29udGV4dC5ub2Rlc0FzU3RyaW5nKGxhYmVsTm9kZXMpLFxuICAgICAgICBwcm9vZkNvbnRleHQgPSBQcm9vZkNvbnRleHQuZnJvbUZpbGVDb250ZXh0KGZpbGVDb250ZXh0KTtcblxuICBmaWxlQ29udGV4dC50cmFjZShgVmVyaWZ5aW5nIHRoZSAnJHtsYWJlbHNTdHJpbmd9JyB0aGVvcmVtLi4uYCwgdGhlb3JlbU5vZGUpO1xuXG4gIGNvbnN0IGxhYmVscyA9IFtdLFxuICAgICAgICBsYWJlbHNWZXJpZmllZCA9IHZlcmlmeUxhYmVscyhsYWJlbE5vZGVzLCBsYWJlbHMsIGZpbGVDb250ZXh0KTtcblxuICBpZiAobGFiZWxzVmVyaWZpZWQpIHtcbiAgICBjb25zdCBzdXBwb3NpdGlvbnMgPSBbXSxcbiAgICAgICAgICBzdXBwb3NpdGlvbk5vZGVzID0gc3VwcG9zaXRpb25zTm9kZVF1ZXJ5KHRoZW9yZW1Ob2RlKSxcbiAgICAgICAgICBzdXBwb3NpdGlvbnNWZXJpZmllZCA9IHN1cHBvc2l0aW9uTm9kZXMuZXZlcnkoKHN1cHBvc2l0aW9uTm9kZSkgPT4ge1xuICAgICAgICAgICAgY29uc3Qgc3VwcG9zaXRpb25WZXJpZmllZCA9IHZlcmlmeVN1cHBvc2l0aW9uKHN1cHBvc2l0aW9uTm9kZSwgc3VwcG9zaXRpb25zLCBwcm9vZkNvbnRleHQpO1xuXG4gICAgICAgICAgICBpZiAoc3VwcG9zaXRpb25WZXJpZmllZCkge1xuICAgICAgICAgICAgICByZXR1cm4gdHJ1ZTtcbiAgICAgICAgICAgIH1cbiAgICAgICAgICB9KTtcblxuICAgIGlmIChzdXBwb3NpdGlvbnNWZXJpZmllZCkge1xuICAgICAgY29uc3QgY29uc2VxdWVudHMgPSBbXSxcbiAgICAgICAgICAgIGNvbnNlcXVlbnROb2RlID0gY29uc2VxdWVudE5vZGVRdWVyeSh0aGVvcmVtTm9kZSksXG4gICAgICAgICAgICBjb25zZXF1ZW50VmVyaWZpZWQgPSB2ZXJpZnlDb25zZXF1ZW50KGNvbnNlcXVlbnROb2RlLCBjb25zZXF1ZW50cywgcHJvb2ZDb250ZXh0KTtcblxuICAgICAgaWYgKGNvbnNlcXVlbnRWZXJpZmllZCkge1xuICAgICAgICBjb25zdCBwcm9vZk5vZGUgPSBwcm9vZk5vZGVRdWVyeSh0aGVvcmVtTm9kZSksXG4gICAgICAgICAgICAgIGZpcnN0Q29uc2VxdWVudCA9IGZpcnN0KGNvbnNlcXVlbnRzKSxcbiAgICAgICAgICAgICAgY29uc2VxdWVudCA9IGZpcnN0Q29uc2VxdWVudCwgLy8vXG4gICAgICAgICAgICAgIHByb29mVmVyaWZpZWQgPSB2ZXJpZnlQcm9vZihwcm9vZk5vZGUsIGNvbnNlcXVlbnQsIHByb29mQ29udGV4dCk7XG5cbiAgICAgICAgaWYgKHByb29mVmVyaWZpZWQpIHtcbiAgICAgICAgICBjb25zdCB0aGVvcmVtID0gVGhlb3JlbS5mcm9tTGFiZWxzU3VwcG9zaXRpb25zQ29uc2VxdWVudEFuZFByb29mQ29udGV4dChsYWJlbHMsIHN1cHBvc2l0aW9ucywgY29uc2VxdWVudCwgcHJvb2ZDb250ZXh0KTtcblxuICAgICAgICAgIGZpbGVDb250ZXh0LmFkZFRoZW9yZW0odGhlb3JlbSk7XG5cbiAgICAgICAgICB0aGVvcmVtVmVyaWZpZWQgPSB0cnVlO1xuICAgICAgICB9XG4gICAgICB9XG4gICAgfVxuICB9XG5cbiAgaWYgKHRoZW9yZW1WZXJpZmllZCkge1xuICAgIGZpbGVDb250ZXh0LmRlYnVnKGAuLi52ZXJpZmllZCB0aGUgJyR7bGFiZWxzU3RyaW5nfScgdGhlb3JlbS5gLCB0aGVvcmVtTm9kZSk7XG4gIH1cblxuICByZXR1cm4gdGhlb3JlbVZlcmlmaWVkO1xufVxuIl0sIm5hbWVzIjpbInZlcmlmeVRoZW9yZW0iLCJwcm9vZk5vZGVRdWVyeSIsIm5vZGVRdWVyeSIsImxhYmVsTm9kZXNRdWVyeSIsIm5vZGVzUXVlcnkiLCJjb25zZXF1ZW50Tm9kZVF1ZXJ5Iiwic3VwcG9zaXRpb25zTm9kZVF1ZXJ5IiwidGhlb3JlbU5vZGUiLCJmaWxlQ29udGV4dCIsInRoZW9yZW1WZXJpZmllZCIsImxhYmVsTm9kZXMiLCJsYWJlbHNTdHJpbmciLCJub2Rlc0FzU3RyaW5nIiwicHJvb2ZDb250ZXh0IiwiUHJvb2ZDb250ZXh0IiwiZnJvbUZpbGVDb250ZXh0IiwidHJhY2UiLCJsYWJlbHMiLCJsYWJlbHNWZXJpZmllZCIsInZlcmlmeUxhYmVscyIsInN1cHBvc2l0aW9ucyIsInN1cHBvc2l0aW9uTm9kZXMiLCJzdXBwb3NpdGlvbnNWZXJpZmllZCIsImV2ZXJ5Iiwic3VwcG9zaXRpb25Ob2RlIiwic3VwcG9zaXRpb25WZXJpZmllZCIsInZlcmlmeVN1cHBvc2l0aW9uIiwiY29uc2VxdWVudHMiLCJjb25zZXF1ZW50Tm9kZSIsImNvbnNlcXVlbnRWZXJpZmllZCIsInZlcmlmeUNvbnNlcXVlbnQiLCJwcm9vZk5vZGUiLCJmaXJzdENvbnNlcXVlbnQiLCJmaXJzdCIsImNvbnNlcXVlbnQiLCJwcm9vZlZlcmlmaWVkIiwidmVyaWZ5UHJvb2YiLCJ0aGVvcmVtIiwiVGhlb3JlbSIsImZyb21MYWJlbHNTdXBwb3NpdGlvbnNDb25zZXF1ZW50QW5kUHJvb2ZDb250ZXh0IiwiYWRkVGhlb3JlbSIsImRlYnVnIl0sIm1hcHBpbmdzIjoiQUFBQTs7OzsrQkFpQkE7OztlQUF3QkE7Ozs4REFmSjs0REFDSTs2REFDQzs2REFDQTtpRUFDSTtrRUFDQztxQkFFUjtxQkFDZ0I7Ozs7OztBQUV0QyxJQUFNQyxpQkFBaUJDLElBQUFBLGdCQUFTLEVBQUMsb0JBQzNCQyxrQkFBa0JDLElBQUFBLGlCQUFVLEVBQUMsMEJBQzdCQyxzQkFBc0JILElBQUFBLGdCQUFTLEVBQUMseUJBQ2hDSSx3QkFBd0JGLElBQUFBLGlCQUFVLEVBQUM7QUFFMUIsU0FBU0osY0FBY08sV0FBVyxFQUFFQyxXQUFXO0lBQzVELElBQUlDLGtCQUFrQjtJQUV0QixJQUFNQyxhQUFhUCxnQkFBZ0JJLGNBQzdCSSxlQUFlSCxZQUFZSSxhQUFhLENBQUNGLGFBQ3pDRyxlQUFlQyxlQUFZLENBQUNDLGVBQWUsQ0FBQ1A7SUFFbERBLFlBQVlRLEtBQUssQ0FBQyxBQUFDLGtCQUE4QixPQUFiTCxjQUFhLGlCQUFlSjtJQUVoRSxJQUFNVSxTQUFTLEVBQUUsRUFDWEMsaUJBQWlCQyxJQUFBQSxlQUFZLEVBQUNULFlBQVlPLFFBQVFUO0lBRXhELElBQUlVLGdCQUFnQjtRQUNsQixJQUFNRSxlQUFlLEVBQUUsRUFDakJDLG1CQUFtQmYsc0JBQXNCQyxjQUN6Q2UsdUJBQXVCRCxpQkFBaUJFLEtBQUssQ0FBQyxTQUFDQztZQUM3QyxJQUFNQyxzQkFBc0JDLElBQUFBLG9CQUFpQixFQUFDRixpQkFBaUJKLGNBQWNQO1lBRTdFLElBQUlZLHFCQUFxQjtnQkFDdkIsT0FBTztZQUNUO1FBQ0Y7UUFFTixJQUFJSCxzQkFBc0I7WUFDeEIsSUFBTUssY0FBYyxFQUFFLEVBQ2hCQyxpQkFBaUJ2QixvQkFBb0JFLGNBQ3JDc0IscUJBQXFCQyxJQUFBQSxtQkFBZ0IsRUFBQ0YsZ0JBQWdCRCxhQUFhZDtZQUV6RSxJQUFJZ0Isb0JBQW9CO2dCQUN0QixJQUFNRSxZQUFZOUIsZUFBZU0sY0FDM0J5QixrQkFBa0JDLElBQUFBLFlBQUssRUFBQ04sY0FDeEJPLGFBQWFGLGlCQUNiRyxnQkFBZ0JDLElBQUFBLGNBQVcsRUFBQ0wsV0FBV0csWUFBWXJCO2dCQUV6RCxJQUFJc0IsZUFBZTtvQkFDakIsSUFBTUUsVUFBVUMsZ0JBQU8sQ0FBQ0MsK0NBQStDLENBQUN0QixRQUFRRyxjQUFjYyxZQUFZckI7b0JBRTFHTCxZQUFZZ0MsVUFBVSxDQUFDSDtvQkFFdkI1QixrQkFBa0I7Z0JBQ3BCO1lBQ0Y7UUFDRjtJQUNGO0lBRUEsSUFBSUEsaUJBQWlCO1FBQ25CRCxZQUFZaUMsS0FBSyxDQUFDLEFBQUMsb0JBQWdDLE9BQWI5QixjQUFhLGVBQWFKO0lBQ2xFO0lBRUEsT0FBT0U7QUFDVCJ9
|
package/lib/verify/type.js
CHANGED
|
@@ -17,9 +17,11 @@ function _interop_require_default(obj) {
|
|
|
17
17
|
}
|
|
18
18
|
function verifyType(typeNode, superTypeNode, fileContext) {
|
|
19
19
|
var typeVerified = false;
|
|
20
|
-
var
|
|
20
|
+
var typeString = fileContext.nodeAsString(typeNode);
|
|
21
|
+
fileContext.trace("Verifying the '".concat(typeString, "' type."));
|
|
22
|
+
var typeName = (0, _query.typeNameFromTypeNode)(typeNode), typePresent = fileContext.isTypePresentByTypeName(typeName);
|
|
21
23
|
if (typePresent) {
|
|
22
|
-
fileContext.
|
|
24
|
+
fileContext.debug("The type '".concat(typeName, "' is already present."), typeNode);
|
|
23
25
|
} else {
|
|
24
26
|
var type;
|
|
25
27
|
var superTypeName = (0, _query.typeNameFromTypeNode)(superTypeNode);
|
|
@@ -28,7 +30,7 @@ function verifyType(typeNode, superTypeNode, fileContext) {
|
|
|
28
30
|
} else {
|
|
29
31
|
var superType = fileContext.findTypeByTypeName(superTypeName);
|
|
30
32
|
if (superType === null) {
|
|
31
|
-
fileContext.
|
|
33
|
+
fileContext.debug("The super-type '".concat(superTypeName, "' is not present."), typeNode);
|
|
32
34
|
} else {
|
|
33
35
|
type = _type.default.fromTypeNameAndSuperType(typeName, superType);
|
|
34
36
|
}
|
|
@@ -39,9 +41,9 @@ function verifyType(typeNode, superTypeNode, fileContext) {
|
|
|
39
41
|
}
|
|
40
42
|
}
|
|
41
43
|
if (typeVerified) {
|
|
42
|
-
fileContext.
|
|
44
|
+
fileContext.debug("...verified the '".concat(typeString, "' type."), typeNode);
|
|
43
45
|
}
|
|
44
46
|
return typeVerified;
|
|
45
47
|
}
|
|
46
48
|
|
|
47
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
49
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy92ZXJpZnkvdHlwZS5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuaW1wb3J0IFR5cGUgZnJvbSBcIi4uL3R5cGVcIjtcblxuaW1wb3J0IHsgdHlwZU5hbWVGcm9tVHlwZU5vZGUgfSBmcm9tIFwiLi4vdXRpbGl0aWVzL3F1ZXJ5XCI7XG5cbmV4cG9ydCBkZWZhdWx0IGZ1bmN0aW9uIHZlcmlmeVR5cGUodHlwZU5vZGUsIHN1cGVyVHlwZU5vZGUsIGZpbGVDb250ZXh0KSB7XG4gIGxldCB0eXBlVmVyaWZpZWQgPSBmYWxzZTtcblxuICBjb25zdCB0eXBlU3RyaW5nID0gZmlsZUNvbnRleHQubm9kZUFzU3RyaW5nKHR5cGVOb2RlKTtcblxuICBmaWxlQ29udGV4dC50cmFjZShgVmVyaWZ5aW5nIHRoZSAnJHt0eXBlU3RyaW5nfScgdHlwZS5gKTtcblxuICBjb25zdCB0eXBlTmFtZSA9IHR5cGVOYW1lRnJvbVR5cGVOb2RlKHR5cGVOb2RlKSxcbiAgICAgICAgdHlwZVByZXNlbnQgPSBmaWxlQ29udGV4dC5pc1R5cGVQcmVzZW50QnlUeXBlTmFtZSh0eXBlTmFtZSk7XG5cbiAgaWYgKHR5cGVQcmVzZW50KSB7XG4gICAgZmlsZUNvbnRleHQuZGVidWcoYFRoZSB0eXBlICcke3R5cGVOYW1lfScgaXMgYWxyZWFkeSBwcmVzZW50LmAsIHR5cGVOb2RlKTtcbiAgfSBlbHNlIHtcbiAgICBsZXQgdHlwZTtcblxuICAgIGNvbnN0IHN1cGVyVHlwZU5hbWUgPSB0eXBlTmFtZUZyb21UeXBlTm9kZShzdXBlclR5cGVOb2RlKTtcblxuICAgIGlmIChzdXBlclR5cGVOYW1lID09PSBudWxsKSB7XG4gICAgICB0eXBlID0gVHlwZS5mcm9tVHlwZU5hbWUodHlwZU5hbWUpO1xuICAgIH0gZWxzZSB7XG4gICAgICBjb25zdCBzdXBlclR5cGUgPSBmaWxlQ29udGV4dC5maW5kVHlwZUJ5VHlwZU5hbWUoc3VwZXJUeXBlTmFtZSk7XG5cbiAgICAgIGlmIChzdXBlclR5cGUgPT09IG51bGwpIHtcbiAgICAgICAgZmlsZUNvbnRleHQuZGVidWcoYFRoZSBzdXBlci10eXBlICcke3N1cGVyVHlwZU5hbWV9JyBpcyBub3QgcHJlc2VudC5gLCB0eXBlTm9kZSk7XG4gICAgICB9IGVsc2Uge1xuICAgICAgICB0eXBlID0gVHlwZS5mcm9tVHlwZU5hbWVBbmRTdXBlclR5cGUodHlwZU5hbWUsIHN1cGVyVHlwZSk7XG4gICAgICB9XG4gICAgfVxuXG4gICAgaWYgKHR5cGUgIT09IG51bGwpIHtcbiAgICAgIGZpbGVDb250ZXh0LmFkZFR5cGUodHlwZSk7XG5cbiAgICAgIHR5cGVWZXJpZmllZCA9IHRydWU7XG4gICAgfVxuICB9XG5cbiAgaWYgKHR5cGVWZXJpZmllZCkge1xuICAgIGZpbGVDb250ZXh0LmRlYnVnKGAuLi52ZXJpZmllZCB0aGUgJyR7dHlwZVN0cmluZ30nIHR5cGUuYCwgdHlwZU5vZGUpO1xuICB9XG5cbiAgcmV0dXJuIHR5cGVWZXJpZmllZDtcbn1cbiJdLCJuYW1lcyI6WyJ2ZXJpZnlUeXBlIiwidHlwZU5vZGUiLCJzdXBlclR5cGVOb2RlIiwiZmlsZUNvbnRleHQiLCJ0eXBlVmVyaWZpZWQiLCJ0eXBlU3RyaW5nIiwibm9kZUFzU3RyaW5nIiwidHJhY2UiLCJ0eXBlTmFtZSIsInR5cGVOYW1lRnJvbVR5cGVOb2RlIiwidHlwZVByZXNlbnQiLCJpc1R5cGVQcmVzZW50QnlUeXBlTmFtZSIsImRlYnVnIiwidHlwZSIsInN1cGVyVHlwZU5hbWUiLCJUeXBlIiwiZnJvbVR5cGVOYW1lIiwic3VwZXJUeXBlIiwiZmluZFR5cGVCeVR5cGVOYW1lIiwiZnJvbVR5cGVOYW1lQW5kU3VwZXJUeXBlIiwiYWRkVHlwZSJdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7K0JBTUE7OztlQUF3QkE7OzsyREFKUDtxQkFFb0I7Ozs7OztBQUV0QixTQUFTQSxXQUFXQyxRQUFRLEVBQUVDLGFBQWEsRUFBRUMsV0FBVztJQUNyRSxJQUFJQyxlQUFlO0lBRW5CLElBQU1DLGFBQWFGLFlBQVlHLFlBQVksQ0FBQ0w7SUFFNUNFLFlBQVlJLEtBQUssQ0FBQyxBQUFDLGtCQUE0QixPQUFYRixZQUFXO0lBRS9DLElBQU1HLFdBQVdDLElBQUFBLDJCQUFvQixFQUFDUixXQUNoQ1MsY0FBY1AsWUFBWVEsdUJBQXVCLENBQUNIO0lBRXhELElBQUlFLGFBQWE7UUFDZlAsWUFBWVMsS0FBSyxDQUFDLEFBQUMsYUFBcUIsT0FBVEosVUFBUywwQkFBd0JQO0lBQ2xFLE9BQU87UUFDTCxJQUFJWTtRQUVKLElBQU1DLGdCQUFnQkwsSUFBQUEsMkJBQW9CLEVBQUNQO1FBRTNDLElBQUlZLGtCQUFrQixNQUFNO1lBQzFCRCxPQUFPRSxhQUFJLENBQUNDLFlBQVksQ0FBQ1I7UUFDM0IsT0FBTztZQUNMLElBQU1TLFlBQVlkLFlBQVllLGtCQUFrQixDQUFDSjtZQUVqRCxJQUFJRyxjQUFjLE1BQU07Z0JBQ3RCZCxZQUFZUyxLQUFLLENBQUMsQUFBQyxtQkFBZ0MsT0FBZEUsZUFBYyxzQkFBb0JiO1lBQ3pFLE9BQU87Z0JBQ0xZLE9BQU9FLGFBQUksQ0FBQ0ksd0JBQXdCLENBQUNYLFVBQVVTO1lBQ2pEO1FBQ0Y7UUFFQSxJQUFJSixTQUFTLE1BQU07WUFDakJWLFlBQVlpQixPQUFPLENBQUNQO1lBRXBCVCxlQUFlO1FBQ2pCO0lBQ0Y7SUFFQSxJQUFJQSxjQUFjO1FBQ2hCRCxZQUFZUyxLQUFLLENBQUMsQUFBQyxvQkFBOEIsT0FBWFAsWUFBVyxZQUFVSjtJQUM3RDtJQUVBLE9BQU9HO0FBQ1QifQ==
|
|
@@ -0,0 +1,124 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", {
|
|
3
|
+
value: true
|
|
4
|
+
});
|
|
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() {
|
|
13
|
+
return verifyTypeAssertion;
|
|
14
|
+
},
|
|
15
|
+
verifyVariableTypeAssertion: function() {
|
|
16
|
+
return verifyVariableTypeAssertion;
|
|
17
|
+
}
|
|
18
|
+
});
|
|
19
|
+
var _variable = /*#__PURE__*/ _interop_require_default(require("../variable"));
|
|
20
|
+
var _assignment = /*#__PURE__*/ _interop_require_default(require("../assignment"));
|
|
21
|
+
var _array = require("../utilities/array");
|
|
22
|
+
var _query = require("../utilities/query");
|
|
23
|
+
var _term = require("../verify/term");
|
|
24
|
+
function _interop_require_default(obj) {
|
|
25
|
+
return obj && obj.__esModule ? obj : {
|
|
26
|
+
default: obj
|
|
27
|
+
};
|
|
28
|
+
}
|
|
29
|
+
var termNodeQuery = (0, _query.nodeQuery)("/typeAssertion/term!"), typeNodeQuery = (0, _query.nodeQuery)("/typeAssertion/type!");
|
|
30
|
+
function verifyTypeAssertion(typeAssertionNode, assignments, derived, context, verifyAhead) {
|
|
31
|
+
var typeAssertionVerified = false;
|
|
32
|
+
var typeAssertionString = context.nodeAsString(typeAssertionNode);
|
|
33
|
+
context.trace("Verifying the '".concat(typeAssertionString, "' type assertion..."), typeAssertionNode);
|
|
34
|
+
var typeNode = typeNodeQuery(typeAssertionNode), typeName = (0, _query.typeNameFromTypeNode)(typeNode), assertedTypeName = typeName, assertedType = context.findTypeByTypeName(assertedTypeName);
|
|
35
|
+
if (assertedType === null) {
|
|
36
|
+
context.debug("The '".concat(typeName, "' asserted type is not present."), typeAssertionNode);
|
|
37
|
+
} else {
|
|
38
|
+
var verifyTypeAssertionFunctions = [
|
|
39
|
+
verifyVariableTypeAssertion,
|
|
40
|
+
verifyTermTypeAssertion
|
|
41
|
+
];
|
|
42
|
+
typeAssertionVerified = verifyTypeAssertionFunctions.some(function(verifyTypeAssertionFunction) {
|
|
43
|
+
var typeAssertionVerified = verifyTypeAssertionFunction(typeAssertionNode, assertedType, assignments, derived, context, verifyAhead);
|
|
44
|
+
if (typeAssertionVerified) {
|
|
45
|
+
return true;
|
|
46
|
+
}
|
|
47
|
+
});
|
|
48
|
+
}
|
|
49
|
+
if (typeAssertionVerified) {
|
|
50
|
+
context.debug("...verified the '".concat(typeAssertionString, "' statement type assertion."), typeAssertionNode);
|
|
51
|
+
}
|
|
52
|
+
return typeAssertionVerified;
|
|
53
|
+
}
|
|
54
|
+
function verifyVariableTypeAssertion(typeAssertionNode, assertedType, assignments, derived, context, verifyAhead) {
|
|
55
|
+
var variableTypeAssertionVerified;
|
|
56
|
+
var typeAssertionString = context.nodeAsString(typeAssertionNode);
|
|
57
|
+
context.trace("Verifying the '".concat(typeAssertionString, "' variable type assertion..."), typeAssertionNode);
|
|
58
|
+
var variables = [], termNode = termNodeQuery(typeAssertionNode), termVerifiedAsVariable = (0, _term.verifyTermAsVariable)(termNode, variables, context, function() {
|
|
59
|
+
var verifiedAhead = false;
|
|
60
|
+
var firstVariable = (0, _array.first)(variables), variable = firstVariable, variableName = variable.getName(), variableType = variable.getType();
|
|
61
|
+
if (derived) {
|
|
62
|
+
var assertedTypeEqualToOrSuperTypeOfVariableType = assertedType.isEqualToOrSuperTypeOf(variableType);
|
|
63
|
+
if (!assertedTypeEqualToOrSuperTypeOfVariableType) {
|
|
64
|
+
var assertedTypeName = assertedType.getName(), variableTypeName = variableType.getName();
|
|
65
|
+
context.debug("The '".concat(assertedTypeName, "' asserted type is not equal to or a super-type of the '").concat(variableName, "' variable's '").concat(variableTypeName, "' type."), typeAssertionNode);
|
|
66
|
+
} else {
|
|
67
|
+
verifiedAhead = verifyAhead();
|
|
68
|
+
}
|
|
69
|
+
} else {
|
|
70
|
+
var assertedTypeEqualToOrSubTypeOfVariableType = assertedType.isEqualToOrSubTypeOf(variableType);
|
|
71
|
+
if (!assertedTypeEqualToOrSubTypeOfVariableType) {
|
|
72
|
+
var assertedTypeName1 = assertedType.getName(), variableTypeName1 = variableType.getName();
|
|
73
|
+
context.debug("The '".concat(assertedTypeName1, "' asserted type is not equal to or a sub-type of the '").concat(variableName, "' variable's '").concat(variableTypeName1, "' type."), typeAssertionNode);
|
|
74
|
+
} else {
|
|
75
|
+
var name = variableName, type = assertedType, variable1 = _variable.default.fromNameAndType(name, type), assignment = _assignment.default.fromVariable(variable1);
|
|
76
|
+
assignments.push(assignment);
|
|
77
|
+
verifiedAhead = verifyAhead();
|
|
78
|
+
if (!verifiedAhead) {
|
|
79
|
+
assignments.pop();
|
|
80
|
+
}
|
|
81
|
+
}
|
|
82
|
+
}
|
|
83
|
+
return verifiedAhead;
|
|
84
|
+
});
|
|
85
|
+
variableTypeAssertionVerified = termVerifiedAsVariable; ///
|
|
86
|
+
if (variableTypeAssertionVerified) {
|
|
87
|
+
context.debug("...verified the '".concat(typeAssertionString, "' variable type assertion."), typeAssertionNode);
|
|
88
|
+
}
|
|
89
|
+
return variableTypeAssertionVerified;
|
|
90
|
+
}
|
|
91
|
+
function verifyTermTypeAssertion(typeAssertionNode, assertedType, assignments, derived, context, verifyAhead) {
|
|
92
|
+
var termTypeAssertionVerified;
|
|
93
|
+
var typeAssertionString = context.nodeAsString(typeAssertionNode);
|
|
94
|
+
context.trace("Verifying the '".concat(typeAssertionString, "' term type assertion..."), typeAssertionNode);
|
|
95
|
+
var types = [], termNode = termNodeQuery(typeAssertionNode), termVerifiedAgainstConstructors = (0, _term.verifyTermAgainstConstructors)(termNode, types, context, function() {
|
|
96
|
+
var verifiedAhead = false;
|
|
97
|
+
var firstType = (0, _array.first)(types), termType = firstType; ///
|
|
98
|
+
if (derived) {
|
|
99
|
+
var assertedTypeIsEqualToOrSuperTypeOfTermType = assertedType.isEqualToOrSuperTypeOf(termType);
|
|
100
|
+
if (!assertedTypeIsEqualToOrSuperTypeOfTermType) {
|
|
101
|
+
var termString = context.nodeAsString(termNode), termTypeName = termType.getName(), assertedTypeName = assertedType.getName();
|
|
102
|
+
context.debug("The '".concat(assertedTypeName, "' asserted type is not equal to or a super-type of the '").concat(termString, "' term's '").concat(termTypeName, "' type."), typeAssertionNode);
|
|
103
|
+
} else {
|
|
104
|
+
verifiedAhead = verifyAhead();
|
|
105
|
+
}
|
|
106
|
+
} else {
|
|
107
|
+
var assertedTypeIsEqualToOrSubTypeOfTermType = assertedType.isEqualToOrSubTypeOf(termType);
|
|
108
|
+
if (!assertedTypeIsEqualToOrSubTypeOfTermType) {
|
|
109
|
+
var termString1 = context.nodeAsString(termNode), termTypeName1 = termType.getName(), assertedTypeName1 = assertedType.getName();
|
|
110
|
+
context.debug("The '".concat(assertedTypeName1, "' asserted type is not equal to or a sub-type of the '").concat(termString1, "' term's '").concat(termTypeName1, "' type."), typeAssertionNode);
|
|
111
|
+
} else {
|
|
112
|
+
verifiedAhead = verifyAhead();
|
|
113
|
+
}
|
|
114
|
+
}
|
|
115
|
+
return verifiedAhead;
|
|
116
|
+
});
|
|
117
|
+
termTypeAssertionVerified = termVerifiedAgainstConstructors; ///
|
|
118
|
+
if (termTypeAssertionVerified) {
|
|
119
|
+
context.debug("...verified the '".concat(typeAssertionString, "' term type assertion."), typeAssertionNode);
|
|
120
|
+
}
|
|
121
|
+
return termTypeAssertionVerified;
|
|
122
|
+
}
|
|
123
|
+
|
|
124
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/verify/typeAssertion.js"],"sourcesContent":["\"use strict\";\n\nimport Variable from \"../variable\";\nimport Assignment from \"../assignment\";\n\nimport { first } from \"../utilities/array\";\nimport { nodeQuery, typeNameFromTypeNode } from \"../utilities/query\";\nimport { verifyTermAsVariable, verifyTermAgainstConstructors } from \"../verify/term\";\n\nconst termNodeQuery = nodeQuery(\"/typeAssertion/term!\"),\n      typeNodeQuery = nodeQuery(\"/typeAssertion/type!\");\n\nexport default function verifyTypeAssertion(typeAssertionNode, assignments, derived, context, verifyAhead) {\n  let typeAssertionVerified = false;\n\n  const typeAssertionString = context.nodeAsString(typeAssertionNode);\n\n  context.trace(`Verifying the '${typeAssertionString}' type assertion...`, typeAssertionNode);\n\n  const typeNode = typeNodeQuery(typeAssertionNode),\n        typeName = typeNameFromTypeNode(typeNode),\n        assertedTypeName = typeName,  ///\n        assertedType = context.findTypeByTypeName(assertedTypeName);\n\n  if (assertedType === null) {\n    context.debug(`The '${typeName}' asserted type is not present.`, typeAssertionNode);\n  } else {\n    const verifyTypeAssertionFunctions = [\n      verifyVariableTypeAssertion,\n      verifyTermTypeAssertion\n    ];\n\n    typeAssertionVerified = verifyTypeAssertionFunctions.some((verifyTypeAssertionFunction) => {\n      const typeAssertionVerified = verifyTypeAssertionFunction(typeAssertionNode, assertedType, assignments, derived, context, verifyAhead);\n\n      if (typeAssertionVerified) {\n        return true;\n      }\n    });\n  }\n\n  if (typeAssertionVerified) {\n    context.debug(`...verified the '${typeAssertionString}' statement type assertion.`, typeAssertionNode);\n  }\n\n  return typeAssertionVerified;\n}\n\nexport function verifyVariableTypeAssertion(typeAssertionNode, assertedType, assignments, derived, context, verifyAhead) {\n  let variableTypeAssertionVerified;\n\n  const typeAssertionString = context.nodeAsString(typeAssertionNode);\n\n  context.trace(`Verifying the '${typeAssertionString}' variable type assertion...`, typeAssertionNode);\n\n  const variables = [],\n        termNode = termNodeQuery(typeAssertionNode),\n        termVerifiedAsVariable = verifyTermAsVariable(termNode, variables, context, () => {\n          let verifiedAhead = false;\n\n          const firstVariable = first(variables),\n                variable = firstVariable, ///\n                variableName = variable.getName(),\n                variableType = variable.getType();\n\n          if (derived) {\n            const assertedTypeEqualToOrSuperTypeOfVariableType = assertedType.isEqualToOrSuperTypeOf(variableType);\n\n            if (!assertedTypeEqualToOrSuperTypeOfVariableType) {\n              const assertedTypeName = assertedType.getName(),\n                    variableTypeName = variableType.getName();\n\n              context.debug(`The '${assertedTypeName}' asserted type is not equal to or a super-type of the '${variableName}' variable's '${variableTypeName}' type.`, typeAssertionNode);\n            } else {\n              verifiedAhead = verifyAhead();\n            }\n          } else {\n            const assertedTypeEqualToOrSubTypeOfVariableType = assertedType.isEqualToOrSubTypeOf(variableType);\n\n            if (!assertedTypeEqualToOrSubTypeOfVariableType) {\n              const assertedTypeName = assertedType.getName(),\n                    variableTypeName = variableType.getName();\n\n              context.debug(`The '${assertedTypeName}' asserted type is not equal to or a sub-type of the '${variableName}' variable's '${variableTypeName}' type.`, typeAssertionNode);\n            } else {\n              const name = variableName,  ///\n                    type = assertedType,  ///\n                    variable = Variable.fromNameAndType(name, type),\n                    assignment = Assignment.fromVariable(variable);\n\n              assignments.push(assignment);\n\n              verifiedAhead = verifyAhead();\n\n              if (!verifiedAhead) {\n                assignments.pop();\n              }\n            }\n          }\n\n          return verifiedAhead;\n        });\n\n  variableTypeAssertionVerified = termVerifiedAsVariable; ///\n\n  if (variableTypeAssertionVerified) {\n    context.debug(`...verified the '${typeAssertionString}' variable type assertion.`, typeAssertionNode);\n  }\n\n  return variableTypeAssertionVerified;\n}\n\nfunction verifyTermTypeAssertion(typeAssertionNode, assertedType, assignments, derived, context, verifyAhead) {\n  let termTypeAssertionVerified;\n\n  const typeAssertionString = context.nodeAsString(typeAssertionNode);\n\n  context.trace(`Verifying the '${typeAssertionString}' term type assertion...`, typeAssertionNode);\n\n  const types = [],\n        termNode = termNodeQuery(typeAssertionNode),\n        termVerifiedAgainstConstructors = verifyTermAgainstConstructors(termNode, types, context, () => {\n          let verifiedAhead = false;\n\n          const firstType = first(types),\n                termType = firstType; ///\n\n          if (derived) {\n            const assertedTypeIsEqualToOrSuperTypeOfTermType = assertedType.isEqualToOrSuperTypeOf(termType);\n\n            if (!assertedTypeIsEqualToOrSuperTypeOfTermType) {\n              const termString = context.nodeAsString(termNode),\n                    termTypeName = termType.getName(),\n                    assertedTypeName = assertedType.getName();\n\n              context.debug(`The '${assertedTypeName}' asserted type is not equal to or a super-type of the '${termString}' term's '${termTypeName}' type.`, typeAssertionNode);\n            } else {\n              verifiedAhead = verifyAhead();\n            }\n          } else {\n            const assertedTypeIsEqualToOrSubTypeOfTermType = assertedType.isEqualToOrSubTypeOf(termType);\n\n            if (!assertedTypeIsEqualToOrSubTypeOfTermType) {\n              const termString = context.nodeAsString(termNode),\n                    termTypeName = termType.getName(),\n                    assertedTypeName = assertedType.getName();\n\n              context.debug(`The '${assertedTypeName}' asserted type is not equal to or a sub-type of the '${termString}' term's '${termTypeName}' type.`, typeAssertionNode);\n            } else {\n              verifiedAhead = verifyAhead();\n            }\n          }\n\n          return verifiedAhead;\n        });\n\n  termTypeAssertionVerified = termVerifiedAgainstConstructors;  ///\n\n  if (termTypeAssertionVerified) {\n    context.debug(`...verified the '${typeAssertionString}' term type assertion.`, typeAssertionNode);\n  }\n\n  return termTypeAssertionVerified;\n}\n"],"names":["verifyTypeAssertion","verifyVariableTypeAssertion","termNodeQuery","nodeQuery","typeNodeQuery","typeAssertionNode","assignments","derived","context","verifyAhead","typeAssertionVerified","typeAssertionString","nodeAsString","trace","typeNode","typeName","typeNameFromTypeNode","assertedTypeName","assertedType","findTypeByTypeName","debug","verifyTypeAssertionFunctions","verifyTermTypeAssertion","some","verifyTypeAssertionFunction","variableTypeAssertionVerified","variables","termNode","termVerifiedAsVariable","verifyTermAsVariable","verifiedAhead","firstVariable","first","variable","variableName","getName","variableType","getType","assertedTypeEqualToOrSuperTypeOfVariableType","isEqualToOrSuperTypeOf","variableTypeName","assertedTypeEqualToOrSubTypeOfVariableType","isEqualToOrSubTypeOf","name","type","Variable","fromNameAndType","assignment","Assignment","fromVariable","push","pop","termTypeAssertionVerified","types","termVerifiedAgainstConstructors","verifyTermAgainstConstructors","firstType","termType","assertedTypeIsEqualToOrSuperTypeOfTermType","termString","termTypeName","assertedTypeIsEqualToOrSubTypeOfTermType"],"mappings":"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"}
|
package/lib/verify/variable.js
CHANGED
|
@@ -18,9 +18,11 @@ function _interop_require_default(obj) {
|
|
|
18
18
|
}
|
|
19
19
|
function verifyVariable(variableNode, typeNode, fileContext) {
|
|
20
20
|
var variableVerified = false;
|
|
21
|
-
var
|
|
21
|
+
var variableString = fileContext.nodeAsString(variableNode);
|
|
22
|
+
fileContext.trace("Verifying the '".concat(variableString, "' variable..."), variableNode);
|
|
23
|
+
var variableName = (0, _query.variableNameFromVariableNode)(variableNode), variablePresent = fileContext.isVariablePresentByVariableName(variableName);
|
|
22
24
|
if (variablePresent) {
|
|
23
|
-
fileContext.
|
|
25
|
+
fileContext.debug("The variable '".concat(variableName, "' is already present."), variableNode);
|
|
24
26
|
} else {
|
|
25
27
|
var variable;
|
|
26
28
|
var typeName = (0, _query.typeNameFromTypeNode)(typeNode);
|
|
@@ -30,7 +32,7 @@ function verifyVariable(variableNode, typeNode, fileContext) {
|
|
|
30
32
|
} else {
|
|
31
33
|
var type1 = fileContext.findTypeByTypeName(typeName);
|
|
32
34
|
if (type1 === null) {
|
|
33
|
-
fileContext.
|
|
35
|
+
fileContext.debug("The '".concat(variableName, "' variable's '").concat(typeName, "' type is not present."), variableNode);
|
|
34
36
|
} else {
|
|
35
37
|
var name1 = variableName; ///
|
|
36
38
|
variable = _variable.default.fromNameAndType(name1, type1);
|
|
@@ -42,9 +44,9 @@ function verifyVariable(variableNode, typeNode, fileContext) {
|
|
|
42
44
|
}
|
|
43
45
|
}
|
|
44
46
|
if (variableVerified) {
|
|
45
|
-
fileContext.
|
|
47
|
+
fileContext.debug("...verified the '".concat(variableString, "' variable."), variableNode);
|
|
46
48
|
}
|
|
47
49
|
return variableVerified;
|
|
48
50
|
}
|
|
49
51
|
|
|
50
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
52
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy92ZXJpZnkvdmFyaWFibGUuanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmltcG9ydCBWYXJpYWJsZSBmcm9tIFwiLi4vdmFyaWFibGVcIjtcblxuaW1wb3J0IHsgb2JqZWN0VHlwZSB9IGZyb20gXCIuLi90eXBlXCI7XG5pbXBvcnQgeyB0eXBlTmFtZUZyb21UeXBlTm9kZSwgdmFyaWFibGVOYW1lRnJvbVZhcmlhYmxlTm9kZSB9IGZyb20gXCIuLi91dGlsaXRpZXMvcXVlcnlcIjtcblxuZXhwb3J0IGRlZmF1bHQgZnVuY3Rpb24gdmVyaWZ5VmFyaWFibGUodmFyaWFibGVOb2RlLCB0eXBlTm9kZSwgZmlsZUNvbnRleHQpIHtcbiAgbGV0IHZhcmlhYmxlVmVyaWZpZWQgPSBmYWxzZTtcblxuICBjb25zdCB2YXJpYWJsZVN0cmluZyA9IGZpbGVDb250ZXh0Lm5vZGVBc1N0cmluZyh2YXJpYWJsZU5vZGUpO1xuXG4gIGZpbGVDb250ZXh0LnRyYWNlKGBWZXJpZnlpbmcgdGhlICcke3ZhcmlhYmxlU3RyaW5nfScgdmFyaWFibGUuLi5gLCB2YXJpYWJsZU5vZGUpO1xuXG4gIGNvbnN0IHZhcmlhYmxlTmFtZSA9IHZhcmlhYmxlTmFtZUZyb21WYXJpYWJsZU5vZGUodmFyaWFibGVOb2RlKSxcbiAgICAgICAgdmFyaWFibGVQcmVzZW50ID0gZmlsZUNvbnRleHQuaXNWYXJpYWJsZVByZXNlbnRCeVZhcmlhYmxlTmFtZSh2YXJpYWJsZU5hbWUpO1xuXG4gIGlmICh2YXJpYWJsZVByZXNlbnQpIHtcbiAgICBmaWxlQ29udGV4dC5kZWJ1ZyhgVGhlIHZhcmlhYmxlICcke3ZhcmlhYmxlTmFtZX0nIGlzIGFscmVhZHkgcHJlc2VudC5gLCB2YXJpYWJsZU5vZGUpO1xuICB9IGVsc2Uge1xuICAgIGxldCB2YXJpYWJsZTtcblxuICAgIGNvbnN0IHR5cGVOYW1lID0gdHlwZU5hbWVGcm9tVHlwZU5vZGUodHlwZU5vZGUpO1xuICAgIFxuICAgIGlmICh0eXBlTmFtZSA9PT0gbnVsbCkge1xuICAgICAgY29uc3QgbmFtZSA9IHZhcmlhYmxlTmFtZSwgIC8vL1xuICAgICAgICAgICAgdHlwZSA9IG9iamVjdFR5cGU7XG5cbiAgICAgICAgdmFyaWFibGUgPSBWYXJpYWJsZS5mcm9tTmFtZUFuZFR5cGUobmFtZSwgdHlwZSk7XG4gICAgfSBlbHNlIHtcbiAgICAgIGNvbnN0IHR5cGUgPSBmaWxlQ29udGV4dC5maW5kVHlwZUJ5VHlwZU5hbWUodHlwZU5hbWUpO1xuXG4gICAgICBpZiAodHlwZSA9PT0gbnVsbCkge1xuICAgICAgICBmaWxlQ29udGV4dC5kZWJ1ZyhgVGhlICcke3ZhcmlhYmxlTmFtZX0nIHZhcmlhYmxlJ3MgJyR7dHlwZU5hbWV9JyB0eXBlIGlzIG5vdCBwcmVzZW50LmAsIHZhcmlhYmxlTm9kZSk7XG4gICAgICB9IGVsc2Uge1xuICAgICAgICBjb25zdCBuYW1lID0gdmFyaWFibGVOYW1lOyAgLy8vXG5cbiAgICAgICAgdmFyaWFibGUgPSBWYXJpYWJsZS5mcm9tTmFtZUFuZFR5cGUobmFtZSwgdHlwZSk7XG4gICAgICB9XG4gICAgfVxuXG4gICAgaWYgKHZhcmlhYmxlICE9PSBudWxsKSB7XG4gICAgICBmaWxlQ29udGV4dC5hZGRWYXJpYWJsZSh2YXJpYWJsZSk7XG5cbiAgICAgIHZhcmlhYmxlVmVyaWZpZWQgPSB0cnVlO1xuICAgIH1cbiAgfVxuXG4gIGlmICh2YXJpYWJsZVZlcmlmaWVkKSB7XG4gICAgZmlsZUNvbnRleHQuZGVidWcoYC4uLnZlcmlmaWVkIHRoZSAnJHt2YXJpYWJsZVN0cmluZ30nIHZhcmlhYmxlLmAsIHZhcmlhYmxlTm9kZSk7XG4gIH1cblxuICByZXR1cm4gdmFyaWFibGVWZXJpZmllZDtcbn1cbiJdLCJuYW1lcyI6WyJ2ZXJpZnlWYXJpYWJsZSIsInZhcmlhYmxlTm9kZSIsInR5cGVOb2RlIiwiZmlsZUNvbnRleHQiLCJ2YXJpYWJsZVZlcmlmaWVkIiwidmFyaWFibGVTdHJpbmciLCJub2RlQXNTdHJpbmciLCJ0cmFjZSIsInZhcmlhYmxlTmFtZSIsInZhcmlhYmxlTmFtZUZyb21WYXJpYWJsZU5vZGUiLCJ2YXJpYWJsZVByZXNlbnQiLCJpc1ZhcmlhYmxlUHJlc2VudEJ5VmFyaWFibGVOYW1lIiwiZGVidWciLCJ2YXJpYWJsZSIsInR5cGVOYW1lIiwidHlwZU5hbWVGcm9tVHlwZU5vZGUiLCJuYW1lIiwidHlwZSIsIm9iamVjdFR5cGUiLCJWYXJpYWJsZSIsImZyb21OYW1lQW5kVHlwZSIsImZpbmRUeXBlQnlUeXBlTmFtZSIsImFkZFZhcmlhYmxlIl0sIm1hcHBpbmdzIjoiQUFBQTs7OzsrQkFPQTs7O2VBQXdCQTs7OytEQUxIO29CQUVNO3FCQUN3Qzs7Ozs7O0FBRXBELFNBQVNBLGVBQWVDLFlBQVksRUFBRUMsUUFBUSxFQUFFQyxXQUFXO0lBQ3hFLElBQUlDLG1CQUFtQjtJQUV2QixJQUFNQyxpQkFBaUJGLFlBQVlHLFlBQVksQ0FBQ0w7SUFFaERFLFlBQVlJLEtBQUssQ0FBQyxBQUFDLGtCQUFnQyxPQUFmRixnQkFBZSxrQkFBZ0JKO0lBRW5FLElBQU1PLGVBQWVDLElBQUFBLG1DQUE0QixFQUFDUixlQUM1Q1Msa0JBQWtCUCxZQUFZUSwrQkFBK0IsQ0FBQ0g7SUFFcEUsSUFBSUUsaUJBQWlCO1FBQ25CUCxZQUFZUyxLQUFLLENBQUMsQUFBQyxpQkFBNkIsT0FBYkosY0FBYSwwQkFBd0JQO0lBQzFFLE9BQU87UUFDTCxJQUFJWTtRQUVKLElBQU1DLFdBQVdDLElBQUFBLDJCQUFvQixFQUFDYjtRQUV0QyxJQUFJWSxhQUFhLE1BQU07WUFDckIsSUFBTUUsT0FBT1IsY0FDUFMsT0FBT0MsZ0JBQVU7WUFFckJMLFdBQVdNLGlCQUFRLENBQUNDLGVBQWUsQ0FBQ0osTUFBTUM7UUFDOUMsT0FBTztZQUNMLElBQU1BLFFBQU9kLFlBQVlrQixrQkFBa0IsQ0FBQ1A7WUFFNUMsSUFBSUcsVUFBUyxNQUFNO2dCQUNqQmQsWUFBWVMsS0FBSyxDQUFDLEFBQUMsUUFBb0NFLE9BQTdCTixjQUFhLGtCQUF5QixPQUFUTSxVQUFTLDJCQUF5QmI7WUFDM0YsT0FBTztnQkFDTCxJQUFNZSxRQUFPUixjQUFlLEdBQUc7Z0JBRS9CSyxXQUFXTSxpQkFBUSxDQUFDQyxlQUFlLENBQUNKLE9BQU1DO1lBQzVDO1FBQ0Y7UUFFQSxJQUFJSixhQUFhLE1BQU07WUFDckJWLFlBQVltQixXQUFXLENBQUNUO1lBRXhCVCxtQkFBbUI7UUFDckI7SUFDRjtJQUVBLElBQUlBLGtCQUFrQjtRQUNwQkQsWUFBWVMsS0FBSyxDQUFDLEFBQUMsb0JBQWtDLE9BQWZQLGdCQUFlLGdCQUFjSjtJQUNyRTtJQUVBLE9BQU9HO0FBQ1QifQ==
|
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.680",
|
|
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": "^12.0.1",
|
|
15
|
-
"occam-custom-grammars": "^5.0.
|
|
15
|
+
"occam-custom-grammars": "^5.0.533",
|
|
16
16
|
"occam-dom": "^3.1.70",
|
|
17
|
-
"occam-entities": "^1.0.
|
|
18
|
-
"occam-file-system": "^6.0.
|
|
19
|
-
"occam-grammar-utilities": "^8.0.
|
|
17
|
+
"occam-entities": "^1.0.16",
|
|
18
|
+
"occam-file-system": "^6.0.61",
|
|
19
|
+
"occam-grammar-utilities": "^8.0.45"
|
|
20
20
|
},
|
|
21
21
|
"devDependencies": {
|
|
22
22
|
"@swc/core": "^1.2.51",
|
|
@@ -175,8 +175,8 @@ function matchSupposition(supposition, proofSteps, substitutions, proofContext,
|
|
|
175
175
|
return suppositionMatches;
|
|
176
176
|
}
|
|
177
177
|
|
|
178
|
-
function matchSuppositions(
|
|
179
|
-
const suppositionsMatch =
|
|
178
|
+
function matchSuppositions(suppositions, proofSteps, substitutions, proofContext, statementProofContext) {
|
|
179
|
+
const suppositionsMatch = suppositions.every((supposition) => {
|
|
180
180
|
const suppositionMatches = matchSupposition(supposition, proofSteps, substitutions, proofContext, statementProofContext);
|
|
181
181
|
|
|
182
182
|
if (suppositionMatches) {
|
package/src/conclusion.js
CHANGED
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
+
import conclusionStatementForMetavariableNodesVerifier from "./verifier/nodes/statementForMetavariable/conclusion";
|
|
4
|
+
import conclusionMetastatementForMetavariableNodesVerifier from "./verifier/nodes/metastatementForMetavariable/conclusion";
|
|
5
|
+
|
|
3
6
|
import { nodeAsString } from "./utilities/string";
|
|
4
7
|
import { metastatementNodeFromMetastatementString } from "./utilities/node";
|
|
5
|
-
import { conclusionStatementForMetavariableVerifier } from "./verifier/statementForMetavariable/conclusion";
|
|
6
|
-
import { conclusionMetastatementForMetavariableVerifier } from "./verifier/metastatementForMetavariable/conclusion";
|
|
7
8
|
|
|
8
9
|
export default class Conclusion {
|
|
9
10
|
constructor(metastatementNode) {
|
|
@@ -19,7 +20,11 @@ export default class Conclusion {
|
|
|
19
20
|
nonTerminalNodeB = statementNode, ///
|
|
20
21
|
fileContextA = fileContext, ///
|
|
21
22
|
proofContextB = statementProofContext, ///
|
|
22
|
-
nonTerminalNodeVerified =
|
|
23
|
+
nonTerminalNodeVerified = conclusionStatementForMetavariableNodesVerifier.verifyNonTerminalNode(nonTerminalNodeA, nonTerminalNodeB, substitutions, fileContextA, proofContextB, () => {
|
|
24
|
+
const verifyAhead = true;
|
|
25
|
+
|
|
26
|
+
return verifyAhead;
|
|
27
|
+
}),
|
|
23
28
|
statementNodeMatches = nonTerminalNodeVerified; ///
|
|
24
29
|
|
|
25
30
|
return statementNodeMatches;
|
|
@@ -30,7 +35,11 @@ export default class Conclusion {
|
|
|
30
35
|
nonTerminalNodeB = metastatementNode, ///
|
|
31
36
|
fileContextA = fileContext, ///
|
|
32
37
|
metaproofContextB = metastatementMetaproofContext, ///
|
|
33
|
-
nonTerminalNodeVerified =
|
|
38
|
+
nonTerminalNodeVerified = conclusionMetastatementForMetavariableNodesVerifier.verifyNonTerminalNode(nonTerminalNodeA, nonTerminalNodeB, substitutions, fileContextA, metaproofContextB, () => {
|
|
39
|
+
const verifiedAhead = true;
|
|
40
|
+
|
|
41
|
+
return verifiedAhead;
|
|
42
|
+
}),
|
|
34
43
|
metastatementNodeMatches = nonTerminalNodeVerified; ///
|
|
35
44
|
|
|
36
45
|
return metastatementNodeMatches;
|
package/src/consequent.js
CHANGED
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
+
import consequentTermForVariableNodesVerifier from "./verifier/nodes/termForVariable/consequent";
|
|
4
|
+
|
|
3
5
|
import { nodeAsString } from "./utilities/string";
|
|
4
6
|
import { statementNodeFromStatementString } from "./utilities/node";
|
|
5
|
-
import { consequentTermForVariableVerifier } from "./verifier/termForVariable/consequent";
|
|
6
7
|
|
|
7
8
|
export default class Consequent {
|
|
8
9
|
constructor(statementNode) {
|
|
@@ -16,7 +17,13 @@ export default class Consequent {
|
|
|
16
17
|
matchStatementNode(statementNode, substitutions, proofContext) {
|
|
17
18
|
const nonTerminalNodeA = this.statementNode, ///
|
|
18
19
|
nonTerminalNodeB = statementNode, ///
|
|
19
|
-
|
|
20
|
+
proofContextA = proofContext, ///
|
|
21
|
+
proofContextB = null, ///
|
|
22
|
+
nonTerminalNodeVerified = consequentTermForVariableNodesVerifier.verifyNonTerminalNode(nonTerminalNodeA, nonTerminalNodeB, substitutions, proofContextA, proofContextB, () => {
|
|
23
|
+
const verifiedAhead = true;
|
|
24
|
+
|
|
25
|
+
return verifiedAhead;
|
|
26
|
+
}),
|
|
20
27
|
statementNodeMatches = nonTerminalNodeVerified; ///
|
|
21
28
|
|
|
22
29
|
return statementNodeMatches;
|