tla-ts 0.0.10-dev.a17d6d9fa → 0.0.10-dev.a5705bfbf
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/deciders.cjs +31 -31
- package/dist/deciders.js +2 -2
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +12 -2
- package/dist/index.d.ts +12 -2
- package/dist/index.js +1 -1
- package/dist/parallel-worker.cjs +1 -1
- package/dist/parallel-worker.js +1 -1
- package/dist/prove.cjs +64 -64
- package/dist/prove.js +76 -76
- package/dist/run.cjs +42 -42
- package/dist/run.js +44 -44
- package/dist/transfer.cjs +37 -35
- package/dist/transfer.js +43 -41
- package/dist/worker.cjs +7 -7
- package/dist/worker.js +7 -7
- package/package.json +1 -1
- package/src/ast.ts +10 -1
- package/src/check-failure.ts +12 -10
- package/src/check-trace.ts +36 -23
- package/src/check.ts +182 -135
- package/src/cli/tlc-output.ts +17 -2
- package/src/cli/tlc.ts +2 -2
- package/src/codegen.ts +15 -19
- package/src/coverage.ts +190 -1
- package/src/dependencies.ts +19 -6
- package/src/dfid.ts +80 -27
- package/src/environment.ts +30 -1
- package/src/evaluate.ts +254 -59
- package/src/exit-codes.ts +25 -13
- package/src/instances.ts +11 -1
- package/src/levels.ts +48 -7
- package/src/liveness-checker.ts +98 -27
- package/src/liveness.ts +4 -1
- package/src/obligations/source.ts +2 -0
- package/src/parser.ts +3 -0
- package/src/prover/smt/solver/card2bv.ts +7 -4
- package/src/prover/smt/solver/context.ts +20 -4
- package/src/prover/smt/solver/dependent-expr-state.ts +18 -12
- package/src/prover/smt/solver/dt2bv-tactic.ts +36 -20
- package/src/prover/smt/solver/fd-solver.ts +146 -39
- 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-checker.ts +1 -1
- package/src/prover/smt/solver/muz/dl-context.ts +12 -40
- package/src/prover/smt/solver/muz/dl-mk-coi-filter.ts +1 -1
- package/src/prover/smt/solver/muz/dl-rule.ts +6 -7
- package/src/prover/smt/solver/muz/hnf.ts +2 -2
- package/src/prover/smt/solver/muz/horn-tactic.ts +14 -1
- package/src/prover/smt/solver/muz/rule-properties.ts +22 -0
- package/src/prover/smt/solver/muz/spacer-prop-solver.ts +1 -1
- package/src/prover/smt/solver/opt-context.ts +1 -0
- package/src/prover/smt/solver/opt-solver.ts +1 -1
- package/src/prover/smt/solver/parallel-tactic.ts +1 -1
- package/src/prover/smt/solver/qsat.ts +7 -2
- package/src/prover/smt/solver/rewriter-tpl.ts +7 -6
- package/src/prover/smt/solver/sat/inc-sat-solver.ts +45 -26
- package/src/prover/smt/solver/sat/sat-tactic.ts +4 -2
- package/src/prover/smt/solver/sat/sat2goal.ts +10 -7
- package/src/prover/smt/solver/smt-consequences.ts +1 -1
- package/src/prover/smt/solver/smt-kernel.ts +9 -2
- package/src/prover/smt/solver/smtlib-parser.ts +6 -2
- package/src/prover/smt/solver/smtlib-script.ts +197 -73
- package/src/prover/smt/solver/tactic.ts +64 -37
- package/src/resolve.ts +143 -39
- package/src/sany/generator-expressions.ts +2 -0
- package/src/sany/generator-proofs.ts +1 -0
- package/src/search.ts +156 -37
- package/src/simulate.ts +143 -150
- package/src/spec-description.ts +3 -0
- package/src/standard-modules.ts +41 -16
- package/src/subexpressions.ts +168 -63
- package/src/successors.ts +33 -11
- package/src/symmetry.ts +1 -0
- package/src/tlc/replay.ts +64 -41
- package/src/trace-liveness.ts +529 -0
- package/src/typed-tier.ts +20 -6
- package/src/values.ts +15 -1
package/src/tlc/replay.ts
CHANGED
|
@@ -2,8 +2,9 @@ import type { Expression, SourceLocation } from "../ast";
|
|
|
2
2
|
import { TlaEvaluationError } from "../errors";
|
|
3
3
|
import { isConstantLevel } from "../dependencies";
|
|
4
4
|
import {
|
|
5
|
+
chargeContexts,
|
|
5
6
|
countCoverage,
|
|
6
|
-
|
|
7
|
+
createChargedEnumerator,
|
|
7
8
|
getCoverageNode,
|
|
8
9
|
runAtCoverageNode,
|
|
9
10
|
type Coverage,
|
|
@@ -61,7 +62,7 @@ interface Replay {
|
|
|
61
62
|
isEnabled: boolean;
|
|
62
63
|
current: Value[] | undefined;
|
|
63
64
|
onState: (state: Value[]) => void;
|
|
64
|
-
onIncomplete: ((state: State) =>
|
|
65
|
+
onIncomplete: ((state: State) => boolean) | undefined;
|
|
65
66
|
}
|
|
66
67
|
|
|
67
68
|
const withFrame = <Result>(replay: Replay, expression: Expression, run: () => Result): Result => {
|
|
@@ -216,8 +217,7 @@ const proceedItems = (
|
|
|
216
217
|
): boolean => {
|
|
217
218
|
if (items === undefined) {
|
|
218
219
|
if (isComplete(partial)) return addState(replay, partial, node);
|
|
219
|
-
replay.onIncomplete?.(partial);
|
|
220
|
-
return false;
|
|
220
|
+
return replay.onIncomplete?.(partial) ?? false;
|
|
221
221
|
}
|
|
222
222
|
if (isComplete(partial) && isAssignedShortcut(replay)) {
|
|
223
223
|
return proceedAssigned(replay, items, partial, node);
|
|
@@ -309,16 +309,19 @@ const visitAt = (
|
|
|
309
309
|
case "Let": {
|
|
310
310
|
const context = getContext(replay, scope, partial);
|
|
311
311
|
const definitions = expression.definitions;
|
|
312
|
-
const bound =
|
|
313
|
-
|
|
314
|
-
|
|
315
|
-
|
|
316
|
-
|
|
317
|
-
|
|
312
|
+
const bound =
|
|
313
|
+
replay.coverage && !replay.isEnabled
|
|
314
|
+
? bindDefinitions(definitions, context, {
|
|
315
|
+
impure: new Set(definitions),
|
|
316
|
+
streamed: new Set(),
|
|
317
|
+
})
|
|
318
|
+
: bindDefinitions(definitions, context);
|
|
318
319
|
return visit(replay, expression.body, items, bound, partial, node);
|
|
319
320
|
}
|
|
320
321
|
case "Label":
|
|
321
322
|
return visit(replay, expression.body, items, scope, partial, node);
|
|
323
|
+
case "Selection":
|
|
324
|
+
return visit(replay, expression.expression, items, scope, partial, node);
|
|
322
325
|
default:
|
|
323
326
|
if (LITERAL_KINDS.has(expression.kind))
|
|
324
327
|
throw new TlaEvaluationError("The state relation is not a boolean expression.");
|
|
@@ -434,11 +437,6 @@ const createItem = (
|
|
|
434
437
|
rest: ActionItem | undefined,
|
|
435
438
|
): ActionItem => ({ kind, expression, scope, node, rest });
|
|
436
439
|
|
|
437
|
-
const getEnumerated = (replay: Replay, set: Value, elements: Value[]) => {
|
|
438
|
-
if (replay.coverage) costCoverage(replay.coverage, set, elements.length + 1);
|
|
439
|
-
return elements;
|
|
440
|
-
};
|
|
441
|
-
|
|
442
440
|
const visitAssignment = (
|
|
443
441
|
replay: Replay,
|
|
444
442
|
expression: Expression & { kind: "Apply" },
|
|
@@ -473,11 +471,15 @@ const visitAssignment = (
|
|
|
473
471
|
}
|
|
474
472
|
if (!isTlcEnumerable(set))
|
|
475
473
|
throw new TlaEvaluationError("The right side of \\IN is not enumerable.");
|
|
476
|
-
|
|
477
|
-
|
|
478
|
-
|
|
479
|
-
|
|
480
|
-
|
|
474
|
+
const elements = getStreamedElements(set);
|
|
475
|
+
const enumerator =
|
|
476
|
+
replay.coverage && createChargedEnumerator(replay.coverage, set, elements, false);
|
|
477
|
+
const isProduced = elements.reduce<boolean>((isProduced, element) => {
|
|
478
|
+
enumerator?.next();
|
|
479
|
+
return proceed(replay, items, assign(partial, index, element), node) || isProduced;
|
|
480
|
+
}, false);
|
|
481
|
+
enumerator?.next();
|
|
482
|
+
return isProduced;
|
|
481
483
|
};
|
|
482
484
|
|
|
483
485
|
const ASSIGNMENT_OPERATORS = new Set(["=", "\\in", "\\subseteq"]);
|
|
@@ -520,19 +522,26 @@ const getBindings = (
|
|
|
520
522
|
) => {
|
|
521
523
|
const bindings: (Scope | undefined)[] = [];
|
|
522
524
|
const version = replay.environment.runtime.version;
|
|
523
|
-
const
|
|
525
|
+
const bounded = runAt(replay, node, () =>
|
|
524
526
|
mapBoundSets(expression.bounds, (set) => {
|
|
525
527
|
const value = evaluate(set, context);
|
|
526
|
-
|
|
527
|
-
if (Array.isArray(elements)) getEnumerated(replay, value, elements);
|
|
528
|
-
return elements;
|
|
528
|
+
return { value, elements: getQuantifierElements(value, set, version) };
|
|
529
529
|
}),
|
|
530
530
|
);
|
|
531
|
+
const sets = bounded.map((item) => item.elements);
|
|
531
532
|
forEachBoundElement(expression.bounds, sets, context.scope, (bound) => {
|
|
532
533
|
bindings.push(bound);
|
|
533
534
|
return false;
|
|
534
535
|
});
|
|
535
|
-
|
|
536
|
+
const coverage = replay.coverage;
|
|
537
|
+
const charge =
|
|
538
|
+
coverage &&
|
|
539
|
+
chargeContexts(
|
|
540
|
+
coverage,
|
|
541
|
+
bounded.map((item) => item.value),
|
|
542
|
+
sets,
|
|
543
|
+
);
|
|
544
|
+
return { bindings, charge };
|
|
536
545
|
};
|
|
537
546
|
|
|
538
547
|
const visitApplication = (
|
|
@@ -607,14 +616,17 @@ const visitApplication = (
|
|
|
607
616
|
);
|
|
608
617
|
return isPrefixProduced || isLastProduced;
|
|
609
618
|
}
|
|
610
|
-
case "Exists":
|
|
611
|
-
|
|
612
|
-
|
|
613
|
-
|
|
614
|
-
|
|
615
|
-
);
|
|
619
|
+
case "Exists": {
|
|
620
|
+
const bound = getBindings(replay, expression, context, node);
|
|
621
|
+
return bound.bindings.reduce((isProduced, scope) => {
|
|
622
|
+
bound.charge?.();
|
|
623
|
+
return visit(replay, expression.body, items, scope, partial, node) || isProduced;
|
|
624
|
+
}, false);
|
|
625
|
+
}
|
|
616
626
|
case "Forall": {
|
|
617
|
-
const
|
|
627
|
+
const bound = getBindings(replay, expression, context, node);
|
|
628
|
+
const bounds = bound.bindings;
|
|
629
|
+
bounds.forEach(() => bound.charge?.());
|
|
618
630
|
if (bounds.length === 0) return proceed(replay, items, partial, node);
|
|
619
631
|
const rest = bounds
|
|
620
632
|
.slice(1)
|
|
@@ -715,6 +727,7 @@ const visitUnchanged = (
|
|
|
715
727
|
if (index !== undefined) {
|
|
716
728
|
const value = replay.current?.[index];
|
|
717
729
|
if (value === undefined) return false;
|
|
730
|
+
if (replay.isEnabled && replay.coverage) countCoverage(replay.coverage, node);
|
|
718
731
|
const assigned = partial[index];
|
|
719
732
|
if (assigned !== undefined && !isEqualLikeTlc(assigned, value)) {
|
|
720
733
|
warnChangedUnchanged(replay.environment, index, expression);
|
|
@@ -779,11 +792,12 @@ const createReplay = (
|
|
|
779
792
|
kind: "init" | "next" | "enabled",
|
|
780
793
|
current: Value[] | undefined,
|
|
781
794
|
onState: (state: Value[]) => void,
|
|
782
|
-
onIncomplete?: (state: State) =>
|
|
795
|
+
onIncomplete?: (state: State) => boolean,
|
|
783
796
|
): Replay => ({
|
|
784
797
|
environment,
|
|
785
798
|
callStack: environment.callStack,
|
|
786
|
-
coverage:
|
|
799
|
+
coverage:
|
|
800
|
+
kind === "enabled" && environment.coverage?.current === -1 ? undefined : environment.coverage,
|
|
787
801
|
isInit: kind === "init",
|
|
788
802
|
isEnabled: kind === "enabled",
|
|
789
803
|
current,
|
|
@@ -802,15 +816,16 @@ export const replayEnabled = (
|
|
|
802
816
|
const found = () => {
|
|
803
817
|
throw ENABLED_FOUND;
|
|
804
818
|
};
|
|
819
|
+
const node = environment.coverage?.current ?? -1;
|
|
805
820
|
const replay = createReplay(environment, "enabled", state, found, found);
|
|
806
821
|
const callStack = replay.callStack;
|
|
807
822
|
const depth = callStack?.expressions.length ?? 0;
|
|
808
823
|
try {
|
|
809
824
|
if (expression.kind === "AngleAction" && expression.location === expression.action.location) {
|
|
810
|
-
const changed = createItem("Changed", expression.subscript, scope,
|
|
811
|
-
visit(replay, expression.action, changed, scope, getEmptyState(environment),
|
|
825
|
+
const changed = createItem("Changed", expression.subscript, scope, node, undefined);
|
|
826
|
+
visit(replay, expression.action, changed, scope, getEmptyState(environment), node);
|
|
812
827
|
} else {
|
|
813
|
-
visit(replay, expression, undefined, scope, getEmptyState(environment),
|
|
828
|
+
visit(replay, expression, undefined, scope, getEmptyState(environment), node);
|
|
814
829
|
}
|
|
815
830
|
return false;
|
|
816
831
|
} catch (error) {
|
|
@@ -827,7 +842,7 @@ export const replayInitialStates = (
|
|
|
827
842
|
inits: (ReplayAction & { node?: number })[],
|
|
828
843
|
environment: Environment,
|
|
829
844
|
onState: (state: Value[]) => void,
|
|
830
|
-
onIncomplete?: (state: State) =>
|
|
845
|
+
onIncomplete?: (state: State) => boolean,
|
|
831
846
|
) => {
|
|
832
847
|
const [first, ...others] = inits;
|
|
833
848
|
if (first === undefined) return;
|
|
@@ -839,16 +854,21 @@ export const replayInitialStates = (
|
|
|
839
854
|
visit(replay, first.expression, rest, first.scope, getEmptyState(environment), first.node ?? -1);
|
|
840
855
|
};
|
|
841
856
|
|
|
842
|
-
export const replaySuccessors = <Action extends ReplayAction>(
|
|
857
|
+
export const replaySuccessors = <Action extends ReplayAction & { node?: number }>(
|
|
843
858
|
actions: Action[],
|
|
844
859
|
state: Value[],
|
|
845
860
|
environment: Environment,
|
|
846
861
|
onState: (state: Value[], action: Action) => void,
|
|
847
862
|
) => {
|
|
848
863
|
if (actions.some((action) => LITERAL_KINDS.has(action.expression.kind))) return;
|
|
864
|
+
const coverage = environment.coverage;
|
|
849
865
|
actions.forEach((action) => {
|
|
850
866
|
const successors: Value[][] = [];
|
|
851
|
-
|
|
867
|
+
const node = action.node ?? -1;
|
|
868
|
+
walkSuccessors(action, node, state, environment, (next) => {
|
|
869
|
+
if (coverage && node !== -1) coverage.primary[node]++;
|
|
870
|
+
successors.push(next);
|
|
871
|
+
});
|
|
852
872
|
successors.forEach((successor) => onState(successor, action));
|
|
853
873
|
});
|
|
854
874
|
};
|
|
@@ -859,7 +879,7 @@ export const walkSuccessors = (
|
|
|
859
879
|
state: Value[],
|
|
860
880
|
environment: Environment,
|
|
861
881
|
onState: (state: Value[]) => void,
|
|
862
|
-
onIncomplete?: (state: State) =>
|
|
882
|
+
onIncomplete?: (state: State) => boolean,
|
|
863
883
|
) => {
|
|
864
884
|
const replay = createReplay(environment, "next", state, onState, onIncomplete);
|
|
865
885
|
visit(replay, action.expression, undefined, action.scope, getEmptyState(environment), node);
|
|
@@ -908,6 +928,9 @@ export const getPrimedRanges = (actions: ReplayAction[], environment: Environmen
|
|
|
908
928
|
case "Label":
|
|
909
929
|
collect(expression.body, scope, visited);
|
|
910
930
|
return;
|
|
931
|
+
case "Selection":
|
|
932
|
+
collect(expression.expression, scope, visited);
|
|
933
|
+
return;
|
|
911
934
|
case "FunctionApplication":
|
|
912
935
|
collect(expression.function, scope, visited);
|
|
913
936
|
return;
|