tla-ts 0.0.2 → 0.0.3-dev.14337b3
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/README.md +78 -12
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +85 -15
- package/dist/index.d.ts +85 -15
- package/dist/index.js +1 -1
- package/dist/parallel-worker.cjs +2 -2
- package/dist/parallel-worker.js +2 -2
- package/dist/parallel.cjs +1 -1
- package/dist/parallel.js +2 -2
- package/dist/run-cli.cjs +22 -2
- package/dist/run-cli.js +22 -2
- package/dist/transfer.cjs +37 -16
- package/dist/transfer.js +37 -16
- package/package.json +3 -1
- package/src/ast.ts +137 -4
- package/src/check.ts +378 -100
- package/src/cli-options.ts +64 -0
- package/src/codegen.ts +15 -22
- package/src/config.ts +224 -170
- package/src/dependencies.ts +2 -2
- package/src/environment.ts +116 -28
- package/src/errors.ts +101 -3
- package/src/evaluate.ts +129 -153
- package/src/exit-codes.ts +39 -42
- package/src/fingerprints.ts +46 -11
- package/src/instances.ts +16 -15
- package/src/levels.ts +62 -34
- package/src/lexer.ts +11 -2
- package/src/live-check.ts +772 -0
- package/src/liveness.ts +116 -543
- package/src/obligation-action.ts +384 -0
- package/src/obligation-anon.ts +575 -0
- package/src/obligation-deref.ts +637 -0
- package/src/obligation-expression.ts +1060 -0
- package/src/obligation-format.ts +406 -0
- package/src/obligation-generate.ts +1074 -0
- package/src/obligation-levels.ts +329 -0
- package/src/obligation-module.ts +1042 -0
- package/src/obligation-printer.ts +889 -0
- package/src/obligation-proof.ts +76 -0
- package/src/obligation-source.ts +1084 -0
- package/src/obligation-tuples.ts +184 -0
- package/src/obligations.ts +316 -0
- package/src/parallel-worker.ts +168 -212
- package/src/parallel.ts +78 -37
- package/src/parser.ts +315 -60
- package/src/resolve.ts +122 -44
- package/src/run-cli.ts +376 -44
- package/src/runtime.ts +3 -1
- package/src/spec-description.ts +19 -8
- package/src/standard-levels.ts +3 -3
- package/src/standard-modules.ts +2 -7
- package/src/state-graph.ts +157 -0
- package/src/subexpressions.ts +10 -10
- package/src/successors.ts +99 -25
- package/src/symmetry.ts +30 -8
- package/src/tableau.ts +51 -24
- package/src/tlc-ext.ts +29 -12
- package/src/tlc-module.ts +14 -33
- package/src/tlc-modules.ts +4 -0
- package/src/tlc-order.ts +25 -7
- package/src/tlc-random.ts +9 -6
- package/src/tlc-summary.ts +20 -5
- package/src/transfer.ts +22 -1
- package/src/values.ts +179 -42
|
@@ -0,0 +1,157 @@
|
|
|
1
|
+
// A port of TLC's -dump writers, tlc2.util.StateWriter and tlc2.util.DotStateWriter.
|
|
2
|
+
|
|
3
|
+
export interface StateDump {
|
|
4
|
+
path: string;
|
|
5
|
+
dot?: boolean;
|
|
6
|
+
colorize?: boolean;
|
|
7
|
+
actionLabels?: boolean;
|
|
8
|
+
snapshot?: boolean;
|
|
9
|
+
}
|
|
10
|
+
|
|
11
|
+
export interface GraphState {
|
|
12
|
+
fingerprint: bigint;
|
|
13
|
+
level: number;
|
|
14
|
+
// The state as TLC prints it after evaluating the alias, and as it prints it without the alias.
|
|
15
|
+
getLabel: () => string;
|
|
16
|
+
getText: () => string;
|
|
17
|
+
}
|
|
18
|
+
|
|
19
|
+
export interface GraphAction {
|
|
20
|
+
name: string;
|
|
21
|
+
signature: string;
|
|
22
|
+
}
|
|
23
|
+
|
|
24
|
+
export interface StateWriter {
|
|
25
|
+
writeInitialState: (state: GraphState) => void;
|
|
26
|
+
writeSuccessor: (
|
|
27
|
+
state: GraphState,
|
|
28
|
+
successor: GraphState,
|
|
29
|
+
isSeen: boolean,
|
|
30
|
+
action: GraphAction | undefined,
|
|
31
|
+
) => void;
|
|
32
|
+
close: () => void;
|
|
33
|
+
}
|
|
34
|
+
|
|
35
|
+
type WriteFile = ((path: string, content: string) => void) | undefined;
|
|
36
|
+
|
|
37
|
+
const COLOR_SCHEME = "paired12";
|
|
38
|
+
const LOAD_FACTOR = 0.75;
|
|
39
|
+
const INITIAL_CAPACITY = 16;
|
|
40
|
+
|
|
41
|
+
const getCapacity = (size: number, capacity = INITIAL_CAPACITY): number =>
|
|
42
|
+
size <= capacity * LOAD_FACTOR ? capacity : getCapacity(size, capacity * 2);
|
|
43
|
+
|
|
44
|
+
// The order in which a java.util.HashMap iterates over keys put in this order: by bucket, and in
|
|
45
|
+
// insertion order within a bucket. A bucket only becomes a tree once 8 keys collide in it.
|
|
46
|
+
const getJavaHashOrder = <Key>(keys: Key[], getHash: (key: Key) => number) => {
|
|
47
|
+
const mask = getCapacity(keys.length) - 1;
|
|
48
|
+
const getBucket = (key: Key) => {
|
|
49
|
+
const hash = getHash(key);
|
|
50
|
+
return (hash ^ (hash >>> 16)) & mask;
|
|
51
|
+
};
|
|
52
|
+
return keys
|
|
53
|
+
.map((key, position) => ({ key, position, bucket: getBucket(key) }))
|
|
54
|
+
.sort((left, right) => left.bucket - right.bucket || left.position - right.position)
|
|
55
|
+
.map((entry) => entry.key);
|
|
56
|
+
};
|
|
57
|
+
|
|
58
|
+
const getLongHash = (value: bigint) =>
|
|
59
|
+
Number(BigInt.asIntN(32, value ^ (BigInt.asUintN(64, value) >> 32n)));
|
|
60
|
+
|
|
61
|
+
const getStringHash = (text: string) =>
|
|
62
|
+
[...Array(text.length).keys()].reduce(
|
|
63
|
+
(hash, index) => (Math.imul(31, hash) + text.charCodeAt(index)) | 0,
|
|
64
|
+
0,
|
|
65
|
+
);
|
|
66
|
+
|
|
67
|
+
const escape = (text: string) => text.replaceAll("\\", "\\\\").replaceAll('"', '\\"').trim();
|
|
68
|
+
|
|
69
|
+
const toDot = (text: string) => escape(text).replaceAll("\n", "\\n");
|
|
70
|
+
|
|
71
|
+
const createPlainWriter = (dump: StateDump, writeFile: WriteFile): StateWriter => {
|
|
72
|
+
const states: string[] = [];
|
|
73
|
+
const writeState = (state: GraphState) =>
|
|
74
|
+
states.push(`State ${states.length + 1}:\n${state.getText()}\n`);
|
|
75
|
+
return {
|
|
76
|
+
writeInitialState: writeState,
|
|
77
|
+
writeSuccessor: (_state, successor, isSeen) => {
|
|
78
|
+
if (!isSeen) writeState(successor);
|
|
79
|
+
},
|
|
80
|
+
close: () => writeFile?.(dump.path, states.join("")),
|
|
81
|
+
};
|
|
82
|
+
};
|
|
83
|
+
|
|
84
|
+
const createDotWriter = (dump: StateDump, writeFile: WriteFile): StateWriter => {
|
|
85
|
+
const lines = [
|
|
86
|
+
"strict digraph DiskGraph {\n",
|
|
87
|
+
"node [shape=box,style=rounded]\n",
|
|
88
|
+
dump.colorize ? `edge [colorscheme="${COLOR_SCHEME}"]\n` : "",
|
|
89
|
+
"nodesep=0.35;\n",
|
|
90
|
+
"subgraph cluster_graph {\n",
|
|
91
|
+
'color="white";\n',
|
|
92
|
+
];
|
|
93
|
+
const ranks = new Map<number, Set<bigint>>();
|
|
94
|
+
const colors = new Map<string, number>();
|
|
95
|
+
const addRank = (state: GraphState) => {
|
|
96
|
+
const rank = ranks.get(state.level) ?? new Set();
|
|
97
|
+
ranks.set(state.level, rank.add(state.fingerprint));
|
|
98
|
+
};
|
|
99
|
+
// TLC colors an edge by the name of its action, numbering the names from 2 as it finds them.
|
|
100
|
+
const getColor = (action: GraphAction | undefined) => {
|
|
101
|
+
if (!action) return 1;
|
|
102
|
+
const color = colors.get(action.name) ?? colors.size + 2;
|
|
103
|
+
colors.set(action.name, color);
|
|
104
|
+
return color;
|
|
105
|
+
};
|
|
106
|
+
const getLegend = () =>
|
|
107
|
+
[
|
|
108
|
+
`subgraph cluster_legend {graph[style=bold];label = "Next State Actions" style="solid"\n`,
|
|
109
|
+
`node [ labeljust="l",colorscheme="${COLOR_SCHEME}",style=filled,shape=record ]\n`,
|
|
110
|
+
...getJavaHashOrder([...colors.keys()], getStringHash).map(
|
|
111
|
+
(name) => `${name.replaceAll("!", ":")} [label="${name}",fillcolor=${colors.get(name)}]\n`,
|
|
112
|
+
),
|
|
113
|
+
"}",
|
|
114
|
+
].join("");
|
|
115
|
+
const getEnding = () =>
|
|
116
|
+
[
|
|
117
|
+
...getJavaHashOrder([...ranks], (rank) => rank[0]).map(
|
|
118
|
+
(rank) =>
|
|
119
|
+
`{rank = same; ${getJavaHashOrder([...rank[1]], getLongHash)
|
|
120
|
+
.map((fingerprint) => `${fingerprint};`)
|
|
121
|
+
.join("")}}\n`,
|
|
122
|
+
),
|
|
123
|
+
"}\n",
|
|
124
|
+
dump.colorize && colors.size > 1 ? getLegend() : "",
|
|
125
|
+
"}",
|
|
126
|
+
].join("");
|
|
127
|
+
const writeSnapshot = () => {
|
|
128
|
+
if (dump.snapshot) {
|
|
129
|
+
writeFile?.(dump.path.replaceAll(".dot", "_snapshot.dot"), lines.join("") + getEnding());
|
|
130
|
+
}
|
|
131
|
+
};
|
|
132
|
+
return {
|
|
133
|
+
writeInitialState: (state) => {
|
|
134
|
+
lines.push(`${state.fingerprint} [label="${toDot(state.getLabel())}",style = filled]\n`);
|
|
135
|
+
addRank(state);
|
|
136
|
+
writeSnapshot();
|
|
137
|
+
},
|
|
138
|
+
writeSuccessor: (state, successor, isSeen, action) => {
|
|
139
|
+
const color = dump.colorize ? String(getColor(action)) : "black";
|
|
140
|
+
const label = dump.actionLabels && action ? escape(action.signature) : "";
|
|
141
|
+
lines.push(
|
|
142
|
+
`${state.fingerprint} -> ${successor.fingerprint} [label="${label}",color="${color}",fontcolor="${color}"];\n`,
|
|
143
|
+
);
|
|
144
|
+
if (!isSeen) {
|
|
145
|
+
lines.push(
|
|
146
|
+
`${successor.fingerprint} [label="${toDot(successor.getLabel())}",tooltip="${toDot(successor.getText())}"];\n`,
|
|
147
|
+
);
|
|
148
|
+
}
|
|
149
|
+
addRank(state);
|
|
150
|
+
writeSnapshot();
|
|
151
|
+
},
|
|
152
|
+
close: () => writeFile?.(dump.path, lines.join("") + getEnding()),
|
|
153
|
+
};
|
|
154
|
+
};
|
|
155
|
+
|
|
156
|
+
export const createStateWriter = (dump: StateDump, writeFile: WriteFile) =>
|
|
157
|
+
dump.dot ? createDotWriter(dump, writeFile) : createPlainWriter(dump, writeFile);
|
package/src/subexpressions.ts
CHANGED
|
@@ -1,15 +1,15 @@
|
|
|
1
|
-
import
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
1
|
+
import {
|
|
2
|
+
getChildren,
|
|
3
|
+
type Bound,
|
|
4
|
+
type Definition,
|
|
5
|
+
type Expression,
|
|
6
|
+
type Instance,
|
|
7
|
+
type Module,
|
|
8
|
+
type OperatorParam,
|
|
9
|
+
type Selector,
|
|
10
|
+
type SourceLocation,
|
|
10
11
|
} from "./ast";
|
|
11
12
|
import { TlaSyntaxError } from "./errors";
|
|
12
|
-
import { getChildren } from "./evaluate";
|
|
13
13
|
import { getSourceName, mapChildren, mapDefinition } from "./instances";
|
|
14
14
|
import { getArity, getBoundNames, getPatternNames, LOCAL_RESOLUTION } from "./resolve";
|
|
15
15
|
|
package/src/successors.ts
CHANGED
|
@@ -1,28 +1,36 @@
|
|
|
1
|
-
import
|
|
1
|
+
import {
|
|
2
|
+
getChildren,
|
|
3
|
+
isLocallyResolved,
|
|
4
|
+
type Bound,
|
|
5
|
+
type Definition,
|
|
6
|
+
type Expression,
|
|
7
|
+
type QuantifierExpression,
|
|
8
|
+
} from "./ast";
|
|
2
9
|
import { getReadVariables } from "./dependencies";
|
|
3
|
-
import { TlaEvaluationError } from "./errors";
|
|
10
|
+
import { TlaEvaluationError, TlaIncompleteStateError } from "./errors";
|
|
4
11
|
import { EXIT_STATUS, setExitCode } from "./exit-codes";
|
|
5
12
|
import {
|
|
6
13
|
describeLocation,
|
|
14
|
+
describeRange,
|
|
7
15
|
bindArgument,
|
|
8
16
|
bindDefinitions,
|
|
9
17
|
bindOperatorArguments,
|
|
10
18
|
bindValue,
|
|
11
19
|
compileArgumentScope,
|
|
12
20
|
evaluate,
|
|
21
|
+
getEntryEvaluator,
|
|
13
22
|
expectBoolean,
|
|
14
23
|
forEachBinding,
|
|
15
24
|
getBoundsDomain,
|
|
16
|
-
getChildren,
|
|
17
25
|
getDefinition,
|
|
18
26
|
getEnumeratedElements,
|
|
19
27
|
getReevaluatedDefinitions,
|
|
20
28
|
lookupScope,
|
|
21
29
|
resolveApplyOperator,
|
|
22
30
|
resolveGlobalOperator,
|
|
23
|
-
isLocallyResolved,
|
|
24
31
|
type Context,
|
|
25
32
|
type Environment,
|
|
33
|
+
type Evaluator,
|
|
26
34
|
type Scope,
|
|
27
35
|
type State,
|
|
28
36
|
} from "./evaluate";
|
|
@@ -81,15 +89,25 @@ const assign = (partial: State, index: number, value: Value) => {
|
|
|
81
89
|
return copy;
|
|
82
90
|
};
|
|
83
91
|
|
|
84
|
-
|
|
85
|
-
|
|
92
|
+
// TLC's Tool.getInitStates and Tool.getNextStates report a value where they expect a formula.
|
|
93
|
+
const expectFormula = (expression: Expression, value: Value, isInit: boolean) => {
|
|
86
94
|
if (typeof value === "boolean") return value;
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
95
|
+
throw new TlaEvaluationError(
|
|
96
|
+
`In computing ${isInit ? "initial" : "next"} states, TLC expected a boolean expression,\nbut instead found ${formatValue(value)}.\n${describeRange(expression)}`,
|
|
97
|
+
);
|
|
98
|
+
};
|
|
99
|
+
|
|
100
|
+
const holds = (expression: Expression, context: Context, value = evaluate(expression, context)) => {
|
|
101
|
+
// TLC rejects a number in the next-state relation when it splits the relation into actions.
|
|
102
|
+
if (context.next !== undefined && expression.kind === "Number") {
|
|
103
|
+
throw setExitCode(
|
|
104
|
+
new TlaEvaluationError(
|
|
105
|
+
`The next state relation is not a boolean expression.\n${expression.text ?? expression.value}`,
|
|
106
|
+
),
|
|
107
|
+
EXIT_STATUS.error,
|
|
108
|
+
);
|
|
92
109
|
}
|
|
110
|
+
return expectFormula(expression, value, context.next === undefined);
|
|
93
111
|
};
|
|
94
112
|
|
|
95
113
|
const isAssignmentOperator = (operator: string) =>
|
|
@@ -287,12 +305,34 @@ const toConjunct = (
|
|
|
287
305
|
return { kind: "Branch", expression, runner: getRunner(expression, environment, isInit) };
|
|
288
306
|
};
|
|
289
307
|
|
|
308
|
+
// The leading guards of `\E x \in S, y \in T : P /\ Q` that read no inner bound hold for every inner
|
|
309
|
+
// binding alike, so they can run once for each element of the outermost bound.
|
|
310
|
+
const getHoistedGuards = (expression: QuantifierExpression, environment: Environment) => {
|
|
311
|
+
if (expression.bounds.length < 2 || expression.body.kind !== "And") return undefined;
|
|
312
|
+
const names = expression.bounds.flatMap((bound) =>
|
|
313
|
+
bound.pattern.kind === "Name" ? [bound.pattern.name] : [],
|
|
314
|
+
);
|
|
315
|
+
if (names.length !== expression.bounds.length) return undefined;
|
|
316
|
+
const innerNames = new Set(names.slice(0, -1));
|
|
317
|
+
const operands = expression.body.operands;
|
|
318
|
+
const index = operands.findIndex((operand) => {
|
|
319
|
+
if (getReadVariables(operand, environment) === undefined) return true;
|
|
320
|
+
if (hasBranches(operand, environment, new Set())) return true;
|
|
321
|
+
const readLocals = getReadLocals(operand, NO_NAMES);
|
|
322
|
+
return !readLocals || readLocals.some((name) => innerNames.has(name));
|
|
323
|
+
});
|
|
324
|
+
const count = index === -1 ? operands.length : index;
|
|
325
|
+
if (count === 0) return undefined;
|
|
326
|
+
return { names, guards: operands.slice(0, count), rest: operands.slice(count) };
|
|
327
|
+
};
|
|
328
|
+
|
|
290
329
|
const compileConjunction = (
|
|
291
330
|
operands: Expression[],
|
|
292
331
|
environment: Environment,
|
|
293
332
|
isInit: boolean,
|
|
294
333
|
): Runner => {
|
|
295
334
|
const conjuncts = operands.map((operand) => toConjunct(operand, environment, isInit));
|
|
335
|
+
const evaluators: (Evaluator | undefined)[] = conjuncts.map(() => undefined);
|
|
296
336
|
const runFrom = (
|
|
297
337
|
start: number,
|
|
298
338
|
run: Run,
|
|
@@ -315,12 +355,17 @@ const compileConjunction = (
|
|
|
315
355
|
const conjunct = conjuncts[index];
|
|
316
356
|
if (conjunct.kind === "Guard") {
|
|
317
357
|
context ??= getContext(run, scope, current);
|
|
318
|
-
|
|
358
|
+
const evaluator = (evaluators[index] ??= getEntryEvaluator(
|
|
359
|
+
conjunct.expression,
|
|
360
|
+
environment,
|
|
361
|
+
));
|
|
362
|
+
if (!holds(conjunct.expression, context, evaluator(context))) return;
|
|
319
363
|
continue;
|
|
320
364
|
}
|
|
321
365
|
if (conjunct.kind === "Assign") {
|
|
322
366
|
context ??= getContext(run, scope, current);
|
|
323
|
-
const
|
|
367
|
+
const evaluator = (evaluators[index] ??= getEntryEvaluator(conjunct.value, environment));
|
|
368
|
+
const value = evaluator(context);
|
|
324
369
|
const assigned = current[conjunct.index];
|
|
325
370
|
if (assigned === undefined) {
|
|
326
371
|
current = assign(current, conjunct.index, value);
|
|
@@ -357,10 +402,7 @@ const compileConjunction = (
|
|
|
357
402
|
};
|
|
358
403
|
|
|
359
404
|
const holdsInInit = (expression: Expression, context: Context) =>
|
|
360
|
-
|
|
361
|
-
evaluate(expression, context),
|
|
362
|
-
`the initial predicate at ${describeLocation(expression)}`,
|
|
363
|
-
);
|
|
405
|
+
expectFormula(expression, evaluate(expression, context), true);
|
|
364
406
|
|
|
365
407
|
const compileGuard =
|
|
366
408
|
(expression: Expression): Runner =>
|
|
@@ -385,7 +427,7 @@ const compileMembership = (
|
|
|
385
427
|
expression.operator === "\\subseteq" ? { kind: "Subset", base: evaluated } : evaluated;
|
|
386
428
|
if (!isEnumerable(value)) {
|
|
387
429
|
throw new TlaEvaluationError(
|
|
388
|
-
`In computing next states, the right side of \\
|
|
430
|
+
`In computing ${run.isInit ? "initial" : "next"} states, the right side of \\IN is not enumerable.\n${describeRange(expression)}`,
|
|
389
431
|
);
|
|
390
432
|
}
|
|
391
433
|
const elements = getStreamedElements(value);
|
|
@@ -729,6 +771,33 @@ const compileAction = (
|
|
|
729
771
|
}
|
|
730
772
|
};
|
|
731
773
|
}
|
|
774
|
+
const hoisted = isInit ? undefined : getHoistedGuards(expression, environment);
|
|
775
|
+
if (hoisted) {
|
|
776
|
+
const rest = compileConjunction(hoisted.rest, environment, isInit);
|
|
777
|
+
return (run, scope, partial, action, isFixed, onComplete) => {
|
|
778
|
+
const context = getContext(run, scope, partial);
|
|
779
|
+
const sets = expression.bounds.map((innerBound) =>
|
|
780
|
+
getEnumeratedElements(evaluate(innerBound.set, context), innerBound.set),
|
|
781
|
+
);
|
|
782
|
+
if (sets.some((elements) => elements.length === 0)) return;
|
|
783
|
+
const visit = (index: number, boundScope: Scope | undefined): void => {
|
|
784
|
+
if (index < 0) {
|
|
785
|
+
rest(run, boundScope, partial, action, isFixed, onComplete);
|
|
786
|
+
return;
|
|
787
|
+
}
|
|
788
|
+
for (const element of sets[index]) {
|
|
789
|
+
if (run.isStopped) return;
|
|
790
|
+
const elementScope = bindValue(boundScope, hoisted.names[index], element);
|
|
791
|
+
if (index === sets.length - 1) {
|
|
792
|
+
const guardContext = getContext(run, elementScope, partial);
|
|
793
|
+
if (!hoisted.guards.every((guard) => holds(guard, guardContext))) continue;
|
|
794
|
+
}
|
|
795
|
+
visit(index - 1, elementScope);
|
|
796
|
+
}
|
|
797
|
+
};
|
|
798
|
+
visit(sets.length - 1, scope);
|
|
799
|
+
};
|
|
800
|
+
}
|
|
732
801
|
return (run, scope, partial, action, isFixed, onComplete) => {
|
|
733
802
|
forEachBinding(expression.bounds, getContext(run, scope, partial), (boundScope) => {
|
|
734
803
|
body(run, boundScope, partial, action, isFixed, onComplete);
|
|
@@ -804,7 +873,9 @@ const compileAction = (
|
|
|
804
873
|
);
|
|
805
874
|
const body = arm?.body ?? other;
|
|
806
875
|
if (!body)
|
|
807
|
-
throw new TlaEvaluationError(
|
|
876
|
+
throw new TlaEvaluationError(
|
|
877
|
+
`In computing ${run.isInit ? "initial" : "next"} states, TLC encountered a CASE with no conditions true.\n${describeRange(expression)}`,
|
|
878
|
+
);
|
|
808
879
|
body(run, scope, partial, action, isFixed, onComplete);
|
|
809
880
|
};
|
|
810
881
|
}
|
|
@@ -913,18 +984,19 @@ export const isEnabled = (expression: Expression, context: Context): boolean =>
|
|
|
913
984
|
);
|
|
914
985
|
}
|
|
915
986
|
const environment = context.environment;
|
|
916
|
-
const
|
|
987
|
+
const run: Run = { environment, isInit: false, current: state, isStopped: false };
|
|
988
|
+
// TLC stops computing ENABLED at the first successor, so it skips the rest of the action.
|
|
917
989
|
getRunner(expression, environment, false)(
|
|
918
|
-
|
|
990
|
+
run,
|
|
919
991
|
context.scope,
|
|
920
992
|
getEmptyState(environment),
|
|
921
993
|
undefined,
|
|
922
994
|
false,
|
|
923
995
|
() => {
|
|
924
|
-
|
|
996
|
+
run.isStopped = true;
|
|
925
997
|
},
|
|
926
998
|
);
|
|
927
|
-
return
|
|
999
|
+
return run.isStopped;
|
|
928
1000
|
};
|
|
929
1001
|
|
|
930
1002
|
export const forEachInitialState = (
|
|
@@ -993,8 +1065,10 @@ export const forEachSuccessor = (
|
|
|
993
1065
|
(partial, action) => {
|
|
994
1066
|
if (run.isStopped) return;
|
|
995
1067
|
if (!isComplete(partial)) {
|
|
996
|
-
throw new
|
|
997
|
-
|
|
1068
|
+
throw new TlaIncompleteStateError(
|
|
1069
|
+
partial,
|
|
1070
|
+
action,
|
|
1071
|
+
getMissingVariables(partial, environment).sort(),
|
|
998
1072
|
);
|
|
999
1073
|
}
|
|
1000
1074
|
counter.successors++;
|
package/src/symmetry.ts
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
|
-
import { TlaConfigError } from "./errors";
|
|
1
|
+
import { TlaConfigError, TlaEvaluationError, UNEXPECTED_EXCEPTION } from "./errors";
|
|
2
2
|
import { evaluate, type Environment } from "./evaluate";
|
|
3
|
+
import { EXIT_STATUS, setExitCode } from "./exit-codes";
|
|
3
4
|
import {
|
|
4
5
|
compareValues,
|
|
5
6
|
createFunction,
|
|
@@ -9,6 +10,7 @@ import {
|
|
|
9
10
|
isEnumerable,
|
|
10
11
|
isFunctionValue,
|
|
11
12
|
isModelValue,
|
|
13
|
+
isSameValue,
|
|
12
14
|
isSetValue,
|
|
13
15
|
toFiniteFunction,
|
|
14
16
|
toFiniteSet,
|
|
@@ -46,9 +48,13 @@ const composePermutations = (first: Images, second: Images) => {
|
|
|
46
48
|
return composed;
|
|
47
49
|
};
|
|
48
50
|
|
|
49
|
-
|
|
51
|
+
// TLC checks the symmetry set outside any phase that reports an error itself.
|
|
52
|
+
const createSymmetryError = (message: string) =>
|
|
53
|
+
setExitCode(new TlaEvaluationError(`${UNEXPECTED_EXCEPTION}${message}`), EXIT_STATUS.error);
|
|
54
|
+
|
|
55
|
+
const toImages = (value: Value) => {
|
|
50
56
|
if (!isFunctionValue(value)) {
|
|
51
|
-
throw
|
|
57
|
+
throw createSymmetryError("The symmetry values must be function records.");
|
|
52
58
|
}
|
|
53
59
|
const functionValue = toFiniteFunction(value);
|
|
54
60
|
const permutation: Images = new Map();
|
|
@@ -64,8 +70,13 @@ const toImages = (value: Value, name: string) => {
|
|
|
64
70
|
|
|
65
71
|
export const getSymmetryGroup = (name: string, environment: Environment): Permutation[] => {
|
|
66
72
|
const definition = environment.definitions.get(name);
|
|
73
|
+
if (definition === undefined && !environment.constants.has(name)) {
|
|
74
|
+
throw new TlaConfigError(
|
|
75
|
+
`The symmetry function ${name} specified in the configuration file\nis not defined in the specification.`,
|
|
76
|
+
);
|
|
77
|
+
}
|
|
67
78
|
if (definition?.kind !== "Operator" || definition.params.length > 0) {
|
|
68
|
-
throw
|
|
79
|
+
throw createSymmetryError(`The symmetry function ${name} must specify a set of permutations.`);
|
|
69
80
|
}
|
|
70
81
|
const value = evaluate(definition.body, {
|
|
71
82
|
environment,
|
|
@@ -74,9 +85,9 @@ export const getSymmetryGroup = (name: string, environment: Environment): Permut
|
|
|
74
85
|
next: undefined,
|
|
75
86
|
});
|
|
76
87
|
if (!isSetValue(value) || !isEnumerable(value)) {
|
|
77
|
-
throw
|
|
88
|
+
throw createSymmetryError("The symmetry operator must specify a set of functions.");
|
|
78
89
|
}
|
|
79
|
-
const permutations = toFiniteSet(value).elements.map(
|
|
90
|
+
const permutations = toFiniteSet(value).elements.map(toImages);
|
|
80
91
|
const isDisabled =
|
|
81
92
|
definition.body.kind === "Apply" && definition.body.args.length >= permutations.length;
|
|
82
93
|
if (isDisabled) return [];
|
|
@@ -163,7 +174,10 @@ const permuteValue = (value: Value, permutation: Permutation): Value => {
|
|
|
163
174
|
if (size === 0 || size > CACHED_SIZE_LIMIT) return computePermutedValue(value, permutation);
|
|
164
175
|
const cached = permutation.cache.get(value);
|
|
165
176
|
if (cached !== undefined) return cached;
|
|
166
|
-
const
|
|
177
|
+
const computed = computePermutedValue(value, permutation);
|
|
178
|
+
// A permutation often maps a value to an equal one. Keeping the original lets the comparison
|
|
179
|
+
// with the smallest state so far stop at identity.
|
|
180
|
+
const permuted = computed !== value && isSameValue(computed, value) ? value : computed;
|
|
167
181
|
if (permutation.cacheSize >= permutation.cacheLimit) {
|
|
168
182
|
permutation.cache = new WeakMap();
|
|
169
183
|
permutation.cacheSize = 0;
|
|
@@ -184,7 +198,15 @@ const computePermutedValue = (value: ObjectValue, permutation: Permutation) => {
|
|
|
184
198
|
const domain = permuteElements(functionValue.domain, permutation);
|
|
185
199
|
const range = permuteElements(functionValue.range, permutation) ?? functionValue.range;
|
|
186
200
|
if (domain) {
|
|
187
|
-
|
|
201
|
+
const permuted = createFunction(
|
|
202
|
+
domain.map((key, index): [Value, Value] => [key, range[index]]),
|
|
203
|
+
);
|
|
204
|
+
// A permutation often maps the domain to itself, such as a function over the symmetric set.
|
|
205
|
+
// Sharing the original domain array lets comparisons with other images skip the domain.
|
|
206
|
+
const isSameDomain = permuted.domain.every(
|
|
207
|
+
(key, index) => key === functionValue.domain[index],
|
|
208
|
+
);
|
|
209
|
+
return isSameDomain ? createSortedFunction(functionValue.domain, permuted.range) : permuted;
|
|
188
210
|
}
|
|
189
211
|
return range === functionValue.range
|
|
190
212
|
? functionValue
|
package/src/tableau.ts
CHANGED
|
@@ -162,22 +162,39 @@ const containsAction = (expression: LiveExpression): boolean => {
|
|
|
162
162
|
}
|
|
163
163
|
};
|
|
164
164
|
|
|
165
|
-
const
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
165
|
+
const termKeys = new WeakMap<LiveExpression, string>();
|
|
166
|
+
const atoms = { count: 0 };
|
|
167
|
+
|
|
168
|
+
// A term's structure as a string in which each atom stands for itself, so equal terms share a key.
|
|
169
|
+
export const getTermKey = (expression: LiveExpression): string => {
|
|
170
|
+
const cached = termKeys.get(expression);
|
|
171
|
+
if (cached !== undefined) return cached;
|
|
172
|
+
const key = (() => {
|
|
173
|
+
switch (expression.kind) {
|
|
174
|
+
case "Boolean":
|
|
175
|
+
return String(expression.value);
|
|
176
|
+
case "State":
|
|
177
|
+
case "Enabled":
|
|
178
|
+
case "Action":
|
|
179
|
+
return `#${atoms.count++}`;
|
|
180
|
+
case "And":
|
|
181
|
+
case "Or":
|
|
182
|
+
return `${expression.kind}(${expression.operands.map(getTermKey).join(",")})`;
|
|
183
|
+
default:
|
|
184
|
+
return `${expression.kind}(${getTermKey(expression.body)})`;
|
|
185
|
+
}
|
|
186
|
+
})();
|
|
187
|
+
termKeys.set(expression, key);
|
|
188
|
+
return key;
|
|
177
189
|
};
|
|
178
190
|
|
|
179
|
-
const
|
|
180
|
-
|
|
191
|
+
const isEqual = (left: LiveExpression, right: LiveExpression) =>
|
|
192
|
+
left === right || getTermKey(left) === getTermKey(right);
|
|
193
|
+
|
|
194
|
+
const isMember = (items: LiveExpression[], expression: LiveExpression) => {
|
|
195
|
+
const key = getTermKey(expression);
|
|
196
|
+
return items.some((item) => item === expression || getTermKey(item) === key);
|
|
197
|
+
};
|
|
181
198
|
|
|
182
199
|
const getDual = (kind: LiveJunction["kind"]) => (kind === "And" ? "Or" : "And");
|
|
183
200
|
|
|
@@ -272,7 +289,7 @@ const toDisjunctiveNormalForm = (expression: LiveExpression): LiveExpression =>
|
|
|
272
289
|
total.value *= normal.operands.length;
|
|
273
290
|
if (total.value > MAXIMUM_DISJUNCTS) {
|
|
274
291
|
throw new TlaEvaluationError(
|
|
275
|
-
"TLC cannot handle the temporal formula because it exceeds the maximum supported size in disjunctive normal form",
|
|
292
|
+
"TLC cannot handle the temporal formula because it exceeds the maximum supported size in disjunctive normal form.",
|
|
276
293
|
);
|
|
277
294
|
}
|
|
278
295
|
}
|
|
@@ -446,13 +463,14 @@ const getTriples = (
|
|
|
446
463
|
return parts ? [{ whole: term, first: parts.first, second: parts.second }] : [];
|
|
447
464
|
});
|
|
448
465
|
|
|
449
|
-
|
|
450
|
-
|
|
466
|
+
// A particle is a set of terms, so its key ignores order and repeats.
|
|
467
|
+
const getParticleKey = (particle: LiveExpression[]) =>
|
|
468
|
+
[...new Set(particle.map(getTermKey))].sort().join("|");
|
|
451
469
|
|
|
452
|
-
const unionParticles = (left: LiveExpression[][], right: LiveExpression[][]) =>
|
|
453
|
-
|
|
454
|
-
...right
|
|
455
|
-
|
|
470
|
+
const unionParticles = (left: LiveExpression[][], right: LiveExpression[][]) => {
|
|
471
|
+
const rightKeys = new Set(right.map(getParticleKey));
|
|
472
|
+
return [...left.filter((particle) => !rightKeys.has(getParticleKey(particle))), ...right];
|
|
473
|
+
};
|
|
456
474
|
|
|
457
475
|
const getParticleClosure = (terms: LiveExpression[]) => {
|
|
458
476
|
const closure = getPositiveClosure(terms);
|
|
@@ -516,14 +534,23 @@ const createTableauNode = (particle: LiveExpression[]): TableauNode => ({
|
|
|
516
534
|
const createTableau = (formula: LiveExpression) => {
|
|
517
535
|
const nodes = getParticleClosure([formula]).map(createTableauNode);
|
|
518
536
|
const initialCount = nodes.length;
|
|
537
|
+
const indices = new Map<string, number>();
|
|
538
|
+
nodes.forEach((node, index) => {
|
|
539
|
+
const key = getParticleKey(node.particle);
|
|
540
|
+
if (!indices.has(key)) indices.set(key, index);
|
|
541
|
+
});
|
|
519
542
|
for (let index = 0; index < nodes.length; index++) {
|
|
520
543
|
const implied = nodes[index].particle.flatMap((term) =>
|
|
521
544
|
term.kind === "Next" ? [term.body] : [],
|
|
522
545
|
);
|
|
523
546
|
for (const particle of getParticleClosure(implied)) {
|
|
524
|
-
const
|
|
525
|
-
|
|
526
|
-
|
|
547
|
+
const key = getParticleKey(particle);
|
|
548
|
+
const existing = indices.get(key);
|
|
549
|
+
if (existing === undefined) {
|
|
550
|
+
indices.set(key, nodes.length);
|
|
551
|
+
nodes.push(createTableauNode(particle));
|
|
552
|
+
}
|
|
553
|
+
nodes[index].successors.push(existing ?? nodes.length - 1);
|
|
527
554
|
}
|
|
528
555
|
}
|
|
529
556
|
return { nodes, initialCount };
|