tla-ts 0.0.10-dev.d618a2d79 → 0.0.10-dev.e3e5dd576
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 +53 -53
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +18 -4
- package/dist/index.d.ts +18 -4
- 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 +56 -56
- package/dist/prove.js +78 -78
- package/dist/run.cjs +40 -44
- package/dist/run.js +42 -46
- package/dist/tlapm.cjs +1 -1
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +49 -44
- package/dist/transfer.js +48 -43
- package/dist/worker.cjs +7 -7
- package/dist/worker.js +7 -7
- package/package.json +1 -1
- package/src/ast.ts +14 -2
- package/src/bags.ts +50 -29
- package/src/builtins.ts +4 -3
- package/src/check-failure.ts +13 -11
- package/src/check-trace.ts +116 -64
- package/src/check.ts +516 -280
- package/src/cli/runtime-invariants.ts +20 -56
- package/src/cli/tlc-arguments.ts +2 -2
- package/src/cli/tlc-output.ts +18 -4
- package/src/cli/tlc.ts +18 -12
- package/src/cli/xml-exporter.ts +1 -1
- package/src/codegen.ts +23 -10
- package/src/coverage.ts +190 -1
- package/src/dependencies.ts +68 -15
- package/src/dfid.ts +101 -36
- package/src/environment.ts +123 -38
- package/src/errors.ts +7 -0
- package/src/evaluate.ts +370 -99
- package/src/exit-codes.ts +28 -14
- package/src/instances.ts +135 -11
- package/src/java-hash.ts +14 -0
- package/src/java-overrides.ts +2 -2
- package/src/levels.ts +675 -236
- package/src/lexer.ts +12 -2
- package/src/liveness-checker.ts +179 -60
- package/src/liveness.ts +51 -10
- 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/parallel-worker.ts +8 -2
- package/src/parallel.ts +5 -0
- package/src/parser.ts +180 -149
- 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 +171 -58
- package/src/prover/smt/solver/ast-lt.ts +1 -1
- package/src/prover/smt/solver/ast.ts +66 -14
- package/src/prover/smt/solver/auf-solver.ts +23 -12
- package/src/prover/smt/solver/bit-blast-tactic.ts +27 -1
- 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 +84 -15
- 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 +28 -16
- package/src/prover/smt/solver/diff-neq.ts +1 -2
- package/src/prover/smt/solver/dt2bv-tactic.ts +57 -21
- 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 +608 -139
- 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 +15 -5
- package/src/prover/smt/solver/lp/core-solver.ts +12 -8
- package/src/prover/smt/solver/lp/lar-solver.ts +1 -1
- package/src/prover/smt/solver/lp/lp-settings.ts +6 -2
- package/src/prover/smt/solver/lp/nla-core.ts +1 -1
- package/src/prover/smt/solver/lp/nla-grobner.ts +158 -80
- package/src/prover/smt/solver/lp/nra-solver.ts +45 -39
- package/src/prover/smt/solver/lp/pdd-interval.ts +6 -2
- package/src/prover/smt/solver/lp/pdd-simplifier.ts +60 -20
- package/src/prover/smt/solver/lp/pdd-solver.ts +72 -39
- package/src/prover/smt/solver/lp/pdd.ts +725 -290
- 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 +7 -3
- package/src/prover/smt/solver/sat/config.ts +1 -1
- package/src/prover/smt/solver/sat/goal2sat.ts +65 -12
- package/src/prover/smt/solver/sat/inc-sat-solver.ts +129 -43
- package/src/prover/smt/solver/sat/model-converter.ts +1 -1
- package/src/prover/smt/solver/sat/pb-constraint.ts +7 -0
- package/src/prover/smt/solver/sat/pb-solver.ts +26 -7
- package/src/prover/smt/solver/sat/sat-tactic.ts +17 -7
- package/src/prover/smt/solver/sat/sat2goal.ts +72 -48
- package/src/prover/smt/solver/sat/simplifier.ts +1 -1
- package/src/prover/smt/solver/sat/solver.ts +27 -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 +106 -13
- package/src/prover/smt/solver/smtlib-parser.ts +589 -224
- package/src/prover/smt/solver/smtlib-script.ts +713 -210
- 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 +350 -195
- 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-state.ts +1 -1
- 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/theory-without-terms.ts +24 -0
- 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 +1274 -257
- package/src/runtime.ts +7 -1
- package/src/sany/builtins.ts +10 -10
- package/src/sany/generation.ts +5 -15
- package/src/sany/generator-def-entries.ts +123 -36
- package/src/sany/generator-definitions.ts +5 -3
- package/src/sany/generator-expressions.ts +60 -37
- package/src/sany/generator-proofs.ts +18 -12
- package/src/sany/generator.ts +12 -6
- package/src/sany/lexer.ts +15 -7
- 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 +319 -135
- package/src/simulate.ts +235 -182
- package/src/spec-description.ts +8 -6
- package/src/standard-definitions.ts +1 -0
- package/src/standard-modules.ts +56 -22
- package/src/subexpressions.ts +564 -138
- package/src/successors.ts +37 -13
- package/src/symmetry.ts +2 -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 +67 -43
- 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/trace-liveness.ts +529 -0
- package/src/typed-tier.ts +52 -31
- package/src/typescript/types.ts +2 -2
- package/src/values.ts +150 -79
package/src/check-trace.ts
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
import type { CheckOptions, OutputLine, TraceStep } from "./check";
|
|
2
2
|
import type { ModelConfig } from "./config";
|
|
3
3
|
import { TlaEvaluationError } from "./errors";
|
|
4
|
-
import { isImpure, type Environment } from "./evaluate";
|
|
5
|
-
import { isSameState } from "./fingerprints";
|
|
4
|
+
import { isImpure, type Environment, type State } from "./evaluate";
|
|
5
|
+
import { getStateHash, isSameState } from "./fingerprints";
|
|
6
6
|
import type { Search } from "./search";
|
|
7
7
|
import { getActionLabel, type SpecAction } from "./spec-description";
|
|
8
8
|
import { getSuccessors, type Successor } from "./successors";
|
|
9
|
-
import type
|
|
9
|
+
import { createModelValue, getFingerprintError, isSameValue, type Value } from "./values";
|
|
10
10
|
|
|
11
11
|
export interface Behavior {
|
|
12
12
|
trace: TraceStep[];
|
|
@@ -16,6 +16,8 @@ export interface Behavior {
|
|
|
16
16
|
interface TraceOptions {
|
|
17
17
|
loopStart?: number;
|
|
18
18
|
known?: number;
|
|
19
|
+
incomplete?: State;
|
|
20
|
+
isPrintedOnly?: boolean;
|
|
19
21
|
}
|
|
20
22
|
|
|
21
23
|
interface RebuiltState {
|
|
@@ -35,6 +37,7 @@ export interface SearchPosition {
|
|
|
35
37
|
export interface TracedStep {
|
|
36
38
|
state: Record<string, Value>;
|
|
37
39
|
action: SpecAction | undefined;
|
|
40
|
+
alias?: Record<string, Value>;
|
|
38
41
|
}
|
|
39
42
|
|
|
40
43
|
interface TraceContext {
|
|
@@ -52,6 +55,7 @@ interface TraceContext {
|
|
|
52
55
|
tracedSteps: WeakMap<TraceStep, TracedStep>;
|
|
53
56
|
captureOutput: <Result>(rebuild: () => Result) => { result: Result; lines: OutputLine[] };
|
|
54
57
|
getInitialStates: () => Value[][];
|
|
58
|
+
getUncoveredInitialStates: () => Value[][];
|
|
55
59
|
findSuccessorAction: (
|
|
56
60
|
state: Value[],
|
|
57
61
|
isMatch: (successor: Successor) => boolean,
|
|
@@ -59,7 +63,7 @@ interface TraceContext {
|
|
|
59
63
|
}
|
|
60
64
|
|
|
61
65
|
const INITIAL_RECOVERY_FAILURE = "Failed to recover the initial state from its fingerprint.";
|
|
62
|
-
const NEXT_RECOVERY_FAILURE = "Failed to recover the next state from its fingerprint.";
|
|
66
|
+
export const NEXT_RECOVERY_FAILURE = "Failed to recover the next state from its fingerprint.";
|
|
63
67
|
|
|
64
68
|
export const createTraceBuilder = (context: TraceContext) => {
|
|
65
69
|
const config = context.config;
|
|
@@ -78,39 +82,44 @@ export const createTraceBuilder = (context: TraceContext) => {
|
|
|
78
82
|
|
|
79
83
|
const getAliasState = (
|
|
80
84
|
alias: string,
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
85
|
+
state: State,
|
|
86
|
+
successor: State,
|
|
87
|
+
level: number,
|
|
88
|
+
getBehavior: () => Value[][],
|
|
84
89
|
) => {
|
|
85
90
|
const searchLevel = runtime.getLevel;
|
|
86
91
|
const searchBehavior = runtime.getBehavior;
|
|
87
|
-
runtime.getLevel = () =>
|
|
88
|
-
runtime.getBehavior =
|
|
92
|
+
runtime.getLevel = () => level;
|
|
93
|
+
runtime.getBehavior = getBehavior;
|
|
89
94
|
try {
|
|
90
|
-
return search.evaluateAlias(
|
|
91
|
-
alias,
|
|
92
|
-
steps[position].state,
|
|
93
|
-
(steps[position + 1] ?? steps[loopStart ?? position]).state,
|
|
94
|
-
options.isTool ?? false,
|
|
95
|
-
);
|
|
95
|
+
return search.evaluateAlias(alias, state, successor, options.isTool ?? false);
|
|
96
96
|
} finally {
|
|
97
97
|
runtime.getLevel = searchLevel;
|
|
98
98
|
runtime.getBehavior = searchBehavior;
|
|
99
99
|
}
|
|
100
100
|
};
|
|
101
|
+
// Deviation from TLC: TLCTrace#printTrace and Worker#doPostCondition rebuild a step with the generator that already drew for its state, so they miss it; printTrace leaks a NullPointerException and doPostCondition skips the postcondition.
|
|
102
|
+
const rebuildFrom = (state: Value[], level: number) => {
|
|
103
|
+
current.rebuilt = { state, level };
|
|
104
|
+
runtime.reseedRandom();
|
|
105
|
+
};
|
|
106
|
+
// TLC's TLCStateMut#equals compares the variables in turn, and a lazy value fails as it reaches it.
|
|
107
|
+
const isEqualState = (state: Value[], successor: Value[]) =>
|
|
108
|
+
state.every((value, position) => {
|
|
109
|
+
const error = getFingerprintError(value);
|
|
110
|
+
if (error) throw error;
|
|
111
|
+
return isSameValue(value, successor[position]);
|
|
112
|
+
});
|
|
101
113
|
const findStepAction = (index: number, previous: Value[], state: Value[], isHeld: boolean) => {
|
|
102
114
|
const expanding = { ...current };
|
|
103
|
-
Object.assign(current, {
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
candidate: undefined,
|
|
107
|
-
rebuilt: { state: previous, level: depths[index] },
|
|
108
|
-
});
|
|
109
|
-
const getKey = isHeld ? (values: Value[]) => values : getFingerprintState;
|
|
110
|
-
const key = getKey(state);
|
|
115
|
+
Object.assign(current, { index, isExpanding: true, candidate: undefined });
|
|
116
|
+
rebuildFrom(previous, depths[index]);
|
|
117
|
+
const key = isHeld ? state : getFingerprintState(state);
|
|
111
118
|
try {
|
|
112
119
|
return context.findSuccessorAction(previous, (successor) =>
|
|
113
|
-
|
|
120
|
+
isHeld
|
|
121
|
+
? isEqualState(key, successor.state)
|
|
122
|
+
: isSameState(getFingerprintState(successor.state), key),
|
|
114
123
|
);
|
|
115
124
|
} finally {
|
|
116
125
|
Object.assign(current, expanding);
|
|
@@ -123,7 +132,13 @@ export const createTraceBuilder = (context: TraceContext) => {
|
|
|
123
132
|
): Behavior => {
|
|
124
133
|
const alias = config.alias;
|
|
125
134
|
const known = traceOptions.known ?? 1;
|
|
126
|
-
const
|
|
135
|
+
const loopStart = traceOptions.loopStart;
|
|
136
|
+
const rebuilt = is174 && loopStart !== undefined ? loopStart + 1 : steps.length - known;
|
|
137
|
+
const isRebuiltAgain = known > 0 && !is174 && !traceOptions.isPrintedOnly;
|
|
138
|
+
const initialOutput =
|
|
139
|
+
known === 0 || (steps.length > 1 && (rebuilt > 0 || isRebuiltAgain || is174))
|
|
140
|
+
? captureOutput(context.getInitialStates).lines
|
|
141
|
+
: [];
|
|
127
142
|
const stepActions = steps.map((step, position) =>
|
|
128
143
|
position === 0 || step.action === "Stuttering"
|
|
129
144
|
? { result: undefined, lines: [] }
|
|
@@ -137,10 +152,7 @@ export const createTraceBuilder = (context: TraceContext) => {
|
|
|
137
152
|
),
|
|
138
153
|
);
|
|
139
154
|
const outputs = stepActions.map((step) => step.lines);
|
|
140
|
-
const loopStart = traceOptions.loopStart;
|
|
141
|
-
const rebuilt = is174 && loopStart !== undefined ? loopStart + 1 : steps.length - known;
|
|
142
155
|
if (environment.coverage && steps.length > 1) {
|
|
143
|
-
const isRebuiltAgain = known > 0 && !is174;
|
|
144
156
|
if (rebuilt > 0 && isRebuiltAgain) captureOutput(context.getInitialStates);
|
|
145
157
|
if (isRebuiltAgain) {
|
|
146
158
|
steps.slice(1).forEach((step, position) => {
|
|
@@ -166,7 +178,15 @@ export const createTraceBuilder = (context: TraceContext) => {
|
|
|
166
178
|
state:
|
|
167
179
|
alias === undefined
|
|
168
180
|
? toRecord(step.state)
|
|
169
|
-
: getAliasState(
|
|
181
|
+
: getAliasState(
|
|
182
|
+
alias,
|
|
183
|
+
step.state,
|
|
184
|
+
steps[position + 1]?.state ??
|
|
185
|
+
traceOptions.incomplete ??
|
|
186
|
+
steps[loopStart ?? position].state,
|
|
187
|
+
position + 1,
|
|
188
|
+
() => steps.slice(0, position + 1).map((inner) => inner.state),
|
|
189
|
+
),
|
|
170
190
|
output: position === 0 ? prefixOutput : position < rebuilt ? [] : outputs[position],
|
|
171
191
|
};
|
|
172
192
|
if (alias !== undefined || action) {
|
|
@@ -174,7 +194,7 @@ export const createTraceBuilder = (context: TraceContext) => {
|
|
|
174
194
|
}
|
|
175
195
|
return traceStep;
|
|
176
196
|
}),
|
|
177
|
-
traceOutput:
|
|
197
|
+
traceOutput: isRebuiltAgain ? [initialOutput, ...outputs].flat() : [],
|
|
178
198
|
};
|
|
179
199
|
};
|
|
180
200
|
const findTraceSuccessor = (state: Value[], isMatch: (successor: Successor) => boolean) =>
|
|
@@ -187,14 +207,28 @@ export const createTraceBuilder = (context: TraceContext) => {
|
|
|
187
207
|
}
|
|
188
208
|
return undefined;
|
|
189
209
|
}).result;
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
210
|
+
// TLC's Tool#getState fingerprints each state it rebuilds, which sorts its records in place.
|
|
211
|
+
const hasFingerprint = (state: Value[], index: number) => {
|
|
212
|
+
const fingerprintState = getFingerprintState(state);
|
|
213
|
+
const stored = context.fingerprintStates[index];
|
|
214
|
+
return (
|
|
215
|
+
getStateHash(fingerprintState) === getStateHash(stored) &&
|
|
216
|
+
isSameState(fingerprintState, stored)
|
|
217
|
+
);
|
|
218
|
+
};
|
|
219
|
+
const findSuccessorWithFingerprint = (state: Value[], source: number, target: number) => {
|
|
220
|
+
const rebuilt = current.rebuilt;
|
|
221
|
+
rebuildFrom(state, depths[source]);
|
|
222
|
+
const successor = findTraceSuccessor(state, (candidate) =>
|
|
223
|
+
hasFingerprint(candidate.state, target),
|
|
224
|
+
);
|
|
225
|
+
current.rebuilt = rebuilt;
|
|
226
|
+
return successor;
|
|
227
|
+
};
|
|
194
228
|
const getPathStates = (path: number[], nextFailure: string) => {
|
|
195
229
|
const initial = captureOutput(() =>
|
|
196
230
|
isReducing || isImpure(environment)
|
|
197
|
-
? context.
|
|
231
|
+
? context.getUncoveredInitialStates().find((state) => hasFingerprint(state, path[0]))
|
|
198
232
|
: states[path[0]],
|
|
199
233
|
).result;
|
|
200
234
|
if (!initial) throw new TlaEvaluationError(INITIAL_RECOVERY_FAILURE);
|
|
@@ -205,16 +239,13 @@ export const createTraceBuilder = (context: TraceContext) => {
|
|
|
205
239
|
steps.push({ state: previous, action: "Stuttering" });
|
|
206
240
|
continue;
|
|
207
241
|
}
|
|
208
|
-
const
|
|
209
|
-
current.rebuilt = { state: previous, level: depths[path[position - 1]] };
|
|
210
|
-
const successor = findSuccessorWithFingerprint(previous, path[position]);
|
|
211
|
-
current.rebuilt = rebuilt;
|
|
242
|
+
const successor = findSuccessorWithFingerprint(previous, path[position - 1], path[position]);
|
|
212
243
|
if (!successor) throw new TlaEvaluationError(nextFailure);
|
|
213
244
|
steps.push(successor);
|
|
214
245
|
}
|
|
215
246
|
return steps;
|
|
216
247
|
};
|
|
217
|
-
const getTrace = (index: number, lastSuccessor?: Successor) => {
|
|
248
|
+
const getTrace = (index: number, lastSuccessor?: Successor, traceOptions: TraceOptions = {}) => {
|
|
218
249
|
const path: number[] = [];
|
|
219
250
|
for (let position = index; position !== -1; position = context.parents[position]) {
|
|
220
251
|
path.unshift(position);
|
|
@@ -226,43 +257,64 @@ export const createTraceBuilder = (context: TraceContext) => {
|
|
|
226
257
|
state: states[position],
|
|
227
258
|
action: context.actions[position],
|
|
228
259
|
}));
|
|
229
|
-
if (!lastSuccessor) return toTrace(steps, path);
|
|
260
|
+
if (!lastSuccessor) return toTrace(steps, path, traceOptions);
|
|
230
261
|
const action = isReducing
|
|
231
262
|
? findTraceSuccessor(states[index], (successor) =>
|
|
232
263
|
isSameState(successor.state, lastSuccessor.state),
|
|
233
264
|
)?.action
|
|
234
265
|
: lastSuccessor.action;
|
|
235
|
-
return toTrace([...steps, { state: lastSuccessor.state, action }], path, {
|
|
266
|
+
return toTrace([...steps, { state: lastSuccessor.state, action }], path, {
|
|
267
|
+
...traceOptions,
|
|
268
|
+
known: 2,
|
|
269
|
+
});
|
|
236
270
|
};
|
|
237
|
-
// TLCTrace#printTrace
|
|
238
|
-
const getStateTrace = (index: number): Behavior =>
|
|
239
|
-
context.parents[index]
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
|
|
246
|
-
|
|
247
|
-
|
|
248
|
-
|
|
249
|
-
const
|
|
250
|
-
const
|
|
251
|
-
|
|
252
|
-
|
|
253
|
-
|
|
254
|
-
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
|
|
271
|
+
// TLCTrace#printTrace applies the alias to every state but an initial one it prints without a successor.
|
|
272
|
+
const getStateTrace = (index: number, traceOptions: TraceOptions = {}): Behavior => {
|
|
273
|
+
if (context.parents[index] !== -1) return getTrace(index, undefined, traceOptions);
|
|
274
|
+
const traceOutput =
|
|
275
|
+
is174 || traceOptions.isPrintedOnly ? [] : captureOutput(context.getInitialStates).lines;
|
|
276
|
+
const state = states[index];
|
|
277
|
+
if (traceOptions.incomplete !== undefined) {
|
|
278
|
+
return {
|
|
279
|
+
trace: toTrace([{ state, action: undefined }], [index], traceOptions).trace,
|
|
280
|
+
traceOutput,
|
|
281
|
+
};
|
|
282
|
+
}
|
|
283
|
+
const step = { action: undefined, label: undefined, state: toRecord(state) };
|
|
284
|
+
const alias = config.alias;
|
|
285
|
+
if (alias !== undefined) {
|
|
286
|
+
context.tracedSteps.set(step, {
|
|
287
|
+
state: step.state,
|
|
288
|
+
action: undefined,
|
|
289
|
+
alias: getAliasState(alias, state, state, 1, () => [state]),
|
|
290
|
+
});
|
|
291
|
+
}
|
|
292
|
+
return { trace: [step], traceOutput };
|
|
293
|
+
};
|
|
294
|
+
const getIncompleteStep = (
|
|
295
|
+
incomplete: State,
|
|
296
|
+
level: number,
|
|
297
|
+
step: Omit<TraceStep, "state">,
|
|
298
|
+
action: SpecAction | undefined,
|
|
299
|
+
): TraceStep => {
|
|
300
|
+
const state = toRecord(incomplete.map((value) => value ?? createModelValue("null")));
|
|
301
|
+
const alias = config.alias;
|
|
302
|
+
const traceStep = {
|
|
303
|
+
...step,
|
|
304
|
+
state:
|
|
305
|
+
alias === undefined ? state : getAliasState(alias, incomplete, incomplete, level, () => []),
|
|
306
|
+
};
|
|
307
|
+
context.tracedSteps.set(traceStep, { state, action });
|
|
308
|
+
return traceStep;
|
|
258
309
|
};
|
|
310
|
+
const getPathSteps = (path: number[]) => getPathStates(path, NEXT_RECOVERY_FAILURE);
|
|
259
311
|
return {
|
|
260
312
|
toTrace,
|
|
261
313
|
findStepAction,
|
|
262
314
|
findSuccessorWithFingerprint,
|
|
263
315
|
getTrace,
|
|
264
316
|
getStateTrace,
|
|
265
|
-
|
|
317
|
+
getIncompleteStep,
|
|
266
318
|
getPathSteps,
|
|
267
319
|
};
|
|
268
320
|
};
|