occam-verify-cli 1.0.633 → 1.0.635
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/nominal.js +9 -1
- package/lib/element/conclusion.js +156 -19
- package/lib/element/deduction.js +156 -19
- package/lib/element/hypothesis.js +158 -21
- package/lib/element/section.js +31 -18
- package/lib/element/subDerivation.js +170 -15
- package/lib/element/subproof.js +194 -18
- package/package.json +4 -4
- package/src/context/nominal.js +8 -0
- package/src/element/conclusion.js +3 -1
- package/src/element/deduction.js +3 -1
- package/src/element/hypothesis.js +3 -1
- package/src/element/section.js +1 -1
- package/src/element/subDerivation.js +8 -7
- package/src/element/subproof.js +9 -7
package/lib/element/subproof.js
CHANGED
|
@@ -9,8 +9,8 @@ Object.defineProperty(exports, "default", {
|
|
|
9
9
|
}
|
|
10
10
|
});
|
|
11
11
|
var _occamlanguages = require("occam-languages");
|
|
12
|
-
var _context = require("../utilities/context");
|
|
13
12
|
var _elements = require("../elements");
|
|
13
|
+
var _context = require("../utilities/context");
|
|
14
14
|
function _array_like_to_array(arr, len) {
|
|
15
15
|
if (len == null || len > arr.length) len = arr.length;
|
|
16
16
|
for(var i = 0, arr2 = new Array(len); i < len; i++)arr2[i] = arr[i];
|
|
@@ -25,6 +25,35 @@ function _assert_this_initialized(self) {
|
|
|
25
25
|
}
|
|
26
26
|
return self;
|
|
27
27
|
}
|
|
28
|
+
function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
|
|
29
|
+
try {
|
|
30
|
+
var info = gen[key](arg);
|
|
31
|
+
var value = info.value;
|
|
32
|
+
} catch (error) {
|
|
33
|
+
reject(error);
|
|
34
|
+
return;
|
|
35
|
+
}
|
|
36
|
+
if (info.done) {
|
|
37
|
+
resolve(value);
|
|
38
|
+
} else {
|
|
39
|
+
Promise.resolve(value).then(_next, _throw);
|
|
40
|
+
}
|
|
41
|
+
}
|
|
42
|
+
function _async_to_generator(fn) {
|
|
43
|
+
return function() {
|
|
44
|
+
var self = this, args = arguments;
|
|
45
|
+
return new Promise(function(resolve, reject) {
|
|
46
|
+
var gen = fn.apply(self, args);
|
|
47
|
+
function _next(value) {
|
|
48
|
+
asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value);
|
|
49
|
+
}
|
|
50
|
+
function _throw(err) {
|
|
51
|
+
asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err);
|
|
52
|
+
}
|
|
53
|
+
_next(undefined);
|
|
54
|
+
});
|
|
55
|
+
};
|
|
56
|
+
}
|
|
28
57
|
function _call_super(_this, derived, args) {
|
|
29
58
|
derived = _get_prototype_of(derived);
|
|
30
59
|
return _possible_constructor_return(_this, _is_native_reflect_construct() ? Reflect.construct(derived, args || [], _get_prototype_of(_this).constructor) : derived.apply(_this, args));
|
|
@@ -168,7 +197,99 @@ function _is_native_reflect_construct() {
|
|
|
168
197
|
return !!result;
|
|
169
198
|
})();
|
|
170
199
|
}
|
|
200
|
+
function _ts_generator(thisArg, body) {
|
|
201
|
+
var f, y, t, _ = {
|
|
202
|
+
label: 0,
|
|
203
|
+
sent: function() {
|
|
204
|
+
if (t[0] & 1) throw t[1];
|
|
205
|
+
return t[1];
|
|
206
|
+
},
|
|
207
|
+
trys: [],
|
|
208
|
+
ops: []
|
|
209
|
+
}, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
|
|
210
|
+
return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() {
|
|
211
|
+
return this;
|
|
212
|
+
}), g;
|
|
213
|
+
function verb(n) {
|
|
214
|
+
return function(v) {
|
|
215
|
+
return step([
|
|
216
|
+
n,
|
|
217
|
+
v
|
|
218
|
+
]);
|
|
219
|
+
};
|
|
220
|
+
}
|
|
221
|
+
function step(op) {
|
|
222
|
+
if (f) throw new TypeError("Generator is already executing.");
|
|
223
|
+
while(g && (g = 0, op[0] && (_ = 0)), _)try {
|
|
224
|
+
if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
|
|
225
|
+
if (y = 0, t) op = [
|
|
226
|
+
op[0] & 2,
|
|
227
|
+
t.value
|
|
228
|
+
];
|
|
229
|
+
switch(op[0]){
|
|
230
|
+
case 0:
|
|
231
|
+
case 1:
|
|
232
|
+
t = op;
|
|
233
|
+
break;
|
|
234
|
+
case 4:
|
|
235
|
+
_.label++;
|
|
236
|
+
return {
|
|
237
|
+
value: op[1],
|
|
238
|
+
done: false
|
|
239
|
+
};
|
|
240
|
+
case 5:
|
|
241
|
+
_.label++;
|
|
242
|
+
y = op[1];
|
|
243
|
+
op = [
|
|
244
|
+
0
|
|
245
|
+
];
|
|
246
|
+
continue;
|
|
247
|
+
case 7:
|
|
248
|
+
op = _.ops.pop();
|
|
249
|
+
_.trys.pop();
|
|
250
|
+
continue;
|
|
251
|
+
default:
|
|
252
|
+
if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) {
|
|
253
|
+
_ = 0;
|
|
254
|
+
continue;
|
|
255
|
+
}
|
|
256
|
+
if (op[0] === 3 && (!t || op[1] > t[0] && op[1] < t[3])) {
|
|
257
|
+
_.label = op[1];
|
|
258
|
+
break;
|
|
259
|
+
}
|
|
260
|
+
if (op[0] === 6 && _.label < t[1]) {
|
|
261
|
+
_.label = t[1];
|
|
262
|
+
t = op;
|
|
263
|
+
break;
|
|
264
|
+
}
|
|
265
|
+
if (t && _.label < t[2]) {
|
|
266
|
+
_.label = t[2];
|
|
267
|
+
_.ops.push(op);
|
|
268
|
+
break;
|
|
269
|
+
}
|
|
270
|
+
if (t[2]) _.ops.pop();
|
|
271
|
+
_.trys.pop();
|
|
272
|
+
continue;
|
|
273
|
+
}
|
|
274
|
+
op = body.call(thisArg, _);
|
|
275
|
+
} catch (e) {
|
|
276
|
+
op = [
|
|
277
|
+
6,
|
|
278
|
+
e
|
|
279
|
+
];
|
|
280
|
+
y = 0;
|
|
281
|
+
} finally{
|
|
282
|
+
f = t = 0;
|
|
283
|
+
}
|
|
284
|
+
if (op[0] & 5) throw op[1];
|
|
285
|
+
return {
|
|
286
|
+
value: op[0] ? op[1] : void 0,
|
|
287
|
+
done: true
|
|
288
|
+
};
|
|
289
|
+
}
|
|
290
|
+
}
|
|
171
291
|
var _Subproof;
|
|
292
|
+
var asyncEvery = _occamlanguages.asynchronousUtilities.asyncEvery;
|
|
172
293
|
var _default = (0, _elements.define)((_Subproof = /*#__PURE__*/ function(Element) {
|
|
173
294
|
_inherits(Subproof, Element);
|
|
174
295
|
function Subproof(context, string, node, suppositions, subDerivation) {
|
|
@@ -230,24 +351,79 @@ var _default = (0, _elements.define)((_Subproof = /*#__PURE__*/ function(Element
|
|
|
230
351
|
},
|
|
231
352
|
{
|
|
232
353
|
key: "verify",
|
|
233
|
-
value: function verify(
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
|
|
240
|
-
|
|
354
|
+
value: function verify(assignments, context) {
|
|
355
|
+
return _async_to_generator(function() {
|
|
356
|
+
var _this, verifies;
|
|
357
|
+
return _ts_generator(this, function(_state) {
|
|
358
|
+
switch(_state.label){
|
|
359
|
+
case 0:
|
|
360
|
+
_this = this;
|
|
361
|
+
verifies = false;
|
|
362
|
+
return [
|
|
363
|
+
4,
|
|
364
|
+
(0, _context.asyncScope)(function() {
|
|
365
|
+
return _async_to_generator(function() {
|
|
366
|
+
var suppositionsVerify, subDerivationVerifies;
|
|
367
|
+
return _ts_generator(this, function(_state) {
|
|
368
|
+
switch(_state.label){
|
|
369
|
+
case 0:
|
|
370
|
+
suppositionsVerify = asyncEvery(this.suppositions, function(supposition) {
|
|
371
|
+
return _async_to_generator(function() {
|
|
372
|
+
var suppositionVerifies;
|
|
373
|
+
return _ts_generator(this, function(_state) {
|
|
374
|
+
switch(_state.label){
|
|
375
|
+
case 0:
|
|
376
|
+
return [
|
|
377
|
+
4,
|
|
378
|
+
supposition.verify(assignments, context)
|
|
379
|
+
];
|
|
380
|
+
case 1:
|
|
381
|
+
suppositionVerifies = _state.sent();
|
|
382
|
+
if (suppositionVerifies) {
|
|
383
|
+
return [
|
|
384
|
+
2,
|
|
385
|
+
true
|
|
386
|
+
];
|
|
387
|
+
}
|
|
388
|
+
return [
|
|
389
|
+
2
|
|
390
|
+
];
|
|
391
|
+
}
|
|
392
|
+
});
|
|
393
|
+
})();
|
|
394
|
+
});
|
|
395
|
+
if (!suppositionsVerify) return [
|
|
396
|
+
3,
|
|
397
|
+
2
|
|
398
|
+
];
|
|
399
|
+
return [
|
|
400
|
+
4,
|
|
401
|
+
this.subDerivation.verify(context)
|
|
402
|
+
];
|
|
403
|
+
case 1:
|
|
404
|
+
subDerivationVerifies = _state.sent();
|
|
405
|
+
if (subDerivationVerifies) {
|
|
406
|
+
verifies = true;
|
|
407
|
+
}
|
|
408
|
+
_state.label = 2;
|
|
409
|
+
case 2:
|
|
410
|
+
return [
|
|
411
|
+
2
|
|
412
|
+
];
|
|
413
|
+
}
|
|
414
|
+
});
|
|
415
|
+
}).call(_this);
|
|
416
|
+
}, context)
|
|
417
|
+
];
|
|
418
|
+
case 1:
|
|
419
|
+
_state.sent();
|
|
420
|
+
return [
|
|
421
|
+
2,
|
|
422
|
+
verifies
|
|
423
|
+
];
|
|
241
424
|
}
|
|
242
425
|
});
|
|
243
|
-
|
|
244
|
-
var subDerivationVerifies = _this.subDerivation.verify(substitutions, context);
|
|
245
|
-
if (subDerivationVerifies) {
|
|
246
|
-
verifies = true;
|
|
247
|
-
}
|
|
248
|
-
}
|
|
249
|
-
}, context);
|
|
250
|
-
return verifies;
|
|
426
|
+
}).call(this);
|
|
251
427
|
}
|
|
252
428
|
},
|
|
253
429
|
{
|
|
@@ -286,4 +462,4 @@ var _default = (0, _elements.define)((_Subproof = /*#__PURE__*/ function(Element
|
|
|
286
462
|
return Subproof;
|
|
287
463
|
}(_wrap_native_super(_occamlanguages.Element)), _define_property(_Subproof, "name", "Subproof"), _Subproof));
|
|
288
464
|
|
|
289
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
465
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/element/subproof.js"],"sourcesContent":["\"use strict\";\n\nimport { Element, asynchronousUtilities } from \"occam-languages\";\n\nimport { define } from \"../elements\";\nimport { asyncScope } from \"../utilities/context\";\n\nconst { asyncEvery } = asynchronousUtilities;\n\nexport default define(class Subproof extends Element {\n  constructor(context, string, node, suppositions, subDerivation) {\n    super(context, string, node);\n\n    this.suppositions = suppositions;\n    this.subDerivation = subDerivation;\n  }\n\n  getSuppositions() {\n    return this.suppositions;\n  }\n\n  getSubDerivation() {\n    return this.subDerivation;\n  }\n\n  getSubproofNode() {\n    const node = this.getNode(),\n          subproofNode = node;  ///\n\n    return subproofNode;\n  }\n\n  getLastProofAssertion() { return this.subDerivation.getLastProofAssertion(); }\n\n  getStatements() {\n    const lastProofAssertion = this.getLastProofAssertion(),\n          suppositionStatements = this.suppositions.map((supposition) => {\n            const suppositionStatement = supposition.getStatement();\n\n            return suppositionStatement;\n          }),\n          lastProofAssertionStatement = lastProofAssertion.getStatement(),\n          statements = [\n            ...suppositionStatements,\n            lastProofAssertionStatement\n          ];\n\n    return statements;\n  }\n\n  isProofAssertion() {\n    const proofAssertion = false;\n\n    return proofAssertion;\n  }\n\n  async verify(assignments, context) {\n    let verifies = false;\n\n    await asyncScope(async () => {\n      const suppositionsVerify = asyncEvery(this.suppositions, async (supposition) => {\n        const suppositionVerifies = await supposition.verify(assignments, context);\n\n        if (suppositionVerifies) {\n          return true;\n        }\n      });\n\n      if (suppositionsVerify) {\n        const subDerivationVerifies = await this.subDerivation.verify(context);\n\n        if (subDerivationVerifies) {\n          verifies = true;\n        }\n      }\n    }, context);\n\n    return verifies;\n  }\n\n  compareStatement(statement, context) {\n    const statementUnifies = false;\n\n    return statementUnifies;\n  }\n\n  unifyWithSatisfiesAssertion(satisfiesAssertion, context) {\n    let unifiesWithSatisfiesAssertion = false;\n\n    const subproofString = this.getString(), ///\n          satisfiesAssertionString = satisfiesAssertion.getString();\n\n    context.trace(`Unifying the '${subproofString}' subproof with the '${satisfiesAssertionString}' satisfies assertion...`)\n\n    const reference = satisfiesAssertion.getReference(),\n          axiom = context.findAxiomByReference(reference);\n\n    if (axiom !== null) {\n      const axiomSatisfiable = axiom.isSatisfiable();\n\n      if (axiomSatisfiable) {\n        const subproof = this,  ///\n              substitutions = [],\n              statementUnifies = axiom.unifySubproof(subproof, substitutions, context);\n\n        if (statementUnifies) {\n          const substitutionsCompare = satisfiesAssertion.compareSubstitutions(substitutions, context);\n\n          if (substitutionsCompare) {\n            unifiesWithSatisfiesAssertion = true;\n          }\n        }\n      }\n    }\n\n    if (unifiesWithSatisfiesAssertion) {\n      context.debug(`...unified the '${subproofString}' subproof with the '${satisfiesAssertionString}' satisfies assertion.`)\n    }\n\n    return unifiesWithSatisfiesAssertion;\n  }\n\n  static name = \"Subproof\";\n});\n"],"names":["asyncEvery","asynchronousUtilities","define","Subproof","context","string","node","suppositions","subDerivation","getSuppositions","getSubDerivation","getSubproofNode","getNode","subproofNode","getLastProofAssertion","getStatements","lastProofAssertion","suppositionStatements","map","supposition","suppositionStatement","getStatement","lastProofAssertionStatement","statements","isProofAssertion","proofAssertion","verify","assignments","verifies","asyncScope","suppositionsVerify","subDerivationVerifies","suppositionVerifies","compareStatement","statement","statementUnifies","unifyWithSatisfiesAssertion","satisfiesAssertion","unifiesWithSatisfiesAssertion","subproofString","getString","satisfiesAssertionString","trace","reference","getReference","axiom","findAxiomByReference","axiomSatisfiable","isSatisfiable","subproof","substitutions","unifySubproof","substitutionsCompare","compareSubstitutions","debug","Element","name"],"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": "1.0.
|
|
4
|
+
"version": "1.0.635",
|
|
5
5
|
"license": "MIT, Anti-996",
|
|
6
6
|
"homepage": "https://github.com/djalbat/occam-verify-cli",
|
|
7
7
|
"description": "Occam's Verifier",
|
|
@@ -13,12 +13,12 @@
|
|
|
13
13
|
"argumentative": "^2.0.36",
|
|
14
14
|
"necessary": "^17.0.9",
|
|
15
15
|
"occam-file-system": "^6.0.505",
|
|
16
|
-
"occam-furtle": "^3.0.
|
|
16
|
+
"occam-furtle": "^3.0.116",
|
|
17
17
|
"occam-grammars": "^1.3.510",
|
|
18
|
-
"occam-languages": "^0.0.
|
|
18
|
+
"occam-languages": "^0.0.88",
|
|
19
19
|
"occam-lexers": "^23.1.34",
|
|
20
20
|
"occam-model": "^1.0.494",
|
|
21
|
-
"occam-nominal": "^1.0.
|
|
21
|
+
"occam-nominal": "^1.0.42",
|
|
22
22
|
"occam-parsers": "^23.1.37"
|
|
23
23
|
},
|
|
24
24
|
"devDependencies": {
|
package/src/context/nominal.js
CHANGED
|
@@ -6,6 +6,8 @@ import { lexersUtilities, parsersUtilities } from "occam-nominal";
|
|
|
6
6
|
import NominalLexer from "../nominal/lexer";
|
|
7
7
|
import NominalParser from "../nominal/parser";
|
|
8
8
|
|
|
9
|
+
import { findMetaTypeByMetaTypeName } from "../metaTypes";
|
|
10
|
+
|
|
9
11
|
const { nominalLexerFromNothing } = lexersUtilities,
|
|
10
12
|
{ nominalParserFromNothing } = parsersUtilities;
|
|
11
13
|
|
|
@@ -28,6 +30,12 @@ class NominalContext extends Context {
|
|
|
28
30
|
return this.parser;
|
|
29
31
|
}
|
|
30
32
|
|
|
33
|
+
findMetaTypeByMetaTypeName(metaTypeName) {
|
|
34
|
+
const metaType = findMetaTypeByMetaTypeName(metaTypeName);
|
|
35
|
+
|
|
36
|
+
return metaType;
|
|
37
|
+
}
|
|
38
|
+
|
|
31
39
|
static fromNothing() {
|
|
32
40
|
const context = null,
|
|
33
41
|
lexer = nominalLexer, ///
|
|
@@ -24,9 +24,11 @@ export default define(class Conclusion extends Element {
|
|
|
24
24
|
return conclusionNode;
|
|
25
25
|
}
|
|
26
26
|
|
|
27
|
-
verify(context) {
|
|
27
|
+
async verify(context) {
|
|
28
28
|
let verifies = false;
|
|
29
29
|
|
|
30
|
+
await this.break(context);
|
|
31
|
+
|
|
30
32
|
const conclusionString = this.getString(); ///
|
|
31
33
|
|
|
32
34
|
context.trace(`Verifying the '${conclusionString}' conclusion...`);
|
package/src/element/deduction.js
CHANGED
|
@@ -24,9 +24,11 @@ export default define(class Deduction extends Element {
|
|
|
24
24
|
return deductionNode;
|
|
25
25
|
}
|
|
26
26
|
|
|
27
|
-
verify(context) {
|
|
27
|
+
async verify(context) {
|
|
28
28
|
let verifies = false;
|
|
29
29
|
|
|
30
|
+
await this.break(context);
|
|
31
|
+
|
|
30
32
|
const deductionString = this.getString(); ///
|
|
31
33
|
|
|
32
34
|
context.trace(`Verifying the '${deductionString}' deduction...`);
|
|
@@ -25,9 +25,11 @@ export default define(class Hypothesis extends Element {
|
|
|
25
25
|
return hypothesisNode;
|
|
26
26
|
}
|
|
27
27
|
|
|
28
|
-
verify(context) {
|
|
28
|
+
async verify(context) {
|
|
29
29
|
let verifies = false;
|
|
30
30
|
|
|
31
|
+
await this.break(context);
|
|
32
|
+
|
|
31
33
|
const hypothesisString = this.getString(); ///
|
|
32
34
|
|
|
33
35
|
context.trace(`Verifying the '${hypothesisString}' hypothesis...`);
|
package/src/element/section.js
CHANGED
|
@@ -66,7 +66,7 @@ export default define(class Section extends Element {
|
|
|
66
66
|
|
|
67
67
|
if (hypothesesVerify) {
|
|
68
68
|
const topLevelAssertion = (this.axiom || this.lemma || this.theorem || this.conjecture),
|
|
69
|
-
topLevelAssertionVerifies = topLevelAssertion.verify(context);
|
|
69
|
+
topLevelAssertionVerifies = await topLevelAssertion.verify(context);
|
|
70
70
|
|
|
71
71
|
if (topLevelAssertionVerifies) {
|
|
72
72
|
topLevelAssertion.setHypotheses(this.hypotheses);
|
|
@@ -1,13 +1,14 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
import { Element } from "occam-languages";
|
|
4
3
|
import { arrayUtilities } from "necessary";
|
|
5
|
-
|
|
6
|
-
import assignAssignments from "../process/assign";
|
|
4
|
+
import { Element, asynchronousUtilities } from "occam-languages";
|
|
7
5
|
|
|
8
6
|
import { define } from "../elements";
|
|
9
7
|
|
|
10
|
-
|
|
8
|
+
import assignAssignments from "../process/assign";
|
|
9
|
+
|
|
10
|
+
const { last } = arrayUtilities,
|
|
11
|
+
{ asyncEvery } = asynchronousUtilities;
|
|
11
12
|
|
|
12
13
|
export default define(class SubDerivation extends Element {
|
|
13
14
|
constructor(context, string, node, subproofOrProofAssertions) {
|
|
@@ -34,12 +35,12 @@ export default define(class SubDerivation extends Element {
|
|
|
34
35
|
return lastProofAssertion;
|
|
35
36
|
}
|
|
36
37
|
|
|
37
|
-
verify(
|
|
38
|
+
async verify(context) {
|
|
38
39
|
let verifies;
|
|
39
40
|
|
|
40
|
-
verifies = this.subproofOrProofAssertions
|
|
41
|
+
verifies = await asyncEvery(this.subproofOrProofAssertions, async (subproofOrProofAssertion) => { ///
|
|
41
42
|
const assignments = [],
|
|
42
|
-
subproofOrProofAssertionVarifies = subproofOrProofAssertion.verify(
|
|
43
|
+
subproofOrProofAssertionVarifies = await subproofOrProofAssertion.verify(assignments, context);
|
|
43
44
|
|
|
44
45
|
if (subproofOrProofAssertionVarifies) {
|
|
45
46
|
assignAssignments(assignments, context);
|
package/src/element/subproof.js
CHANGED
|
@@ -1,9 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
import { Element } from "occam-languages";
|
|
3
|
+
import { Element, asynchronousUtilities } from "occam-languages";
|
|
4
4
|
|
|
5
|
-
import { scope } from "../utilities/context";
|
|
6
5
|
import { define } from "../elements";
|
|
6
|
+
import { asyncScope } from "../utilities/context";
|
|
7
|
+
|
|
8
|
+
const { asyncEvery } = asynchronousUtilities;
|
|
7
9
|
|
|
8
10
|
export default define(class Subproof extends Element {
|
|
9
11
|
constructor(context, string, node, suppositions, subDerivation) {
|
|
@@ -52,12 +54,12 @@ export default define(class Subproof extends Element {
|
|
|
52
54
|
return proofAssertion;
|
|
53
55
|
}
|
|
54
56
|
|
|
55
|
-
verify(
|
|
57
|
+
async verify(assignments, context) {
|
|
56
58
|
let verifies = false;
|
|
57
59
|
|
|
58
|
-
|
|
59
|
-
const suppositionsVerify = this.suppositions
|
|
60
|
-
const suppositionVerifies = supposition.verify(context);
|
|
60
|
+
await asyncScope(async () => {
|
|
61
|
+
const suppositionsVerify = asyncEvery(this.suppositions, async (supposition) => {
|
|
62
|
+
const suppositionVerifies = await supposition.verify(assignments, context);
|
|
61
63
|
|
|
62
64
|
if (suppositionVerifies) {
|
|
63
65
|
return true;
|
|
@@ -65,7 +67,7 @@ export default define(class Subproof extends Element {
|
|
|
65
67
|
});
|
|
66
68
|
|
|
67
69
|
if (suppositionsVerify) {
|
|
68
|
-
const subDerivationVerifies = this.subDerivation.verify(
|
|
70
|
+
const subDerivationVerifies = await this.subDerivation.verify(context);
|
|
69
71
|
|
|
70
72
|
if (subDerivationVerifies) {
|
|
71
73
|
verifies = true;
|