tla-ts 0.0.10-dev.28c823e4b → 0.0.10-dev.63a6693bd
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/dist/compile.cjs +6 -6
- package/dist/compile.js +10 -10
- package/dist/deciders.cjs +29 -29
- package/dist/deciders.js +40 -40
- package/dist/index.cjs +1 -1
- package/dist/index.js +1 -1
- package/dist/parallel-worker.cjs +1 -1
- package/dist/parallel-worker.js +1 -1
- package/dist/prove-worker.cjs +1 -1
- package/dist/prove-worker.js +1 -1
- package/dist/prove.cjs +54 -54
- package/dist/prove.js +52 -52
- package/dist/run.cjs +42 -42
- package/dist/run.js +44 -44
- package/dist/tlapm.cjs +2 -2
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +39 -39
- package/dist/transfer.js +41 -41
- package/dist/worker.cjs +4 -4
- package/dist/worker.js +4 -4
- package/package.json +1 -1
- package/src/ast.ts +44 -39
- package/src/builtins.ts +4 -13
- package/src/check-failure.ts +116 -0
- package/src/check-trace.ts +282 -0
- package/src/check.ts +152 -518
- package/src/cli/options.ts +6 -31
- package/src/cli/shared.ts +1 -1
- package/src/cli/tlapm.ts +14 -13
- package/src/cli/tlc-arguments.ts +222 -210
- package/src/cli/tlc-output.ts +687 -0
- package/src/cli/tlc-usage.ts +1 -1
- package/src/cli/tlc.ts +34 -701
- package/src/cli/xml-exporter.ts +23 -33
- package/src/codegen.ts +5 -10
- package/src/coverage.ts +3 -10
- package/src/dependencies.ts +8 -13
- package/src/dfid.ts +16 -16
- package/src/environment-config.ts +315 -0
- package/src/environment.ts +45 -333
- package/src/errors.ts +3 -2
- package/src/evaluate.ts +5 -4
- package/src/fingerprints.ts +65 -1
- package/src/instances.ts +47 -10
- package/src/java-hash.ts +7 -0
- package/src/json.ts +4 -7
- package/src/levels.ts +39 -42
- package/src/liveness-checker.ts +24 -37
- package/src/liveness.ts +47 -54
- package/src/obligations/action.ts +4 -11
- package/src/obligations/anonymize.ts +4 -2
- package/src/obligations/expression.ts +18 -2
- package/src/obligations/generate.ts +45 -38
- package/src/obligations/index.ts +2 -2
- package/src/obligations/module.ts +27 -38
- package/src/obligations/normalize.ts +2 -1
- package/src/obligations/simplify.ts +39 -44
- package/src/obligations/source.ts +47 -57
- package/src/obligations/temporal.ts +5 -5
- package/src/parallel-worker.ts +10 -30
- package/src/parallel.ts +22 -45
- package/src/parser.ts +19 -34
- package/src/prover/decide-pool.ts +3 -3
- package/src/prover/deciders.ts +3 -3
- package/src/prover/isabelle/encode.ts +1 -1
- package/src/prover/isabelle/isar/inner-syntax.ts +9 -4
- package/src/prover/isabelle/isar/method.ts +14 -25
- package/src/prover/isabelle/isar/theory.ts +11 -10
- package/src/prover/isabelle/isar/type-check.ts +6 -6
- package/src/prover/isabelle/provers/blast/blast.ts +7 -63
- package/src/prover/isabelle/provers/hypsubst.ts +17 -26
- package/src/prover/isabelle/pure/bicompose.ts +9 -25
- package/src/prover/isabelle/pure/conv.ts +2 -8
- package/src/prover/isabelle/pure/drule.ts +9 -2
- package/src/prover/isabelle/pure/logic.ts +1 -1
- package/src/prover/isabelle/pure/raw-simplifier.ts +4 -13
- package/src/prover/isabelle/pure/rewriter.ts +5 -9
- package/src/prover/isabelle/pure/table.ts +2 -1
- package/src/prover/isabelle/pure/tactical.ts +42 -35
- package/src/prover/isabelle/pure/thm.ts +14 -11
- package/src/prover/isabelle/tla/classical-setup.ts +17 -14
- package/src/prover/isabelle/tla/context.ts +7 -2
- package/src/prover/isabelle/tla/logic.ts +10 -21
- package/src/prover/isabelle/tla/simpdata.ts +1 -10
- package/src/prover/prep/action.ts +11 -19
- package/src/prover/prep/fingerprint.ts +2 -5
- package/src/prover/prep/methods.ts +24 -3
- package/src/prover/prove.ts +87 -64
- package/src/prover/smt/context.ts +1 -2
- package/src/prover/smt/data.ts +418 -406
- package/src/prover/smt/encode.ts +30 -18
- package/src/prover/smt/rewrite.ts +657 -626
- package/src/prover/smt/solver/ast.ts +0 -22
- package/src/prover/smt/solver/auf-solver.ts +2 -5
- package/src/prover/smt/solver/context.ts +3 -3
- package/src/prover/smt/solver/e-matching.ts +1 -1
- package/src/prover/smt/solver/expr-safe-replace.ts +1 -1
- package/src/prover/smt/solver/internalizer.ts +1 -2
- package/src/prover/smt/solver/lp/dioph-eq.ts +1 -8
- package/src/prover/smt/solver/lp/hnf-cutter.ts +1 -1
- package/src/prover/smt/solver/lp/nla-core.ts +2 -6
- package/src/prover/smt/solver/mam-compiler.ts +4 -2
- package/src/prover/smt/solver/model-checker.ts +1 -1
- package/src/prover/smt/solver/model-finder.ts +12 -17
- package/src/prover/smt/solver/model-macro-solver.ts +11 -19
- package/src/prover/smt/solver/nlsat/algebraic.ts +9 -9
- package/src/prover/smt/solver/nlsat/atoms.ts +20 -4
- package/src/prover/smt/solver/nlsat/explain.ts +7 -22
- package/src/prover/smt/solver/nlsat/levelwise.ts +1 -6
- package/src/prover/smt/solver/nlsat/polynomial.ts +12 -3
- package/src/prover/smt/solver/nlsat/solver.ts +12 -24
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +1 -1
- package/src/prover/smt/solver/proto-model.ts +0 -4
- package/src/prover/smt/solver/quantifier-analyzer.ts +10 -10
- package/src/prover/smt/solver/quantifier-manager.ts +1 -5
- package/src/prover/smt/solver/smtlib-parser.ts +78 -94
- package/src/prover/smt/solver/theory-lra-bounds.ts +1 -2
- package/src/prover/smt/solver/theory-lra-internalize.ts +5 -16
- package/src/prover/tlapm/cache.ts +28 -18
- package/src/prover/tlapm/tlapm.ts +15 -9
- package/src/prover/verdict.ts +7 -0
- package/src/prover/zenon/check/check.ts +1 -2
- package/src/prover/zenon/check/records.ts +1 -1
- package/src/prover/zenon/check/relations.ts +2 -1
- package/src/prover/zenon/check/rewrites.ts +2 -15
- package/src/prover/zenon/check/sets.ts +40 -58
- package/src/prover/zenon/check/terms.ts +1 -2
- package/src/prover/zenon/eqrel.ts +2 -0
- package/src/prover/zenon/expr.ts +7 -0
- package/src/prover/zenon/index-table.ts +9 -19
- package/src/prover/zenon/isar.ts +35 -35
- package/src/prover/zenon/llproof.ts +2 -11
- package/src/prover/zenon/mltoll.ts +12 -28
- package/src/prover/zenon/parse.ts +3 -6
- package/src/prover/zenon/search.ts +4 -14
- package/src/prover/zenon/tla/functions.ts +2 -2
- package/src/prover/zenon/tla/llproof.ts +9 -11
- package/src/prover/zenon/tla/records.ts +1 -6
- package/src/prover/zenon/tla/sets.ts +15 -14
- package/src/prover/zenon/tla/tla.ts +7 -6
- package/src/resolve.ts +55 -72
- package/src/sany/generation.ts +394 -0
- package/src/sany/generator-def-entries.ts +210 -0
- package/src/sany/generator-definitions.ts +686 -0
- package/src/sany/generator-expressions.ts +1100 -0
- package/src/sany/generator-proofs.ts +662 -0
- package/src/sany/generator.ts +155 -2625
- package/src/sany/lexer.ts +17 -16
- package/src/sany/nodes.ts +6 -13
- package/src/sany/report.ts +3 -6
- package/src/sany/selectors.ts +35 -38
- package/src/sany/xml.ts +23 -55
- package/src/search.ts +65 -27
- package/src/simulate.ts +157 -133
- package/src/spec-description.ts +33 -48
- package/src/standard-modules.ts +16 -32
- package/src/state-graph.ts +2 -7
- package/src/substitution-levels.ts +5 -4
- package/src/successors.ts +5 -7
- package/src/tlc/messages.ts +20 -15
- package/src/tlc/order.ts +2 -9
- package/src/tlc/random.ts +4 -4
- package/src/tlc/replay.ts +8 -15
- package/src/tlc/tlc-operators.ts +2 -3
- package/src/tlc/trace-spec.ts +25 -45
- package/src/typescript/actions.ts +2 -4
- package/src/typescript/collections.ts +34 -20
- package/src/typescript/compile.ts +1 -3
- package/src/typescript/formula.ts +5 -3
- package/src/typescript/model.ts +4 -5
- package/src/typescript/steps.ts +20 -18
- package/src/values.ts +63 -158
package/src/prover/prove.ts
CHANGED
|
@@ -15,14 +15,14 @@ import {
|
|
|
15
15
|
normalizeExpand,
|
|
16
16
|
normalizeSequent,
|
|
17
17
|
} from "./prep/normalize";
|
|
18
|
-
import { findMethods, type Method } from "./prep/methods";
|
|
18
|
+
import { findMethods, getBudget, type Method } from "./prep/methods";
|
|
19
19
|
import { encodePtl } from "./ptl/encode";
|
|
20
20
|
import { encodeSmt } from "./smt/encode";
|
|
21
21
|
import type { EncodingSession } from "./smt/rewrite";
|
|
22
22
|
import { encodeZenon } from "./zenon/encode";
|
|
23
23
|
import type { TlapmResult } from "./tlapm/tlapm";
|
|
24
24
|
import { TLAPS_MODULE } from "./tlaps-module";
|
|
25
|
-
import type
|
|
25
|
+
import { isBackend, type Backend, type Verdict } from "./verdict";
|
|
26
26
|
|
|
27
27
|
interface ObligationBase {
|
|
28
28
|
id: number;
|
|
@@ -63,14 +63,11 @@ export interface ProveOptions {
|
|
|
63
63
|
workers?: number;
|
|
64
64
|
}
|
|
65
65
|
|
|
66
|
-
export
|
|
67
|
-
method: Method;
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
reason?: string;
|
|
71
|
-
verdict?: Verdict;
|
|
72
|
-
timeUsedMs?: number;
|
|
73
|
-
}
|
|
66
|
+
export type ProofAttempt =
|
|
67
|
+
| { kind: "decided"; method: Method; verdict: Verdict; timeUsedMs: number }
|
|
68
|
+
| { kind: "error"; method: Method }
|
|
69
|
+
| { kind: "skipped"; method: Method; reason: string }
|
|
70
|
+
| { kind: "stored" | "reused"; method: Method; isProved: boolean; reason?: string };
|
|
74
71
|
|
|
75
72
|
interface ProofReport {
|
|
76
73
|
obligation: ProofObligation;
|
|
@@ -83,7 +80,9 @@ interface MethodFailure {
|
|
|
83
80
|
}
|
|
84
81
|
|
|
85
82
|
interface ObligationTask {
|
|
83
|
+
report: Promise<ProofReport>;
|
|
86
84
|
done: Promise<void>;
|
|
85
|
+
isSettled: boolean;
|
|
87
86
|
session: { initial: number; current: EncodingSession } | undefined;
|
|
88
87
|
}
|
|
89
88
|
|
|
@@ -92,25 +91,33 @@ interface ProveRun {
|
|
|
92
91
|
results: Map<string, Map<string, ProofAttempt>>;
|
|
93
92
|
isFingerprinted: (obligation: PrintedObligation) => boolean;
|
|
94
93
|
isProving: boolean;
|
|
95
|
-
lastByFingerprint: Map<string,
|
|
94
|
+
lastByFingerprint: Map<string, number>;
|
|
96
95
|
decide: DecidePool["decide"];
|
|
97
96
|
}
|
|
98
97
|
|
|
99
|
-
|
|
98
|
+
interface Encoder {
|
|
99
|
+
encode: (id: number, sequent: Sequent, method: Method, session: EncodingSession) => string;
|
|
100
|
+
isCaseNumbered?: boolean;
|
|
101
|
+
}
|
|
100
102
|
|
|
101
103
|
const shipFirstOrder = (sequent: Sequent) => flatten(processObligation(sequent));
|
|
102
104
|
|
|
103
|
-
const
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
105
|
+
const SMT_ENCODER: Encoder = {
|
|
106
|
+
encode: (_id, sequent, method, session) =>
|
|
107
|
+
(method.rlimit === undefined ? "" : `(set-option :rlimit ${method.rlimit})\n`) +
|
|
108
|
+
encodeSmt(shipFirstOrder(sequent), session),
|
|
109
|
+
isCaseNumbered: true,
|
|
110
|
+
};
|
|
111
|
+
|
|
112
|
+
const ENCODERS: Record<Backend, Encoder> = {
|
|
113
|
+
smt: SMT_ENCODER,
|
|
114
|
+
z3: SMT_ENCODER,
|
|
115
|
+
zenon: { encode: (id, sequent) => encodeZenon(id, shipFirstOrder(sequent)) },
|
|
116
|
+
isabelle: {
|
|
117
|
+
encode: (id, sequent, method) =>
|
|
118
|
+
encodeIsabelle(id, shipFirstOrder(sequent), method.tactic ?? "auto"),
|
|
119
|
+
},
|
|
120
|
+
ls4: { encode: (_id, sequent) => encodePtl(sequent) },
|
|
114
121
|
};
|
|
115
122
|
|
|
116
123
|
const hasIncompleteCase = (expression: Expr): boolean =>
|
|
@@ -151,6 +158,23 @@ const getUnprovedReport = (
|
|
|
151
158
|
attempts: ProofAttempt[] = [],
|
|
152
159
|
): ProofReport => ({ obligation: { ...getObligationBase(obligation), status, reason }, attempts });
|
|
153
160
|
|
|
161
|
+
export const isProvedAttempt = (attempt: ProofAttempt) =>
|
|
162
|
+
attempt.kind === "decided"
|
|
163
|
+
? attempt.verdict === "unsat"
|
|
164
|
+
: (attempt.kind === "stored" || attempt.kind === "reused") && attempt.isProved;
|
|
165
|
+
|
|
166
|
+
export const getFailureReason = (attempt: ProofAttempt) => {
|
|
167
|
+
switch (attempt.kind) {
|
|
168
|
+
case "decided":
|
|
169
|
+
if (attempt.verdict === "unsat") return undefined;
|
|
170
|
+
return attempt.timeUsedMs >= attempt.method.timeLimitMs ? "timeout" : "false";
|
|
171
|
+
case "error":
|
|
172
|
+
return "false";
|
|
173
|
+
default:
|
|
174
|
+
return attempt.reason;
|
|
175
|
+
}
|
|
176
|
+
};
|
|
177
|
+
|
|
154
178
|
export const formatNormalized = (obligation: PrintedObligation, isReused: boolean) =>
|
|
155
179
|
`${formatObligation(
|
|
156
180
|
isReused
|
|
@@ -169,7 +193,9 @@ export const encodeProofTheory = (
|
|
|
169
193
|
report.attempts
|
|
170
194
|
.filter(
|
|
171
195
|
(attempt) =>
|
|
172
|
-
attempt.method.prover === "isabelle" &&
|
|
196
|
+
attempt.method.prover === "isabelle" &&
|
|
197
|
+
attempt.kind === "decided" &&
|
|
198
|
+
attempt.verdict === "unsat",
|
|
173
199
|
)
|
|
174
200
|
.map((attempt) => ({
|
|
175
201
|
id: report.obligation.id,
|
|
@@ -181,17 +207,20 @@ export const encodeProofTheory = (
|
|
|
181
207
|
|
|
182
208
|
export const encodeForBackend = (
|
|
183
209
|
obligation: PrintedObligation,
|
|
184
|
-
prover:
|
|
210
|
+
prover: Backend,
|
|
185
211
|
session: EncodingSession,
|
|
186
212
|
) => {
|
|
187
|
-
const encode = ENCODERS[prover];
|
|
188
|
-
if (!encode) throw new TlaUnsupportedError(`the ${prover} backend`);
|
|
189
213
|
const methods = findMethods(obligation);
|
|
190
214
|
const method = methods.provers.find((candidate) => candidate.prover === prover) ?? {
|
|
191
215
|
prover,
|
|
192
216
|
timeLimitMs: Infinity,
|
|
193
217
|
};
|
|
194
|
-
return encode(
|
|
218
|
+
return ENCODERS[prover].encode(
|
|
219
|
+
obligation.id,
|
|
220
|
+
normalizeExpand(obligation, methods),
|
|
221
|
+
method,
|
|
222
|
+
session,
|
|
223
|
+
);
|
|
195
224
|
};
|
|
196
225
|
|
|
197
226
|
const getSession = async (run: ProveRun, index: number) => {
|
|
@@ -220,8 +249,8 @@ const proveWithBackends = async (
|
|
|
220
249
|
const methods = findMethods(obligation);
|
|
221
250
|
const fingerprint = getFingerprint(obligation.sequent);
|
|
222
251
|
const earlier = run.lastByFingerprint.get(fingerprint);
|
|
223
|
-
run.lastByFingerprint.set(fingerprint,
|
|
224
|
-
await earlier;
|
|
252
|
+
run.lastByFingerprint.set(fingerprint, index);
|
|
253
|
+
await (earlier === undefined ? undefined : run.tasks[earlier].done);
|
|
225
254
|
const attempts: ProofAttempt[] = [];
|
|
226
255
|
const failures: MethodFailure[] = [];
|
|
227
256
|
const getProvedReport = (prover: string): ProofReport => ({
|
|
@@ -233,9 +262,13 @@ const proveWithBackends = async (
|
|
|
233
262
|
const prior = run.results.get(fingerprint)?.get(method.prover);
|
|
234
263
|
return prior?.method.tactic === method.tactic ? prior : undefined;
|
|
235
264
|
};
|
|
236
|
-
const getBudget = (method: Method) => method.rlimit ?? method.timeLimitMs / 1000;
|
|
237
265
|
const reuse = (prior: ProofAttempt) =>
|
|
238
|
-
attempts.push({
|
|
266
|
+
attempts.push({
|
|
267
|
+
kind: "reused",
|
|
268
|
+
method: prior.method,
|
|
269
|
+
isProved: isProvedAttempt(prior),
|
|
270
|
+
reason: getFailureReason(prior),
|
|
271
|
+
});
|
|
239
272
|
const record = (attempt: ProofAttempt) => {
|
|
240
273
|
attempts.push(attempt);
|
|
241
274
|
run.results.set(
|
|
@@ -244,11 +277,11 @@ const proveWithBackends = async (
|
|
|
244
277
|
);
|
|
245
278
|
};
|
|
246
279
|
const skip = (method: Method, reason: string) => {
|
|
247
|
-
attempts.push({
|
|
280
|
+
attempts.push({ kind: "skipped", method, reason });
|
|
248
281
|
failures.push({ reason, isDecided: false });
|
|
249
282
|
};
|
|
250
283
|
const firstPrior = getPrior(methods.provers[0]);
|
|
251
|
-
if (firstPrior
|
|
284
|
+
if (firstPrior && isProvedAttempt(firstPrior)) {
|
|
252
285
|
reuse(firstPrior);
|
|
253
286
|
return getProvedReport(firstPrior.method.prover);
|
|
254
287
|
}
|
|
@@ -259,7 +292,7 @@ const proveWithBackends = async (
|
|
|
259
292
|
}
|
|
260
293
|
for (const method of methods.provers) {
|
|
261
294
|
const prior = getPrior(method);
|
|
262
|
-
if (prior
|
|
295
|
+
if (prior && isProvedAttempt(prior)) {
|
|
263
296
|
reuse(prior);
|
|
264
297
|
return getProvedReport(method.prover);
|
|
265
298
|
}
|
|
@@ -273,39 +306,29 @@ const proveWithBackends = async (
|
|
|
273
306
|
}
|
|
274
307
|
if (!run.isProving) continue;
|
|
275
308
|
if (method.prover === "trivial") return getProvedReport(method.prover);
|
|
276
|
-
|
|
277
|
-
if (!encode) {
|
|
309
|
+
if (!isBackend(method.prover)) {
|
|
278
310
|
skip(method, `tla-ts has no ${method.prover} backend`);
|
|
279
311
|
continue;
|
|
280
312
|
}
|
|
281
313
|
try {
|
|
314
|
+
const encoder = ENCODERS[method.prover];
|
|
282
315
|
const isCaseNumbered =
|
|
283
|
-
|
|
316
|
+
encoder.isCaseNumbered &&
|
|
284
317
|
(sequent.context.some(isIncompleteCaseHyp) || hasIncompleteCase(sequent.active));
|
|
285
318
|
const session = isCaseNumbered ? await getSession(run, index) : { caseErrors: 0 };
|
|
286
|
-
const text = encode(obligation.id, sequent, method, session);
|
|
319
|
+
const text = encoder.encode(obligation.id, sequent, method, session);
|
|
287
320
|
const decision = await run.decide(
|
|
288
321
|
method.prover,
|
|
289
322
|
text,
|
|
290
323
|
{ timeLimitMs: method.timeLimitMs, signal },
|
|
291
324
|
index,
|
|
292
325
|
);
|
|
293
|
-
|
|
294
|
-
|
|
295
|
-
method,
|
|
296
|
-
isProved,
|
|
297
|
-
isReused: false,
|
|
298
|
-
...(!isProved && {
|
|
299
|
-
reason: decision.timeUsedMs >= method.timeLimitMs ? "timeout" : "false",
|
|
300
|
-
}),
|
|
301
|
-
verdict: decision.verdict,
|
|
302
|
-
timeUsedMs: decision.timeUsedMs,
|
|
303
|
-
});
|
|
304
|
-
if (isProved) return getProvedReport(method.prover);
|
|
326
|
+
record({ kind: "decided", method, ...decision });
|
|
327
|
+
if (decision.verdict === "unsat") return getProvedReport(method.prover);
|
|
305
328
|
failures.push({ reason: `${method.prover} answered ${decision.verdict}`, isDecided: true });
|
|
306
329
|
} catch (error) {
|
|
307
330
|
if (error instanceof TlaProverError) {
|
|
308
|
-
record({
|
|
331
|
+
record({ kind: "error", method });
|
|
309
332
|
failures.push({ reason: `${method.prover} failed: ${error.message}`, isDecided: true });
|
|
310
333
|
continue;
|
|
311
334
|
}
|
|
@@ -357,14 +380,12 @@ export const proveObligations = async (
|
|
|
357
380
|
pool?.decide ?? (async (prover, text, decideOptions) => decide(prover, text, decideOptions)),
|
|
358
381
|
};
|
|
359
382
|
const limit = pool ? workerCount * 4 : 1;
|
|
360
|
-
const pending: Promise<ProofReport>[] = [];
|
|
361
|
-
const isSettled: boolean[] = [];
|
|
362
383
|
const running = new Set<Promise<void>>();
|
|
363
384
|
const reports: ProofReport[] = [];
|
|
364
385
|
const reportSettled = async () => {
|
|
365
|
-
while (
|
|
386
|
+
while (reports.length < run.tasks.length && run.tasks[reports.length].isSettled) {
|
|
366
387
|
options.signal?.throwIfAborted();
|
|
367
|
-
const report = await
|
|
388
|
+
const report = await run.tasks[reports.length].report;
|
|
368
389
|
reports.push(report);
|
|
369
390
|
options.onReport?.(report, obligations[reports.length - 1]);
|
|
370
391
|
// HACK: backends on this thread run synchronously, so yield to let an abort land.
|
|
@@ -374,19 +395,21 @@ export const proveObligations = async (
|
|
|
374
395
|
try {
|
|
375
396
|
for (const [index, obligation] of obligations.entries()) {
|
|
376
397
|
options.signal?.throwIfAborted();
|
|
377
|
-
const done = Promise.withResolvers<void>();
|
|
378
|
-
run.tasks.push({ done: done.promise, session: undefined });
|
|
379
398
|
const report = proveWithBackends(obligation, index, run, options.signal).catch(
|
|
380
399
|
(error: unknown) => getErrorReport(obligation, error),
|
|
381
400
|
);
|
|
382
|
-
pending.push(report);
|
|
383
|
-
running.add(done.promise);
|
|
384
401
|
const settle = () => {
|
|
385
|
-
isSettled
|
|
386
|
-
running.delete(done
|
|
387
|
-
|
|
402
|
+
task.isSettled = true;
|
|
403
|
+
running.delete(task.done);
|
|
404
|
+
};
|
|
405
|
+
const task: ObligationTask = {
|
|
406
|
+
report,
|
|
407
|
+
done: report.then(settle, settle),
|
|
408
|
+
isSettled: false,
|
|
409
|
+
session: undefined,
|
|
388
410
|
};
|
|
389
|
-
|
|
411
|
+
run.tasks.push(task);
|
|
412
|
+
running.add(task.done);
|
|
390
413
|
if (running.size >= limit) await Promise.race(running);
|
|
391
414
|
await reportSettled();
|
|
392
415
|
}
|
|
@@ -40,7 +40,7 @@ export const createContext = () => {
|
|
|
40
40
|
|
|
41
41
|
export const createPrinter = (declared: Map<string, Identifier>) => {
|
|
42
42
|
const context = createContext();
|
|
43
|
-
|
|
43
|
+
return (line: string) => {
|
|
44
44
|
const declaration = /^\(declare-fun (\S+)/.exec(line)?.[1];
|
|
45
45
|
if (declaration !== undefined) {
|
|
46
46
|
const identifier = declared.get(declaration);
|
|
@@ -97,5 +97,4 @@ export const createPrinter = (declared: Map<string, Identifier>) => {
|
|
|
97
97
|
})
|
|
98
98
|
.join("");
|
|
99
99
|
};
|
|
100
|
-
return { resolve };
|
|
101
100
|
};
|