occam-verify-cli 0.0.874 → 0.0.875
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/context/localMeta.js +5 -5
- package/lib/metaLemma.js +4 -4
- package/lib/metaLemmaMetatheorem.js +24 -27
- package/lib/metatheorem.js +4 -4
- package/lib/metavariable.js +39 -7
- package/lib/verify/conclusion.js +2 -2
- package/lib/verify/metaConsequent.js +6 -6
- package/lib/verify/metaDerivation.js +3 -3
- package/lib/verify/metaLemma.js +2 -2
- package/lib/verify/metaSupposition.js +8 -8
- package/lib/verify/metaSuppositions.js +3 -3
- package/lib/verify/metastatement/qualified.js +19 -2
- package/lib/verify/metastatement/unqualified.js +2 -2
- package/lib/verify/metatheorem.js +2 -2
- package/lib/verify/metavariable.js +2 -2
- package/lib/verify/premise.js +2 -2
- package/lib/verify/ruleDerivation.js +3 -3
- package/package.json +2 -2
- package/src/context/localMeta.js +4 -4
- package/src/metaLemma.js +1 -1
- package/src/metaLemmaMetatheorem.js +21 -27
- package/src/metatheorem.js +1 -1
- package/src/metavariable.js +50 -6
- package/src/verify/conclusion.js +2 -1
- package/src/verify/metaConsequent.js +6 -5
- package/src/verify/metaDerivation.js +2 -1
- package/src/verify/metaLemma.js +1 -1
- package/src/verify/metaSupposition.js +7 -7
- package/src/verify/metaSuppositions.js +2 -2
- package/src/verify/metastatement/qualified.js +18 -1
- package/src/verify/metastatement/unqualified.js +1 -1
- package/src/verify/metatheorem.js +1 -1
- package/src/verify/metavariable.js +1 -1
- package/src/verify/premise.js +2 -1
- package/src/verify/ruleDerivation.js +4 -2
package/lib/verify/metaLemma.js
CHANGED
|
@@ -35,7 +35,7 @@ function verifyMetaLemma(metaLemmaNode, fileContext) {
|
|
|
35
35
|
if (metaConsequentVerified) {
|
|
36
36
|
var metaproofNode = metaproofNodeQuery(metaLemmaNode), firstMetaConsequent = (0, _array.first)(metaConsequents), metaConsequent = firstMetaConsequent, metaproofVerified = (0, _metaproof.default)(metaproofNode, metaConsequent, localMetaContext);
|
|
37
37
|
if (metaproofVerified) {
|
|
38
|
-
var metaLemma = _metaLemma.default.
|
|
38
|
+
var metaLemma = _metaLemma.default.fromLabelsMetaSuppositionsMetaConsequentAndFileContext(labels, metaSuppositions, metaConsequent, fileContext);
|
|
39
39
|
fileContext.addMetaLemma(metaLemma);
|
|
40
40
|
metaLemmaVerified = true;
|
|
41
41
|
}
|
|
@@ -48,4 +48,4 @@ function verifyMetaLemma(metaLemmaNode, fileContext) {
|
|
|
48
48
|
return metaLemmaVerified;
|
|
49
49
|
}
|
|
50
50
|
|
|
51
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy92ZXJpZnkvbWV0YUxlbW1hLmpzIl0sInNvdXJjZXNDb250ZW50IjpbIlwidXNlIHN0cmljdFwiO1xuXG5pbXBvcnQgTWV0YUxlbW1hIGZyb20gXCIuLi9tZXRhTGVtbWFcIjtcbmltcG9ydCB2ZXJpZnlMYWJlbHMgZnJvbSBcIi4uL3ZlcmlmeS9sYWJlbHNcIjtcbmltcG9ydCB2ZXJpZnlNZXRhcHJvb2YgZnJvbSBcIi4uL3ZlcmlmeS9tZXRhcHJvb2ZcIjtcbmltcG9ydCBMb2NhbE1ldGFDb250ZXh0IGZyb20gXCIuLi9jb250ZXh0L2xvY2FsTWV0YVwiO1xuaW1wb3J0IHZlcmlmeU1ldGFDb25zZXF1ZW50IGZyb20gXCIuLi92ZXJpZnkvbWV0YUNvbnNlcXVlbnRcIjtcbmltcG9ydCB2ZXJpZnlNZXRhU3VwcG9zaXRpb25zIGZyb20gXCIuLi92ZXJpZnkvbWV0YVN1cHBvc2l0aW9uc1wiO1xuXG5pbXBvcnQgeyBmaXJzdCB9IGZyb20gXCIuLi91dGlsaXRpZXMvYXJyYXlcIjtcbmltcG9ydCB7IEVNUFRZX1NUUklORyB9IGZyb20gXCIuLi9jb25zdGFudHNcIjtcbmltcG9ydCB7IG5vZGVRdWVyeSwgbm9kZXNRdWVyeSB9IGZyb20gXCIuLi91dGlsaXRpZXMvcXVlcnlcIjtcblxuY29uc3QgbGFiZWxzTm9kZVF1ZXJ5ID0gbm9kZVF1ZXJ5KFwiL21ldGFMZW1tYS9sYWJlbHMhXCIpLFxuICAgICAgbWV0YXByb29mTm9kZVF1ZXJ5ID0gbm9kZVF1ZXJ5KFwiL21ldGFMZW1tYS9tZXRhcHJvb2YhXCIpLFxuICAgICAgbWV0YUNvbnNlcXVlbnROb2RlUXVlcnkgPSBub2RlUXVlcnkoXCIvbWV0YUxlbW1hL21ldGFDb25zZXF1ZW50IVwiKSxcbiAgICAgIG1ldGFTdXBwb3NpdGlvbnNOb2RlUXVlcnkgPSBub2Rlc1F1ZXJ5KFwiL21ldGFMZW1tYS9tZXRhU3VwcG9zaXRpb25cIik7XG5cbmV4cG9ydCBkZWZhdWx0IGZ1bmN0aW9uIHZlcmlmeU1ldGFMZW1tYShtZXRhTGVtbWFOb2RlLCBmaWxlQ29udGV4dCkge1xuICBsZXQgbWV0YUxlbW1hVmVyaWZpZWQgPSBmYWxzZTtcblxuICBjb25zdCBsYWJlbHNOb2RlID0gbGFiZWxzTm9kZVF1ZXJ5KG1ldGFMZW1tYU5vZGUpLFxuICAgICAgICBsYWJlbHNTdHJpbmcgPSBmaWxlQ29udGV4dC5ub2RlQXNTdHJpbmcobGFiZWxzTm9kZSksXG4gICAgICAgIGxvY2FsTWV0YUNvbnRleHQgPSBMb2NhbE1ldGFDb250ZXh0LmZyb21GaWxlQ29udGV4dChmaWxlQ29udGV4dCk7XG5cbiAgKGxhYmVsc1N0cmluZyA9PT0gRU1QVFlfU1RSSU5HKSA/
|
|
51
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy92ZXJpZnkvbWV0YUxlbW1hLmpzIl0sInNvdXJjZXNDb250ZW50IjpbIlwidXNlIHN0cmljdFwiO1xuXG5pbXBvcnQgTWV0YUxlbW1hIGZyb20gXCIuLi9tZXRhTGVtbWFcIjtcbmltcG9ydCB2ZXJpZnlMYWJlbHMgZnJvbSBcIi4uL3ZlcmlmeS9sYWJlbHNcIjtcbmltcG9ydCB2ZXJpZnlNZXRhcHJvb2YgZnJvbSBcIi4uL3ZlcmlmeS9tZXRhcHJvb2ZcIjtcbmltcG9ydCBMb2NhbE1ldGFDb250ZXh0IGZyb20gXCIuLi9jb250ZXh0L2xvY2FsTWV0YVwiO1xuaW1wb3J0IHZlcmlmeU1ldGFDb25zZXF1ZW50IGZyb20gXCIuLi92ZXJpZnkvbWV0YUNvbnNlcXVlbnRcIjtcbmltcG9ydCB2ZXJpZnlNZXRhU3VwcG9zaXRpb25zIGZyb20gXCIuLi92ZXJpZnkvbWV0YVN1cHBvc2l0aW9uc1wiO1xuXG5pbXBvcnQgeyBmaXJzdCB9IGZyb20gXCIuLi91dGlsaXRpZXMvYXJyYXlcIjtcbmltcG9ydCB7IEVNUFRZX1NUUklORyB9IGZyb20gXCIuLi9jb25zdGFudHNcIjtcbmltcG9ydCB7IG5vZGVRdWVyeSwgbm9kZXNRdWVyeSB9IGZyb20gXCIuLi91dGlsaXRpZXMvcXVlcnlcIjtcblxuY29uc3QgbGFiZWxzTm9kZVF1ZXJ5ID0gbm9kZVF1ZXJ5KFwiL21ldGFMZW1tYS9sYWJlbHMhXCIpLFxuICAgICAgbWV0YXByb29mTm9kZVF1ZXJ5ID0gbm9kZVF1ZXJ5KFwiL21ldGFMZW1tYS9tZXRhcHJvb2YhXCIpLFxuICAgICAgbWV0YUNvbnNlcXVlbnROb2RlUXVlcnkgPSBub2RlUXVlcnkoXCIvbWV0YUxlbW1hL21ldGFDb25zZXF1ZW50IVwiKSxcbiAgICAgIG1ldGFTdXBwb3NpdGlvbnNOb2RlUXVlcnkgPSBub2Rlc1F1ZXJ5KFwiL21ldGFMZW1tYS9tZXRhU3VwcG9zaXRpb25cIik7XG5cbmV4cG9ydCBkZWZhdWx0IGZ1bmN0aW9uIHZlcmlmeU1ldGFMZW1tYShtZXRhTGVtbWFOb2RlLCBmaWxlQ29udGV4dCkge1xuICBsZXQgbWV0YUxlbW1hVmVyaWZpZWQgPSBmYWxzZTtcblxuICBjb25zdCBsYWJlbHNOb2RlID0gbGFiZWxzTm9kZVF1ZXJ5KG1ldGFMZW1tYU5vZGUpLFxuICAgICAgICBsYWJlbHNTdHJpbmcgPSBmaWxlQ29udGV4dC5ub2RlQXNTdHJpbmcobGFiZWxzTm9kZSksXG4gICAgICAgIGxvY2FsTWV0YUNvbnRleHQgPSBMb2NhbE1ldGFDb250ZXh0LmZyb21GaWxlQ29udGV4dChmaWxlQ29udGV4dCk7XG5cbiAgKGxhYmVsc1N0cmluZyA9PT0gRU1QVFlfU1RSSU5HKSA/XG4gICAgZmlsZUNvbnRleHQudHJhY2UoYFZlcmlmeWluZyBhIG1ldGEtbExlbW1hLi4uYCwgbWV0YUxlbW1hTm9kZSkgOlxuICAgICAgZmlsZUNvbnRleHQudHJhY2UoYFZlcmlmeWluZyB0aGUgJyR7bGFiZWxzU3RyaW5nfScgbWV0YS1sTGVtbWEuLi5gLCBtZXRhTGVtbWFOb2RlKTtcblxuICBjb25zdCBsYWJlbHMgPSBbXSxcbiAgICAgICAgbGFiZWxzVmVyaWZpZWQgPSB2ZXJpZnlMYWJlbHMobGFiZWxzTm9kZSwgbGFiZWxzLCBmaWxlQ29udGV4dCk7XG5cbiAgaWYgKGxhYmVsc1ZlcmlmaWVkKSB7XG4gICAgY29uc3QgbWV0YVN1cHBvc2l0aW9ucyA9IFtdLFxuICAgICAgICAgIG1ldGFTdXBwb3NpdGlvbk5vZGVzID0gbWV0YVN1cHBvc2l0aW9uc05vZGVRdWVyeShtZXRhTGVtbWFOb2RlKSxcbiAgICAgICAgICBtZXRhU3VwcG9zaXRpb25zVmVyaWZpZWQgPSB2ZXJpZnlNZXRhU3VwcG9zaXRpb25zKG1ldGFTdXBwb3NpdGlvbk5vZGVzLCBtZXRhU3VwcG9zaXRpb25zLCBsb2NhbE1ldGFDb250ZXh0KTtcblxuICAgIGlmIChtZXRhU3VwcG9zaXRpb25zVmVyaWZpZWQpIHtcbiAgICAgIGNvbnN0IG1ldGFDb25zZXF1ZW50cyA9IFtdLFxuICAgICAgICAgICAgbWV0YUNvbnNlcXVlbnROb2RlID0gbWV0YUNvbnNlcXVlbnROb2RlUXVlcnkobWV0YUxlbW1hTm9kZSksXG4gICAgICAgICAgICBtZXRhQ29uc2VxdWVudFZlcmlmaWVkID0gdmVyaWZ5TWV0YUNvbnNlcXVlbnQobWV0YUNvbnNlcXVlbnROb2RlLCBtZXRhQ29uc2VxdWVudHMsIGxvY2FsTWV0YUNvbnRleHQpO1xuXG4gICAgICBpZiAobWV0YUNvbnNlcXVlbnRWZXJpZmllZCkge1xuICAgICAgICBjb25zdCBtZXRhcHJvb2ZOb2RlID0gbWV0YXByb29mTm9kZVF1ZXJ5KG1ldGFMZW1tYU5vZGUpLFxuICAgICAgICAgICAgICBmaXJzdE1ldGFDb25zZXF1ZW50ID0gZmlyc3QobWV0YUNvbnNlcXVlbnRzKSxcbiAgICAgICAgICAgICAgbWV0YUNvbnNlcXVlbnQgPSBmaXJzdE1ldGFDb25zZXF1ZW50LCAvLy9cbiAgICAgICAgICAgICAgbWV0YXByb29mVmVyaWZpZWQgPSB2ZXJpZnlNZXRhcHJvb2YobWV0YXByb29mTm9kZSwgbWV0YUNvbnNlcXVlbnQsIGxvY2FsTWV0YUNvbnRleHQpO1xuXG4gICAgICAgIGlmIChtZXRhcHJvb2ZWZXJpZmllZCkge1xuICAgICAgICAgIGNvbnN0IG1ldGFMZW1tYSA9IE1ldGFMZW1tYS5mcm9tTGFiZWxzTWV0YVN1cHBvc2l0aW9uc01ldGFDb25zZXF1ZW50QW5kRmlsZUNvbnRleHQobGFiZWxzLCBtZXRhU3VwcG9zaXRpb25zLCBtZXRhQ29uc2VxdWVudCwgZmlsZUNvbnRleHQpO1xuXG4gICAgICAgICAgZmlsZUNvbnRleHQuYWRkTWV0YUxlbW1hKG1ldGFMZW1tYSk7XG5cbiAgICAgICAgICBtZXRhTGVtbWFWZXJpZmllZCA9IHRydWU7XG4gICAgICAgIH1cbiAgICAgIH1cbiAgICB9XG4gIH1cblxuICBpZiAobWV0YUxlbW1hVmVyaWZpZWQpIHtcbiAgICAobGFiZWxzU3RyaW5nID09PSBFTVBUWV9TVFJJTkcpID9cbiAgICAgIGZpbGVDb250ZXh0LmRlYnVnKGAuLi52ZXJpZmllZCB0aGUgbWV0YS1sZW1tYS5gLCBtZXRhTGVtbWFOb2RlKSA6XG4gICAgICAgIGZpbGVDb250ZXh0LmRlYnVnKGAuLi52ZXJpZmllZCB0aGUgJyR7bGFiZWxzU3RyaW5nfScgbWV0YS1sZW1tYS5gLCBtZXRhTGVtbWFOb2RlKTtcbiAgfVxuXG4gIHJldHVybiBtZXRhTGVtbWFWZXJpZmllZDtcbn1cbiJdLCJuYW1lcyI6WyJ2ZXJpZnlNZXRhTGVtbWEiLCJsYWJlbHNOb2RlUXVlcnkiLCJub2RlUXVlcnkiLCJtZXRhcHJvb2ZOb2RlUXVlcnkiLCJtZXRhQ29uc2VxdWVudE5vZGVRdWVyeSIsIm1ldGFTdXBwb3NpdGlvbnNOb2RlUXVlcnkiLCJub2Rlc1F1ZXJ5IiwibWV0YUxlbW1hTm9kZSIsImZpbGVDb250ZXh0IiwibWV0YUxlbW1hVmVyaWZpZWQiLCJsYWJlbHNOb2RlIiwibGFiZWxzU3RyaW5nIiwibm9kZUFzU3RyaW5nIiwibG9jYWxNZXRhQ29udGV4dCIsIkxvY2FsTWV0YUNvbnRleHQiLCJmcm9tRmlsZUNvbnRleHQiLCJFTVBUWV9TVFJJTkciLCJ0cmFjZSIsImxhYmVscyIsImxhYmVsc1ZlcmlmaWVkIiwidmVyaWZ5TGFiZWxzIiwibWV0YVN1cHBvc2l0aW9ucyIsIm1ldGFTdXBwb3NpdGlvbk5vZGVzIiwibWV0YVN1cHBvc2l0aW9uc1ZlcmlmaWVkIiwidmVyaWZ5TWV0YVN1cHBvc2l0aW9ucyIsIm1ldGFDb25zZXF1ZW50cyIsIm1ldGFDb25zZXF1ZW50Tm9kZSIsIm1ldGFDb25zZXF1ZW50VmVyaWZpZWQiLCJ2ZXJpZnlNZXRhQ29uc2VxdWVudCIsIm1ldGFwcm9vZk5vZGUiLCJmaXJzdE1ldGFDb25zZXF1ZW50IiwiZmlyc3QiLCJtZXRhQ29uc2VxdWVudCIsIm1ldGFwcm9vZlZlcmlmaWVkIiwidmVyaWZ5TWV0YXByb29mIiwibWV0YUxlbW1hIiwiTWV0YUxlbW1hIiwiZnJvbUxhYmVsc01ldGFTdXBwb3NpdGlvbnNNZXRhQ29uc2VxdWVudEFuZEZpbGVDb250ZXh0IiwiYWRkTWV0YUxlbW1hIiwiZGVidWciXSwibWFwcGluZ3MiOiJBQUFBOzs7OytCQWtCQTs7O2VBQXdCQTs7O2dFQWhCRjs2REFDRztnRUFDRztnRUFDQztxRUFDSTt1RUFDRTtxQkFFYjt5QkFDTztxQkFDUzs7Ozs7O0FBRXRDLElBQU1DLGtCQUFrQkMsSUFBQUEsZ0JBQVMsRUFBQyx1QkFDNUJDLHFCQUFxQkQsSUFBQUEsZ0JBQVMsRUFBQywwQkFDL0JFLDBCQUEwQkYsSUFBQUEsZ0JBQVMsRUFBQywrQkFDcENHLDRCQUE0QkMsSUFBQUEsaUJBQVUsRUFBQztBQUU5QixTQUFTTixnQkFBZ0JPLGFBQWEsRUFBRUMsV0FBVztJQUNoRSxJQUFJQyxvQkFBb0I7SUFFeEIsSUFBTUMsYUFBYVQsZ0JBQWdCTSxnQkFDN0JJLGVBQWVILFlBQVlJLFlBQVksQ0FBQ0YsYUFDeENHLG1CQUFtQkMsa0JBQWdCLENBQUNDLGVBQWUsQ0FBQ1A7SUFFekRHLGlCQUFpQkssdUJBQVksR0FDNUJSLFlBQVlTLEtBQUssQ0FBRSw4QkFBNkJWLGlCQUM5Q0MsWUFBWVMsS0FBSyxDQUFDLEFBQUMsa0JBQThCLE9BQWJOLGNBQWEscUJBQW1CSjtJQUV4RSxJQUFNVyxTQUFTLEVBQUUsRUFDWEMsaUJBQWlCQyxJQUFBQSxlQUFZLEVBQUNWLFlBQVlRLFFBQVFWO0lBRXhELElBQUlXLGdCQUFnQjtRQUNsQixJQUFNRSxtQkFBbUIsRUFBRSxFQUNyQkMsdUJBQXVCakIsMEJBQTBCRSxnQkFDakRnQiwyQkFBMkJDLElBQUFBLHlCQUFzQixFQUFDRixzQkFBc0JELGtCQUFrQlI7UUFFaEcsSUFBSVUsMEJBQTBCO1lBQzVCLElBQU1FLGtCQUFrQixFQUFFLEVBQ3BCQyxxQkFBcUJ0Qix3QkFBd0JHLGdCQUM3Q29CLHlCQUF5QkMsSUFBQUEsdUJBQW9CLEVBQUNGLG9CQUFvQkQsaUJBQWlCWjtZQUV6RixJQUFJYyx3QkFBd0I7Z0JBQzFCLElBQU1FLGdCQUFnQjFCLG1CQUFtQkksZ0JBQ25DdUIsc0JBQXNCQyxJQUFBQSxZQUFLLEVBQUNOLGtCQUM1Qk8saUJBQWlCRixxQkFDakJHLG9CQUFvQkMsSUFBQUEsa0JBQWUsRUFBQ0wsZUFBZUcsZ0JBQWdCbkI7Z0JBRXpFLElBQUlvQixtQkFBbUI7b0JBQ3JCLElBQU1FLFlBQVlDLGtCQUFTLENBQUNDLHNEQUFzRCxDQUFDbkIsUUFBUUcsa0JBQWtCVyxnQkFBZ0J4QjtvQkFFN0hBLFlBQVk4QixZQUFZLENBQUNIO29CQUV6QjFCLG9CQUFvQjtnQkFDdEI7WUFDRjtRQUNGO0lBQ0Y7SUFFQSxJQUFJQSxtQkFBbUI7UUFDcEJFLGlCQUFpQkssdUJBQVksR0FDNUJSLFlBQVkrQixLQUFLLENBQUUsK0JBQThCaEMsaUJBQy9DQyxZQUFZK0IsS0FBSyxDQUFDLEFBQUMsb0JBQWdDLE9BQWI1QixjQUFhLGtCQUFnQko7SUFDekU7SUFFQSxPQUFPRTtBQUNUIn0=
|
|
@@ -19,22 +19,22 @@ function _interop_require_default(obj) {
|
|
|
19
19
|
};
|
|
20
20
|
}
|
|
21
21
|
var metastatementNodeQuery = (0, _query.nodeQuery)("/unqualifiedMetastatement/metastatement!"), unqualifiedMetastatementNodeQuery = (0, _query.nodeQuery)("/metaSupposition/unqualifiedMetastatement!");
|
|
22
|
-
function verifyMetaSupposition(metaSuppositionNode, metaSuppositions,
|
|
22
|
+
function verifyMetaSupposition(metaSuppositionNode, metaSuppositions, localMetaContext) {
|
|
23
23
|
var metaSuppositionVerified = false;
|
|
24
|
-
var metaSuppositionString =
|
|
25
|
-
|
|
26
|
-
var derived = false, assignments = [], unqualifiedMetastatementNode = unqualifiedMetastatementNodeQuery(metaSuppositionNode), unqualifiedMetastatementVerified = (0, _unqualified.default)(unqualifiedMetastatementNode, assignments, derived,
|
|
24
|
+
var metaSuppositionString = localMetaContext.nodeAsString(metaSuppositionNode);
|
|
25
|
+
localMetaContext.trace("Verifying the '".concat(metaSuppositionString, "' meta-supposition..."), metaSuppositionNode);
|
|
26
|
+
var derived = false, assignments = [], unqualifiedMetastatementNode = unqualifiedMetastatementNodeQuery(metaSuppositionNode), unqualifiedMetastatementVerified = (0, _unqualified.default)(unqualifiedMetastatementNode, assignments, derived, localMetaContext);
|
|
27
27
|
if (unqualifiedMetastatementVerified) {
|
|
28
|
-
var assignmentAssigned = (0, _assignments.assignAssignment)(assignments,
|
|
28
|
+
var assignmentAssigned = (0, _assignments.assignAssignment)(assignments, localMetaContext);
|
|
29
29
|
metaSuppositionVerified = assignmentAssigned; ///
|
|
30
30
|
}
|
|
31
31
|
if (metaSuppositionVerified) {
|
|
32
32
|
var metastatementNode = metastatementNodeQuery(unqualifiedMetastatementNode), metaSupposition = _metaSupposition.default.fromMetastatementNode(metastatementNode), metaproofStep = _metaproof.default.fromMetastatementNode(metastatementNode);
|
|
33
33
|
metaSuppositions.push(metaSupposition);
|
|
34
|
-
|
|
35
|
-
|
|
34
|
+
localMetaContext.addMetaproofStep(metaproofStep);
|
|
35
|
+
localMetaContext.debug("...verified the '".concat(metaSuppositionString, "' meta-supposition."), metaSuppositionNode);
|
|
36
36
|
}
|
|
37
37
|
return metaSuppositionVerified;
|
|
38
38
|
}
|
|
39
39
|
|
|
40
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
40
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy92ZXJpZnkvbWV0YVN1cHBvc2l0aW9uLmpzIl0sInNvdXJjZXNDb250ZW50IjpbIlwidXNlIHN0cmljdFwiO1xuXG5pbXBvcnQgTWV0YXByb29mU3RlcCBmcm9tIFwiLi4vc3RlcC9tZXRhcHJvb2ZcIjtcbmltcG9ydCBNZXRhU3VwcG9zaXRpb24gZnJvbSBcIi4uL21ldGFTdXBwb3NpdGlvblwiO1xuaW1wb3J0IHZlcmlmeVVucXVhbGlmaWVkTWV0YXN0YXRlbWVudCBmcm9tIFwiLi4vdmVyaWZ5L21ldGFzdGF0ZW1lbnQvdW5xdWFsaWZpZWRcIjtcblxuaW1wb3J0IHsgbm9kZVF1ZXJ5IH0gZnJvbSBcIi4uL3V0aWxpdGllcy9xdWVyeVwiO1xuaW1wb3J0IHsgYXNzaWduQXNzaWdubWVudCB9IGZyb20gXCIuLi91dGlsaXRpZXMvYXNzaWdubWVudHNcIjtcblxuY29uc3QgbWV0YXN0YXRlbWVudE5vZGVRdWVyeSA9IG5vZGVRdWVyeShcIi91bnF1YWxpZmllZE1ldGFzdGF0ZW1lbnQvbWV0YXN0YXRlbWVudCFcIiksXG4gICAgICB1bnF1YWxpZmllZE1ldGFzdGF0ZW1lbnROb2RlUXVlcnkgPSBub2RlUXVlcnkoXCIvbWV0YVN1cHBvc2l0aW9uL3VucXVhbGlmaWVkTWV0YXN0YXRlbWVudCFcIik7XG5cbmV4cG9ydCBkZWZhdWx0IGZ1bmN0aW9uIHZlcmlmeU1ldGFTdXBwb3NpdGlvbihtZXRhU3VwcG9zaXRpb25Ob2RlLCBtZXRhU3VwcG9zaXRpb25zLCBsb2NhbE1ldGFDb250ZXh0KSB7XG4gIGxldCBtZXRhU3VwcG9zaXRpb25WZXJpZmllZCA9IGZhbHNlO1xuXG4gIGNvbnN0IG1ldGFTdXBwb3NpdGlvblN0cmluZyA9IGxvY2FsTWV0YUNvbnRleHQubm9kZUFzU3RyaW5nKG1ldGFTdXBwb3NpdGlvbk5vZGUpO1xuXG4gIGxvY2FsTWV0YUNvbnRleHQudHJhY2UoYFZlcmlmeWluZyB0aGUgJyR7bWV0YVN1cHBvc2l0aW9uU3RyaW5nfScgbWV0YS1zdXBwb3NpdGlvbi4uLmAsIG1ldGFTdXBwb3NpdGlvbk5vZGUpO1xuXG4gIGNvbnN0IGRlcml2ZWQgPSBmYWxzZSxcbiAgICAgICAgYXNzaWdubWVudHMgPSBbXSxcbiAgICAgICAgdW5xdWFsaWZpZWRNZXRhc3RhdGVtZW50Tm9kZSA9IHVucXVhbGlmaWVkTWV0YXN0YXRlbWVudE5vZGVRdWVyeShtZXRhU3VwcG9zaXRpb25Ob2RlKSxcbiAgICAgICAgdW5xdWFsaWZpZWRNZXRhc3RhdGVtZW50VmVyaWZpZWQgPSB2ZXJpZnlVbnF1YWxpZmllZE1ldGFzdGF0ZW1lbnQodW5xdWFsaWZpZWRNZXRhc3RhdGVtZW50Tm9kZSwgYXNzaWdubWVudHMsIGRlcml2ZWQsIGxvY2FsTWV0YUNvbnRleHQpO1xuXG4gIGlmICh1bnF1YWxpZmllZE1ldGFzdGF0ZW1lbnRWZXJpZmllZCkge1xuICAgIGNvbnN0IGFzc2lnbm1lbnRBc3NpZ25lZCA9IGFzc2lnbkFzc2lnbm1lbnQoYXNzaWdubWVudHMsIGxvY2FsTWV0YUNvbnRleHQpO1xuXG4gICAgbWV0YVN1cHBvc2l0aW9uVmVyaWZpZWQgPSBhc3NpZ25tZW50QXNzaWduZWQ7IC8vL1xuICB9XG5cbiAgaWYgKG1ldGFTdXBwb3NpdGlvblZlcmlmaWVkKSB7XG4gICAgY29uc3QgbWV0YXN0YXRlbWVudE5vZGUgPSBtZXRhc3RhdGVtZW50Tm9kZVF1ZXJ5KHVucXVhbGlmaWVkTWV0YXN0YXRlbWVudE5vZGUpLFxuICAgICAgICAgIG1ldGFTdXBwb3NpdGlvbiA9IE1ldGFTdXBwb3NpdGlvbi5mcm9tTWV0YXN0YXRlbWVudE5vZGUobWV0YXN0YXRlbWVudE5vZGUpLFxuICAgICAgICAgIG1ldGFwcm9vZlN0ZXAgPSBNZXRhcHJvb2ZTdGVwLmZyb21NZXRhc3RhdGVtZW50Tm9kZShtZXRhc3RhdGVtZW50Tm9kZSk7XG5cbiAgICBtZXRhU3VwcG9zaXRpb25zLnB1c2gobWV0YVN1cHBvc2l0aW9uKTtcblxuICAgIGxvY2FsTWV0YUNvbnRleHQuYWRkTWV0YXByb29mU3RlcChtZXRhcHJvb2ZTdGVwKTtcblxuICAgIGxvY2FsTWV0YUNvbnRleHQuZGVidWcoYC4uLnZlcmlmaWVkIHRoZSAnJHttZXRhU3VwcG9zaXRpb25TdHJpbmd9JyBtZXRhLXN1cHBvc2l0aW9uLmAsIG1ldGFTdXBwb3NpdGlvbk5vZGUpO1xuICB9XG5cbiAgcmV0dXJuIG1ldGFTdXBwb3NpdGlvblZlcmlmaWVkO1xufVxuIl0sIm5hbWVzIjpbInZlcmlmeU1ldGFTdXBwb3NpdGlvbiIsIm1ldGFzdGF0ZW1lbnROb2RlUXVlcnkiLCJub2RlUXVlcnkiLCJ1bnF1YWxpZmllZE1ldGFzdGF0ZW1lbnROb2RlUXVlcnkiLCJtZXRhU3VwcG9zaXRpb25Ob2RlIiwibWV0YVN1cHBvc2l0aW9ucyIsImxvY2FsTWV0YUNvbnRleHQiLCJtZXRhU3VwcG9zaXRpb25WZXJpZmllZCIsIm1ldGFTdXBwb3NpdGlvblN0cmluZyIsIm5vZGVBc1N0cmluZyIsInRyYWNlIiwiZGVyaXZlZCIsImFzc2lnbm1lbnRzIiwidW5xdWFsaWZpZWRNZXRhc3RhdGVtZW50Tm9kZSIsInVucXVhbGlmaWVkTWV0YXN0YXRlbWVudFZlcmlmaWVkIiwidmVyaWZ5VW5xdWFsaWZpZWRNZXRhc3RhdGVtZW50IiwiYXNzaWdubWVudEFzc2lnbmVkIiwiYXNzaWduQXNzaWdubWVudCIsIm1ldGFzdGF0ZW1lbnROb2RlIiwibWV0YVN1cHBvc2l0aW9uIiwiTWV0YVN1cHBvc2l0aW9uIiwiZnJvbU1ldGFzdGF0ZW1lbnROb2RlIiwibWV0YXByb29mU3RlcCIsIk1ldGFwcm9vZlN0ZXAiLCJwdXNoIiwiYWRkTWV0YXByb29mU3RlcCIsImRlYnVnIl0sIm1hcHBpbmdzIjoiQUFBQTs7OzsrQkFZQTs7O2VBQXdCQTs7O2dFQVZFO3NFQUNFO2tFQUNlO3FCQUVqQjsyQkFDTzs7Ozs7O0FBRWpDLElBQU1DLHlCQUF5QkMsSUFBQUEsZ0JBQVMsRUFBQyw2Q0FDbkNDLG9DQUFvQ0QsSUFBQUEsZ0JBQVMsRUFBQztBQUVyQyxTQUFTRixzQkFBc0JJLG1CQUFtQixFQUFFQyxnQkFBZ0IsRUFBRUMsZ0JBQWdCO0lBQ25HLElBQUlDLDBCQUEwQjtJQUU5QixJQUFNQyx3QkFBd0JGLGlCQUFpQkcsWUFBWSxDQUFDTDtJQUU1REUsaUJBQWlCSSxLQUFLLENBQUMsQUFBQyxrQkFBdUMsT0FBdEJGLHVCQUFzQiwwQkFBd0JKO0lBRXZGLElBQU1PLFVBQVUsT0FDVkMsY0FBYyxFQUFFLEVBQ2hCQywrQkFBK0JWLGtDQUFrQ0Msc0JBQ2pFVSxtQ0FBbUNDLElBQUFBLG9CQUE4QixFQUFDRiw4QkFBOEJELGFBQWFELFNBQVNMO0lBRTVILElBQUlRLGtDQUFrQztRQUNwQyxJQUFNRSxxQkFBcUJDLElBQUFBLDZCQUFnQixFQUFDTCxhQUFhTjtRQUV6REMsMEJBQTBCUyxvQkFBb0IsR0FBRztJQUNuRDtJQUVBLElBQUlULHlCQUF5QjtRQUMzQixJQUFNVyxvQkFBb0JqQix1QkFBdUJZLCtCQUMzQ00sa0JBQWtCQyx3QkFBZSxDQUFDQyxxQkFBcUIsQ0FBQ0gsb0JBQ3hESSxnQkFBZ0JDLGtCQUFhLENBQUNGLHFCQUFxQixDQUFDSDtRQUUxRGIsaUJBQWlCbUIsSUFBSSxDQUFDTDtRQUV0QmIsaUJBQWlCbUIsZ0JBQWdCLENBQUNIO1FBRWxDaEIsaUJBQWlCb0IsS0FBSyxDQUFDLEFBQUMsb0JBQXlDLE9BQXRCbEIsdUJBQXNCLHdCQUFzQko7SUFDekY7SUFFQSxPQUFPRztBQUNUIn0=
|
|
@@ -14,10 +14,10 @@ function _interop_require_default(obj) {
|
|
|
14
14
|
default: obj
|
|
15
15
|
};
|
|
16
16
|
}
|
|
17
|
-
function verifyMetaSuppositions(metaSuppositionNodes, metaSuppositions,
|
|
17
|
+
function verifyMetaSuppositions(metaSuppositionNodes, metaSuppositions, localMetaContext) {
|
|
18
18
|
var metaSuppositionsVerified;
|
|
19
19
|
metaSuppositionsVerified = metaSuppositionNodes.every(function(metaSuppositionNode) {
|
|
20
|
-
var metaSuppositionVerified = (0, _metaSupposition.default)(metaSuppositionNode, metaSuppositions,
|
|
20
|
+
var metaSuppositionVerified = (0, _metaSupposition.default)(metaSuppositionNode, metaSuppositions, localMetaContext);
|
|
21
21
|
if (metaSuppositionVerified) {
|
|
22
22
|
return true;
|
|
23
23
|
}
|
|
@@ -25,4 +25,4 @@ function verifyMetaSuppositions(metaSuppositionNodes, metaSuppositions, localCon
|
|
|
25
25
|
return metaSuppositionsVerified;
|
|
26
26
|
}
|
|
27
27
|
|
|
28
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
28
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy92ZXJpZnkvbWV0YVN1cHBvc2l0aW9ucy5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuaW1wb3J0IHZlcmlmeU1ldGFTdXBwb3NpdGlvbiBmcm9tIFwiLi4vdmVyaWZ5L21ldGFTdXBwb3NpdGlvblwiO1xuXG5leHBvcnQgZGVmYXVsdCBmdW5jdGlvbiB2ZXJpZnlNZXRhU3VwcG9zaXRpb25zKG1ldGFTdXBwb3NpdGlvbk5vZGVzLCBtZXRhU3VwcG9zaXRpb25zLCBsb2NhbE1ldGFDb250ZXh0KSB7XG4gIGxldCBtZXRhU3VwcG9zaXRpb25zVmVyaWZpZWQ7XG5cbiAgbWV0YVN1cHBvc2l0aW9uc1ZlcmlmaWVkID0gbWV0YVN1cHBvc2l0aW9uTm9kZXMuZXZlcnkoKG1ldGFTdXBwb3NpdGlvbk5vZGUpID0+IHtcbiAgICBjb25zdCBtZXRhU3VwcG9zaXRpb25WZXJpZmllZCA9IHZlcmlmeU1ldGFTdXBwb3NpdGlvbihtZXRhU3VwcG9zaXRpb25Ob2RlLCBtZXRhU3VwcG9zaXRpb25zLCBsb2NhbE1ldGFDb250ZXh0KTtcblxuICAgIGlmIChtZXRhU3VwcG9zaXRpb25WZXJpZmllZCkge1xuICAgICAgcmV0dXJuIHRydWU7XG4gICAgfVxuICB9KTtcblxuICByZXR1cm4gbWV0YVN1cHBvc2l0aW9uc1ZlcmlmaWVkO1xufVxuIl0sIm5hbWVzIjpbInZlcmlmeU1ldGFTdXBwb3NpdGlvbnMiLCJtZXRhU3VwcG9zaXRpb25Ob2RlcyIsIm1ldGFTdXBwb3NpdGlvbnMiLCJsb2NhbE1ldGFDb250ZXh0IiwibWV0YVN1cHBvc2l0aW9uc1ZlcmlmaWVkIiwiZXZlcnkiLCJtZXRhU3VwcG9zaXRpb25Ob2RlIiwibWV0YVN1cHBvc2l0aW9uVmVyaWZpZWQiLCJ2ZXJpZnlNZXRhU3VwcG9zaXRpb24iXSwibWFwcGluZ3MiOiJBQUFBOzs7OytCQUlBOzs7ZUFBd0JBOzs7c0VBRlU7Ozs7OztBQUVuQixTQUFTQSx1QkFBdUJDLG9CQUFvQixFQUFFQyxnQkFBZ0IsRUFBRUMsZ0JBQWdCO0lBQ3JHLElBQUlDO0lBRUpBLDJCQUEyQkgscUJBQXFCSSxLQUFLLENBQUMsU0FBQ0M7UUFDckQsSUFBTUMsMEJBQTBCQyxJQUFBQSx3QkFBcUIsRUFBQ0YscUJBQXFCSixrQkFBa0JDO1FBRTdGLElBQUlJLHlCQUF5QjtZQUMzQixPQUFPO1FBQ1Q7SUFDRjtJQUVBLE9BQU9IO0FBQ1QifQ==
|
|
@@ -8,9 +8,15 @@ Object.defineProperty(exports, "default", {
|
|
|
8
8
|
return verifyQualifiedMetastatement;
|
|
9
9
|
}
|
|
10
10
|
});
|
|
11
|
+
var _metastatement = /*#__PURE__*/ _interop_require_default(require("../metastatement"));
|
|
11
12
|
var _query = require("../../utilities/query");
|
|
13
|
+
function _interop_require_default(obj) {
|
|
14
|
+
return obj && obj.__esModule ? obj : {
|
|
15
|
+
default: obj
|
|
16
|
+
};
|
|
17
|
+
}
|
|
12
18
|
var metastatementNodeQuery = (0, _query.nodeQuery)("/qualifiedMetastatement/metastatement!"), referenceMetavariableNodeQuery = (0, _query.nodeQuery)("/qualifiedMetastatement/reference!/metavariable!");
|
|
13
|
-
function verifyQualifiedMetastatement(qualifiedMetastatementNode, assignments, derived, localMetaContext) {
|
|
19
|
+
function verifyQualifiedMetastatement(qualifiedMetastatementNode, metavariableReferences, assignments, derived, localMetaContext) {
|
|
14
20
|
var qualifiedMetastatementVerified = false;
|
|
15
21
|
var metastatementNode = metastatementNodeQuery(qualifiedMetastatementNode);
|
|
16
22
|
if (metastatementNode !== null) {
|
|
@@ -20,6 +26,17 @@ function verifyQualifiedMetastatement(qualifiedMetastatementNode, assignments, d
|
|
|
20
26
|
if (rule !== null) {
|
|
21
27
|
var ruleMatchesMetastatement = rule.matchMetastatement(metastatementNode, metastatementLocalMetaContext);
|
|
22
28
|
qualifiedMetastatementVerified = ruleMatchesMetastatement; ///
|
|
29
|
+
} else {
|
|
30
|
+
if (metavariableReferences) {
|
|
31
|
+
var metavariableNode = referenceMetavariableNode, metavariablePresent = localMetaContext.isMetavariablePresentByMetavariableNode(metavariableNode, localMetaContext);
|
|
32
|
+
if (metavariablePresent) {
|
|
33
|
+
var metastatementVerified = (0, _metastatement.default)(metastatementNode, derived, localMetaContext, function() {
|
|
34
|
+
var verifiedAhead = true;
|
|
35
|
+
return verifiedAhead;
|
|
36
|
+
});
|
|
37
|
+
qualifiedMetastatementVerified = metastatementVerified; ///
|
|
38
|
+
}
|
|
39
|
+
}
|
|
23
40
|
}
|
|
24
41
|
if (qualifiedMetastatementVerified) {
|
|
25
42
|
localMetaContext.debug("...verified the '".concat(metastatementString, "' qualified metastatement."), qualifiedMetastatementNode);
|
|
@@ -28,4 +45,4 @@ function verifyQualifiedMetastatement(qualifiedMetastatementNode, assignments, d
|
|
|
28
45
|
return qualifiedMetastatementVerified;
|
|
29
46
|
}
|
|
30
47
|
|
|
31
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
48
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy92ZXJpZnkvbWV0YXN0YXRlbWVudC9xdWFsaWZpZWQuanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmltcG9ydCB2ZXJpZnlNZXRhc3RhdGVtZW50IGZyb20gXCIuLi9tZXRhc3RhdGVtZW50XCI7XG5cbmltcG9ydCB7IG5vZGVRdWVyeSB9IGZyb20gXCIuLi8uLi91dGlsaXRpZXMvcXVlcnlcIjtcblxuY29uc3QgbWV0YXN0YXRlbWVudE5vZGVRdWVyeSA9IG5vZGVRdWVyeShcIi9xdWFsaWZpZWRNZXRhc3RhdGVtZW50L21ldGFzdGF0ZW1lbnQhXCIpLFxuICAgICAgcmVmZXJlbmNlTWV0YXZhcmlhYmxlTm9kZVF1ZXJ5ID0gbm9kZVF1ZXJ5KFwiL3F1YWxpZmllZE1ldGFzdGF0ZW1lbnQvcmVmZXJlbmNlIS9tZXRhdmFyaWFibGUhXCIpO1xuXG5leHBvcnQgZGVmYXVsdCBmdW5jdGlvbiB2ZXJpZnlRdWFsaWZpZWRNZXRhc3RhdGVtZW50KHF1YWxpZmllZE1ldGFzdGF0ZW1lbnROb2RlLCBtZXRhdmFyaWFibGVSZWZlcmVuY2VzLCBhc3NpZ25tZW50cywgZGVyaXZlZCwgbG9jYWxNZXRhQ29udGV4dCkge1xuICBsZXQgcXVhbGlmaWVkTWV0YXN0YXRlbWVudFZlcmlmaWVkID0gZmFsc2U7XG5cbiAgY29uc3QgbWV0YXN0YXRlbWVudE5vZGUgPSBtZXRhc3RhdGVtZW50Tm9kZVF1ZXJ5KHF1YWxpZmllZE1ldGFzdGF0ZW1lbnROb2RlKTtcblxuICBpZiAobWV0YXN0YXRlbWVudE5vZGUgIT09IG51bGwpIHtcbiAgICBjb25zdCBtZXRhc3RhdGVtZW50U3RyaW5nID0gbG9jYWxNZXRhQ29udGV4dC5ub2RlQXNTdHJpbmcobWV0YXN0YXRlbWVudE5vZGUpLFxuICAgICAgICAgIG1ldGFzdGF0ZW1lbnRMb2NhbE1ldGFDb250ZXh0ID0gbG9jYWxNZXRhQ29udGV4dDsgLy8vXG5cbiAgICBsb2NhbE1ldGFDb250ZXh0LnRyYWNlKGBWZXJpZnlpbmcgdGhlICcke21ldGFzdGF0ZW1lbnRTdHJpbmd9JyBxdWFsaWZpZWQgbWV0YXN0YXRlbWVudC4uLmAsIHF1YWxpZmllZE1ldGFzdGF0ZW1lbnROb2RlKTtcblxuICAgIGNvbnN0IHJlZmVyZW5jZU1ldGF2YXJpYWJsZU5vZGUgPSByZWZlcmVuY2VNZXRhdmFyaWFibGVOb2RlUXVlcnkocXVhbGlmaWVkTWV0YXN0YXRlbWVudE5vZGUpLFxuICAgICAgICAgIGxhYmVsTWV0YXZhcmlhYmxlTm9kZSA9IHJlZmVyZW5jZU1ldGF2YXJpYWJsZU5vZGUsICAvLy9cbiAgICAgICAgICBydWxlID0gbG9jYWxNZXRhQ29udGV4dC5maW5kUnVsZUJ5TGFiZWxNZXRhdmFyaWFibGVOb2RlKGxhYmVsTWV0YXZhcmlhYmxlTm9kZSk7XG5cbiAgICBpZiAocnVsZSAhPT0gbnVsbCkge1xuICAgICAgY29uc3QgcnVsZU1hdGNoZXNNZXRhc3RhdGVtZW50ID0gcnVsZS5tYXRjaE1ldGFzdGF0ZW1lbnQobWV0YXN0YXRlbWVudE5vZGUsIG1ldGFzdGF0ZW1lbnRMb2NhbE1ldGFDb250ZXh0KTtcblxuICAgICAgcXVhbGlmaWVkTWV0YXN0YXRlbWVudFZlcmlmaWVkID0gcnVsZU1hdGNoZXNNZXRhc3RhdGVtZW50OyAgLy8vXG4gICAgfSBlbHNlIHtcbiAgICAgIGlmIChtZXRhdmFyaWFibGVSZWZlcmVuY2VzKSB7XG4gICAgICAgIGNvbnN0IG1ldGF2YXJpYWJsZU5vZGUgPSByZWZlcmVuY2VNZXRhdmFyaWFibGVOb2RlLCAvLy9cbiAgICAgICAgICAgICAgbWV0YXZhcmlhYmxlUHJlc2VudCA9IGxvY2FsTWV0YUNvbnRleHQuaXNNZXRhdmFyaWFibGVQcmVzZW50QnlNZXRhdmFyaWFibGVOb2RlKG1ldGF2YXJpYWJsZU5vZGUsIGxvY2FsTWV0YUNvbnRleHQpO1xuXG4gICAgICAgIGlmIChtZXRhdmFyaWFibGVQcmVzZW50KSB7XG4gICAgICAgICAgY29uc3QgbWV0YXN0YXRlbWVudFZlcmlmaWVkID0gdmVyaWZ5TWV0YXN0YXRlbWVudChtZXRhc3RhdGVtZW50Tm9kZSwgZGVyaXZlZCwgbG9jYWxNZXRhQ29udGV4dCwgKCkgPT4ge1xuICAgICAgICAgICAgY29uc3QgdmVyaWZpZWRBaGVhZCA9IHRydWU7XG5cbiAgICAgICAgICAgIHJldHVybiB2ZXJpZmllZEFoZWFkO1xuICAgICAgICAgIH0pO1xuXG4gICAgICAgICAgcXVhbGlmaWVkTWV0YXN0YXRlbWVudFZlcmlmaWVkID0gbWV0YXN0YXRlbWVudFZlcmlmaWVkOyAvLy9cbiAgICAgICAgfVxuICAgICAgfVxuICAgIH1cblxuICAgIGlmIChxdWFsaWZpZWRNZXRhc3RhdGVtZW50VmVyaWZpZWQpIHtcbiAgICAgIGxvY2FsTWV0YUNvbnRleHQuZGVidWcoYC4uLnZlcmlmaWVkIHRoZSAnJHttZXRhc3RhdGVtZW50U3RyaW5nfScgcXVhbGlmaWVkIG1ldGFzdGF0ZW1lbnQuYCwgcXVhbGlmaWVkTWV0YXN0YXRlbWVudE5vZGUpO1xuICAgIH1cbiAgfVxuXG4gIHJldHVybiBxdWFsaWZpZWRNZXRhc3RhdGVtZW50VmVyaWZpZWQ7XG59XG4iXSwibmFtZXMiOlsidmVyaWZ5UXVhbGlmaWVkTWV0YXN0YXRlbWVudCIsIm1ldGFzdGF0ZW1lbnROb2RlUXVlcnkiLCJub2RlUXVlcnkiLCJyZWZlcmVuY2VNZXRhdmFyaWFibGVOb2RlUXVlcnkiLCJxdWFsaWZpZWRNZXRhc3RhdGVtZW50Tm9kZSIsIm1ldGF2YXJpYWJsZVJlZmVyZW5jZXMiLCJhc3NpZ25tZW50cyIsImRlcml2ZWQiLCJsb2NhbE1ldGFDb250ZXh0IiwicXVhbGlmaWVkTWV0YXN0YXRlbWVudFZlcmlmaWVkIiwibWV0YXN0YXRlbWVudE5vZGUiLCJtZXRhc3RhdGVtZW50U3RyaW5nIiwibm9kZUFzU3RyaW5nIiwibWV0YXN0YXRlbWVudExvY2FsTWV0YUNvbnRleHQiLCJ0cmFjZSIsInJlZmVyZW5jZU1ldGF2YXJpYWJsZU5vZGUiLCJsYWJlbE1ldGF2YXJpYWJsZU5vZGUiLCJydWxlIiwiZmluZFJ1bGVCeUxhYmVsTWV0YXZhcmlhYmxlTm9kZSIsInJ1bGVNYXRjaGVzTWV0YXN0YXRlbWVudCIsIm1hdGNoTWV0YXN0YXRlbWVudCIsIm1ldGF2YXJpYWJsZU5vZGUiLCJtZXRhdmFyaWFibGVQcmVzZW50IiwiaXNNZXRhdmFyaWFibGVQcmVzZW50QnlNZXRhdmFyaWFibGVOb2RlIiwibWV0YXN0YXRlbWVudFZlcmlmaWVkIiwidmVyaWZ5TWV0YXN0YXRlbWVudCIsInZlcmlmaWVkQWhlYWQiLCJkZWJ1ZyJdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7K0JBU0E7OztlQUF3QkE7OztvRUFQUTtxQkFFTjs7Ozs7O0FBRTFCLElBQU1DLHlCQUF5QkMsSUFBQUEsZ0JBQVMsRUFBQywyQ0FDbkNDLGlDQUFpQ0QsSUFBQUEsZ0JBQVMsRUFBQztBQUVsQyxTQUFTRiw2QkFBNkJJLDBCQUEwQixFQUFFQyxzQkFBc0IsRUFBRUMsV0FBVyxFQUFFQyxPQUFPLEVBQUVDLGdCQUFnQjtJQUM3SSxJQUFJQyxpQ0FBaUM7SUFFckMsSUFBTUMsb0JBQW9CVCx1QkFBdUJHO0lBRWpELElBQUlNLHNCQUFzQixNQUFNO1FBQzlCLElBQU1DLHNCQUFzQkgsaUJBQWlCSSxZQUFZLENBQUNGLG9CQUNwREcsZ0NBQWdDTCxrQkFBa0IsR0FBRztRQUUzREEsaUJBQWlCTSxLQUFLLENBQUMsQUFBQyxrQkFBcUMsT0FBcEJILHFCQUFvQixpQ0FBK0JQO1FBRTVGLElBQU1XLDRCQUE0QlosK0JBQStCQyw2QkFDM0RZLHdCQUF3QkQsMkJBQ3hCRSxPQUFPVCxpQkFBaUJVLCtCQUErQixDQUFDRjtRQUU5RCxJQUFJQyxTQUFTLE1BQU07WUFDakIsSUFBTUUsMkJBQTJCRixLQUFLRyxrQkFBa0IsQ0FBQ1YsbUJBQW1CRztZQUU1RUosaUNBQWlDVSwwQkFBMkIsR0FBRztRQUNqRSxPQUFPO1lBQ0wsSUFBSWQsd0JBQXdCO2dCQUMxQixJQUFNZ0IsbUJBQW1CTiwyQkFDbkJPLHNCQUFzQmQsaUJBQWlCZSx1Q0FBdUMsQ0FBQ0Ysa0JBQWtCYjtnQkFFdkcsSUFBSWMscUJBQXFCO29CQUN2QixJQUFNRSx3QkFBd0JDLElBQUFBLHNCQUFtQixFQUFDZixtQkFBbUJILFNBQVNDLGtCQUFrQjt3QkFDOUYsSUFBTWtCLGdCQUFnQjt3QkFFdEIsT0FBT0E7b0JBQ1Q7b0JBRUFqQixpQ0FBaUNlLHVCQUF1QixHQUFHO2dCQUM3RDtZQUNGO1FBQ0Y7UUFFQSxJQUFJZixnQ0FBZ0M7WUFDbENELGlCQUFpQm1CLEtBQUssQ0FBQyxBQUFDLG9CQUF1QyxPQUFwQmhCLHFCQUFvQiwrQkFBNkJQO1FBQzlGO0lBQ0Y7SUFFQSxPQUFPSztBQUNUIn0=
|
|
@@ -16,7 +16,7 @@ function _interop_require_default(obj) {
|
|
|
16
16
|
};
|
|
17
17
|
}
|
|
18
18
|
var metastatementNodeQuery = (0, _query.nodeQuery)("/unqualifiedMetastatement/metastatement!");
|
|
19
|
-
function verifyUnqualifiedMetastatement(unqualifiedMetastatementNode, derived, localMetaContext) {
|
|
19
|
+
function verifyUnqualifiedMetastatement(unqualifiedMetastatementNode, assignments, derived, localMetaContext) {
|
|
20
20
|
var unqualifiedMetastatementVerified = false;
|
|
21
21
|
var metastatementNode = metastatementNodeQuery(unqualifiedMetastatementNode);
|
|
22
22
|
if (metastatementNode !== null) {
|
|
@@ -40,4 +40,4 @@ function verifyUnqualifiedMetastatement(unqualifiedMetastatementNode, derived, l
|
|
|
40
40
|
return unqualifiedMetastatementVerified;
|
|
41
41
|
}
|
|
42
42
|
|
|
43
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
43
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy92ZXJpZnkvbWV0YXN0YXRlbWVudC91bnF1YWxpZmllZC5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuaW1wb3J0IHZlcmlmeU1ldGFzdGF0ZW1lbnQgZnJvbSBcIi4uLy4uL3ZlcmlmeS9tZXRhc3RhdGVtZW50XCI7XG5cbmltcG9ydCB7IG5vZGVRdWVyeSB9IGZyb20gXCIuLi8uLi91dGlsaXRpZXMvcXVlcnlcIjtcblxuY29uc3QgbWV0YXN0YXRlbWVudE5vZGVRdWVyeSA9IG5vZGVRdWVyeShcIi91bnF1YWxpZmllZE1ldGFzdGF0ZW1lbnQvbWV0YXN0YXRlbWVudCFcIik7XG5cbmV4cG9ydCBkZWZhdWx0IGZ1bmN0aW9uIHZlcmlmeVVucXVhbGlmaWVkTWV0YXN0YXRlbWVudCh1bnF1YWxpZmllZE1ldGFzdGF0ZW1lbnROb2RlLCBhc3NpZ25tZW50cywgZGVyaXZlZCwgbG9jYWxNZXRhQ29udGV4dCkge1xuICBsZXQgdW5xdWFsaWZpZWRNZXRhc3RhdGVtZW50VmVyaWZpZWQgPSBmYWxzZTtcblxuICBjb25zdCBtZXRhc3RhdGVtZW50Tm9kZSA9IG1ldGFzdGF0ZW1lbnROb2RlUXVlcnkodW5xdWFsaWZpZWRNZXRhc3RhdGVtZW50Tm9kZSk7XG5cbiAgaWYgKG1ldGFzdGF0ZW1lbnROb2RlICE9PSBudWxsKSB7XG4gICAgY29uc3QgbWV0YXN0YXRlbWVudFN0cmluZyA9IGxvY2FsTWV0YUNvbnRleHQubm9kZUFzU3RyaW5nKG1ldGFzdGF0ZW1lbnROb2RlKTtcblxuICAgIGxvY2FsTWV0YUNvbnRleHQudHJhY2UoYFZlcmlmeWluZyB0aGUgJyR7bWV0YXN0YXRlbWVudFN0cmluZ30nIHVucXVhbGlmaWVkIG1ldGFzdGF0ZW1lbnQuLi5gLCB1bnF1YWxpZmllZE1ldGFzdGF0ZW1lbnROb2RlKTtcblxuICAgIGlmIChkZXJpdmVkKSB7XG4gICAgICBjb25zdCBtZXRhc3RhdGVtZW50TWF0Y2hlcyA9IGxvY2FsTWV0YUNvbnRleHQubWF0Y2hNZXRhc3RhdGVtZW50KG1ldGFzdGF0ZW1lbnROb2RlKTtcblxuICAgICAgdW5xdWFsaWZpZWRNZXRhc3RhdGVtZW50VmVyaWZpZWQgPSBtZXRhc3RhdGVtZW50TWF0Y2hlczsgIC8vL1xuICAgIH1cblxuICAgIGlmICghdW5xdWFsaWZpZWRNZXRhc3RhdGVtZW50VmVyaWZpZWQpIHtcbiAgICAgIGNvbnN0IG1ldGFzdGF0ZW1lbnRWZXJpZmllZCA9IHZlcmlmeU1ldGFzdGF0ZW1lbnQobWV0YXN0YXRlbWVudE5vZGUsIGRlcml2ZWQsIGxvY2FsTWV0YUNvbnRleHQsICgpID0+IHtcbiAgICAgICAgY29uc3QgdmVyaWZpZWRBaGVhZCA9IHRydWU7XG5cbiAgICAgICAgcmV0dXJuIHZlcmlmaWVkQWhlYWQ7XG4gICAgICB9KTtcblxuICAgICAgdW5xdWFsaWZpZWRNZXRhc3RhdGVtZW50VmVyaWZpZWQgPSBtZXRhc3RhdGVtZW50VmVyaWZpZWQ7IC8vL1xuICAgIH1cblxuICAgIGlmICh1bnF1YWxpZmllZE1ldGFzdGF0ZW1lbnRWZXJpZmllZCkge1xuICAgICAgbG9jYWxNZXRhQ29udGV4dC5kZWJ1ZyhgLi4udmVyaWZpZWQgdGhlICcke21ldGFzdGF0ZW1lbnRTdHJpbmd9JyB1bnF1YWxpZmllZCBtZXRhc3RhdGVtZW50LmAsIHVucXVhbGlmaWVkTWV0YXN0YXRlbWVudE5vZGUpO1xuICAgIH1cbiAgfVxuXG4gIHJldHVybiB1bnF1YWxpZmllZE1ldGFzdGF0ZW1lbnRWZXJpZmllZDtcbn1cbiJdLCJuYW1lcyI6WyJ2ZXJpZnlVbnF1YWxpZmllZE1ldGFzdGF0ZW1lbnQiLCJtZXRhc3RhdGVtZW50Tm9kZVF1ZXJ5Iiwibm9kZVF1ZXJ5IiwidW5xdWFsaWZpZWRNZXRhc3RhdGVtZW50Tm9kZSIsImFzc2lnbm1lbnRzIiwiZGVyaXZlZCIsImxvY2FsTWV0YUNvbnRleHQiLCJ1bnF1YWxpZmllZE1ldGFzdGF0ZW1lbnRWZXJpZmllZCIsIm1ldGFzdGF0ZW1lbnROb2RlIiwibWV0YXN0YXRlbWVudFN0cmluZyIsIm5vZGVBc1N0cmluZyIsInRyYWNlIiwibWV0YXN0YXRlbWVudE1hdGNoZXMiLCJtYXRjaE1ldGFzdGF0ZW1lbnQiLCJtZXRhc3RhdGVtZW50VmVyaWZpZWQiLCJ2ZXJpZnlNZXRhc3RhdGVtZW50IiwidmVyaWZpZWRBaGVhZCIsImRlYnVnIl0sIm1hcHBpbmdzIjoiQUFBQTs7OzsrQkFRQTs7O2VBQXdCQTs7O29FQU5RO3FCQUVOOzs7Ozs7QUFFMUIsSUFBTUMseUJBQXlCQyxJQUFBQSxnQkFBUyxFQUFDO0FBRTFCLFNBQVNGLCtCQUErQkcsNEJBQTRCLEVBQUVDLFdBQVcsRUFBRUMsT0FBTyxFQUFFQyxnQkFBZ0I7SUFDekgsSUFBSUMsbUNBQW1DO0lBRXZDLElBQU1DLG9CQUFvQlAsdUJBQXVCRTtJQUVqRCxJQUFJSyxzQkFBc0IsTUFBTTtRQUM5QixJQUFNQyxzQkFBc0JILGlCQUFpQkksWUFBWSxDQUFDRjtRQUUxREYsaUJBQWlCSyxLQUFLLENBQUMsQUFBQyxrQkFBcUMsT0FBcEJGLHFCQUFvQixtQ0FBaUNOO1FBRTlGLElBQUlFLFNBQVM7WUFDWCxJQUFNTyx1QkFBdUJOLGlCQUFpQk8sa0JBQWtCLENBQUNMO1lBRWpFRCxtQ0FBbUNLLHNCQUF1QixHQUFHO1FBQy9EO1FBRUEsSUFBSSxDQUFDTCxrQ0FBa0M7WUFDckMsSUFBTU8sd0JBQXdCQyxJQUFBQSxzQkFBbUIsRUFBQ1AsbUJBQW1CSCxTQUFTQyxrQkFBa0I7Z0JBQzlGLElBQU1VLGdCQUFnQjtnQkFFdEIsT0FBT0E7WUFDVDtZQUVBVCxtQ0FBbUNPLHVCQUF1QixHQUFHO1FBQy9EO1FBRUEsSUFBSVAsa0NBQWtDO1lBQ3BDRCxpQkFBaUJXLEtBQUssQ0FBQyxBQUFDLG9CQUF1QyxPQUFwQlIscUJBQW9CLGlDQUErQk47UUFDaEc7SUFDRjtJQUVBLE9BQU9JO0FBQ1QifQ==
|
|
@@ -34,7 +34,7 @@ function verifyMetatheorem(metatheoremNode, fileContext) {
|
|
|
34
34
|
if (metaConsequentVerified) {
|
|
35
35
|
var metaproofNode = metaproofNodeQuery(metatheoremNode), firstMetaConsequent = (0, _array.first)(metaConsequents), metaConsequent = firstMetaConsequent, metaproofVerified = (0, _metaproof.default)(metaproofNode, metaConsequent, localMetaContext);
|
|
36
36
|
if (metaproofVerified) {
|
|
37
|
-
var metatheorem = _metatheorem.default.
|
|
37
|
+
var metatheorem = _metatheorem.default.fromLabelsMetaSuppositionsMetaConsequentAndFileContext(labels, metaSuppositions, metaConsequent, fileContext);
|
|
38
38
|
fileContext.addMetatheorem(metatheorem);
|
|
39
39
|
metatheoremVerified = true;
|
|
40
40
|
}
|
|
@@ -47,4 +47,4 @@ function verifyMetatheorem(metatheoremNode, fileContext) {
|
|
|
47
47
|
return metatheoremVerified;
|
|
48
48
|
}
|
|
49
49
|
|
|
50
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
50
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy92ZXJpZnkvbWV0YXRoZW9yZW0uanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmltcG9ydCBNZXRhdGhlb3JlbSBmcm9tIFwiLi4vbWV0YXRoZW9yZW1cIjtcbmltcG9ydCB2ZXJpZnlMYWJlbHMgZnJvbSBcIi4uL3ZlcmlmeS9sYWJlbHNcIjtcbmltcG9ydCB2ZXJpZnlNZXRhcHJvb2YgZnJvbSBcIi4uL3ZlcmlmeS9tZXRhcHJvb2ZcIjtcbmltcG9ydCBMb2NhbE1ldGFDb250ZXh0IGZyb20gXCIuLi9jb250ZXh0L2xvY2FsTWV0YVwiO1xuaW1wb3J0IHZlcmlmeU1ldGFDb25zZXF1ZW50IGZyb20gXCIuLi92ZXJpZnkvbWV0YUNvbnNlcXVlbnRcIjtcbmltcG9ydCB2ZXJpZnlNZXRhU3VwcG9zaXRpb25zIGZyb20gXCIuLi92ZXJpZnkvbWV0YVN1cHBvc2l0aW9uc1wiO1xuXG5pbXBvcnQgeyBmaXJzdCB9IGZyb20gXCIuLi91dGlsaXRpZXMvYXJyYXlcIjtcbmltcG9ydCB7IG5vZGVRdWVyeSwgbm9kZXNRdWVyeSB9IGZyb20gXCIuLi91dGlsaXRpZXMvcXVlcnlcIjtcblxuY29uc3QgbGFiZWxzTm9kZVF1ZXJ5ID0gbm9kZVF1ZXJ5KFwiL21ldGF0aGVvcmVtL2xhYmVscyFcIiksXG4gICAgICBtZXRhcHJvb2ZOb2RlUXVlcnkgPSBub2RlUXVlcnkoXCIvbWV0YXRoZW9yZW0vbWV0YXByb29mIVwiKSxcbiAgICAgIG1ldGFDb25zZXF1ZW50Tm9kZVF1ZXJ5ID0gbm9kZVF1ZXJ5KFwiL21ldGF0aGVvcmVtL21ldGFDb25zZXF1ZW50IVwiKSxcbiAgICAgIG1ldGFTdXBwb3NpdGlvbnNOb2RlUXVlcnkgPSBub2Rlc1F1ZXJ5KFwiL21ldGF0aGVvcmVtL21ldGFTdXBwb3NpdGlvblwiKTtcblxuZXhwb3J0IGRlZmF1bHQgZnVuY3Rpb24gdmVyaWZ5TWV0YXRoZW9yZW0obWV0YXRoZW9yZW1Ob2RlLCBmaWxlQ29udGV4dCkge1xuICBsZXQgbWV0YXRoZW9yZW1WZXJpZmllZCA9IGZhbHNlO1xuXG4gIGNvbnN0IGxhYmVsc05vZGUgPSBsYWJlbHNOb2RlUXVlcnkobWV0YXRoZW9yZW1Ob2RlKSxcbiAgICAgICAgbGFiZWxzU3RyaW5nID0gZmlsZUNvbnRleHQubm9kZUFzU3RyaW5nKGxhYmVsc05vZGUpLFxuICAgICAgICBsb2NhbE1ldGFDb250ZXh0ID0gTG9jYWxNZXRhQ29udGV4dC5mcm9tRmlsZUNvbnRleHQoZmlsZUNvbnRleHQpO1xuXG4gIGZpbGVDb250ZXh0LnRyYWNlKGBWZXJpZnlpbmcgdGhlICcke2xhYmVsc1N0cmluZ30nIG1ldGF0aGVvcmVtLi4uYCwgbWV0YXRoZW9yZW1Ob2RlKTtcblxuICBjb25zdCBsYWJlbHMgPSBbXSxcbiAgICAgICAgbGFiZWxzVmVyaWZpZWQgPSB2ZXJpZnlMYWJlbHMobGFiZWxzTm9kZSwgbGFiZWxzLCBmaWxlQ29udGV4dCk7XG5cbiAgaWYgKGxhYmVsc1ZlcmlmaWVkKSB7XG4gICAgY29uc3QgbWV0YVN1cHBvc2l0aW9ucyA9IFtdLFxuICAgICAgICAgIG1ldGFTdXBwb3NpdGlvbk5vZGVzID0gbWV0YVN1cHBvc2l0aW9uc05vZGVRdWVyeShtZXRhdGhlb3JlbU5vZGUpLFxuICAgICAgICAgIG1ldGFTdXBwb3NpdGlvbnNWZXJpZmllZCA9IHZlcmlmeU1ldGFTdXBwb3NpdGlvbnMobWV0YVN1cHBvc2l0aW9uTm9kZXMsIG1ldGFTdXBwb3NpdGlvbnMsIGxvY2FsTWV0YUNvbnRleHQpO1xuXG4gICAgaWYgKG1ldGFTdXBwb3NpdGlvbnNWZXJpZmllZCkge1xuICAgICAgY29uc3QgbWV0YUNvbnNlcXVlbnRzID0gW10sXG4gICAgICAgICAgICBtZXRhQ29uc2VxdWVudE5vZGUgPSBtZXRhQ29uc2VxdWVudE5vZGVRdWVyeShtZXRhdGhlb3JlbU5vZGUpLFxuICAgICAgICAgICAgbWV0YUNvbnNlcXVlbnRWZXJpZmllZCA9IHZlcmlmeU1ldGFDb25zZXF1ZW50KG1ldGFDb25zZXF1ZW50Tm9kZSwgbWV0YUNvbnNlcXVlbnRzLCBsb2NhbE1ldGFDb250ZXh0KTtcblxuICAgICAgaWYgKG1ldGFDb25zZXF1ZW50VmVyaWZpZWQpIHtcbiAgICAgICAgY29uc3QgbWV0YXByb29mTm9kZSA9IG1ldGFwcm9vZk5vZGVRdWVyeShtZXRhdGhlb3JlbU5vZGUpLFxuICAgICAgICAgICAgICBmaXJzdE1ldGFDb25zZXF1ZW50ID0gZmlyc3QobWV0YUNvbnNlcXVlbnRzKSxcbiAgICAgICAgICAgICAgbWV0YUNvbnNlcXVlbnQgPSBmaXJzdE1ldGFDb25zZXF1ZW50LCAvLy9cbiAgICAgICAgICAgICAgbWV0YXByb29mVmVyaWZpZWQgPSB2ZXJpZnlNZXRhcHJvb2YobWV0YXByb29mTm9kZSwgbWV0YUNvbnNlcXVlbnQsIGxvY2FsTWV0YUNvbnRleHQpO1xuXG4gICAgICAgIGlmIChtZXRhcHJvb2ZWZXJpZmllZCkge1xuICAgICAgICAgIGNvbnN0IG1ldGF0aGVvcmVtID0gTWV0YXRoZW9yZW0uZnJvbUxhYmVsc01ldGFTdXBwb3NpdGlvbnNNZXRhQ29uc2VxdWVudEFuZEZpbGVDb250ZXh0KGxhYmVscywgbWV0YVN1cHBvc2l0aW9ucywgbWV0YUNvbnNlcXVlbnQsIGZpbGVDb250ZXh0KTtcblxuICAgICAgICAgIGZpbGVDb250ZXh0LmFkZE1ldGF0aGVvcmVtKG1ldGF0aGVvcmVtKTtcblxuICAgICAgICAgIG1ldGF0aGVvcmVtVmVyaWZpZWQgPSB0cnVlO1xuICAgICAgICB9XG4gICAgICB9XG4gICAgfVxuICB9XG5cbiAgaWYgKG1ldGF0aGVvcmVtVmVyaWZpZWQpIHtcbiAgICBmaWxlQ29udGV4dC5kZWJ1ZyhgLi4udmVyaWZpZWQgdGhlICcke2xhYmVsc1N0cmluZ30nIG1ldGF0aGVvcmVtLmAsIG1ldGF0aGVvcmVtTm9kZSk7XG4gIH1cblxuICByZXR1cm4gbWV0YXRoZW9yZW1WZXJpZmllZDtcbn1cbiJdLCJuYW1lcyI6WyJ2ZXJpZnlNZXRhdGhlb3JlbSIsImxhYmVsc05vZGVRdWVyeSIsIm5vZGVRdWVyeSIsIm1ldGFwcm9vZk5vZGVRdWVyeSIsIm1ldGFDb25zZXF1ZW50Tm9kZVF1ZXJ5IiwibWV0YVN1cHBvc2l0aW9uc05vZGVRdWVyeSIsIm5vZGVzUXVlcnkiLCJtZXRhdGhlb3JlbU5vZGUiLCJmaWxlQ29udGV4dCIsIm1ldGF0aGVvcmVtVmVyaWZpZWQiLCJsYWJlbHNOb2RlIiwibGFiZWxzU3RyaW5nIiwibm9kZUFzU3RyaW5nIiwibG9jYWxNZXRhQ29udGV4dCIsIkxvY2FsTWV0YUNvbnRleHQiLCJmcm9tRmlsZUNvbnRleHQiLCJ0cmFjZSIsImxhYmVscyIsImxhYmVsc1ZlcmlmaWVkIiwidmVyaWZ5TGFiZWxzIiwibWV0YVN1cHBvc2l0aW9ucyIsIm1ldGFTdXBwb3NpdGlvbk5vZGVzIiwibWV0YVN1cHBvc2l0aW9uc1ZlcmlmaWVkIiwidmVyaWZ5TWV0YVN1cHBvc2l0aW9ucyIsIm1ldGFDb25zZXF1ZW50cyIsIm1ldGFDb25zZXF1ZW50Tm9kZSIsIm1ldGFDb25zZXF1ZW50VmVyaWZpZWQiLCJ2ZXJpZnlNZXRhQ29uc2VxdWVudCIsIm1ldGFwcm9vZk5vZGUiLCJmaXJzdE1ldGFDb25zZXF1ZW50IiwiZmlyc3QiLCJtZXRhQ29uc2VxdWVudCIsIm1ldGFwcm9vZlZlcmlmaWVkIiwidmVyaWZ5TWV0YXByb29mIiwibWV0YXRoZW9yZW0iLCJNZXRhdGhlb3JlbSIsImZyb21MYWJlbHNNZXRhU3VwcG9zaXRpb25zTWV0YUNvbnNlcXVlbnRBbmRGaWxlQ29udGV4dCIsImFkZE1ldGF0aGVvcmVtIiwiZGVidWciXSwibWFwcGluZ3MiOiJBQUFBOzs7OytCQWlCQTs7O2VBQXdCQTs7O2tFQWZBOzZEQUNDO2dFQUNHO2dFQUNDO3FFQUNJO3VFQUNFO3FCQUViO3FCQUNnQjs7Ozs7O0FBRXRDLElBQU1DLGtCQUFrQkMsSUFBQUEsZ0JBQVMsRUFBQyx5QkFDNUJDLHFCQUFxQkQsSUFBQUEsZ0JBQVMsRUFBQyw0QkFDL0JFLDBCQUEwQkYsSUFBQUEsZ0JBQVMsRUFBQyxpQ0FDcENHLDRCQUE0QkMsSUFBQUEsaUJBQVUsRUFBQztBQUU5QixTQUFTTixrQkFBa0JPLGVBQWUsRUFBRUMsV0FBVztJQUNwRSxJQUFJQyxzQkFBc0I7SUFFMUIsSUFBTUMsYUFBYVQsZ0JBQWdCTSxrQkFDN0JJLGVBQWVILFlBQVlJLFlBQVksQ0FBQ0YsYUFDeENHLG1CQUFtQkMsa0JBQWdCLENBQUNDLGVBQWUsQ0FBQ1A7SUFFMURBLFlBQVlRLEtBQUssQ0FBQyxBQUFDLGtCQUE4QixPQUFiTCxjQUFhLHFCQUFtQko7SUFFcEUsSUFBTVUsU0FBUyxFQUFFLEVBQ1hDLGlCQUFpQkMsSUFBQUEsZUFBWSxFQUFDVCxZQUFZTyxRQUFRVDtJQUV4RCxJQUFJVSxnQkFBZ0I7UUFDbEIsSUFBTUUsbUJBQW1CLEVBQUUsRUFDckJDLHVCQUF1QmhCLDBCQUEwQkUsa0JBQ2pEZSwyQkFBMkJDLElBQUFBLHlCQUFzQixFQUFDRixzQkFBc0JELGtCQUFrQlA7UUFFaEcsSUFBSVMsMEJBQTBCO1lBQzVCLElBQU1FLGtCQUFrQixFQUFFLEVBQ3BCQyxxQkFBcUJyQix3QkFBd0JHLGtCQUM3Q21CLHlCQUF5QkMsSUFBQUEsdUJBQW9CLEVBQUNGLG9CQUFvQkQsaUJBQWlCWDtZQUV6RixJQUFJYSx3QkFBd0I7Z0JBQzFCLElBQU1FLGdCQUFnQnpCLG1CQUFtQkksa0JBQ25Dc0Isc0JBQXNCQyxJQUFBQSxZQUFLLEVBQUNOLGtCQUM1Qk8saUJBQWlCRixxQkFDakJHLG9CQUFvQkMsSUFBQUEsa0JBQWUsRUFBQ0wsZUFBZUcsZ0JBQWdCbEI7Z0JBRXpFLElBQUltQixtQkFBbUI7b0JBQ3JCLElBQU1FLGNBQWNDLG9CQUFXLENBQUNDLHNEQUFzRCxDQUFDbkIsUUFBUUcsa0JBQWtCVyxnQkFBZ0J2QjtvQkFFaklBLFlBQVk2QixjQUFjLENBQUNIO29CQUUzQnpCLHNCQUFzQjtnQkFDeEI7WUFDRjtRQUNGO0lBQ0Y7SUFFQSxJQUFJQSxxQkFBcUI7UUFDdkJELFlBQVk4QixLQUFLLENBQUMsQUFBQyxvQkFBZ0MsT0FBYjNCLGNBQWEsbUJBQWlCSjtJQUN0RTtJQUVBLE9BQU9FO0FBQ1QifQ==
|
|
@@ -62,7 +62,7 @@ function verifyStandaloneMetavariable(metavariableNode, localMetaContext, verify
|
|
|
62
62
|
var standaloneMetavariableVerified = false;
|
|
63
63
|
var metavariableString = localMetaContext.nodeAsString(metavariableNode);
|
|
64
64
|
localMetaContext.trace("Verifying the '".concat(metavariableString, "' standalone metavariable..."), metavariableNode);
|
|
65
|
-
var metavariablePresent = localMetaContext.isMetavariablePresentByMetavariableNode(metavariableNode);
|
|
65
|
+
var metavariablePresent = localMetaContext.isMetavariablePresentByMetavariableNode(metavariableNode, localMetaContext);
|
|
66
66
|
if (metavariablePresent) {
|
|
67
67
|
var verifiedAhead = verifyAhead();
|
|
68
68
|
standaloneMetavariableVerified = verifiedAhead; ///
|
|
@@ -105,4 +105,4 @@ function verifyMetaType(metaTypeNode, metaTypes, fileContext) {
|
|
|
105
105
|
return metaTypeVerified;
|
|
106
106
|
}
|
|
107
107
|
|
|
108
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/verify/metavariable.js"],"sourcesContent":["\"use strict\";\n\nimport Metavariable from \"../metavariable\";\nimport MetavariableAssignment from \"../assignment/metavariable\";\n\nimport { first } from \"../utilities/array\";\nimport { nodeQuery } from \"../utilities/query\";\nimport { nameFromMetavariableNode } from \"../utilities/name\";\n\nconst termNodeQuery = nodeQuery(\"/argument/term\"),\n      typeNodeQuery = nodeQuery(\"/argument/type\"),\n      argumentNodeQuery = nodeQuery(\"/metavariable/argument!\");\n\nexport default function verifyMetavariable(metavariableNode, metaTypeNode, fileContext) {\n  let metavariableVerified = false;\n\n  const metavariableString = fileContext.nodeAsString(metavariableNode);\n\n  fileContext.trace(`Verifying the '${metavariableString}' metavariable...`, metavariableNode);\n\n  const name = nameFromMetavariableNode(metavariableNode),\n        metavariablePresent = fileContext.isMetavariablePresentByName(name);\n\n  if (metavariablePresent) {\n    fileContext.debug(`The metavariable '${metavariableString}' is already present.`, metavariableNode);\n  } else {\n    const termTypes = [],\n          metaTypes = [],\n          argumentNode = argumentNodeQuery(metavariableNode),\n          argumentVerified = verifyArgument(argumentNode, termTypes, fileContext),\n          metaTypeVerified = verifyMetaType(metaTypeNode, metaTypes, fileContext);\n\n    if (argumentVerified && metaTypeVerified) {\n      let termType,\n          metaType;\n\n      const firstMetaType = first(metaTypes);\n\n      metaType = firstMetaType; ///\n\n      const termTypesLength = termTypes.length;\n\n      if (termTypesLength === 0) {\n        termType = null;\n      } else {\n        const firstTermType = first(termTypes);\n\n        termType = firstTermType; ///\n      }\n\n      const node = metavariableNode,  ///\n            metavariable = Metavariable.fromNodeNameTermTypeAndMetaType(node, name, termType, metaType),\n            metavariableAssignment = MetavariableAssignment.fromMetavariable(metavariable),\n            metavariableAssigned = metavariableAssignment.assign(fileContext);\n\n      if (metavariableAssigned) {\n        metavariableVerified = true;\n      }\n    }\n  }\n\n  if (metavariableVerified) {\n    fileContext.debug(`...verified the '${metavariableString}' metavariable.`, metavariableNode);\n  }\n\n  return metavariableVerified;\n}\n\nexport function verifyStandaloneMetavariable(metavariableNode, localMetaContext, verifyAhead) {\n  let standaloneMetavariableVerified = false;\n\n  const metavariableString = localMetaContext.nodeAsString(metavariableNode);\n\n  localMetaContext.trace(`Verifying the '${metavariableString}' standalone metavariable...`, metavariableNode);\n\n  const metavariablePresent = localMetaContext.isMetavariablePresentByMetavariableNode(metavariableNode);\n\n  if (metavariablePresent) {\n    const verifiedAhead = verifyAhead();\n\n    standaloneMetavariableVerified = verifiedAhead; ///\n  }\n\n  if (standaloneMetavariableVerified) {\n    localMetaContext.debug(`...verified the '${metavariableString}' standalone metavariable.`, metavariableNode);\n  }\n\n  return standaloneMetavariableVerified;\n}\n\nfunction verifyArgument(argumentNode, termTypes, fileContext) {\n  let argumentVerified = false;\n\n  if (argumentNode === null) {\n    argumentVerified = true;\n  } else {\n    const termNode = termNodeQuery(argumentNode);\n\n    if (termNode === null) {\n\n    } else {\n      const termString = fileContext.nodeAsString(termNode);\n\n      fileContext.debug(`The '${termString}' term was found when a type should have been present.`, termNode);\n    }\n    const typeNode = typeNodeQuery(argumentNode);\n\n    if (typeNode !== null) {\n      const type = fileContext.findTypeByTypeNode(typeNode);\n\n      if (type !== null) {\n        const termType = type;  ///\n\n        termTypes.push(termType);\n\n        argumentVerified = true;\n      } else {\n        const typeString = fileContext.nodeAsString(typeNode);\n\n        fileContext.debug(`The '${typeString}' type is not present.`, typeNode);\n      }\n    }\n  }\n\n  return argumentVerified;\n}\n\nfunction verifyMetaType(metaTypeNode, metaTypes, fileContext) {\n  let metaTypeVerified;\n\n  const metaType = fileContext.findMetaTypeByMetaTypeNode(metaTypeNode);\n\n  metaTypes.push(metaType);\n\n  metaTypeVerified = true;\n\n  return metaTypeVerified;\n}"],"names":["verifyMetavariable","verifyStandaloneMetavariable","termNodeQuery","nodeQuery","typeNodeQuery","argumentNodeQuery","metavariableNode","metaTypeNode","fileContext","metavariableVerified","metavariableString","nodeAsString","trace","name","nameFromMetavariableNode","metavariablePresent","isMetavariablePresentByName","debug","termTypes","metaTypes","argumentNode","argumentVerified","verifyArgument","metaTypeVerified","verifyMetaType","termType","metaType","firstMetaType","first","termTypesLength","length","firstTermType","node","metavariable","Metavariable","fromNodeNameTermTypeAndMetaType","metavariableAssignment","MetavariableAssignment","fromMetavariable","metavariableAssigned","assign","localMetaContext","verifyAhead","standaloneMetavariableVerified","isMetavariablePresentByMetavariableNode","verifiedAhead","termNode","termString","typeNode","type","findTypeByTypeNode","push","typeString","findMetaTypeByMetaTypeNode"],"mappings":"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"}
|
|
108
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/verify/metavariable.js"],"sourcesContent":["\"use strict\";\n\nimport Metavariable from \"../metavariable\";\nimport MetavariableAssignment from \"../assignment/metavariable\";\n\nimport { first } from \"../utilities/array\";\nimport { nodeQuery } from \"../utilities/query\";\nimport { nameFromMetavariableNode } from \"../utilities/name\";\n\nconst termNodeQuery = nodeQuery(\"/argument/term\"),\n      typeNodeQuery = nodeQuery(\"/argument/type\"),\n      argumentNodeQuery = nodeQuery(\"/metavariable/argument!\");\n\nexport default function verifyMetavariable(metavariableNode, metaTypeNode, fileContext) {\n  let metavariableVerified = false;\n\n  const metavariableString = fileContext.nodeAsString(metavariableNode);\n\n  fileContext.trace(`Verifying the '${metavariableString}' metavariable...`, metavariableNode);\n\n  const name = nameFromMetavariableNode(metavariableNode),\n        metavariablePresent = fileContext.isMetavariablePresentByName(name);\n\n  if (metavariablePresent) {\n    fileContext.debug(`The metavariable '${metavariableString}' is already present.`, metavariableNode);\n  } else {\n    const termTypes = [],\n          metaTypes = [],\n          argumentNode = argumentNodeQuery(metavariableNode),\n          argumentVerified = verifyArgument(argumentNode, termTypes, fileContext),\n          metaTypeVerified = verifyMetaType(metaTypeNode, metaTypes, fileContext);\n\n    if (argumentVerified && metaTypeVerified) {\n      let termType,\n          metaType;\n\n      const firstMetaType = first(metaTypes);\n\n      metaType = firstMetaType; ///\n\n      const termTypesLength = termTypes.length;\n\n      if (termTypesLength === 0) {\n        termType = null;\n      } else {\n        const firstTermType = first(termTypes);\n\n        termType = firstTermType; ///\n      }\n\n      const node = metavariableNode,  ///\n            metavariable = Metavariable.fromNodeNameTermTypeAndMetaType(node, name, termType, metaType),\n            metavariableAssignment = MetavariableAssignment.fromMetavariable(metavariable),\n            metavariableAssigned = metavariableAssignment.assign(fileContext);\n\n      if (metavariableAssigned) {\n        metavariableVerified = true;\n      }\n    }\n  }\n\n  if (metavariableVerified) {\n    fileContext.debug(`...verified the '${metavariableString}' metavariable.`, metavariableNode);\n  }\n\n  return metavariableVerified;\n}\n\nexport function verifyStandaloneMetavariable(metavariableNode, localMetaContext, verifyAhead) {\n  let standaloneMetavariableVerified = false;\n\n  const metavariableString = localMetaContext.nodeAsString(metavariableNode);\n\n  localMetaContext.trace(`Verifying the '${metavariableString}' standalone metavariable...`, metavariableNode);\n\n  const metavariablePresent = localMetaContext.isMetavariablePresentByMetavariableNode(metavariableNode, localMetaContext);\n\n  if (metavariablePresent) {\n    const verifiedAhead = verifyAhead();\n\n    standaloneMetavariableVerified = verifiedAhead; ///\n  }\n\n  if (standaloneMetavariableVerified) {\n    localMetaContext.debug(`...verified the '${metavariableString}' standalone metavariable.`, metavariableNode);\n  }\n\n  return standaloneMetavariableVerified;\n}\n\nfunction verifyArgument(argumentNode, termTypes, fileContext) {\n  let argumentVerified = false;\n\n  if (argumentNode === null) {\n    argumentVerified = true;\n  } else {\n    const termNode = termNodeQuery(argumentNode);\n\n    if (termNode === null) {\n\n    } else {\n      const termString = fileContext.nodeAsString(termNode);\n\n      fileContext.debug(`The '${termString}' term was found when a type should have been present.`, termNode);\n    }\n    const typeNode = typeNodeQuery(argumentNode);\n\n    if (typeNode !== null) {\n      const type = fileContext.findTypeByTypeNode(typeNode);\n\n      if (type !== null) {\n        const termType = type;  ///\n\n        termTypes.push(termType);\n\n        argumentVerified = true;\n      } else {\n        const typeString = fileContext.nodeAsString(typeNode);\n\n        fileContext.debug(`The '${typeString}' type is not present.`, typeNode);\n      }\n    }\n  }\n\n  return argumentVerified;\n}\n\nfunction verifyMetaType(metaTypeNode, metaTypes, fileContext) {\n  let metaTypeVerified;\n\n  const metaType = fileContext.findMetaTypeByMetaTypeNode(metaTypeNode);\n\n  metaTypes.push(metaType);\n\n  metaTypeVerified = true;\n\n  return metaTypeVerified;\n}"],"names":["verifyMetavariable","verifyStandaloneMetavariable","termNodeQuery","nodeQuery","typeNodeQuery","argumentNodeQuery","metavariableNode","metaTypeNode","fileContext","metavariableVerified","metavariableString","nodeAsString","trace","name","nameFromMetavariableNode","metavariablePresent","isMetavariablePresentByName","debug","termTypes","metaTypes","argumentNode","argumentVerified","verifyArgument","metaTypeVerified","verifyMetaType","termType","metaType","firstMetaType","first","termTypesLength","length","firstTermType","node","metavariable","Metavariable","fromNodeNameTermTypeAndMetaType","metavariableAssignment","MetavariableAssignment","fromMetavariable","metavariableAssigned","assign","localMetaContext","verifyAhead","standaloneMetavariableVerified","isMetavariablePresentByMetavariableNode","verifiedAhead","termNode","termString","typeNode","type","findTypeByTypeNode","push","typeString","findMetaTypeByMetaTypeNode"],"mappings":"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"}
|
package/lib/verify/premise.js
CHANGED
|
@@ -22,7 +22,7 @@ function verifyPremise(premiseNode, premises, localMetaContext) {
|
|
|
22
22
|
var premiseVerified;
|
|
23
23
|
var premiseString = localMetaContext.nodeAsString(premiseNode);
|
|
24
24
|
localMetaContext.trace("Verifying the '".concat(premiseString, "' premise..."), premiseNode);
|
|
25
|
-
var derived = false, unqualifiedMetastatementNode = unqualifiedMetastatementNodeQuery(premiseNode), unqualifiedMetastatementVerified = (0, _unqualified.default)(unqualifiedMetastatementNode, derived, localMetaContext);
|
|
25
|
+
var derived = false, assignments = [], unqualifiedMetastatementNode = unqualifiedMetastatementNodeQuery(premiseNode), unqualifiedMetastatementVerified = (0, _unqualified.default)(unqualifiedMetastatementNode, assignments, derived, localMetaContext);
|
|
26
26
|
if (unqualifiedMetastatementVerified) {
|
|
27
27
|
var metastatementNode = metastatementNodeQuery(unqualifiedMetastatementNode), metaproofStep = _metaproof.default.fromMetastatementNode(metastatementNode), premise = _premise.default.fromMetastatementNode(metastatementNode);
|
|
28
28
|
premises.push(premise);
|
|
@@ -35,4 +35,4 @@ function verifyPremise(premiseNode, premises, localMetaContext) {
|
|
|
35
35
|
return premiseVerified;
|
|
36
36
|
}
|
|
37
37
|
|
|
38
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
38
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy92ZXJpZnkvcHJlbWlzZS5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuaW1wb3J0IFByZW1pc2UgZnJvbSBcIi4uL3ByZW1pc2VcIjtcbmltcG9ydCBNZXRhcHJvb2ZTdGVwIGZyb20gXCIuLi9zdGVwL21ldGFwcm9vZlwiO1xuaW1wb3J0IHZlcmlmeVVucXVhbGlmaWVkTWV0YXN0YXRlbWVudCBmcm9tIFwiLi4vdmVyaWZ5L21ldGFzdGF0ZW1lbnQvdW5xdWFsaWZpZWRcIjtcblxuaW1wb3J0IHsgbm9kZVF1ZXJ5IH0gZnJvbSBcIi4uL3V0aWxpdGllcy9xdWVyeVwiO1xuXG5jb25zdCBtZXRhc3RhdGVtZW50Tm9kZVF1ZXJ5ID0gbm9kZVF1ZXJ5KFwiL3VucXVhbGlmaWVkTWV0YXN0YXRlbWVudC9tZXRhc3RhdGVtZW50IVwiKSxcbiAgICAgIHVucXVhbGlmaWVkTWV0YXN0YXRlbWVudE5vZGVRdWVyeSA9IG5vZGVRdWVyeShcIi9wcmVtaXNlL3VucXVhbGlmaWVkTWV0YXN0YXRlbWVudCFcIik7XG5cbmV4cG9ydCBkZWZhdWx0IGZ1bmN0aW9uIHZlcmlmeVByZW1pc2UocHJlbWlzZU5vZGUsIHByZW1pc2VzLCBsb2NhbE1ldGFDb250ZXh0KSB7XG4gIGxldCBwcmVtaXNlVmVyaWZpZWQ7XG5cbiAgY29uc3QgcHJlbWlzZVN0cmluZyA9IGxvY2FsTWV0YUNvbnRleHQubm9kZUFzU3RyaW5nKHByZW1pc2VOb2RlKTtcblxuICBsb2NhbE1ldGFDb250ZXh0LnRyYWNlKGBWZXJpZnlpbmcgdGhlICcke3ByZW1pc2VTdHJpbmd9JyBwcmVtaXNlLi4uYCwgcHJlbWlzZU5vZGUpO1xuXG4gIGNvbnN0IGRlcml2ZWQgPSBmYWxzZSxcbiAgICAgICAgYXNzaWdubWVudHMgPSBbXSxcbiAgICAgICAgdW5xdWFsaWZpZWRNZXRhc3RhdGVtZW50Tm9kZSA9IHVucXVhbGlmaWVkTWV0YXN0YXRlbWVudE5vZGVRdWVyeShwcmVtaXNlTm9kZSksXG4gICAgICAgIHVucXVhbGlmaWVkTWV0YXN0YXRlbWVudFZlcmlmaWVkID0gdmVyaWZ5VW5xdWFsaWZpZWRNZXRhc3RhdGVtZW50KHVucXVhbGlmaWVkTWV0YXN0YXRlbWVudE5vZGUsIGFzc2lnbm1lbnRzLCBkZXJpdmVkLCBsb2NhbE1ldGFDb250ZXh0KTtcblxuICBpZiAodW5xdWFsaWZpZWRNZXRhc3RhdGVtZW50VmVyaWZpZWQpIHtcbiAgICBjb25zdCBtZXRhc3RhdGVtZW50Tm9kZSA9IG1ldGFzdGF0ZW1lbnROb2RlUXVlcnkodW5xdWFsaWZpZWRNZXRhc3RhdGVtZW50Tm9kZSksXG4gICAgICAgICAgbWV0YXByb29mU3RlcCA9IE1ldGFwcm9vZlN0ZXAuZnJvbU1ldGFzdGF0ZW1lbnROb2RlKG1ldGFzdGF0ZW1lbnROb2RlKSxcbiAgICAgICAgICBwcmVtaXNlID0gUHJlbWlzZS5mcm9tTWV0YXN0YXRlbWVudE5vZGUobWV0YXN0YXRlbWVudE5vZGUpO1xuXG4gICAgcHJlbWlzZXMucHVzaChwcmVtaXNlKTtcblxuICAgIGxvY2FsTWV0YUNvbnRleHQuYWRkTWV0YXByb29mU3RlcChtZXRhcHJvb2ZTdGVwKTtcblxuICAgIHByZW1pc2VWZXJpZmllZCA9IHRydWU7XG4gIH1cblxuICBpZiAocHJlbWlzZVZlcmlmaWVkKSB7XG4gICAgbG9jYWxNZXRhQ29udGV4dC5kZWJ1ZyhgLi4udmVyaWZpZWQgdGhlICcke3ByZW1pc2VTdHJpbmd9JyBwcmVtaXNlLmAsIHByZW1pc2VOb2RlKTtcbiAgfVxuXG4gIHJldHVybiBwcmVtaXNlVmVyaWZpZWQ7XG59XG4iXSwibmFtZXMiOlsidmVyaWZ5UHJlbWlzZSIsIm1ldGFzdGF0ZW1lbnROb2RlUXVlcnkiLCJub2RlUXVlcnkiLCJ1bnF1YWxpZmllZE1ldGFzdGF0ZW1lbnROb2RlUXVlcnkiLCJwcmVtaXNlTm9kZSIsInByZW1pc2VzIiwibG9jYWxNZXRhQ29udGV4dCIsInByZW1pc2VWZXJpZmllZCIsInByZW1pc2VTdHJpbmciLCJub2RlQXNTdHJpbmciLCJ0cmFjZSIsImRlcml2ZWQiLCJhc3NpZ25tZW50cyIsInVucXVhbGlmaWVkTWV0YXN0YXRlbWVudE5vZGUiLCJ1bnF1YWxpZmllZE1ldGFzdGF0ZW1lbnRWZXJpZmllZCIsInZlcmlmeVVucXVhbGlmaWVkTWV0YXN0YXRlbWVudCIsIm1ldGFzdGF0ZW1lbnROb2RlIiwibWV0YXByb29mU3RlcCIsIk1ldGFwcm9vZlN0ZXAiLCJmcm9tTWV0YXN0YXRlbWVudE5vZGUiLCJwcmVtaXNlIiwiUHJlbWlzZSIsInB1c2giLCJhZGRNZXRhcHJvb2ZTdGVwIiwiZGVidWciXSwibWFwcGluZ3MiOiJBQUFBOzs7OytCQVdBOzs7ZUFBd0JBOzs7OERBVEo7Z0VBQ007a0VBQ2lCO3FCQUVqQjs7Ozs7O0FBRTFCLElBQU1DLHlCQUF5QkMsSUFBQUEsZ0JBQVMsRUFBQyw2Q0FDbkNDLG9DQUFvQ0QsSUFBQUEsZ0JBQVMsRUFBQztBQUVyQyxTQUFTRixjQUFjSSxXQUFXLEVBQUVDLFFBQVEsRUFBRUMsZ0JBQWdCO0lBQzNFLElBQUlDO0lBRUosSUFBTUMsZ0JBQWdCRixpQkFBaUJHLFlBQVksQ0FBQ0w7SUFFcERFLGlCQUFpQkksS0FBSyxDQUFDLEFBQUMsa0JBQStCLE9BQWRGLGVBQWMsaUJBQWVKO0lBRXRFLElBQU1PLFVBQVUsT0FDVkMsY0FBYyxFQUFFLEVBQ2hCQywrQkFBK0JWLGtDQUFrQ0MsY0FDakVVLG1DQUFtQ0MsSUFBQUEsb0JBQThCLEVBQUNGLDhCQUE4QkQsYUFBYUQsU0FBU0w7SUFFNUgsSUFBSVEsa0NBQWtDO1FBQ3BDLElBQU1FLG9CQUFvQmYsdUJBQXVCWSwrQkFDM0NJLGdCQUFnQkMsa0JBQWEsQ0FBQ0MscUJBQXFCLENBQUNILG9CQUNwREksVUFBVUMsZ0JBQU8sQ0FBQ0YscUJBQXFCLENBQUNIO1FBRTlDWCxTQUFTaUIsSUFBSSxDQUFDRjtRQUVkZCxpQkFBaUJpQixnQkFBZ0IsQ0FBQ047UUFFbENWLGtCQUFrQjtJQUNwQjtJQUVBLElBQUlBLGlCQUFpQjtRQUNuQkQsaUJBQWlCa0IsS0FBSyxDQUFDLEFBQUMsb0JBQWlDLE9BQWRoQixlQUFjLGVBQWFKO0lBQ3hFO0lBRUEsT0FBT0c7QUFDVCJ9
|
|
@@ -71,7 +71,7 @@ function verifyChild(childNode, localMetaContext) {
|
|
|
71
71
|
}
|
|
72
72
|
case _ruleNames.QUALIFIED_METASTATEMENT_RULE_NAME:
|
|
73
73
|
{
|
|
74
|
-
var derived = true, assignments = [], qualifiedMetastatementNode = childNode, qualifiedMetastatementVerified = (0, _qualified.default)(qualifiedMetastatementNode, assignments, derived, localMetaContext);
|
|
74
|
+
var derived = true, assignments = [], metavariableReferences = true, qualifiedMetastatementNode = childNode, qualifiedMetastatementVerified = (0, _qualified.default)(qualifiedMetastatementNode, metavariableReferences, assignments, derived, localMetaContext);
|
|
75
75
|
if (qualifiedMetastatementVerified) {
|
|
76
76
|
var metastatementNode = metastatementNodeQuery(qualifiedMetastatementNode), metaproofStep1 = _metaproof.default.fromMetastatementNode(metastatementNode);
|
|
77
77
|
localMetaContext.addMetaproofStep(metaproofStep1);
|
|
@@ -81,7 +81,7 @@ function verifyChild(childNode, localMetaContext) {
|
|
|
81
81
|
}
|
|
82
82
|
case _ruleNames.UNQUALIFIED_METASTATEMENT_RULE_NAME:
|
|
83
83
|
{
|
|
84
|
-
var derived1 = true, unqualifiedMetastatementNode = childNode, unqualifiedMetastatementVerified = (0, _unqualified.default)(unqualifiedMetastatementNode, derived1, localMetaContext);
|
|
84
|
+
var derived1 = true, assignments1 = false, unqualifiedMetastatementNode = childNode, unqualifiedMetastatementVerified = (0, _unqualified.default)(unqualifiedMetastatementNode, assignments1, derived1, localMetaContext);
|
|
85
85
|
if (unqualifiedMetastatementVerified) {
|
|
86
86
|
var metastatementNode1 = metastatementNodeQuery(unqualifiedMetastatementNode), metaproofStep2 = _metaproof.default.fromMetastatementNode(metastatementNode1);
|
|
87
87
|
localMetaContext.addMetaproofStep(metaproofStep2);
|
|
@@ -93,4 +93,4 @@ function verifyChild(childNode, localMetaContext) {
|
|
|
93
93
|
return childVerified;
|
|
94
94
|
}
|
|
95
95
|
|
|
96
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
96
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/verify/ruleDerivation.js"],"sourcesContent":["\"use strict\";\n\nimport MetaproofStep from \"../step/metaproof\";\nimport verifyPremises from \"../verify/premises\";\nimport LocalMetaContext from \"../context/localMeta\";\nimport verifyQualifiedMetastatement from \"../verify/metastatement/qualified\";\nimport verifyUnqualifiedMetastatement from \"../verify/metastatement/unqualified\";\n\nimport { nodeQuery, nodesQuery } from \"../utilities/query\";\nimport { RULE_SUBPROOF_RULE_NAME, QUALIFIED_METASTATEMENT_RULE_NAME, UNQUALIFIED_METASTATEMENT_RULE_NAME } from \"../ruleNames\";\n\nconst childNodesQuery = nodesQuery(\"/ruleDerivation|ruleSubDerivation/*\"),\n      premiseNodesQuery = nodesQuery(\"/ruleSubproof/premise\"),\n      metastatementNodeQuery = nodeQuery(\"/qualifiedMetastatement|unqualifiedMetastatement/metastatement!\"),\n      ruleSubDerivationNodeQuery = nodeQuery(\"/ruleSubproof/ruleSubDerivation\");\n\nexport default function verifyRuleDerivation(ruleDerivationNode, localMetaContext) {\n  let ruleDerivationVerified;\n\n  const childNodes = childNodesQuery(ruleDerivationNode);\n\n  ruleDerivationVerified = childNodes.every((childNode) => {\n    const childVerified = verifyChild(childNode, localMetaContext);\n\n    if (childVerified) {\n      return true;\n    }\n  });\n\n  return ruleDerivationVerified;\n}\n\nfunction verifyRuleSubDerivation(ruleSubDerivationNode, localMetaContext) {\n  let ruleSubDerivationVerified;\n\n  const childNodes = childNodesQuery(ruleSubDerivationNode);\n\n  ruleSubDerivationVerified = childNodes.every((childNode) => {\n    const childVerified = verifyChild(childNode, localMetaContext);\n\n    if (childVerified) {\n      return true;\n    }\n  });\n\n  return ruleSubDerivationVerified;\n}\n\nfunction verifyRuleSubproof(ruleSubproofNode, localMetaContext) {\n  let ruleSubproofVerified = false;\n\n  localMetaContext = LocalMetaContext.fromLocalMetaContext(localMetaContext); ///\n\n  const premises = [],\n        premiseNodes = premiseNodesQuery(ruleSubproofNode),\n        premisesVerified = verifyPremises(premiseNodes, premises, localMetaContext);\n\n  if (premisesVerified) {\n    const ruleSubDerivationNode = ruleSubDerivationNodeQuery(ruleSubproofNode),\n          ruleSubDerivationVerified = verifyRuleSubDerivation(ruleSubDerivationNode, localMetaContext);\n\n    if (ruleSubDerivationVerified) {\n      ruleSubproofVerified = true;\n    }\n  }\n\n  return ruleSubproofVerified;\n}\n\nfunction verifyChild(childNode, localMetaContext) {\n  let childVerified;\n\n  const childNodeRuleName = childNode.getRuleName();\n\n  switch (childNodeRuleName) {\n    case RULE_SUBPROOF_RULE_NAME: {\n      const ruleSubproofNode = childNode,  ///\n            ruleSubproofVerified = verifyRuleSubproof(ruleSubproofNode, localMetaContext);\n\n      if (ruleSubproofVerified) {\n        const metaproofStep = MetaproofStep.fromRuleSubproofNode(ruleSubproofNode);\n\n        localMetaContext.addMetaproofStep(metaproofStep);\n\n        childVerified = true;\n      }\n\n      break;\n    }\n\n    case QUALIFIED_METASTATEMENT_RULE_NAME: {\n      const derived = true,\n            assignments = [],\n            metavariableReferences = true,\n            qualifiedMetastatementNode = childNode,  ///\n            qualifiedMetastatementVerified = verifyQualifiedMetastatement(qualifiedMetastatementNode, metavariableReferences, assignments, derived, localMetaContext);\n\n      if (qualifiedMetastatementVerified) {\n        const metastatementNode = metastatementNodeQuery(qualifiedMetastatementNode),\n              metaproofStep = MetaproofStep.fromMetastatementNode(metastatementNode);\n\n        localMetaContext.addMetaproofStep(metaproofStep);\n\n        childVerified = qualifiedMetastatementVerified; ///\n      }\n\n      break;\n    }\n\n    case UNQUALIFIED_METASTATEMENT_RULE_NAME: {\n      const derived = true,\n            assignments = false,\n            unqualifiedMetastatementNode = childNode,  ///\n            unqualifiedMetastatementVerified = verifyUnqualifiedMetastatement(unqualifiedMetastatementNode, assignments, derived, localMetaContext);\n\n      if (unqualifiedMetastatementVerified) {\n        const metastatementNode = metastatementNodeQuery(unqualifiedMetastatementNode),\n              metaproofStep = MetaproofStep.fromMetastatementNode(metastatementNode);\n\n        localMetaContext.addMetaproofStep(metaproofStep);\n\n        childVerified = true;\n      }\n\n      break;\n    }\n  }\n\n  return childVerified;\n}\n"],"names":["verifyRuleDerivation","childNodesQuery","nodesQuery","premiseNodesQuery","metastatementNodeQuery","nodeQuery","ruleSubDerivationNodeQuery","ruleDerivationNode","localMetaContext","ruleDerivationVerified","childNodes","every","childNode","childVerified","verifyChild","verifyRuleSubDerivation","ruleSubDerivationNode","ruleSubDerivationVerified","verifyRuleSubproof","ruleSubproofNode","ruleSubproofVerified","LocalMetaContext","fromLocalMetaContext","premises","premiseNodes","premisesVerified","verifyPremises","childNodeRuleName","getRuleName","RULE_SUBPROOF_RULE_NAME","metaproofStep","MetaproofStep","fromRuleSubproofNode","addMetaproofStep","QUALIFIED_METASTATEMENT_RULE_NAME","derived","assignments","metavariableReferences","qualifiedMetastatementNode","qualifiedMetastatementVerified","verifyQualifiedMetastatement","metastatementNode","fromMetastatementNode","UNQUALIFIED_METASTATEMENT_RULE_NAME","unqualifiedMetastatementNode","unqualifiedMetastatementVerified","verifyUnqualifiedMetastatement"],"mappings":"AAAA;;;;+BAgBA;;;eAAwBA;;;gEAdE;+DACC;gEACE;gEACY;kEACE;qBAEL;yBAC0E;;;;;;AAEhH,IAAMC,kBAAkBC,IAAAA,iBAAU,EAAC,wCAC7BC,oBAAoBD,IAAAA,iBAAU,EAAC,0BAC/BE,yBAAyBC,IAAAA,gBAAS,EAAC,oEACnCC,6BAA6BD,IAAAA,gBAAS,EAAC;AAE9B,SAASL,qBAAqBO,kBAAkB,EAAEC,gBAAgB;IAC/E,IAAIC;IAEJ,IAAMC,aAAaT,gBAAgBM;IAEnCE,yBAAyBC,WAAWC,KAAK,CAAC,SAACC;QACzC,IAAMC,gBAAgBC,YAAYF,WAAWJ;QAE7C,IAAIK,eAAe;YACjB,OAAO;QACT;IACF;IAEA,OAAOJ;AACT;AAEA,SAASM,wBAAwBC,qBAAqB,EAAER,gBAAgB;IACtE,IAAIS;IAEJ,IAAMP,aAAaT,gBAAgBe;IAEnCC,4BAA4BP,WAAWC,KAAK,CAAC,SAACC;QAC5C,IAAMC,gBAAgBC,YAAYF,WAAWJ;QAE7C,IAAIK,eAAe;YACjB,OAAO;QACT;IACF;IAEA,OAAOI;AACT;AAEA,SAASC,mBAAmBC,gBAAgB,EAAEX,gBAAgB;IAC5D,IAAIY,uBAAuB;IAE3BZ,mBAAmBa,kBAAgB,CAACC,oBAAoB,CAACd,mBAAmB,GAAG;IAE/E,IAAMe,WAAW,EAAE,EACbC,eAAerB,kBAAkBgB,mBACjCM,mBAAmBC,IAAAA,iBAAc,EAACF,cAAcD,UAAUf;IAEhE,IAAIiB,kBAAkB;QACpB,IAAMT,wBAAwBV,2BAA2Ba,mBACnDF,4BAA4BF,wBAAwBC,uBAAuBR;QAEjF,IAAIS,2BAA2B;YAC7BG,uBAAuB;QACzB;IACF;IAEA,OAAOA;AACT;AAEA,SAASN,YAAYF,SAAS,EAAEJ,gBAAgB;IAC9C,IAAIK;IAEJ,IAAMc,oBAAoBf,UAAUgB,WAAW;IAE/C,OAAQD;QACN,KAAKE,kCAAuB;YAAE;gBAC5B,IAAMV,mBAAmBP,WACnBQ,uBAAuBF,mBAAmBC,kBAAkBX;gBAElE,IAAIY,sBAAsB;oBACxB,IAAMU,gBAAgBC,kBAAa,CAACC,oBAAoB,CAACb;oBAEzDX,iBAAiByB,gBAAgB,CAACH;oBAElCjB,gBAAgB;gBAClB;gBAEA;YACF;QAEA,KAAKqB,4CAAiC;YAAE;gBACtC,IAAMC,UAAU,MACVC,cAAc,EAAE,EAChBC,yBAAyB,MACzBC,6BAA6B1B,WAC7B2B,iCAAiCC,IAAAA,kBAA4B,EAACF,4BAA4BD,wBAAwBD,aAAaD,SAAS3B;gBAE9I,IAAI+B,gCAAgC;oBAClC,IAAME,oBAAoBrC,uBAAuBkC,6BAC3CR,iBAAgBC,kBAAa,CAACW,qBAAqB,CAACD;oBAE1DjC,iBAAiByB,gBAAgB,CAACH;oBAElCjB,gBAAgB0B,gCAAgC,GAAG;gBACrD;gBAEA;YACF;QAEA,KAAKI,8CAAmC;YAAE;gBACxC,IAAMR,WAAU,MACVC,eAAc,OACdQ,+BAA+BhC,WAC/BiC,mCAAmCC,IAAAA,oBAA8B,EAACF,8BAA8BR,cAAaD,UAAS3B;gBAE5H,IAAIqC,kCAAkC;oBACpC,IAAMJ,qBAAoBrC,uBAAuBwC,+BAC3Cd,iBAAgBC,kBAAa,CAACW,qBAAqB,CAACD;oBAE1DjC,iBAAiByB,gBAAgB,CAACH;oBAElCjB,gBAAgB;gBAClB;gBAEA;YACF;IACF;IAEA,OAAOA;AACT"}
|
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.875",
|
|
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.28",
|
|
14
14
|
"necessary": "^14.0.1",
|
|
15
|
-
"occam-custom-grammars": "^5.0.
|
|
15
|
+
"occam-custom-grammars": "^5.0.778",
|
|
16
16
|
"occam-entities": "^1.0.134",
|
|
17
17
|
"occam-file-system": "^6.0.176",
|
|
18
18
|
"occam-grammar-utilities": "^8.0.205",
|
package/src/context/localMeta.js
CHANGED
|
@@ -125,11 +125,11 @@ class LocalMetaContext {
|
|
|
125
125
|
return variablePresent;
|
|
126
126
|
}
|
|
127
127
|
|
|
128
|
-
findMetavariableByMetavariableNode(metavariableNode) {
|
|
128
|
+
findMetavariableByMetavariableNode(metavariableNode, localMetaContext) {
|
|
129
129
|
const node = metavariableNode, ///
|
|
130
130
|
metavariables = this.getMetavariables(),
|
|
131
131
|
metavariable = metavariables.find((metavariable) => {
|
|
132
|
-
const matches = metavariable.matchNode(node);
|
|
132
|
+
const matches = metavariable.matchNode(node, localMetaContext);
|
|
133
133
|
|
|
134
134
|
if (matches) {
|
|
135
135
|
return true;
|
|
@@ -139,8 +139,8 @@ class LocalMetaContext {
|
|
|
139
139
|
return metavariable;
|
|
140
140
|
}
|
|
141
141
|
|
|
142
|
-
isMetavariablePresentByMetavariableNode(metavariableNode) {
|
|
143
|
-
const metavariable = this.findMetavariableByMetavariableNode(metavariableNode),
|
|
142
|
+
isMetavariablePresentByMetavariableNode(metavariableNode, localMetaContext) {
|
|
143
|
+
const metavariable = this.findMetavariableByMetavariableNode(metavariableNode, localMetaContext),
|
|
144
144
|
metavariablePresent = (metavariable !== null);
|
|
145
145
|
|
|
146
146
|
return metavariablePresent;
|
package/src/metaLemma.js
CHANGED
|
@@ -5,5 +5,5 @@ import MetalemmaMetatheorem from "./metalemmaMetatheorem";
|
|
|
5
5
|
export default class MetaLemma extends MetalemmaMetatheorem {
|
|
6
6
|
static fromJSONAndFileContext(json, fileContext) { return MetalemmaMetatheorem.fromJSONAndFileContext(MetaLemma, json, fileContext); }
|
|
7
7
|
|
|
8
|
-
static
|
|
8
|
+
static fromLabelsMetaSuppositionsMetaConsequentAndFileContext(labels, metaSuppositions, metaConsequent, fileContext) { return MetalemmaMetatheorem.fromLabelsMetaSuppositionsMetaConsequentAndFileContext(MetaLemma, labels, metaSuppositions, metaConsequent, fileContext); }
|
|
9
9
|
}
|