tla-ts 0.0.10-dev.99796fe03 → 0.0.10-dev.a17d6d9fa
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 +3 -3
- package/dist/compile.js +1 -1
- package/dist/deciders.cjs +36 -36
- package/dist/deciders.js +54 -54
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +3 -2
- package/dist/index.d.ts +3 -2
- 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 +60 -60
- package/dist/prove.js +78 -78
- package/dist/run.cjs +42 -44
- package/dist/run.js +44 -46
- package/dist/tlapm.cjs +1 -1
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +43 -43
- package/dist/transfer.js +39 -39
- package/dist/worker.cjs +6 -6
- package/dist/worker.js +6 -6
- package/package.json +1 -1
- package/src/ast.ts +1 -0
- package/src/bags.ts +50 -29
- package/src/builtins.ts +4 -3
- package/src/check-failure.ts +1 -1
- package/src/check-trace.ts +90 -51
- package/src/check.ts +367 -178
- package/src/cli/runtime-invariants.ts +20 -56
- package/src/cli/tlc-arguments.ts +2 -2
- package/src/cli/tlc-output.ts +1 -2
- package/src/cli/tlc.ts +16 -10
- package/src/cli/xml-exporter.ts +1 -1
- package/src/codegen.ts +26 -9
- package/src/dependencies.ts +49 -9
- package/src/dfid.ts +22 -10
- package/src/environment.ts +58 -33
- package/src/errors.ts +7 -0
- package/src/evaluate.ts +117 -41
- package/src/exit-codes.ts +4 -2
- package/src/instances.ts +5 -5
- package/src/java-hash.ts +14 -0
- package/src/java-overrides.ts +2 -2
- package/src/levels.ts +138 -90
- package/src/liveness-checker.ts +81 -33
- package/src/liveness.ts +49 -11
- package/src/obligations/index.ts +1 -1
- package/src/obligations/normalize.ts +1 -4
- package/src/obligations/printer.ts +5 -5
- package/src/parallel-worker.ts +8 -2
- package/src/parallel.ts +5 -0
- package/src/parser.ts +112 -145
- package/src/prover/isabelle/isar/attrib.ts +4 -4
- package/src/prover/isabelle/isar/rule-cases.ts +8 -6
- package/src/prover/isabelle/provers/clasimp.ts +1 -1
- package/src/prover/isabelle/provers/hypsubst.ts +2 -2
- package/src/prover/isabelle/pure/rewriter.ts +3 -3
- package/src/prover/isabelle/pure/term.ts +3 -3
- package/src/prover/prep/md5.ts +26 -29
- package/src/prover/smt/rewrite.ts +2 -7
- package/src/prover/smt/simplify.ts +1 -1
- package/src/prover/smt/solver/arith-rewriter.ts +11 -3
- package/src/prover/smt/solver/array-rewriter.ts +12 -2
- package/src/prover/smt/solver/asserted-formulas.ts +169 -58
- package/src/prover/smt/solver/ast-lt.ts +1 -1
- package/src/prover/smt/solver/ast.ts +63 -14
- package/src/prover/smt/solver/auf-solver.ts +23 -12
- package/src/prover/smt/solver/bit-blast-tactic.ts +26 -0
- package/src/prover/smt/solver/blast-term-ite.ts +47 -0
- package/src/prover/smt/solver/bound-simplifier.ts +11 -13
- package/src/prover/smt/solver/bv-decl-plugin.ts +13 -10
- package/src/prover/smt/solver/bv-rewriter.ts +1 -1
- package/src/prover/smt/solver/card2bv.ts +32 -18
- package/src/prover/smt/solver/cofactor-elim-term-ite.ts +39 -24
- package/src/prover/smt/solver/context.ts +47 -9
- package/src/prover/smt/solver/ctx-simplify.ts +1 -2
- package/src/prover/smt/solver/datatype-decl-plugin.ts +15 -7
- package/src/prover/smt/solver/dependent-expr-state.ts +9 -4
- package/src/prover/smt/solver/diff-neq.ts +1 -2
- package/src/prover/smt/solver/elim-bounds.ts +89 -0
- package/src/prover/smt/solver/elim-term-ite-tactic.ts +48 -0
- package/src/prover/smt/solver/elim-uncnstr.ts +5 -8
- package/src/prover/smt/solver/euf/arith-internalize.ts +1 -1
- package/src/prover/smt/solver/euf/array-internalize.ts +1 -1
- package/src/prover/smt/solver/euf/bv-internalize.ts +1 -1
- package/src/prover/smt/solver/euf/egraph.ts +4 -11
- package/src/prover/smt/solver/euf/euf-solver.ts +1 -2
- package/src/prover/smt/solver/euf/mam.ts +1 -5
- package/src/prover/smt/solver/euf/q-ematch.ts +1 -2
- package/src/prover/smt/solver/euf/th-solver.ts +0 -7
- package/src/prover/smt/solver/expr2polynomial.ts +204 -79
- package/src/prover/smt/solver/factor.ts +36 -14
- package/src/prover/smt/solver/fd-solver.ts +2 -0
- package/src/prover/smt/solver/fix-dl-var.ts +1 -2
- package/src/prover/smt/solver/fpa-rewriter.ts +1 -2
- package/src/prover/smt/solver/fpa2bv-converter.ts +3 -1
- package/src/prover/smt/solver/fpa2bv-rewriter.ts +1 -0
- package/src/prover/smt/solver/goal.ts +6 -3
- package/src/prover/smt/solver/goal2nlsat.ts +57 -30
- package/src/prover/smt/solver/hashtable.ts +4 -0
- package/src/prover/smt/solver/internalizer.ts +1 -1
- package/src/prover/smt/solver/logic-tactics.ts +9 -2
- package/src/prover/smt/solver/lp/lp-settings.ts +5 -1
- package/src/prover/smt/solver/lp/nla-core.ts +1 -1
- package/src/prover/smt/solver/lp/nla-grobner.ts +2 -2
- package/src/prover/smt/solver/lp/nra-solver.ts +45 -39
- package/src/prover/smt/solver/lp/pdd.ts +2 -3
- package/src/prover/smt/solver/lp/union-find.ts +1 -1
- package/src/prover/smt/solver/mam-compiler.ts +1 -1
- package/src/prover/smt/solver/model-based-opt.ts +1 -1
- package/src/prover/smt/solver/model-evaluator.ts +2 -0
- package/src/prover/smt/solver/model-generator.ts +85 -43
- package/src/prover/smt/solver/mpf.ts +2 -4
- package/src/prover/smt/solver/mus.ts +2 -3
- package/src/prover/smt/solver/muz/dl-context.ts +10 -4
- package/src/prover/smt/solver/muz/dl-mk-slice.ts +3 -3
- package/src/prover/smt/solver/muz/dl-rule.ts +2 -2
- package/src/prover/smt/solver/muz/horn-subsume-model-converter.ts +1 -1
- package/src/prover/smt/solver/muz/horn-tactic.ts +1 -1
- package/src/prover/smt/solver/muz/spacer-context.ts +2 -4
- package/src/prover/smt/solver/muz/spacer-pdr.ts +1 -0
- package/src/prover/smt/solver/nlqsat.ts +1 -1
- package/src/prover/smt/solver/nlsat/algebraic.ts +196 -92
- package/src/prover/smt/solver/nlsat/atoms.ts +52 -33
- package/src/prover/smt/solver/nlsat/explain.ts +375 -217
- package/src/prover/smt/solver/nlsat/levelwise.ts +460 -240
- package/src/prover/smt/solver/nlsat/polynomial.ts +2366 -681
- package/src/prover/smt/solver/nlsat/solver.ts +74 -64
- package/src/prover/smt/solver/nlsat/transcendentals.ts +41 -17
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +8 -4
- package/src/prover/smt/solver/nlsat/upolynomial.ts +41 -18
- package/src/prover/smt/solver/nlsat-tactic.ts +1 -1
- package/src/prover/smt/solver/nnf.ts +6 -2
- package/src/prover/smt/solver/opt-context.ts +20 -7
- package/src/prover/smt/solver/opt-nlsat.ts +29 -18
- package/src/prover/smt/solver/opt-pareto.ts +19 -0
- package/src/prover/smt/solver/opt-preprocess.ts +1 -1
- package/src/prover/smt/solver/opt-solver.ts +9 -5
- package/src/prover/smt/solver/optsmt.ts +1 -1
- package/src/prover/smt/solver/pb-rewriter.ts +1 -4
- package/src/prover/smt/solver/poly-rewriter.ts +75 -18
- package/src/prover/smt/solver/probes.ts +88 -23
- package/src/prover/smt/solver/proto-model.ts +8 -8
- package/src/prover/smt/solver/push-app-ite.ts +37 -0
- package/src/prover/smt/solver/qe-arith-plugin.ts +2 -4
- package/src/prover/smt/solver/qe-lite.ts +2 -2
- package/src/prover/smt/solver/qe.ts +3 -2
- package/src/prover/smt/solver/qsat.ts +16 -6
- package/src/prover/smt/solver/quantifier-manager.ts +14 -9
- package/src/prover/smt/solver/recfun-decl-plugin.ts +2 -1
- package/src/prover/smt/solver/rewriter.ts +31 -25
- package/src/prover/smt/solver/rlimit.ts +4 -0
- package/src/prover/smt/solver/sat/config.ts +1 -1
- package/src/prover/smt/solver/sat/goal2sat.ts +0 -1
- package/src/prover/smt/solver/sat/inc-sat-solver.ts +39 -5
- package/src/prover/smt/solver/sat/model-converter.ts +1 -1
- package/src/prover/smt/solver/sat/pb-solver.ts +1 -1
- package/src/prover/smt/solver/sat/sat-tactic.ts +13 -5
- package/src/prover/smt/solver/sat/simplifier.ts +1 -1
- package/src/prover/smt/solver/sat/solver.ts +25 -47
- package/src/prover/smt/solver/seq-axioms.ts +20 -35
- package/src/prover/smt/solver/seq-decl-plugin.ts +1 -1
- package/src/prover/smt/solver/seq-derive.ts +2 -2
- package/src/prover/smt/solver/seq-eq-solver.ts +2 -2
- package/src/prover/smt/solver/seq-monadic.ts +7 -5
- package/src/prover/smt/solver/seq-re-rewriter.ts +2 -1
- package/src/prover/smt/solver/seq-re-util.ts +1 -1
- package/src/prover/smt/solver/seq-regex-bisim.ts +1 -1
- package/src/prover/smt/solver/seq-regex-live.ts +2 -2
- package/src/prover/smt/solver/seq-rewriter.ts +31 -29
- package/src/prover/smt/solver/seq-skolem.ts +0 -23
- package/src/prover/smt/solver/seq-view-witness.ts +4 -4
- package/src/prover/smt/solver/smt-kernel.ts +39 -5
- package/src/prover/smt/solver/smt-setup.ts +96 -10
- package/src/prover/smt/solver/smtlib-parser.ts +584 -223
- package/src/prover/smt/solver/smtlib-script.ts +509 -154
- package/src/prover/smt/solver/solve-eqs.ts +36 -37
- package/src/prover/smt/solver/solver.ts +18 -3
- package/src/prover/smt/solver/tactic.ts +284 -168
- package/src/prover/smt/solver/theory-bv.ts +13 -3
- package/src/prover/smt/solver/theory-fpa.ts +1 -1
- package/src/prover/smt/solver/theory-lra-final-check.ts +1 -0
- package/src/prover/smt/solver/theory-lra-internalize.ts +2 -0
- package/src/prover/smt/solver/theory-lra-propagate.ts +11 -3
- package/src/prover/smt/solver/theory-lra.ts +1 -1
- package/src/prover/smt/solver/theory-pb.ts +24 -7
- package/src/prover/smt/solver/theory-seq-solve.ts +1 -1
- package/src/prover/smt/solver/theory-seq-state.ts +2 -21
- package/src/prover/smt/solver/tseitin-cnf.ts +1 -0
- package/src/prover/tlapm/cache.ts +8 -8
- package/src/prover/zenon/index-table.ts +5 -2
- package/src/prover/zenon/isar-case.ts +1 -1
- package/src/prover/zenon/isar.ts +2 -2
- package/src/prover/zenon/phrase.ts +1 -1
- package/src/resolve.ts +959 -243
- package/src/runtime.ts +7 -1
- package/src/sany/builtins.ts +10 -10
- package/src/sany/generation.ts +2 -13
- package/src/sany/generator-definitions.ts +3 -1
- package/src/sany/generator-expressions.ts +36 -30
- package/src/sany/generator-proofs.ts +5 -3
- package/src/sany/generator.ts +2 -1
- package/src/sany/lexer.ts +3 -3
- package/src/sany/modules.ts +4 -2
- package/src/sany/nodes.ts +1 -1
- package/src/sany/selectors.ts +11 -6
- package/src/sany/xml.ts +2 -3
- package/src/search.ts +166 -101
- package/src/simulate.ts +110 -50
- package/src/spec-description.ts +5 -6
- package/src/standard-modules.ts +15 -6
- package/src/subexpressions.ts +398 -108
- package/src/successors.ts +4 -2
- package/src/symmetry.ts +1 -1
- package/src/tlc/jar-data.ts +10 -0
- package/src/tlc/messages.ts +3 -3
- package/src/tlc/order.ts +14 -3
- package/src/tlc/random.ts +2 -1
- package/src/tlc/replay.ts +3 -2
- package/src/tlc/tlc-operators.ts +10 -8
- package/src/tlc/tlcext-operators.ts +44 -15
- package/src/tlc/trace-spec.ts +9 -22
- package/src/typed-tier.ts +32 -25
- package/src/typescript/types.ts +2 -2
- package/src/values.ts +135 -78
package/src/simulate.ts
CHANGED
|
@@ -10,7 +10,9 @@ import {
|
|
|
10
10
|
UNEXPECTED_EVAL_EXCEPTION,
|
|
11
11
|
UNEXPECTED_EXCEPTION,
|
|
12
12
|
} from "./errors";
|
|
13
|
+
import type { State } from "./evaluate";
|
|
13
14
|
import { EXIT_STATUS, getMessageExitStatus, withLivenessExitCode } from "./exit-codes";
|
|
15
|
+
import { getHashMapOrder } from "./java-hash";
|
|
14
16
|
import { createLivenessChecker, type LivenessChecker } from "./liveness-checker";
|
|
15
17
|
import { getIncompleteSuccessorMessage, prepareSearch, reportAssumptionViolation } from "./search";
|
|
16
18
|
import { getActionLabel, toActionValue, type SpecAction } from "./spec-description";
|
|
@@ -27,13 +29,20 @@ import {
|
|
|
27
29
|
withUnexpectedException,
|
|
28
30
|
} from "./tlc/messages";
|
|
29
31
|
import { createJavaRandom, nextPrime, type JavaRandom } from "./tlc/random";
|
|
30
|
-
import { createCounterExample } from "./tlc/tlcext-operators";
|
|
31
32
|
import {
|
|
33
|
+
createActionRecord,
|
|
34
|
+
createCounterExample,
|
|
35
|
+
createTlcRecord,
|
|
36
|
+
type CounterExampleLoop,
|
|
37
|
+
} from "./tlc/tlcext-operators";
|
|
38
|
+
import {
|
|
39
|
+
computeLikeTlcOnFailure,
|
|
32
40
|
createModelValue,
|
|
33
41
|
createRecord,
|
|
34
42
|
formatState,
|
|
35
43
|
getSetBound,
|
|
36
|
-
|
|
44
|
+
markNormalized,
|
|
45
|
+
valuesEqual,
|
|
37
46
|
type Value,
|
|
38
47
|
} from "./values";
|
|
39
48
|
|
|
@@ -67,6 +76,7 @@ interface TraceNode {
|
|
|
67
76
|
predecessor: TraceNode | undefined;
|
|
68
77
|
level: number;
|
|
69
78
|
deferred?: (next: Value[]) => void;
|
|
79
|
+
incomplete?: State;
|
|
70
80
|
}
|
|
71
81
|
|
|
72
82
|
interface WorkerError {
|
|
@@ -77,6 +87,7 @@ interface WorkerError {
|
|
|
77
87
|
isException: boolean;
|
|
78
88
|
isSummarized: boolean;
|
|
79
89
|
violation?: Violation;
|
|
90
|
+
counterExample?: Value;
|
|
80
91
|
}
|
|
81
92
|
|
|
82
93
|
const FATAL_CODES = new Set<number>([
|
|
@@ -91,14 +102,25 @@ const RL_ALPHA = 0.3;
|
|
|
91
102
|
const RL_GAMMA = 0.7;
|
|
92
103
|
const RL_REWARD = -10;
|
|
93
104
|
|
|
94
|
-
const
|
|
95
|
-
|
|
105
|
+
const isUnequal = () => false;
|
|
106
|
+
|
|
107
|
+
// TLC's SimulationWorker#getTrace drops a step its TLCState#equals finds stuttering, which sorts the records it compares.
|
|
108
|
+
const isRepeatedState = (state: Value[], predecessor: Value[], order: number[]) => {
|
|
109
|
+
for (let position = 0; position < order.length; position++) {
|
|
110
|
+
const index = order[position];
|
|
111
|
+
// Deviation from TLC: TLCState#equals fails on values it can't compare, which hangs TLC's simulation.
|
|
112
|
+
if (!computeLikeTlcOnFailure(valuesEqual, isUnequal, state[index], predecessor[index])) {
|
|
113
|
+
return false;
|
|
114
|
+
}
|
|
115
|
+
}
|
|
116
|
+
return true;
|
|
117
|
+
};
|
|
96
118
|
|
|
97
|
-
const getTrace = (last: TraceNode) => {
|
|
119
|
+
const getTrace = (last: TraceNode, order: number[]) => {
|
|
98
120
|
const trace: TraceNode[] = [];
|
|
99
121
|
for (let node: TraceNode | undefined = last; node; node = node.predecessor) {
|
|
100
122
|
const predecessor = node.predecessor;
|
|
101
|
-
if (predecessor &&
|
|
123
|
+
if (predecessor && isRepeatedState(node.state, predecessor.state, order)) continue;
|
|
102
124
|
trace.unshift(node);
|
|
103
125
|
}
|
|
104
126
|
trace.forEach((node, index) => {
|
|
@@ -108,6 +130,7 @@ const getTrace = (last: TraceNode) => {
|
|
|
108
130
|
return trace;
|
|
109
131
|
};
|
|
110
132
|
|
|
133
|
+
// Deviation from TLC: LiveCheck1 gives the initial state no stuttering step into a tableau node that isn't initial, so it misses a behavior that stutters there.
|
|
111
134
|
const findTemporalViolation = (
|
|
112
135
|
trace: TraceNode[],
|
|
113
136
|
getFingerprint: (state: Value[]) => bigint,
|
|
@@ -151,6 +174,7 @@ const findTemporalViolation = (
|
|
|
151
174
|
fingerprints[length - 1] === getFingerprint(states[path[lasso.prefix.length]]);
|
|
152
175
|
return {
|
|
153
176
|
length,
|
|
177
|
+
isStuttering,
|
|
154
178
|
loopStart: isStuttering ? length - 1 : cyclePosition - 1,
|
|
155
179
|
properties: checker.getViolatedProperties(
|
|
156
180
|
trace.slice(0, length).map((node) => node.state),
|
|
@@ -252,10 +276,6 @@ export const simulate = (options: SimulationOptions): number => {
|
|
|
252
276
|
let evaluatedAction: SpecAction | undefined;
|
|
253
277
|
runtime.getSuccessorAction = () => evaluatedAction;
|
|
254
278
|
runtime.getLevel = (state) => nodes.get(state)?.level ?? 0;
|
|
255
|
-
runtime.getBehavior = (state) => {
|
|
256
|
-
const node = nodes.get(state);
|
|
257
|
-
return node ? getTrace(node).map((step) => step.state) : [state];
|
|
258
|
-
};
|
|
259
279
|
runtime.getSimulationValue = (key, state) => {
|
|
260
280
|
const node = state && nodes.get(state);
|
|
261
281
|
switch (key) {
|
|
@@ -268,7 +288,7 @@ export const simulate = (options: SimulationOptions): number => {
|
|
|
268
288
|
case "action":
|
|
269
289
|
return node && toActionValue(node.action);
|
|
270
290
|
case "config":
|
|
271
|
-
return
|
|
291
|
+
return createTlcRecord([
|
|
272
292
|
["mode", options.isGenerating ? "generate" : "simulate"],
|
|
273
293
|
["depth", traceDepth === INFINITE_DEPTH ? -1 : traceDepth],
|
|
274
294
|
["traces", Number(BigInt.asIntN(32, traceLimit))],
|
|
@@ -284,14 +304,19 @@ export const simulate = (options: SimulationOptions): number => {
|
|
|
284
304
|
for (let step = node; step && step.level > 1; step = step.predecessor) {
|
|
285
305
|
actions.set(step.action.name, (actions.get(step.action.name) ?? 0) + 1);
|
|
286
306
|
}
|
|
287
|
-
|
|
307
|
+
// TLC's SimulationWorker counts the actions of a behavior in a HashMap.
|
|
308
|
+
const counts = getHashMapOrder([...actions.keys()]).map((name): [string, Value] => [
|
|
309
|
+
name,
|
|
310
|
+
actions.get(name) ?? 0,
|
|
311
|
+
]);
|
|
312
|
+
return createTlcRecord([
|
|
288
313
|
["traces", statistics.traces],
|
|
289
314
|
["duration", Math.floor((Date.now() - runtime.startedAt) / 1000)],
|
|
290
315
|
["generated", statistics.generatedStates],
|
|
291
316
|
[
|
|
292
317
|
"behavior",
|
|
293
|
-
|
|
294
|
-
["actions",
|
|
318
|
+
createTlcRecord([
|
|
319
|
+
["actions", createTlcRecord(counts)],
|
|
295
320
|
["id", currentTrace],
|
|
296
321
|
]),
|
|
297
322
|
],
|
|
@@ -311,6 +336,10 @@ export const simulate = (options: SimulationOptions): number => {
|
|
|
311
336
|
if (!search) {
|
|
312
337
|
throw new TlaUnsupportedError("tla-ts can't simulate a specification without variables");
|
|
313
338
|
}
|
|
339
|
+
runtime.getBehavior = (state) => {
|
|
340
|
+
const node = nodes.get(state);
|
|
341
|
+
return node ? getTrace(node, search.getTlcOrder()).map((step) => step.state) : [state];
|
|
342
|
+
};
|
|
314
343
|
const reportPostcondition = (isAfterViolation: boolean) => {
|
|
315
344
|
const postcondition = search.findPostconditionViolation(isAfterViolation);
|
|
316
345
|
if (!postcondition) return undefined;
|
|
@@ -329,8 +358,13 @@ export const simulate = (options: SimulationOptions): number => {
|
|
|
329
358
|
createLivenessChecker(temporalProperties, search.spec.temporals, environment, {
|
|
330
359
|
getFingerprint: (successor) =>
|
|
331
360
|
Number(BigInt.asIntN(32, runtime.getFingerprint(successor.state))),
|
|
332
|
-
|
|
333
|
-
|
|
361
|
+
forEachActionSuccessors: (index, _state, onSuccessors) =>
|
|
362
|
+
onSuccessors(
|
|
363
|
+
successors[index].map((successor) => ({
|
|
364
|
+
index: successor,
|
|
365
|
+
state: states[successor],
|
|
366
|
+
})),
|
|
367
|
+
),
|
|
334
368
|
}),
|
|
335
369
|
),
|
|
336
370
|
);
|
|
@@ -351,25 +385,35 @@ export const simulate = (options: SimulationOptions): number => {
|
|
|
351
385
|
const toRecord = (state: (Value | undefined)[]) =>
|
|
352
386
|
search.toRecord(state.map((value) => value ?? createModelValue("null")));
|
|
353
387
|
const toTraceSteps = (trace: TraceNode[]): TraceStep[] =>
|
|
354
|
-
trace.map((node, index) =>
|
|
355
|
-
|
|
356
|
-
|
|
357
|
-
|
|
358
|
-
|
|
359
|
-
|
|
360
|
-
|
|
361
|
-
|
|
362
|
-
|
|
363
|
-
|
|
364
|
-
|
|
365
|
-
|
|
366
|
-
|
|
367
|
-
|
|
388
|
+
trace.map((node, index) => {
|
|
389
|
+
const successor = trace[index + 1] ?? node;
|
|
390
|
+
return {
|
|
391
|
+
action: node.action.name,
|
|
392
|
+
label: getActionLabel(node.action, options.version, node.level === 1),
|
|
393
|
+
state:
|
|
394
|
+
config.alias === undefined
|
|
395
|
+
? toRecord(node.state)
|
|
396
|
+
: search.evaluateAlias(
|
|
397
|
+
config.alias,
|
|
398
|
+
node.incomplete ?? node.state,
|
|
399
|
+
successor.incomplete ?? successor.state,
|
|
400
|
+
options.isTool ?? false,
|
|
401
|
+
),
|
|
402
|
+
};
|
|
403
|
+
});
|
|
404
|
+
const getCounterExample = (
|
|
405
|
+
trace: TraceNode[],
|
|
406
|
+
steps = toTraceSteps(trace),
|
|
407
|
+
loop?: CounterExampleLoop,
|
|
408
|
+
) =>
|
|
368
409
|
createCounterExample(
|
|
369
|
-
|
|
410
|
+
steps.map((step) => step.state),
|
|
370
411
|
trace.slice(1).map((node) => toActionValue(node.action)),
|
|
371
|
-
|
|
412
|
+
loop,
|
|
372
413
|
);
|
|
414
|
+
// TLC's Simulator binds CounterExample to an initial state that violates an invariant, not to its alias.
|
|
415
|
+
const getInitialCounterExample = (node: TraceNode) =>
|
|
416
|
+
createCounterExample([toRecord(node.state)], [], undefined);
|
|
373
417
|
|
|
374
418
|
const initialStates: TraceNode[] = [];
|
|
375
419
|
const isComplete = (state: (Value | undefined)[]): state is Value[] =>
|
|
@@ -431,7 +475,7 @@ export const simulate = (options: SimulationOptions): number => {
|
|
|
431
475
|
MESSAGE_CODE.invariantViolatedInitial,
|
|
432
476
|
`Invariant ${violated.name} is violated by the initial state:\n${formatState(alias)}`,
|
|
433
477
|
);
|
|
434
|
-
runtime.counterExample =
|
|
478
|
+
runtime.counterExample = getInitialCounterExample(node);
|
|
435
479
|
reportPostcondition(true);
|
|
436
480
|
return EXIT_STATUS.safetyViolation;
|
|
437
481
|
}
|
|
@@ -443,7 +487,7 @@ export const simulate = (options: SimulationOptions): number => {
|
|
|
443
487
|
MESSAGE_CODE.propertyViolatedInitial,
|
|
444
488
|
`Property ${predicate.name} is violated by the initial state:\n${formatState(alias)}`,
|
|
445
489
|
);
|
|
446
|
-
runtime.counterExample =
|
|
490
|
+
runtime.counterExample = getInitialCounterExample(node);
|
|
447
491
|
reportPostcondition(true);
|
|
448
492
|
return EXIT_STATUS.livenessViolation;
|
|
449
493
|
}
|
|
@@ -475,6 +519,8 @@ export const simulate = (options: SimulationOptions): number => {
|
|
|
475
519
|
undefined,
|
|
476
520
|
false,
|
|
477
521
|
);
|
|
522
|
+
// TLC's Simulator deep-normalizes the initial states, which sorts their records.
|
|
523
|
+
initialStates.forEach((node) => node.state.forEach(markNormalized));
|
|
478
524
|
|
|
479
525
|
const toWorkerError = (code: number, text: string, node: TraceNode): WorkerError => ({
|
|
480
526
|
code,
|
|
@@ -545,6 +591,7 @@ export const simulate = (options: SimulationOptions): number => {
|
|
|
545
591
|
action,
|
|
546
592
|
current,
|
|
547
593
|
);
|
|
594
|
+
node.incomplete = error.state;
|
|
548
595
|
const text = getIncompleteSuccessorMessage(
|
|
549
596
|
error.variables,
|
|
550
597
|
action.name,
|
|
@@ -563,18 +610,34 @@ export const simulate = (options: SimulationOptions): number => {
|
|
|
563
610
|
runtime.getFingerprint,
|
|
564
611
|
search.getReward,
|
|
565
612
|
);
|
|
566
|
-
const getTemporalViolation = (last: TraceNode):
|
|
613
|
+
const getTemporalViolation = (last: TraceNode): WorkerError | undefined => {
|
|
567
614
|
if (temporalProperties.length === 0) return undefined;
|
|
568
|
-
const trace = getTrace(last);
|
|
615
|
+
const trace = getTrace(last, search.getTlcOrder());
|
|
616
|
+
// TLC's LiveCheck#checkTrace fingerprints each state, which sorts its records.
|
|
617
|
+
for (let position = 0; position < trace.length; position++) {
|
|
618
|
+
trace[position].state.forEach(markNormalized);
|
|
619
|
+
}
|
|
569
620
|
const found = findTemporalViolation(trace, runtime.getFingerprint, createTemporalChecker);
|
|
570
621
|
if (!found) return undefined;
|
|
571
622
|
const back = trace[found.length];
|
|
623
|
+
const lasso = trace.slice(0, found.length);
|
|
624
|
+
const steps = toTraceSteps(lasso);
|
|
625
|
+
const loopAction =
|
|
626
|
+
found.isStuttering || !back ? createActionRecord(undefined) : toActionValue(back.action);
|
|
572
627
|
return {
|
|
573
|
-
|
|
574
|
-
|
|
575
|
-
|
|
576
|
-
|
|
577
|
-
|
|
628
|
+
...toWorkerError(MESSAGE_CODE.temporalPropertyViolated, "", last),
|
|
629
|
+
isException: true,
|
|
630
|
+
violation: {
|
|
631
|
+
name: found.properties[0],
|
|
632
|
+
properties: found.properties,
|
|
633
|
+
trace: steps,
|
|
634
|
+
loopStart: found.loopStart,
|
|
635
|
+
loopLabel: back && getActionLabel(back.action, options.version, back.level === 1),
|
|
636
|
+
},
|
|
637
|
+
counterExample: getCounterExample(lasso, steps, {
|
|
638
|
+
start: found.loopStart,
|
|
639
|
+
action: loopAction,
|
|
640
|
+
}),
|
|
578
641
|
};
|
|
579
642
|
};
|
|
580
643
|
const simulateTrace = (): WorkerError | "stopped" | undefined => {
|
|
@@ -603,13 +666,7 @@ export const simulate = (options: SimulationOptions): number => {
|
|
|
603
666
|
}
|
|
604
667
|
if (runtime.isStopped) return "stopped";
|
|
605
668
|
const violation = getTemporalViolation(currentNode);
|
|
606
|
-
if (violation)
|
|
607
|
-
return {
|
|
608
|
-
...toWorkerError(MESSAGE_CODE.temporalPropertyViolated, "", currentNode),
|
|
609
|
-
isException: true,
|
|
610
|
-
violation,
|
|
611
|
-
};
|
|
612
|
-
}
|
|
669
|
+
if (violation) return violation;
|
|
613
670
|
const length = Math.min(traceDepth, currentNode.level);
|
|
614
671
|
const delta = length - statistics.levelMean;
|
|
615
672
|
statistics.levelMean += Math.trunc(delta / Math.max(statistics.traces, 1));
|
|
@@ -684,14 +741,17 @@ export const simulate = (options: SimulationOptions): number => {
|
|
|
684
741
|
reportMessage(error.code, error.message, error.toolMessage);
|
|
685
742
|
output({
|
|
686
743
|
kind: "behavior",
|
|
687
|
-
trace: toTraceSteps(getTrace(error.node)),
|
|
744
|
+
trace: toTraceSteps(getTrace(error.node, search.getTlcOrder())),
|
|
688
745
|
isLastStateOnly: traceDepth === INFINITE_DEPTH,
|
|
689
746
|
});
|
|
690
747
|
if (error.isSummarized) printSummary();
|
|
691
748
|
});
|
|
692
749
|
const last = reported[reported.length - 1];
|
|
693
750
|
const errorStatus = last ? getMessageExitStatus(last.code) : EXIT_STATUS.success;
|
|
694
|
-
if (last)
|
|
751
|
+
if (last) {
|
|
752
|
+
runtime.counterExample =
|
|
753
|
+
last.counterExample ?? getCounterExample(getTrace(last.node, search.getTlcOrder()));
|
|
754
|
+
}
|
|
695
755
|
const postcondition = reportPostcondition(last !== undefined);
|
|
696
756
|
const postconditionStatus = postcondition
|
|
697
757
|
? getMessageExitStatus(postcondition.code)
|
package/src/spec-description.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { isEvaluatedAtStartup } from "./dependencies";
|
|
2
2
|
import {
|
|
3
3
|
isLocallyResolved,
|
|
4
4
|
type Definition,
|
|
@@ -13,7 +13,6 @@ import { substitutionFrames, withSubstitutionFrames } from "./instances";
|
|
|
13
13
|
import type { InstanceAction } from "./environment";
|
|
14
14
|
import { formatRange, TlaError, TlaEvaluationError, UNEXPECTED_EXCEPTION } from "./errors";
|
|
15
15
|
import {
|
|
16
|
-
bindDefinitions,
|
|
17
16
|
bindOperatorArguments,
|
|
18
17
|
describeNode,
|
|
19
18
|
evaluate,
|
|
@@ -26,7 +25,7 @@ import {
|
|
|
26
25
|
type Scope,
|
|
27
26
|
} from "./evaluate";
|
|
28
27
|
import { ACTION_LEVEL, CONSTANT_LEVEL, TEMPORAL_LEVEL, VARIABLE_LEVEL } from "./levels";
|
|
29
|
-
import { getLevel } from "./liveness";
|
|
28
|
+
import { bindLetDefinitions, getLevel } from "./liveness";
|
|
30
29
|
import { createRecord, createSet, createTuple, formatValue, type Value } from "./values";
|
|
31
30
|
import { LITERAL_KINDS } from "./tlc/replay";
|
|
32
31
|
import type { TlcVersion } from "./tlc/version";
|
|
@@ -148,7 +147,7 @@ const isEvaluable = (expression: Expression, environment: Environment) => {
|
|
|
148
147
|
const isStartupValue = (definition: Definition | undefined, environment: Environment) =>
|
|
149
148
|
definition?.kind === "Operator" &&
|
|
150
149
|
definition.params.length === 0 &&
|
|
151
|
-
|
|
150
|
+
isEvaluatedAtStartup(definition, environment) &&
|
|
152
151
|
isEvaluable(definition.body, environment);
|
|
153
152
|
|
|
154
153
|
const isConstantValue = (definition: Definition | undefined, environment: Environment) =>
|
|
@@ -176,7 +175,7 @@ const unwrapBinding = (
|
|
|
176
175
|
if (expression.kind === "Let") {
|
|
177
176
|
return {
|
|
178
177
|
expression: expression.body,
|
|
179
|
-
scope:
|
|
178
|
+
scope: bindLetDefinitions(expression, scope, environment),
|
|
180
179
|
};
|
|
181
180
|
}
|
|
182
181
|
const thunk = getThunk(expression, scope);
|
|
@@ -268,7 +267,7 @@ const getActions = (
|
|
|
268
267
|
case "Let":
|
|
269
268
|
return getActions(
|
|
270
269
|
expression.body,
|
|
271
|
-
|
|
270
|
+
bindLetDefinitions(expression, scope, environment),
|
|
272
271
|
closure,
|
|
273
272
|
environment,
|
|
274
273
|
instanceActions,
|
package/src/standard-modules.ts
CHANGED
|
@@ -18,6 +18,7 @@ import {
|
|
|
18
18
|
overrideWithJava,
|
|
19
19
|
} from "./builtins";
|
|
20
20
|
import type { Builtin, BuiltinArgument, Context } from "./evaluate";
|
|
21
|
+
import { prettyPrint } from "./pretty-print";
|
|
21
22
|
import type { CheckerRuntime } from "./runtime";
|
|
22
23
|
import { createBagsOperators } from "./bags";
|
|
23
24
|
import { createIoUtilsOperators, createJsonOperators, type FileSystem } from "./json";
|
|
@@ -40,6 +41,7 @@ import {
|
|
|
40
41
|
formatValue,
|
|
41
42
|
getCardinality,
|
|
42
43
|
getDomain,
|
|
44
|
+
getFunctionClass,
|
|
43
45
|
getSortedIntersection,
|
|
44
46
|
someStreamedElement,
|
|
45
47
|
isElementOf,
|
|
@@ -376,7 +378,7 @@ const INTEGERS_OPERATORS = [
|
|
|
376
378
|
const getSequenceArgument = (args: BuiltinArgument[], index: number, message: string) => {
|
|
377
379
|
const value = getValue(args, index, message);
|
|
378
380
|
const elements = getSequenceElements(value);
|
|
379
|
-
if (!elements) throw new TlaModuleError(`${message}\n${formatValue(value)}`);
|
|
381
|
+
if (!elements) throw new TlaModuleError(`${message}\n${prettyPrint(formatValue(value))}`);
|
|
380
382
|
return elements;
|
|
381
383
|
};
|
|
382
384
|
|
|
@@ -425,12 +427,19 @@ const createSequencesOperators = (version: TlcVersion) =>
|
|
|
425
427
|
const left = getSequenceOrString(args, 0, getEvaluatingMessage("s \\o t", "sequence"));
|
|
426
428
|
if (typeof left !== "string") {
|
|
427
429
|
const right = getSequenceArgument(args, 1, getEvaluatingMessage("t \\o s", "sequence"));
|
|
430
|
+
const kept =
|
|
431
|
+
left.length === 0
|
|
432
|
+
? getValue(args, 1, "\\o")
|
|
433
|
+
: right.length === 0
|
|
434
|
+
? getValue(args, 0, "\\o")
|
|
435
|
+
: undefined;
|
|
436
|
+
if (kept !== undefined && getFunctionClass(kept) === "tuple") return kept;
|
|
428
437
|
return createTuple([...left, ...right]);
|
|
429
438
|
}
|
|
430
439
|
const right = getValue(args, 1, "\\o");
|
|
431
440
|
if (typeof right !== "string") {
|
|
432
441
|
throw new TlaModuleError(
|
|
433
|
-
`${getEvaluatingMessage("t \\o s", "string")}\n${formatValue(right)}`,
|
|
442
|
+
`${getEvaluatingMessage("t \\o s", "string")}\n${prettyPrint(formatValue(right))}`,
|
|
434
443
|
);
|
|
435
444
|
}
|
|
436
445
|
return rankString(left + right);
|
|
@@ -470,7 +479,7 @@ const createSequencesOperators = (version: TlcVersion) =>
|
|
|
470
479
|
: undefined;
|
|
471
480
|
if (outOfDomain) {
|
|
472
481
|
throw new TlaModuleError(
|
|
473
|
-
`The ${outOfDomain.position} argument of SubSeq must be in the domain of its first argument:\n${formatValue(getValue(args, 0, "SubSeq"))}\n, but instead it is\n${outOfDomain.value}`,
|
|
482
|
+
`The ${outOfDomain.position} argument of SubSeq must be in the domain of its first argument:\n${prettyPrint(formatValue(getValue(args, 0, "SubSeq")))}\n, but instead it is\n${outOfDomain.value}`,
|
|
474
483
|
);
|
|
475
484
|
}
|
|
476
485
|
return sliceSequence(sequence, start - 1, end);
|
|
@@ -503,7 +512,7 @@ const createFiniteSetsOperators = (version: TlcVersion) =>
|
|
|
503
512
|
(typeof set === "object" && (set.kind === "InfiniteSet" || set.kind === "SequenceSet"))
|
|
504
513
|
) {
|
|
505
514
|
throw new TlaModuleError(
|
|
506
|
-
`Attempted to compute cardinality of the value\n${formatValue(set)}`,
|
|
515
|
+
`Attempted to compute cardinality of the value\n${prettyPrint(formatValue(set))}`,
|
|
507
516
|
);
|
|
508
517
|
}
|
|
509
518
|
return getCardinality(set, version);
|
|
@@ -516,7 +525,7 @@ const TRANSITIVE_CLOSURE_OPERATORS = [
|
|
|
516
525
|
const relation = getValue(args, 0, "Warshall");
|
|
517
526
|
if (!isSetValue(relation) || isOverriddenSet(relation)) {
|
|
518
527
|
throw new TlaModuleError(
|
|
519
|
-
`Applying TransitiveClosure to the following value,\nwhich is not an enumerable set:\n${formatValue(relation)}`,
|
|
528
|
+
`Applying TransitiveClosure to the following value,\nwhich is not an enumerable set:\n${prettyPrint(formatValue(relation))}`,
|
|
520
529
|
);
|
|
521
530
|
}
|
|
522
531
|
// TLC sizes the relation, which normalizes it.
|
|
@@ -536,7 +545,7 @@ const TRANSITIVE_CLOSURE_OPERATORS = [
|
|
|
536
545
|
const ends = getSequenceElements(edge);
|
|
537
546
|
if (ends?.length !== 2) {
|
|
538
547
|
throw new TlaModuleError(
|
|
539
|
-
`Attempted to apply TransitiveClosure to a set containing\nthe following value:\n${formatValue(edge)}`,
|
|
548
|
+
`Attempted to apply TransitiveClosure to a set containing\nthe following value:\n${prettyPrint(formatValue(edge))}`,
|
|
540
549
|
);
|
|
541
550
|
}
|
|
542
551
|
return [getNodeIndex(ends[0]), getNodeIndex(ends[1])];
|