tla-ts 0.0.10-dev.c92e6a4ea → 0.0.10-dev.d166e0ae9
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 +13 -3
- package/dist/index.d.ts +13 -3
- 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 +68 -68
- package/dist/prove.js +78 -78
- package/dist/run.cjs +42 -42
- package/dist/run.js +44 -44
- package/dist/tlapm.cjs +1 -1
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +45 -43
- package/dist/transfer.js +45 -43
- package/dist/worker.cjs +7 -7
- package/dist/worker.js +7 -7
- package/package.json +1 -1
- package/src/ast.ts +11 -1
- package/src/bags.ts +50 -29
- package/src/builtins.ts +4 -3
- package/src/check-failure.ts +9 -6
- package/src/check-trace.ts +116 -64
- package/src/check.ts +356 -173
- package/src/cli/tlc-output.ts +1 -0
- package/src/cli/tlc.ts +4 -3
- package/src/cli/xml-exporter.ts +1 -1
- package/src/codegen.ts +34 -13
- package/src/coverage.ts +3 -0
- package/src/dependencies.ts +61 -13
- package/src/dfid.ts +22 -10
- package/src/environment.ts +71 -35
- package/src/errors.ts +7 -0
- package/src/evaluate.ts +149 -54
- package/src/exit-codes.ts +29 -15
- package/src/instances.ts +16 -6
- package/src/java-hash.ts +14 -0
- package/src/java-overrides.ts +2 -2
- package/src/levels.ts +186 -97
- package/src/liveness-checker.ts +131 -83
- package/src/liveness.ts +52 -11
- package/src/obligations/index.ts +1 -1
- package/src/obligations/normalize.ts +1 -4
- package/src/obligations/printer.ts +5 -5
- package/src/obligations/source.ts +2 -0
- package/src/parser.ts +115 -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 +35 -18
- package/src/prover/smt/solver/cofactor-elim-term-ite.ts +39 -24
- package/src/prover/smt/solver/context.ts +67 -13
- 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 +26 -15
- package/src/prover/smt/solver/diff-neq.ts +1 -2
- package/src/prover/smt/solver/dt2bv-tactic.ts +36 -20
- 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 +148 -39
- 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/maxcore.ts +2 -1
- package/src/prover/smt/solver/maxsmt-base.ts +1 -0
- package/src/prover/smt/solver/model-based-opt.ts +1 -1
- package/src/prover/smt/solver/model-checker.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 +22 -44
- package/src/prover/smt/solver/muz/dl-mk-coi-filter.ts +1 -1
- package/src/prover/smt/solver/muz/dl-mk-slice.ts +3 -3
- package/src/prover/smt/solver/muz/dl-rule.ts +8 -9
- package/src/prover/smt/solver/muz/hnf.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 +15 -2
- package/src/prover/smt/solver/muz/rule-properties.ts +22 -0
- 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/muz/spacer-prop-solver.ts +1 -1
- 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 +21 -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 +10 -6
- package/src/prover/smt/solver/optsmt.ts +1 -1
- package/src/prover/smt/solver/parallel-tactic.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 +23 -8
- 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-tpl.ts +7 -6
- 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 +81 -28
- 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 +17 -7
- package/src/prover/smt/solver/sat/sat2goal.ts +10 -7
- 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-consequences.ts +1 -1
- package/src/prover/smt/solver/smt-kernel.ts +48 -7
- package/src/prover/smt/solver/smt-setup.ts +96 -10
- package/src/prover/smt/solver/smtlib-parser.ts +589 -224
- package/src/prover/smt/solver/smtlib-script.ts +674 -195
- 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 +332 -189
- 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 +1071 -251
- package/src/runtime.ts +5 -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 +38 -30
- package/src/sany/generator-proofs.ts +6 -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 +197 -117
- package/src/simulate.ts +165 -102
- package/src/spec-description.ts +8 -6
- package/src/standard-modules.ts +56 -22
- package/src/subexpressions.ts +518 -123
- package/src/successors.ts +10 -3
- package/src/symmetry.ts +2 -1
- package/src/tlc/jar-data.ts +10 -0
- package/src/tlc/messages.ts +3 -3
- package/src/tlc/random.ts +2 -1
- package/src/tlc/replay.ts +27 -14
- package/src/tlc/tlc-operators.ts +10 -8
- package/src/tlc/tlcext-operators.ts +26 -10
- package/src/tlc/trace-spec.ts +9 -22
- package/src/typed-tier.ts +44 -27
- package/src/typescript/types.ts +2 -2
- package/src/values.ts +135 -78
package/src/simulate.ts
CHANGED
|
@@ -10,8 +10,10 @@ import {
|
|
|
10
10
|
UNEXPECTED_EVAL_EXCEPTION,
|
|
11
11
|
UNEXPECTED_EXCEPTION,
|
|
12
12
|
} from "./errors";
|
|
13
|
-
import {
|
|
14
|
-
import {
|
|
13
|
+
import type { State } from "./evaluate";
|
|
14
|
+
import { EXIT_STATUS, getMessageExitStatus, withLivenessChecksExitCode } from "./exit-codes";
|
|
15
|
+
import { getHashMapOrder } from "./java-hash";
|
|
16
|
+
import { createLivenessChecks, type LivenessChecks, type SearchGraph } from "./liveness-checker";
|
|
15
17
|
import { getIncompleteSuccessorMessage, prepareSearch, reportAssumptionViolation } from "./search";
|
|
16
18
|
import { getActionLabel, toActionValue, type SpecAction } from "./spec-description";
|
|
17
19
|
import { forEachInitialState, forEachSuccessor } from "./successors";
|
|
@@ -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
|
-
left.every((value, index) => isSameValue(value, right[index]));
|
|
105
|
+
const isUnequal = () => false;
|
|
96
106
|
|
|
97
|
-
|
|
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
|
+
};
|
|
118
|
+
|
|
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,19 +130,22 @@ 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,
|
|
114
|
-
|
|
137
|
+
checks: LivenessChecks,
|
|
115
138
|
) => {
|
|
116
139
|
const fingerprints = trace.map((node) => getFingerprint(node.state));
|
|
117
140
|
const indices = new Map<bigint, number>();
|
|
118
141
|
const states: Value[][] = [];
|
|
119
142
|
const successors: number[][] = [];
|
|
143
|
+
const stateFingerprints: number[] = [];
|
|
120
144
|
fingerprints.forEach((fingerprint, position) => {
|
|
121
145
|
if (!indices.has(fingerprint)) {
|
|
122
146
|
indices.set(fingerprint, states.length);
|
|
123
147
|
states.push(trace[position].state);
|
|
148
|
+
stateFingerprints.push(Number(BigInt.asIntN(32, fingerprint)));
|
|
124
149
|
successors.push([]);
|
|
125
150
|
}
|
|
126
151
|
if (position === 0) return;
|
|
@@ -130,33 +155,38 @@ const findTemporalViolation = (
|
|
|
130
155
|
successors[source].push(target);
|
|
131
156
|
}
|
|
132
157
|
});
|
|
133
|
-
const
|
|
134
|
-
|
|
135
|
-
checker.addInitialState(0, states[0]);
|
|
136
|
-
states.forEach((state, index) =>
|
|
137
|
-
checker.addState(
|
|
138
|
-
index,
|
|
139
|
-
state,
|
|
140
|
-
successors[index].map((successor) => ({ index: successor, state: states[successor] })),
|
|
141
|
-
),
|
|
158
|
+
const stateSuccessors = successors.map((targets) =>
|
|
159
|
+
targets.map((target) => ({ index: target, state: states[target] })),
|
|
142
160
|
);
|
|
143
|
-
const
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
path.filter((index, position) => position === 0 || index !== path[position - 1]).length;
|
|
147
|
-
const path = [...lasso.prefix, ...lasso.cycle];
|
|
148
|
-
const length = getLength(path);
|
|
149
|
-
const cyclePosition = getLength(path.slice(0, lasso.prefix.length + 1));
|
|
150
|
-
const isStuttering =
|
|
151
|
-
fingerprints[length - 1] === getFingerprint(states[path[lasso.prefix.length]]);
|
|
152
|
-
return {
|
|
153
|
-
length,
|
|
154
|
-
loopStart: isStuttering ? length - 1 : cyclePosition - 1,
|
|
155
|
-
properties: checker.getViolatedProperties(
|
|
156
|
-
trace.slice(0, length).map((node) => node.state),
|
|
157
|
-
cyclePosition - 1,
|
|
158
|
-
),
|
|
161
|
+
const search: SearchGraph<Value[]> = {
|
|
162
|
+
getFingerprint: (successor) => stateFingerprints[successor.index],
|
|
163
|
+
forEachActionSuccessors: (index, _state, onSuccessors) => onSuccessors(stateSuccessors[index]),
|
|
159
164
|
};
|
|
165
|
+
// TLC's LiveCheck1 checks the behavior against one solution after another, up to the first it violates.
|
|
166
|
+
for (let position = 0; position < checks.solutions.length; position++) {
|
|
167
|
+
const checker = checks.createChecker(search, [checks.solutions[position]]);
|
|
168
|
+
checker.addInitialState(0, states[0]);
|
|
169
|
+
states.forEach((state, index) => checker.addState(index, state, stateSuccessors[index]));
|
|
170
|
+
const lasso = checker.findViolation();
|
|
171
|
+
if (!lasso) continue;
|
|
172
|
+
const getLength = (path: number[]) =>
|
|
173
|
+
path.filter((index, position) => position === 0 || index !== path[position - 1]).length;
|
|
174
|
+
const path = [...lasso.prefix, ...lasso.cycle];
|
|
175
|
+
const length = getLength(path);
|
|
176
|
+
const cyclePosition = getLength(path.slice(0, lasso.prefix.length + 1));
|
|
177
|
+
const isStuttering =
|
|
178
|
+
fingerprints[length - 1] === getFingerprint(states[path[lasso.prefix.length]]);
|
|
179
|
+
return {
|
|
180
|
+
length,
|
|
181
|
+
isStuttering,
|
|
182
|
+
loopStart: isStuttering ? length - 1 : cyclePosition - 1,
|
|
183
|
+
properties: checker.getViolatedProperties(
|
|
184
|
+
trace.slice(0, length).map((node) => node.state),
|
|
185
|
+
cyclePosition - 1,
|
|
186
|
+
),
|
|
187
|
+
};
|
|
188
|
+
}
|
|
189
|
+
return undefined;
|
|
160
190
|
};
|
|
161
191
|
|
|
162
192
|
const createScheduler = (
|
|
@@ -252,10 +282,6 @@ export const simulate = (options: SimulationOptions): number => {
|
|
|
252
282
|
let evaluatedAction: SpecAction | undefined;
|
|
253
283
|
runtime.getSuccessorAction = () => evaluatedAction;
|
|
254
284
|
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
285
|
runtime.getSimulationValue = (key, state) => {
|
|
260
286
|
const node = state && nodes.get(state);
|
|
261
287
|
switch (key) {
|
|
@@ -268,7 +294,7 @@ export const simulate = (options: SimulationOptions): number => {
|
|
|
268
294
|
case "action":
|
|
269
295
|
return node && toActionValue(node.action);
|
|
270
296
|
case "config":
|
|
271
|
-
return
|
|
297
|
+
return createTlcRecord([
|
|
272
298
|
["mode", options.isGenerating ? "generate" : "simulate"],
|
|
273
299
|
["depth", traceDepth === INFINITE_DEPTH ? -1 : traceDepth],
|
|
274
300
|
["traces", Number(BigInt.asIntN(32, traceLimit))],
|
|
@@ -284,14 +310,19 @@ export const simulate = (options: SimulationOptions): number => {
|
|
|
284
310
|
for (let step = node; step && step.level > 1; step = step.predecessor) {
|
|
285
311
|
actions.set(step.action.name, (actions.get(step.action.name) ?? 0) + 1);
|
|
286
312
|
}
|
|
287
|
-
|
|
313
|
+
// TLC's SimulationWorker counts the actions of a behavior in a HashMap.
|
|
314
|
+
const counts = getHashMapOrder([...actions.keys()]).map((name): [string, Value] => [
|
|
315
|
+
name,
|
|
316
|
+
actions.get(name) ?? 0,
|
|
317
|
+
]);
|
|
318
|
+
return createTlcRecord([
|
|
288
319
|
["traces", statistics.traces],
|
|
289
320
|
["duration", Math.floor((Date.now() - runtime.startedAt) / 1000)],
|
|
290
321
|
["generated", statistics.generatedStates],
|
|
291
322
|
[
|
|
292
323
|
"behavior",
|
|
293
|
-
|
|
294
|
-
["actions",
|
|
324
|
+
createTlcRecord([
|
|
325
|
+
["actions", createTlcRecord(counts)],
|
|
295
326
|
["id", currentTrace],
|
|
296
327
|
]),
|
|
297
328
|
],
|
|
@@ -311,6 +342,10 @@ export const simulate = (options: SimulationOptions): number => {
|
|
|
311
342
|
if (!search) {
|
|
312
343
|
throw new TlaUnsupportedError("tla-ts can't simulate a specification without variables");
|
|
313
344
|
}
|
|
345
|
+
runtime.getBehavior = (state) => {
|
|
346
|
+
const node = nodes.get(state);
|
|
347
|
+
return node ? getTrace(node, search.getTlcOrder()).map((step) => step.state) : [state];
|
|
348
|
+
};
|
|
314
349
|
const reportPostcondition = (isAfterViolation: boolean) => {
|
|
315
350
|
const postcondition = search.findPostconditionViolation(isAfterViolation);
|
|
316
351
|
if (!postcondition) return undefined;
|
|
@@ -322,19 +357,12 @@ export const simulate = (options: SimulationOptions): number => {
|
|
|
322
357
|
);
|
|
323
358
|
return postcondition;
|
|
324
359
|
};
|
|
325
|
-
const
|
|
326
|
-
|
|
327
|
-
|
|
328
|
-
|
|
329
|
-
|
|
330
|
-
|
|
331
|
-
Number(BigInt.asIntN(32, runtime.getFingerprint(successor.state))),
|
|
332
|
-
getSuccessors: (index) =>
|
|
333
|
-
successors[index].map((successor) => ({ index: successor, state: states[successor] })),
|
|
334
|
-
}),
|
|
335
|
-
),
|
|
336
|
-
);
|
|
337
|
-
const branches = createTemporalChecker([], [])?.branches;
|
|
360
|
+
const livenessChecks = withLivenessChecksExitCode(() =>
|
|
361
|
+
withUnexpectedException(() =>
|
|
362
|
+
createLivenessChecks(search.properties.liveness, search.spec.temporals, environment),
|
|
363
|
+
),
|
|
364
|
+
);
|
|
365
|
+
const branches = livenessChecks?.solutions.length;
|
|
338
366
|
if (branches) options.onProgress?.({ kind: "liveness-prepared", branches });
|
|
339
367
|
const assumptionStatus = reportAssumptionViolation(
|
|
340
368
|
specification.assumptions,
|
|
@@ -351,25 +379,35 @@ export const simulate = (options: SimulationOptions): number => {
|
|
|
351
379
|
const toRecord = (state: (Value | undefined)[]) =>
|
|
352
380
|
search.toRecord(state.map((value) => value ?? createModelValue("null")));
|
|
353
381
|
const toTraceSteps = (trace: TraceNode[]): TraceStep[] =>
|
|
354
|
-
trace.map((node, index) =>
|
|
355
|
-
|
|
356
|
-
|
|
357
|
-
|
|
358
|
-
|
|
359
|
-
|
|
360
|
-
|
|
361
|
-
|
|
362
|
-
|
|
363
|
-
|
|
364
|
-
|
|
365
|
-
|
|
366
|
-
|
|
367
|
-
|
|
382
|
+
trace.map((node, index) => {
|
|
383
|
+
const successor = trace[index + 1] ?? node;
|
|
384
|
+
return {
|
|
385
|
+
action: node.action.name,
|
|
386
|
+
label: getActionLabel(node.action, options.version, node.level === 1),
|
|
387
|
+
state:
|
|
388
|
+
config.alias === undefined
|
|
389
|
+
? toRecord(node.state)
|
|
390
|
+
: search.evaluateAlias(
|
|
391
|
+
config.alias,
|
|
392
|
+
node.incomplete ?? node.state,
|
|
393
|
+
successor.incomplete ?? successor.state,
|
|
394
|
+
options.isTool ?? false,
|
|
395
|
+
),
|
|
396
|
+
};
|
|
397
|
+
});
|
|
398
|
+
const getCounterExample = (
|
|
399
|
+
trace: TraceNode[],
|
|
400
|
+
steps = toTraceSteps(trace),
|
|
401
|
+
loop?: CounterExampleLoop,
|
|
402
|
+
) =>
|
|
368
403
|
createCounterExample(
|
|
369
|
-
|
|
404
|
+
steps.map((step) => step.state),
|
|
370
405
|
trace.slice(1).map((node) => toActionValue(node.action)),
|
|
371
|
-
|
|
406
|
+
loop,
|
|
372
407
|
);
|
|
408
|
+
// TLC's Simulator binds CounterExample to an initial state that violates an invariant, not to its alias.
|
|
409
|
+
const getInitialCounterExample = (node: TraceNode) =>
|
|
410
|
+
createCounterExample([toRecord(node.state)], [], undefined);
|
|
373
411
|
|
|
374
412
|
const initialStates: TraceNode[] = [];
|
|
375
413
|
const isComplete = (state: (Value | undefined)[]): state is Value[] =>
|
|
@@ -414,6 +452,7 @@ export const simulate = (options: SimulationOptions): number => {
|
|
|
414
452
|
undefined,
|
|
415
453
|
false,
|
|
416
454
|
);
|
|
455
|
+
const generatedNodes: TraceNode[] = [];
|
|
417
456
|
for (const state of generated) {
|
|
418
457
|
if (!isComplete(state)) {
|
|
419
458
|
reportMessage(
|
|
@@ -431,22 +470,11 @@ export const simulate = (options: SimulationOptions): number => {
|
|
|
431
470
|
MESSAGE_CODE.invariantViolatedInitial,
|
|
432
471
|
`Invariant ${violated.name} is violated by the initial state:\n${formatState(alias)}`,
|
|
433
472
|
);
|
|
434
|
-
runtime.counterExample =
|
|
473
|
+
runtime.counterExample = getInitialCounterExample(node);
|
|
435
474
|
reportPostcondition(true);
|
|
436
475
|
return EXIT_STATUS.safetyViolation;
|
|
437
476
|
}
|
|
438
|
-
|
|
439
|
-
const predicate = search.findFailedInitialPredicate(state);
|
|
440
|
-
if (predicate) {
|
|
441
|
-
const alias = toTraceSteps([node])[0].state;
|
|
442
|
-
reportMessage(
|
|
443
|
-
MESSAGE_CODE.propertyViolatedInitial,
|
|
444
|
-
`Property ${predicate.name} is violated by the initial state:\n${formatState(alias)}`,
|
|
445
|
-
);
|
|
446
|
-
runtime.counterExample = getCounterExample([node]);
|
|
447
|
-
reportPostcondition(true);
|
|
448
|
-
return EXIT_STATUS.livenessViolation;
|
|
449
|
-
}
|
|
477
|
+
generatedNodes.push(node);
|
|
450
478
|
if (search.satisfiesConstraints(state)) {
|
|
451
479
|
search.trackStatePossible(state);
|
|
452
480
|
initialStates.push(node);
|
|
@@ -469,12 +497,32 @@ export const simulate = (options: SimulationOptions): number => {
|
|
|
469
497
|
);
|
|
470
498
|
return EXIT_STATUS.error;
|
|
471
499
|
}
|
|
500
|
+
// Deviation from TLC: its simulator checks no implied init, tla-ts checks them after TLC's own checks of the initial states.
|
|
501
|
+
for (const node of generatedNodes) {
|
|
502
|
+
try {
|
|
503
|
+
const predicate = search.findFailedInitialPredicate(node.state);
|
|
504
|
+
if (predicate) {
|
|
505
|
+
const alias = toTraceSteps([node])[0].state;
|
|
506
|
+
reportMessage(
|
|
507
|
+
MESSAGE_CODE.propertyViolatedInitial,
|
|
508
|
+
`Property ${predicate.name} is violated by the initial state:\n${formatState(alias)}`,
|
|
509
|
+
);
|
|
510
|
+
runtime.counterExample = getInitialCounterExample(node);
|
|
511
|
+
reportPostcondition(true);
|
|
512
|
+
return EXIT_STATUS.livenessViolation;
|
|
513
|
+
}
|
|
514
|
+
} catch (error) {
|
|
515
|
+
return reportInitialException(error, node.state);
|
|
516
|
+
}
|
|
517
|
+
}
|
|
472
518
|
reportMessage(
|
|
473
519
|
MESSAGE_CODE.initGenerated1,
|
|
474
520
|
`Finished computing initial states: ${initialStates.length} distinct state generated at ${formatTlcDate(new Date())}.`,
|
|
475
521
|
undefined,
|
|
476
522
|
false,
|
|
477
523
|
);
|
|
524
|
+
// TLC's Simulator deep-normalizes the initial states, which sorts their records.
|
|
525
|
+
initialStates.forEach((node) => node.state.forEach(markNormalized));
|
|
478
526
|
|
|
479
527
|
const toWorkerError = (code: number, text: string, node: TraceNode): WorkerError => ({
|
|
480
528
|
code,
|
|
@@ -545,6 +593,7 @@ export const simulate = (options: SimulationOptions): number => {
|
|
|
545
593
|
action,
|
|
546
594
|
current,
|
|
547
595
|
);
|
|
596
|
+
node.incomplete = error.state;
|
|
548
597
|
const text = getIncompleteSuccessorMessage(
|
|
549
598
|
error.variables,
|
|
550
599
|
action.name,
|
|
@@ -563,18 +612,34 @@ export const simulate = (options: SimulationOptions): number => {
|
|
|
563
612
|
runtime.getFingerprint,
|
|
564
613
|
search.getReward,
|
|
565
614
|
);
|
|
566
|
-
const getTemporalViolation = (last: TraceNode):
|
|
567
|
-
if (
|
|
568
|
-
const trace = getTrace(last);
|
|
569
|
-
|
|
615
|
+
const getTemporalViolation = (last: TraceNode): WorkerError | undefined => {
|
|
616
|
+
if (!livenessChecks) return undefined;
|
|
617
|
+
const trace = getTrace(last, search.getTlcOrder());
|
|
618
|
+
// TLC's LiveCheck#checkTrace fingerprints each state, which sorts its records.
|
|
619
|
+
for (let position = 0; position < trace.length; position++) {
|
|
620
|
+
trace[position].state.forEach(markNormalized);
|
|
621
|
+
}
|
|
622
|
+
const found = findTemporalViolation(trace, runtime.getFingerprint, livenessChecks);
|
|
570
623
|
if (!found) return undefined;
|
|
571
624
|
const back = trace[found.length];
|
|
625
|
+
const lasso = trace.slice(0, found.length);
|
|
626
|
+
const steps = toTraceSteps(lasso);
|
|
627
|
+
const loopAction =
|
|
628
|
+
found.isStuttering || !back ? createActionRecord(undefined) : toActionValue(back.action);
|
|
572
629
|
return {
|
|
573
|
-
|
|
574
|
-
|
|
575
|
-
|
|
576
|
-
|
|
577
|
-
|
|
630
|
+
...toWorkerError(MESSAGE_CODE.temporalPropertyViolated, "", last),
|
|
631
|
+
isException: true,
|
|
632
|
+
violation: {
|
|
633
|
+
name: found.properties[0],
|
|
634
|
+
properties: found.properties,
|
|
635
|
+
trace: steps,
|
|
636
|
+
loopStart: found.loopStart,
|
|
637
|
+
loopLabel: back && getActionLabel(back.action, options.version, back.level === 1),
|
|
638
|
+
},
|
|
639
|
+
counterExample: getCounterExample(lasso, steps, {
|
|
640
|
+
start: found.loopStart,
|
|
641
|
+
action: loopAction,
|
|
642
|
+
}),
|
|
578
643
|
};
|
|
579
644
|
};
|
|
580
645
|
const simulateTrace = (): WorkerError | "stopped" | undefined => {
|
|
@@ -586,6 +651,7 @@ export const simulate = (options: SimulationOptions): number => {
|
|
|
586
651
|
let successors: TraceNode[] = [];
|
|
587
652
|
for (let attempt = 0; attempt < nextActions.length; attempt++) {
|
|
588
653
|
const result = getSuccessors(currentNode, nextActions[actionIndex]);
|
|
654
|
+
// Deviation from TLC: TLCSet("exit") interrupts TLC's SimulationWorker, whose BlockingQueue#put then drops a violation found in the same step.
|
|
589
655
|
if (result.error) return result.error;
|
|
590
656
|
successors = result.successors;
|
|
591
657
|
if (successors.length > 0) break;
|
|
@@ -603,13 +669,7 @@ export const simulate = (options: SimulationOptions): number => {
|
|
|
603
669
|
}
|
|
604
670
|
if (runtime.isStopped) return "stopped";
|
|
605
671
|
const violation = getTemporalViolation(currentNode);
|
|
606
|
-
if (violation)
|
|
607
|
-
return {
|
|
608
|
-
...toWorkerError(MESSAGE_CODE.temporalPropertyViolated, "", currentNode),
|
|
609
|
-
isException: true,
|
|
610
|
-
violation,
|
|
611
|
-
};
|
|
612
|
-
}
|
|
672
|
+
if (violation) return violation;
|
|
613
673
|
const length = Math.min(traceDepth, currentNode.level);
|
|
614
674
|
const delta = length - statistics.levelMean;
|
|
615
675
|
statistics.levelMean += Math.trunc(delta / Math.max(statistics.traces, 1));
|
|
@@ -684,14 +744,17 @@ export const simulate = (options: SimulationOptions): number => {
|
|
|
684
744
|
reportMessage(error.code, error.message, error.toolMessage);
|
|
685
745
|
output({
|
|
686
746
|
kind: "behavior",
|
|
687
|
-
trace: toTraceSteps(getTrace(error.node)),
|
|
747
|
+
trace: toTraceSteps(getTrace(error.node, search.getTlcOrder())),
|
|
688
748
|
isLastStateOnly: traceDepth === INFINITE_DEPTH,
|
|
689
749
|
});
|
|
690
750
|
if (error.isSummarized) printSummary();
|
|
691
751
|
});
|
|
692
752
|
const last = reported[reported.length - 1];
|
|
693
753
|
const errorStatus = last ? getMessageExitStatus(last.code) : EXIT_STATUS.success;
|
|
694
|
-
if (last)
|
|
754
|
+
if (last) {
|
|
755
|
+
runtime.counterExample =
|
|
756
|
+
last.counterExample ?? getCounterExample(getTrace(last.node, search.getTlcOrder()));
|
|
757
|
+
}
|
|
695
758
|
const postcondition = reportPostcondition(last !== undefined);
|
|
696
759
|
const postconditionStatus = postcondition
|
|
697
760
|
? 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,13 +267,15 @@ 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,
|
|
275
274
|
);
|
|
276
275
|
case "Label":
|
|
277
276
|
return getActions(expression.body, scope, closure, environment, instanceActions);
|
|
277
|
+
case "Selection":
|
|
278
|
+
return getActions(expression.expression, scope, closure, environment, instanceActions);
|
|
278
279
|
case "Or":
|
|
279
280
|
return expression.operands.flatMap((operand) =>
|
|
280
281
|
getActions(operand, scope, closure, environment, instanceActions),
|
|
@@ -526,6 +527,7 @@ export const getSubscriptVariables = (
|
|
|
526
527
|
return expression.elements.every((element) => collect(element, innerScope));
|
|
527
528
|
}
|
|
528
529
|
if (expression.kind === "Label") return collect(expression.body, innerScope);
|
|
530
|
+
if (expression.kind === "Selection") return collect(expression.expression, innerScope);
|
|
529
531
|
const unwrapped = unwrapBinding(expression, innerScope, environment);
|
|
530
532
|
if (unwrapped) return collect(unwrapped.expression, unwrapped.scope);
|
|
531
533
|
const argument =
|