occam-verify-cli 0.0.865 → 0.0.866
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 +7 -7
- package/lib/context/file.js +128 -68
- package/lib/context/local.js +4 -4
- package/lib/context/release.js +13 -1
- package/lib/label.js +6 -6
- package/lib/metaConsequent.js +88 -0
- package/lib/metaLemma.js +126 -0
- package/lib/metaLemmaMetatheorem.js +196 -0
- package/lib/metaSupposition.js +140 -0
- package/lib/metaType.js +33 -3
- package/lib/metaTypeNames.js +13 -4
- package/lib/metaTypes.js +9 -4
- package/lib/metatheorem.js +9 -9
- package/lib/mixins/context.js +30 -22
- package/lib/rule.js +7 -7
- package/lib/ruleNames.js +5 -1
- package/lib/step/metaproof.js +18 -4
- package/lib/type.js +9 -1
- package/lib/utilities/name.js +52 -0
- package/lib/utilities/query.js +1 -38
- package/lib/verifier/node/metastatement.js +3 -3
- package/lib/verifier/nodes/statementAgainstCombinator.js +4 -4
- package/lib/verifier/nodes/termAgainstConstructor.js +3 -3
- package/lib/verify/declaration/topLevel.js +11 -3
- package/lib/verify/givenMetavariable.js +31 -0
- package/lib/verify/givenType.js +2 -3
- package/lib/verify/label.js +3 -4
- package/lib/verify/metaConsequent.js +36 -0
- package/lib/verify/metaDerivation.js +111 -0
- package/lib/verify/metaLemma.js +51 -0
- package/lib/verify/metaSupposition.js +40 -0
- package/lib/verify/metaSuppositions.js +28 -0
- package/lib/verify/metaproof.js +34 -0
- package/lib/verify/metastatement/qualified.js +2 -2
- package/lib/verify/metatheorem.js +50 -0
- package/lib/verify/metavariable.js +30 -10
- package/lib/verify/proof.js +3 -3
- package/lib/verify/statement/qualified.js +28 -28
- package/lib/verify/termAsConstructor.js +4 -5
- package/lib/verify/type.js +18 -20
- package/lib/verify/variable.js +13 -16
- package/package.json +4 -4
- package/src/axiomLemmaTheoremConjecture.js +6 -6
- package/src/context/file.js +132 -61
- package/src/context/local.js +1 -1
- package/src/context/release.js +13 -0
- package/src/label.js +4 -6
- package/src/metaConsequent.js +58 -0
- package/src/metaLemma.js +9 -0
- package/src/metaLemmaMetatheorem.js +194 -0
- package/src/metaSupposition.js +103 -0
- package/src/metaType.js +23 -3
- package/src/metaTypeNames.js +1 -0
- package/src/metaTypes.js +8 -1
- package/src/metatheorem.js +4 -4
- package/src/mixins/context.js +20 -14
- package/src/rule.js +6 -6
- package/src/ruleNames.js +1 -0
- package/src/step/metaproof.js +20 -4
- package/src/type.js +10 -0
- package/src/utilities/name.js +50 -0
- package/src/utilities/query.js +0 -47
- package/src/verifier/node/metastatement.js +2 -1
- package/src/verifier/nodes/statementAgainstCombinator.js +3 -3
- package/src/verifier/nodes/termAgainstConstructor.js +3 -4
- package/src/verify/declaration/topLevel.js +14 -0
- package/src/verify/givenMetavariable.js +31 -0
- package/src/verify/givenType.js +1 -4
- package/src/verify/label.js +2 -5
- package/src/verify/metaConsequent.js +36 -0
- package/src/verify/metaDerivation.js +151 -0
- package/src/verify/metaLemma.js +67 -0
- package/src/verify/metaSupposition.js +44 -0
- package/src/verify/metaSuppositions.js +17 -0
- package/src/verify/metaproof.js +32 -0
- package/src/verify/metastatement/qualified.js +2 -3
- package/src/verify/metatheorem.js +62 -0
- package/src/verify/metavariable.js +46 -16
- package/src/verify/proof.js +2 -2
- package/src/verify/statement/qualified.js +27 -23
- package/src/verify/termAsConstructor.js +4 -6
- package/src/verify/type.js +20 -22
- package/src/verify/variable.js +14 -17
- package/lib/ruleMetatheorem.js +0 -253
- package/src/ruleMetatheorem.js +0 -274
|
@@ -11,7 +11,6 @@ Object.defineProperty(exports, "default", {
|
|
|
11
11
|
var _constructor = /*#__PURE__*/ _interop_require_default(require("../constructor"));
|
|
12
12
|
var _local = /*#__PURE__*/ _interop_require_default(require("../context/local"));
|
|
13
13
|
var _termAsConstructor = /*#__PURE__*/ _interop_require_default(require("../verifier/node/termAsConstructor"));
|
|
14
|
-
var _query = require("../utilities/query");
|
|
15
14
|
function _interop_require_default(obj) {
|
|
16
15
|
return obj && obj.__esModule ? obj : {
|
|
17
16
|
default: obj
|
|
@@ -30,12 +29,12 @@ function verifyTermAsConstructor(termNode, typeNode, fileContext) {
|
|
|
30
29
|
if (typeNode === null) {
|
|
31
30
|
termVerifiedAsConstructor = true;
|
|
32
31
|
} else {
|
|
33
|
-
|
|
34
|
-
type = fileContext.findTypeByTypeName(typeName);
|
|
32
|
+
type = fileContext.findTypeByTypeNode(typeNode);
|
|
35
33
|
if (type !== null) {
|
|
36
34
|
termVerifiedAsConstructor = true;
|
|
37
35
|
} else {
|
|
38
|
-
|
|
36
|
+
var typeString = fileContext.nodeAsString(typeNode);
|
|
37
|
+
fileContext.debug("The '".concat(termString, "' constructor's '").concat(typeString, "' type is not present."), termNode);
|
|
39
38
|
}
|
|
40
39
|
}
|
|
41
40
|
if (termVerifiedAsConstructor) {
|
|
@@ -49,4 +48,4 @@ function verifyTermAsConstructor(termNode, typeNode, fileContext) {
|
|
|
49
48
|
return termVerifiedAsConstructor;
|
|
50
49
|
}
|
|
51
50
|
|
|
52
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
51
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy92ZXJpZnkvdGVybUFzQ29uc3RydWN0b3IuanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmltcG9ydCBDb25zdHJ1Y3RvciBmcm9tIFwiLi4vY29uc3RydWN0b3JcIjtcbmltcG9ydCBMb2NhbENvbnRleHQgZnJvbSBcIi4uL2NvbnRleHQvbG9jYWxcIjtcbmltcG9ydCB0ZXJtQXNDb25zdHJ1Y3Rvck5vZGVWZXJpZmllciBmcm9tIFwiLi4vdmVyaWZpZXIvbm9kZS90ZXJtQXNDb25zdHJ1Y3RvclwiO1xuXG5leHBvcnQgZGVmYXVsdCBmdW5jdGlvbiB2ZXJpZnlUZXJtQXNDb25zdHJ1Y3Rvcih0ZXJtTm9kZSwgdHlwZU5vZGUsIGZpbGVDb250ZXh0KSB7XG4gIGxldCB0ZXJtVmVyaWZpZWRBc0NvbnN0cnVjdG9yID0gZmFsc2U7XG5cbiAgY29uc3QgdGVybVN0cmluZyA9IGZpbGVDb250ZXh0Lm5vZGVBc1N0cmluZyh0ZXJtTm9kZSk7XG5cbiAgZmlsZUNvbnRleHQuZGVidWcoYFZlcmlmeWluZyB0aGUgJyR7dGVybVN0cmluZ30nIHRlcm0gYXMgYSBjb25zdHJ1Y3Rvci4uLmAsIHRlcm1Ob2RlKTtcblxuICBjb25zdCBub25UZXJtaW5hbE5vZGUgPSB0ZXJtTm9kZSwgLy8vXG4gICAgICAgIGNoaWxkTm9kZXMgPSBub25UZXJtaW5hbE5vZGUuZ2V0Q2hpbGROb2RlcygpLFxuICAgICAgICBsb2NhbENvbnRleHQgPSBMb2NhbENvbnRleHQuZnJvbUZpbGVDb250ZXh0KGZpbGVDb250ZXh0KSxcbiAgICAgICAgY2hpbGROb2Rlc1ZlcmlmaWVkID0gdGVybUFzQ29uc3RydWN0b3JOb2RlVmVyaWZpZXIudmVyaWZ5Q2hpbGROb2RlcyhjaGlsZE5vZGVzLCBsb2NhbENvbnRleHQsICgpID0+IHtcbiAgICAgICAgICBjb25zdCB2ZXJpZmllZEFoZWFkID0gdHJ1ZTtcblxuICAgICAgICAgIHJldHVybiB2ZXJpZmllZEFoZWFkO1xuICAgICAgICB9KTtcblxuICBpZiAoY2hpbGROb2Rlc1ZlcmlmaWVkKSB7XG4gICAgbGV0IHR5cGUgPSBudWxsO1xuXG4gICAgaWYgKHR5cGVOb2RlID09PSBudWxsKSB7XG4gICAgICB0ZXJtVmVyaWZpZWRBc0NvbnN0cnVjdG9yID0gdHJ1ZTtcbiAgICB9IGVsc2Uge1xuICAgICAgdHlwZSA9IGZpbGVDb250ZXh0LmZpbmRUeXBlQnlUeXBlTm9kZSh0eXBlTm9kZSk7XG5cbiAgICAgIGlmICh0eXBlICE9PSBudWxsKSB7XG4gICAgICAgIHRlcm1WZXJpZmllZEFzQ29uc3RydWN0b3IgPSB0cnVlO1xuICAgICAgfSBlbHNlIHtcbiAgICAgICAgY29uc3QgdHlwZVN0cmluZyA9IGZpbGVDb250ZXh0Lm5vZGVBc1N0cmluZyh0eXBlTm9kZSk7XG5cbiAgICAgICAgZmlsZUNvbnRleHQuZGVidWcoYFRoZSAnJHt0ZXJtU3RyaW5nfScgY29uc3RydWN0b3IncyAnJHt0eXBlU3RyaW5nfScgdHlwZSBpcyBub3QgcHJlc2VudC5gLCB0ZXJtTm9kZSk7XG4gICAgICB9XG4gICAgfVxuXG4gICAgaWYgKHRlcm1WZXJpZmllZEFzQ29uc3RydWN0b3IpIHtcbiAgICAgIGNvbnN0IHRva2VucyA9IGZpbGVDb250ZXh0LmdldFRva2VucygpLFxuICAgICAgICAgICAgY29uc3RydWN0b3IgPSBDb25zdHJ1Y3Rvci5mcm9tVGVybU5vZGVUeXBlQW5kVG9rZW5zKHRlcm1Ob2RlLCB0eXBlLCB0b2tlbnMpO1xuXG4gICAgICBmaWxlQ29udGV4dC5hZGRDb25zdHJ1Y3Rvcihjb25zdHJ1Y3Rvcik7XG4gICAgfVxuICB9XG5cbiAgaWYgKHRlcm1WZXJpZmllZEFzQ29uc3RydWN0b3IpIHtcbiAgICBmaWxlQ29udGV4dC5kZWJ1ZyhgLi4udmVyaWZpZWQgdGhlICcke3Rlcm1TdHJpbmd9JyB0ZXJtIGFzIGEgY29uc3RydWN0b3IuYCwgdGVybU5vZGUpO1xuICB9XG5cbiAgcmV0dXJuIHRlcm1WZXJpZmllZEFzQ29uc3RydWN0b3I7XG59XG4iXSwibmFtZXMiOlsidmVyaWZ5VGVybUFzQ29uc3RydWN0b3IiLCJ0ZXJtTm9kZSIsInR5cGVOb2RlIiwiZmlsZUNvbnRleHQiLCJ0ZXJtVmVyaWZpZWRBc0NvbnN0cnVjdG9yIiwidGVybVN0cmluZyIsIm5vZGVBc1N0cmluZyIsImRlYnVnIiwibm9uVGVybWluYWxOb2RlIiwiY2hpbGROb2RlcyIsImdldENoaWxkTm9kZXMiLCJsb2NhbENvbnRleHQiLCJMb2NhbENvbnRleHQiLCJmcm9tRmlsZUNvbnRleHQiLCJjaGlsZE5vZGVzVmVyaWZpZWQiLCJ0ZXJtQXNDb25zdHJ1Y3Rvck5vZGVWZXJpZmllciIsInZlcmlmeUNoaWxkTm9kZXMiLCJ2ZXJpZmllZEFoZWFkIiwidHlwZSIsImZpbmRUeXBlQnlUeXBlTm9kZSIsInR5cGVTdHJpbmciLCJ0b2tlbnMiLCJnZXRUb2tlbnMiLCJjb25zdHJ1Y3RvciIsIkNvbnN0cnVjdG9yIiwiZnJvbVRlcm1Ob2RlVHlwZUFuZFRva2VucyIsImFkZENvbnN0cnVjdG9yIl0sIm1hcHBpbmdzIjoiQUFBQTs7OzsrQkFNQTs7O2VBQXdCQTs7O2tFQUpBOzREQUNDO3dFQUNpQjs7Ozs7O0FBRTNCLFNBQVNBLHdCQUF3QkMsUUFBUSxFQUFFQyxRQUFRLEVBQUVDLFdBQVc7SUFDN0UsSUFBSUMsNEJBQTRCO0lBRWhDLElBQU1DLGFBQWFGLFlBQVlHLFlBQVksQ0FBQ0w7SUFFNUNFLFlBQVlJLEtBQUssQ0FBQyxBQUFDLGtCQUE0QixPQUFYRixZQUFXLCtCQUE2Qko7SUFFNUUsSUFBTU8sa0JBQWtCUCxVQUNsQlEsYUFBYUQsZ0JBQWdCRSxhQUFhLElBQzFDQyxlQUFlQyxjQUFZLENBQUNDLGVBQWUsQ0FBQ1YsY0FDNUNXLHFCQUFxQkMsMEJBQTZCLENBQUNDLGdCQUFnQixDQUFDUCxZQUFZRSxjQUFjO1FBQzVGLElBQU1NLGdCQUFnQjtRQUV0QixPQUFPQTtJQUNUO0lBRU4sSUFBSUgsb0JBQW9CO1FBQ3RCLElBQUlJLE9BQU87UUFFWCxJQUFJaEIsYUFBYSxNQUFNO1lBQ3JCRSw0QkFBNEI7UUFDOUIsT0FBTztZQUNMYyxPQUFPZixZQUFZZ0Isa0JBQWtCLENBQUNqQjtZQUV0QyxJQUFJZ0IsU0FBUyxNQUFNO2dCQUNqQmQsNEJBQTRCO1lBQzlCLE9BQU87Z0JBQ0wsSUFBTWdCLGFBQWFqQixZQUFZRyxZQUFZLENBQUNKO2dCQUU1Q0MsWUFBWUksS0FBSyxDQUFDLEFBQUMsUUFBcUNhLE9BQTlCZixZQUFXLHFCQUE4QixPQUFYZSxZQUFXLDJCQUF5Qm5CO1lBQzlGO1FBQ0Y7UUFFQSxJQUFJRywyQkFBMkI7WUFDN0IsSUFBTWlCLFNBQVNsQixZQUFZbUIsU0FBUyxJQUM5QkMsY0FBY0Msb0JBQVcsQ0FBQ0MseUJBQXlCLENBQUN4QixVQUFVaUIsTUFBTUc7WUFFMUVsQixZQUFZdUIsY0FBYyxDQUFDSDtRQUM3QjtJQUNGO0lBRUEsSUFBSW5CLDJCQUEyQjtRQUM3QkQsWUFBWUksS0FBSyxDQUFDLEFBQUMsb0JBQThCLE9BQVhGLFlBQVcsNkJBQTJCSjtJQUM5RTtJQUVBLE9BQU9HO0FBQ1QifQ==
|
package/lib/verify/type.js
CHANGED
|
@@ -17,7 +17,8 @@ _export(exports, {
|
|
|
17
17
|
}
|
|
18
18
|
});
|
|
19
19
|
var _type = /*#__PURE__*/ _interop_require_default(require("../type"));
|
|
20
|
-
var
|
|
20
|
+
var _givenType = /*#__PURE__*/ _interop_require_default(require("../verify/givenType"));
|
|
21
|
+
var _name = require("../utilities/name");
|
|
21
22
|
function _interop_require_default(obj) {
|
|
22
23
|
return obj && obj.__esModule ? obj : {
|
|
23
24
|
default: obj
|
|
@@ -27,18 +28,20 @@ function verifyType(typeNode, superTypeNode, fileContext) {
|
|
|
27
28
|
var typeVerified = false;
|
|
28
29
|
var typeString = fileContext.nodeAsString(typeNode);
|
|
29
30
|
fileContext.trace("Verifying the '".concat(typeString, "' type..."), typeNode);
|
|
30
|
-
var
|
|
31
|
+
var typePresent = fileContext.isTypePresentByTypeNode(typeNode);
|
|
31
32
|
if (typePresent) {
|
|
32
|
-
|
|
33
|
+
var typeString1 = fileContext.nodeAsString(typeNode);
|
|
34
|
+
fileContext.debug("The type '".concat(typeString1, "' is already present."), typeNode);
|
|
33
35
|
} else {
|
|
34
36
|
var type;
|
|
35
|
-
var
|
|
36
|
-
if (
|
|
37
|
+
var typeName = (0, _name.typeNameFromTypeNode)(typeNode);
|
|
38
|
+
if (superTypeNode === null) {
|
|
37
39
|
type = _type.default.fromTypeName(typeName);
|
|
38
40
|
} else {
|
|
39
|
-
var superType = fileContext.
|
|
41
|
+
var superType = fileContext.findTypeByTypeNode(superTypeNode);
|
|
40
42
|
if (superType === null) {
|
|
41
|
-
|
|
43
|
+
var superTypeString = fileContext.nodeAsString(superTypeNode);
|
|
44
|
+
fileContext.debug("The super-type '".concat(superTypeString, "' is not present."), typeNode);
|
|
42
45
|
} else {
|
|
43
46
|
type = _type.default.fromTypeNameAndSuperType(typeName, superType);
|
|
44
47
|
}
|
|
@@ -53,21 +56,16 @@ function verifyType(typeNode, superTypeNode, fileContext) {
|
|
|
53
56
|
}
|
|
54
57
|
return typeVerified;
|
|
55
58
|
}
|
|
56
|
-
function verifyStandaloneType(typeNode,
|
|
57
|
-
var standaloneTypeVerified
|
|
58
|
-
var typeString =
|
|
59
|
-
|
|
60
|
-
var
|
|
61
|
-
|
|
62
|
-
fileContext.debug("The type '".concat(typeName, "' is not present."), typeNode);
|
|
63
|
-
} else {
|
|
64
|
-
var verifiedAhead = verifyAhead();
|
|
65
|
-
standaloneTypeVerified = verifiedAhead; ///
|
|
66
|
-
}
|
|
59
|
+
function verifyStandaloneType(typeNode, localContext, verifyAhead) {
|
|
60
|
+
var standaloneTypeVerified;
|
|
61
|
+
var typeString = localContext.nodeAsString(typeNode);
|
|
62
|
+
localContext.trace("Verifying the '".concat(typeString, "' standalone type..."), typeNode);
|
|
63
|
+
var types = [], givenTypeVerified = (0, _givenType.default)(typeNode, types, localContext, verifyAhead);
|
|
64
|
+
standaloneTypeVerified = givenTypeVerified; ///
|
|
67
65
|
if (standaloneTypeVerified) {
|
|
68
|
-
|
|
66
|
+
localContext.debug("...verified the '".concat(typeString, "' standalone type."), typeNode);
|
|
69
67
|
}
|
|
70
68
|
return standaloneTypeVerified;
|
|
71
69
|
}
|
|
72
70
|
|
|
73
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
71
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy92ZXJpZnkvdHlwZS5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuaW1wb3J0IFR5cGUgZnJvbSBcIi4uL3R5cGVcIjtcbmltcG9ydCB2ZXJpZnlHaXZlblR5cGUgZnJvbSBcIi4uL3ZlcmlmeS9naXZlblR5cGVcIjtcblxuaW1wb3J0IHsgdHlwZU5hbWVGcm9tVHlwZU5vZGUgfSBmcm9tIFwiLi4vdXRpbGl0aWVzL25hbWVcIjtcblxuZXhwb3J0IGRlZmF1bHQgZnVuY3Rpb24gdmVyaWZ5VHlwZSh0eXBlTm9kZSwgc3VwZXJUeXBlTm9kZSwgZmlsZUNvbnRleHQpIHtcbiAgbGV0IHR5cGVWZXJpZmllZCA9IGZhbHNlO1xuXG4gIGNvbnN0IHR5cGVTdHJpbmcgPSBmaWxlQ29udGV4dC5ub2RlQXNTdHJpbmcodHlwZU5vZGUpO1xuXG4gIGZpbGVDb250ZXh0LnRyYWNlKGBWZXJpZnlpbmcgdGhlICcke3R5cGVTdHJpbmd9JyB0eXBlLi4uYCwgdHlwZU5vZGUpO1xuXG4gIGNvbnN0IHR5cGVQcmVzZW50ID0gZmlsZUNvbnRleHQuaXNUeXBlUHJlc2VudEJ5VHlwZU5vZGUodHlwZU5vZGUpO1xuXG4gIGlmICh0eXBlUHJlc2VudCkge1xuICAgIGNvbnN0IHR5cGVTdHJpbmcgPSBmaWxlQ29udGV4dC5ub2RlQXNTdHJpbmcodHlwZU5vZGUpO1xuXG4gICAgZmlsZUNvbnRleHQuZGVidWcoYFRoZSB0eXBlICcke3R5cGVTdHJpbmd9JyBpcyBhbHJlYWR5IHByZXNlbnQuYCwgdHlwZU5vZGUpO1xuICB9IGVsc2Uge1xuICAgIGxldCB0eXBlO1xuXG4gICAgY29uc3QgdHlwZU5hbWUgPSB0eXBlTmFtZUZyb21UeXBlTm9kZSh0eXBlTm9kZSk7XG5cbiAgICBpZiAoc3VwZXJUeXBlTm9kZSA9PT0gbnVsbCkge1xuICAgICAgdHlwZSA9IFR5cGUuZnJvbVR5cGVOYW1lKHR5cGVOYW1lKTtcbiAgICB9IGVsc2Uge1xuICAgICAgY29uc3Qgc3VwZXJUeXBlID0gZmlsZUNvbnRleHQuZmluZFR5cGVCeVR5cGVOb2RlKHN1cGVyVHlwZU5vZGUpO1xuXG4gICAgICBpZiAoc3VwZXJUeXBlID09PSBudWxsKSB7XG4gICAgICAgIGNvbnN0IHN1cGVyVHlwZVN0cmluZyA9IGZpbGVDb250ZXh0Lm5vZGVBc1N0cmluZyhzdXBlclR5cGVOb2RlKTtcblxuICAgICAgICBmaWxlQ29udGV4dC5kZWJ1ZyhgVGhlIHN1cGVyLXR5cGUgJyR7c3VwZXJUeXBlU3RyaW5nfScgaXMgbm90IHByZXNlbnQuYCwgdHlwZU5vZGUpO1xuICAgICAgfSBlbHNlIHtcbiAgICAgICAgdHlwZSA9IFR5cGUuZnJvbVR5cGVOYW1lQW5kU3VwZXJUeXBlKHR5cGVOYW1lLCBzdXBlclR5cGUpO1xuICAgICAgfVxuICAgIH1cblxuICAgIGlmICh0eXBlICE9PSBudWxsKSB7XG4gICAgICBmaWxlQ29udGV4dC5hZGRUeXBlKHR5cGUpO1xuXG4gICAgICB0eXBlVmVyaWZpZWQgPSB0cnVlO1xuICAgIH1cbiAgfVxuXG4gIGlmICh0eXBlVmVyaWZpZWQpIHtcbiAgICBmaWxlQ29udGV4dC5kZWJ1ZyhgLi4udmVyaWZpZWQgdGhlICcke3R5cGVTdHJpbmd9JyB0eXBlLmAsIHR5cGVOb2RlKTtcbiAgfVxuXG4gIHJldHVybiB0eXBlVmVyaWZpZWQ7XG59XG5cbmV4cG9ydCBmdW5jdGlvbiB2ZXJpZnlTdGFuZGFsb25lVHlwZSh0eXBlTm9kZSwgbG9jYWxDb250ZXh0LCB2ZXJpZnlBaGVhZCkge1xuICBsZXQgc3RhbmRhbG9uZVR5cGVWZXJpZmllZDtcblxuICBjb25zdCB0eXBlU3RyaW5nID0gbG9jYWxDb250ZXh0Lm5vZGVBc1N0cmluZyh0eXBlTm9kZSk7XG5cbiAgbG9jYWxDb250ZXh0LnRyYWNlKGBWZXJpZnlpbmcgdGhlICcke3R5cGVTdHJpbmd9JyBzdGFuZGFsb25lIHR5cGUuLi5gLCB0eXBlTm9kZSk7XG5cbiAgY29uc3QgdHlwZXMgPSBbXSxcbiAgICAgICAgZ2l2ZW5UeXBlVmVyaWZpZWQgPSB2ZXJpZnlHaXZlblR5cGUodHlwZU5vZGUsIHR5cGVzLCBsb2NhbENvbnRleHQsIHZlcmlmeUFoZWFkKTtcblxuICBzdGFuZGFsb25lVHlwZVZlcmlmaWVkID0gZ2l2ZW5UeXBlVmVyaWZpZWQ7ICAvLy9cblxuICBpZiAoc3RhbmRhbG9uZVR5cGVWZXJpZmllZCkge1xuICAgIGxvY2FsQ29udGV4dC5kZWJ1ZyhgLi4udmVyaWZpZWQgdGhlICcke3R5cGVTdHJpbmd9JyBzdGFuZGFsb25lIHR5cGUuYCwgdHlwZU5vZGUpO1xuICB9XG5cbiAgcmV0dXJuIHN0YW5kYWxvbmVUeXBlVmVyaWZpZWQ7XG59XG4iXSwibmFtZXMiOlsidmVyaWZ5VHlwZSIsInZlcmlmeVN0YW5kYWxvbmVUeXBlIiwidHlwZU5vZGUiLCJzdXBlclR5cGVOb2RlIiwiZmlsZUNvbnRleHQiLCJ0eXBlVmVyaWZpZWQiLCJ0eXBlU3RyaW5nIiwibm9kZUFzU3RyaW5nIiwidHJhY2UiLCJ0eXBlUHJlc2VudCIsImlzVHlwZVByZXNlbnRCeVR5cGVOb2RlIiwiZGVidWciLCJ0eXBlIiwidHlwZU5hbWUiLCJ0eXBlTmFtZUZyb21UeXBlTm9kZSIsIlR5cGUiLCJmcm9tVHlwZU5hbWUiLCJzdXBlclR5cGUiLCJmaW5kVHlwZUJ5VHlwZU5vZGUiLCJzdXBlclR5cGVTdHJpbmciLCJmcm9tVHlwZU5hbWVBbmRTdXBlclR5cGUiLCJhZGRUeXBlIiwibG9jYWxDb250ZXh0IiwidmVyaWZ5QWhlYWQiLCJzdGFuZGFsb25lVHlwZVZlcmlmaWVkIiwidHlwZXMiLCJnaXZlblR5cGVWZXJpZmllZCIsInZlcmlmeUdpdmVuVHlwZSJdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7Ozs7Ozs7O0lBT0EsT0E0Q0M7ZUE1Q3VCQTs7SUE4Q1JDLG9CQUFvQjtlQUFwQkE7OzsyREFuREM7Z0VBQ1c7b0JBRVM7Ozs7OztBQUV0QixTQUFTRCxXQUFXRSxRQUFRLEVBQUVDLGFBQWEsRUFBRUMsV0FBVztJQUNyRSxJQUFJQyxlQUFlO0lBRW5CLElBQU1DLGFBQWFGLFlBQVlHLFlBQVksQ0FBQ0w7SUFFNUNFLFlBQVlJLEtBQUssQ0FBQyxBQUFDLGtCQUE0QixPQUFYRixZQUFXLGNBQVlKO0lBRTNELElBQU1PLGNBQWNMLFlBQVlNLHVCQUF1QixDQUFDUjtJQUV4RCxJQUFJTyxhQUFhO1FBQ2YsSUFBTUgsY0FBYUYsWUFBWUcsWUFBWSxDQUFDTDtRQUU1Q0UsWUFBWU8sS0FBSyxDQUFDLEFBQUMsYUFBdUIsT0FBWEwsYUFBVywwQkFBd0JKO0lBQ3BFLE9BQU87UUFDTCxJQUFJVTtRQUVKLElBQU1DLFdBQVdDLElBQUFBLDBCQUFvQixFQUFDWjtRQUV0QyxJQUFJQyxrQkFBa0IsTUFBTTtZQUMxQlMsT0FBT0csYUFBSSxDQUFDQyxZQUFZLENBQUNIO1FBQzNCLE9BQU87WUFDTCxJQUFNSSxZQUFZYixZQUFZYyxrQkFBa0IsQ0FBQ2Y7WUFFakQsSUFBSWMsY0FBYyxNQUFNO2dCQUN0QixJQUFNRSxrQkFBa0JmLFlBQVlHLFlBQVksQ0FBQ0o7Z0JBRWpEQyxZQUFZTyxLQUFLLENBQUMsQUFBQyxtQkFBa0MsT0FBaEJRLGlCQUFnQixzQkFBb0JqQjtZQUMzRSxPQUFPO2dCQUNMVSxPQUFPRyxhQUFJLENBQUNLLHdCQUF3QixDQUFDUCxVQUFVSTtZQUNqRDtRQUNGO1FBRUEsSUFBSUwsU0FBUyxNQUFNO1lBQ2pCUixZQUFZaUIsT0FBTyxDQUFDVDtZQUVwQlAsZUFBZTtRQUNqQjtJQUNGO0lBRUEsSUFBSUEsY0FBYztRQUNoQkQsWUFBWU8sS0FBSyxDQUFDLEFBQUMsb0JBQThCLE9BQVhMLFlBQVcsWUFBVUo7SUFDN0Q7SUFFQSxPQUFPRztBQUNUO0FBRU8sU0FBU0oscUJBQXFCQyxRQUFRLEVBQUVvQixZQUFZLEVBQUVDLFdBQVc7SUFDdEUsSUFBSUM7SUFFSixJQUFNbEIsYUFBYWdCLGFBQWFmLFlBQVksQ0FBQ0w7SUFFN0NvQixhQUFhZCxLQUFLLENBQUMsQUFBQyxrQkFBNEIsT0FBWEYsWUFBVyx5QkFBdUJKO0lBRXZFLElBQU11QixRQUFRLEVBQUUsRUFDVkMsb0JBQW9CQyxJQUFBQSxrQkFBZSxFQUFDekIsVUFBVXVCLE9BQU9ILGNBQWNDO0lBRXpFQyx5QkFBeUJFLG1CQUFvQixHQUFHO0lBRWhELElBQUlGLHdCQUF3QjtRQUMxQkYsYUFBYVgsS0FBSyxDQUFDLEFBQUMsb0JBQThCLE9BQVhMLFlBQVcsdUJBQXFCSjtJQUN6RTtJQUVBLE9BQU9zQjtBQUNUIn0=
|
package/lib/verify/variable.js
CHANGED
|
@@ -18,8 +18,8 @@ _export(exports, {
|
|
|
18
18
|
});
|
|
19
19
|
var _variable = /*#__PURE__*/ _interop_require_default(require("../variable"));
|
|
20
20
|
var _variable1 = /*#__PURE__*/ _interop_require_default(require("../assignment/variable"));
|
|
21
|
+
var _givenVariable = /*#__PURE__*/ _interop_require_default(require("../verify/givenVariable"));
|
|
21
22
|
var _type = require("../type");
|
|
22
|
-
var _query = require("../utilities/query");
|
|
23
23
|
function _interop_require_default(obj) {
|
|
24
24
|
return obj && obj.__esModule ? obj : {
|
|
25
25
|
default: obj
|
|
@@ -34,14 +34,14 @@ function verifyVariable(variableNode, typeNode, fileContext) {
|
|
|
34
34
|
fileContext.debug("The variable '".concat(variableString, "' is already present."), variableNode);
|
|
35
35
|
} else {
|
|
36
36
|
var variable;
|
|
37
|
-
|
|
38
|
-
if (typeName === null) {
|
|
37
|
+
if (typeNode === null) {
|
|
39
38
|
var type = _type.objectType;
|
|
40
39
|
variable = _variable.default.fromVariableNodeAndType(variableNode, type);
|
|
41
40
|
} else {
|
|
42
|
-
var type1 = fileContext.
|
|
41
|
+
var type1 = fileContext.findTypeByTypeNode(typeNode);
|
|
43
42
|
if (type1 === null) {
|
|
44
|
-
|
|
43
|
+
var typeString = fileContext.nodeAsString(typeNode);
|
|
44
|
+
fileContext.debug("The '".concat(variableString, "' variable's '").concat(typeString, "' type is not present."), variableNode);
|
|
45
45
|
} else {
|
|
46
46
|
variable = _variable.default.fromVariableNodeAndType(variableNode, type1);
|
|
47
47
|
}
|
|
@@ -58,19 +58,16 @@ function verifyVariable(variableNode, typeNode, fileContext) {
|
|
|
58
58
|
}
|
|
59
59
|
return variableVerified;
|
|
60
60
|
}
|
|
61
|
-
function verifyStandaloneVariable(variableNode,
|
|
62
|
-
var standaloneVariableVerified
|
|
63
|
-
var variableString =
|
|
64
|
-
|
|
65
|
-
var
|
|
66
|
-
|
|
67
|
-
var verifiedAhead = verifyAhead();
|
|
68
|
-
standaloneVariableVerified = verifiedAhead; ///
|
|
69
|
-
}
|
|
61
|
+
function verifyStandaloneVariable(variableNode, localContext, verifyAhead) {
|
|
62
|
+
var standaloneVariableVerified;
|
|
63
|
+
var variableString = localContext.nodeAsString(variableNode);
|
|
64
|
+
localContext.trace("Verifying the '".concat(variableString, "' standalone variable..."), variableNode);
|
|
65
|
+
var variables = [], givenVariableVerified = (0, _givenVariable.default)(variableNode, variables, localContext, verifyAhead);
|
|
66
|
+
standaloneVariableVerified = givenVariableVerified; ///
|
|
70
67
|
if (standaloneVariableVerified) {
|
|
71
|
-
|
|
68
|
+
localContext.debug("...verified the '".concat(variableString, "' standalone variable."), variableNode);
|
|
72
69
|
}
|
|
73
70
|
return standaloneVariableVerified;
|
|
74
71
|
}
|
|
75
72
|
|
|
76
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
73
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy92ZXJpZnkvdmFyaWFibGUuanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmltcG9ydCBWYXJpYWJsZSBmcm9tIFwiLi4vdmFyaWFibGVcIjtcbmltcG9ydCBWYXJpYWJsZUFzc2lnbm1lbnQgZnJvbSBcIi4uL2Fzc2lnbm1lbnQvdmFyaWFibGVcIjtcbmltcG9ydCB2ZXJpZnlHaXZlblZhcmlhYmxlIGZyb20gXCIuLi92ZXJpZnkvZ2l2ZW5WYXJpYWJsZVwiO1xuXG5pbXBvcnQgeyBvYmplY3RUeXBlIH0gZnJvbSBcIi4uL3R5cGVcIjtcblxuZXhwb3J0IGRlZmF1bHQgZnVuY3Rpb24gdmVyaWZ5VmFyaWFibGUodmFyaWFibGVOb2RlLCB0eXBlTm9kZSwgZmlsZUNvbnRleHQpIHtcbiAgbGV0IHZhcmlhYmxlVmVyaWZpZWQgPSBmYWxzZTtcblxuICBjb25zdCB2YXJpYWJsZVN0cmluZyA9IGZpbGVDb250ZXh0Lm5vZGVBc1N0cmluZyh2YXJpYWJsZU5vZGUpO1xuXG4gIGZpbGVDb250ZXh0LnRyYWNlKGBWZXJpZnlpbmcgdGhlICcke3ZhcmlhYmxlU3RyaW5nfScgdmFyaWFibGUuLi5gLCB2YXJpYWJsZU5vZGUpO1xuXG4gIGNvbnN0IHZhcmlhYmxlUHJlc2VudCA9IGZpbGVDb250ZXh0LmlzVmFyaWFibGVQcmVzZW50QnlWYXJpYWJsZU5vZGUodmFyaWFibGVOb2RlKTtcblxuICBpZiAodmFyaWFibGVQcmVzZW50KSB7XG4gICAgZmlsZUNvbnRleHQuZGVidWcoYFRoZSB2YXJpYWJsZSAnJHt2YXJpYWJsZVN0cmluZ30nIGlzIGFscmVhZHkgcHJlc2VudC5gLCB2YXJpYWJsZU5vZGUpO1xuICB9IGVsc2Uge1xuICAgIGxldCB2YXJpYWJsZTtcblxuICAgIGlmICh0eXBlTm9kZSA9PT0gbnVsbCkge1xuICAgICAgY29uc3QgdHlwZSA9IG9iamVjdFR5cGU7XG5cbiAgICAgIHZhcmlhYmxlID0gVmFyaWFibGUuZnJvbVZhcmlhYmxlTm9kZUFuZFR5cGUodmFyaWFibGVOb2RlLCB0eXBlKTtcbiAgICB9IGVsc2Uge1xuICAgICAgY29uc3QgdHlwZSA9IGZpbGVDb250ZXh0LmZpbmRUeXBlQnlUeXBlTm9kZSh0eXBlTm9kZSk7XG5cbiAgICAgIGlmICh0eXBlID09PSBudWxsKSB7XG4gICAgICAgIGNvbnN0IHR5cGVTdHJpbmcgPSBmaWxlQ29udGV4dC5ub2RlQXNTdHJpbmcodHlwZU5vZGUpO1xuXG4gICAgICAgIGZpbGVDb250ZXh0LmRlYnVnKGBUaGUgJyR7dmFyaWFibGVTdHJpbmd9JyB2YXJpYWJsZSdzICcke3R5cGVTdHJpbmd9JyB0eXBlIGlzIG5vdCBwcmVzZW50LmAsIHZhcmlhYmxlTm9kZSk7XG4gICAgICB9IGVsc2Uge1xuICAgICAgICB2YXJpYWJsZSA9IFZhcmlhYmxlLmZyb21WYXJpYWJsZU5vZGVBbmRUeXBlKHZhcmlhYmxlTm9kZSwgdHlwZSk7XG4gICAgICB9XG4gICAgfVxuXG4gICAgaWYgKHZhcmlhYmxlICE9PSBudWxsKSB7XG4gICAgICBjb25zdCB2YXJpYWJsZUFzc2lnbm1lbnQgPSBWYXJpYWJsZUFzc2lnbm1lbnQuZnJvbVZhcmlhYmxlKHZhcmlhYmxlKSxcbiAgICAgICAgICAgIHZhcmlhYmxlQXNzaWduZWQgPSB2YXJpYWJsZUFzc2lnbm1lbnQuYXNzaWduKGZpbGVDb250ZXh0KTtcblxuICAgICAgaWYgKHZhcmlhYmxlQXNzaWduZWQpIHtcbiAgICAgICAgdmFyaWFibGVWZXJpZmllZCA9IHRydWU7XG4gICAgICB9XG4gICAgfVxuICB9XG5cbiAgaWYgKHZhcmlhYmxlVmVyaWZpZWQpIHtcbiAgICBmaWxlQ29udGV4dC5kZWJ1ZyhgLi4udmVyaWZpZWQgdGhlICcke3ZhcmlhYmxlU3RyaW5nfScgdmFyaWFibGUuYCwgdmFyaWFibGVOb2RlKTtcbiAgfVxuXG4gIHJldHVybiB2YXJpYWJsZVZlcmlmaWVkO1xufVxuXG5leHBvcnQgZnVuY3Rpb24gdmVyaWZ5U3RhbmRhbG9uZVZhcmlhYmxlKHZhcmlhYmxlTm9kZSwgbG9jYWxDb250ZXh0LCB2ZXJpZnlBaGVhZCkge1xuICBsZXQgc3RhbmRhbG9uZVZhcmlhYmxlVmVyaWZpZWQ7XG5cbiAgY29uc3QgdmFyaWFibGVTdHJpbmcgPSBsb2NhbENvbnRleHQubm9kZUFzU3RyaW5nKHZhcmlhYmxlTm9kZSk7XG5cbiAgbG9jYWxDb250ZXh0LnRyYWNlKGBWZXJpZnlpbmcgdGhlICcke3ZhcmlhYmxlU3RyaW5nfScgc3RhbmRhbG9uZSB2YXJpYWJsZS4uLmAsIHZhcmlhYmxlTm9kZSk7XG5cbiAgY29uc3QgdmFyaWFibGVzID0gW10sXG4gICAgICAgIGdpdmVuVmFyaWFibGVWZXJpZmllZCA9IHZlcmlmeUdpdmVuVmFyaWFibGUodmFyaWFibGVOb2RlLCB2YXJpYWJsZXMsIGxvY2FsQ29udGV4dCwgdmVyaWZ5QWhlYWQpO1xuXG4gIHN0YW5kYWxvbmVWYXJpYWJsZVZlcmlmaWVkID0gZ2l2ZW5WYXJpYWJsZVZlcmlmaWVkOyAvLy9cblxuICBpZiAoc3RhbmRhbG9uZVZhcmlhYmxlVmVyaWZpZWQpIHtcbiAgICBsb2NhbENvbnRleHQuZGVidWcoYC4uLnZlcmlmaWVkIHRoZSAnJHt2YXJpYWJsZVN0cmluZ30nIHN0YW5kYWxvbmUgdmFyaWFibGUuYCwgdmFyaWFibGVOb2RlKTtcbiAgfVxuXG4gIHJldHVybiBzdGFuZGFsb25lVmFyaWFibGVWZXJpZmllZDtcbn1cbiJdLCJuYW1lcyI6WyJ2ZXJpZnlWYXJpYWJsZSIsInZlcmlmeVN0YW5kYWxvbmVWYXJpYWJsZSIsInZhcmlhYmxlTm9kZSIsInR5cGVOb2RlIiwiZmlsZUNvbnRleHQiLCJ2YXJpYWJsZVZlcmlmaWVkIiwidmFyaWFibGVTdHJpbmciLCJub2RlQXNTdHJpbmciLCJ0cmFjZSIsInZhcmlhYmxlUHJlc2VudCIsImlzVmFyaWFibGVQcmVzZW50QnlWYXJpYWJsZU5vZGUiLCJkZWJ1ZyIsInZhcmlhYmxlIiwidHlwZSIsIm9iamVjdFR5cGUiLCJWYXJpYWJsZSIsImZyb21WYXJpYWJsZU5vZGVBbmRUeXBlIiwiZmluZFR5cGVCeVR5cGVOb2RlIiwidHlwZVN0cmluZyIsInZhcmlhYmxlQXNzaWdubWVudCIsIlZhcmlhYmxlQXNzaWdubWVudCIsImZyb21WYXJpYWJsZSIsInZhcmlhYmxlQXNzaWduZWQiLCJhc3NpZ24iLCJsb2NhbENvbnRleHQiLCJ2ZXJpZnlBaGVhZCIsInN0YW5kYWxvbmVWYXJpYWJsZVZlcmlmaWVkIiwidmFyaWFibGVzIiwiZ2l2ZW5WYXJpYWJsZVZlcmlmaWVkIiwidmVyaWZ5R2l2ZW5WYXJpYWJsZSJdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7Ozs7Ozs7O0lBUUEsT0E2Q0M7ZUE3Q3VCQTs7SUErQ1JDLHdCQUF3QjtlQUF4QkE7OzsrREFyREs7Z0VBQ1U7b0VBQ0M7b0JBRUw7Ozs7OztBQUVaLFNBQVNELGVBQWVFLFlBQVksRUFBRUMsUUFBUSxFQUFFQyxXQUFXO0lBQ3hFLElBQUlDLG1CQUFtQjtJQUV2QixJQUFNQyxpQkFBaUJGLFlBQVlHLFlBQVksQ0FBQ0w7SUFFaERFLFlBQVlJLEtBQUssQ0FBQyxBQUFDLGtCQUFnQyxPQUFmRixnQkFBZSxrQkFBZ0JKO0lBRW5FLElBQU1PLGtCQUFrQkwsWUFBWU0sK0JBQStCLENBQUNSO0lBRXBFLElBQUlPLGlCQUFpQjtRQUNuQkwsWUFBWU8sS0FBSyxDQUFDLEFBQUMsaUJBQStCLE9BQWZMLGdCQUFlLDBCQUF3Qko7SUFDNUUsT0FBTztRQUNMLElBQUlVO1FBRUosSUFBSVQsYUFBYSxNQUFNO1lBQ3JCLElBQU1VLE9BQU9DLGdCQUFVO1lBRXZCRixXQUFXRyxpQkFBUSxDQUFDQyx1QkFBdUIsQ0FBQ2QsY0FBY1c7UUFDNUQsT0FBTztZQUNMLElBQU1BLFFBQU9ULFlBQVlhLGtCQUFrQixDQUFDZDtZQUU1QyxJQUFJVSxVQUFTLE1BQU07Z0JBQ2pCLElBQU1LLGFBQWFkLFlBQVlHLFlBQVksQ0FBQ0o7Z0JBRTVDQyxZQUFZTyxLQUFLLENBQUMsQUFBQyxRQUFzQ08sT0FBL0JaLGdCQUFlLGtCQUEyQixPQUFYWSxZQUFXLDJCQUF5QmhCO1lBQy9GLE9BQU87Z0JBQ0xVLFdBQVdHLGlCQUFRLENBQUNDLHVCQUF1QixDQUFDZCxjQUFjVztZQUM1RDtRQUNGO1FBRUEsSUFBSUQsYUFBYSxNQUFNO1lBQ3JCLElBQU1PLHFCQUFxQkMsa0JBQWtCLENBQUNDLFlBQVksQ0FBQ1QsV0FDckRVLG1CQUFtQkgsbUJBQW1CSSxNQUFNLENBQUNuQjtZQUVuRCxJQUFJa0Isa0JBQWtCO2dCQUNwQmpCLG1CQUFtQjtZQUNyQjtRQUNGO0lBQ0Y7SUFFQSxJQUFJQSxrQkFBa0I7UUFDcEJELFlBQVlPLEtBQUssQ0FBQyxBQUFDLG9CQUFrQyxPQUFmTCxnQkFBZSxnQkFBY0o7SUFDckU7SUFFQSxPQUFPRztBQUNUO0FBRU8sU0FBU0oseUJBQXlCQyxZQUFZLEVBQUVzQixZQUFZLEVBQUVDLFdBQVc7SUFDOUUsSUFBSUM7SUFFSixJQUFNcEIsaUJBQWlCa0IsYUFBYWpCLFlBQVksQ0FBQ0w7SUFFakRzQixhQUFhaEIsS0FBSyxDQUFDLEFBQUMsa0JBQWdDLE9BQWZGLGdCQUFlLDZCQUEyQko7SUFFL0UsSUFBTXlCLFlBQVksRUFBRSxFQUNkQyx3QkFBd0JDLElBQUFBLHNCQUFtQixFQUFDM0IsY0FBY3lCLFdBQVdILGNBQWNDO0lBRXpGQyw2QkFBNkJFLHVCQUF1QixHQUFHO0lBRXZELElBQUlGLDRCQUE0QjtRQUM5QkYsYUFBYWIsS0FBSyxDQUFDLEFBQUMsb0JBQWtDLE9BQWZMLGdCQUFlLDJCQUF5Qko7SUFDakY7SUFFQSxPQUFPd0I7QUFDVCJ9
|
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.866",
|
|
5
5
|
"license": "MIT, Anti-996",
|
|
6
6
|
"homepage": "https://github.com/djalbat/occam-verify-cli",
|
|
7
7
|
"description": "Occam's Verifier",
|
|
@@ -12,9 +12,9 @@
|
|
|
12
12
|
"dependencies": {
|
|
13
13
|
"argumentative": "^2.0.28",
|
|
14
14
|
"necessary": "^14.0.1",
|
|
15
|
-
"occam-custom-grammars": "^5.0.
|
|
16
|
-
"occam-entities": "^1.0.
|
|
17
|
-
"occam-file-system": "^6.0.
|
|
15
|
+
"occam-custom-grammars": "^5.0.771",
|
|
16
|
+
"occam-entities": "^1.0.132",
|
|
17
|
+
"occam-file-system": "^6.0.174",
|
|
18
18
|
"occam-grammar-utilities": "^8.0.205",
|
|
19
19
|
"occam-query": "^3.1.174"
|
|
20
20
|
},
|
|
@@ -32,17 +32,17 @@ export default class AxiomLemmaTheoremConjecture {
|
|
|
32
32
|
return this.localContext;
|
|
33
33
|
}
|
|
34
34
|
|
|
35
|
-
|
|
36
|
-
const
|
|
37
|
-
const
|
|
38
|
-
|
|
35
|
+
matchLabelNode(labelNode) {
|
|
36
|
+
const labelNodeMatches = this.labels.some((label) => {
|
|
37
|
+
const node = labelNode, ///
|
|
38
|
+
labelMatchesNode = label.matchNode(node);
|
|
39
39
|
|
|
40
|
-
if (
|
|
40
|
+
if (labelMatchesNode) {
|
|
41
41
|
return true;
|
|
42
42
|
}
|
|
43
43
|
});
|
|
44
44
|
|
|
45
|
-
return
|
|
45
|
+
return labelNodeMatches;
|
|
46
46
|
}
|
|
47
47
|
|
|
48
48
|
matchStatement(statementNode, statementLocalContext) {
|