occam-verify-cli 0.0.968 → 0.0.971
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 +6 -8
- package/lib/constants.js +5 -1
- package/lib/context/file.js +48 -53
- package/lib/context/local.js +45 -39
- package/lib/context/release.js +3 -3
- package/lib/declaration.js +9 -7
- package/lib/equivalence.js +23 -21
- package/lib/judgement.js +3 -3
- package/lib/label.js +3 -3
- package/lib/log.js +3 -3
- package/lib/metaType.js +7 -7
- package/lib/metavariable.js +7 -7
- package/lib/node/term/bracketed.js +16 -0
- package/lib/proofStep.js +3 -29
- package/lib/releaseContext/initialise.js +11 -17
- package/lib/resolve/substitutions.js +99 -0
- package/lib/rule.js +10 -6
- package/lib/substitution/statementForMetavariable.js +93 -98
- package/lib/substitution/termForVariable.js +45 -54
- package/lib/substitution.js +51 -9
- package/lib/substitutions.js +165 -12
- package/lib/term.js +8 -1
- package/lib/topLevelAssertion.js +10 -6
- package/lib/type.js +5 -5
- package/lib/unifier/metaLevel.js +10 -3
- package/lib/unifier/statementWithCombinator.js +6 -6
- package/lib/unifier.js +2 -2
- package/lib/unify/metavariableWithStatement.js +13 -48
- package/lib/unify/metavariableWithStatementGivenSubstitution.js +39 -0
- package/lib/unify/premiseWithProofStep.js +3 -3
- package/lib/unify/statement/qualified.js +117 -0
- package/lib/unify/statement/unqualified.js +25 -0
- package/lib/unify/statementWithBracketedCombinator.js +3 -3
- package/lib/unify/statementWithCombinators.js +5 -5
- package/lib/unify/statementWithMetaType.js +3 -3
- package/lib/unify/statementWithSttaemetnGivenEquivalences.js +45 -0
- package/lib/unify/suppositionWithProffStep.js +3 -3
- package/lib/unify/variableWithTerm.js +11 -26
- package/lib/utilities/array.js +5 -14
- package/lib/utilities/assertion.js +24 -0
- package/lib/utilities/brackets.js +60 -0
- package/lib/utilities/message.js +52 -0
- package/lib/utilities/name.js +7 -7
- package/lib/utilities/node.js +10 -17
- package/lib/utilities/string.js +1 -7
- package/lib/utilities/subproof.js +19 -0
- package/lib/utilities/unify.js +30 -11
- package/lib/variable.js +8 -8
- package/lib/verifier/metaLevel.js +6 -6
- package/lib/verifier/statementAsCombinator.js +2 -2
- package/lib/verify/assertion/contained.js +66 -32
- package/lib/verify/assertion/defined.js +51 -46
- package/lib/verify/assertion/subproof.js +9 -9
- package/lib/verify/assertion/type.js +11 -11
- package/lib/verify/conclusion.js +6 -6
- package/lib/verify/consequent.js +6 -6
- package/lib/verify/declaration/metavariable.js +2 -2
- package/lib/verify/declaration.js +34 -20
- package/lib/verify/equality.js +13 -13
- package/lib/verify/frame.js +38 -24
- package/lib/verify/judgement.js +13 -13
- package/lib/verify/metavariable.js +2 -2
- package/lib/verify/premise.js +5 -5
- package/lib/verify/proofStep.js +15 -24
- package/lib/verify/statement/qualified.js +15 -124
- package/lib/verify/statement/unqualified.js +23 -24
- package/lib/verify/statement.js +24 -24
- package/lib/verify/statementGivenMetaType.js +3 -3
- package/lib/verify/supposition.js +5 -5
- package/package.json +2 -2
- package/src/constants.js +1 -0
- package/src/context/file.js +49 -55
- package/src/context/local.js +34 -31
- package/src/context/release.js +2 -2
- package/src/declaration.js +12 -10
- package/src/equivalence.js +27 -26
- package/src/judgement.js +2 -2
- package/src/label.js +2 -2
- package/src/log.js +1 -1
- package/src/metaType.js +7 -7
- package/src/metavariable.js +7 -7
- package/src/node/term/bracketed.js +9 -0
- package/src/proofStep.js +3 -48
- package/src/releaseContext/initialise.js +13 -24
- package/src/resolve/substitutions.js +134 -0
- package/src/rule.js +10 -5
- package/src/substitution/statementForMetavariable.js +99 -85
- package/src/substitution/termForVariable.js +50 -65
- package/src/substitution.js +46 -8
- package/src/substitutions.js +176 -10
- package/src/term.js +6 -0
- package/src/topLevelAssertion.js +10 -5
- package/src/type.js +4 -4
- package/src/unifier/metaLevel.js +11 -3
- package/src/unifier/statementWithCombinator.js +5 -5
- package/src/unifier.js +1 -1
- package/src/unify/metavariableWithStatement.js +17 -71
- package/src/unify/metavariableWithStatementGivenSubstitution.js +39 -0
- package/src/unify/premiseWithProofStep.js +1 -1
- package/src/unify/statement/qualified.js +183 -0
- package/src/unify/statement/unqualified.js +24 -0
- package/src/unify/statementWithBracketedCombinator.js +2 -2
- package/src/unify/statementWithCombinators.js +4 -4
- package/src/unify/statementWithMetaType.js +2 -2
- package/src/unify/statementWithSttaemetnGivenEquivalences.js +51 -0
- package/src/unify/suppositionWithProffStep.js +1 -1
- package/src/unify/variableWithTerm.js +14 -35
- package/src/utilities/array.js +1 -16
- package/src/utilities/assertion.js +19 -0
- package/src/utilities/brackets.js +56 -0
- package/src/utilities/name.js +8 -8
- package/src/utilities/node.js +14 -17
- package/src/utilities/string.js +2 -2
- package/src/utilities/subproof.js +18 -0
- package/src/utilities/unify.js +24 -12
- package/src/variable.js +11 -11
- package/src/verifier/metaLevel.js +5 -5
- package/src/verifier/statementAsCombinator.js +2 -2
- package/src/verify/assertion/contained.js +80 -38
- package/src/verify/assertion/defined.js +64 -55
- package/src/verify/assertion/subproof.js +8 -8
- package/src/verify/assertion/type.js +11 -11
- package/src/verify/conclusion.js +8 -8
- package/src/verify/consequent.js +8 -8
- package/src/verify/declaration/metavariable.js +4 -3
- package/src/verify/declaration.js +46 -23
- package/src/verify/equality.js +13 -13
- package/src/verify/frame.js +48 -28
- package/src/verify/judgement.js +13 -13
- package/src/verify/metavariable.js +3 -3
- package/src/verify/premise.js +6 -6
- package/src/verify/proofStep.js +14 -31
- package/src/verify/statement/qualified.js +18 -199
- package/src/verify/statement/unqualified.js +25 -31
- package/src/verify/statement.js +23 -23
- package/src/verify/statementGivenMetaType.js +2 -2
- package/src/verify/supposition.js +6 -6
- package/lib/unify/statementAtainstStatement.js +0 -49
- package/lib/utilities/lineIndex.js +0 -52
- package/lib/utilities/match.js +0 -59
- package/lib/utilities/verify.js +0 -19
- package/src/unify/statementAtainstStatement.js +0 -56
- package/src/utilities/match.js +0 -53
- package/src/utilities/verify.js +0 -14
- /package/src/utilities/{lineIndex.js → message.js} +0 -0
|
@@ -1,52 +0,0 @@
|
|
|
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
|
-
greatestLineIndexFromNodeAndTokens: function() {
|
|
13
|
-
return greatestLineIndexFromNodeAndTokens;
|
|
14
|
-
},
|
|
15
|
-
leastLineIndexFromNodeAndTokens: function() {
|
|
16
|
-
return leastLineIndexFromNodeAndTokens;
|
|
17
|
-
}
|
|
18
|
-
});
|
|
19
|
-
function leastLineIndexFromNodeAndTokens(node, tokens) {
|
|
20
|
-
var leastLineIndex = undefined; ///
|
|
21
|
-
var firstSignificantTokenIndex = node.getFirstSignificantTokenIndex(tokens);
|
|
22
|
-
var lineIndex = 0;
|
|
23
|
-
tokens.some(function(token, tokenIndex) {
|
|
24
|
-
if (tokenIndex === firstSignificantTokenIndex) {
|
|
25
|
-
leastLineIndex = lineIndex; ///
|
|
26
|
-
return true;
|
|
27
|
-
}
|
|
28
|
-
var tokenEndOfLineToken = token.isEndOfLineToken();
|
|
29
|
-
if (tokenEndOfLineToken) {
|
|
30
|
-
lineIndex += 1;
|
|
31
|
-
}
|
|
32
|
-
});
|
|
33
|
-
return leastLineIndex;
|
|
34
|
-
}
|
|
35
|
-
function greatestLineIndexFromNodeAndTokens(node, tokens) {
|
|
36
|
-
var greatestLineIndex = undefined; ///
|
|
37
|
-
var lastSignificantTokenIndex = node.getLastSignificantTokenIndex(tokens);
|
|
38
|
-
var lineIndex = 0;
|
|
39
|
-
tokens.some(function(token, tokenIndex) {
|
|
40
|
-
if (tokenIndex === lastSignificantTokenIndex) {
|
|
41
|
-
greatestLineIndex = lineIndex; ///
|
|
42
|
-
return true;
|
|
43
|
-
}
|
|
44
|
-
var tokenEndOfLineToken = token.isEndOfLineToken();
|
|
45
|
-
if (tokenEndOfLineToken) {
|
|
46
|
-
lineIndex += 1;
|
|
47
|
-
}
|
|
48
|
-
});
|
|
49
|
-
return greatestLineIndex;
|
|
50
|
-
}
|
|
51
|
-
|
|
52
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlsaXRpZXMvbGluZUluZGV4LmpzIl0sInNvdXJjZXNDb250ZW50IjpbIlwidXNlIHN0cmljdFwiO1xuXG5leHBvcnQgZnVuY3Rpb24gbGVhc3RMaW5lSW5kZXhGcm9tTm9kZUFuZFRva2Vucyhub2RlLCB0b2tlbnMpIHtcbiAgbGV0IGxlYXN0TGluZUluZGV4ID0gdW5kZWZpbmVkOyAvLy9cblxuICBjb25zdCBmaXJzdFNpZ25pZmljYW50VG9rZW5JbmRleCA9IG5vZGUuZ2V0Rmlyc3RTaWduaWZpY2FudFRva2VuSW5kZXgodG9rZW5zKTtcblxuICBsZXQgbGluZUluZGV4ID0gMDtcblxuICB0b2tlbnMuc29tZSgodG9rZW4sIHRva2VuSW5kZXgpID0+IHsgIC8vL1xuICAgIGlmICh0b2tlbkluZGV4ID09PSBmaXJzdFNpZ25pZmljYW50VG9rZW5JbmRleCkge1xuICAgICAgbGVhc3RMaW5lSW5kZXggPSBsaW5lSW5kZXg7ICAvLy9cblxuICAgICAgcmV0dXJuIHRydWU7XG4gICAgfVxuXG4gICAgY29uc3QgdG9rZW5FbmRPZkxpbmVUb2tlbiA9IHRva2VuLmlzRW5kT2ZMaW5lVG9rZW4oKTtcblxuICAgIGlmICh0b2tlbkVuZE9mTGluZVRva2VuKSB7XG4gICAgICBsaW5lSW5kZXggKz0gMTtcbiAgICB9XG4gIH0pO1xuXG4gIHJldHVybiBsZWFzdExpbmVJbmRleDtcbn1cblxuZXhwb3J0IGZ1bmN0aW9uIGdyZWF0ZXN0TGluZUluZGV4RnJvbU5vZGVBbmRUb2tlbnMobm9kZSwgdG9rZW5zKSB7XG4gIGxldCBncmVhdGVzdExpbmVJbmRleCA9IHVuZGVmaW5lZDsgIC8vL1xuXG4gIGNvbnN0IGxhc3RTaWduaWZpY2FudFRva2VuSW5kZXggPSBub2RlLmdldExhc3RTaWduaWZpY2FudFRva2VuSW5kZXgodG9rZW5zKTtcblxuICBsZXQgbGluZUluZGV4ID0gMDtcblxuICB0b2tlbnMuc29tZSgodG9rZW4sIHRva2VuSW5kZXgpID0+IHsgIC8vL1xuICAgIGlmICh0b2tlbkluZGV4ID09PSBsYXN0U2lnbmlmaWNhbnRUb2tlbkluZGV4KSB7XG4gICAgICBncmVhdGVzdExpbmVJbmRleCA9IGxpbmVJbmRleDsgIC8vL1xuXG4gICAgICByZXR1cm4gdHJ1ZTtcbiAgICB9XG5cbiAgICBjb25zdCB0b2tlbkVuZE9mTGluZVRva2VuID0gdG9rZW4uaXNFbmRPZkxpbmVUb2tlbigpO1xuXG4gICAgaWYgKHRva2VuRW5kT2ZMaW5lVG9rZW4pIHtcbiAgICAgIGxpbmVJbmRleCArPSAxO1xuICAgIH1cbiAgfSk7XG5cbiAgcmV0dXJuIGdyZWF0ZXN0TGluZUluZGV4O1xufVxuIl0sIm5hbWVzIjpbImdyZWF0ZXN0TGluZUluZGV4RnJvbU5vZGVBbmRUb2tlbnMiLCJsZWFzdExpbmVJbmRleEZyb21Ob2RlQW5kVG9rZW5zIiwibm9kZSIsInRva2VucyIsImxlYXN0TGluZUluZGV4IiwidW5kZWZpbmVkIiwiZmlyc3RTaWduaWZpY2FudFRva2VuSW5kZXgiLCJnZXRGaXJzdFNpZ25pZmljYW50VG9rZW5JbmRleCIsImxpbmVJbmRleCIsInNvbWUiLCJ0b2tlbiIsInRva2VuSW5kZXgiLCJ0b2tlbkVuZE9mTGluZVRva2VuIiwiaXNFbmRPZkxpbmVUb2tlbiIsImdyZWF0ZXN0TGluZUluZGV4IiwibGFzdFNpZ25pZmljYW50VG9rZW5JbmRleCIsImdldExhc3RTaWduaWZpY2FudFRva2VuSW5kZXgiXSwibWFwcGluZ3MiOiJBQUFBOzs7Ozs7Ozs7OztJQTBCZ0JBLGtDQUFrQztlQUFsQ0E7O0lBeEJBQywrQkFBK0I7ZUFBL0JBOzs7QUFBVCxTQUFTQSxnQ0FBZ0NDLElBQUksRUFBRUMsTUFBTTtJQUMxRCxJQUFJQyxpQkFBaUJDLFdBQVcsR0FBRztJQUVuQyxJQUFNQyw2QkFBNkJKLEtBQUtLLDZCQUE2QixDQUFDSjtJQUV0RSxJQUFJSyxZQUFZO0lBRWhCTCxPQUFPTSxJQUFJLENBQUMsU0FBQ0MsT0FBT0M7UUFDbEIsSUFBSUEsZUFBZUwsNEJBQTRCO1lBQzdDRixpQkFBaUJJLFdBQVksR0FBRztZQUVoQyxPQUFPO1FBQ1Q7UUFFQSxJQUFNSSxzQkFBc0JGLE1BQU1HLGdCQUFnQjtRQUVsRCxJQUFJRCxxQkFBcUI7WUFDdkJKLGFBQWE7UUFDZjtJQUNGO0lBRUEsT0FBT0o7QUFDVDtBQUVPLFNBQVNKLG1DQUFtQ0UsSUFBSSxFQUFFQyxNQUFNO0lBQzdELElBQUlXLG9CQUFvQlQsV0FBWSxHQUFHO0lBRXZDLElBQU1VLDRCQUE0QmIsS0FBS2MsNEJBQTRCLENBQUNiO0lBRXBFLElBQUlLLFlBQVk7SUFFaEJMLE9BQU9NLElBQUksQ0FBQyxTQUFDQyxPQUFPQztRQUNsQixJQUFJQSxlQUFlSSwyQkFBMkI7WUFDNUNELG9CQUFvQk4sV0FBWSxHQUFHO1lBRW5DLE9BQU87UUFDVDtRQUVBLElBQU1JLHNCQUFzQkYsTUFBTUcsZ0JBQWdCO1FBRWxELElBQUlELHFCQUFxQjtZQUN2QkosYUFBYTtRQUNmO0lBQ0Y7SUFFQSxPQUFPTTtBQUNUIn0=
|
package/lib/utilities/match.js
DELETED
|
@@ -1,59 +0,0 @@
|
|
|
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
|
-
bracketedStatementChildNodeFromStatementNode: function() {
|
|
13
|
-
return bracketedStatementChildNodeFromStatementNode;
|
|
14
|
-
},
|
|
15
|
-
matchStatementModuloBrackets: function() {
|
|
16
|
-
return matchStatementModuloBrackets;
|
|
17
|
-
}
|
|
18
|
-
});
|
|
19
|
-
var _bracketed = /*#__PURE__*/ _interop_require_default(require("../node/statement/bracketed"));
|
|
20
|
-
var _query = require("../utilities/query");
|
|
21
|
-
var _constants = require("../constants");
|
|
22
|
-
function _interop_require_default(obj) {
|
|
23
|
-
return obj && obj.__esModule ? obj : {
|
|
24
|
-
default: obj
|
|
25
|
-
};
|
|
26
|
-
}
|
|
27
|
-
var bracketedStatementChildNodeQuery = (0, _query.nodeQuery)("/statement/metaArgument/statement!");
|
|
28
|
-
function matchStatementModuloBrackets(statementNodeA, statementNodeB) {
|
|
29
|
-
var statementMatches = false;
|
|
30
|
-
if (!statementMatches) {
|
|
31
|
-
var statementNodeMatches = statementNodeA.match(statementNodeB);
|
|
32
|
-
statementMatches = statementNodeMatches; ///
|
|
33
|
-
}
|
|
34
|
-
if (!statementMatches) {
|
|
35
|
-
var bracketedStatementChildNodeA = bracketedStatementChildNodeFromStatementNode(statementNodeA);
|
|
36
|
-
if (bracketedStatementChildNodeA !== null) {
|
|
37
|
-
var bracketedStatementChildNodeAMatchesStatementNodeB = bracketedStatementChildNodeA.match(statementNodeB);
|
|
38
|
-
statementMatches = bracketedStatementChildNodeAMatchesStatementNodeB; ///
|
|
39
|
-
}
|
|
40
|
-
}
|
|
41
|
-
if (!statementMatches) {
|
|
42
|
-
var bracketedStatementChildNodeB = bracketedStatementChildNodeFromStatementNode(statementNodeB);
|
|
43
|
-
if (bracketedStatementChildNodeB !== null) {
|
|
44
|
-
var statementNodeAMatchesBracketedStatementChildNodeB = statementNodeA.match(bracketedStatementChildNodeB);
|
|
45
|
-
statementMatches = statementNodeAMatchesBracketedStatementChildNodeB; ///
|
|
46
|
-
}
|
|
47
|
-
}
|
|
48
|
-
return statementMatches;
|
|
49
|
-
}
|
|
50
|
-
function bracketedStatementChildNodeFromStatementNode(statementNode) {
|
|
51
|
-
var bracketedStatementChildNode = null;
|
|
52
|
-
var depth = _constants.BRACKETED_STATEMENT_DEPTH, statementNodeMatchBracketedStatementNode = statementNode.match(_bracketed.default, depth);
|
|
53
|
-
if (statementNodeMatchBracketedStatementNode) {
|
|
54
|
-
bracketedStatementChildNode = bracketedStatementChildNodeQuery(statementNode);
|
|
55
|
-
}
|
|
56
|
-
return bracketedStatementChildNode;
|
|
57
|
-
}
|
|
58
|
-
|
|
59
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlsaXRpZXMvbWF0Y2guanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmltcG9ydCBicmFja2V0ZWRTdGF0ZW1lbnROb2RlIGZyb20gXCIuLi9ub2RlL3N0YXRlbWVudC9icmFja2V0ZWRcIjtcblxuaW1wb3J0IHsgbm9kZVF1ZXJ5IH0gZnJvbSBcIi4uL3V0aWxpdGllcy9xdWVyeVwiO1xuaW1wb3J0IHsgQlJBQ0tFVEVEX1NUQVRFTUVOVF9ERVBUSCB9IGZyb20gXCIuLi9jb25zdGFudHNcIjtcblxuY29uc3QgYnJhY2tldGVkU3RhdGVtZW50Q2hpbGROb2RlUXVlcnkgPSBub2RlUXVlcnkoXCIvc3RhdGVtZW50L21ldGFBcmd1bWVudC9zdGF0ZW1lbnQhXCIpO1xuXG5leHBvcnQgZnVuY3Rpb24gbWF0Y2hTdGF0ZW1lbnRNb2R1bG9CcmFja2V0cyhzdGF0ZW1lbnROb2RlQSwgc3RhdGVtZW50Tm9kZUIpIHtcbiAgbGV0IHN0YXRlbWVudE1hdGNoZXMgPSBmYWxzZTtcblxuICBpZiAoIXN0YXRlbWVudE1hdGNoZXMpIHtcbiAgICBjb25zdCBzdGF0ZW1lbnROb2RlTWF0Y2hlcyA9IHN0YXRlbWVudE5vZGVBLm1hdGNoKHN0YXRlbWVudE5vZGVCKTtcblxuICAgIHN0YXRlbWVudE1hdGNoZXMgPSBzdGF0ZW1lbnROb2RlTWF0Y2hlczsgIC8vL1xuICB9XG5cbiAgaWYgKCFzdGF0ZW1lbnRNYXRjaGVzKSB7XG4gICAgY29uc3QgYnJhY2tldGVkU3RhdGVtZW50Q2hpbGROb2RlQSA9IGJyYWNrZXRlZFN0YXRlbWVudENoaWxkTm9kZUZyb21TdGF0ZW1lbnROb2RlKHN0YXRlbWVudE5vZGVBKTtcblxuICAgIGlmIChicmFja2V0ZWRTdGF0ZW1lbnRDaGlsZE5vZGVBICE9PSBudWxsKSB7XG4gICAgICBjb25zdCBicmFja2V0ZWRTdGF0ZW1lbnRDaGlsZE5vZGVBTWF0Y2hlc1N0YXRlbWVudE5vZGVCID0gYnJhY2tldGVkU3RhdGVtZW50Q2hpbGROb2RlQS5tYXRjaChzdGF0ZW1lbnROb2RlQik7XG5cbiAgICAgIHN0YXRlbWVudE1hdGNoZXMgPSBicmFja2V0ZWRTdGF0ZW1lbnRDaGlsZE5vZGVBTWF0Y2hlc1N0YXRlbWVudE5vZGVCOyAvLy9cbiAgICB9XG4gIH1cblxuICBpZiAoIXN0YXRlbWVudE1hdGNoZXMpIHtcbiAgICBjb25zdCBicmFja2V0ZWRTdGF0ZW1lbnRDaGlsZE5vZGVCID0gYnJhY2tldGVkU3RhdGVtZW50Q2hpbGROb2RlRnJvbVN0YXRlbWVudE5vZGUoc3RhdGVtZW50Tm9kZUIpO1xuXG4gICAgaWYgKGJyYWNrZXRlZFN0YXRlbWVudENoaWxkTm9kZUIgIT09IG51bGwpIHtcbiAgICAgIGNvbnN0IHN0YXRlbWVudE5vZGVBTWF0Y2hlc0JyYWNrZXRlZFN0YXRlbWVudENoaWxkTm9kZUIgPSBzdGF0ZW1lbnROb2RlQS5tYXRjaChicmFja2V0ZWRTdGF0ZW1lbnRDaGlsZE5vZGVCKTtcblxuICAgICAgc3RhdGVtZW50TWF0Y2hlcyA9IHN0YXRlbWVudE5vZGVBTWF0Y2hlc0JyYWNrZXRlZFN0YXRlbWVudENoaWxkTm9kZUI7IC8vL1xuICAgIH1cbiAgfVxuXG4gIHJldHVybiBzdGF0ZW1lbnRNYXRjaGVzO1xufVxuXG5leHBvcnQgZnVuY3Rpb24gYnJhY2tldGVkU3RhdGVtZW50Q2hpbGROb2RlRnJvbVN0YXRlbWVudE5vZGUoc3RhdGVtZW50Tm9kZSkge1xuICBsZXQgYnJhY2tldGVkU3RhdGVtZW50Q2hpbGROb2RlID0gbnVsbDtcblxuICBjb25zdCBkZXB0aCA9IEJSQUNLRVRFRF9TVEFURU1FTlRfREVQVEgsXG4gICAgICAgIHN0YXRlbWVudE5vZGVNYXRjaEJyYWNrZXRlZFN0YXRlbWVudE5vZGUgPSBzdGF0ZW1lbnROb2RlLm1hdGNoKGJyYWNrZXRlZFN0YXRlbWVudE5vZGUsIGRlcHRoKTtcblxuICBpZiAoc3RhdGVtZW50Tm9kZU1hdGNoQnJhY2tldGVkU3RhdGVtZW50Tm9kZSkge1xuICAgIGJyYWNrZXRlZFN0YXRlbWVudENoaWxkTm9kZSA9IGJyYWNrZXRlZFN0YXRlbWVudENoaWxkTm9kZVF1ZXJ5KHN0YXRlbWVudE5vZGUpO1xuICB9XG5cbiAgcmV0dXJuIGJyYWNrZXRlZFN0YXRlbWVudENoaWxkTm9kZTtcbn1cbiJdLCJuYW1lcyI6WyJicmFja2V0ZWRTdGF0ZW1lbnRDaGlsZE5vZGVGcm9tU3RhdGVtZW50Tm9kZSIsIm1hdGNoU3RhdGVtZW50TW9kdWxvQnJhY2tldHMiLCJicmFja2V0ZWRTdGF0ZW1lbnRDaGlsZE5vZGVRdWVyeSIsIm5vZGVRdWVyeSIsInN0YXRlbWVudE5vZGVBIiwic3RhdGVtZW50Tm9kZUIiLCJzdGF0ZW1lbnRNYXRjaGVzIiwic3RhdGVtZW50Tm9kZU1hdGNoZXMiLCJtYXRjaCIsImJyYWNrZXRlZFN0YXRlbWVudENoaWxkTm9kZUEiLCJicmFja2V0ZWRTdGF0ZW1lbnRDaGlsZE5vZGVBTWF0Y2hlc1N0YXRlbWVudE5vZGVCIiwiYnJhY2tldGVkU3RhdGVtZW50Q2hpbGROb2RlQiIsInN0YXRlbWVudE5vZGVBTWF0Y2hlc0JyYWNrZXRlZFN0YXRlbWVudENoaWxkTm9kZUIiLCJzdGF0ZW1lbnROb2RlIiwiYnJhY2tldGVkU3RhdGVtZW50Q2hpbGROb2RlIiwiZGVwdGgiLCJCUkFDS0VURURfU1RBVEVNRU5UX0RFUFRIIiwic3RhdGVtZW50Tm9kZU1hdGNoQnJhY2tldGVkU3RhdGVtZW50Tm9kZSIsImJyYWNrZXRlZFN0YXRlbWVudE5vZGUiXSwibWFwcGluZ3MiOiJBQUFBOzs7Ozs7Ozs7OztJQXlDZ0JBLDRDQUE0QztlQUE1Q0E7O0lBaENBQyw0QkFBNEI7ZUFBNUJBOzs7Z0VBUG1CO3FCQUVUO3lCQUNnQjs7Ozs7O0FBRTFDLElBQU1DLG1DQUFtQ0MsSUFBQUEsZ0JBQVMsRUFBQztBQUU1QyxTQUFTRiw2QkFBNkJHLGNBQWMsRUFBRUMsY0FBYztJQUN6RSxJQUFJQyxtQkFBbUI7SUFFdkIsSUFBSSxDQUFDQSxrQkFBa0I7UUFDckIsSUFBTUMsdUJBQXVCSCxlQUFlSSxLQUFLLENBQUNIO1FBRWxEQyxtQkFBbUJDLHNCQUF1QixHQUFHO0lBQy9DO0lBRUEsSUFBSSxDQUFDRCxrQkFBa0I7UUFDckIsSUFBTUcsK0JBQStCVCw2Q0FBNkNJO1FBRWxGLElBQUlLLGlDQUFpQyxNQUFNO1lBQ3pDLElBQU1DLG9EQUFvREQsNkJBQTZCRCxLQUFLLENBQUNIO1lBRTdGQyxtQkFBbUJJLG1EQUFtRCxHQUFHO1FBQzNFO0lBQ0Y7SUFFQSxJQUFJLENBQUNKLGtCQUFrQjtRQUNyQixJQUFNSywrQkFBK0JYLDZDQUE2Q0s7UUFFbEYsSUFBSU0saUNBQWlDLE1BQU07WUFDekMsSUFBTUMsb0RBQW9EUixlQUFlSSxLQUFLLENBQUNHO1lBRS9FTCxtQkFBbUJNLG1EQUFtRCxHQUFHO1FBQzNFO0lBQ0Y7SUFFQSxPQUFPTjtBQUNUO0FBRU8sU0FBU04sNkNBQTZDYSxhQUFhO0lBQ3hFLElBQUlDLDhCQUE4QjtJQUVsQyxJQUFNQyxRQUFRQyxvQ0FBeUIsRUFDakNDLDJDQUEyQ0osY0FBY0wsS0FBSyxDQUFDVSxrQkFBc0IsRUFBRUg7SUFFN0YsSUFBSUUsMENBQTBDO1FBQzVDSCw4QkFBOEJaLGlDQUFpQ1c7SUFDakU7SUFFQSxPQUFPQztBQUNUIn0=
|
package/lib/utilities/verify.js
DELETED
|
@@ -1,19 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", {
|
|
3
|
-
value: true
|
|
4
|
-
});
|
|
5
|
-
Object.defineProperty(exports, "isAssertionNegated", {
|
|
6
|
-
enumerable: true,
|
|
7
|
-
get: function() {
|
|
8
|
-
return isAssertionNegated;
|
|
9
|
-
}
|
|
10
|
-
});
|
|
11
|
-
var _constants = require("../constants");
|
|
12
|
-
var _query = require("../utilities/query");
|
|
13
|
-
var secondOperatorTerminalNodeQuery = (0, _query.nodeQuery)("/*/@operator[1]");
|
|
14
|
-
function isAssertionNegated(assertionNode) {
|
|
15
|
-
var secondOperatorTerminalNode = secondOperatorTerminalNodeQuery(assertionNode), content = secondOperatorTerminalNode.getContent(), assertionNegated = content === _constants.NOT;
|
|
16
|
-
return assertionNegated;
|
|
17
|
-
}
|
|
18
|
-
|
|
19
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlsaXRpZXMvdmVyaWZ5LmpzIl0sInNvdXJjZXNDb250ZW50IjpbIlwidXNlIHN0cmljdFwiO1xuXG5pbXBvcnQgeyBOT1QgfSBmcm9tIFwiLi4vY29uc3RhbnRzXCI7XG5pbXBvcnQgeyBub2RlUXVlcnkgfSBmcm9tIFwiLi4vdXRpbGl0aWVzL3F1ZXJ5XCI7XG5cbmNvbnN0IHNlY29uZE9wZXJhdG9yVGVybWluYWxOb2RlUXVlcnkgPSBub2RlUXVlcnkoXCIvKi9Ab3BlcmF0b3JbMV1cIik7XG5cbmV4cG9ydCBmdW5jdGlvbiBpc0Fzc2VydGlvbk5lZ2F0ZWQoYXNzZXJ0aW9uTm9kZSkge1xuICBjb25zdCBzZWNvbmRPcGVyYXRvclRlcm1pbmFsTm9kZSA9IHNlY29uZE9wZXJhdG9yVGVybWluYWxOb2RlUXVlcnkoYXNzZXJ0aW9uTm9kZSksXG4gICAgICAgIGNvbnRlbnQgPSBzZWNvbmRPcGVyYXRvclRlcm1pbmFsTm9kZS5nZXRDb250ZW50KCksXG4gICAgICAgIGFzc2VydGlvbk5lZ2F0ZWQgPSAoY29udGVudCA9PT0gTk9UKTtcblxuICByZXR1cm4gYXNzZXJ0aW9uTmVnYXRlZDtcbn1cbiJdLCJuYW1lcyI6WyJpc0Fzc2VydGlvbk5lZ2F0ZWQiLCJzZWNvbmRPcGVyYXRvclRlcm1pbmFsTm9kZVF1ZXJ5Iiwibm9kZVF1ZXJ5IiwiYXNzZXJ0aW9uTm9kZSIsInNlY29uZE9wZXJhdG9yVGVybWluYWxOb2RlIiwiY29udGVudCIsImdldENvbnRlbnQiLCJhc3NlcnRpb25OZWdhdGVkIiwiTk9UIl0sIm1hcHBpbmdzIjoiQUFBQTs7OzsrQkFPZ0JBOzs7ZUFBQUE7Ozt5QkFMSTtxQkFDTTtBQUUxQixJQUFNQyxrQ0FBa0NDLElBQUFBLGdCQUFTLEVBQUM7QUFFM0MsU0FBU0YsbUJBQW1CRyxhQUFhO0lBQzlDLElBQU1DLDZCQUE2QkgsZ0NBQWdDRSxnQkFDN0RFLFVBQVVELDJCQUEyQkUsVUFBVSxJQUMvQ0MsbUJBQW9CRixZQUFZRyxjQUFHO0lBRXpDLE9BQU9EO0FBQ1QifQ==
|
|
@@ -1,56 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
|
|
3
|
-
import Substitutions from "../substitutions";
|
|
4
|
-
import metaLevelUnifier from "../unifier/metaLevel";
|
|
5
|
-
import TermForVariableSubstitution from "../substitution/termForVariable";
|
|
6
|
-
|
|
7
|
-
import { push } from "../utilities/array";
|
|
8
|
-
|
|
9
|
-
export default function unifyStatementWithStatement(statementNodeA, statementNodeB, substitution, substitutions, localContextA, localContextB) {
|
|
10
|
-
let statementUnifiedWithStatement = false;
|
|
11
|
-
|
|
12
|
-
const transformedSubstitutions = Substitutions.fromNothing(),
|
|
13
|
-
transformedSubstitution = substitution.transformed(substitutions);
|
|
14
|
-
|
|
15
|
-
if (transformedSubstitution !== null) {
|
|
16
|
-
transformedSubstitutions.addSubstitution(transformedSubstitution, localContextA, localContextB);
|
|
17
|
-
}
|
|
18
|
-
|
|
19
|
-
const nodeA = statementNodeA, ///
|
|
20
|
-
nodeB = statementNodeB, ///
|
|
21
|
-
unified = metaLevelUnifier.unify(nodeA, nodeB, transformedSubstitutions, localContextA, localContextB);
|
|
22
|
-
|
|
23
|
-
if (unified) {
|
|
24
|
-
if (transformedSubstitution === null) {
|
|
25
|
-
|
|
26
|
-
debugger
|
|
27
|
-
|
|
28
|
-
const substitutionB = termForVariableSubstitution, ///
|
|
29
|
-
substitutionsB = [
|
|
30
|
-
substitutionB
|
|
31
|
-
];
|
|
32
|
-
|
|
33
|
-
substitutionsA = transformSubstitutions(substitutionsA, substitutionsB);
|
|
34
|
-
|
|
35
|
-
push(substitutions, substitutionsA);
|
|
36
|
-
}
|
|
37
|
-
|
|
38
|
-
statementUnifiedWithStatement = true;
|
|
39
|
-
}
|
|
40
|
-
|
|
41
|
-
return statementUnifiedWithStatement;
|
|
42
|
-
}
|
|
43
|
-
|
|
44
|
-
function transformSubstitutions(substitutionsA, substitutionsB) {
|
|
45
|
-
substitutionsA = substitutionsA.map((substitutionA) => {
|
|
46
|
-
const substitution = substitutionA, ///
|
|
47
|
-
substitutions = substitutionsB,
|
|
48
|
-
termForVariableSubstitution = TermForVariableSubstitution.fromSubstitutionAndSubstitutions(substitution, substitutions);
|
|
49
|
-
|
|
50
|
-
substitutionA = termForVariableSubstitution; ///
|
|
51
|
-
|
|
52
|
-
return substitutionA;
|
|
53
|
-
});
|
|
54
|
-
|
|
55
|
-
return substitutionsA;
|
|
56
|
-
}
|
package/src/utilities/match.js
DELETED
|
@@ -1,53 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
|
|
3
|
-
import bracketedStatementNode from "../node/statement/bracketed";
|
|
4
|
-
|
|
5
|
-
import { nodeQuery } from "../utilities/query";
|
|
6
|
-
import { BRACKETED_STATEMENT_DEPTH } from "../constants";
|
|
7
|
-
|
|
8
|
-
const bracketedStatementChildNodeQuery = nodeQuery("/statement/metaArgument/statement!");
|
|
9
|
-
|
|
10
|
-
export function matchStatementModuloBrackets(statementNodeA, statementNodeB) {
|
|
11
|
-
let statementMatches = false;
|
|
12
|
-
|
|
13
|
-
if (!statementMatches) {
|
|
14
|
-
const statementNodeMatches = statementNodeA.match(statementNodeB);
|
|
15
|
-
|
|
16
|
-
statementMatches = statementNodeMatches; ///
|
|
17
|
-
}
|
|
18
|
-
|
|
19
|
-
if (!statementMatches) {
|
|
20
|
-
const bracketedStatementChildNodeA = bracketedStatementChildNodeFromStatementNode(statementNodeA);
|
|
21
|
-
|
|
22
|
-
if (bracketedStatementChildNodeA !== null) {
|
|
23
|
-
const bracketedStatementChildNodeAMatchesStatementNodeB = bracketedStatementChildNodeA.match(statementNodeB);
|
|
24
|
-
|
|
25
|
-
statementMatches = bracketedStatementChildNodeAMatchesStatementNodeB; ///
|
|
26
|
-
}
|
|
27
|
-
}
|
|
28
|
-
|
|
29
|
-
if (!statementMatches) {
|
|
30
|
-
const bracketedStatementChildNodeB = bracketedStatementChildNodeFromStatementNode(statementNodeB);
|
|
31
|
-
|
|
32
|
-
if (bracketedStatementChildNodeB !== null) {
|
|
33
|
-
const statementNodeAMatchesBracketedStatementChildNodeB = statementNodeA.match(bracketedStatementChildNodeB);
|
|
34
|
-
|
|
35
|
-
statementMatches = statementNodeAMatchesBracketedStatementChildNodeB; ///
|
|
36
|
-
}
|
|
37
|
-
}
|
|
38
|
-
|
|
39
|
-
return statementMatches;
|
|
40
|
-
}
|
|
41
|
-
|
|
42
|
-
export function bracketedStatementChildNodeFromStatementNode(statementNode) {
|
|
43
|
-
let bracketedStatementChildNode = null;
|
|
44
|
-
|
|
45
|
-
const depth = BRACKETED_STATEMENT_DEPTH,
|
|
46
|
-
statementNodeMatchBracketedStatementNode = statementNode.match(bracketedStatementNode, depth);
|
|
47
|
-
|
|
48
|
-
if (statementNodeMatchBracketedStatementNode) {
|
|
49
|
-
bracketedStatementChildNode = bracketedStatementChildNodeQuery(statementNode);
|
|
50
|
-
}
|
|
51
|
-
|
|
52
|
-
return bracketedStatementChildNode;
|
|
53
|
-
}
|
package/src/utilities/verify.js
DELETED
|
@@ -1,14 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
|
|
3
|
-
import { NOT } from "../constants";
|
|
4
|
-
import { nodeQuery } from "../utilities/query";
|
|
5
|
-
|
|
6
|
-
const secondOperatorTerminalNodeQuery = nodeQuery("/*/@operator[1]");
|
|
7
|
-
|
|
8
|
-
export function isAssertionNegated(assertionNode) {
|
|
9
|
-
const secondOperatorTerminalNode = secondOperatorTerminalNodeQuery(assertionNode),
|
|
10
|
-
content = secondOperatorTerminalNode.getContent(),
|
|
11
|
-
assertionNegated = (content === NOT);
|
|
12
|
-
|
|
13
|
-
return assertionNegated;
|
|
14
|
-
}
|
|
File without changes
|