tla-ts 0.0.3-dev.6a30eee → 0.0.3-dev.6d0aeb6
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 +5 -1
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +58 -22
- package/dist/index.d.ts +58 -22
- package/dist/index.js +1 -1
- package/dist/parallel-worker.cjs +1 -1
- package/dist/parallel-worker.js +2 -2
- package/dist/parallel.cjs +1 -1
- package/dist/parallel.js +2 -2
- package/dist/run-cli.cjs +20 -18
- package/dist/run-cli.js +22 -20
- package/dist/transfer.cjs +40 -15
- package/dist/transfer.js +40 -15
- package/package.json +1 -1
- package/src/ast.ts +101 -1
- package/src/builtins.ts +9 -3
- package/src/check.ts +473 -100
- package/src/cli-options.ts +11 -5
- package/src/codegen.ts +15 -22
- package/src/config.ts +224 -170
- package/src/dependencies.ts +2 -2
- package/src/environment.ts +158 -49
- package/src/errors.ts +93 -3
- package/src/evaluate.ts +214 -147
- package/src/exit-codes.ts +21 -14
- package/src/fingerprints.ts +2 -1
- package/src/instances.ts +16 -15
- package/src/levels.ts +181 -45
- package/src/live-check.ts +132 -70
- package/src/liveness.ts +118 -24
- package/src/parallel-worker.ts +2 -2
- package/src/parallel.ts +5 -2
- package/src/parser.ts +71 -19
- package/src/resolve.ts +490 -95
- package/src/run-cli.ts +104 -18
- package/src/runtime.ts +2 -0
- package/src/sany-lexer.ts +615 -0
- package/src/sany-parse-error.ts +3143 -0
- package/src/spec-description.ts +19 -8
- package/src/standard-modules.ts +54 -45
- package/src/state-graph.ts +157 -0
- package/src/subexpressions.ts +35 -23
- package/src/substitution-levels.ts +38 -17
- package/src/successors.ts +176 -36
- package/src/symmetry.ts +16 -6
- 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 +8 -4
- package/src/tlc-random.ts +9 -6
- package/src/tlc-summary.ts +20 -5
- package/src/value-sources.ts +29 -0
- package/src/values.ts +242 -61
package/src/successors.ts
CHANGED
|
@@ -1,6 +1,18 @@
|
|
|
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 {
|
|
10
|
+
import {
|
|
11
|
+
TlaEvaluationError,
|
|
12
|
+
TlaIllegalStateError,
|
|
13
|
+
TlaIncompleteStateError,
|
|
14
|
+
TlaUnassignedError,
|
|
15
|
+
} from "./errors";
|
|
4
16
|
import { EXIT_STATUS, setExitCode } from "./exit-codes";
|
|
5
17
|
import {
|
|
6
18
|
describeLocation,
|
|
@@ -11,19 +23,19 @@ import {
|
|
|
11
23
|
bindValue,
|
|
12
24
|
compileArgumentScope,
|
|
13
25
|
evaluate,
|
|
26
|
+
getEntryEvaluator,
|
|
14
27
|
expectBoolean,
|
|
15
28
|
forEachBinding,
|
|
16
29
|
getBoundsDomain,
|
|
17
|
-
getChildren,
|
|
18
30
|
getDefinition,
|
|
19
31
|
getEnumeratedElements,
|
|
20
32
|
getReevaluatedDefinitions,
|
|
21
33
|
lookupScope,
|
|
22
34
|
resolveApplyOperator,
|
|
23
35
|
resolveGlobalOperator,
|
|
24
|
-
isLocallyResolved,
|
|
25
36
|
type Context,
|
|
26
37
|
type Environment,
|
|
38
|
+
type Evaluator,
|
|
27
39
|
type Scope,
|
|
28
40
|
type State,
|
|
29
41
|
} from "./evaluate";
|
|
@@ -46,6 +58,7 @@ export interface Successor {
|
|
|
46
58
|
interface Run {
|
|
47
59
|
environment: Environment;
|
|
48
60
|
isInit: boolean;
|
|
61
|
+
isEnabled: boolean;
|
|
49
62
|
current: Value[] | undefined;
|
|
50
63
|
isStopped: boolean;
|
|
51
64
|
}
|
|
@@ -82,25 +95,54 @@ const assign = (partial: State, index: number, value: Value) => {
|
|
|
82
95
|
return copy;
|
|
83
96
|
};
|
|
84
97
|
|
|
85
|
-
|
|
86
|
-
|
|
98
|
+
// TLC's Tool.getInitStates and Tool.getNextStates report a value where they expect a formula.
|
|
99
|
+
const expectFormula = (expression: Expression, value: Value, isInit: boolean) => {
|
|
87
100
|
if (typeof value === "boolean") return value;
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
101
|
+
throw new TlaEvaluationError(
|
|
102
|
+
`In computing ${isInit ? "initial" : "next"} states, TLC expected a boolean expression,\nbut instead found ${formatValue(value)}.\n${describeRange(expression)}`,
|
|
103
|
+
);
|
|
104
|
+
};
|
|
105
|
+
|
|
106
|
+
const holds = (expression: Expression, context: Context, value = evaluate(expression, context)) => {
|
|
107
|
+
// TLC rejects a number in the next-state relation when it splits the relation into actions.
|
|
108
|
+
if (context.next !== undefined && expression.kind === "Number") {
|
|
109
|
+
throw setExitCode(
|
|
110
|
+
new TlaEvaluationError(
|
|
111
|
+
`The next state relation is not a boolean expression.\n${expression.text ?? expression.value}`,
|
|
112
|
+
),
|
|
113
|
+
EXIT_STATUS.error,
|
|
114
|
+
);
|
|
93
115
|
}
|
|
116
|
+
return expectFormula(expression, value, context.next === undefined);
|
|
94
117
|
};
|
|
95
118
|
|
|
96
119
|
const isAssignmentOperator = (operator: string) =>
|
|
97
120
|
operator === "=" || operator === "\\in" || operator === "\\subseteq";
|
|
98
121
|
|
|
122
|
+
const tracedRunners = new WeakMap<Environment, WeakMap<Expression, Runner>[]>();
|
|
123
|
+
|
|
124
|
+
const getRunners = (environment: Environment, isInit: boolean) => {
|
|
125
|
+
if (!environment.trace) return isInit ? initRunners : nextRunners;
|
|
126
|
+
const runners = tracedRunners.get(environment) ?? [new WeakMap(), new WeakMap()];
|
|
127
|
+
tracedRunners.set(environment, runners);
|
|
128
|
+
return runners[isInit ? 0 : 1];
|
|
129
|
+
};
|
|
130
|
+
|
|
99
131
|
const getRunner = (expression: Expression, environment: Environment, isInit: boolean): Runner => {
|
|
100
|
-
const runners = isInit
|
|
132
|
+
const runners = getRunners(environment, isInit);
|
|
101
133
|
const cached = runners.get(expression);
|
|
102
134
|
if (cached) return cached;
|
|
103
|
-
const
|
|
135
|
+
const compiled = compileAction(expression, environment, isInit);
|
|
136
|
+
const trace = environment.trace;
|
|
137
|
+
// TLC's CallStackTool keeps an action's expression on the stack while the rest of the action runs.
|
|
138
|
+
const runner: Runner = trace
|
|
139
|
+
? (run, scope, partial, action, isFixed, onComplete) => {
|
|
140
|
+
const depth = trace.length;
|
|
141
|
+
trace.push(expression);
|
|
142
|
+
compiled(run, scope, partial, action, isFixed, onComplete);
|
|
143
|
+
trace.length = depth;
|
|
144
|
+
}
|
|
145
|
+
: compiled;
|
|
104
146
|
runners.set(expression, runner);
|
|
105
147
|
return runner;
|
|
106
148
|
};
|
|
@@ -184,6 +226,23 @@ const getUnchangedIndices = (
|
|
|
184
226
|
return getUnchangedIndices(definition.body, environment, visited);
|
|
185
227
|
};
|
|
186
228
|
|
|
229
|
+
// TLC's CallStackTool keeps each expression that UNCHANGED takes apart on the stack.
|
|
230
|
+
const getUnchangedFrames = (expression: Expression, environment: Environment): Expression[] => {
|
|
231
|
+
if (expression.kind === "Tuple") {
|
|
232
|
+
return [
|
|
233
|
+
expression,
|
|
234
|
+
...expression.elements.flatMap((element) => getUnchangedFrames(element, environment)),
|
|
235
|
+
];
|
|
236
|
+
}
|
|
237
|
+
const definition =
|
|
238
|
+
expression.kind === "Identifier" && !environment.variableIndex.has(expression.name)
|
|
239
|
+
? getZeroArityBody(expression.name, environment)
|
|
240
|
+
: undefined;
|
|
241
|
+
return definition
|
|
242
|
+
? [expression, ...getUnchangedFrames(definition.body, environment)]
|
|
243
|
+
: [expression];
|
|
244
|
+
};
|
|
245
|
+
|
|
187
246
|
const ACTION_KINDS = new Set([
|
|
188
247
|
"Label",
|
|
189
248
|
"And",
|
|
@@ -288,12 +347,35 @@ const toConjunct = (
|
|
|
288
347
|
return { kind: "Branch", expression, runner: getRunner(expression, environment, isInit) };
|
|
289
348
|
};
|
|
290
349
|
|
|
350
|
+
// The leading guards of `\E x \in S, y \in T : P /\ Q` that read no inner bound hold for every inner
|
|
351
|
+
// binding alike, so they can run once for each element of the outermost bound.
|
|
352
|
+
const getHoistedGuards = (expression: QuantifierExpression, environment: Environment) => {
|
|
353
|
+
if (expression.bounds.length < 2 || expression.body.kind !== "And") return undefined;
|
|
354
|
+
const names = expression.bounds.flatMap((bound) =>
|
|
355
|
+
bound.pattern.kind === "Name" ? [bound.pattern.name] : [],
|
|
356
|
+
);
|
|
357
|
+
if (names.length !== expression.bounds.length) return undefined;
|
|
358
|
+
const innerNames = new Set(names.slice(0, -1));
|
|
359
|
+
const operands = expression.body.operands;
|
|
360
|
+
const index = operands.findIndex((operand) => {
|
|
361
|
+
if (getReadVariables(operand, environment) === undefined) return true;
|
|
362
|
+
if (hasBranches(operand, environment, new Set())) return true;
|
|
363
|
+
const readLocals = getReadLocals(operand, NO_NAMES);
|
|
364
|
+
return !readLocals || readLocals.some((name) => innerNames.has(name));
|
|
365
|
+
});
|
|
366
|
+
const count = index === -1 ? operands.length : index;
|
|
367
|
+
if (count === 0) return undefined;
|
|
368
|
+
return { names, guards: operands.slice(0, count), rest: operands.slice(count) };
|
|
369
|
+
};
|
|
370
|
+
|
|
291
371
|
const compileConjunction = (
|
|
292
372
|
operands: Expression[],
|
|
293
373
|
environment: Environment,
|
|
294
374
|
isInit: boolean,
|
|
295
375
|
): Runner => {
|
|
296
376
|
const conjuncts = operands.map((operand) => toConjunct(operand, environment, isInit));
|
|
377
|
+
const evaluators: (Evaluator | undefined)[] = conjuncts.map(() => undefined);
|
|
378
|
+
const trace = environment.trace;
|
|
297
379
|
const runFrom = (
|
|
298
380
|
start: number,
|
|
299
381
|
run: Run,
|
|
@@ -314,14 +396,25 @@ const compileConjunction = (
|
|
|
314
396
|
return;
|
|
315
397
|
}
|
|
316
398
|
const conjunct = conjuncts[index];
|
|
399
|
+
if (trace) {
|
|
400
|
+
trace.push(conjunct.expression);
|
|
401
|
+
if (conjunct.expression.kind === "Unchanged") {
|
|
402
|
+
trace.push(...getUnchangedFrames(conjunct.expression.expression, environment));
|
|
403
|
+
}
|
|
404
|
+
}
|
|
317
405
|
if (conjunct.kind === "Guard") {
|
|
318
406
|
context ??= getContext(run, scope, current);
|
|
319
|
-
|
|
407
|
+
const evaluator = (evaluators[index] ??= getEntryEvaluator(
|
|
408
|
+
conjunct.expression,
|
|
409
|
+
environment,
|
|
410
|
+
));
|
|
411
|
+
if (!holds(conjunct.expression, context, evaluator(context))) return;
|
|
320
412
|
continue;
|
|
321
413
|
}
|
|
322
414
|
if (conjunct.kind === "Assign") {
|
|
323
415
|
context ??= getContext(run, scope, current);
|
|
324
|
-
const
|
|
416
|
+
const evaluator = (evaluators[index] ??= getEntryEvaluator(conjunct.value, environment));
|
|
417
|
+
const value = evaluator(context);
|
|
325
418
|
const assigned = current[conjunct.index];
|
|
326
419
|
if (assigned === undefined) {
|
|
327
420
|
current = assign(current, conjunct.index, value);
|
|
@@ -358,10 +451,7 @@ const compileConjunction = (
|
|
|
358
451
|
};
|
|
359
452
|
|
|
360
453
|
const holdsInInit = (expression: Expression, context: Context) =>
|
|
361
|
-
|
|
362
|
-
evaluate(expression, context),
|
|
363
|
-
`the initial predicate at ${describeLocation(expression)}`,
|
|
364
|
-
);
|
|
454
|
+
expectFormula(expression, evaluate(expression, context), true);
|
|
365
455
|
|
|
366
456
|
const compileGuard =
|
|
367
457
|
(expression: Expression): Runner =>
|
|
@@ -386,7 +476,7 @@ const compileMembership = (
|
|
|
386
476
|
expression.operator === "\\subseteq" ? { kind: "Subset", base: evaluated } : evaluated;
|
|
387
477
|
if (!isEnumerable(value)) {
|
|
388
478
|
throw new TlaEvaluationError(
|
|
389
|
-
`In computing next states, the right side of \\
|
|
479
|
+
`In computing ${run.isInit ? "initial" : "next"} states, the right side of \\IN is not enumerable.\n${describeRange(expression)}`,
|
|
390
480
|
);
|
|
391
481
|
}
|
|
392
482
|
const elements = getStreamedElements(value);
|
|
@@ -730,6 +820,34 @@ const compileAction = (
|
|
|
730
820
|
}
|
|
731
821
|
};
|
|
732
822
|
}
|
|
823
|
+
const hoisted =
|
|
824
|
+
isInit || environment.trace ? undefined : getHoistedGuards(expression, environment);
|
|
825
|
+
if (hoisted) {
|
|
826
|
+
const rest = compileConjunction(hoisted.rest, environment, isInit);
|
|
827
|
+
return (run, scope, partial, action, isFixed, onComplete) => {
|
|
828
|
+
const context = getContext(run, scope, partial);
|
|
829
|
+
const sets = expression.bounds.map((innerBound) =>
|
|
830
|
+
getEnumeratedElements(evaluate(innerBound.set, context), innerBound.set),
|
|
831
|
+
);
|
|
832
|
+
if (sets.some((elements) => elements.length === 0)) return;
|
|
833
|
+
const visit = (index: number, boundScope: Scope | undefined): void => {
|
|
834
|
+
if (index < 0) {
|
|
835
|
+
rest(run, boundScope, partial, action, isFixed, onComplete);
|
|
836
|
+
return;
|
|
837
|
+
}
|
|
838
|
+
for (const element of sets[index]) {
|
|
839
|
+
if (run.isStopped) return;
|
|
840
|
+
const elementScope = bindValue(boundScope, hoisted.names[index], element);
|
|
841
|
+
if (index === sets.length - 1) {
|
|
842
|
+
const guardContext = getContext(run, elementScope, partial);
|
|
843
|
+
if (!hoisted.guards.every((guard) => holds(guard, guardContext))) continue;
|
|
844
|
+
}
|
|
845
|
+
visit(index - 1, elementScope);
|
|
846
|
+
}
|
|
847
|
+
};
|
|
848
|
+
visit(sets.length - 1, scope);
|
|
849
|
+
};
|
|
850
|
+
}
|
|
733
851
|
return (run, scope, partial, action, isFixed, onComplete) => {
|
|
734
852
|
forEachBinding(expression.bounds, getContext(run, scope, partial), (boundScope) => {
|
|
735
853
|
body(run, boundScope, partial, action, isFixed, onComplete);
|
|
@@ -806,7 +924,7 @@ const compileAction = (
|
|
|
806
924
|
const body = arm?.body ?? other;
|
|
807
925
|
if (!body)
|
|
808
926
|
throw new TlaEvaluationError(
|
|
809
|
-
|
|
927
|
+
`In computing ${run.isInit ? "initial" : "next"} states, TLC encountered a CASE with no conditions true.\n${describeRange(expression)}`,
|
|
810
928
|
);
|
|
811
929
|
body(run, scope, partial, action, isFixed, onComplete);
|
|
812
930
|
};
|
|
@@ -838,8 +956,17 @@ const compileAction = (
|
|
|
838
956
|
const unchanged = getUnchangedWrapper(expression.subscript);
|
|
839
957
|
return (run, scope, partial, action, isFixed, onComplete) =>
|
|
840
958
|
body(run, scope, partial, action, isFixed, (nextPartial, nextAction) => {
|
|
841
|
-
|
|
842
|
-
|
|
959
|
+
// ENABLED evaluates the subscript on the successor that the action specifies. TLC names
|
|
960
|
+
// a variable that the action leaves without a value.
|
|
961
|
+
try {
|
|
962
|
+
if (!holds(unchanged, getContext(run, scope, nextPartial)))
|
|
963
|
+
onComplete(nextPartial, nextAction);
|
|
964
|
+
} catch (error) {
|
|
965
|
+
if (!run.isEnabled || !(error instanceof TlaUnassignedError)) throw error;
|
|
966
|
+
throw new TlaEvaluationError(
|
|
967
|
+
`The action formula A appearing in a WF_v(A) or SF_v(A) operator does not specify the primed value of the variable ${error.variable} occurring in the state formula v.\n`,
|
|
968
|
+
);
|
|
969
|
+
}
|
|
843
970
|
});
|
|
844
971
|
}
|
|
845
972
|
case "BoxAction":
|
|
@@ -916,7 +1043,13 @@ export const isEnabled = (expression: Expression, context: Context): boolean =>
|
|
|
916
1043
|
);
|
|
917
1044
|
}
|
|
918
1045
|
const environment = context.environment;
|
|
919
|
-
const run: Run = {
|
|
1046
|
+
const run: Run = {
|
|
1047
|
+
environment,
|
|
1048
|
+
isInit: false,
|
|
1049
|
+
isEnabled: true,
|
|
1050
|
+
current: state,
|
|
1051
|
+
isStopped: false,
|
|
1052
|
+
};
|
|
920
1053
|
// TLC stops computing ENABLED at the first successor, so it skips the rest of the action.
|
|
921
1054
|
getRunner(expression, environment, false)(
|
|
922
1055
|
run,
|
|
@@ -937,7 +1070,13 @@ export const forEachInitialState = (
|
|
|
937
1070
|
onState: (state: Value[]) => boolean,
|
|
938
1071
|
scope?: Scope,
|
|
939
1072
|
) => {
|
|
940
|
-
const run: Run = {
|
|
1073
|
+
const run: Run = {
|
|
1074
|
+
environment,
|
|
1075
|
+
isInit: true,
|
|
1076
|
+
isEnabled: false,
|
|
1077
|
+
current: undefined,
|
|
1078
|
+
isStopped: false,
|
|
1079
|
+
};
|
|
941
1080
|
getRunner(expression, environment, true)(
|
|
942
1081
|
run,
|
|
943
1082
|
scope,
|
|
@@ -947,14 +1086,7 @@ export const forEachInitialState = (
|
|
|
947
1086
|
(partial) => {
|
|
948
1087
|
if (run.isStopped) return;
|
|
949
1088
|
if (!isComplete(partial)) {
|
|
950
|
-
|
|
951
|
-
// an evaluation failure.
|
|
952
|
-
throw setExitCode(
|
|
953
|
-
new TlaEvaluationError(
|
|
954
|
-
`The initial predicate does not assign ${getMissingVariables(partial, environment).join(", ")}`,
|
|
955
|
-
),
|
|
956
|
-
EXIT_STATUS.error,
|
|
957
|
-
);
|
|
1089
|
+
throw setExitCode(new TlaIllegalStateError(partial), EXIT_STATUS.error);
|
|
958
1090
|
}
|
|
959
1091
|
run.isStopped = onState(partial);
|
|
960
1092
|
},
|
|
@@ -986,7 +1118,13 @@ export const forEachSuccessor = (
|
|
|
986
1118
|
onSuccessor: (successor: Successor) => boolean,
|
|
987
1119
|
scope?: Scope,
|
|
988
1120
|
) => {
|
|
989
|
-
const run: Run = {
|
|
1121
|
+
const run: Run = {
|
|
1122
|
+
environment,
|
|
1123
|
+
isInit: false,
|
|
1124
|
+
isEnabled: false,
|
|
1125
|
+
current: state,
|
|
1126
|
+
isStopped: false,
|
|
1127
|
+
};
|
|
990
1128
|
const counter = { successors: 0 };
|
|
991
1129
|
getRunner(expression, environment, false)(
|
|
992
1130
|
run,
|
|
@@ -997,8 +1135,10 @@ export const forEachSuccessor = (
|
|
|
997
1135
|
(partial, action) => {
|
|
998
1136
|
if (run.isStopped) return;
|
|
999
1137
|
if (!isComplete(partial)) {
|
|
1000
|
-
throw new
|
|
1001
|
-
|
|
1138
|
+
throw new TlaIncompleteStateError(
|
|
1139
|
+
partial,
|
|
1140
|
+
action,
|
|
1141
|
+
getMissingVariables(partial, environment).sort(),
|
|
1002
1142
|
);
|
|
1003
1143
|
}
|
|
1004
1144
|
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,
|
|
@@ -47,9 +48,13 @@ const composePermutations = (first: Images, second: Images) => {
|
|
|
47
48
|
return composed;
|
|
48
49
|
};
|
|
49
50
|
|
|
50
|
-
|
|
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) => {
|
|
51
56
|
if (!isFunctionValue(value)) {
|
|
52
|
-
throw
|
|
57
|
+
throw createSymmetryError("The symmetry values must be function records.");
|
|
53
58
|
}
|
|
54
59
|
const functionValue = toFiniteFunction(value);
|
|
55
60
|
const permutation: Images = new Map();
|
|
@@ -65,8 +70,13 @@ const toImages = (value: Value, name: string) => {
|
|
|
65
70
|
|
|
66
71
|
export const getSymmetryGroup = (name: string, environment: Environment): Permutation[] => {
|
|
67
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
|
+
}
|
|
68
78
|
if (definition?.kind !== "Operator" || definition.params.length > 0) {
|
|
69
|
-
throw
|
|
79
|
+
throw createSymmetryError(`The symmetry function ${name} must specify a set of permutations.`);
|
|
70
80
|
}
|
|
71
81
|
const value = evaluate(definition.body, {
|
|
72
82
|
environment,
|
|
@@ -75,9 +85,9 @@ export const getSymmetryGroup = (name: string, environment: Environment): Permut
|
|
|
75
85
|
next: undefined,
|
|
76
86
|
});
|
|
77
87
|
if (!isSetValue(value) || !isEnumerable(value)) {
|
|
78
|
-
throw
|
|
88
|
+
throw createSymmetryError("The symmetry operator must specify a set of functions.");
|
|
79
89
|
}
|
|
80
|
-
const permutations = toFiniteSet(value).elements.map(
|
|
90
|
+
const permutations = toFiniteSet(value).elements.map(toImages);
|
|
81
91
|
const isDisabled =
|
|
82
92
|
definition.body.kind === "Apply" && definition.body.args.length >= permutations.length;
|
|
83
93
|
if (isDisabled) return [];
|
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 };
|
package/src/tlc-ext.ts
CHANGED
|
@@ -10,16 +10,8 @@ import {
|
|
|
10
10
|
} from "./builtins";
|
|
11
11
|
import { TlaEvaluationError, TlaModuleError, TlaUnsupportedError } from "./errors";
|
|
12
12
|
import { getTlcFingerprint } from "./tlc-random";
|
|
13
|
-
import {
|
|
14
|
-
|
|
15
|
-
expectBoolean,
|
|
16
|
-
getChildren,
|
|
17
|
-
getDefinition,
|
|
18
|
-
isLocallyResolved,
|
|
19
|
-
type Builtin,
|
|
20
|
-
type Environment,
|
|
21
|
-
} from "./evaluate";
|
|
22
|
-
import type { Definition, Expression } from "./ast";
|
|
13
|
+
import { evaluate, expectBoolean, getDefinition, type Builtin, type Environment } from "./evaluate";
|
|
14
|
+
import { getChildren, isLocallyResolved, type Definition, type Expression } from "./ast";
|
|
23
15
|
import type { TraceStep } from "./check";
|
|
24
16
|
import {
|
|
25
17
|
getNamedRegisters,
|
|
@@ -111,15 +103,35 @@ const getRegister = (runtime: CheckerRuntime, key: Value) => {
|
|
|
111
103
|
return undefined;
|
|
112
104
|
};
|
|
113
105
|
|
|
114
|
-
|
|
106
|
+
// TLC's TLCSet. TLCExt's TLCGetAndSet is a TLA+ definition that calls it.
|
|
107
|
+
export const setTlcValue = (
|
|
108
|
+
runtime: CheckerRuntime,
|
|
109
|
+
print: (text: string) => void,
|
|
110
|
+
key: Value,
|
|
111
|
+
value: Value,
|
|
112
|
+
) => {
|
|
115
113
|
if (typeof key === "number" && key >= 0) {
|
|
116
114
|
runtime.registers.set(key, value);
|
|
117
115
|
return;
|
|
118
116
|
}
|
|
117
|
+
if (key === "exit") {
|
|
118
|
+
if (value === true) runtime.isStopped = true;
|
|
119
|
+
return;
|
|
120
|
+
}
|
|
121
|
+
if (key === "pause") {
|
|
122
|
+
if (value !== true) return;
|
|
123
|
+
print("Press enter to resume model checking.");
|
|
124
|
+
runtime.pause();
|
|
125
|
+
return;
|
|
126
|
+
}
|
|
119
127
|
if (typeof key === "string" && key.startsWith(NAMED_REGISTER_PREFIX)) {
|
|
120
128
|
runtime.namedRegisters.set(key, value);
|
|
121
129
|
return;
|
|
122
130
|
}
|
|
131
|
+
if (typeof key === "string" && key.startsWith("-D")) {
|
|
132
|
+
runtime.properties.set(key.slice(2), formatValue(value));
|
|
133
|
+
return;
|
|
134
|
+
}
|
|
123
135
|
throw new TlaModuleError(
|
|
124
136
|
`The first argument of TLCSet should be a nonnegative integer, but instead it is:\n${formatValue(key)}`,
|
|
125
137
|
);
|
|
@@ -203,7 +215,12 @@ export const createTlcExtOperators = (
|
|
|
203
215
|
const key = getValue(args, 0, "TLCGetAndSet");
|
|
204
216
|
const previous = getRegister(runtime, key) ?? getValue(args, 3, "TLCGetAndSet");
|
|
205
217
|
const update = getOperator(args, 1, "TLCGetAndSet");
|
|
206
|
-
|
|
218
|
+
setTlcValue(
|
|
219
|
+
runtime,
|
|
220
|
+
print,
|
|
221
|
+
key,
|
|
222
|
+
update.call([previous, getValue(args, 2, "TLCGetAndSet")]),
|
|
223
|
+
);
|
|
207
224
|
return previous;
|
|
208
225
|
}),
|
|
209
226
|
isStateLevel: true,
|