occam-verify-cli 0.0.1052 → 0.0.1054

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.
Files changed (3) hide show
  1. package/lib/assertion/subproof.js +10 -10
  2. package/package.json +1 -1
  3. package/src/assertion/subproof.js +1 -0
package/lib/assertion/subproof.js CHANGED
@@ -119,8 +119,8 @@ var SubproofAssertion = /*#__PURE__*/ function() {
119
119
  var subproofUnified;
120
120
  var subproofString = subproof.getString(), subproofStatements = subproof.getStatements(), subproofAssertionString = this.string; ///
121
121
  localContext.trace("Unifying the '".concat(subproofString, "' subproof with the '").concat(subproofAssertionString, "' subproof assertion..."));
122
- subproofUnified = (0, _array.match)(this.statements, subproofStatements, function(statement1, subproofStatement) {
123
- var statementNode = statement1.getNode(), subproofStatementNode = subproofStatement.getNode(), nodeA = statementNode, nodeB = subproofStatementNode, fileContextA = fileContext, localContextA = _local.default.fromFileContext(fileContextA), localContextB = localContext, unified = _metaLevel.default.unify(nodeA, nodeB, substitutions, localContextA, localContextB);
122
+ subproofUnified = (0, _array.match)(this.statements, subproofStatements, function(statement, subproofStatement) {
123
+ var statementNode = statement.getNode(), subproofStatementNode = subproofStatement.getNode(), nodeA = statementNode, nodeB = subproofStatementNode, fileContextA = fileContext, localContextA = _local.default.fromFileContext(fileContextA), localContextB = localContext, unified = _metaLevel.default.unify(nodeA, nodeB, substitutions, localContextA, localContextB);
124
124
  if (unified) {
125
125
  return true;
126
126
  }
@@ -138,9 +138,9 @@ var SubproofAssertion = /*#__PURE__*/ function() {
138
138
  var subproofAssertion = null;
139
139
  var subproofAssertionNode = subproofAssertionNodeQuery(statementNode);
140
140
  if (subproofAssertionNode !== null) {
141
- var Statement = _shim.default.Statement, statementNodes = statementNodesQuery(subproofAssertionNode), statementString = statement.getString(), localContext = _local.default.fromFileContext(fileContext), statements = statementNodes.map(function(statementNode) {
142
- var _$statement = Statement.fromStatementNode(statementNode, localContext);
143
- return _$statement;
141
+ var Statement = _shim.default.Statement, statementNodes = statementNodesQuery(subproofAssertionNode), statement = Statement.fromStatementNode(statementNode, fileContext), statementString = statement.getString(), localContext = _local.default.fromFileContext(fileContext), statements = statementNodes.map(function(statementNode) {
142
+ var statement = Statement.fromStatementNode(statementNode, localContext);
143
+ return statement;
144
144
  }), node = subproofAssertionNode, string = statementString; ///
145
145
  subproofAssertion = new SubproofAssertion(string, node, statements);
146
146
  }
@@ -153,8 +153,8 @@ var SubproofAssertion = /*#__PURE__*/ function() {
153
153
  var subproofAssertion = null;
154
154
  if (subproofAssertionNode !== null) {
155
155
  var Statement = _shim.default.Statement, statementNodes = statementNodesQuery(subproofAssertionNode), statements = statementNodes.map(function(statementNode) {
156
- var statement1 = Statement.fromStatementNode(statementNode, localContext);
157
- return statement1;
156
+ var statement = Statement.fromStatementNode(statementNode, localContext);
157
+ return statement;
158
158
  }), node = subproofAssertionNode, string = stringFromStatements(statements);
159
159
  subproofAssertion = new SubproofAssertion(string, node, statements);
160
160
  }
@@ -169,12 +169,12 @@ function stringFromStatements(statements) {
169
169
  return string;
170
170
  }
171
171
  function statementsStringFromStatements(statements) {
172
- var statementsString = statements.reduce(function(statementsString, statement1) {
173
- var statementString = statement1.getString();
172
+ var statementsString = statements.reduce(function(statementsString, statement) {
173
+ var statementString = statement.getString();
174
174
  statementsString = statementsString !== null ? "".concat(statementsString, ", ").concat(statementString) : statementString; ///
175
175
  return statementsString;
176
176
  }, null);
177
177
  return statementsString;
178
178
  }
179
179
 
180
- //# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/assertion/subproof.js"],"sourcesContent":["\"use strict\";\n\nimport shim from \"../shim\";\nimport LocalContext from \"../context/local\";\nimport metaLevelUnifier from \"../unifier/metaLevel\";\nimport metaLevelVerifier from \"../verifier/metaLevel\";\n\nimport { front, last, match } from \"../utilities/array\";\nimport { nodeQuery, nodesQuery } from \"../utilities/query\";\n\nconst statementNodesQuery = nodesQuery(\"/subproofAssertion/statement\"),\n      subproofAssertionNodeQuery = nodeQuery(\"/statement/subproofAssertion\");\n\nexport default class SubproofAssertion {\n  constructor(string, node, statements) {\n    this.string = string;\n    this.node = node;\n    this.statements = statements;\n  }\n\n  getString() {\n    return this.string;\n  }\n\n  getNode() {\n    return this.node;\n  }\n\n  getStatements() {\n    return this.statements;\n  }\n\n  verify(assignments, stated, localContext) {\n    let verified;\n\n    const subproofAssertionString = this.string;  ///\n\n    localContext.trace(`Verifying the '${subproofAssertionString}' subproof assertion...`);\n\n    let verifiedWhenStated = false,\n        verifiedWhenDerived = false;\n\n    if (stated) {\n      verifiedWhenStated = this.verifyWhenStated(localContext);\n    } else {\n      verifiedWhenDerived = this.verifyWhenDerived(localContext);\n    }\n\n    if (verifiedWhenStated || verifiedWhenDerived) {\n      assignments = null; ///\n\n      stated = true;  ///\n\n      const subproofAssertionNode = this.node;  ///\n\n      verified = metaLevelVerifier.verify(subproofAssertionNode, assignments, stated, localContext);\n    }\n\n    if (verified) {\n      localContext.debug(`...verified the '${subproofAssertionString}' subproof assertion.`);\n    }\n\n    return verified;\n  }\n\n  verifyWhenStated(localContext) {\n    let verifiedWhenStated;\n\n    const subproofAssertionString = this.string;  ///\n\n    localContext.trace(`Verifying the '${subproofAssertionString}' stated subproof assertion...`);\n\n    verifiedWhenStated = true;\n\n    if (verifiedWhenStated) {\n      localContext.debug(`...verified the '${subproofAssertionString}' stated subproof assertion.`);\n    }\n\n    return verifiedWhenStated;\n  }\n\n  verifyWhenDerived(localContext) {\n    let derivedSubproofAssertionVerified;\n\n    const subproofAssertionString = this.string;  ///\n\n    localContext.trace(`Verifying the '${subproofAssertionString}' derived subproof assertion...`);\n\n    derivedSubproofAssertionVerified = false;\n\n    localContext.debug(`The '${subproofAssertionString}' derived subproof assertion cannot be verified.`);\n\n    return derivedSubproofAssertionVerified;\n  }\n\n  unifySubproof(subproof, substitutions, fileContext, localContext) {\n    let subproofUnified;\n\n    const subproofString = subproof.getString(),\n          subproofStatements = subproof.getStatements(),\n          subproofAssertionString = this.string;  ///\n\n    localContext.trace(`Unifying the '${subproofString}' subproof with the '${subproofAssertionString}' subproof assertion...`);\n\n    subproofUnified = match(this.statements, subproofStatements, (statement, subproofStatement) => {\n      const statementNode = statement.getNode(),\n            subproofStatementNode = subproofStatement.getNode(),\n            nodeA = statementNode,  ///\n            nodeB = subproofStatementNode,  ///\n            fileContextA = fileContext,  ///\n            localContextA = LocalContext.fromFileContext(fileContextA),\n            localContextB = localContext, ///\n            unified = metaLevelUnifier.unify(nodeA, nodeB, substitutions, localContextA, localContextB);\n\n      if (unified) {\n        return true;\n      }\n    });\n\n    if (subproofUnified) {\n      localContext.debug(`...unified the '${subproofString}' subproof with the '${subproofAssertionString}' subproof assertion.`);\n    }\n\n    return subproofUnified;\n  }\n\n  static fromStatementNode(statementNode, fileContext) {\n    let subproofAssertion = null;\n\n    const subproofAssertionNode = subproofAssertionNodeQuery(statementNode);\n\n    if (subproofAssertionNode !== null) {\n      const { Statement } = shim,\n            statementNodes = statementNodesQuery(subproofAssertionNode),\n            statementString = statement.getString(),\n            localContext = LocalContext.fromFileContext(fileContext),\n            statements = statementNodes.map((statementNode) => {\n              const statement = Statement.fromStatementNode(statementNode, localContext);\n\n              return statement;\n            }),\n            node = subproofAssertionNode, ///\n            string = statementString; ///\n\n      subproofAssertion = new SubproofAssertion(string, node, statements);\n    }\n\n    return subproofAssertion;\n  }\n\n  static fromSubproofAssertionNode(subproofAssertionNode, localContext) {\n    let subproofAssertion = null;\n\n    if (subproofAssertionNode !== null) {\n      const { Statement } = shim,\n            statementNodes = statementNodesQuery(subproofAssertionNode),\n            statements = statementNodes.map((statementNode) => {\n              const statement = Statement.fromStatementNode(statementNode, localContext);\n\n              return statement;\n            }),\n            node = subproofAssertionNode, ///\n            string = stringFromStatements(statements);\n\n      subproofAssertion = new SubproofAssertion(string, node, statements);\n    }\n\n    return subproofAssertion;\n  }\n}\n\nfunction stringFromStatements(statements) {\n  const frontStatements = front(statements),\n        lastStatement = last(statements),\n        frontStatementsString = statementsStringFromStatements(frontStatements),\n        lastStatementString = lastStatement.getString(),\n        string = `[${frontStatementsString}] ... ${lastStatementString}`;\n\n  return string;\n}\n\nfunction statementsStringFromStatements(statements) {\n  const statementsString = statements.reduce((statementsString, statement) => {\n    const statementString = statement.getString();\n\n    statementsString = (statementsString !== null) ?\n                        `${statementsString}, ${statementString}` :\n                           statementString;  ///\n\n    return statementsString;\n  }, null);\n\n  return statementsString\n}"],"names":["SubproofAssertion","statementNodesQuery","nodesQuery","subproofAssertionNodeQuery","nodeQuery","string","node","statements","getString","getNode","getStatements","verify","assignments","stated","localContext","verified","subproofAssertionString","trace","verifiedWhenStated","verifiedWhenDerived","verifyWhenStated","verifyWhenDerived","subproofAssertionNode","metaLevelVerifier","debug","derivedSubproofAssertionVerified","unifySubproof","subproof","substitutions","fileContext","subproofUnified","subproofString","subproofStatements","match","statement","subproofStatement","statementNode","subproofStatementNode","nodeA","nodeB","fileContextA","localContextA","LocalContext","fromFileContext","localContextB","unified","metaLevelUnifier","unify","fromStatementNode","subproofAssertion","Statement","shim","statementNodes","statementString","map","fromSubproofAssertionNode","stringFromStatements","frontStatements","front","lastStatement","last","frontStatementsString","statementsStringFromStatements","lastStatementString","statementsString","reduce"],"mappings":"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"}
180
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/assertion/subproof.js"],"sourcesContent":["\"use strict\";\n\nimport shim from \"../shim\";\nimport LocalContext from \"../context/local\";\nimport metaLevelUnifier from \"../unifier/metaLevel\";\nimport metaLevelVerifier from \"../verifier/metaLevel\";\n\nimport { front, last, match } from \"../utilities/array\";\nimport { nodeQuery, nodesQuery } from \"../utilities/query\";\n\nconst statementNodesQuery = nodesQuery(\"/subproofAssertion/statement\"),\n      subproofAssertionNodeQuery = nodeQuery(\"/statement/subproofAssertion\");\n\nexport default class SubproofAssertion {\n  constructor(string, node, statements) {\n    this.string = string;\n    this.node = node;\n    this.statements = statements;\n  }\n\n  getString() {\n    return this.string;\n  }\n\n  getNode() {\n    return this.node;\n  }\n\n  getStatements() {\n    return this.statements;\n  }\n\n  verify(assignments, stated, localContext) {\n    let verified;\n\n    const subproofAssertionString = this.string;  ///\n\n    localContext.trace(`Verifying the '${subproofAssertionString}' subproof assertion...`);\n\n    let verifiedWhenStated = false,\n        verifiedWhenDerived = false;\n\n    if (stated) {\n      verifiedWhenStated = this.verifyWhenStated(localContext);\n    } else {\n      verifiedWhenDerived = this.verifyWhenDerived(localContext);\n    }\n\n    if (verifiedWhenStated || verifiedWhenDerived) {\n      assignments = null; ///\n\n      stated = true;  ///\n\n      const subproofAssertionNode = this.node;  ///\n\n      verified = metaLevelVerifier.verify(subproofAssertionNode, assignments, stated, localContext);\n    }\n\n    if (verified) {\n      localContext.debug(`...verified the '${subproofAssertionString}' subproof assertion.`);\n    }\n\n    return verified;\n  }\n\n  verifyWhenStated(localContext) {\n    let verifiedWhenStated;\n\n    const subproofAssertionString = this.string;  ///\n\n    localContext.trace(`Verifying the '${subproofAssertionString}' stated subproof assertion...`);\n\n    verifiedWhenStated = true;\n\n    if (verifiedWhenStated) {\n      localContext.debug(`...verified the '${subproofAssertionString}' stated subproof assertion.`);\n    }\n\n    return verifiedWhenStated;\n  }\n\n  verifyWhenDerived(localContext) {\n    let derivedSubproofAssertionVerified;\n\n    const subproofAssertionString = this.string;  ///\n\n    localContext.trace(`Verifying the '${subproofAssertionString}' derived subproof assertion...`);\n\n    derivedSubproofAssertionVerified = false;\n\n    localContext.debug(`The '${subproofAssertionString}' derived subproof assertion cannot be verified.`);\n\n    return derivedSubproofAssertionVerified;\n  }\n\n  unifySubproof(subproof, substitutions, fileContext, localContext) {\n    let subproofUnified;\n\n    const subproofString = subproof.getString(),\n          subproofStatements = subproof.getStatements(),\n          subproofAssertionString = this.string;  ///\n\n    localContext.trace(`Unifying the '${subproofString}' subproof with the '${subproofAssertionString}' subproof assertion...`);\n\n    subproofUnified = match(this.statements, subproofStatements, (statement, subproofStatement) => {\n      const statementNode = statement.getNode(),\n            subproofStatementNode = subproofStatement.getNode(),\n            nodeA = statementNode,  ///\n            nodeB = subproofStatementNode,  ///\n            fileContextA = fileContext,  ///\n            localContextA = LocalContext.fromFileContext(fileContextA),\n            localContextB = localContext, ///\n            unified = metaLevelUnifier.unify(nodeA, nodeB, substitutions, localContextA, localContextB);\n\n      if (unified) {\n        return true;\n      }\n    });\n\n    if (subproofUnified) {\n      localContext.debug(`...unified the '${subproofString}' subproof with the '${subproofAssertionString}' subproof assertion.`);\n    }\n\n    return subproofUnified;\n  }\n\n  static fromStatementNode(statementNode, fileContext) {\n    let subproofAssertion = null;\n\n    const subproofAssertionNode = subproofAssertionNodeQuery(statementNode);\n\n    if (subproofAssertionNode !== null) {\n      const { Statement } = shim,\n            statementNodes = statementNodesQuery(subproofAssertionNode),\n            statement = Statement.fromStatementNode(statementNode, fileContext),\n            statementString = statement.getString(),\n            localContext = LocalContext.fromFileContext(fileContext),\n            statements = statementNodes.map((statementNode) => {\n              const statement = Statement.fromStatementNode(statementNode, localContext);\n\n              return statement;\n            }),\n            node = subproofAssertionNode, ///\n            string = statementString; ///\n\n      subproofAssertion = new SubproofAssertion(string, node, statements);\n    }\n\n    return subproofAssertion;\n  }\n\n  static fromSubproofAssertionNode(subproofAssertionNode, localContext) {\n    let subproofAssertion = null;\n\n    if (subproofAssertionNode !== null) {\n      const { Statement } = shim,\n            statementNodes = statementNodesQuery(subproofAssertionNode),\n            statements = statementNodes.map((statementNode) => {\n              const statement = Statement.fromStatementNode(statementNode, localContext);\n\n              return statement;\n            }),\n            node = subproofAssertionNode, ///\n            string = stringFromStatements(statements);\n\n      subproofAssertion = new SubproofAssertion(string, node, statements);\n    }\n\n    return subproofAssertion;\n  }\n}\n\nfunction stringFromStatements(statements) {\n  const frontStatements = front(statements),\n        lastStatement = last(statements),\n        frontStatementsString = statementsStringFromStatements(frontStatements),\n        lastStatementString = lastStatement.getString(),\n        string = `[${frontStatementsString}] ... ${lastStatementString}`;\n\n  return string;\n}\n\nfunction statementsStringFromStatements(statements) {\n  const statementsString = statements.reduce((statementsString, statement) => {\n    const statementString = statement.getString();\n\n    statementsString = (statementsString !== null) ?\n                        `${statementsString}, ${statementString}` :\n                           statementString;  ///\n\n    return statementsString;\n  }, null);\n\n  return statementsString\n}"],"names":["SubproofAssertion","statementNodesQuery","nodesQuery","subproofAssertionNodeQuery","nodeQuery","string","node","statements","getString","getNode","getStatements","verify","assignments","stated","localContext","verified","subproofAssertionString","trace","verifiedWhenStated","verifiedWhenDerived","verifyWhenStated","verifyWhenDerived","subproofAssertionNode","metaLevelVerifier","debug","derivedSubproofAssertionVerified","unifySubproof","subproof","substitutions","fileContext","subproofUnified","subproofString","subproofStatements","match","statement","subproofStatement","statementNode","subproofStatementNode","nodeA","nodeB","fileContextA","localContextA","LocalContext","fromFileContext","localContextB","unified","metaLevelUnifier","unify","fromStatementNode","subproofAssertion","Statement","shim","statementNodes","statementString","map","fromSubproofAssertionNode","stringFromStatements","frontStatements","front","lastStatement","last","frontStatementsString","statementsStringFromStatements","lastStatementString","statementsString","reduce"],"mappings":"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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.1052",
4
+ "version": "0.0.1054",
5
5
  "license": "MIT, Anti-996",
6
6
  "homepage": "https://github.com/djalbat/occam-verify-cli",
7
7
  "description": "Occam's Verifier",
package/src/assertion/subproof.js CHANGED
@@ -132,6 +132,7 @@ export default class SubproofAssertion {
132
132
  if (subproofAssertionNode !== null) {
133
133
  const { Statement } = shim,
134
134
  statementNodes = statementNodesQuery(subproofAssertionNode),
135
+ statement = Statement.fromStatementNode(statementNode, fileContext),
135
136
  statementString = statement.getString(),
136
137
  localContext = LocalContext.fromFileContext(fileContext),
137
138
  statements = statementNodes.map((statementNode) => {