occam-verify-cli 0.0.1237 → 0.0.1239

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 (15) hide show
  1. package/lib/dom/metavariable.js +2 -2
  2. package/lib/dom/premise.js +13 -9
  3. package/lib/dom/procedureCall.js +9 -4
  4. package/lib/dom/rule.js +2 -2
  5. package/lib/dom/statement.js +13 -13
  6. package/lib/dom/supposition.js +14 -10
  7. package/lib/dom/topLevelAssertion.js +2 -2
  8. package/package.json +3 -3
  9. package/src/dom/metavariable.js +1 -1
  10. package/src/dom/premise.js +17 -13
  11. package/src/dom/procedureCall.js +9 -3
  12. package/src/dom/rule.js +2 -1
  13. package/src/dom/statement.js +3 -4
  14. package/src/dom/supposition.js +15 -11
  15. package/src/dom/topLevelAssertion.js +2 -1
package/src/dom/statement.js CHANGED
@@ -107,18 +107,17 @@ export default domAssigned(class Statement {
107
107
  return statementUnified;
108
108
  }
109
109
 
110
- unifyIndependently(substitutions, generalContext, specificContext) {
110
+ unifyIndependently(substitutions, context) {
111
111
  let unifiedIndependently = false;
112
112
 
113
- const context = specificContext, ///
114
- statement = this; ///
113
+ const statement = this; ///
115
114
 
116
115
  const definedAssertion = definedAssertionFromStatement(statement, context);
117
116
 
118
117
  if (definedAssertion !== null) {
119
118
  const statementString = this.string;
120
119
 
121
- specificContext.trace(`Unifying the '${statementString}' statement independently...`);
120
+ context.trace(`Unifying the '${statementString}' statement independently...`);
122
121
 
123
122
  const definedAssertionUnifiedIndependently = definedAssertion.unifyIndependently(substitutions, context);
124
123
 
package/src/dom/supposition.js CHANGED
@@ -26,17 +26,17 @@ export default domAssigned(class Supposition {
26
26
  return this.procedureCall;
27
27
  }
28
28
 
29
- unifyIndependently(substitutions, generalContext, specificContext) {
29
+ unifyIndependently(substitutions, context) {
30
30
  let unifiedIndependently;
31
31
 
32
- if (this.statesment !== null) {
33
- const statementResolvedIndependently = this.statement.unifyIndependently(substitutions, generalContext, specificContext);
32
+ if (this.statement !== null) {
33
+ const statementResolvedIndependently = this.statement.unifyIndependently(substitutions, context);
34
34
 
35
35
  unifiedIndependently = statementResolvedIndependently; ///
36
36
  }
37
37
 
38
38
  if (this.procedureCall !== null) {
39
- const procedureCallResolvedIndependently = this.procedureCall.unifyIndependently(substitutions, generalContext, specificContext);
39
+ const procedureCallResolvedIndependently = this.procedureCall.unifyIndependently(substitutions, context);
40
40
 
41
41
  unifiedIndependently = procedureCallResolvedIndependently; ///
42
42
  }
@@ -103,11 +103,13 @@ export default domAssigned(class Supposition {
103
103
 
104
104
  specificContext.trace(`Unifying the '${subproofString}' subproof with the supposition's '${suppositionStatementString}' statement...`);
105
105
 
106
- const context = generalContext,
107
- subproofAssertion = subproofAssertionFromStatement(this.statement, context);
106
+ if (this.statement !== null) {
107
+ const context = generalContext, ///
108
+ subproofAssertion = subproofAssertionFromStatement(this.statement, context);
108
109
 
109
- if (subproofAssertion !== null) {
110
- subproofUnified = subproofAssertion.unifySubproof(subproof, substitutions, generalContext, specificContext);
110
+ if (subproofAssertion !== null) {
111
+ subproofUnified = subproofAssertion.unifySubproof(subproof, substitutions, generalContext, specificContext);
112
+ }
111
113
  }
112
114
 
113
115
  if (subproofUnified) {
@@ -121,12 +123,14 @@ export default domAssigned(class Supposition {
121
123
  let statementUnified;
122
124
 
123
125
  const supposition = this, ///
124
- suppositionString = supposition.getString(),
125
- statementString = statement.getString();
126
+ statementString = statement.getString(),
127
+ suppositionString = supposition.getString();
126
128
 
127
129
  specificContext.trace(`Unifying the '${statementString}' statement with the '${suppositionString}' supposition...`);
128
130
 
129
- statementUnified = this.statement.unifyStatement(statement, substitutions, generalContext, specificContext);
131
+ if (this.statement) {
132
+ statementUnified = this.statement.unifyStatement(statement, substitutions, generalContext, specificContext);
133
+ }
130
134
 
131
135
  if (statementUnified) {
132
136
  specificContext.debug(`...unified the '${statementString}' statement with the '${suppositionString}' supposition.`);
package/src/dom/topLevelAssertion.js CHANGED
@@ -189,7 +189,8 @@ export default class TopLevelAssertion {
189
189
  unifyProofStepSubproofsWithSupposition(proofStepSubproofs, supposition, substitutions, generalContext, specificContext) {
190
190
  let proofStepSubproofsUnifiedWithSupposition =false;
191
191
 
192
- const suppositionUnifiedIndependently = supposition.unifyIndependently(substitutions, generalContext, specificContext);
192
+ const context = specificContext, ///
193
+ suppositionUnifiedIndependently = supposition.unifyIndependently(substitutions, context);
193
194
 
194
195
  if (suppositionUnifiedIndependently) {
195
196
  proofStepSubproofsUnifiedWithSupposition = true;