occam-verify-cli 0.0.679 → 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/lib/axiomLemmaTheoremConjecture.js +3 -3
- package/lib/conclusion.js +9 -3
- package/lib/consequent.js +5 -2
- package/lib/context/file.js +2 -2
- package/lib/equality.js +13 -199
- package/lib/premise.js +17 -5
- package/lib/supposition.js +9 -3
- package/lib/utilities/array.js +5 -2
- package/lib/verifier/node/metastatement.js +9 -6
- package/lib/verifier/node/termAsConstructor.js +2 -2
- package/lib/verifier/nodes/equality.js +155 -0
- package/lib/verifier/nodes/metastatementForMetavariable.js +8 -8
- package/lib/verifier/nodes/statement.js +6 -5
- package/lib/verifier/nodes/term.js +3 -5
- package/lib/verifier/nodes/termForVariable.js +24 -16
- package/lib/verify/file.js +2 -2
- package/lib/verify/label.js +2 -2
- package/lib/verify/metastatement.js +8 -5
- package/lib/verify/metavariable.js +2 -2
- package/lib/verify/statement.js +39 -80
- package/lib/verify/term.js +16 -8
- package/lib/verify/termAsConstructor.js +2 -2
- package/lib/verify/terms.js +45 -0
- package/lib/verify/type.js +3 -3
- package/lib/verify/typeAssertion.js +124 -0
- package/lib/verify/variable.js +3 -3
- package/package.json +2 -2
- package/src/axiomLemmaTheoremConjecture.js +2 -2
- package/src/conclusion.js +10 -2
- package/src/consequent.js +7 -1
- package/src/context/file.js +2 -2
- package/src/equality.js +15 -141
- package/src/premise.js +20 -4
- package/src/supposition.js +10 -2
- package/src/utilities/array.js +1 -1
- package/src/verifier/node/metastatement.js +9 -5
- package/src/verifier/node/termAsConstructor.js +1 -1
- package/src/verifier/nodes/equality.js +68 -0
- package/src/verifier/nodes/metastatementForMetavariable.js +7 -7
- package/src/verifier/nodes/statement.js +6 -4
- package/src/verifier/nodes/term.js +1 -6
- package/src/verifier/nodes/termForVariable.js +34 -22
- package/src/verify/file.js +1 -1
- package/src/verify/label.js +1 -1
- package/src/verify/metastatement.js +8 -4
- package/src/verify/metavariable.js +1 -1
- package/src/verify/statement.js +50 -119
- package/src/verify/term.js +20 -12
- package/src/verify/termAsConstructor.js +1 -1
- package/src/verify/terms.js +54 -0
- package/src/verify/type.js +2 -2
- package/src/verify/typeAssertion.js +164 -0
- package/src/verify/variable.js +2 -2
- 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/verify/assertion/type.js +0 -125
- 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/verify/assertion/type.js +0 -169
- package/src/verify/typeInference.js +0 -146
package/lib/verify/term.js
CHANGED
|
@@ -43,8 +43,7 @@ function verifyTerm(termNode, types, context, verifyAhead) {
|
|
|
43
43
|
}
|
|
44
44
|
});
|
|
45
45
|
if (termVerified) {
|
|
46
|
-
|
|
47
|
-
context.debug("...verified the '".concat(termString, "' term, which has been given the '").concat(typeName, "' type."), termNode);
|
|
46
|
+
context.debug("...verified the '".concat(termString, "' term."), termNode);
|
|
48
47
|
}
|
|
49
48
|
return termVerified;
|
|
50
49
|
}
|
|
@@ -65,21 +64,24 @@ function verifyTermAgainstConstructors(termNode, types, context, verifyAhead) {
|
|
|
65
64
|
}
|
|
66
65
|
function verifyTermAsVariable(termNode, variables, context, verifyAhead) {
|
|
67
66
|
var termVerifiedAsVariable = false;
|
|
68
|
-
var termString = context.nodeAsString(termNode);
|
|
69
|
-
context.trace("Verifying the '".concat(termString, "' term as a variable..."), termNode);
|
|
70
67
|
var variableNode = variableNodeQuery(termNode);
|
|
71
68
|
if (variableNode !== null) {
|
|
69
|
+
var termString = context.nodeAsString(termNode);
|
|
70
|
+
context.trace("Verifying the '".concat(termString, "' term as a variable..."), termNode);
|
|
72
71
|
var variableName = (0, _query.variableNameFromVariableNode)(variableNode), variablePresent = context.isVariablePresentByVariableName(variableName);
|
|
73
72
|
if (variablePresent) {
|
|
74
73
|
var verifiedAhead;
|
|
75
74
|
var variable = context.findVariableByVariableName(variableName);
|
|
76
75
|
variables.push(variable);
|
|
77
76
|
verifiedAhead = verifyAhead();
|
|
77
|
+
if (!verifiedAhead) {
|
|
78
|
+
variables.pop();
|
|
79
|
+
}
|
|
78
80
|
termVerifiedAsVariable = verifiedAhead; ///
|
|
79
81
|
}
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
82
|
+
if (termVerifiedAsVariable) {
|
|
83
|
+
context.debug("...verified the '".concat(termString, "' term as a variable."), termNode);
|
|
84
|
+
}
|
|
83
85
|
}
|
|
84
86
|
return termVerifiedAsVariable;
|
|
85
87
|
}
|
|
@@ -92,6 +94,9 @@ function verifyTermAgainstConstructor(termNode, types, constructor, context, ver
|
|
|
92
94
|
var type = constructor.getType();
|
|
93
95
|
types.push(type);
|
|
94
96
|
verifiedAhead = verifyAhead();
|
|
97
|
+
if (!verifiedAhead) {
|
|
98
|
+
types.pop();
|
|
99
|
+
}
|
|
95
100
|
return verifiedAhead;
|
|
96
101
|
});
|
|
97
102
|
termVerifiedAgainstConstructor = nodeVerified; ///
|
|
@@ -109,6 +114,9 @@ function verifyTermAsStandaloneVariable(termNode, types, context, verifyAhead) {
|
|
|
109
114
|
var firstVariable = (0, _array.first)(variables), variable = firstVariable, type = variable.getType();
|
|
110
115
|
types.push(type);
|
|
111
116
|
verifiedAhead = verifyAhead();
|
|
117
|
+
if (!verifiedAhead) {
|
|
118
|
+
types.pop();
|
|
119
|
+
}
|
|
112
120
|
return verifiedAhead;
|
|
113
121
|
});
|
|
114
122
|
termVerifiedAsStandaloneVariable = termVerifiedAsVariable; ///
|
|
@@ -118,4 +126,4 @@ function verifyTermAsStandaloneVariable(termNode, types, context, verifyAhead) {
|
|
|
118
126
|
return termVerifiedAsStandaloneVariable;
|
|
119
127
|
}
|
|
120
128
|
|
|
121
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/verify/term.js"],"sourcesContent":["\"use strict\";\n\nimport termNodesVerifier from \"../verifier/nodes/term\";\n\nimport { first } from \"../utilities/array\";\nimport { nodeQuery, variableNameFromVariableNode } from \"../utilities/query\";\n\nconst variableNodeQuery = nodeQuery(\"/term/variable!\");\n\nfunction verifyTerm(termNode, types, context, verifyAhead) {\n  let termVerified;\n\n  const termString = context.nodeAsString(termNode);\n\n  context.trace(`Verifying the '${termString}' term...`, termNode);\n\n  const verifyTermFunctions = [\n    verifyTermAsStandaloneVariable,\n    verifyTermAgainstConstructors\n  ];\n\n  termVerified = verifyTermFunctions.some((verifyTermFunction) => {\n    const termVerified = verifyTermFunction(termNode, types, context, verifyAhead);\n\n    if (termVerified) {\n      return true;\n    }\n  });\n\n  if (termVerified) {\n    const firstType = first(types),\n          type = firstType, ///\n          typeName = type.getName();\n\n    context.debug(`...verified the '${termString}' term, which has been given the '${typeName}' type.`, termNode);\n  }\n\n  return termVerified;\n}\n\nObject.assign(termNodesVerifier, {\n  verifyTerm\n});\n\nexport default verifyTerm;\n\nexport function verifyTermAgainstConstructors(termNode, types, context, verifyAhead) {\n  let termVerifiedAgainstConstructors;\n\n  const constructors = context.getConstructors();\n\n  termVerifiedAgainstConstructors = constructors.some((constructor) => {\n    const termVerifiedAgainstConstructor = verifyTermAgainstConstructor(termNode, types, constructor, context, verifyAhead);\n\n    if (termVerifiedAgainstConstructor) {\n      return true;\n    }\n  });\n\n  return termVerifiedAgainstConstructors;\n}\n\nexport function verifyTermAsVariable(termNode, variables, context, verifyAhead) {\n  let termVerifiedAsVariable = false;\n\n  const termString = context.nodeAsString(termNode);\n\n  context.trace(`Verifying the '${termString}' term as a variable...`, termNode);\n\n  const variableNode = variableNodeQuery(termNode);\n\n  if (variableNode !== null) {\n    const variableName = variableNameFromVariableNode(variableNode),\n          variablePresent = context.isVariablePresentByVariableName(variableName);\n\n    if (variablePresent) {\n      let verifiedAhead;\n\n      const variable = context.findVariableByVariableName(variableName);\n\n      variables.push(variable);\n\n      verifiedAhead = verifyAhead();\n\n      termVerifiedAsVariable = verifiedAhead; ///\n    }\n  }\n\n  if (termVerifiedAsVariable) {\n    context.debug(`...verified the '${termString}' term as a variable.`, termNode);\n  }\n\n  return termVerifiedAsVariable;\n}\n\nfunction verifyTermAgainstConstructor(termNode, types, constructor, context, verifyAhead) {\n  let termVerifiedAgainstConstructor;\n\n  const termString = context.nodeAsString(termNode),\n        constructorString = constructor.getString();\n\n  context.trace(`Verifying the '${termString}' term against the '${constructorString}' constructor...`, termNode);\n\n  const constructorTermNode = constructor.getTermNode(),\n        nonTerminalNNdeA = termNode,  ///\n        nonTerminalNodeB = constructorTermNode,  ///\n        nodeVerified = termNodesVerifier.verifyNonTerminalNode(nonTerminalNNdeA, nonTerminalNodeB, context, () => {\n          let verifiedAhead;\n\n          const type = constructor.getType();\n\n          types.push(type);\n\n          verifiedAhead = verifyAhead();\n\n          return verifiedAhead;\n        });\n\n  termVerifiedAgainstConstructor = nodeVerified;  ///\n\n  if (termVerifiedAgainstConstructor) {\n    context.debug(`...verified the '${termString}' term against the '${constructorString}' constructor.`, termNode);\n  }\n\n  return termVerifiedAgainstConstructor;\n}\n\nfunction verifyTermAsStandaloneVariable(termNode, types, context, verifyAhead) {\n  let termVerifiedAsStandaloneVariable;\n\n  const termString = context.nodeAsString(termNode);\n\n  context.trace(`Verifying the '${termString}' term as a standalone variable...`, termNode);\n\n  const variables = [],\n        termVerifiedAsVariable = verifyTermAsVariable(termNode, variables, context, () => {\n          let verifiedAhead;\n\n          const firstVariable = first(variables),\n                variable = firstVariable, ///\n                type = variable.getType();\n\n          types.push(type);\n\n          verifiedAhead = verifyAhead();\n\n          return verifiedAhead;\n        });\n\n  termVerifiedAsStandaloneVariable = termVerifiedAsVariable;  ///\n\n  if (termVerifiedAsStandaloneVariable) {\n    context.debug(`...verified the '${termString}' term as a standalone variable.`, termNode);\n  }\n\n  return termVerifiedAsStandaloneVariable;\n}\n"],"names":["verifyTermAgainstConstructors","verifyTermAsVariable","variableNodeQuery","nodeQuery","verifyTerm","termNode","types","context","verifyAhead","termVerified","termString","nodeAsString","trace","verifyTermFunctions","verifyTermAsStandaloneVariable","some","verifyTermFunction","firstType","first","type","typeName","getName","debug","Object","assign","termNodesVerifier","termVerifiedAgainstConstructors","constructors","getConstructors","constructor","termVerifiedAgainstConstructor","verifyTermAgainstConstructor","variables","termVerifiedAsVariable","variableNode","variableName","variableNameFromVariableNode","variablePresent","isVariablePresentByVariableName","verifiedAhead","variable","findVariableByVariableName","push","constructorString","getString","constructorTermNode","getTermNode","nonTerminalNNdeA","nonTerminalNodeB","nodeVerified","verifyNonTerminalNode","getType","termVerifiedAsStandaloneVariable","firstVariable"],"mappings":"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"}
|
|
129
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/verify/term.js"],"sourcesContent":["\"use strict\";\n\nimport termNodesVerifier from \"../verifier/nodes/term\";\n\nimport { first } from \"../utilities/array\";\nimport { nodeQuery, variableNameFromVariableNode } from \"../utilities/query\";\n\nconst variableNodeQuery = nodeQuery(\"/term/variable!\");\n\nfunction verifyTerm(termNode, types, context, verifyAhead) {\n  let termVerified;\n\n  const termString = context.nodeAsString(termNode);\n\n  context.trace(`Verifying the '${termString}' term...`, termNode);\n\n  const verifyTermFunctions = [\n    verifyTermAsStandaloneVariable,\n    verifyTermAgainstConstructors\n  ];\n\n  termVerified = verifyTermFunctions.some((verifyTermFunction) => {\n    const termVerified = verifyTermFunction(termNode, types, context, verifyAhead);\n\n    if (termVerified) {\n      return true;\n    }\n  });\n\n  if (termVerified) {\n    context.debug(`...verified the '${termString}' term.`, termNode);\n  }\n\n  return termVerified;\n}\n\nObject.assign(termNodesVerifier, {\n  verifyTerm\n});\n\nexport default verifyTerm;\n\nexport function verifyTermAgainstConstructors(termNode, types, context, verifyAhead) {\n  let termVerifiedAgainstConstructors;\n\n  const constructors = context.getConstructors();\n\n  termVerifiedAgainstConstructors = constructors.some((constructor) => {\n    const termVerifiedAgainstConstructor = verifyTermAgainstConstructor(termNode, types, constructor, context, verifyAhead);\n\n    if (termVerifiedAgainstConstructor) {\n      return true;\n    }\n  });\n\n  return termVerifiedAgainstConstructors;\n}\n\nexport function verifyTermAsVariable(termNode, variables, context, verifyAhead) {\n  let termVerifiedAsVariable = false;\n\n  const variableNode = variableNodeQuery(termNode);\n\n  if (variableNode !== null) {\n    const termString = context.nodeAsString(termNode);\n\n    context.trace(`Verifying the '${termString}' term as a variable...`, termNode);\n\n    const variableName = variableNameFromVariableNode(variableNode),\n          variablePresent = context.isVariablePresentByVariableName(variableName);\n\n    if (variablePresent) {\n      let verifiedAhead;\n\n      const variable = context.findVariableByVariableName(variableName);\n\n      variables.push(variable);\n\n      verifiedAhead = verifyAhead();\n\n      if (!verifiedAhead) {\n        variables.pop();\n      }\n\n      termVerifiedAsVariable = verifiedAhead; ///\n    }\n\n    if (termVerifiedAsVariable) {\n      context.debug(`...verified the '${termString}' term as a variable.`, termNode);\n    }\n  }\n\n  return termVerifiedAsVariable;\n}\n\nfunction verifyTermAgainstConstructor(termNode, types, constructor, context, verifyAhead) {\n  let termVerifiedAgainstConstructor;\n\n  const termString = context.nodeAsString(termNode),\n        constructorString = constructor.getString();\n\n  context.trace(`Verifying the '${termString}' term against the '${constructorString}' constructor...`, termNode);\n\n  const constructorTermNode = constructor.getTermNode(),\n        nonTerminalNNdeA = termNode,  ///\n        nonTerminalNodeB = constructorTermNode,  ///\n        nodeVerified = termNodesVerifier.verifyNonTerminalNode(nonTerminalNNdeA, nonTerminalNodeB, context, () => {\n          let verifiedAhead;\n\n          const type = constructor.getType();\n\n          types.push(type);\n\n          verifiedAhead = verifyAhead();\n\n          if (!verifiedAhead) {\n            types.pop();\n          }\n\n          return verifiedAhead;\n        });\n\n  termVerifiedAgainstConstructor = nodeVerified;  ///\n\n  if (termVerifiedAgainstConstructor) {\n    context.debug(`...verified the '${termString}' term against the '${constructorString}' constructor.`, termNode);\n  }\n\n  return termVerifiedAgainstConstructor;\n}\n\nfunction verifyTermAsStandaloneVariable(termNode, types, context, verifyAhead) {\n  let termVerifiedAsStandaloneVariable;\n\n  const termString = context.nodeAsString(termNode);\n\n  context.trace(`Verifying the '${termString}' term as a standalone variable...`, termNode);\n\n  const variables = [],\n        termVerifiedAsVariable = verifyTermAsVariable(termNode, variables, context, () => {\n          let verifiedAhead;\n\n          const firstVariable = first(variables),\n                variable = firstVariable, ///\n                type = variable.getType();\n\n          types.push(type);\n\n          verifiedAhead = verifyAhead();\n\n          if (!verifiedAhead) {\n            types.pop();\n          }\n\n          return verifiedAhead;\n        });\n\n  termVerifiedAsStandaloneVariable = termVerifiedAsVariable;  ///\n\n  if (termVerifiedAsStandaloneVariable) {\n    context.debug(`...verified the '${termString}' term as a standalone variable.`, termNode);\n  }\n\n  return termVerifiedAsStandaloneVariable;\n}\n"],"names":["verifyTermAgainstConstructors","verifyTermAsVariable","variableNodeQuery","nodeQuery","verifyTerm","termNode","types","context","verifyAhead","termVerified","termString","nodeAsString","trace","verifyTermFunctions","verifyTermAsStandaloneVariable","some","verifyTermFunction","debug","Object","assign","termNodesVerifier","termVerifiedAgainstConstructors","constructors","getConstructors","constructor","termVerifiedAgainstConstructor","verifyTermAgainstConstructor","variables","termVerifiedAsVariable","variableNode","variableName","variableNameFromVariableNode","variablePresent","isVariablePresentByVariableName","verifiedAhead","variable","findVariableByVariableName","push","pop","constructorString","getString","constructorTermNode","getTermNode","nonTerminalNNdeA","nonTerminalNodeB","nodeVerified","verifyNonTerminalNode","type","getType","termVerifiedAsStandaloneVariable","firstVariable","first"],"mappings":"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"}
|
|
@@ -34,7 +34,7 @@ function verifyTermAsConstructor(termNode, typeNode, fileContext) {
|
|
|
34
34
|
if (type !== null) {
|
|
35
35
|
termVerifiedAsConstructor = true;
|
|
36
36
|
} else {
|
|
37
|
-
fileContext.
|
|
37
|
+
fileContext.debug("The '".concat(termString, "' constructor's '").concat(typeName, "' type is not present."), termNode);
|
|
38
38
|
}
|
|
39
39
|
}
|
|
40
40
|
if (termVerifiedAsConstructor) {
|
|
@@ -48,4 +48,4 @@ function verifyTermAsConstructor(termNode, typeNode, fileContext) {
|
|
|
48
48
|
return termVerifiedAsConstructor;
|
|
49
49
|
}
|
|
50
50
|
|
|
51
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
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/type.js
CHANGED
|
@@ -21,7 +21,7 @@ function verifyType(typeNode, superTypeNode, fileContext) {
|
|
|
21
21
|
fileContext.trace("Verifying the '".concat(typeString, "' type."));
|
|
22
22
|
var typeName = (0, _query.typeNameFromTypeNode)(typeNode), typePresent = fileContext.isTypePresentByTypeName(typeName);
|
|
23
23
|
if (typePresent) {
|
|
24
|
-
fileContext.
|
|
24
|
+
fileContext.debug("The type '".concat(typeName, "' is already present."), typeNode);
|
|
25
25
|
} else {
|
|
26
26
|
var type;
|
|
27
27
|
var superTypeName = (0, _query.typeNameFromTypeNode)(superTypeNode);
|
|
@@ -30,7 +30,7 @@ function verifyType(typeNode, superTypeNode, fileContext) {
|
|
|
30
30
|
} else {
|
|
31
31
|
var superType = fileContext.findTypeByTypeName(superTypeName);
|
|
32
32
|
if (superType === null) {
|
|
33
|
-
fileContext.
|
|
33
|
+
fileContext.debug("The super-type '".concat(superTypeName, "' is not present."), typeNode);
|
|
34
34
|
} else {
|
|
35
35
|
type = _type.default.fromTypeNameAndSuperType(typeName, superType);
|
|
36
36
|
}
|
|
@@ -46,4 +46,4 @@ function verifyType(typeNode, superTypeNode, fileContext) {
|
|
|
46
46
|
return typeVerified;
|
|
47
47
|
}
|
|
48
48
|
|
|
49
|
-
//# 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
|
@@ -22,7 +22,7 @@ function verifyVariable(variableNode, typeNode, fileContext) {
|
|
|
22
22
|
fileContext.trace("Verifying the '".concat(variableString, "' variable..."), variableNode);
|
|
23
23
|
var variableName = (0, _query.variableNameFromVariableNode)(variableNode), variablePresent = fileContext.isVariablePresentByVariableName(variableName);
|
|
24
24
|
if (variablePresent) {
|
|
25
|
-
fileContext.
|
|
25
|
+
fileContext.debug("The variable '".concat(variableName, "' is already present."), variableNode);
|
|
26
26
|
} else {
|
|
27
27
|
var variable;
|
|
28
28
|
var typeName = (0, _query.typeNameFromTypeNode)(typeNode);
|
|
@@ -32,7 +32,7 @@ function verifyVariable(variableNode, typeNode, fileContext) {
|
|
|
32
32
|
} else {
|
|
33
33
|
var type1 = fileContext.findTypeByTypeName(typeName);
|
|
34
34
|
if (type1 === null) {
|
|
35
|
-
fileContext.
|
|
35
|
+
fileContext.debug("The '".concat(variableName, "' variable's '").concat(typeName, "' type is not present."), variableNode);
|
|
36
36
|
} else {
|
|
37
37
|
var name1 = variableName; ///
|
|
38
38
|
variable = _variable.default.fromNameAndType(name1, type1);
|
|
@@ -49,4 +49,4 @@ function verifyVariable(variableNode, typeNode, fileContext) {
|
|
|
49
49
|
return variableVerified;
|
|
50
50
|
}
|
|
51
51
|
|
|
52
|
-
//# 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,7 +12,7 @@
|
|
|
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
17
|
"occam-entities": "^1.0.16",
|
|
18
18
|
"occam-file-system": "^6.0.61",
|
|
@@ -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
|
@@ -20,7 +20,11 @@ export default class Conclusion {
|
|
|
20
20
|
nonTerminalNodeB = statementNode, ///
|
|
21
21
|
fileContextA = fileContext, ///
|
|
22
22
|
proofContextB = statementProofContext, ///
|
|
23
|
-
nonTerminalNodeVerified = conclusionStatementForMetavariableNodesVerifier.verifyNonTerminalNode(nonTerminalNodeA, nonTerminalNodeB, substitutions, fileContextA, proofContextB)
|
|
23
|
+
nonTerminalNodeVerified = conclusionStatementForMetavariableNodesVerifier.verifyNonTerminalNode(nonTerminalNodeA, nonTerminalNodeB, substitutions, fileContextA, proofContextB, () => {
|
|
24
|
+
const verifyAhead = true;
|
|
25
|
+
|
|
26
|
+
return verifyAhead;
|
|
27
|
+
}),
|
|
24
28
|
statementNodeMatches = nonTerminalNodeVerified; ///
|
|
25
29
|
|
|
26
30
|
return statementNodeMatches;
|
|
@@ -31,7 +35,11 @@ export default class Conclusion {
|
|
|
31
35
|
nonTerminalNodeB = metastatementNode, ///
|
|
32
36
|
fileContextA = fileContext, ///
|
|
33
37
|
metaproofContextB = metastatementMetaproofContext, ///
|
|
34
|
-
nonTerminalNodeVerified = conclusionMetastatementForMetavariableNodesVerifier.verifyNonTerminalNode(nonTerminalNodeA, nonTerminalNodeB, substitutions, fileContextA, metaproofContextB)
|
|
38
|
+
nonTerminalNodeVerified = conclusionMetastatementForMetavariableNodesVerifier.verifyNonTerminalNode(nonTerminalNodeA, nonTerminalNodeB, substitutions, fileContextA, metaproofContextB, () => {
|
|
39
|
+
const verifiedAhead = true;
|
|
40
|
+
|
|
41
|
+
return verifiedAhead;
|
|
42
|
+
}),
|
|
35
43
|
metastatementNodeMatches = nonTerminalNodeVerified; ///
|
|
36
44
|
|
|
37
45
|
return metastatementNodeMatches;
|
package/src/consequent.js
CHANGED
|
@@ -17,7 +17,13 @@ export default class Consequent {
|
|
|
17
17
|
matchStatementNode(statementNode, substitutions, proofContext) {
|
|
18
18
|
const nonTerminalNodeA = this.statementNode, ///
|
|
19
19
|
nonTerminalNodeB = statementNode, ///
|
|
20
|
-
|
|
20
|
+
proofContextA = proofContext, ///
|
|
21
|
+
proofContextB = null, ///
|
|
22
|
+
nonTerminalNodeVerified = consequentTermForVariableNodesVerifier.verifyNonTerminalNode(nonTerminalNodeA, nonTerminalNodeB, substitutions, proofContextA, proofContextB, () => {
|
|
23
|
+
const verifiedAhead = true;
|
|
24
|
+
|
|
25
|
+
return verifiedAhead;
|
|
26
|
+
}),
|
|
21
27
|
statementNodeMatches = nonTerminalNodeVerified; ///
|
|
22
28
|
|
|
23
29
|
return statementNodeMatches;
|
package/src/context/file.js
CHANGED
|
@@ -225,14 +225,14 @@ export default class FileContext {
|
|
|
225
225
|
getConstructors(includeRelease = true) {
|
|
226
226
|
const constructors = [];
|
|
227
227
|
|
|
228
|
+
push(constructors, this.constructors);
|
|
229
|
+
|
|
228
230
|
if (includeRelease) {
|
|
229
231
|
const releaseContextConstructors = this.releaseContext.getConstructors();
|
|
230
232
|
|
|
231
233
|
push(constructors, releaseContextConstructors);
|
|
232
234
|
}
|
|
233
235
|
|
|
234
|
-
push(constructors, this.constructors);
|
|
235
|
-
|
|
236
236
|
return constructors;
|
|
237
237
|
}
|
|
238
238
|
|