occam-verify-cli 0.0.1234 → 0.0.1235
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/dom/frame.js +2 -16
- package/lib/dom/statement.js +7 -58
- package/lib/dom/term.js +2 -17
- package/lib/index.js +1 -2
- package/lib/mixins/statement/verify.js +1 -16
- package/lib/utilities/verification.js +1 -9
- package/package.json +5 -5
- package/src/dom/frame.js +1 -19
- package/src/dom/statement.js +8 -82
- package/src/dom/term.js +1 -23
- package/src/index.js +0 -1
- package/src/mixins/statement/verify.js +1 -25
- package/src/utilities/verification.js +0 -10
- package/lib/dom/assertion/contained.js +0 -287
- package/src/dom/assertion/contained.js +0 -233
|
@@ -85,20 +85,6 @@ function verifyAsDefinedAssertion(statement, assignments, stated, context) {
|
|
|
85
85
|
}
|
|
86
86
|
return verifiedAsDefinedAssertion;
|
|
87
87
|
}
|
|
88
|
-
function verifyAsContainedAssertion(statement, assignments, stated, context) {
|
|
89
|
-
var verifiedAsContainedAssertion = false;
|
|
90
|
-
var containedAssertion = (0, _verification.containedAssertionFromStatement)(statement, context);
|
|
91
|
-
if (containedAssertion !== null) {
|
|
92
|
-
var statementString = statement.getString();
|
|
93
|
-
context.trace("Verifying the '".concat(statementString, "' statement as a contained assertion..."));
|
|
94
|
-
var containedAssertionVerified = containedAssertion.verify(assignments, stated, context);
|
|
95
|
-
verifiedAsContainedAssertion = containedAssertionVerified; ///
|
|
96
|
-
if (verifiedAsContainedAssertion) {
|
|
97
|
-
context.debug("...verified the '".concat(statementString, "' statement as a contained assertion."));
|
|
98
|
-
}
|
|
99
|
-
}
|
|
100
|
-
return verifiedAsContainedAssertion;
|
|
101
|
-
}
|
|
102
88
|
function verifyAsSubproofAssertion(statement, assignments, stated, context) {
|
|
103
89
|
var verifiedAsSubproofAssertion = false;
|
|
104
90
|
var subproofAssertion = (0, _verification.subproofAssertionFromStatement)(statement, context);
|
|
@@ -137,10 +123,9 @@ var verifyMixins = [
|
|
|
137
123
|
verifyAsTypeAssertion,
|
|
138
124
|
verifyAsDefinedAssertion,
|
|
139
125
|
verifyAsSubproofAssertion,
|
|
140
|
-
verifyAsContainedAssertion,
|
|
141
126
|
unifyWithBracketedCombinator,
|
|
142
127
|
unifyWithCombinators
|
|
143
128
|
];
|
|
144
129
|
var _default = verifyMixins;
|
|
145
130
|
|
|
146
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../../src/mixins/statement/verify.js"],"sourcesContent":["\"use strict\";\n\nimport BracketedCombinator from \"../../combinator/bracketed\";\n\nimport { equalityFromStatement,\n         judgementFromStatement,\n         metavariableFromStatement,\n         typeAssertionFromStatement,\n         definedAssertionFromStatement,\n         subproofAssertionFromStatement,\n         containedAssertionFromStatement } from \"../../utilities/verification\";\n\nfunction verifyAsMetavariable(statement, assignments, stated, context) {\n  let verifiedAsMetavariable = false;\n\n  const metavariable = metavariableFromStatement(statement, context);\n\n  if (metavariable !== null) {\n    const statementString = statement.getString();\n\n    context.trace(`Verifying the '${statementString}' statement as a metavariable...`);\n\n    const metavariableVerified = metavariable.verify(context);\n\n    verifiedAsMetavariable = metavariableVerified; ///\n\n    if (verifiedAsMetavariable) {\n      context.debug(`...verified the '${statementString}' statement as a metavariable.`);\n    }\n  }\n\n  return verifiedAsMetavariable;\n}\n\nfunction verifyAsEquality(statement, assignments, stated, context) {\n  let verifiedAsEquality = false;\n\n  const equality = equalityFromStatement(statement, context);\n\n  if (equality !== null) {\n    const statementString = statement.getString();\n\n    context.trace(`Verifying the '${statementString}' statement as an equality...`);\n\n    const equalityVerified = equality.verify(assignments, stated, context);\n\n    verifiedAsEquality = equalityVerified; ///\n\n    if (verifiedAsEquality) {\n      context.debug(`...verified the '${statementString}' statement as an equality.`);\n    }\n  }\n\n  return verifiedAsEquality;\n}\n\nfunction verifyAsJudgement(statement, assignments, stated, context) {\n  let verifiedAsJudgement = false;\n\n  const judgement = judgementFromStatement(statement, context);\n\n  if (judgement !== null) {\n    const statementString = statement.getString();\n\n    context.trace(`Verifying the '${statementString}' statement as a judgement...`);\n\n    const judgementVerified = judgement.verify(assignments, stated, context);\n\n    verifiedAsJudgement = judgementVerified;  ///\n\n    if (verifiedAsJudgement) {\n      context.debug(`...verified the '${statementString}' statement as a judgement.`);\n    }\n  }\n\n  return verifiedAsJudgement;\n}\n\nfunction verifyAsTypeAssertion(statement, assignments, stated, context) {\n  let verifiedAsTypeAssertion = false;\n\n  const typeAssertion = typeAssertionFromStatement(statement, context);\n\n  if (typeAssertion !== null) {\n    const statementString = statement.getString();\n\n    context.trace(`Verifying the '${statementString}' statement as a type assertion...`);\n\n    const typeAssertionVerified = typeAssertion.verify(assignments, stated, context);\n\n    verifiedAsTypeAssertion = typeAssertionVerified; ///\n\n    if (verifiedAsTypeAssertion) {\n      context.debug(`...verified the '${statementString}' statement as a type assertion.`);\n    }\n  }\n\n  return verifiedAsTypeAssertion;\n}\n\nfunction verifyAsDefinedAssertion(statement, assignments, stated, context) {\n  let verifiedAsDefinedAssertion = false;\n\n  const definedAssertion = definedAssertionFromStatement(statement, context);\n\n  if (definedAssertion !== null) {\n    const statementString = statement.getString();\n\n    context.trace(`Verifying the '${statementString}' statement as a defined assertion...`);\n\n    const definedAssertionVerified = definedAssertion.verify(assignments, stated, context);\n\n    verifiedAsDefinedAssertion = definedAssertionVerified; ///\n\n    if (verifiedAsDefinedAssertion) {\n      context.debug(`...verified the '${statementString}' statement as a defined assertion.`);\n    }\n  }\n\n  return verifiedAsDefinedAssertion;\n}\n\nfunction verifyAsContainedAssertion(statement, assignments, stated, context) {\n  let verifiedAsContainedAssertion = false;\n\n  const containedAssertion = containedAssertionFromStatement(statement, context);\n\n  if (containedAssertion !== null) {\n    const statementString = statement.getString();\n\n    context.trace(`Verifying the '${statementString}' statement as a contained assertion...`);\n\n    const containedAssertionVerified = containedAssertion.verify(assignments, stated, context);\n\n    verifiedAsContainedAssertion = containedAssertionVerified; ///\n\n    if (verifiedAsContainedAssertion) {\n      context.debug(`...verified the '${statementString}' statement as a contained assertion.`);\n    }\n  }\n\n  return verifiedAsContainedAssertion;\n}\n\nfunction verifyAsSubproofAssertion(statement, assignments, stated, context) {\n  let verifiedAsSubproofAssertion = false;\n\n  const subproofAssertion = subproofAssertionFromStatement(statement, context);\n\n  if (subproofAssertion !== null) {\n    const statementString = statement.getString();\n\n    context.trace(`Verifying the '${statementString}' statement as a subproof assertion...`);\n\n    const subproofAssertionVerified = subproofAssertion.verify(assignments, stated, context);\n\n    verifiedAsSubproofAssertion = subproofAssertionVerified; ///\n\n    if (verifiedAsSubproofAssertion) {\n      context.debug(`...verified the '${statementString}' statement as a subproof assertion.`);\n    }\n  }\n\n  return verifiedAsSubproofAssertion;\n}\n\nfunction unifyWithBracketedCombinator(statement, assignments, stated, context) {\n  stated = true;  ///\n\n  assignments = null; ///\n\n  const bracketedCombinator = BracketedCombinator.fromNothing(),\n        unifiedWithBracketedCombinator = bracketedCombinator.unifyStatement(statement, assignments, stated, context);\n\n  return unifiedWithBracketedCombinator;\n}\n\nfunction unifyWithCombinators(statement, assignments, stated, context) {\n  stated = true;  ///\n\n  assignments = null; ///\n\n  const combinators = context.getCombinators(),\n        unifiedWithCombinators = combinators.some((combinator) => {\n          const unifiedWithCombinator = combinator.unifyStatement(statement, assignments, stated, context);\n\n          if (unifiedWithCombinator) {\n            return true;\n          }\n        });\n\n  return unifiedWithCombinators;\n}\n\nconst verifyMixins = [\n  verifyAsMetavariable,\n  verifyAsEquality,\n  verifyAsJudgement,\n  verifyAsTypeAssertion,\n  verifyAsDefinedAssertion,\n  verifyAsSubproofAssertion,\n  verifyAsContainedAssertion,\n  unifyWithBracketedCombinator,\n  unifyWithCombinators\n];\n\nexport default verifyMixins;\n"],"names":["verifyAsMetavariable","statement","assignments","stated","context","verifiedAsMetavariable","metavariable","metavariableFromStatement","statementString","getString","trace","metavariableVerified","verify","debug","verifyAsEquality","verifiedAsEquality","equality","equalityFromStatement","equalityVerified","verifyAsJudgement","verifiedAsJudgement","judgement","judgementFromStatement","judgementVerified","verifyAsTypeAssertion","verifiedAsTypeAssertion","typeAssertion","typeAssertionFromStatement","typeAssertionVerified","verifyAsDefinedAssertion","verifiedAsDefinedAssertion","definedAssertion","definedAssertionFromStatement","definedAssertionVerified","verifyAsContainedAssertion","verifiedAsContainedAssertion","containedAssertion","containedAssertionFromStatement","containedAssertionVerified","verifyAsSubproofAssertion","verifiedAsSubproofAssertion","subproofAssertion","subproofAssertionFromStatement","subproofAssertionVerified","unifyWithBracketedCombinator","bracketedCombinator","BracketedCombinator","fromNothing","unifiedWithBracketedCombinator","unifyStatement","unifyWithCombinators","combinators","getCombinators","unifiedWithCombinators","some","combinator","unifiedWithCombinator","verifyMixins"],"mappings":"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"}
|
|
131
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../../src/mixins/statement/verify.js"],"sourcesContent":["\"use strict\";\n\nimport BracketedCombinator from \"../../combinator/bracketed\";\n\nimport { equalityFromStatement,\n         judgementFromStatement,\n         metavariableFromStatement,\n         typeAssertionFromStatement,\n         definedAssertionFromStatement,\n         subproofAssertionFromStatement } from \"../../utilities/verification\";\n\nfunction verifyAsMetavariable(statement, assignments, stated, context) {\n  let verifiedAsMetavariable = false;\n\n  const metavariable = metavariableFromStatement(statement, context);\n\n  if (metavariable !== null) {\n    const statementString = statement.getString();\n\n    context.trace(`Verifying the '${statementString}' statement as a metavariable...`);\n\n    const metavariableVerified = metavariable.verify(context);\n\n    verifiedAsMetavariable = metavariableVerified; ///\n\n    if (verifiedAsMetavariable) {\n      context.debug(`...verified the '${statementString}' statement as a metavariable.`);\n    }\n  }\n\n  return verifiedAsMetavariable;\n}\n\nfunction verifyAsEquality(statement, assignments, stated, context) {\n  let verifiedAsEquality = false;\n\n  const equality = equalityFromStatement(statement, context);\n\n  if (equality !== null) {\n    const statementString = statement.getString();\n\n    context.trace(`Verifying the '${statementString}' statement as an equality...`);\n\n    const equalityVerified = equality.verify(assignments, stated, context);\n\n    verifiedAsEquality = equalityVerified; ///\n\n    if (verifiedAsEquality) {\n      context.debug(`...verified the '${statementString}' statement as an equality.`);\n    }\n  }\n\n  return verifiedAsEquality;\n}\n\nfunction verifyAsJudgement(statement, assignments, stated, context) {\n  let verifiedAsJudgement = false;\n\n  const judgement = judgementFromStatement(statement, context);\n\n  if (judgement !== null) {\n    const statementString = statement.getString();\n\n    context.trace(`Verifying the '${statementString}' statement as a judgement...`);\n\n    const judgementVerified = judgement.verify(assignments, stated, context);\n\n    verifiedAsJudgement = judgementVerified;  ///\n\n    if (verifiedAsJudgement) {\n      context.debug(`...verified the '${statementString}' statement as a judgement.`);\n    }\n  }\n\n  return verifiedAsJudgement;\n}\n\nfunction verifyAsTypeAssertion(statement, assignments, stated, context) {\n  let verifiedAsTypeAssertion = false;\n\n  const typeAssertion = typeAssertionFromStatement(statement, context);\n\n  if (typeAssertion !== null) {\n    const statementString = statement.getString();\n\n    context.trace(`Verifying the '${statementString}' statement as a type assertion...`);\n\n    const typeAssertionVerified = typeAssertion.verify(assignments, stated, context);\n\n    verifiedAsTypeAssertion = typeAssertionVerified; ///\n\n    if (verifiedAsTypeAssertion) {\n      context.debug(`...verified the '${statementString}' statement as a type assertion.`);\n    }\n  }\n\n  return verifiedAsTypeAssertion;\n}\n\nfunction verifyAsDefinedAssertion(statement, assignments, stated, context) {\n  let verifiedAsDefinedAssertion = false;\n\n  const definedAssertion = definedAssertionFromStatement(statement, context);\n\n  if (definedAssertion !== null) {\n    const statementString = statement.getString();\n\n    context.trace(`Verifying the '${statementString}' statement as a defined assertion...`);\n\n    const definedAssertionVerified = definedAssertion.verify(assignments, stated, context);\n\n    verifiedAsDefinedAssertion = definedAssertionVerified; ///\n\n    if (verifiedAsDefinedAssertion) {\n      context.debug(`...verified the '${statementString}' statement as a defined assertion.`);\n    }\n  }\n\n  return verifiedAsDefinedAssertion;\n}\n\nfunction verifyAsSubproofAssertion(statement, assignments, stated, context) {\n  let verifiedAsSubproofAssertion = false;\n\n  const subproofAssertion = subproofAssertionFromStatement(statement, context);\n\n  if (subproofAssertion !== null) {\n    const statementString = statement.getString();\n\n    context.trace(`Verifying the '${statementString}' statement as a subproof assertion...`);\n\n    const subproofAssertionVerified = subproofAssertion.verify(assignments, stated, context);\n\n    verifiedAsSubproofAssertion = subproofAssertionVerified; ///\n\n    if (verifiedAsSubproofAssertion) {\n      context.debug(`...verified the '${statementString}' statement as a subproof assertion.`);\n    }\n  }\n\n  return verifiedAsSubproofAssertion;\n}\n\nfunction unifyWithBracketedCombinator(statement, assignments, stated, context) {\n  stated = true;  ///\n\n  assignments = null; ///\n\n  const bracketedCombinator = BracketedCombinator.fromNothing(),\n        unifiedWithBracketedCombinator = bracketedCombinator.unifyStatement(statement, assignments, stated, context);\n\n  return unifiedWithBracketedCombinator;\n}\n\nfunction unifyWithCombinators(statement, assignments, stated, context) {\n  stated = true;  ///\n\n  assignments = null; ///\n\n  const combinators = context.getCombinators(),\n        unifiedWithCombinators = combinators.some((combinator) => {\n          const unifiedWithCombinator = combinator.unifyStatement(statement, assignments, stated, context);\n\n          if (unifiedWithCombinator) {\n            return true;\n          }\n        });\n\n  return unifiedWithCombinators;\n}\n\nconst verifyMixins = [\n  verifyAsMetavariable,\n  verifyAsEquality,\n  verifyAsJudgement,\n  verifyAsTypeAssertion,\n  verifyAsDefinedAssertion,\n  verifyAsSubproofAssertion,\n  unifyWithBracketedCombinator,\n  unifyWithCombinators\n];\n\nexport default verifyMixins;\n"],"names":["verifyAsMetavariable","statement","assignments","stated","context","verifiedAsMetavariable","metavariable","metavariableFromStatement","statementString","getString","trace","metavariableVerified","verify","debug","verifyAsEquality","verifiedAsEquality","equality","equalityFromStatement","equalityVerified","verifyAsJudgement","verifiedAsJudgement","judgement","judgementFromStatement","judgementVerified","verifyAsTypeAssertion","verifiedAsTypeAssertion","typeAssertion","typeAssertionFromStatement","typeAssertionVerified","verifyAsDefinedAssertion","verifiedAsDefinedAssertion","definedAssertion","definedAssertionFromStatement","definedAssertionVerified","verifyAsSubproofAssertion","verifiedAsSubproofAssertion","subproofAssertion","subproofAssertionFromStatement","subproofAssertionVerified","unifyWithBracketedCombinator","bracketedCombinator","BracketedCombinator","fromNothing","unifiedWithBracketedCombinator","unifyStatement","unifyWithCombinators","combinators","getCombinators","unifiedWithCombinators","some","combinator","unifiedWithCombinator","verifyMixins"],"mappings":"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"}
|
|
@@ -9,9 +9,6 @@ function _export(target, all) {
|
|
|
9
9
|
});
|
|
10
10
|
}
|
|
11
11
|
_export(exports, {
|
|
12
|
-
containedAssertionFromStatement: function() {
|
|
13
|
-
return containedAssertionFromStatement;
|
|
14
|
-
},
|
|
15
12
|
definedAssertionFromStatement: function() {
|
|
16
13
|
return definedAssertionFromStatement;
|
|
17
14
|
},
|
|
@@ -76,11 +73,6 @@ function subproofAssertionFromStatement(statement, context) {
|
|
|
76
73
|
var SubproofAssertion = _dom.default.SubproofAssertion, statementNode = statement.getNode(), subproofAssertion = SubproofAssertion.fromStatementNode(statementNode, context);
|
|
77
74
|
return subproofAssertion;
|
|
78
75
|
}
|
|
79
|
-
function containedAssertionFromStatement(statement, context) {
|
|
80
|
-
context = contextFromStatement(statement, context); ///
|
|
81
|
-
var ContainedAssertion = _dom.default.ContainedAssertion, statementNode = statement.getNode(), containedAssertion = ContainedAssertion.fromStatementNode(statementNode, context);
|
|
82
|
-
return containedAssertion;
|
|
83
|
-
}
|
|
84
76
|
function contextFromFrame(frame, context) {
|
|
85
77
|
var frameTokens = frame.getTokens(), tokens = frameTokens, localContext = _local.default.fromContextAndTokens(context, tokens);
|
|
86
78
|
context = localContext; ///
|
|
@@ -92,4 +84,4 @@ function contextFromStatement(statement, context) {
|
|
|
92
84
|
return context;
|
|
93
85
|
}
|
|
94
86
|
|
|
95
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
87
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlsaXRpZXMvdmVyaWZpY2F0aW9uLmpzIl0sInNvdXJjZXNDb250ZW50IjpbIlwidXNlIHN0cmljdFwiO1xuXG5pbXBvcnQgZG9tIGZyb20gXCIuLi9kb21cIjtcbmltcG9ydCBMb2NhbENvbnRleHQgZnJvbSBcIi4uL2NvbnRleHQvbG9jYWxcIjtcblxuZXhwb3J0IGZ1bmN0aW9uIG1ldGF2YXJpYWJsZUZyb21GcmFtZShmcmFtZSwgY29udGV4dCkge1xuICBjb250ZXh0ID0gY29udGV4dEZyb21GcmFtZShmcmFtZSwgY29udGV4dCk7IC8vL1xuXG4gIGNvbnN0IHsgTWV0YXZhcmlhYmxlIH0gPSBkb20sXG4gICAgICAgIGZyYW1lTm9kZSA9IGZyYW1lLmdldE5vZGUoKSxcbiAgICAgICAgbWV0YXZhcmlhYmxlID0gTWV0YXZhcmlhYmxlLmZyb21GcmFtZU5vZGUoZnJhbWVOb2RlLCBjb250ZXh0KTtcblxuICByZXR1cm4gbWV0YXZhcmlhYmxlO1xufVxuXG5leHBvcnQgZnVuY3Rpb24gZXF1YWxpdHlGcm9tU3RhdGVtZW50KHN0YXRlbWVudCwgY29udGV4dCkge1xuICBjb250ZXh0ID0gY29udGV4dEZyb21TdGF0ZW1lbnQoc3RhdGVtZW50LCBjb250ZXh0KTsgLy8vXG5cbiAgY29uc3QgeyBFcXVhbGl0eSB9ID0gZG9tLFxuICAgICAgICBzdGF0ZW1lbnROb2RlID0gc3RhdGVtZW50LmdldE5vZGUoKSxcbiAgICAgICAgZXF1YWxpdHkgPSBFcXVhbGl0eS5mcm9tU3RhdGVtZW50Tm9kZShzdGF0ZW1lbnROb2RlLCBjb250ZXh0KTtcblxuICByZXR1cm4gZXF1YWxpdHk7XG59XG5cbmV4cG9ydCBmdW5jdGlvbiBqdWRnZW1lbnRGcm9tU3RhdGVtZW50KHN0YXRlbWVudCwgY29udGV4dCkge1xuICBjb250ZXh0ID0gY29udGV4dEZyb21TdGF0ZW1lbnQoc3RhdGVtZW50LCBjb250ZXh0KTsgLy8vXG5cbiAgY29uc3QgeyBKdWRnZW1lbnQgfSA9IGRvbSxcbiAgICAgICAgc3RhdGVtZW50Tm9kZSA9IHN0YXRlbWVudC5nZXROb2RlKCksXG4gICAgICAgIGp1ZGdlbWVudCA9IEp1ZGdlbWVudC5mcm9tU3RhdGVtZW50Tm9kZShzdGF0ZW1lbnROb2RlLCBjb250ZXh0KTtcblxuICByZXR1cm4ganVkZ2VtZW50O1xufVxuXG5leHBvcnQgZnVuY3Rpb24gbWV0YXZhcmlhYmxlRnJvbVN0YXRlbWVudChzdGF0ZW1lbnQsIGNvbnRleHQpIHtcbiAgY29udGV4dCA9IGNvbnRleHRGcm9tU3RhdGVtZW50KHN0YXRlbWVudCwgY29udGV4dCk7IC8vL1xuXG4gIGNvbnN0IHsgTWV0YXZhcmlhYmxlIH0gPSBkb20sXG4gICAgICAgIHN0YXRlbWVudE5vZGUgPSBzdGF0ZW1lbnQuZ2V0Tm9kZSgpLFxuICAgICAgICBtZXRhdmFyaWFibGUgPSBNZXRhdmFyaWFibGUuZnJvbVN0YXRlbWVudE5vZGUoc3RhdGVtZW50Tm9kZSwgY29udGV4dCk7XG5cbiAgcmV0dXJuIG1ldGF2YXJpYWJsZTtcbn1cblxuZXhwb3J0IGZ1bmN0aW9uIHR5cGVBc3NlcnRpb25Gcm9tU3RhdGVtZW50KHN0YXRlbWVudCwgY29udGV4dCkge1xuICBjb250ZXh0ID0gY29udGV4dEZyb21TdGF0ZW1lbnQoc3RhdGVtZW50LCBjb250ZXh0KTsgLy8vXG5cbiAgY29uc3QgeyBUeXBlQXNzZXJ0aW9uIH0gPSBkb20sXG4gICAgICAgIHN0YXRlbWVudE5vZGUgPSBzdGF0ZW1lbnQuZ2V0Tm9kZSgpLFxuICAgICAgICB0eXBlQXNzZXJ0aW9uID0gVHlwZUFzc2VydGlvbi5mcm9tU3RhdGVtZW50Tm9kZShzdGF0ZW1lbnROb2RlLCBjb250ZXh0KTtcblxuICByZXR1cm4gdHlwZUFzc2VydGlvbjtcbn1cblxuZXhwb3J0IGZ1bmN0aW9uIGRlZmluZWRBc3NlcnRpb25Gcm9tU3RhdGVtZW50KHN0YXRlbWVudCwgY29udGV4dCkge1xuICBjb250ZXh0ID0gY29udGV4dEZyb21TdGF0ZW1lbnQoc3RhdGVtZW50LCBjb250ZXh0KTsgLy8vXG5cbiAgY29uc3QgeyBEZWZpbmVkQXNzZXJ0aW9uIH0gPSBkb20sXG4gICAgICAgIHN0YXRlbWVudE5vZGUgPSBzdGF0ZW1lbnQuZ2V0Tm9kZSgpLFxuICAgICAgICBkZWZpbmVkQXNzZXJ0aW9uID0gRGVmaW5lZEFzc2VydGlvbi5mcm9tU3RhdGVtZW50Tm9kZShzdGF0ZW1lbnROb2RlLCBjb250ZXh0KTtcblxuICByZXR1cm4gZGVmaW5lZEFzc2VydGlvbjtcbn1cblxuZXhwb3J0IGZ1bmN0aW9uIHN1YnByb29mQXNzZXJ0aW9uRnJvbVN0YXRlbWVudChzdGF0ZW1lbnQsIGNvbnRleHQpIHtcbiAgY29udGV4dCA9IGNvbnRleHRGcm9tU3RhdGVtZW50KHN0YXRlbWVudCwgY29udGV4dCk7IC8vL1xuXG4gIGNvbnN0IHsgU3VicHJvb2ZBc3NlcnRpb24gfSA9IGRvbSxcbiAgICAgICAgc3RhdGVtZW50Tm9kZSA9IHN0YXRlbWVudC5nZXROb2RlKCksXG4gICAgICAgIHN1YnByb29mQXNzZXJ0aW9uID0gU3VicHJvb2ZBc3NlcnRpb24uZnJvbVN0YXRlbWVudE5vZGUoc3RhdGVtZW50Tm9kZSwgY29udGV4dCk7XG5cbiAgcmV0dXJuIHN1YnByb29mQXNzZXJ0aW9uO1xufVxuXG5mdW5jdGlvbiBjb250ZXh0RnJvbUZyYW1lKGZyYW1lLCBjb250ZXh0KSB7XG4gIGNvbnN0IGZyYW1lVG9rZW5zID0gZnJhbWUuZ2V0VG9rZW5zKCksXG4gICAgICAgIHRva2VucyA9IGZyYW1lVG9rZW5zLCAvLy9cbiAgICAgICAgbG9jYWxDb250ZXh0ID0gTG9jYWxDb250ZXh0LmZyb21Db250ZXh0QW5kVG9rZW5zKGNvbnRleHQsIHRva2Vucyk7XG5cbiAgY29udGV4dCA9IGxvY2FsQ29udGV4dDsgLy8vXG5cbiAgcmV0dXJuIGNvbnRleHQ7XG59XG5cbmZ1bmN0aW9uIGNvbnRleHRGcm9tU3RhdGVtZW50KHN0YXRlbWVudCwgY29udGV4dCkge1xuICBjb25zdCBzdGF0ZW1lbnRUb2tlbnMgPSBzdGF0ZW1lbnQuZ2V0VG9rZW5zKCksXG4gICAgICAgIHRva2VucyA9IHN0YXRlbWVudFRva2VucywgLy8vXG4gICAgICAgIGxvY2FsQ29udGV4dCA9IExvY2FsQ29udGV4dC5mcm9tQ29udGV4dEFuZFRva2Vucyhjb250ZXh0LCB0b2tlbnMpO1xuXG4gIGNvbnRleHQgPSBsb2NhbENvbnRleHQ7IC8vL1xuXG4gIHJldHVybiBjb250ZXh0O1xufVxuIl0sIm5hbWVzIjpbImRlZmluZWRBc3NlcnRpb25Gcm9tU3RhdGVtZW50IiwiZXF1YWxpdHlGcm9tU3RhdGVtZW50IiwianVkZ2VtZW50RnJvbVN0YXRlbWVudCIsIm1ldGF2YXJpYWJsZUZyb21GcmFtZSIsIm1ldGF2YXJpYWJsZUZyb21TdGF0ZW1lbnQiLCJzdWJwcm9vZkFzc2VydGlvbkZyb21TdGF0ZW1lbnQiLCJ0eXBlQXNzZXJ0aW9uRnJvbVN0YXRlbWVudCIsImZyYW1lIiwiY29udGV4dCIsImNvbnRleHRGcm9tRnJhbWUiLCJNZXRhdmFyaWFibGUiLCJkb20iLCJmcmFtZU5vZGUiLCJnZXROb2RlIiwibWV0YXZhcmlhYmxlIiwiZnJvbUZyYW1lTm9kZSIsInN0YXRlbWVudCIsImNvbnRleHRGcm9tU3RhdGVtZW50IiwiRXF1YWxpdHkiLCJzdGF0ZW1lbnROb2RlIiwiZXF1YWxpdHkiLCJmcm9tU3RhdGVtZW50Tm9kZSIsIkp1ZGdlbWVudCIsImp1ZGdlbWVudCIsIlR5cGVBc3NlcnRpb24iLCJ0eXBlQXNzZXJ0aW9uIiwiRGVmaW5lZEFzc2VydGlvbiIsImRlZmluZWRBc3NlcnRpb24iLCJTdWJwcm9vZkFzc2VydGlvbiIsInN1YnByb29mQXNzZXJ0aW9uIiwiZnJhbWVUb2tlbnMiLCJnZXRUb2tlbnMiLCJ0b2tlbnMiLCJsb2NhbENvbnRleHQiLCJMb2NhbENvbnRleHQiLCJmcm9tQ29udGV4dEFuZFRva2VucyIsInN0YXRlbWVudFRva2VucyJdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7Ozs7Ozs7O0lBdURnQkEsNkJBQTZC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
|
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.1235",
|
|
5
5
|
"license": "MIT, Anti-996",
|
|
6
6
|
"homepage": "https://github.com/djalbat/occam-verify-cli",
|
|
7
7
|
"description": "Occam's Verifier",
|
|
@@ -12,10 +12,10 @@
|
|
|
12
12
|
"dependencies": {
|
|
13
13
|
"argumentative": "^2.0.32",
|
|
14
14
|
"necessary": "^14.2.1",
|
|
15
|
-
"occam-custom-grammars": "^5.0.
|
|
16
|
-
"occam-entities": "^1.0.
|
|
17
|
-
"occam-file-system": "^6.0.
|
|
18
|
-
"occam-furtle": "^2.0.
|
|
15
|
+
"occam-custom-grammars": "^5.0.1013",
|
|
16
|
+
"occam-entities": "^1.0.258",
|
|
17
|
+
"occam-file-system": "^6.0.282",
|
|
18
|
+
"occam-furtle": "^2.0.19",
|
|
19
19
|
"occam-grammar-utilities": "^8.0.239",
|
|
20
20
|
"occam-lexers": "^23.0.11",
|
|
21
21
|
"occam-parsers": "^23.0.21",
|
package/src/dom/frame.js
CHANGED
|
@@ -11,8 +11,7 @@ import { nodeQuery, nodesQuery } from "../utilities/query";
|
|
|
11
11
|
const declarationNodesQuery = nodesQuery("/frame/declaration"),
|
|
12
12
|
metavariableNodeQuery = nodeQuery("/frame/metavariable!"),
|
|
13
13
|
metavariableNodesQuery = nodesQuery("/frame/metavariable"),
|
|
14
|
-
definedAssertionFrameNodeQuery = nodeQuery("/definedAssertion/frame")
|
|
15
|
-
containedAssertionFrameNodeQuery = nodeQuery("/containedAssertion/frame");
|
|
14
|
+
definedAssertionFrameNodeQuery = nodeQuery("/definedAssertion/frame");
|
|
16
15
|
|
|
17
16
|
const { first } = arrayUtilities;
|
|
18
17
|
|
|
@@ -312,23 +311,6 @@ export default domAssigned(class Frame {
|
|
|
312
311
|
|
|
313
312
|
return frame;
|
|
314
313
|
}
|
|
315
|
-
|
|
316
|
-
static fromContainedAssertionNode(containedAssertionNode, context) {
|
|
317
|
-
let frame = null;
|
|
318
|
-
|
|
319
|
-
const containedAssertionFrameNode = containedAssertionFrameNodeQuery(containedAssertionNode);
|
|
320
|
-
|
|
321
|
-
if (containedAssertionFrameNode !== null) {
|
|
322
|
-
const frameNode = containedAssertionFrameNode, ///
|
|
323
|
-
metavariableNode = metavariableNodeQuery(frameNode);
|
|
324
|
-
|
|
325
|
-
if (metavariableNode !== null) {
|
|
326
|
-
frame = frameFromFrameNodeAndMetavariableNode(frameNode, metavariableNode, context);
|
|
327
|
-
}
|
|
328
|
-
}
|
|
329
|
-
|
|
330
|
-
return frame;
|
|
331
|
-
}
|
|
332
314
|
});
|
|
333
315
|
|
|
334
316
|
function frameFromFrameNodeAndMetavariableNode(frameNode, metavariableNode, context) {
|
package/src/dom/statement.js
CHANGED
|
@@ -8,22 +8,19 @@ import verifyMixins from "../mixins/statement/verify";
|
|
|
8
8
|
import combinatorVerifier from "../verifier/combinator";
|
|
9
9
|
import StatementPartialContext from "../context/partial/statement";
|
|
10
10
|
|
|
11
|
+
import { nodeQuery } from "../utilities/query";
|
|
11
12
|
import { domAssigned } from "../dom";
|
|
12
13
|
import { unifyStatement } from "../utilities/unification";
|
|
13
|
-
import { nodeQuery, nodesQuery } from "../utilities/query";
|
|
14
14
|
import { STATEMENT_META_TYPE_NAME } from "../metaTypeNames";
|
|
15
|
-
import { definedAssertionFromStatement, subproofAssertionFromStatement
|
|
15
|
+
import { definedAssertionFromStatement, subproofAssertionFromStatement } from "../utilities/verification";
|
|
16
16
|
|
|
17
17
|
const { match, backwardsSome } = arrayUtilities;
|
|
18
18
|
|
|
19
|
-
const
|
|
20
|
-
statementFrameNodesQuery = nodesQuery("/statement//frame"),
|
|
21
|
-
premiseStatementNodeQuery = nodeQuery("/premise/statement"),
|
|
19
|
+
const premiseStatementNodeQuery = nodeQuery("/premise/statement"),
|
|
22
20
|
proofStepStatementNodeQuery = nodeQuery("/proofStep/statement"),
|
|
23
21
|
conclusionStatementNodeQuery = nodeQuery("/conclusion/statement"),
|
|
24
22
|
consequentStatementNodeQuery = nodeQuery("/consequent/statement"),
|
|
25
|
-
suppositionStatementNodeQuery = nodeQuery("/supposition/statement")
|
|
26
|
-
containedAssertionStatementNodeQuery = nodeQuery("/containedAssertion/statement");
|
|
23
|
+
suppositionStatementNodeQuery = nodeQuery("/supposition/statement");
|
|
27
24
|
|
|
28
25
|
export default domAssigned(class Statement {
|
|
29
26
|
constructor(string, node, tokens) {
|
|
@@ -51,60 +48,6 @@ export default domAssigned(class Statement {
|
|
|
51
48
|
return equalTo;
|
|
52
49
|
}
|
|
53
50
|
|
|
54
|
-
isTermContained(term, context) {
|
|
55
|
-
let termContained;
|
|
56
|
-
|
|
57
|
-
const termString = term.getString(),
|
|
58
|
-
statementString = this.string; ///
|
|
59
|
-
|
|
60
|
-
context.trace(`Is the '${termString}' term contained in the '${statementString}' statement...`);
|
|
61
|
-
|
|
62
|
-
const termNode = term.getNode(),
|
|
63
|
-
statementNode = this.node,
|
|
64
|
-
statementTermNodes = statementTermNodesQuery(statementNode);
|
|
65
|
-
|
|
66
|
-
termContained = statementTermNodes.some((statementTermNode) => { ///
|
|
67
|
-
const termNodeMatchesStatementVariableNode = termNode.match(statementTermNode);
|
|
68
|
-
|
|
69
|
-
if (termNodeMatchesStatementVariableNode) {
|
|
70
|
-
return true;
|
|
71
|
-
}
|
|
72
|
-
});
|
|
73
|
-
|
|
74
|
-
if (termContained) {
|
|
75
|
-
context.debug(`...the '${termString}' term is contained in the '${statementString}' statement.`);
|
|
76
|
-
}
|
|
77
|
-
|
|
78
|
-
return termContained;
|
|
79
|
-
}
|
|
80
|
-
|
|
81
|
-
isFrameContained(frame, context) {
|
|
82
|
-
let frameContained;
|
|
83
|
-
|
|
84
|
-
const frameString = frame.getString(),
|
|
85
|
-
statementString = this.string; ///
|
|
86
|
-
|
|
87
|
-
context.trace(`Is the '${frameString}' frame contained in the '${statementString}' statement...`);
|
|
88
|
-
|
|
89
|
-
const frameNode = frame.getNode(),
|
|
90
|
-
statementNode = this.node,
|
|
91
|
-
statementFrameNodes = statementFrameNodesQuery(statementNode);
|
|
92
|
-
|
|
93
|
-
frameContained = statementFrameNodes.some((statementFrameNode) => { ///
|
|
94
|
-
const frameNodeMatchesStatementMetavariableNode = frameNode.match(statementFrameNode);
|
|
95
|
-
|
|
96
|
-
if (frameNodeMatchesStatementMetavariableNode) {
|
|
97
|
-
return true;
|
|
98
|
-
}
|
|
99
|
-
});
|
|
100
|
-
|
|
101
|
-
if (frameContained) {
|
|
102
|
-
context.debug(`...the '${frameString}' frame is contained in the '${statementString}' statement.`);
|
|
103
|
-
}
|
|
104
|
-
|
|
105
|
-
return frameContained;
|
|
106
|
-
}
|
|
107
|
-
|
|
108
51
|
matchStatementNode(statementNode) {
|
|
109
52
|
const statementNodeMatches = this.node.match(statementNode);
|
|
110
53
|
|
|
@@ -170,25 +113,16 @@ export default domAssigned(class Statement {
|
|
|
170
113
|
const context = specificContext, ///
|
|
171
114
|
statement = this; ///
|
|
172
115
|
|
|
173
|
-
const definedAssertion = definedAssertionFromStatement(statement, context)
|
|
174
|
-
containedAssertion = containedAssertionFromStatement(statement, context);
|
|
116
|
+
const definedAssertion = definedAssertionFromStatement(statement, context);
|
|
175
117
|
|
|
176
|
-
if (
|
|
118
|
+
if (definedAssertion !== null) {
|
|
177
119
|
const statementString = this.string;
|
|
178
120
|
|
|
179
121
|
specificContext.trace(`Unifying the '${statementString}' statement independently...`);
|
|
180
122
|
|
|
181
|
-
|
|
182
|
-
const definedAssertionUnifiedIndependently = definedAssertion.unifyIndependently(substitutions, context);
|
|
183
|
-
|
|
184
|
-
unifiedIndependently = definedAssertionUnifiedIndependently; ///
|
|
185
|
-
}
|
|
123
|
+
const definedAssertionUnifiedIndependently = definedAssertion.unifyIndependently(substitutions, context);
|
|
186
124
|
|
|
187
|
-
|
|
188
|
-
const containedAssertionUnifiedIndependently = containedAssertion.unifyIndependently(substitutions, context);
|
|
189
|
-
|
|
190
|
-
unifiedIndependently = containedAssertionUnifiedIndependently; ///
|
|
191
|
-
}
|
|
125
|
+
unifiedIndependently = definedAssertionUnifiedIndependently; ///
|
|
192
126
|
|
|
193
127
|
if (unifiedIndependently) {
|
|
194
128
|
specificContext.debug(`...unified the '${statementString}' statement independently.`);
|
|
@@ -382,14 +316,6 @@ export default domAssigned(class Statement {
|
|
|
382
316
|
|
|
383
317
|
return statement;
|
|
384
318
|
}
|
|
385
|
-
|
|
386
|
-
static fromContainedAssertionNode(containedAssertionNode, context) {
|
|
387
|
-
const containedAssertionStatementNode = containedAssertionStatementNodeQuery(containedAssertionNode),
|
|
388
|
-
statementNode = containedAssertionStatementNode, ///
|
|
389
|
-
statement = statementFromStatementNode(statementNode, context);
|
|
390
|
-
|
|
391
|
-
return statement;
|
|
392
|
-
}
|
|
393
319
|
});
|
|
394
320
|
|
|
395
321
|
function statementFromStatementNode(statementNode, context) {
|
package/src/dom/term.js
CHANGED
|
@@ -17,8 +17,7 @@ const { filter, compress } = arrayUtilities;
|
|
|
17
17
|
|
|
18
18
|
const variableNodesQuery = nodesQuery("//variable"),
|
|
19
19
|
termVariableNodeQuery = nodeQuery("/term/variable!"),
|
|
20
|
-
definedAssertionTermNodeQuery = nodeQuery("/definedAssertion/term")
|
|
21
|
-
containedAssertionTermNodeQuery = nodeQuery("/containedAssertion/term");
|
|
20
|
+
definedAssertionTermNodeQuery = nodeQuery("/definedAssertion/term");
|
|
22
21
|
|
|
23
22
|
export default domAssigned(class Term {
|
|
24
23
|
constructor(string, node, type) {
|
|
@@ -299,25 +298,4 @@ export default domAssigned(class Term {
|
|
|
299
298
|
|
|
300
299
|
return term;
|
|
301
300
|
}
|
|
302
|
-
|
|
303
|
-
static fromContainedAssertionNode(containedAssertionNode, context) {
|
|
304
|
-
let term = null;
|
|
305
|
-
|
|
306
|
-
const containedAssertionTermNode = containedAssertionTermNodeQuery(containedAssertionNode);
|
|
307
|
-
|
|
308
|
-
if (containedAssertionTermNode !== null) {
|
|
309
|
-
const termNode = containedAssertionTermNode, ///
|
|
310
|
-
termVariableNode = termVariableNodeQuery(termNode);
|
|
311
|
-
|
|
312
|
-
if (termVariableNode !== null) {
|
|
313
|
-
const node = termNode, ///
|
|
314
|
-
string = context.nodeAsString(node),
|
|
315
|
-
type = null;
|
|
316
|
-
|
|
317
|
-
term = new Term(string, node, type);
|
|
318
|
-
}
|
|
319
|
-
}
|
|
320
|
-
|
|
321
|
-
return term;
|
|
322
|
-
}
|
|
323
301
|
});
|
package/src/index.js
CHANGED
|
@@ -35,7 +35,6 @@ import TypeAssertion from "./dom/assertion/type";
|
|
|
35
35
|
import TypeDeclaration from "./dom/declaration/type";
|
|
36
36
|
import DefinedAssertion from "./dom/assertion/defined";
|
|
37
37
|
import SubproofAssertion from "./dom/assertion/subproof";
|
|
38
|
-
import ContainedAssertion from "./dom/assertion/contained";
|
|
39
38
|
import VariableDeclaration from "./dom/declaration/variable";
|
|
40
39
|
import CombinatorDeclaration from "./dom/declaration/combinator";
|
|
41
40
|
import ConstructorDeclaration from "./dom/declaration/constructor";
|
|
@@ -7,8 +7,7 @@ import { equalityFromStatement,
|
|
|
7
7
|
metavariableFromStatement,
|
|
8
8
|
typeAssertionFromStatement,
|
|
9
9
|
definedAssertionFromStatement,
|
|
10
|
-
subproofAssertionFromStatement
|
|
11
|
-
containedAssertionFromStatement } from "../../utilities/verification";
|
|
10
|
+
subproofAssertionFromStatement } from "../../utilities/verification";
|
|
12
11
|
|
|
13
12
|
function verifyAsMetavariable(statement, assignments, stated, context) {
|
|
14
13
|
let verifiedAsMetavariable = false;
|
|
@@ -120,28 +119,6 @@ function verifyAsDefinedAssertion(statement, assignments, stated, context) {
|
|
|
120
119
|
return verifiedAsDefinedAssertion;
|
|
121
120
|
}
|
|
122
121
|
|
|
123
|
-
function verifyAsContainedAssertion(statement, assignments, stated, context) {
|
|
124
|
-
let verifiedAsContainedAssertion = false;
|
|
125
|
-
|
|
126
|
-
const containedAssertion = containedAssertionFromStatement(statement, context);
|
|
127
|
-
|
|
128
|
-
if (containedAssertion !== null) {
|
|
129
|
-
const statementString = statement.getString();
|
|
130
|
-
|
|
131
|
-
context.trace(`Verifying the '${statementString}' statement as a contained assertion...`);
|
|
132
|
-
|
|
133
|
-
const containedAssertionVerified = containedAssertion.verify(assignments, stated, context);
|
|
134
|
-
|
|
135
|
-
verifiedAsContainedAssertion = containedAssertionVerified; ///
|
|
136
|
-
|
|
137
|
-
if (verifiedAsContainedAssertion) {
|
|
138
|
-
context.debug(`...verified the '${statementString}' statement as a contained assertion.`);
|
|
139
|
-
}
|
|
140
|
-
}
|
|
141
|
-
|
|
142
|
-
return verifiedAsContainedAssertion;
|
|
143
|
-
}
|
|
144
|
-
|
|
145
122
|
function verifyAsSubproofAssertion(statement, assignments, stated, context) {
|
|
146
123
|
let verifiedAsSubproofAssertion = false;
|
|
147
124
|
|
|
@@ -199,7 +176,6 @@ const verifyMixins = [
|
|
|
199
176
|
verifyAsTypeAssertion,
|
|
200
177
|
verifyAsDefinedAssertion,
|
|
201
178
|
verifyAsSubproofAssertion,
|
|
202
|
-
verifyAsContainedAssertion,
|
|
203
179
|
unifyWithBracketedCombinator,
|
|
204
180
|
unifyWithCombinators
|
|
205
181
|
];
|
|
@@ -73,16 +73,6 @@ export function subproofAssertionFromStatement(statement, context) {
|
|
|
73
73
|
return subproofAssertion;
|
|
74
74
|
}
|
|
75
75
|
|
|
76
|
-
export function containedAssertionFromStatement(statement, context) {
|
|
77
|
-
context = contextFromStatement(statement, context); ///
|
|
78
|
-
|
|
79
|
-
const { ContainedAssertion } = dom,
|
|
80
|
-
statementNode = statement.getNode(),
|
|
81
|
-
containedAssertion = ContainedAssertion.fromStatementNode(statementNode, context);
|
|
82
|
-
|
|
83
|
-
return containedAssertion;
|
|
84
|
-
}
|
|
85
|
-
|
|
86
76
|
function contextFromFrame(frame, context) {
|
|
87
77
|
const frameTokens = frame.getTokens(),
|
|
88
78
|
tokens = frameTokens, ///
|