occam-verify-cli 0.0.1047 → 0.0.1050
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/release.js +16 -11
- package/lib/premise.js +12 -16
- package/lib/proofStep.js +13 -2
- package/lib/statement/qualified.js +20 -19
- package/lib/statement/unqualified.js +27 -20
- package/lib/statement.js +6 -2
- package/lib/subproof.js +5 -9
- package/lib/supposition.js +12 -16
- package/package.json +1 -1
- package/src/context/release.js +5 -3
- package/src/premise.js +14 -18
- package/src/proofStep.js +17 -5
- package/src/statement/qualified.js +27 -27
- package/src/statement/unqualified.js +32 -17
- package/src/statement.js +8 -3
- package/src/subproof.js +11 -16
- package/src/supposition.js +14 -18
package/lib/statement.js
CHANGED
|
@@ -157,7 +157,11 @@ var Statement = /*#__PURE__*/ function() {
|
|
|
157
157
|
{
|
|
158
158
|
key: "fromStatementNode",
|
|
159
159
|
value: function fromStatementNode(statementNode, localContext) {
|
|
160
|
-
var
|
|
160
|
+
var statement = null;
|
|
161
|
+
if (statementNode !== null) {
|
|
162
|
+
var node = statementNode, string = localContext.nodeAsString(node), statementSubstitution = _statement.default.fromStatementNode(statementNode, localContext), substitution = statementSubstitution; ///
|
|
163
|
+
statement = new Statement(string, node, substitution);
|
|
164
|
+
}
|
|
161
165
|
return statement;
|
|
162
166
|
}
|
|
163
167
|
}
|
|
@@ -170,4 +174,4 @@ Object.assign(_shim.default, {
|
|
|
170
174
|
Object.assign(Statement.prototype, _unify.default);
|
|
171
175
|
var _default = Statement;
|
|
172
176
|
|
|
173
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../src/statement.js"],"sourcesContent":["\"use strict\";\n\nimport shim from \"./shim\";\nimport unifyMixins from \"./mixins/statement/unify\";\nimport verifyMixins from \"./mixins/statement/verify\";\nimport StatementSubstitution from \"./substitution/statement\";\nimport statementAsCombinatorVerifier from \"./verifier/statementAsCombinator\";\n\nimport { STATEMENT_META_TYPE_NAME } from \"./metaTypeNames\";\nimport { statementNodeFromStatementString } from \"./utilities/node\";\n\nclass Statement {\n  constructor(string, node, substitution) {\n    this.string = string;\n    this.node = node;\n    this.substitution = substitution;\n  }\n\n  getString() {\n    return this.string;\n  }\n\n  getNode() {\n    return this.node;\n  }\n\n  getSubstitution() {\n    return this.substitution;\n  }\n\n  isEqualTo(statement) {\n    const node = statement.getNode(),\n          matches = this.node.match(node),\n          equalTo = matches;  ///\n\n    return equalTo;\n  }\n\n  verify(assignments, stated, localContext) {\n    let verified = false;\n\n    const statement = this, ///\n          statementString = this.string;  ///\n\n    localContext.trace(`Verifying the '${statementString}' statement...`);\n\n    if (!verified) {\n      const unified = unifyMixins.some((unifyMixin) => {\n        const unified = unifyMixin(statement, assignments, stated, localContext);\n\n        if (unified) {\n          return true;\n        }\n      });\n\n      verified = unified; ///\n    }\n\n    if (!verified) {\n      verified = verifyMixins.some((verifyMixin) => {\n        const verified = verifyMixin(statement, assignments, stated, localContext);\n\n        if (verified) {\n          return true;\n        }\n      });\n    }\n\n    if (verified) {\n      localContext.debug(`...verified the '${statementString}' statement.`);\n    }\n\n    return verified;\n  }\n\n  verifyAtTopLevel(fileContext) {\n    let verifiedAtTopLevel;\n\n    const statementNode = this.node,  ///\n          statementString = this.string;  ///\n\n    fileContext.trace(`Verifying the '${statementString}' statement at top level...`);\n\n    verifiedAtTopLevel = statementAsCombinatorVerifier.verifyStatement(statementNode, fileContext);\n\n    if (verifiedAtTopLevel) {\n      fileContext.debug(`...verified the '${statementString}' statement at top level.`, statementNode);\n    }\n\n    return verifiedAtTopLevel;\n  }\n\n  verifyGivenMetaType(metaType, assignments, stated, localContext) {\n    let verifiedGivenMetaType = false;\n\n    const metaTypeString = metaType.getString(),\n          statementString = this.string;  ///\n\n    localContext.trace(`Verifying the '${statementString}' given the '${metaTypeString}' meta-type...`);\n\n    const metaTypeName = metaType.getName();\n\n    if (metaTypeName === STATEMENT_META_TYPE_NAME) {\n      const verified = this.verify(assignments, stated, localContext)\n\n      verifiedGivenMetaType = verified; ///\n    }\n\n    if (verifiedGivenMetaType) {\n      localContext.debug(`...verified the '${statementString}' given the '${metaTypeString}' meta-type.`);\n    }\n\n    return verifiedGivenMetaType;\n  }\n\n  toJSON() {\n    const substitutionJSON = (this.substitution !== null) ?\n                                this.substitution.toJSON() :\n                                  null,\n          substitution = substitutionJSON,  ///\n          string = this.string, ///\n          json = {\n            substitution,\n            string\n          };\n\n    return json;\n  }\n\n  static fromJSON(json, fileContext) {\n    const { string } = json,\n          statementString = string, ///\n          lexer = fileContext.getLexer(),\n          parser = fileContext.getParser(),\n          statementNode = statementNodeFromStatementString(statementString, lexer, parser),\n          node = statementNode;  ///\n\n    let { substitution } = json;\n\n    json = substitution;  ///\n\n    const statementSubstitution = StatementSubstitution.fromJSON(json, fileContext);\n\n    substitution = statementSubstitution; ///\n\n    const statement = new Statement(string, node, substitution);\n\n    return statement;\n  }\n\n  static fromStatementNode(statementNode, localContext) {\n    const node = statementNode, ///\n          string = localContext.nodeAsString(node),\n          statementSubstitution = StatementSubstitution.fromStatementNode(statementNode, localContext),\n          substitution = statementSubstitution, ///\n          statement = new Statement(string, node, substitution);\n\n    return statement;\n  }\n}\n\nObject.assign(shim, {\n  Statement\n});\n\nObject.assign(Statement.prototype, unifyMixins);\n\nexport default Statement;\n\n"],"names":["Statement","string","node","substitution","getString","getNode","getSubstitution","isEqualTo","statement","matches","match","equalTo","verify","assignments","stated","localContext","verified","statementString","trace","unified","unifyMixins","some","unifyMixin","verifyMixins","verifyMixin","debug","verifyAtTopLevel","fileContext","verifiedAtTopLevel","statementNode","statementAsCombinatorVerifier","verifyStatement","verifyGivenMetaType","metaType","verifiedGivenMetaType","metaTypeString","metaTypeName","getName","STATEMENT_META_TYPE_NAME","toJSON","substitutionJSON","json","fromJSON","lexer","getLexer","parser","getParser","statementNodeFromStatementString","statementSubstitution","StatementSubstitution","fromStatementNode","nodeAsString","Object","assign","shim","prototype"],"mappings":"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"}
|
|
177
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../src/statement.js"],"sourcesContent":["\"use strict\";\n\nimport shim from \"./shim\";\nimport unifyMixins from \"./mixins/statement/unify\";\nimport verifyMixins from \"./mixins/statement/verify\";\nimport StatementSubstitution from \"./substitution/statement\";\nimport statementAsCombinatorVerifier from \"./verifier/statementAsCombinator\";\n\nimport { STATEMENT_META_TYPE_NAME } from \"./metaTypeNames\";\nimport { statementNodeFromStatementString } from \"./utilities/node\";\n\nclass Statement {\n  constructor(string, node, substitution) {\n    this.string = string;\n    this.node = node;\n    this.substitution = substitution;\n  }\n\n  getString() {\n    return this.string;\n  }\n\n  getNode() {\n    return this.node;\n  }\n\n  getSubstitution() {\n    return this.substitution;\n  }\n\n  isEqualTo(statement) {\n    const node = statement.getNode(),\n          matches = this.node.match(node),\n          equalTo = matches;  ///\n\n    return equalTo;\n  }\n\n  verify(assignments, stated, localContext) {\n    let verified = false;\n\n    const statement = this, ///\n          statementString = this.string;  ///\n\n    localContext.trace(`Verifying the '${statementString}' statement...`);\n\n    if (!verified) {\n      const unified = unifyMixins.some((unifyMixin) => {\n        const unified = unifyMixin(statement, assignments, stated, localContext);\n\n        if (unified) {\n          return true;\n        }\n      });\n\n      verified = unified; ///\n    }\n\n    if (!verified) {\n      verified = verifyMixins.some((verifyMixin) => {\n        const verified = verifyMixin(statement, assignments, stated, localContext);\n\n        if (verified) {\n          return true;\n        }\n      });\n    }\n\n    if (verified) {\n      localContext.debug(`...verified the '${statementString}' statement.`);\n    }\n\n    return verified;\n  }\n\n  verifyAtTopLevel(fileContext) {\n    let verifiedAtTopLevel;\n\n    const statementNode = this.node,  ///\n          statementString = this.string;  ///\n\n    fileContext.trace(`Verifying the '${statementString}' statement at top level...`);\n\n    verifiedAtTopLevel = statementAsCombinatorVerifier.verifyStatement(statementNode, fileContext);\n\n    if (verifiedAtTopLevel) {\n      fileContext.debug(`...verified the '${statementString}' statement at top level.`, statementNode);\n    }\n\n    return verifiedAtTopLevel;\n  }\n\n  verifyGivenMetaType(metaType, assignments, stated, localContext) {\n    let verifiedGivenMetaType = false;\n\n    const metaTypeString = metaType.getString(),\n          statementString = this.string;  ///\n\n    localContext.trace(`Verifying the '${statementString}' given the '${metaTypeString}' meta-type...`);\n\n    const metaTypeName = metaType.getName();\n\n    if (metaTypeName === STATEMENT_META_TYPE_NAME) {\n      const verified = this.verify(assignments, stated, localContext)\n\n      verifiedGivenMetaType = verified; ///\n    }\n\n    if (verifiedGivenMetaType) {\n      localContext.debug(`...verified the '${statementString}' given the '${metaTypeString}' meta-type.`);\n    }\n\n    return verifiedGivenMetaType;\n  }\n\n  toJSON() {\n    const substitutionJSON = (this.substitution !== null) ?\n                                this.substitution.toJSON() :\n                                  null,\n          substitution = substitutionJSON,  ///\n          string = this.string, ///\n          json = {\n            substitution,\n            string\n          };\n\n    return json;\n  }\n\n  static fromJSON(json, fileContext) {\n    const { string } = json,\n          statementString = string, ///\n          lexer = fileContext.getLexer(),\n          parser = fileContext.getParser(),\n          statementNode = statementNodeFromStatementString(statementString, lexer, parser),\n          node = statementNode;  ///\n\n    let { substitution } = json;\n\n    json = substitution;  ///\n\n    const statementSubstitution = StatementSubstitution.fromJSON(json, fileContext);\n\n    substitution = statementSubstitution; ///\n\n    const statement = new Statement(string, node, substitution);\n\n    return statement;\n  }\n\n  static fromStatementNode(statementNode, localContext) {\n    let statement = null;\n\n    if (statementNode !== null) {\n      const node = statementNode, ///\n          string = localContext.nodeAsString(node),\n          statementSubstitution = StatementSubstitution.fromStatementNode(statementNode, localContext),\n          substitution = statementSubstitution; ///\n\n      statement = new Statement(string, node, substitution);\n    }\n\n    return statement;\n  }\n}\n\nObject.assign(shim, {\n  Statement\n});\n\nObject.assign(Statement.prototype, unifyMixins);\n\nexport default Statement;\n\n"],"names":["Statement","string","node","substitution","getString","getNode","getSubstitution","isEqualTo","statement","matches","match","equalTo","verify","assignments","stated","localContext","verified","statementString","trace","unified","unifyMixins","some","unifyMixin","verifyMixins","verifyMixin","debug","verifyAtTopLevel","fileContext","verifiedAtTopLevel","statementNode","statementAsCombinatorVerifier","verifyStatement","verifyGivenMetaType","metaType","verifiedGivenMetaType","metaTypeString","metaTypeName","getName","STATEMENT_META_TYPE_NAME","toJSON","substitutionJSON","json","fromJSON","lexer","getLexer","parser","getParser","statementNodeFromStatementString","statementSubstitution","StatementSubstitution","fromStatementNode","nodeAsString","Object","assign","shim","prototype"],"mappings":"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"}
|
package/lib/subproof.js
CHANGED
|
@@ -137,14 +137,10 @@ var Subproof = /*#__PURE__*/ function() {
|
|
|
137
137
|
{
|
|
138
138
|
key: "fromSubproofNode",
|
|
139
139
|
value: function fromSubproofNode(subproofNode, fileContext) {
|
|
140
|
-
var
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
return supposition;
|
|
145
|
-
}), subDerivation = _subDerivation.default.fromSubDerivationNode(subDerivationNode, fileContext);
|
|
146
|
-
subproof = new Subproof(string, suppositions, subDerivation);
|
|
147
|
-
}
|
|
140
|
+
var subproofString = (0, _subproof.subproofStringFromSubproofNode)(subproofNode, fileContext), suppositionNodes = suppositionNodesQuery(subproofNode), subDerivationNode = subDerivationNodeQuery(subproofNode), string = subproofString, suppositions = suppositionNodes.map(function(suppositionNode) {
|
|
141
|
+
var supposition = _supposition.default.fromSuppositionNode(suppositionNode, fileContext);
|
|
142
|
+
return supposition;
|
|
143
|
+
}), subDerivation = _subDerivation.default.fromSubDerivationNode(subDerivationNode, fileContext), subproof = new Subproof(string, suppositions, subDerivation);
|
|
148
144
|
return subproof;
|
|
149
145
|
}
|
|
150
146
|
}
|
|
@@ -152,4 +148,4 @@ var Subproof = /*#__PURE__*/ function() {
|
|
|
152
148
|
return Subproof;
|
|
153
149
|
}();
|
|
154
150
|
|
|
155
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy9zdWJwcm9vZi5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuaW1wb3J0IFN1cHBvc2l0aW9uIGZyb20gXCIuL3N1cHBvc2l0aW9uXCI7XG5pbXBvcnQgTG9jYWxDb250ZXh0IGZyb20gXCIuL2NvbnRleHQvbG9jYWxcIjtcbmltcG9ydCBTdWJEZXJpdmF0aW9uIGZyb20gXCIuL3N1YkRlcml2YXRpb25cIjtcblxuaW1wb3J0IHsgbm9kZVF1ZXJ5LCBub2Rlc1F1ZXJ5IH0gZnJvbSBcIi4vdXRpbGl0aWVzL3F1ZXJ5XCI7XG5pbXBvcnQge3N1YnByb29mTm9kZUFzU3VicHJvb2ZTdHJpbmcsIHN1YnByb29mU3RyaW5nRnJvbVN1YnByb29mTm9kZX0gZnJvbSBcIi4vdXRpbGl0aWVzL3N1YnByb29mXCI7XG5cbmNvbnN0IHN1cHBvc2l0aW9uTm9kZXNRdWVyeSA9IG5vZGVzUXVlcnkoXCIvc3VicHJvb2Yvc3VwcG9zaXRpb25cIiksXG4gICAgICBzdWJEZXJpdmF0aW9uTm9kZVF1ZXJ5ID0gbm9kZVF1ZXJ5KFwiL3N1YnByb29mL3N1YkRlcml2YXRpb25cIik7XG5cbmV4cG9ydCBkZWZhdWx0IGNsYXNzIFN1YnByb29mIHtcbiAgY29uc3RydWN0b3Ioc3RyaW5nLCBzdXBwb3NpdGlvbnMsIHN1YkRlcml2YXRpb24pIHtcbiAgICB0aGlzLnN0cmluZyA9IHN0cmluZztcbiAgICB0aGlzLnN1cHBvc2l0aW9ucyA9IHN1cHBvc2l0aW9ucztcbiAgICB0aGlzLnN1YkRlcml2YXRpb24gPSBzdWJEZXJpdmF0aW9uO1xuICB9XG5cbiAgZ2V0U3RyaW5nKCkge1xuICAgIHJldHVybiB0aGlzLnN0cmluZztcbiAgfVxuXG4gIGdldE5vZGUoKSB7XG4gICAgcmV0dXJuIHRoaXMubm9kZTtcbiAgfVxuXG4gIGdldFN1cHBvc2l0aW9ucygpIHtcbiAgICByZXR1cm4gdGhpcy5zdXBwb3NpdGlvbnM7XG4gIH1cblxuICBnZXRTdWJEZXJpdmF0aW9uKCkge1xuICAgIHJldHVybiB0aGlzLnN1YkRlcml2YXRpb247XG4gIH1cblxuICBnZXRMYXN0UHJvb2ZTdGVwKCkgeyByZXR1cm4gdGhpcy5zdWJEZXJpdmF0aW9uLmdldExhc3RQcm9vZlN0ZXAoKTsgfVxuXG4gIGdldFN0YXRlbWVudHMoKSB7XG4gICAgY29uc3QgbGFzdFByb29mU3RlcCA9IHRoaXMuZ2V0TGFzdFByb29mU3RlcCgpLFxuICAgICAgICAgIHN1cHBvc2l0aW9uU3RhdGVtZW50cyA9IHRoaXMuc3VwcG9zaXRpb25zLm1hcCgoc3VwcG9zaXRpb24pID0+
|
|
151
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy9zdWJwcm9vZi5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuaW1wb3J0IFN1cHBvc2l0aW9uIGZyb20gXCIuL3N1cHBvc2l0aW9uXCI7XG5pbXBvcnQgTG9jYWxDb250ZXh0IGZyb20gXCIuL2NvbnRleHQvbG9jYWxcIjtcbmltcG9ydCBTdWJEZXJpdmF0aW9uIGZyb20gXCIuL3N1YkRlcml2YXRpb25cIjtcblxuaW1wb3J0IHsgbm9kZVF1ZXJ5LCBub2Rlc1F1ZXJ5IH0gZnJvbSBcIi4vdXRpbGl0aWVzL3F1ZXJ5XCI7XG5pbXBvcnQge3N1YnByb29mTm9kZUFzU3VicHJvb2ZTdHJpbmcsIHN1YnByb29mU3RyaW5nRnJvbVN1YnByb29mTm9kZX0gZnJvbSBcIi4vdXRpbGl0aWVzL3N1YnByb29mXCI7XG5cbmNvbnN0IHN1cHBvc2l0aW9uTm9kZXNRdWVyeSA9IG5vZGVzUXVlcnkoXCIvc3VicHJvb2Yvc3VwcG9zaXRpb25cIiksXG4gICAgICBzdWJEZXJpdmF0aW9uTm9kZVF1ZXJ5ID0gbm9kZVF1ZXJ5KFwiL3N1YnByb29mL3N1YkRlcml2YXRpb25cIik7XG5cbmV4cG9ydCBkZWZhdWx0IGNsYXNzIFN1YnByb29mIHtcbiAgY29uc3RydWN0b3Ioc3RyaW5nLCBzdXBwb3NpdGlvbnMsIHN1YkRlcml2YXRpb24pIHtcbiAgICB0aGlzLnN0cmluZyA9IHN0cmluZztcbiAgICB0aGlzLnN1cHBvc2l0aW9ucyA9IHN1cHBvc2l0aW9ucztcbiAgICB0aGlzLnN1YkRlcml2YXRpb24gPSBzdWJEZXJpdmF0aW9uO1xuICB9XG5cbiAgZ2V0U3RyaW5nKCkge1xuICAgIHJldHVybiB0aGlzLnN0cmluZztcbiAgfVxuXG4gIGdldE5vZGUoKSB7XG4gICAgcmV0dXJuIHRoaXMubm9kZTtcbiAgfVxuXG4gIGdldFN1cHBvc2l0aW9ucygpIHtcbiAgICByZXR1cm4gdGhpcy5zdXBwb3NpdGlvbnM7XG4gIH1cblxuICBnZXRTdWJEZXJpdmF0aW9uKCkge1xuICAgIHJldHVybiB0aGlzLnN1YkRlcml2YXRpb247XG4gIH1cblxuICBnZXRMYXN0UHJvb2ZTdGVwKCkgeyByZXR1cm4gdGhpcy5zdWJEZXJpdmF0aW9uLmdldExhc3RQcm9vZlN0ZXAoKTsgfVxuXG4gIGdldFN0YXRlbWVudHMoKSB7XG4gICAgY29uc3QgbGFzdFByb29mU3RlcCA9IHRoaXMuZ2V0TGFzdFByb29mU3RlcCgpLFxuICAgICAgICAgIHN1cHBvc2l0aW9uU3RhdGVtZW50cyA9IHRoaXMuc3VwcG9zaXRpb25zLm1hcCgoc3VwcG9zaXRpb24pID0+IHtcbiAgICAgICAgICAgIGNvbnN0IHN1cHBvc2l0aW9uU3RhdGVtZW50ID0gc3VwcG9zaXRpb24uZ2V0U3RhdGVtZW50KCk7XG5cbiAgICAgICAgICAgIHJldHVybiBzdXBwb3NpdGlvblN0YXRlbWVudDtcbiAgICAgICAgICB9KSxcbiAgICAgICAgICBsYXN0UHJvb2ZTdGVwU3RhdGVtZW50ID0gbGFzdFByb29mU3RlcC5nZXRTdGF0ZW1lbnQoKSxcbiAgICAgICAgICBzdGF0ZW1lbnRzID0gW1xuICAgICAgICAgICAgLi4uc3VwcG9zaXRpb25TdGF0ZW1lbnRzLFxuICAgICAgICAgICAgbGFzdFByb29mU3RlcFN0YXRlbWVudFxuICAgICAgICAgIF07XG5cbiAgICByZXR1cm4gc3RhdGVtZW50cztcbiAgfVxuXG5cbiAgdmVyaWZ5KHN1YnN0aXR1dGlvbnMsIGxvY2FsQ29udGV4dCkge1xuICAgIGxldCBzdWJwcm9vZlZlcmlmaWVkID0gZmFsc2U7XG5cbiAgICBsb2NhbENvbnRleHQgPSBMb2NhbENvbnRleHQuZnJvbUxvY2FsQ29udGV4dChsb2NhbENvbnRleHQpOyAgLy8vXG5cbiAgICBjb25zdCBzdXBwb3NpdGlvbnNWZXJpZmllZCA9IHRoaXMuc3VwcG9zaXRpb25zLmV2ZXJ5KChzdXBwb3NpdGlvbikgPT4ge1xuICAgICAgY29uc3Qgc3VwcG9zaXRpb25WZXJpZmllZCA9IHN1cHBvc2l0aW9uLnZlcmlmeShsb2NhbENvbnRleHQpO1xuXG4gICAgICBpZiAoc3VwcG9zaXRpb25WZXJpZmllZCkge1xuICAgICAgICByZXR1cm4gdHJ1ZTtcbiAgICAgIH1cbiAgICB9KTtcblxuICAgIGlmIChzdXBwb3NpdGlvbnNWZXJpZmllZCkge1xuICAgICAgY29uc3Qgc3ViRGVyaXZhdGlvblZlcmlmaWVkID0gdGhpcy5zdWJEZXJpdmF0aW9uLnZlcmlmeShzdWJzdGl0dXRpb25zLCBsb2NhbENvbnRleHQpO1xuXG4gICAgICBpZiAoc3ViRGVyaXZhdGlvblZlcmlmaWVkKSB7XG4gICAgICAgIHN1YnByb29mVmVyaWZpZWQgPSB0cnVlO1xuICAgICAgfVxuICAgIH1cblxuICAgIHJldHVybiBzdWJwcm9vZlZlcmlmaWVkO1xuICB9XG5cbiAgc3RhdGljIGZyb21TdWJwcm9vZk5vZGUoc3VicHJvb2ZOb2RlLCBmaWxlQ29udGV4dCkge1xuICAgIGNvbnN0IHN1YnByb29mU3RyaW5nID0gc3VicHJvb2ZTdHJpbmdGcm9tU3VicHJvb2ZOb2RlKHN1YnByb29mTm9kZSwgZmlsZUNvbnRleHQpLFxuICAgICAgICAgIHN1cHBvc2l0aW9uTm9kZXMgPSBzdXBwb3NpdGlvbk5vZGVzUXVlcnkoc3VicHJvb2ZOb2RlKSxcbiAgICAgICAgICBzdWJEZXJpdmF0aW9uTm9kZSA9IHN1YkRlcml2YXRpb25Ob2RlUXVlcnkoc3VicHJvb2ZOb2RlKSxcbiAgICAgICAgICBzdHJpbmcgPSBzdWJwcm9vZlN0cmluZywgIC8vL1xuICAgICAgICAgIHN1cHBvc2l0aW9ucyA9IHN1cHBvc2l0aW9uTm9kZXMubWFwKChzdXBwb3NpdGlvbk5vZGUpID0+IHtcbiAgICAgICAgICAgIGNvbnN0IHN1cHBvc2l0aW9uID0gU3VwcG9zaXRpb24uZnJvbVN1cHBvc2l0aW9uTm9kZShzdXBwb3NpdGlvbk5vZGUsIGZpbGVDb250ZXh0KTtcblxuICAgICAgICAgICAgcmV0dXJuIHN1cHBvc2l0aW9uO1xuICAgICAgICAgIH0pLFxuICAgICAgICAgIHN1YkRlcml2YXRpb24gPSBTdWJEZXJpdmF0aW9uLmZyb21TdWJEZXJpdmF0aW9uTm9kZShzdWJEZXJpdmF0aW9uTm9kZSwgZmlsZUNvbnRleHQpLFxuICAgICAgICAgIHN1YnByb29mID0gbmV3IFN1YnByb29mKHN0cmluZywgc3VwcG9zaXRpb25zLCBzdWJEZXJpdmF0aW9uKTtcblxuICAgIHJldHVybiBzdWJwcm9vZjtcbiAgfVxufVxuIl0sIm5hbWVzIjpbIlN1YnByb29mIiwic3VwcG9zaXRpb25Ob2Rlc1F1ZXJ5Iiwibm9kZXNRdWVyeSIsInN1YkRlcml2YXRpb25Ob2RlUXVlcnkiLCJub2RlUXVlcnkiLCJzdHJpbmciLCJzdXBwb3NpdGlvbnMiLCJzdWJEZXJpdmF0aW9uIiwiZ2V0U3RyaW5nIiwiZ2V0Tm9kZSIsIm5vZGUiLCJnZXRTdXBwb3NpdGlvbnMiLCJnZXRTdWJEZXJpdmF0aW9uIiwiZ2V0TGFzdFByb29mU3RlcCIsImdldFN0YXRlbWVudHMiLCJsYXN0UHJvb2ZTdGVwIiwic3VwcG9zaXRpb25TdGF0ZW1lbnRzIiwibWFwIiwic3VwcG9zaXRpb24iLCJzdXBwb3NpdGlvblN0YXRlbWVudCIsImdldFN0YXRlbWVudCIsImxhc3RQcm9vZlN0ZXBTdGF0ZW1lbnQiLCJzdGF0ZW1lbnRzIiwidmVyaWZ5Iiwic3Vic3RpdHV0aW9ucyIsImxvY2FsQ29udGV4dCIsInN1YnByb29mVmVyaWZpZWQiLCJMb2NhbENvbnRleHQiLCJmcm9tTG9jYWxDb250ZXh0Iiwic3VwcG9zaXRpb25zVmVyaWZpZWQiLCJldmVyeSIsInN1cHBvc2l0aW9uVmVyaWZpZWQiLCJzdWJEZXJpdmF0aW9uVmVyaWZpZWQiLCJmcm9tU3VicHJvb2ZOb2RlIiwic3VicHJvb2ZOb2RlIiwiZmlsZUNvbnRleHQiLCJzdWJwcm9vZlN0cmluZyIsInN1YnByb29mU3RyaW5nRnJvbVN1YnByb29mTm9kZSIsInN1cHBvc2l0aW9uTm9kZXMiLCJzdWJEZXJpdmF0aW9uTm9kZSIsInN1cHBvc2l0aW9uTm9kZSIsIlN1cHBvc2l0aW9uIiwiZnJvbVN1cHBvc2l0aW9uTm9kZSIsIlN1YkRlcml2YXRpb24iLCJmcm9tU3ViRGVyaXZhdGlvbk5vZGUiLCJzdWJwcm9vZiJdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7Ozs7ZUFZcUJBOzs7a0VBVkc7NERBQ0M7b0VBQ0M7cUJBRVk7d0JBQ3FDOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUUzRSxJQUFNQyx3QkFBd0JDLElBQUFBLGlCQUFVLEVBQUMsMEJBQ25DQyx5QkFBeUJDLElBQUFBLGdCQUFTLEVBQUM7QUFFMUIsSUFBQSxBQUFNSix5QkFBTjthQUFNQSxTQUNQSyxNQUFNLEVBQUVDLFlBQVksRUFBRUMsYUFBYTtnQ0FENUJQO1FBRWpCLElBQUksQ0FBQ0ssTUFBTSxHQUFHQTtRQUNkLElBQUksQ0FBQ0MsWUFBWSxHQUFHQTtRQUNwQixJQUFJLENBQUNDLGFBQWEsR0FBR0E7O2tCQUpKUDs7WUFPbkJRLEtBQUFBO21CQUFBQSxTQUFBQTtnQkFDRSxPQUFPLElBQUksQ0FBQ0gsTUFBTTtZQUNwQjs7O1lBRUFJLEtBQUFBO21CQUFBQSxTQUFBQTtnQkFDRSxPQUFPLElBQUksQ0FBQ0MsSUFBSTtZQUNsQjs7O1lBRUFDLEtBQUFBO21CQUFBQSxTQUFBQTtnQkFDRSxPQUFPLElBQUksQ0FBQ0wsWUFBWTtZQUMxQjs7O1lBRUFNLEtBQUFBO21CQUFBQSxTQUFBQTtnQkFDRSxPQUFPLElBQUksQ0FBQ0wsYUFBYTtZQUMzQjs7O1lBRUFNLEtBQUFBO21CQUFBQSxTQUFBQTtnQkFBcUIsT0FBTyxJQUFJLENBQUNOLGFBQWEsQ0FBQ00sZ0JBQWdCO1lBQUk7OztZQUVuRUMsS0FBQUE7bUJBQUFBLFNBQUFBO2dCQUNFLElBQU1DLGdCQUFnQixJQUFJLENBQUNGLGdCQUFnQixJQUNyQ0csd0JBQXdCLElBQUksQ0FBQ1YsWUFBWSxDQUFDVyxHQUFHLENBQUMsU0FBQ0M7b0JBQzdDLElBQU1DLHVCQUF1QkQsWUFBWUUsWUFBWTtvQkFFckQsT0FBT0Q7Z0JBQ1QsSUFDQUUseUJBQXlCTixjQUFjSyxZQUFZLElBQ25ERSxhQUFhLEFBQ1gscUJBQUdOLDhCQURRO29CQUVYSztpQkFDRDtnQkFFUCxPQUFPQztZQUNUOzs7WUFHQUMsS0FBQUE7bUJBQUFBLFNBQUFBLE9BQU9DLGFBQWEsRUFBRUMsWUFBWTtnQkFDaEMsSUFBSUMsbUJBQW1CO2dCQUV2QkQsZUFBZUUsY0FBWSxDQUFDQyxnQkFBZ0IsQ0FBQ0gsZUFBZ0IsR0FBRztnQkFFaEUsSUFBTUksdUJBQXVCLElBQUksQ0FBQ3ZCLFlBQVksQ0FBQ3dCLEtBQUssQ0FBQyxTQUFDWjtvQkFDcEQsSUFBTWEsc0JBQXNCYixZQUFZSyxNQUFNLENBQUNFO29CQUUvQyxJQUFJTSxxQkFBcUI7d0JBQ3ZCLE9BQU87b0JBQ1Q7Z0JBQ0Y7Z0JBRUEsSUFBSUYsc0JBQXNCO29CQUN4QixJQUFNRyx3QkFBd0IsSUFBSSxDQUFDekIsYUFBYSxDQUFDZ0IsTUFBTSxDQUFDQyxlQUFlQztvQkFFdkUsSUFBSU8sdUJBQXVCO3dCQUN6Qk4sbUJBQW1CO29CQUNyQjtnQkFDRjtnQkFFQSxPQUFPQTtZQUNUOzs7O1lBRU9PLEtBQUFBO21CQUFQLFNBQU9BLGlCQUFpQkMsWUFBWSxFQUFFQyxXQUFXO2dCQUMvQyxJQUFNQyxpQkFBaUJDLElBQUFBLHdDQUE4QixFQUFDSCxjQUFjQyxjQUM5REcsbUJBQW1CckMsc0JBQXNCaUMsZUFDekNLLG9CQUFvQnBDLHVCQUF1QitCLGVBQzNDN0IsU0FBUytCLGdCQUNUOUIsZUFBZWdDLGlCQUFpQnJCLEdBQUcsQ0FBQyxTQUFDdUI7b0JBQ25DLElBQU10QixjQUFjdUIsb0JBQVcsQ0FBQ0MsbUJBQW1CLENBQUNGLGlCQUFpQkw7b0JBRXJFLE9BQU9qQjtnQkFDVCxJQUNBWCxnQkFBZ0JvQyxzQkFBYSxDQUFDQyxxQkFBcUIsQ0FBQ0wsbUJBQW1CSixjQUN2RVUsV0FBVyxJQTdFQTdDLFNBNkVhSyxRQUFRQyxjQUFjQztnQkFFcEQsT0FBT3NDO1lBQ1Q7OztXQWhGbUI3QyJ9
|
package/lib/supposition.js
CHANGED
|
@@ -76,22 +76,18 @@ var Supposition = /*#__PURE__*/ function() {
|
|
|
76
76
|
value: function verify(localContext) {
|
|
77
77
|
var verified = false;
|
|
78
78
|
var suppositionString = this.getString(); ///
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
verified = true;
|
|
88
|
-
}
|
|
79
|
+
localContext.trace("Verifying the '".concat(suppositionString, "' supposition..."));
|
|
80
|
+
var stated = true, assignments = [], unqualifiedStatementVerified = this.unqualifiedStatement.verify(assignments, stated, localContext);
|
|
81
|
+
if (unqualifiedStatementVerified) {
|
|
82
|
+
var assignmentsAssigned = (0, _assignments.assignAssignments)(assignments, localContext);
|
|
83
|
+
if (assignmentsAssigned) {
|
|
84
|
+
var ProofStep = _shim.default.ProofStep, proofStep = ProofStep.fromUnqualifiedStatement(this.unqualifiedStatement);
|
|
85
|
+
localContext.addProofStep(proofStep);
|
|
86
|
+
verified = true;
|
|
89
87
|
}
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
} else {
|
|
94
|
-
localContext.debug("The '".concat(suppositionString, "' supposition cannot be verified because it is nonsense."));
|
|
88
|
+
}
|
|
89
|
+
if (verified) {
|
|
90
|
+
localContext.debug("...verified the '".concat(suppositionString, "' supposition."));
|
|
95
91
|
}
|
|
96
92
|
return verified;
|
|
97
93
|
}
|
|
@@ -174,4 +170,4 @@ var Supposition = /*#__PURE__*/ function() {
|
|
|
174
170
|
return Supposition;
|
|
175
171
|
}();
|
|
176
172
|
|
|
177
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../src/supposition.js"],"sourcesContent":["\"use strict\";\n\nimport shim from \"./shim\";\nimport LocalContext from \"./context/local\";\nimport metaLevelUnifier from \"./unifier/metaLevel\";\nimport SubproofAssertion from \"./assertion/subproof\";\nimport UnqualifiedStatement from \"./statement/unqualified\";\n\nimport { nodeQuery } from \"./utilities/query\";\nimport { assignAssignments } from \"./utilities/assignments\";\n\nconst unqualifiedStatementNodeQuery = nodeQuery(\"/supposition/unqualifiedStatement\");\n\nexport default class Supposition {\n  constructor(fileContext, unqualifiedStatement) {\n    this.fileContext = fileContext;\n    this.unqualifiedStatement = unqualifiedStatement;\n  }\n\n  getFileContext() {\n    return this.fileContext;\n  }\n\n  getUnqualifiedStatement() {\n    return this.unqualifiedStatement;\n  }\n\n  getString() { return this.unqualifiedStatement.getString(); }\n\n  getStatement() { return this.unqualifiedStatement.getStatement(); }\n\n  verify(localContext) {\n    let verified = false;\n\n    const suppositionString = this.getString(); ///\n\n    if (this.unqualifiedStatement !== null) {\n      localContext.trace(`Verifying the '${suppositionString}' supposition...`);\n\n      const stated = true,\n            assignments = [],\n            unqualifiedStatementVerified = this.unqualifiedStatement.verify(assignments, stated, localContext);\n\n      if (unqualifiedStatementVerified) {\n        const assignmentsAssigned = assignAssignments(assignments, localContext);\n\n        if (assignmentsAssigned) {\n          const { ProofStep } = shim,\n                proofStep = ProofStep.fromUnqualifiedStatement(this.unqualifiedStatement);\n\n          localContext.addProofStep(proofStep);\n\n          verified = true;\n        }\n      }\n\n      if (verified) {\n        localContext.debug(`...verified the '${suppositionString}' supposition.`);\n      }\n    } else {\n      localContext.debug(`The '${suppositionString}' supposition cannot be verified because it is nonsense.`);\n    }\n\n    return verified;\n  }\n\n  unifySubproof(subproof, substitutions, localContext) {\n    let subproofUnified = false;\n\n    const supposition = this, ///\n          subproofString = subproof.getString(),\n          suppositionStatement = supposition.getStatement(),\n          suppositionStatementString = suppositionStatement.getString();\n\n    localContext.trace(`Unifying the '${subproofString}' subproof with the supposition's '${suppositionStatementString}' statement...`);\n\n    const statement = this.unqualifiedStatement.getStatement(),\n          subproofAssertion = SubproofAssertion.fromStatement(statement, this.fileContext);\n\n    if (subproofAssertion !== null) {\n      subproofUnified = subproofAssertion.unifySubproof(subproof, substitutions, this.fileContext, localContext);\n    }\n\n    if (subproofUnified) {\n      localContext.debug(`...unified the '${subproofString}' subproof with the supposition's '${suppositionStatementString}' statement.`);\n    }\n\n    return subproofUnified;\n  }\n\n  unifyProofStep(proofStep, substitutions, localContext) {\n    let proofStepUnified = false;\n\n    const subproof = proofStep.getSubproof(),\n          statement = proofStep.getStatement();\n\n    substitutions.snapshot();\n\n    if (false) {\n      ///\n    } else if (subproof !== null) {\n      proofStepUnified = this.unifySubproof(subproof, substitutions, localContext);\n    } else if (statement !== null) {\n      proofStepUnified = this.unifyStatement(statement, substitutions, localContext);\n    }\n\n    proofStepUnified ?\n      substitutions.continue() :\n        substitutions.rollback(localContext);\n\n    return proofStepUnified;\n  }\n\n  unifyStatement(statement, substitutions, localContext) {\n    let statementUnified;\n\n    const supposition = this, ///\n          statementString = statement.getString(),\n          suppositionStatement = supposition.getStatement(),\n          suppositionStatementString = suppositionStatement.getString();\n\n    localContext.trace(`Unifying the '${statementString}' statement with the supposition's '${suppositionStatementString}' statement...`);\n\n    const statementNode = statement.getNode(),\n          suppositionStatementNode = suppositionStatement.getNode(),\n          nodeA = suppositionStatementNode,  ///\n          nodeB = statementNode,  ///\n          fileContextA = this.fileContext,  ///\n          localContextA = LocalContext.fromFileContext(fileContextA),\n          localContextB = localContext, ///\n          unified = metaLevelUnifier.unify(nodeA, nodeB, substitutions, localContextA, localContextB);\n\n    statementUnified = unified; ///\n\n    if (statementUnified) {\n      localContext.debug(`...unified the '${statementString}' statement with the supposition's '${suppositionStatementString}' statement.`);\n    }\n\n    return statementUnified;\n  }\n\n  toJSON() {\n    const unqualifiedStatementJSON = this.unqualifiedStatement.toJSON(),\n          unqualifiedStatement = unqualifiedStatementJSON,  ///\n          json = {\n            unqualifiedStatement\n          };\n\n    return json;\n  }\n\n  static fromJSON(json, fileContext) {\n    let { unqualifiedStatement } = json;\n\n    json = unqualifiedStatement;  ///\n\n    unqualifiedStatement = UnqualifiedStatement.fromJSON(json, fileContext);\n\n    const supposition = new Supposition(fileContext, unqualifiedStatement);\n\n    return supposition;\n  }\n\n  static fromSuppositionNode(suppositionNode, fileContext) {\n    const unqualifiedStatementNode = unqualifiedStatementNodeQuery(suppositionNode),\n          unqualifiedStatement = UnqualifiedStatement.fromUnqualifiedStatementNode(unqualifiedStatementNode, fileContext),\n          supposition = new Supposition(fileContext, unqualifiedStatement);\n\n    return supposition\n  }\n}\n"],"names":["Supposition","unqualifiedStatementNodeQuery","nodeQuery","fileContext","unqualifiedStatement","getFileContext","getUnqualifiedStatement","getString","getStatement","verify","localContext","verified","suppositionString","trace","stated","assignments","unqualifiedStatementVerified","assignmentsAssigned","assignAssignments","ProofStep","shim","proofStep","fromUnqualifiedStatement","addProofStep","debug","unifySubproof","subproof","substitutions","subproofUnified","supposition","subproofString","suppositionStatement","suppositionStatementString","statement","subproofAssertion","SubproofAssertion","fromStatement","unifyProofStep","proofStepUnified","getSubproof","snapshot","unifyStatement","continue","rollback","statementUnified","statementString","statementNode","getNode","suppositionStatementNode","nodeA","nodeB","fileContextA","localContextA","LocalContext","fromFileContext","localContextB","unified","metaLevelUnifier","unify","toJSON","unqualifiedStatementJSON","json","fromJSON","UnqualifiedStatement","fromSuppositionNode","suppositionNode","unqualifiedStatementNode","fromUnqualifiedStatementNode"],"mappings":"AAAA;;;;;;;eAaqBA;;;2DAXJ;4DACQ;gEACI;+DACC;kEACG;qBAEP;2BACQ;;;;;;;;;;;;;;;;;;;;;;;;;AAElC,IAAMC,gCAAgCC,IAAAA,gBAAS,EAAC;AAEjC,IAAA,AAAMF,4BAAN;aAAMA,YACPG,WAAW,EAAEC,oBAAoB;gCAD1BJ;QAEjB,IAAI,CAACG,WAAW,GAAGA;QACnB,IAAI,CAACC,oBAAoB,GAAGA;;kBAHXJ;;YAMnBK,KAAAA;mBAAAA,SAAAA;gBACE,OAAO,IAAI,CAACF,WAAW;YACzB;;;YAEAG,KAAAA;mBAAAA,SAAAA;gBACE,OAAO,IAAI,CAACF,oBAAoB;YAClC;;;YAEAG,KAAAA;mBAAAA,SAAAA;gBAAc,OAAO,IAAI,CAACH,oBAAoB,CAACG,SAAS;YAAI;;;YAE5DC,KAAAA;mBAAAA,SAAAA;gBAAiB,OAAO,IAAI,CAACJ,oBAAoB,CAACI,YAAY;YAAI;;;YAElEC,KAAAA;mBAAAA,SAAAA,OAAOC,YAAY;gBACjB,IAAIC,WAAW;gBAEf,IAAMC,oBAAoB,IAAI,CAACL,SAAS,IAAI,GAAG;gBAE/C,IAAI,IAAI,CAACH,oBAAoB,KAAK,MAAM;oBACtCM,aAAaG,KAAK,CAAC,AAAC,kBAAmC,OAAlBD,mBAAkB;oBAEvD,IAAME,SAAS,MACTC,cAAc,EAAE,EAChBC,+BAA+B,IAAI,CAACZ,oBAAoB,CAACK,MAAM,CAACM,aAAaD,QAAQJ;oBAE3F,IAAIM,8BAA8B;wBAChC,IAAMC,sBAAsBC,IAAAA,8BAAiB,EAACH,aAAaL;wBAE3D,IAAIO,qBAAqB;4BACvB,IAAM,AAAEE,YAAcC,aAAI,CAAlBD,WACFE,YAAYF,UAAUG,wBAAwB,CAAC,IAAI,CAAClB,oBAAoB;4BAE9EM,aAAaa,YAAY,CAACF;4BAE1BV,WAAW;wBACb;oBACF;oBAEA,IAAIA,UAAU;wBACZD,aAAac,KAAK,CAAC,AAAC,oBAAqC,OAAlBZ,mBAAkB;oBAC3D;gBACF,OAAO;oBACLF,aAAac,KAAK,CAAC,AAAC,QAAyB,OAAlBZ,mBAAkB;gBAC/C;gBAEA,OAAOD;YACT;;;YAEAc,KAAAA;mBAAAA,SAAAA,cAAcC,QAAQ,EAAEC,aAAa,EAAEjB,YAAY;gBACjD,IAAIkB,kBAAkB;gBAEtB,IAAMC,cAAc,IAAI,EAClBC,iBAAiBJ,SAASnB,SAAS,IACnCwB,uBAAuBF,YAAYrB,YAAY,IAC/CwB,6BAA6BD,qBAAqBxB,SAAS;gBAEjEG,aAAaG,KAAK,CAAC,AAAC,iBAAoEmB,OAApDF,gBAAe,uCAAgE,OAA3BE,4BAA2B;gBAEnH,IAAMC,YAAY,IAAI,CAAC7B,oBAAoB,CAACI,YAAY,IAClD0B,oBAAoBC,iBAAiB,CAACC,aAAa,CAACH,WAAW,IAAI,CAAC9B,WAAW;gBAErF,IAAI+B,sBAAsB,MAAM;oBAC9BN,kBAAkBM,kBAAkBT,aAAa,CAACC,UAAUC,eAAe,IAAI,CAACxB,WAAW,EAAEO;gBAC/F;gBAEA,IAAIkB,iBAAiB;oBACnBlB,aAAac,KAAK,CAAC,AAAC,mBAAsEQ,OAApDF,gBAAe,uCAAgE,OAA3BE,4BAA2B;gBACvH;gBAEA,OAAOJ;YACT;;;YAEAS,KAAAA;mBAAAA,SAAAA,eAAehB,SAAS,EAAEM,aAAa,EAAEjB,YAAY;gBACnD,IAAI4B,mBAAmB;gBAEvB,IAAMZ,WAAWL,UAAUkB,WAAW,IAChCN,YAAYZ,UAAUb,YAAY;gBAExCmB,cAAca,QAAQ;gBAEtB,IAAI,OAAO;gBACT,GAAG;gBACL,OAAO,IAAId,aAAa,MAAM;oBAC5BY,mBAAmB,IAAI,CAACb,aAAa,CAACC,UAAUC,eAAejB;gBACjE,OAAO,IAAIuB,cAAc,MAAM;oBAC7BK,mBAAmB,IAAI,CAACG,cAAc,CAACR,WAAWN,eAAejB;gBACnE;gBAEA4B,mBACEX,cAAce,QAAQ,KACpBf,cAAcgB,QAAQ,CAACjC;gBAE3B,OAAO4B;YACT;;;YAEAG,KAAAA;mBAAAA,SAAAA,eAAeR,SAAS,EAAEN,aAAa,EAAEjB,YAAY;gBACnD,IAAIkC;gBAEJ,IAAMf,cAAc,IAAI,EAClBgB,kBAAkBZ,UAAU1B,SAAS,IACrCwB,uBAAuBF,YAAYrB,YAAY,IAC/CwB,6BAA6BD,qBAAqBxB,SAAS;gBAEjEG,aAAaG,KAAK,CAAC,AAAC,iBAAsEmB,OAAtDa,iBAAgB,wCAAiE,OAA3Bb,4BAA2B;gBAErH,IAAMc,gBAAgBb,UAAUc,OAAO,IACjCC,2BAA2BjB,qBAAqBgB,OAAO,IACvDE,QAAQD,0BACRE,QAAQJ,eACRK,eAAe,IAAI,CAAChD,WAAW,EAC/BiD,gBAAgBC,cAAY,CAACC,eAAe,CAACH,eAC7CI,gBAAgB7C,cAChB8C,UAAUC,kBAAgB,CAACC,KAAK,CAACT,OAAOC,OAAOvB,eAAeyB,eAAeG;gBAEnFX,mBAAmBY,SAAS,GAAG;gBAE/B,IAAIZ,kBAAkB;oBACpBlC,aAAac,KAAK,CAAC,AAAC,mBAAwEQ,OAAtDa,iBAAgB,wCAAiE,OAA3Bb,4BAA2B;gBACzH;gBAEA,OAAOY;YACT;;;YAEAe,KAAAA;mBAAAA,SAAAA;gBACE,IAAMC,2BAA2B,IAAI,CAACxD,oBAAoB,CAACuD,MAAM,IAC3DvD,uBAAuBwD,0BACvBC,OAAO;oBACLzD,sBAAAA;gBACF;gBAEN,OAAOyD;YACT;;;;YAEOC,KAAAA;mBAAP,SAAOA,SAASD,IAAI,EAAE1D,WAAW;gBAC/B,IAAI,AAAEC,uBAAyByD,KAAzBzD;gBAENyD,OAAOzD,sBAAuB,GAAG;gBAEjCA,uBAAuB2D,oBAAoB,CAACD,QAAQ,CAACD,MAAM1D;gBAE3D,IAAM0B,cAAc,IAjJH7B,YAiJmBG,aAAaC;gBAEjD,OAAOyB;YACT;;;YAEOmC,KAAAA;mBAAP,SAAOA,oBAAoBC,eAAe,EAAE9D,WAAW;gBACrD,IAAM+D,2BAA2BjE,8BAA8BgE,kBACzD7D,uBAAuB2D,oBAAoB,CAACI,4BAA4B,CAACD,0BAA0B/D,cACnG0B,cAAc,IAzJH7B,YAyJmBG,aAAaC;gBAEjD,OAAOyB;YACT;;;WA5JmB7B"}
|
|
173
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../src/supposition.js"],"sourcesContent":["\"use strict\";\n\nimport shim from \"./shim\";\nimport LocalContext from \"./context/local\";\nimport metaLevelUnifier from \"./unifier/metaLevel\";\nimport SubproofAssertion from \"./assertion/subproof\";\nimport UnqualifiedStatement from \"./statement/unqualified\";\n\nimport { nodeQuery } from \"./utilities/query\";\nimport { assignAssignments } from \"./utilities/assignments\";\n\nconst unqualifiedStatementNodeQuery = nodeQuery(\"/supposition/unqualifiedStatement\");\n\nexport default class Supposition {\n  constructor(fileContext, unqualifiedStatement) {\n    this.fileContext = fileContext;\n    this.unqualifiedStatement = unqualifiedStatement;\n  }\n\n  getFileContext() {\n    return this.fileContext;\n  }\n\n  getUnqualifiedStatement() {\n    return this.unqualifiedStatement;\n  }\n\n  getString() { return this.unqualifiedStatement.getString(); }\n\n  getStatement() { return this.unqualifiedStatement.getStatement(); }\n\n  verify(localContext) {\n    let verified = false;\n\n    const suppositionString = this.getString(); ///\n\n    localContext.trace(`Verifying the '${suppositionString}' supposition...`);\n\n    const stated = true,\n          assignments = [],\n          unqualifiedStatementVerified = this.unqualifiedStatement.verify(assignments, stated, localContext);\n\n    if (unqualifiedStatementVerified) {\n      const assignmentsAssigned = assignAssignments(assignments, localContext);\n\n      if (assignmentsAssigned) {\n        const { ProofStep } = shim,\n              proofStep = ProofStep.fromUnqualifiedStatement(this.unqualifiedStatement);\n\n        localContext.addProofStep(proofStep);\n\n        verified = true;\n      }\n    }\n\n    if (verified) {\n      localContext.debug(`...verified the '${suppositionString}' supposition.`);\n    }\n\n    return verified;\n  }\n\n  unifySubproof(subproof, substitutions, localContext) {\n    let subproofUnified = false;\n\n    const supposition = this, ///\n          subproofString = subproof.getString(),\n          suppositionStatement = supposition.getStatement(),\n          suppositionStatementString = suppositionStatement.getString();\n\n    localContext.trace(`Unifying the '${subproofString}' subproof with the supposition's '${suppositionStatementString}' statement...`);\n\n    const statement = this.unqualifiedStatement.getStatement(),\n          subproofAssertion = SubproofAssertion.fromStatement(statement, this.fileContext);\n\n    if (subproofAssertion !== null) {\n      subproofUnified = subproofAssertion.unifySubproof(subproof, substitutions, this.fileContext, localContext);\n    }\n\n    if (subproofUnified) {\n      localContext.debug(`...unified the '${subproofString}' subproof with the supposition's '${suppositionStatementString}' statement.`);\n    }\n\n    return subproofUnified;\n  }\n\n  unifyProofStep(proofStep, substitutions, localContext) {\n    let proofStepUnified = false;\n\n    const subproof = proofStep.getSubproof(),\n          statement = proofStep.getStatement();\n\n    substitutions.snapshot();\n\n    if (false) {\n      ///\n    } else if (subproof !== null) {\n      proofStepUnified = this.unifySubproof(subproof, substitutions, localContext);\n    } else if (statement !== null) {\n      proofStepUnified = this.unifyStatement(statement, substitutions, localContext);\n    }\n\n    proofStepUnified ?\n      substitutions.continue() :\n        substitutions.rollback(localContext);\n\n    return proofStepUnified;\n  }\n\n  unifyStatement(statement, substitutions, localContext) {\n    let statementUnified;\n\n    const supposition = this, ///\n          statementString = statement.getString(),\n          suppositionStatement = supposition.getStatement(),\n          suppositionStatementString = suppositionStatement.getString();\n\n    localContext.trace(`Unifying the '${statementString}' statement with the supposition's '${suppositionStatementString}' statement...`);\n\n    const statementNode = statement.getNode(),\n          suppositionStatementNode = suppositionStatement.getNode(),\n          nodeA = suppositionStatementNode,  ///\n          nodeB = statementNode,  ///\n          fileContextA = this.fileContext,  ///\n          localContextA = LocalContext.fromFileContext(fileContextA),\n          localContextB = localContext, ///\n          unified = metaLevelUnifier.unify(nodeA, nodeB, substitutions, localContextA, localContextB);\n\n    statementUnified = unified; ///\n\n    if (statementUnified) {\n      localContext.debug(`...unified the '${statementString}' statement with the supposition's '${suppositionStatementString}' statement.`);\n    }\n\n    return statementUnified;\n  }\n\n  toJSON() {\n    const unqualifiedStatementJSON = this.unqualifiedStatement.toJSON(),\n          unqualifiedStatement = unqualifiedStatementJSON,  ///\n          json = {\n            unqualifiedStatement\n          };\n\n    return json;\n  }\n\n  static fromJSON(json, fileContext) {\n    let { unqualifiedStatement } = json;\n\n    json = unqualifiedStatement;  ///\n\n    unqualifiedStatement = UnqualifiedStatement.fromJSON(json, fileContext);\n\n    const supposition = new Supposition(fileContext, unqualifiedStatement);\n\n    return supposition;\n  }\n\n  static fromSuppositionNode(suppositionNode, fileContext) {\n    const unqualifiedStatementNode = unqualifiedStatementNodeQuery(suppositionNode),\n          unqualifiedStatement = UnqualifiedStatement.fromUnqualifiedStatementNode(unqualifiedStatementNode, fileContext),\n          supposition = new Supposition(fileContext, unqualifiedStatement);\n\n    return supposition\n  }\n}\n"],"names":["Supposition","unqualifiedStatementNodeQuery","nodeQuery","fileContext","unqualifiedStatement","getFileContext","getUnqualifiedStatement","getString","getStatement","verify","localContext","verified","suppositionString","trace","stated","assignments","unqualifiedStatementVerified","assignmentsAssigned","assignAssignments","ProofStep","shim","proofStep","fromUnqualifiedStatement","addProofStep","debug","unifySubproof","subproof","substitutions","subproofUnified","supposition","subproofString","suppositionStatement","suppositionStatementString","statement","subproofAssertion","SubproofAssertion","fromStatement","unifyProofStep","proofStepUnified","getSubproof","snapshot","unifyStatement","continue","rollback","statementUnified","statementString","statementNode","getNode","suppositionStatementNode","nodeA","nodeB","fileContextA","localContextA","LocalContext","fromFileContext","localContextB","unified","metaLevelUnifier","unify","toJSON","unqualifiedStatementJSON","json","fromJSON","UnqualifiedStatement","fromSuppositionNode","suppositionNode","unqualifiedStatementNode","fromUnqualifiedStatementNode"],"mappings":"AAAA;;;;;;;eAaqBA;;;2DAXJ;4DACQ;gEACI;+DACC;kEACG;qBAEP;2BACQ;;;;;;;;;;;;;;;;;;;;;;;;;AAElC,IAAMC,gCAAgCC,IAAAA,gBAAS,EAAC;AAEjC,IAAA,AAAMF,4BAAN;aAAMA,YACPG,WAAW,EAAEC,oBAAoB;gCAD1BJ;QAEjB,IAAI,CAACG,WAAW,GAAGA;QACnB,IAAI,CAACC,oBAAoB,GAAGA;;kBAHXJ;;YAMnBK,KAAAA;mBAAAA,SAAAA;gBACE,OAAO,IAAI,CAACF,WAAW;YACzB;;;YAEAG,KAAAA;mBAAAA,SAAAA;gBACE,OAAO,IAAI,CAACF,oBAAoB;YAClC;;;YAEAG,KAAAA;mBAAAA,SAAAA;gBAAc,OAAO,IAAI,CAACH,oBAAoB,CAACG,SAAS;YAAI;;;YAE5DC,KAAAA;mBAAAA,SAAAA;gBAAiB,OAAO,IAAI,CAACJ,oBAAoB,CAACI,YAAY;YAAI;;;YAElEC,KAAAA;mBAAAA,SAAAA,OAAOC,YAAY;gBACjB,IAAIC,WAAW;gBAEf,IAAMC,oBAAoB,IAAI,CAACL,SAAS,IAAI,GAAG;gBAE/CG,aAAaG,KAAK,CAAC,AAAC,kBAAmC,OAAlBD,mBAAkB;gBAEvD,IAAME,SAAS,MACTC,cAAc,EAAE,EAChBC,+BAA+B,IAAI,CAACZ,oBAAoB,CAACK,MAAM,CAACM,aAAaD,QAAQJ;gBAE3F,IAAIM,8BAA8B;oBAChC,IAAMC,sBAAsBC,IAAAA,8BAAiB,EAACH,aAAaL;oBAE3D,IAAIO,qBAAqB;wBACvB,IAAM,AAAEE,YAAcC,aAAI,CAAlBD,WACFE,YAAYF,UAAUG,wBAAwB,CAAC,IAAI,CAAClB,oBAAoB;wBAE9EM,aAAaa,YAAY,CAACF;wBAE1BV,WAAW;oBACb;gBACF;gBAEA,IAAIA,UAAU;oBACZD,aAAac,KAAK,CAAC,AAAC,oBAAqC,OAAlBZ,mBAAkB;gBAC3D;gBAEA,OAAOD;YACT;;;YAEAc,KAAAA;mBAAAA,SAAAA,cAAcC,QAAQ,EAAEC,aAAa,EAAEjB,YAAY;gBACjD,IAAIkB,kBAAkB;gBAEtB,IAAMC,cAAc,IAAI,EAClBC,iBAAiBJ,SAASnB,SAAS,IACnCwB,uBAAuBF,YAAYrB,YAAY,IAC/CwB,6BAA6BD,qBAAqBxB,SAAS;gBAEjEG,aAAaG,KAAK,CAAC,AAAC,iBAAoEmB,OAApDF,gBAAe,uCAAgE,OAA3BE,4BAA2B;gBAEnH,IAAMC,YAAY,IAAI,CAAC7B,oBAAoB,CAACI,YAAY,IAClD0B,oBAAoBC,iBAAiB,CAACC,aAAa,CAACH,WAAW,IAAI,CAAC9B,WAAW;gBAErF,IAAI+B,sBAAsB,MAAM;oBAC9BN,kBAAkBM,kBAAkBT,aAAa,CAACC,UAAUC,eAAe,IAAI,CAACxB,WAAW,EAAEO;gBAC/F;gBAEA,IAAIkB,iBAAiB;oBACnBlB,aAAac,KAAK,CAAC,AAAC,mBAAsEQ,OAApDF,gBAAe,uCAAgE,OAA3BE,4BAA2B;gBACvH;gBAEA,OAAOJ;YACT;;;YAEAS,KAAAA;mBAAAA,SAAAA,eAAehB,SAAS,EAAEM,aAAa,EAAEjB,YAAY;gBACnD,IAAI4B,mBAAmB;gBAEvB,IAAMZ,WAAWL,UAAUkB,WAAW,IAChCN,YAAYZ,UAAUb,YAAY;gBAExCmB,cAAca,QAAQ;gBAEtB,IAAI,OAAO;gBACT,GAAG;gBACL,OAAO,IAAId,aAAa,MAAM;oBAC5BY,mBAAmB,IAAI,CAACb,aAAa,CAACC,UAAUC,eAAejB;gBACjE,OAAO,IAAIuB,cAAc,MAAM;oBAC7BK,mBAAmB,IAAI,CAACG,cAAc,CAACR,WAAWN,eAAejB;gBACnE;gBAEA4B,mBACEX,cAAce,QAAQ,KACpBf,cAAcgB,QAAQ,CAACjC;gBAE3B,OAAO4B;YACT;;;YAEAG,KAAAA;mBAAAA,SAAAA,eAAeR,SAAS,EAAEN,aAAa,EAAEjB,YAAY;gBACnD,IAAIkC;gBAEJ,IAAMf,cAAc,IAAI,EAClBgB,kBAAkBZ,UAAU1B,SAAS,IACrCwB,uBAAuBF,YAAYrB,YAAY,IAC/CwB,6BAA6BD,qBAAqBxB,SAAS;gBAEjEG,aAAaG,KAAK,CAAC,AAAC,iBAAsEmB,OAAtDa,iBAAgB,wCAAiE,OAA3Bb,4BAA2B;gBAErH,IAAMc,gBAAgBb,UAAUc,OAAO,IACjCC,2BAA2BjB,qBAAqBgB,OAAO,IACvDE,QAAQD,0BACRE,QAAQJ,eACRK,eAAe,IAAI,CAAChD,WAAW,EAC/BiD,gBAAgBC,cAAY,CAACC,eAAe,CAACH,eAC7CI,gBAAgB7C,cAChB8C,UAAUC,kBAAgB,CAACC,KAAK,CAACT,OAAOC,OAAOvB,eAAeyB,eAAeG;gBAEnFX,mBAAmBY,SAAS,GAAG;gBAE/B,IAAIZ,kBAAkB;oBACpBlC,aAAac,KAAK,CAAC,AAAC,mBAAwEQ,OAAtDa,iBAAgB,wCAAiE,OAA3Bb,4BAA2B;gBACzH;gBAEA,OAAOY;YACT;;;YAEAe,KAAAA;mBAAAA,SAAAA;gBACE,IAAMC,2BAA2B,IAAI,CAACxD,oBAAoB,CAACuD,MAAM,IAC3DvD,uBAAuBwD,0BACvBC,OAAO;oBACLzD,sBAAAA;gBACF;gBAEN,OAAOyD;YACT;;;;YAEOC,KAAAA;mBAAP,SAAOA,SAASD,IAAI,EAAE1D,WAAW;gBAC/B,IAAI,AAAEC,uBAAyByD,KAAzBzD;gBAENyD,OAAOzD,sBAAuB,GAAG;gBAEjCA,uBAAuB2D,oBAAoB,CAACD,QAAQ,CAACD,MAAM1D;gBAE3D,IAAM0B,cAAc,IA7IH7B,YA6ImBG,aAAaC;gBAEjD,OAAOyB;YACT;;;YAEOmC,KAAAA;mBAAP,SAAOA,oBAAoBC,eAAe,EAAE9D,WAAW;gBACrD,IAAM+D,2BAA2BjE,8BAA8BgE,kBACzD7D,uBAAuB2D,oBAAoB,CAACI,4BAA4B,CAACD,0BAA0B/D,cACnG0B,cAAc,IArJH7B,YAqJmBG,aAAaC;gBAEjD,OAAOyB;YACT;;;WAxJmB7B"}
|
package/package.json
CHANGED
package/src/context/release.js
CHANGED
|
@@ -491,7 +491,9 @@ function verifyFileContexts(fileContexts, verifiedFileContexts) {
|
|
|
491
491
|
break;
|
|
492
492
|
}
|
|
493
493
|
|
|
494
|
-
|
|
494
|
+
let fileContextsVerified = false;
|
|
495
|
+
|
|
496
|
+
fileContexts.forEach((fileContext) => {
|
|
495
497
|
const fileContextVerified = verifyFileContext(fileContext);
|
|
496
498
|
|
|
497
499
|
if (fileContextVerified) {
|
|
@@ -499,11 +501,11 @@ function verifyFileContexts(fileContexts, verifiedFileContexts) {
|
|
|
499
501
|
|
|
500
502
|
verifiedFileContexts.push(verifiedFileContext);
|
|
501
503
|
|
|
502
|
-
|
|
504
|
+
fileContextsVerified = true;
|
|
503
505
|
}
|
|
504
506
|
});
|
|
505
507
|
|
|
506
|
-
if (!
|
|
508
|
+
if (!fileContextsVerified) {
|
|
507
509
|
break;
|
|
508
510
|
}
|
|
509
511
|
|
package/src/premise.js
CHANGED
|
@@ -109,31 +109,27 @@ export default class Premise {
|
|
|
109
109
|
|
|
110
110
|
const premiseString = this.getString(); ///
|
|
111
111
|
|
|
112
|
-
|
|
113
|
-
localContext.trace(`Verifying the '${premiseString}' premise...`);
|
|
112
|
+
localContext.trace(`Verifying the '${premiseString}' premise...`);
|
|
114
113
|
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
114
|
+
const stated = true,
|
|
115
|
+
assignments = [],
|
|
116
|
+
unqualifiedStatementVerified = this.unqualifiedStatement.verify(assignments, stated, localContext);
|
|
118
117
|
|
|
119
|
-
|
|
120
|
-
|
|
118
|
+
if (unqualifiedStatementVerified) {
|
|
119
|
+
const assignmentsAssigned = assignAssignments(assignments, localContext);
|
|
121
120
|
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
121
|
+
if (assignmentsAssigned) {
|
|
122
|
+
const { ProofStep } = shim,
|
|
123
|
+
proofStep = ProofStep.fromUnqualifiedStatement(this.unqualifiedStatement);
|
|
125
124
|
|
|
126
|
-
|
|
125
|
+
localContext.addProofStep(proofStep);
|
|
127
126
|
|
|
128
|
-
|
|
129
|
-
}
|
|
127
|
+
verified = true;
|
|
130
128
|
}
|
|
129
|
+
}
|
|
131
130
|
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
}
|
|
135
|
-
} else {
|
|
136
|
-
localContext.debug(`The '${premiseString}' premise cannot be verified because it is nonsense.`);
|
|
131
|
+
if (verified) {
|
|
132
|
+
localContext.debug(`...verified the '${premiseString}' premise.`);
|
|
137
133
|
}
|
|
138
134
|
|
|
139
135
|
return verified;
|
package/src/proofStep.js
CHANGED
|
@@ -90,11 +90,23 @@ class ProofStep {
|
|
|
90
90
|
static fromProofStepNode(proofStepNode, fileContext) {
|
|
91
91
|
const subproofNode = subproofNodeQuery(proofStepNode),
|
|
92
92
|
qualifiedStatementNode = qualifiedStatementNodeQuery(proofStepNode),
|
|
93
|
-
unqualifiedStatementNode = unqualifiedStatementNodeQuery(proofStepNode)
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
93
|
+
unqualifiedStatementNode = unqualifiedStatementNodeQuery(proofStepNode);
|
|
94
|
+
|
|
95
|
+
let subproof = null,
|
|
96
|
+
qualifiedStatement = null,
|
|
97
|
+
unqualifiedStatement = null;
|
|
98
|
+
|
|
99
|
+
if (false) {
|
|
100
|
+
///
|
|
101
|
+
} else if (subproofNode !== null) {
|
|
102
|
+
subproof = Subproof.fromSubproofNode(subproofNode, fileContext);
|
|
103
|
+
} else if (qualifiedStatementNode !== null) {
|
|
104
|
+
qualifiedStatement = QualifiedStatement.fromQualifiedStatementNode(qualifiedStatementNode, fileContext);
|
|
105
|
+
} else if (unqualifiedStatementNode !== null) {
|
|
106
|
+
unqualifiedStatement = UnqualifiedStatement.fromUnqualifiedStatementNode(unqualifiedStatementNode, fileContext);
|
|
107
|
+
}
|
|
108
|
+
|
|
109
|
+
const proofStep = new ProofStep(subproof, qualifiedStatement, unqualifiedStatement);
|
|
98
110
|
|
|
99
111
|
return proofStep;
|
|
100
112
|
}
|
|
@@ -38,24 +38,28 @@ export default class QualifiedStatement {
|
|
|
38
38
|
|
|
39
39
|
const qualifiedStatementString = this.string; ///
|
|
40
40
|
|
|
41
|
-
|
|
41
|
+
if (this.statement !== null) {
|
|
42
|
+
localContext.trace(`Verifying the '${qualifiedStatementString}' qualified statement...`);
|
|
42
43
|
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
44
|
+
const stated = true,
|
|
45
|
+
assignments = [],
|
|
46
|
+
statementVerified = this.statement.verify(assignments, stated, localContext);
|
|
46
47
|
|
|
47
|
-
|
|
48
|
-
|
|
48
|
+
if (statementVerified) {
|
|
49
|
+
const unified = this.unify(substitutions, localContext);
|
|
49
50
|
|
|
50
|
-
|
|
51
|
-
|
|
51
|
+
if (unified) {
|
|
52
|
+
const assignmentsAssigned = assignAssignments(assignments, localContext);
|
|
52
53
|
|
|
53
|
-
|
|
54
|
+
verified = assignmentsAssigned; ///
|
|
55
|
+
}
|
|
54
56
|
}
|
|
55
|
-
}
|
|
56
57
|
|
|
57
|
-
|
|
58
|
-
|
|
58
|
+
if (verified) {
|
|
59
|
+
localContext.debug(`...verified the '${qualifiedStatementString}' qualified statement.`);
|
|
60
|
+
}
|
|
61
|
+
} else {
|
|
62
|
+
localContext.debug(`Cannot verify the '${qualifiedStatementString}' qualified statement because it is nonsense.`);
|
|
59
63
|
}
|
|
60
64
|
|
|
61
65
|
return verified;
|
|
@@ -83,25 +87,21 @@ export default class QualifiedStatement {
|
|
|
83
87
|
}
|
|
84
88
|
|
|
85
89
|
static fromQualifiedStatementNode(qualifiedStatementNode, fileContext) {
|
|
86
|
-
let
|
|
90
|
+
let string;
|
|
87
91
|
|
|
88
|
-
|
|
89
|
-
|
|
92
|
+
const { Statement } = shim,
|
|
93
|
+
statementNode = statementNodeQuery(qualifiedStatementNode),
|
|
94
|
+
referenceNode = referenceNodeQuery(qualifiedStatementNode),
|
|
95
|
+
localContext = LocalContext.fromFileContext(fileContext),
|
|
96
|
+
statement = Statement.fromStatementNode(statementNode, localContext),
|
|
97
|
+
reference = Reference.fromReferenceNode(referenceNode, fileContext),
|
|
98
|
+
node = qualifiedStatementNode; ///
|
|
90
99
|
|
|
91
|
-
|
|
92
|
-
statementNode = statementNodeQuery(qualifiedStatementNode),
|
|
93
|
-
referenceNode = referenceNodeQuery(qualifiedStatementNode),
|
|
94
|
-
localContext = LocalContext.fromFileContext(fileContext),
|
|
95
|
-
statement = Statement.fromStatementNode(statementNode, localContext),
|
|
96
|
-
reference = Reference.fromReferenceNode(referenceNode, fileContext),
|
|
97
|
-
node = qualifiedStatementNode; ///
|
|
100
|
+
string = fileContext.nodeAsString(node);
|
|
98
101
|
|
|
99
|
-
|
|
102
|
+
string = trim(string); ///
|
|
100
103
|
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
qualifiedStatement = new QualifiedStatement(string, statement, reference);
|
|
104
|
-
}
|
|
104
|
+
const qualifiedStatement = new QualifiedStatement(string, statement, reference);
|
|
105
105
|
|
|
106
106
|
return qualifiedStatement;
|
|
107
107
|
}
|
|
@@ -3,34 +3,43 @@
|
|
|
3
3
|
import shim from "../shim";
|
|
4
4
|
import LocalContext from "../context/local";
|
|
5
5
|
|
|
6
|
+
import { trim } from "../utilities/string";
|
|
6
7
|
import { nodeQuery } from "../utilities/query";
|
|
7
8
|
|
|
8
9
|
const statementNodeQuery = nodeQuery("/unqualifiedStatement/statement");
|
|
9
10
|
|
|
10
11
|
export default class UnqualifiedStatement {
|
|
11
|
-
constructor(statement) {
|
|
12
|
+
constructor(string, statement) {
|
|
13
|
+
this.string = string;
|
|
12
14
|
this.statement = statement;
|
|
13
15
|
}
|
|
14
16
|
|
|
17
|
+
getString() {
|
|
18
|
+
return this.string;
|
|
19
|
+
}
|
|
20
|
+
|
|
15
21
|
getStatement() {
|
|
16
22
|
return this.statement;
|
|
17
23
|
}
|
|
18
24
|
|
|
19
|
-
getString() { return this.statement.getString(); }
|
|
20
|
-
|
|
21
25
|
verify(assignments, stated, localContext) {
|
|
22
26
|
let verified;
|
|
23
27
|
|
|
24
28
|
const unqualifiedStatementString = this.getString(); ///
|
|
25
29
|
|
|
26
|
-
|
|
30
|
+
if (this.statement !== null) {
|
|
31
|
+
localContext.trace(`Verifying the '${unqualifiedStatementString}' unqualified statement...`);
|
|
32
|
+
|
|
33
|
+
const statementVerified = this.statement.verify(assignments, stated, localContext);
|
|
27
34
|
|
|
28
|
-
|
|
35
|
+
verified = statementVerified; ///
|
|
29
36
|
|
|
30
|
-
|
|
37
|
+
if (verified) {
|
|
38
|
+
localContext.debug(`...verified the '${unqualifiedStatementString}' unqualified statement.`);
|
|
39
|
+
}
|
|
31
40
|
|
|
32
|
-
|
|
33
|
-
localContext.debug(
|
|
41
|
+
} else {
|
|
42
|
+
localContext.debug(`Cannot verify the '${unqualifiedStatementString}' unqualified statement because it is nonsense.`);
|
|
34
43
|
}
|
|
35
44
|
|
|
36
45
|
return verified;
|
|
@@ -39,7 +48,9 @@ export default class UnqualifiedStatement {
|
|
|
39
48
|
toJSON() {
|
|
40
49
|
const statementJSON = this.statement.toJSON(),
|
|
41
50
|
statement = statementJSON, ///
|
|
51
|
+
string = this.string, ///
|
|
42
52
|
json = {
|
|
53
|
+
string,
|
|
43
54
|
statement
|
|
44
55
|
};
|
|
45
56
|
|
|
@@ -55,22 +66,26 @@ export default class UnqualifiedStatement {
|
|
|
55
66
|
|
|
56
67
|
statement = Statement.fromJSON(json, fileContext);
|
|
57
68
|
|
|
58
|
-
const
|
|
69
|
+
const { string } = json,
|
|
70
|
+
unqualifiedStatement = new UnqualifiedStatement(string, statement);
|
|
59
71
|
|
|
60
72
|
return unqualifiedStatement;
|
|
61
73
|
}
|
|
62
74
|
|
|
63
75
|
static fromUnqualifiedStatementNode(unqualifiedStatementNode, fileContext) {
|
|
64
|
-
let
|
|
76
|
+
let string;
|
|
65
77
|
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
78
|
+
const { Statement } = shim,
|
|
79
|
+
statementNode = statementNodeQuery(unqualifiedStatementNode),
|
|
80
|
+
localContext = LocalContext.fromFileContext(fileContext),
|
|
81
|
+
statement = Statement.fromStatementNode(statementNode, localContext),
|
|
82
|
+
node = unqualifiedStatementNode; ///
|
|
71
83
|
|
|
72
|
-
|
|
73
|
-
|
|
84
|
+
string = fileContext.nodeAsString(node);
|
|
85
|
+
|
|
86
|
+
string = trim(string); ///
|
|
87
|
+
|
|
88
|
+
const unqualifiedStatement = new UnqualifiedStatement(string, statement);
|
|
74
89
|
|
|
75
90
|
return unqualifiedStatement;
|
|
76
91
|
}
|
package/src/statement.js
CHANGED
|
@@ -149,11 +149,16 @@ class Statement {
|
|
|
149
149
|
}
|
|
150
150
|
|
|
151
151
|
static fromStatementNode(statementNode, localContext) {
|
|
152
|
-
|
|
152
|
+
let statement = null;
|
|
153
|
+
|
|
154
|
+
if (statementNode !== null) {
|
|
155
|
+
const node = statementNode, ///
|
|
153
156
|
string = localContext.nodeAsString(node),
|
|
154
157
|
statementSubstitution = StatementSubstitution.fromStatementNode(statementNode, localContext),
|
|
155
|
-
substitution = statementSubstitution
|
|
156
|
-
|
|
158
|
+
substitution = statementSubstitution; ///
|
|
159
|
+
|
|
160
|
+
statement = new Statement(string, node, substitution);
|
|
161
|
+
}
|
|
157
162
|
|
|
158
163
|
return statement;
|
|
159
164
|
}
|
package/src/subproof.js
CHANGED
|
@@ -77,22 +77,17 @@ export default class Subproof {
|
|
|
77
77
|
}
|
|
78
78
|
|
|
79
79
|
static fromSubproofNode(subproofNode, fileContext) {
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
}),
|
|
92
|
-
subDerivation = SubDerivation.fromSubDerivationNode(subDerivationNode, fileContext);
|
|
93
|
-
|
|
94
|
-
subproof = new Subproof(string, suppositions, subDerivation);
|
|
95
|
-
}
|
|
80
|
+
const subproofString = subproofStringFromSubproofNode(subproofNode, fileContext),
|
|
81
|
+
suppositionNodes = suppositionNodesQuery(subproofNode),
|
|
82
|
+
subDerivationNode = subDerivationNodeQuery(subproofNode),
|
|
83
|
+
string = subproofString, ///
|
|
84
|
+
suppositions = suppositionNodes.map((suppositionNode) => {
|
|
85
|
+
const supposition = Supposition.fromSuppositionNode(suppositionNode, fileContext);
|
|
86
|
+
|
|
87
|
+
return supposition;
|
|
88
|
+
}),
|
|
89
|
+
subDerivation = SubDerivation.fromSubDerivationNode(subDerivationNode, fileContext),
|
|
90
|
+
subproof = new Subproof(string, suppositions, subDerivation);
|
|
96
91
|
|
|
97
92
|
return subproof;
|
|
98
93
|
}
|
package/src/supposition.js
CHANGED
|
@@ -34,31 +34,27 @@ export default class Supposition {
|
|
|
34
34
|
|
|
35
35
|
const suppositionString = this.getString(); ///
|
|
36
36
|
|
|
37
|
-
|
|
38
|
-
localContext.trace(`Verifying the '${suppositionString}' supposition...`);
|
|
37
|
+
localContext.trace(`Verifying the '${suppositionString}' supposition...`);
|
|
39
38
|
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
39
|
+
const stated = true,
|
|
40
|
+
assignments = [],
|
|
41
|
+
unqualifiedStatementVerified = this.unqualifiedStatement.verify(assignments, stated, localContext);
|
|
43
42
|
|
|
44
|
-
|
|
45
|
-
|
|
43
|
+
if (unqualifiedStatementVerified) {
|
|
44
|
+
const assignmentsAssigned = assignAssignments(assignments, localContext);
|
|
46
45
|
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
46
|
+
if (assignmentsAssigned) {
|
|
47
|
+
const { ProofStep } = shim,
|
|
48
|
+
proofStep = ProofStep.fromUnqualifiedStatement(this.unqualifiedStatement);
|
|
50
49
|
|
|
51
|
-
|
|
50
|
+
localContext.addProofStep(proofStep);
|
|
52
51
|
|
|
53
|
-
|
|
54
|
-
}
|
|
52
|
+
verified = true;
|
|
55
53
|
}
|
|
54
|
+
}
|
|
56
55
|
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
}
|
|
60
|
-
} else {
|
|
61
|
-
localContext.debug(`The '${suppositionString}' supposition cannot be verified because it is nonsense.`);
|
|
56
|
+
if (verified) {
|
|
57
|
+
localContext.debug(`...verified the '${suppositionString}' supposition.`);
|
|
62
58
|
}
|
|
63
59
|
|
|
64
60
|
return verified;
|