tla-ts 0.0.10-dev.1ebc153bd → 0.0.10-dev.22f7435d3
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 +30 -30
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +6 -2
- package/dist/index.d.ts +6 -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 +68 -68
- package/dist/prove.js +61 -61
- package/dist/run.cjs +42 -42
- package/dist/run.js +44 -44
- package/dist/transfer.cjs +38 -38
- package/dist/transfer.js +29 -29
- package/dist/worker.cjs +7 -7
- package/dist/worker.js +7 -7
- package/package.json +1 -1
- package/src/bags.ts +5 -2
- package/src/builtins.ts +4 -3
- package/src/check-failure.ts +9 -6
- package/src/check-trace.ts +116 -64
- package/src/check.ts +343 -166
- package/src/cli/tlc-output.ts +1 -0
- package/src/cli/tlc.ts +3 -2
- package/src/codegen.ts +23 -8
- package/src/dependencies.ts +5 -4
- package/src/dfid.ts +13 -8
- package/src/environment.ts +1 -0
- package/src/evaluate.ts +58 -23
- package/src/exit-codes.ts +27 -13
- package/src/java-hash.ts +14 -0
- package/src/liveness-checker.ts +131 -81
- package/src/liveness.ts +48 -10
- package/src/parser.ts +6 -1
- package/src/prover/smt/solver/arith-rewriter.ts +11 -3
- package/src/prover/smt/solver/array-rewriter.ts +12 -2
- package/src/prover/smt/solver/asserted-formulas.ts +109 -63
- package/src/prover/smt/solver/ast.ts +5 -3
- package/src/prover/smt/solver/auf-solver.ts +23 -12
- package/src/prover/smt/solver/bit-blast-tactic.ts +26 -0
- package/src/prover/smt/solver/bound-simplifier.ts +10 -11
- package/src/prover/smt/solver/card2bv.ts +34 -15
- package/src/prover/smt/solver/cofactor-elim-term-ite.ts +39 -23
- package/src/prover/smt/solver/context.ts +44 -11
- package/src/prover/smt/solver/dependent-expr-state.ts +19 -13
- package/src/prover/smt/solver/dt2bv-tactic.ts +36 -20
- package/src/prover/smt/solver/elim-bounds.ts +89 -0
- package/src/prover/smt/solver/elim-uncnstr.ts +1 -1
- package/src/prover/smt/solver/fd-solver.ts +146 -39
- package/src/prover/smt/solver/internalizer.ts +1 -1
- package/src/prover/smt/solver/lp/lp-settings.ts +4 -0
- 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/model-evaluator.ts +2 -0
- package/src/prover/smt/solver/model-generator.ts +82 -42
- 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 +12 -4
- package/src/prover/smt/solver/opt-pareto.ts +19 -0
- package/src/prover/smt/solver/opt-solver.ts +4 -3
- package/src/prover/smt/solver/parallel-tactic.ts +1 -1
- package/src/prover/smt/solver/poly-rewriter.ts +1 -0
- package/src/prover/smt/solver/proto-model.ts +4 -2
- package/src/prover/smt/solver/push-app-ite.ts +37 -0
- package/src/prover/smt/solver/qsat.ts +23 -8
- package/src/prover/smt/solver/rewriter-tpl.ts +7 -6
- package/src/prover/smt/solver/rewriter.ts +31 -25
- package/src/prover/smt/solver/sat/goal2sat.ts +0 -1
- package/src/prover/smt/solver/sat/inc-sat-solver.ts +56 -28
- package/src/prover/smt/solver/sat/sat-tactic.ts +13 -4
- 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 +39 -4
- package/src/prover/smt/solver/smt-setup.ts +28 -4
- package/src/prover/smt/solver/smtlib-parser.ts +31 -4
- package/src/prover/smt/solver/smtlib-script.ts +219 -82
- package/src/prover/smt/solver/solve-eqs.ts +24 -17
- package/src/prover/smt/solver/solver.ts +18 -3
- package/src/prover/smt/solver/tactic.ts +132 -78
- package/src/prover/smt/solver/theory-bv.ts +11 -1
- 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 +1 -0
- package/src/prover/smt/solver/theory-lra-propagate.ts +7 -1
- package/src/prover/smt/solver/theory-lra.ts +1 -0
- package/src/prover/smt/solver/tseitin-cnf.ts +1 -0
- package/src/resolve.ts +446 -167
- package/src/runtime.ts +4 -0
- package/src/search.ts +161 -92
- package/src/simulate.ts +165 -102
- package/src/spec-description.ts +3 -4
- package/src/standard-modules.ts +56 -22
- package/src/subexpressions.ts +168 -49
- package/src/successors.ts +6 -3
- package/src/symmetry.ts +1 -0
- package/src/tlc/random.ts +2 -1
- package/src/tlc/replay.ts +22 -14
- package/src/tlc/tlc-operators.ts +7 -7
- package/src/tlc/tlcext-operators.ts +26 -10
- package/src/tlc/trace-spec.ts +6 -20
- package/src/typed-tier.ts +9 -4
- package/src/values.ts +95 -57
|
@@ -15,6 +15,7 @@ import {
|
|
|
15
15
|
TlaUnsupportedError,
|
|
16
16
|
} from "../errors";
|
|
17
17
|
import { getTlcFingerprint } from "./fingerprint";
|
|
18
|
+
import { prettyPrint } from "../pretty-print";
|
|
18
19
|
import { formatMessage, formatNestedMessage, MESSAGE_CODE, MESSAGE_LEVEL } from "./messages";
|
|
19
20
|
import {
|
|
20
21
|
describeRange,
|
|
@@ -37,11 +38,14 @@ import {
|
|
|
37
38
|
createRecord,
|
|
38
39
|
createSet,
|
|
39
40
|
createTuple,
|
|
41
|
+
createWrittenFunction,
|
|
40
42
|
formatState,
|
|
41
43
|
formatValue,
|
|
42
44
|
getFingerprintError,
|
|
43
45
|
getSequenceElements,
|
|
44
46
|
getValueKey,
|
|
47
|
+
rankString,
|
|
48
|
+
setFunctionClass,
|
|
45
49
|
toFiniteSet,
|
|
46
50
|
type Value,
|
|
47
51
|
} from "../values";
|
|
@@ -63,19 +67,31 @@ export const createActionRecord = (action: string | undefined) =>
|
|
|
63
67
|
|
|
64
68
|
const counterExamples = new WeakSet<Value & object>();
|
|
65
69
|
|
|
66
|
-
const
|
|
67
|
-
|
|
70
|
+
export const createTlcRecord = (fields: [string, Value][]) =>
|
|
71
|
+
setFunctionClass(createWrittenFunction(fields), "record");
|
|
72
|
+
|
|
73
|
+
const createCounterExampleRecord = (action: Value[], states: Value[], isConsole = true) => {
|
|
74
|
+
// TLC's CounterExample interns its field names as the class loads, which orders them as strings.
|
|
75
|
+
["state", "action", "console"].forEach(rankString);
|
|
76
|
+
const fields: [string, Value][] = [
|
|
68
77
|
["action", createSet(action)],
|
|
69
78
|
["state", createSet(states)],
|
|
70
|
-
]
|
|
79
|
+
];
|
|
80
|
+
const counterExample = createTlcRecord(isConsole ? fields : [...fields, ["console", false]]);
|
|
71
81
|
counterExamples.add(counterExample);
|
|
72
82
|
return counterExample;
|
|
73
83
|
};
|
|
74
84
|
|
|
85
|
+
export interface CounterExampleLoop {
|
|
86
|
+
start: number;
|
|
87
|
+
action: Value;
|
|
88
|
+
}
|
|
89
|
+
|
|
75
90
|
export const createCounterExample = (
|
|
76
91
|
stateRecords: Record<string, Value>[],
|
|
77
92
|
actions: Value[],
|
|
78
|
-
loop:
|
|
93
|
+
loop: CounterExampleLoop | undefined,
|
|
94
|
+
isConsole = true,
|
|
79
95
|
) => {
|
|
80
96
|
const states = stateRecords.map((state, index) =>
|
|
81
97
|
createTuple([index + 1, createRecord(Object.entries(state))]),
|
|
@@ -86,7 +102,7 @@ export const createCounterExample = (
|
|
|
86
102
|
const closing = loop
|
|
87
103
|
? [createTuple([states[states.length - 1], loop.action, states[loop.start]])]
|
|
88
104
|
: [];
|
|
89
|
-
return createCounterExampleRecord([...steps, ...closing], states);
|
|
105
|
+
return createCounterExampleRecord([...steps, ...closing], states, isConsole);
|
|
90
106
|
};
|
|
91
107
|
|
|
92
108
|
const getRegister = (runtime: CheckerRuntime, key: Value) => {
|
|
@@ -126,7 +142,7 @@ export const setTlcValue = (
|
|
|
126
142
|
return;
|
|
127
143
|
}
|
|
128
144
|
throw new TlaModuleError(
|
|
129
|
-
`The first argument of TLCSet should be a nonnegative integer, but instead it is:\n${formatValue(key)}`,
|
|
145
|
+
`The first argument of TLCSet should be a nonnegative integer, but instead it is:\n${prettyPrint(formatValue(key))}`,
|
|
130
146
|
);
|
|
131
147
|
};
|
|
132
148
|
|
|
@@ -232,7 +248,7 @@ export const createTlcExtOperators = (
|
|
|
232
248
|
const counterExample = getValue(args, 0, "ToTrace");
|
|
233
249
|
if (typeof counterExample !== "object" || !counterExamples.has(counterExample)) {
|
|
234
250
|
throw new TlaModuleError(
|
|
235
|
-
`The argument of ToTrace should be a CounterExample, but instead it is:\n${formatValue(counterExample)}`,
|
|
251
|
+
`The argument of ToTrace should be a CounterExample, but instead it is:\n${prettyPrint(formatValue(counterExample))}`,
|
|
236
252
|
);
|
|
237
253
|
}
|
|
238
254
|
const states = toFiniteSet(applyFunction(counterExample, "state")).elements.map(
|
|
@@ -246,7 +262,7 @@ export const createTlcExtOperators = (
|
|
|
246
262
|
const name = getValue(args, 0, "TLCModelValue");
|
|
247
263
|
if (typeof name !== "string") {
|
|
248
264
|
throw new TlaModuleError(
|
|
249
|
-
`The argument of ModelValue should be a string, but instead it is:\n${formatValue(name)}`,
|
|
265
|
+
`The argument of ModelValue should be a string, but instead it is:\n${prettyPrint(formatValue(name))}`,
|
|
250
266
|
);
|
|
251
267
|
}
|
|
252
268
|
return createModelValue(name);
|
|
@@ -361,7 +377,7 @@ export const createTlcExtOperators = (
|
|
|
361
377
|
const name = getThunk(args, 0, "TLCEvalDefinition")();
|
|
362
378
|
if (typeof name !== "string") {
|
|
363
379
|
throw new TlaModuleError(
|
|
364
|
-
`The argument of TLCEvalDefinition should be a string, but instead it is:\n${formatValue(name)}`,
|
|
380
|
+
`The argument of TLCEvalDefinition should be a string, but instead it is:\n${prettyPrint(formatValue(name))}`,
|
|
365
381
|
);
|
|
366
382
|
}
|
|
367
383
|
const definition = context ? getDefinition(name, context.environment) : undefined;
|
|
@@ -369,7 +385,7 @@ export const createTlcExtOperators = (
|
|
|
369
385
|
if (builtin?.arity === 0) return builtin.evaluate([], context);
|
|
370
386
|
if (!definition || !context) {
|
|
371
387
|
throw new TlaModuleError(
|
|
372
|
-
`The argument of TLCEvalDefinition should be a name of a definition reachable from the root module, but instead it is:\n${formatValue(name)}`,
|
|
388
|
+
`The argument of TLCEvalDefinition should be a name of a definition reachable from the root module, but instead it is:\n${prettyPrint(formatValue(name))}`,
|
|
373
389
|
);
|
|
374
390
|
}
|
|
375
391
|
if (definition.kind === "Operator" && definition.params.length > 0) {
|
package/src/tlc/trace-spec.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { getHashMapOrder } from "../java-hash";
|
|
2
2
|
import { formatValue, type Value } from "../values";
|
|
3
3
|
import { zeroPad } from "./messages";
|
|
4
4
|
|
|
@@ -18,20 +18,6 @@ const CLOSING_TAG = `${"=".repeat(77)}\n`;
|
|
|
18
18
|
const LASSO_START = "_TTraceLassoStart";
|
|
19
19
|
const LASSO_END = "_TTraceLassoEnd";
|
|
20
20
|
|
|
21
|
-
const getHashMapHash = (text: string) => {
|
|
22
|
-
const hash = getJavaHashCode(text);
|
|
23
|
-
return hash ^ (hash >>> 16);
|
|
24
|
-
};
|
|
25
|
-
|
|
26
|
-
const getHashOrder = (names: string[]) => {
|
|
27
|
-
const unique = [...new Set(names)];
|
|
28
|
-
const capacity = 2 ** Math.max(4, Math.ceil(Math.log2(unique.length / 0.75)));
|
|
29
|
-
return unique
|
|
30
|
-
.map((name, index) => ({ name, index, bucket: getHashMapHash(name) & (capacity - 1) }))
|
|
31
|
-
.sort((left, right) => left.bucket - right.bucket || left.index - right.index)
|
|
32
|
-
.map((entry) => entry.name);
|
|
33
|
-
};
|
|
34
|
-
|
|
35
21
|
const formatJavaDate = (date: Date) => {
|
|
36
22
|
const getPart = (options: Intl.DateTimeFormatOptions, type: Intl.DateTimeFormatPartTypes) =>
|
|
37
23
|
new Intl.DateTimeFormat("en-US", options).formatToParts(date).find((part) => part.type === type)
|
|
@@ -102,7 +88,7 @@ ${examples}`;
|
|
|
102
88
|
export const writeTraceSpec = (input: TraceSpecInput) => {
|
|
103
89
|
const loopStart = input.loopStart;
|
|
104
90
|
const states = input.states.map((state) =>
|
|
105
|
-
|
|
91
|
+
getHashMapOrder(Object.keys(state)).map((name): [string, string] => [
|
|
106
92
|
name,
|
|
107
93
|
formatValue(state[name]),
|
|
108
94
|
]),
|
|
@@ -127,11 +113,11 @@ export const writeTraceSpec = (input: TraceSpecInput) => {
|
|
|
127
113
|
...(isLasso ? [LASSO_START, LASSO_END] : []),
|
|
128
114
|
];
|
|
129
115
|
const teConstantsModule = `${specName}_TEConstants`;
|
|
130
|
-
const constantModules =
|
|
116
|
+
const constantModules = getHashMapOrder([
|
|
131
117
|
"TLC",
|
|
132
118
|
...(teConstants.length > 0 ? [teConstantsModule] : []),
|
|
133
119
|
]);
|
|
134
|
-
const extendedModules =
|
|
120
|
+
const extendedModules = getHashMapOrder([
|
|
135
121
|
"Toolbox",
|
|
136
122
|
"TLCExt",
|
|
137
123
|
"Naturals",
|
|
@@ -187,7 +173,7 @@ ${lassoStep}${variables
|
|
|
187
173
|
definition: `\n_view ==\n${INDENT}<<${variables.join(", ")}, IF TLCGet("level") = ${LASSO_END} + 1 THEN ${LASSO_START} ELSE TLCGet("level")>>\n`,
|
|
188
174
|
}
|
|
189
175
|
: { config: "", definition: "" };
|
|
190
|
-
const deserializedTrace = `\n${getPrimer(traceModule,
|
|
176
|
+
const deserializedTrace = `\n${getPrimer(traceModule, getHashMapOrder(["IOUtils", ...constantModules, specName]))}trace == IODeserialize("${input.module}.bin", TRUE)\n\n${CLOSING_TAG}`;
|
|
191
177
|
const traceFunction = `${INDENT}<<\n${states
|
|
192
178
|
.map(
|
|
193
179
|
(state) =>
|
|
@@ -218,7 +204,7 @@ ${lassoStep}${variables
|
|
|
218
204
|
" In this case, it is advised to uncomment the module below to deserialize the\n",
|
|
219
205
|
" trace from a generated binary file.\n",
|
|
220
206
|
`\n\\*${deserializedTrace.replaceAll("\n", "\n\\*")}\n\n`,
|
|
221
|
-
getPrimer(traceModule,
|
|
207
|
+
getPrimer(traceModule, getHashMapOrder([...constantModules, specName])),
|
|
222
208
|
`trace == \n${traceFunction}\n`,
|
|
223
209
|
...(teConstants.length > 0
|
|
224
210
|
? [
|
package/src/typed-tier.ts
CHANGED
|
@@ -28,6 +28,7 @@ import {
|
|
|
28
28
|
findGlobalName,
|
|
29
29
|
getDefinition,
|
|
30
30
|
getStartupValue,
|
|
31
|
+
isUniformPredicate,
|
|
31
32
|
type Environment,
|
|
32
33
|
type Scope,
|
|
33
34
|
} from "./evaluate";
|
|
@@ -607,6 +608,7 @@ const closeType = (type: Type, path: Type[] = []): Type => {
|
|
|
607
608
|
const resolved = resolveType(type);
|
|
608
609
|
// A function built lazily is only applied, never compared or stored.
|
|
609
610
|
if (resolved.kind === "Lambda") return unsupported();
|
|
611
|
+
if (resolved.kind === "Rec" && resolved.shapes.length === 0) return unsupported();
|
|
610
612
|
if (resolved.kind === "Var") {
|
|
611
613
|
const integer = createInt();
|
|
612
614
|
resolved.target = integer;
|
|
@@ -3405,13 +3407,16 @@ const compileValue = (program: Program, expression: Expression, frame: Frame): C
|
|
|
3405
3407
|
compileValue(program, expression.predicate, { ...frame, scope: bounds.scope }),
|
|
3406
3408
|
);
|
|
3407
3409
|
const result = getName(program, "r");
|
|
3410
|
+
const stop = isUniformPredicate(expression, program.environment)
|
|
3411
|
+
? ` else return ${result};`
|
|
3412
|
+
: "";
|
|
3408
3413
|
const type: SetType = { kind: "Set", element: loop.element };
|
|
3409
3414
|
return {
|
|
3410
3415
|
type,
|
|
3411
3416
|
emit: () =>
|
|
3412
3417
|
isMask(type, program.plains)
|
|
3413
|
-
? `(() => { let ${result} = 0; ${bounds.getHeaders()} { if (${predicate.emit()}) ${result} |= H.bit(${loop.name})
|
|
3414
|
-
: `(() => { const ${result} = []; ${bounds.getHeaders()} { if (${predicate.emit()}) ${result}.push(${loop.name})
|
|
3418
|
+
? `(() => { let ${result} = 0; ${bounds.getHeaders()} { if (${predicate.emit()}) ${result} |= H.bit(${loop.name});${stop} } return ${result}; })()`
|
|
3419
|
+
: `(() => { const ${result} = []; ${bounds.getHeaders()} { if (${predicate.emit()}) ${result}.push(${loop.name});${stop} } return ${result}; })()`,
|
|
3415
3420
|
};
|
|
3416
3421
|
}
|
|
3417
3422
|
case "SetMap": {
|
|
@@ -6373,7 +6378,7 @@ const search = (environment: Environment, check: TypedCheck, plains: Plains): Ty
|
|
|
6373
6378
|
return fingerprinter.words[0];
|
|
6374
6379
|
})()),
|
|
6375
6380
|
// The successors of a state the search expanded are all stored.
|
|
6376
|
-
|
|
6381
|
+
forEachActionSuccessors: (_index, state, onSuccessors) => {
|
|
6377
6382
|
const successors: LiveSuccessor<Plain[]>[] = [];
|
|
6378
6383
|
compiled.next(state, (successor) => {
|
|
6379
6384
|
if (!isInModel(successor)) return;
|
|
@@ -6381,7 +6386,7 @@ const search = (environment: Environment, check: TypedCheck, plains: Plains): Ty
|
|
|
6381
6386
|
const index = findState(false);
|
|
6382
6387
|
successors.push({ index: index === -1 ? deopt() : index, state: successor });
|
|
6383
6388
|
});
|
|
6384
|
-
|
|
6389
|
+
onSuccessors(successors);
|
|
6385
6390
|
},
|
|
6386
6391
|
},
|
|
6387
6392
|
environment.runtime.version !== "1.7.4",
|