occam-verify-cli 0.0.1119 → 0.0.1120

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/mixins/proofStep/unify.js +29 -15
  2. package/package.json +1 -1
  3. package/src/mixins/proofStep/unify.js +43 -22
package/lib/mixins/proofStep/unify.js CHANGED
@@ -15,19 +15,6 @@ function _interop_require_default(obj) {
15
15
  default: obj
16
16
  };
17
17
  }
18
- function unifyAsEquality(statement, reference, substitutions, context) {
19
- var unifiedAsEquality = false;
20
- if (reference === null) {
21
- var equality = (0, _verification.equalityFromStatement)(statement, context);
22
- if (equality !== null) {
23
- var statementString = statement.getString();
24
- context.trace("Unifying the '".concat(statementString, "' statement as an equality..."));
25
- unifiedAsEquality = true;
26
- context.debug("...unified the '".concat(statementString, "' statement as an equality."));
27
- }
28
- }
29
- return unifiedAsEquality;
30
- }
31
18
  function unifyAWithRule(statement, reference, substitutions, context) {
32
19
  var unifiedWithRule = false;
33
20
  if (reference !== null) {
@@ -81,6 +68,32 @@ function unifyAWithAxiomLemmaTheoremOrConjecture(statement, reference, substitut
81
68
  }
82
69
  return unifiedWithAxiomLemmaTheoremOrConjecture;
83
70
  }
71
+ function unifyAsEquality(statement, reference, substitutions, context) {
72
+ var unifiedAsEquality = false;
73
+ if (reference === null) {
74
+ var equality = (0, _verification.equalityFromStatement)(statement, context);
75
+ if (equality !== null) {
76
+ var statementString = statement.getString();
77
+ context.trace("Unifying the '".concat(statementString, "' statement as an equality..."));
78
+ unifiedAsEquality = true;
79
+ context.debug("...unified the '".concat(statementString, "' statement as an equality."));
80
+ }
81
+ }
82
+ return unifiedAsEquality;
83
+ }
84
+ function unifyAsTypeAssertion(statement, reference, substitutions, context) {
85
+ var unifiedAsTypeAssertion = false;
86
+ if (reference === null) {
87
+ var typeAssertion = (0, _verification.typeAssertionFromStatement)(statement, context);
88
+ if (typeAssertion !== null) {
89
+ var statementString = statement.getString();
90
+ context.trace("Unifying the '".concat(statementString, "' statement as a type assertion..."));
91
+ unifiedAsTypeAssertion = true;
92
+ context.debug("...unified the '".concat(statementString, "' statement as a type assertion."));
93
+ }
94
+ }
95
+ return unifiedAsTypeAssertion;
96
+ }
84
97
  function unifyWithProofSteps(statement, reference, substitutions, context) {
85
98
  var unifiedWithProofSteps = false;
86
99
  if (reference === null) {
@@ -90,12 +103,13 @@ function unifyWithProofSteps(statement, reference, substitutions, context) {
90
103
  return unifiedWithProofSteps;
91
104
  }
92
105
  var unifyMixins = [
93
- unifyAsEquality,
94
106
  unifyAWithRule,
95
107
  unifyAWithReference,
96
108
  unifyAWithAxiomLemmaTheoremOrConjecture,
109
+ unifyAsEquality,
110
+ unifyAsTypeAssertion,
97
111
  unifyWithProofSteps
98
112
  ];
99
113
  var _default = unifyMixins;
100
114
 
101
- //# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../../src/mixins/proofStep/unify.js"],"sourcesContent":["\"use strict\";\n\nimport StatementSubstitution from \"../../substitution/statement\";\n\nimport { equalityFromStatement } from \"../../utilities/verification\";\n\nfunction unifyAsEquality(statement, reference, substitutions, context) {\n  let unifiedAsEquality = false;\n\n  if (reference === null) {\n    const equality = equalityFromStatement(statement, context);\n\n    if (equality !== null) {\n      const statementString = statement.getString();\n\n      context.trace(`Unifying the '${statementString}' statement as an equality...`);\n\n      unifiedAsEquality = true;\n\n      context.debug(`...unified the '${statementString}' statement as an equality.`);\n    }\n  }\n\n  return unifiedAsEquality;\n}\n\nfunction unifyAWithRule(statement, reference, substitutions, context) {\n  let unifiedWithRule = false;\n\n  if (reference !== null) {\n    const rule = context.findRuleByReference(reference);\n\n    if (rule !== null) {\n      const ruleString = rule.getString(),\n            statementString = statement.getString();\n\n      context.trace(`Unifying the '${statementString}' statement with the '${ruleString}' rule...`);\n\n      const proofSteps = context.getProofSteps(),\n            statementAndProofStepsUnified = rule.unifyStatementAndProofSteps(statement, proofSteps, context);\n\n      unifiedWithRule = statementAndProofStepsUnified;  ///\n\n      if (unifiedWithRule) {\n        context.debug(`...unified the '${statementString}' statement with the '${ruleString}' rule.`);\n      }\n    }\n  }\n\n  return unifiedWithRule;\n}\n\nfunction unifyAWithReference(statement, reference, substitutions, context) {\n  let unifiedWithReference = false;\n\n  if (reference !== null) {\n    const metavariableVerified = reference.verifyMetavariable(context);\n\n    if (metavariableVerified) {\n      const statementString = statement.getString(),\n            referenceString = reference.getString();\n\n      context.trace(`Unifying the '${statementString}' statement with the '${referenceString}' reference...`);\n\n      const metavariable = reference.getMetavariable(),\n            statementSubstitution = StatementSubstitution.fromStatementAndMetavariable(statement, metavariable, context),\n            substitution = statementSubstitution; ///\n\n      substitutions.addSubstitution(substitution, context);\n\n      unifiedWithReference = true;\n\n      if (unifiedWithReference) {\n        context.debug(`...unified the '${statementString}' statement with the '${referenceString}' reference.`);\n      }\n    }\n  }\n\n  return unifiedWithReference;\n}\n\nfunction unifyAWithAxiomLemmaTheoremOrConjecture(statement, reference, substitutions, context) {\n  let unifiedWithAxiomLemmaTheoremOrConjecture = false;\n\n  if (reference !== null) {\n    const axiomLemmaTheoremConjecture = context.findAxiomLemmaTheoremConjectureByReference(reference);\n\n    if (axiomLemmaTheoremConjecture !== null) {\n      const statementString = statement.getString(),\n            axiomLemmaTheoremConjectureString = reference.getString();\n\n      context.trace(`Unifying the '${statementString}' statement with the '${axiomLemmaTheoremConjectureString}' axiom, lemma, theorem or conjecture...`);\n\n      const proofSteps = context.getProofSteps(),\n            statementAndProofStepsUnified = axiomLemmaTheoremConjecture.unifyStatementAndProofSteps(statement, proofSteps, context);\n\n      if (statementAndProofStepsUnified) {\n        const metavariable = reference.getMetavariable(),\n              statementSubstitution = StatementSubstitution.fromStatementAndMetavariable(statement, metavariable, context),\n              substitution = statementSubstitution; ///\n\n        substitutions.addSubstitution(substitution, context);\n\n        unifiedWithAxiomLemmaTheoremOrConjecture = true;\n      }\n\n      if (unifiedWithAxiomLemmaTheoremOrConjecture) {\n        context.debug(`...unified the '${statementString}' statement with the '${axiomLemmaTheoremConjectureString}' axiom, lemma, theorem or conjecture.`);\n      }\n    }\n  }\n\n  return unifiedWithAxiomLemmaTheoremOrConjecture;\n}\n\nfunction unifyWithProofSteps(statement, reference, substitutions, context) {\n  let unifiedWithProofSteps = false;\n\n  if (reference === null) {\n    const proofSteps = context.getProofSteps(),\n          statementUnifiedWithProofSteps = statement.unifyWithProofSteps(proofSteps, context);\n\n    unifiedWithProofSteps = statementUnifiedWithProofSteps; ///\n  }\n\n  return unifiedWithProofSteps;\n}\n\nconst unifyMixins = [\n  unifyAsEquality,\n  unifyAWithRule,\n  unifyAWithReference,\n  unifyAWithAxiomLemmaTheoremOrConjecture,\n  unifyWithProofSteps\n];\n\nexport default unifyMixins;\n\n"],"names":["unifyAsEquality","statement","reference","substitutions","context","unifiedAsEquality","equality","equalityFromStatement","statementString","getString","trace","debug","unifyAWithRule","unifiedWithRule","rule","findRuleByReference","ruleString","proofSteps","getProofSteps","statementAndProofStepsUnified","unifyStatementAndProofSteps","unifyAWithReference","unifiedWithReference","metavariableVerified","verifyMetavariable","referenceString","metavariable","getMetavariable","statementSubstitution","StatementSubstitution","fromStatementAndMetavariable","substitution","addSubstitution","unifyAWithAxiomLemmaTheoremOrConjecture","unifiedWithAxiomLemmaTheoremOrConjecture","axiomLemmaTheoremConjecture","findAxiomLemmaTheoremConjectureByReference","axiomLemmaTheoremConjectureString","unifyWithProofSteps","unifiedWithProofSteps","statementUnifiedWithProofSteps","unifyMixins"],"mappings":"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"}
115
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../../src/mixins/proofStep/unify.js"],"sourcesContent":["\"use strict\";\n\nimport StatementSubstitution from \"../../substitution/statement\";\n\nimport { equalityFromStatement, typeAssertionFromStatement } from \"../../utilities/verification\";\n\nfunction unifyAWithRule(statement, reference, substitutions, context) {\n  let unifiedWithRule = false;\n\n  if (reference !== null) {\n    const rule = context.findRuleByReference(reference);\n\n    if (rule !== null) {\n      const ruleString = rule.getString(),\n            statementString = statement.getString();\n\n      context.trace(`Unifying the '${statementString}' statement with the '${ruleString}' rule...`);\n\n      const proofSteps = context.getProofSteps(),\n            statementAndProofStepsUnified = rule.unifyStatementAndProofSteps(statement, proofSteps, context);\n\n      unifiedWithRule = statementAndProofStepsUnified;  ///\n\n      if (unifiedWithRule) {\n        context.debug(`...unified the '${statementString}' statement with the '${ruleString}' rule.`);\n      }\n    }\n  }\n\n  return unifiedWithRule;\n}\n\nfunction unifyAWithReference(statement, reference, substitutions, context) {\n  let unifiedWithReference = false;\n\n  if (reference !== null) {\n    const metavariableVerified = reference.verifyMetavariable(context);\n\n    if (metavariableVerified) {\n      const statementString = statement.getString(),\n            referenceString = reference.getString();\n\n      context.trace(`Unifying the '${statementString}' statement with the '${referenceString}' reference...`);\n\n      const metavariable = reference.getMetavariable(),\n            statementSubstitution = StatementSubstitution.fromStatementAndMetavariable(statement, metavariable, context),\n            substitution = statementSubstitution; ///\n\n      substitutions.addSubstitution(substitution, context);\n\n      unifiedWithReference = true;\n\n      if (unifiedWithReference) {\n        context.debug(`...unified the '${statementString}' statement with the '${referenceString}' reference.`);\n      }\n    }\n  }\n\n  return unifiedWithReference;\n}\n\nfunction unifyAWithAxiomLemmaTheoremOrConjecture(statement, reference, substitutions, context) {\n  let unifiedWithAxiomLemmaTheoremOrConjecture = false;\n\n  if (reference !== null) {\n    const axiomLemmaTheoremConjecture = context.findAxiomLemmaTheoremConjectureByReference(reference);\n\n    if (axiomLemmaTheoremConjecture !== null) {\n      const statementString = statement.getString(),\n            axiomLemmaTheoremConjectureString = reference.getString();\n\n      context.trace(`Unifying the '${statementString}' statement with the '${axiomLemmaTheoremConjectureString}' axiom, lemma, theorem or conjecture...`);\n\n      const proofSteps = context.getProofSteps(),\n            statementAndProofStepsUnified = axiomLemmaTheoremConjecture.unifyStatementAndProofSteps(statement, proofSteps, context);\n\n      if (statementAndProofStepsUnified) {\n        const metavariable = reference.getMetavariable(),\n              statementSubstitution = StatementSubstitution.fromStatementAndMetavariable(statement, metavariable, context),\n              substitution = statementSubstitution; ///\n\n        substitutions.addSubstitution(substitution, context);\n\n        unifiedWithAxiomLemmaTheoremOrConjecture = true;\n      }\n\n      if (unifiedWithAxiomLemmaTheoremOrConjecture) {\n        context.debug(`...unified the '${statementString}' statement with the '${axiomLemmaTheoremConjectureString}' axiom, lemma, theorem or conjecture.`);\n      }\n    }\n  }\n\n  return unifiedWithAxiomLemmaTheoremOrConjecture;\n}\n\nfunction unifyAsEquality(statement, reference, substitutions, context) {\n  let unifiedAsEquality = false;\n\n  if (reference === null) {\n    const equality = equalityFromStatement(statement, context);\n\n    if (equality !== null) {\n      const statementString = statement.getString();\n\n      context.trace(`Unifying the '${statementString}' statement as an equality...`);\n\n      unifiedAsEquality = true;\n\n      context.debug(`...unified the '${statementString}' statement as an equality.`);\n    }\n  }\n\n  return unifiedAsEquality;\n}\n\nfunction unifyAsTypeAssertion(statement, reference, substitutions, context) {\n  let unifiedAsTypeAssertion = false;\n\n  if (reference === null) {\n    const typeAssertion = typeAssertionFromStatement(statement, context);\n\n    if (typeAssertion !== null) {\n      const statementString = statement.getString();\n\n      context.trace(`Unifying the '${statementString}' statement as a type assertion...`);\n\n      unifiedAsTypeAssertion = true;\n\n      context.debug(`...unified the '${statementString}' statement as a type assertion.`);\n    }\n  }\n\n  return unifiedAsTypeAssertion;\n}\n\nfunction unifyWithProofSteps(statement, reference, substitutions, context) {\n  let unifiedWithProofSteps = false;\n\n  if (reference === null) {\n    const proofSteps = context.getProofSteps(),\n          statementUnifiedWithProofSteps = statement.unifyWithProofSteps(proofSteps, context);\n\n    unifiedWithProofSteps = statementUnifiedWithProofSteps; ///\n  }\n\n  return unifiedWithProofSteps;\n}\n\nconst unifyMixins = [\n  unifyAWithRule,\n  unifyAWithReference,\n  unifyAWithAxiomLemmaTheoremOrConjecture,\n  unifyAsEquality,\n  unifyAsTypeAssertion,\n  unifyWithProofSteps\n];\n\nexport default unifyMixins;\n\n"],"names":["unifyAWithRule","statement","reference","substitutions","context","unifiedWithRule","rule","findRuleByReference","ruleString","getString","statementString","trace","proofSteps","getProofSteps","statementAndProofStepsUnified","unifyStatementAndProofSteps","debug","unifyAWithReference","unifiedWithReference","metavariableVerified","verifyMetavariable","referenceString","metavariable","getMetavariable","statementSubstitution","StatementSubstitution","fromStatementAndMetavariable","substitution","addSubstitution","unifyAWithAxiomLemmaTheoremOrConjecture","unifiedWithAxiomLemmaTheoremOrConjecture","axiomLemmaTheoremConjecture","findAxiomLemmaTheoremConjectureByReference","axiomLemmaTheoremConjectureString","unifyAsEquality","unifiedAsEquality","equality","equalityFromStatement","unifyAsTypeAssertion","unifiedAsTypeAssertion","typeAssertion","typeAssertionFromStatement","unifyWithProofSteps","unifiedWithProofSteps","statementUnifiedWithProofSteps","unifyMixins"],"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.1119",
4
+ "version": "0.0.1120",
5
5
  "license": "MIT, Anti-996",
6
6
  "homepage": "https://github.com/djalbat/occam-verify-cli",
7
7
  "description": "Occam's Verifier",
package/src/mixins/proofStep/unify.js CHANGED
@@ -2,27 +2,7 @@
2
2
 
3
3
  import StatementSubstitution from "../../substitution/statement";
4
4
 
5
- import { equalityFromStatement } from "../../utilities/verification";
6
-
7
- function unifyAsEquality(statement, reference, substitutions, context) {
8
- let unifiedAsEquality = false;
9
-
10
- if (reference === null) {
11
- const equality = equalityFromStatement(statement, context);
12
-
13
- if (equality !== null) {
14
- const statementString = statement.getString();
15
-
16
- context.trace(`Unifying the '${statementString}' statement as an equality...`);
17
-
18
- unifiedAsEquality = true;
19
-
20
- context.debug(`...unified the '${statementString}' statement as an equality.`);
21
- }
22
- }
23
-
24
- return unifiedAsEquality;
25
- }
5
+ import { equalityFromStatement, typeAssertionFromStatement } from "../../utilities/verification";
26
6
 
27
7
  function unifyAWithRule(statement, reference, substitutions, context) {
28
8
  let unifiedWithRule = false;
@@ -113,6 +93,46 @@ function unifyAWithAxiomLemmaTheoremOrConjecture(statement, reference, substitut
113
93
  return unifiedWithAxiomLemmaTheoremOrConjecture;
114
94
  }
115
95
 
96
+ function unifyAsEquality(statement, reference, substitutions, context) {
97
+ let unifiedAsEquality = false;
98
+
99
+ if (reference === null) {
100
+ const equality = equalityFromStatement(statement, context);
101
+
102
+ if (equality !== null) {
103
+ const statementString = statement.getString();
104
+
105
+ context.trace(`Unifying the '${statementString}' statement as an equality...`);
106
+
107
+ unifiedAsEquality = true;
108
+
109
+ context.debug(`...unified the '${statementString}' statement as an equality.`);
110
+ }
111
+ }
112
+
113
+ return unifiedAsEquality;
114
+ }
115
+
116
+ function unifyAsTypeAssertion(statement, reference, substitutions, context) {
117
+ let unifiedAsTypeAssertion = false;
118
+
119
+ if (reference === null) {
120
+ const typeAssertion = typeAssertionFromStatement(statement, context);
121
+
122
+ if (typeAssertion !== null) {
123
+ const statementString = statement.getString();
124
+
125
+ context.trace(`Unifying the '${statementString}' statement as a type assertion...`);
126
+
127
+ unifiedAsTypeAssertion = true;
128
+
129
+ context.debug(`...unified the '${statementString}' statement as a type assertion.`);
130
+ }
131
+ }
132
+
133
+ return unifiedAsTypeAssertion;
134
+ }
135
+
116
136
  function unifyWithProofSteps(statement, reference, substitutions, context) {
117
137
  let unifiedWithProofSteps = false;
118
138
 
@@ -127,10 +147,11 @@ function unifyWithProofSteps(statement, reference, substitutions, context) {
127
147
  }
128
148
 
129
149
  const unifyMixins = [
130
- unifyAsEquality,
131
150
  unifyAWithRule,
132
151
  unifyAWithReference,
133
152
  unifyAWithAxiomLemmaTheoremOrConjecture,
153
+ unifyAsEquality,
154
+ unifyAsTypeAssertion,
134
155
  unifyWithProofSteps
135
156
  ];
136
157