tla-ts 0.0.10-dev.d618a2d79 → 0.0.10-dev.e5c8dc315
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 +97 -92
- package/dist/transfer.js +97 -92
- package/dist/worker.cjs +7 -7
- package/dist/worker.js +7 -7
- package/package.json +1 -1
- package/src/ast.ts +31 -3
- package/src/bags.ts +50 -29
- package/src/builtins.ts +4 -3
- package/src/check-failure.ts +13 -11
- package/src/check-trace.ts +146 -93
- package/src/check.ts +518 -281
- 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 +255 -18
- package/src/dependencies.ts +68 -15
- package/src/dfid.ts +101 -36
- package/src/environment.ts +155 -66
- package/src/errors.ts +7 -0
- package/src/evaluate.ts +424 -135
- package/src/exit-codes.ts +28 -14
- package/src/instances.ts +152 -25
- 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 +55 -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/ackermannize-bv-tactic.ts +3 -2
- 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 +28 -2
- 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/bv1-blast.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 +9 -4
- 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 +9 -8
- package/src/prover/smt/solver/dt2bv-tactic.ts +66 -28
- 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 +31 -28
- package/src/prover/smt/solver/eq2bv-tactic.ts +15 -6
- 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 +2 -3
- package/src/prover/smt/solver/fm-tactic.ts +9 -7
- 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/fpa2bv-tactic.ts +1 -1
- 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/lia2pb.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 +2 -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/normalize-bounds.ts +2 -2
- package/src/prover/smt/solver/occf.ts +1 -1
- 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/pb2bv-tactic.ts +9 -3
- 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/purify-arith.ts +51 -49
- 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/reduce-args.ts +2 -2
- 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 +75 -12
- package/src/prover/smt/solver/sat/inc-sat-solver.ts +149 -47
- 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 +54 -25
- package/src/prover/smt/solver/sat/sat2goal.ts +75 -50
- 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 +718 -213
- package/src/prover/smt/solver/solve-eqs.ts +36 -37
- package/src/prover/smt/solver/solver.ts +18 -4
- package/src/prover/smt/solver/tactic.ts +389 -199
- 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 +12 -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 +15 -5
- 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 +1311 -268
- package/src/runtime.ts +21 -2
- 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 +19 -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 +12 -6
- package/src/sany/xml.ts +2 -3
- package/src/search.ts +321 -135
- package/src/simulate.ts +247 -185
- package/src/spec-description.ts +15 -7
- package/src/standard-definitions.ts +1 -0
- package/src/standard-modules.ts +56 -22
- package/src/subexpressions.ts +666 -147
- package/src/successors.ts +50 -20
- 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 +147 -46
- 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,40 +82,54 @@ 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
|
-
const
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
101
|
+
const rebuildFrom = (state: Value[], level: number) => {
|
|
102
|
+
current.rebuilt = { state, level };
|
|
103
|
+
runtime.reseedRandom();
|
|
104
|
+
};
|
|
105
|
+
// TLC's TLCStateMut#equals compares the variables in turn, and a lazy value fails as it reaches it.
|
|
106
|
+
const isEqualState = (state: Value[], successor: Value[]) =>
|
|
107
|
+
state.every((value, position) => {
|
|
108
|
+
const error = getFingerprintError(value);
|
|
109
|
+
if (error) throw error;
|
|
110
|
+
return isSameValue(value, successor[position]);
|
|
108
111
|
});
|
|
109
|
-
|
|
110
|
-
|
|
112
|
+
const findStepAction = (
|
|
113
|
+
index: number,
|
|
114
|
+
previous: Value[],
|
|
115
|
+
state: Value[],
|
|
116
|
+
isHeld: boolean,
|
|
117
|
+
isDrawnOn = false,
|
|
118
|
+
) => {
|
|
119
|
+
const expanding = { ...current };
|
|
120
|
+
Object.assign(current, { index, isExpanding: true, candidate: undefined });
|
|
121
|
+
const key = isHeld ? state : getFingerprintState(state);
|
|
122
|
+
const isMatch = (successor: Successor) =>
|
|
123
|
+
isHeld
|
|
124
|
+
? isEqualState(key, successor.state)
|
|
125
|
+
: isSameState(getFingerprintState(successor.state), key);
|
|
111
126
|
try {
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
);
|
|
127
|
+
current.rebuilt = { state: previous, level: depths[index] };
|
|
128
|
+
const drawn = isDrawnOn ? context.findSuccessorAction(previous, isMatch) : undefined;
|
|
129
|
+
if (drawn) return drawn;
|
|
130
|
+
// Deviation from TLC: when TLCTrace#printTrace and Worker#doPostCondition draw on and miss the step, printTrace leaks a NullPointerException and doPostCondition skips the postcondition.
|
|
131
|
+
rebuildFrom(previous, depths[index]);
|
|
132
|
+
return context.findSuccessorAction(previous, isMatch);
|
|
115
133
|
} finally {
|
|
116
134
|
Object.assign(current, expanding);
|
|
117
135
|
}
|
|
@@ -123,39 +141,42 @@ export const createTraceBuilder = (context: TraceContext) => {
|
|
|
123
141
|
): Behavior => {
|
|
124
142
|
const alias = config.alias;
|
|
125
143
|
const known = traceOptions.known ?? 1;
|
|
126
|
-
const
|
|
127
|
-
const
|
|
128
|
-
|
|
144
|
+
const loopStart = traceOptions.loopStart;
|
|
145
|
+
const rebuilt = is174 && loopStart !== undefined ? loopStart + 1 : steps.length - known;
|
|
146
|
+
const isRebuiltAgain = known > 0 && !is174 && !traceOptions.isPrintedOnly && steps.length > 1;
|
|
147
|
+
const initialOutput =
|
|
148
|
+
known === 0 || (steps.length > 1 && (rebuilt > 0 || is174))
|
|
149
|
+
? runtime.runWithNewRandom(() => captureOutput(context.getInitialStates).lines)
|
|
150
|
+
: [];
|
|
151
|
+
const last = steps.length - 1;
|
|
152
|
+
const findPositionAction = (position: number, isDrawnOn = false) =>
|
|
153
|
+
position === 0 || steps[position].action === "Stuttering"
|
|
129
154
|
? { result: undefined, lines: [] }
|
|
130
155
|
: captureOutput(() =>
|
|
131
156
|
findStepAction(
|
|
132
157
|
path[position - 1],
|
|
133
158
|
steps[position - 1].state,
|
|
134
|
-
step.state,
|
|
135
|
-
known === 2 && position === steps.length - 1,
|
|
136
|
-
),
|
|
137
|
-
),
|
|
138
|
-
);
|
|
139
|
-
const outputs = stepActions.map((step) => step.lines);
|
|
140
|
-
const loopStart = traceOptions.loopStart;
|
|
141
|
-
const rebuilt = is174 && loopStart !== undefined ? loopStart + 1 : steps.length - known;
|
|
142
|
-
if (environment.coverage && steps.length > 1) {
|
|
143
|
-
const isRebuiltAgain = known > 0 && !is174;
|
|
144
|
-
if (rebuilt > 0 && isRebuiltAgain) captureOutput(context.getInitialStates);
|
|
145
|
-
if (isRebuiltAgain) {
|
|
146
|
-
steps.slice(1).forEach((step, position) => {
|
|
147
|
-
if (step.action === "Stuttering") return;
|
|
148
|
-
captureOutput(() =>
|
|
149
|
-
findStepAction(
|
|
150
|
-
path[position],
|
|
151
159
|
steps[position].state,
|
|
152
|
-
|
|
153
|
-
|
|
160
|
+
known === 2 && position === last,
|
|
161
|
+
isDrawnOn,
|
|
154
162
|
),
|
|
155
163
|
);
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
164
|
+
// TLC's TLCStateRandom reseeds only for another state, so TLC rebuilds the step to a known successor drawing on from where the search stopped, unless it rebuilt a step before it.
|
|
165
|
+
const stepActions = steps.map((_step, position) =>
|
|
166
|
+
findPositionAction(position, known === 2 && position === last && last === 1 && !is174),
|
|
167
|
+
);
|
|
168
|
+
const outputs = stepActions.map((step) => step.lines);
|
|
169
|
+
const traceOutput = isRebuiltAgain
|
|
170
|
+
? [
|
|
171
|
+
...runtime.runWithNewRandom(() => [
|
|
172
|
+
captureOutput(context.getInitialStates).lines,
|
|
173
|
+
...steps
|
|
174
|
+
.slice(1, last)
|
|
175
|
+
.map((_step, position) => findPositionAction(position + 1).lines),
|
|
176
|
+
]),
|
|
177
|
+
findPositionAction(last, known === 2).lines,
|
|
178
|
+
].flat()
|
|
179
|
+
: [];
|
|
159
180
|
const prefixOutput = rebuilt > 0 ? [initialOutput, ...outputs.slice(1, rebuilt)].flat() : [];
|
|
160
181
|
return {
|
|
161
182
|
trace: steps.map((step, position) => {
|
|
@@ -166,7 +187,15 @@ export const createTraceBuilder = (context: TraceContext) => {
|
|
|
166
187
|
state:
|
|
167
188
|
alias === undefined
|
|
168
189
|
? toRecord(step.state)
|
|
169
|
-
: getAliasState(
|
|
190
|
+
: getAliasState(
|
|
191
|
+
alias,
|
|
192
|
+
step.state,
|
|
193
|
+
steps[position + 1]?.state ??
|
|
194
|
+
traceOptions.incomplete ??
|
|
195
|
+
steps[loopStart ?? position].state,
|
|
196
|
+
position + 1,
|
|
197
|
+
() => steps.slice(0, position + 1).map((inner) => inner.state),
|
|
198
|
+
),
|
|
170
199
|
output: position === 0 ? prefixOutput : position < rebuilt ? [] : outputs[position],
|
|
171
200
|
};
|
|
172
201
|
if (alias !== undefined || action) {
|
|
@@ -174,7 +203,7 @@ export const createTraceBuilder = (context: TraceContext) => {
|
|
|
174
203
|
}
|
|
175
204
|
return traceStep;
|
|
176
205
|
}),
|
|
177
|
-
traceOutput
|
|
206
|
+
traceOutput,
|
|
178
207
|
};
|
|
179
208
|
};
|
|
180
209
|
const findTraceSuccessor = (state: Value[], isMatch: (successor: Successor) => boolean) =>
|
|
@@ -187,14 +216,28 @@ export const createTraceBuilder = (context: TraceContext) => {
|
|
|
187
216
|
}
|
|
188
217
|
return undefined;
|
|
189
218
|
}).result;
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
219
|
+
// TLC's Tool#getState fingerprints each state it rebuilds, which sorts its records in place.
|
|
220
|
+
const hasFingerprint = (state: Value[], index: number) => {
|
|
221
|
+
const fingerprintState = getFingerprintState(state);
|
|
222
|
+
const stored = context.fingerprintStates[index];
|
|
223
|
+
return (
|
|
224
|
+
getStateHash(fingerprintState) === getStateHash(stored) &&
|
|
225
|
+
isSameState(fingerprintState, stored)
|
|
226
|
+
);
|
|
227
|
+
};
|
|
228
|
+
const findSuccessorWithFingerprint = (state: Value[], source: number, target: number) => {
|
|
229
|
+
const rebuilt = current.rebuilt;
|
|
230
|
+
rebuildFrom(state, depths[source]);
|
|
231
|
+
const successor = findTraceSuccessor(state, (candidate) =>
|
|
232
|
+
hasFingerprint(candidate.state, target),
|
|
233
|
+
);
|
|
234
|
+
current.rebuilt = rebuilt;
|
|
235
|
+
return successor;
|
|
236
|
+
};
|
|
194
237
|
const getPathStates = (path: number[], nextFailure: string) => {
|
|
195
238
|
const initial = captureOutput(() =>
|
|
196
239
|
isReducing || isImpure(environment)
|
|
197
|
-
? context.
|
|
240
|
+
? context.getUncoveredInitialStates().find((state) => hasFingerprint(state, path[0]))
|
|
198
241
|
: states[path[0]],
|
|
199
242
|
).result;
|
|
200
243
|
if (!initial) throw new TlaEvaluationError(INITIAL_RECOVERY_FAILURE);
|
|
@@ -205,16 +248,13 @@ export const createTraceBuilder = (context: TraceContext) => {
|
|
|
205
248
|
steps.push({ state: previous, action: "Stuttering" });
|
|
206
249
|
continue;
|
|
207
250
|
}
|
|
208
|
-
const
|
|
209
|
-
current.rebuilt = { state: previous, level: depths[path[position - 1]] };
|
|
210
|
-
const successor = findSuccessorWithFingerprint(previous, path[position]);
|
|
211
|
-
current.rebuilt = rebuilt;
|
|
251
|
+
const successor = findSuccessorWithFingerprint(previous, path[position - 1], path[position]);
|
|
212
252
|
if (!successor) throw new TlaEvaluationError(nextFailure);
|
|
213
253
|
steps.push(successor);
|
|
214
254
|
}
|
|
215
255
|
return steps;
|
|
216
256
|
};
|
|
217
|
-
const getTrace = (index: number, lastSuccessor?: Successor) => {
|
|
257
|
+
const getTrace = (index: number, lastSuccessor?: Successor, traceOptions: TraceOptions = {}) => {
|
|
218
258
|
const path: number[] = [];
|
|
219
259
|
for (let position = index; position !== -1; position = context.parents[position]) {
|
|
220
260
|
path.unshift(position);
|
|
@@ -226,43 +266,56 @@ export const createTraceBuilder = (context: TraceContext) => {
|
|
|
226
266
|
state: states[position],
|
|
227
267
|
action: context.actions[position],
|
|
228
268
|
}));
|
|
229
|
-
if (!lastSuccessor) return toTrace(steps, path);
|
|
230
|
-
|
|
231
|
-
? findTraceSuccessor(states[index], (successor) =>
|
|
232
|
-
isSameState(successor.state, lastSuccessor.state),
|
|
233
|
-
)?.action
|
|
234
|
-
: lastSuccessor.action;
|
|
235
|
-
return toTrace([...steps, { state: lastSuccessor.state, action }], path, { known: 2 });
|
|
269
|
+
if (!lastSuccessor) return toTrace(steps, path, traceOptions);
|
|
270
|
+
return toTrace([...steps, lastSuccessor], path, { ...traceOptions, known: 2 });
|
|
236
271
|
};
|
|
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
|
-
|
|
272
|
+
// TLCTrace#printTrace applies the alias to every state but an initial one it prints without a successor.
|
|
273
|
+
const getStateTrace = (index: number, traceOptions: TraceOptions = {}): Behavior => {
|
|
274
|
+
if (context.parents[index] !== -1) return getTrace(index, undefined, traceOptions);
|
|
275
|
+
const traceOutput =
|
|
276
|
+
is174 || traceOptions.isPrintedOnly ? [] : captureOutput(context.getInitialStates).lines;
|
|
277
|
+
const state = states[index];
|
|
278
|
+
if (traceOptions.incomplete !== undefined) {
|
|
279
|
+
return {
|
|
280
|
+
trace: toTrace([{ state, action: undefined }], [index], traceOptions).trace,
|
|
281
|
+
traceOutput,
|
|
282
|
+
};
|
|
283
|
+
}
|
|
284
|
+
const step = { action: undefined, label: undefined, state: toRecord(state) };
|
|
285
|
+
const alias = config.alias;
|
|
286
|
+
if (alias !== undefined) {
|
|
287
|
+
context.tracedSteps.set(step, {
|
|
288
|
+
state: step.state,
|
|
289
|
+
action: undefined,
|
|
290
|
+
alias: getAliasState(alias, state, state, 1, () => [state]),
|
|
291
|
+
});
|
|
292
|
+
}
|
|
293
|
+
return { trace: [step], traceOutput };
|
|
294
|
+
};
|
|
295
|
+
const getIncompleteStep = (
|
|
296
|
+
incomplete: State,
|
|
297
|
+
level: number,
|
|
298
|
+
step: Omit<TraceStep, "state">,
|
|
299
|
+
action: SpecAction | undefined,
|
|
300
|
+
): TraceStep => {
|
|
301
|
+
const state = toRecord(incomplete.map((value) => value ?? createModelValue("null")));
|
|
302
|
+
const alias = config.alias;
|
|
303
|
+
const traceStep = {
|
|
304
|
+
...step,
|
|
305
|
+
state:
|
|
306
|
+
alias === undefined ? state : getAliasState(alias, incomplete, incomplete, level, () => []),
|
|
307
|
+
};
|
|
308
|
+
context.tracedSteps.set(traceStep, { state, action });
|
|
309
|
+
return traceStep;
|
|
258
310
|
};
|
|
311
|
+
const getPathSteps = (path: number[]) => getPathStates(path, NEXT_RECOVERY_FAILURE);
|
|
259
312
|
return {
|
|
260
313
|
toTrace,
|
|
261
314
|
findStepAction,
|
|
262
315
|
findSuccessorWithFingerprint,
|
|
263
316
|
getTrace,
|
|
264
317
|
getStateTrace,
|
|
265
|
-
|
|
318
|
+
getIncompleteStep,
|
|
266
319
|
getPathSteps,
|
|
267
320
|
};
|
|
268
321
|
};
|