tla-ts 0.0.10-dev.28c823e4b → 0.0.10-dev.63a6693bd
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 +6 -6
- package/dist/compile.js +10 -10
- package/dist/deciders.cjs +29 -29
- package/dist/deciders.js +40 -40
- package/dist/index.cjs +1 -1
- 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 +54 -54
- package/dist/prove.js +52 -52
- package/dist/run.cjs +42 -42
- package/dist/run.js +44 -44
- package/dist/tlapm.cjs +2 -2
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +39 -39
- package/dist/transfer.js +41 -41
- package/dist/worker.cjs +4 -4
- package/dist/worker.js +4 -4
- package/package.json +1 -1
- package/src/ast.ts +44 -39
- package/src/builtins.ts +4 -13
- package/src/check-failure.ts +116 -0
- package/src/check-trace.ts +282 -0
- package/src/check.ts +152 -518
- package/src/cli/options.ts +6 -31
- package/src/cli/shared.ts +1 -1
- package/src/cli/tlapm.ts +14 -13
- package/src/cli/tlc-arguments.ts +222 -210
- package/src/cli/tlc-output.ts +687 -0
- package/src/cli/tlc-usage.ts +1 -1
- package/src/cli/tlc.ts +34 -701
- package/src/cli/xml-exporter.ts +23 -33
- package/src/codegen.ts +5 -10
- package/src/coverage.ts +3 -10
- package/src/dependencies.ts +8 -13
- package/src/dfid.ts +16 -16
- package/src/environment-config.ts +315 -0
- package/src/environment.ts +45 -333
- package/src/errors.ts +3 -2
- package/src/evaluate.ts +5 -4
- package/src/fingerprints.ts +65 -1
- package/src/instances.ts +47 -10
- package/src/java-hash.ts +7 -0
- package/src/json.ts +4 -7
- package/src/levels.ts +39 -42
- package/src/liveness-checker.ts +24 -37
- package/src/liveness.ts +47 -54
- package/src/obligations/action.ts +4 -11
- package/src/obligations/anonymize.ts +4 -2
- package/src/obligations/expression.ts +18 -2
- package/src/obligations/generate.ts +45 -38
- package/src/obligations/index.ts +2 -2
- package/src/obligations/module.ts +27 -38
- package/src/obligations/normalize.ts +2 -1
- package/src/obligations/simplify.ts +39 -44
- package/src/obligations/source.ts +47 -57
- package/src/obligations/temporal.ts +5 -5
- package/src/parallel-worker.ts +10 -30
- package/src/parallel.ts +22 -45
- package/src/parser.ts +19 -34
- package/src/prover/decide-pool.ts +3 -3
- package/src/prover/deciders.ts +3 -3
- package/src/prover/isabelle/encode.ts +1 -1
- package/src/prover/isabelle/isar/inner-syntax.ts +9 -4
- package/src/prover/isabelle/isar/method.ts +14 -25
- package/src/prover/isabelle/isar/theory.ts +11 -10
- package/src/prover/isabelle/isar/type-check.ts +6 -6
- package/src/prover/isabelle/provers/blast/blast.ts +7 -63
- package/src/prover/isabelle/provers/hypsubst.ts +17 -26
- package/src/prover/isabelle/pure/bicompose.ts +9 -25
- package/src/prover/isabelle/pure/conv.ts +2 -8
- package/src/prover/isabelle/pure/drule.ts +9 -2
- package/src/prover/isabelle/pure/logic.ts +1 -1
- package/src/prover/isabelle/pure/raw-simplifier.ts +4 -13
- package/src/prover/isabelle/pure/rewriter.ts +5 -9
- package/src/prover/isabelle/pure/table.ts +2 -1
- package/src/prover/isabelle/pure/tactical.ts +42 -35
- package/src/prover/isabelle/pure/thm.ts +14 -11
- package/src/prover/isabelle/tla/classical-setup.ts +17 -14
- package/src/prover/isabelle/tla/context.ts +7 -2
- package/src/prover/isabelle/tla/logic.ts +10 -21
- package/src/prover/isabelle/tla/simpdata.ts +1 -10
- package/src/prover/prep/action.ts +11 -19
- package/src/prover/prep/fingerprint.ts +2 -5
- package/src/prover/prep/methods.ts +24 -3
- package/src/prover/prove.ts +87 -64
- package/src/prover/smt/context.ts +1 -2
- package/src/prover/smt/data.ts +418 -406
- package/src/prover/smt/encode.ts +30 -18
- package/src/prover/smt/rewrite.ts +657 -626
- package/src/prover/smt/solver/ast.ts +0 -22
- package/src/prover/smt/solver/auf-solver.ts +2 -5
- package/src/prover/smt/solver/context.ts +3 -3
- package/src/prover/smt/solver/e-matching.ts +1 -1
- package/src/prover/smt/solver/expr-safe-replace.ts +1 -1
- package/src/prover/smt/solver/internalizer.ts +1 -2
- package/src/prover/smt/solver/lp/dioph-eq.ts +1 -8
- package/src/prover/smt/solver/lp/hnf-cutter.ts +1 -1
- package/src/prover/smt/solver/lp/nla-core.ts +2 -6
- package/src/prover/smt/solver/mam-compiler.ts +4 -2
- package/src/prover/smt/solver/model-checker.ts +1 -1
- package/src/prover/smt/solver/model-finder.ts +12 -17
- package/src/prover/smt/solver/model-macro-solver.ts +11 -19
- package/src/prover/smt/solver/nlsat/algebraic.ts +9 -9
- package/src/prover/smt/solver/nlsat/atoms.ts +20 -4
- package/src/prover/smt/solver/nlsat/explain.ts +7 -22
- package/src/prover/smt/solver/nlsat/levelwise.ts +1 -6
- package/src/prover/smt/solver/nlsat/polynomial.ts +12 -3
- package/src/prover/smt/solver/nlsat/solver.ts +12 -24
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +1 -1
- package/src/prover/smt/solver/proto-model.ts +0 -4
- package/src/prover/smt/solver/quantifier-analyzer.ts +10 -10
- package/src/prover/smt/solver/quantifier-manager.ts +1 -5
- package/src/prover/smt/solver/smtlib-parser.ts +78 -94
- package/src/prover/smt/solver/theory-lra-bounds.ts +1 -2
- package/src/prover/smt/solver/theory-lra-internalize.ts +5 -16
- package/src/prover/tlapm/cache.ts +28 -18
- package/src/prover/tlapm/tlapm.ts +15 -9
- package/src/prover/verdict.ts +7 -0
- package/src/prover/zenon/check/check.ts +1 -2
- package/src/prover/zenon/check/records.ts +1 -1
- package/src/prover/zenon/check/relations.ts +2 -1
- package/src/prover/zenon/check/rewrites.ts +2 -15
- package/src/prover/zenon/check/sets.ts +40 -58
- package/src/prover/zenon/check/terms.ts +1 -2
- package/src/prover/zenon/eqrel.ts +2 -0
- package/src/prover/zenon/expr.ts +7 -0
- package/src/prover/zenon/index-table.ts +9 -19
- package/src/prover/zenon/isar.ts +35 -35
- package/src/prover/zenon/llproof.ts +2 -11
- package/src/prover/zenon/mltoll.ts +12 -28
- package/src/prover/zenon/parse.ts +3 -6
- package/src/prover/zenon/search.ts +4 -14
- package/src/prover/zenon/tla/functions.ts +2 -2
- package/src/prover/zenon/tla/llproof.ts +9 -11
- package/src/prover/zenon/tla/records.ts +1 -6
- package/src/prover/zenon/tla/sets.ts +15 -14
- package/src/prover/zenon/tla/tla.ts +7 -6
- package/src/resolve.ts +55 -72
- package/src/sany/generation.ts +394 -0
- package/src/sany/generator-def-entries.ts +210 -0
- package/src/sany/generator-definitions.ts +686 -0
- package/src/sany/generator-expressions.ts +1100 -0
- package/src/sany/generator-proofs.ts +662 -0
- package/src/sany/generator.ts +155 -2625
- package/src/sany/lexer.ts +17 -16
- package/src/sany/nodes.ts +6 -13
- package/src/sany/report.ts +3 -6
- package/src/sany/selectors.ts +35 -38
- package/src/sany/xml.ts +23 -55
- package/src/search.ts +65 -27
- package/src/simulate.ts +157 -133
- package/src/spec-description.ts +33 -48
- package/src/standard-modules.ts +16 -32
- package/src/state-graph.ts +2 -7
- package/src/substitution-levels.ts +5 -4
- package/src/successors.ts +5 -7
- package/src/tlc/messages.ts +20 -15
- package/src/tlc/order.ts +2 -9
- package/src/tlc/random.ts +4 -4
- package/src/tlc/replay.ts +8 -15
- package/src/tlc/tlc-operators.ts +2 -3
- package/src/tlc/trace-spec.ts +25 -45
- package/src/typescript/actions.ts +2 -4
- package/src/typescript/collections.ts +34 -20
- package/src/typescript/compile.ts +1 -3
- package/src/typescript/formula.ts +5 -3
- package/src/typescript/model.ts +4 -5
- package/src/typescript/steps.ts +20 -18
- package/src/values.ts +63 -158
package/src/tlc/trace-spec.ts
CHANGED
|
@@ -1,4 +1,6 @@
|
|
|
1
|
+
import { getJavaHashCode } from "../java-hash";
|
|
1
2
|
import { formatValue, type Value } from "../values";
|
|
3
|
+
import { zeroPad } from "./messages";
|
|
2
4
|
|
|
3
5
|
interface TraceSpecInput {
|
|
4
6
|
module: string;
|
|
@@ -10,23 +12,14 @@ interface TraceSpecInput {
|
|
|
10
12
|
isDefined: (name: string) => boolean;
|
|
11
13
|
}
|
|
12
14
|
|
|
13
|
-
interface TraceState {
|
|
14
|
-
values: [string, string][];
|
|
15
|
-
number: number;
|
|
16
|
-
isStuttering: boolean;
|
|
17
|
-
isBackToState: boolean;
|
|
18
|
-
}
|
|
19
|
-
|
|
20
15
|
const INDENT = " ";
|
|
21
16
|
const SEPARATOR = "\n----\n";
|
|
22
17
|
const CLOSING_TAG = `${"=".repeat(77)}\n`;
|
|
23
18
|
const LASSO_START = "_TTraceLassoStart";
|
|
24
19
|
const LASSO_END = "_TTraceLassoEnd";
|
|
25
20
|
|
|
26
|
-
const
|
|
27
|
-
const hash = text
|
|
28
|
-
.split("")
|
|
29
|
-
.reduce((current, unit) => (Math.imul(current, 31) + unit.charCodeAt(0)) | 0, 0);
|
|
21
|
+
const getHashMapHash = (text: string) => {
|
|
22
|
+
const hash = getJavaHashCode(text);
|
|
30
23
|
return hash ^ (hash >>> 16);
|
|
31
24
|
};
|
|
32
25
|
|
|
@@ -34,17 +27,16 @@ const getHashOrder = (names: string[]) => {
|
|
|
34
27
|
const unique = [...new Set(names)];
|
|
35
28
|
const capacity = 2 ** Math.max(4, Math.ceil(Math.log2(unique.length / 0.75)));
|
|
36
29
|
return unique
|
|
37
|
-
.map((name, index) => ({ name, index, bucket:
|
|
30
|
+
.map((name, index) => ({ name, index, bucket: getHashMapHash(name) & (capacity - 1) }))
|
|
38
31
|
.sort((left, right) => left.bucket - right.bucket || left.index - right.index)
|
|
39
32
|
.map((entry) => entry.name);
|
|
40
33
|
};
|
|
41
34
|
|
|
42
35
|
const formatJavaDate = (date: Date) => {
|
|
43
|
-
const pad = (value: number) => String(value).padStart(2, "0");
|
|
44
36
|
const getPart = (options: Intl.DateTimeFormatOptions, type: Intl.DateTimeFormatPartTypes) =>
|
|
45
37
|
new Intl.DateTimeFormat("en-US", options).formatToParts(date).find((part) => part.type === type)
|
|
46
38
|
?.value;
|
|
47
|
-
return `${getPart({ weekday: "short" }, "weekday")} ${getPart({ month: "short" }, "month")} ${
|
|
39
|
+
return `${getPart({ weekday: "short" }, "weekday")} ${getPart({ month: "short" }, "month")} ${zeroPad(date.getDate())} ${zeroPad(date.getHours())}:${zeroPad(date.getMinutes())}:${zeroPad(date.getSeconds())} ${getPart({ timeZoneName: "short" }, "timeZoneName")} ${date.getFullYear()}`;
|
|
48
40
|
};
|
|
49
41
|
|
|
50
42
|
const splitLines = (text: string) => {
|
|
@@ -61,11 +53,11 @@ const indent = (text: string, depth: number) => {
|
|
|
61
53
|
const getPrimer = (module: string, extendedModules: string[]) =>
|
|
62
54
|
`---- MODULE ${module} ----\nEXTENDS ${extendedModules.join(", ")}\n\n`;
|
|
63
55
|
|
|
64
|
-
const getConjunction = (state:
|
|
56
|
+
const getConjunction = (state: [string, string][], prefix?: string) =>
|
|
65
57
|
indent(
|
|
66
58
|
[
|
|
67
59
|
...(prefix === undefined ? [] : [prefix]),
|
|
68
|
-
...state.
|
|
60
|
+
...state.map(([name, value]) => `${name} = (${value})`),
|
|
69
61
|
].join("\n/\\\n"),
|
|
70
62
|
2,
|
|
71
63
|
);
|
|
@@ -109,26 +101,18 @@ ${examples}`;
|
|
|
109
101
|
|
|
110
102
|
export const writeTraceSpec = (input: TraceSpecInput) => {
|
|
111
103
|
const loopStart = input.loopStart;
|
|
112
|
-
const states = input.states.map((state
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
loopStart === undefined
|
|
120
|
-
? states
|
|
121
|
-
: [
|
|
122
|
-
...states,
|
|
123
|
-
loopStart === states.length - 1
|
|
124
|
-
? { ...states[loopStart], isStuttering: true }
|
|
125
|
-
: { ...states[loopStart], isBackToState: true },
|
|
126
|
-
];
|
|
127
|
-
if (trace.length <= 1) return undefined;
|
|
104
|
+
const states = input.states.map((state) =>
|
|
105
|
+
getHashOrder(Object.keys(state)).map((name): [string, string] => [
|
|
106
|
+
name,
|
|
107
|
+
formatValue(state[name]),
|
|
108
|
+
]),
|
|
109
|
+
);
|
|
110
|
+
if (states.length + (loopStart === undefined ? 0 : 1) <= 1) return undefined;
|
|
128
111
|
const variables = Object.keys(input.states[0]);
|
|
129
112
|
const specName = input.specName;
|
|
130
|
-
const final =
|
|
131
|
-
const
|
|
113
|
+
const final = states[states.length - 1];
|
|
114
|
+
const isStuttering = loopStart === states.length - 1;
|
|
115
|
+
const isLasso = loopStart !== undefined && !isStuttering;
|
|
132
116
|
|
|
133
117
|
const declaredNames = new Set(input.rawConstants.map((line) => line.split(" = ")[0]));
|
|
134
118
|
const constantLines = [
|
|
@@ -136,7 +120,7 @@ export const writeTraceSpec = (input: TraceSpecInput) => {
|
|
|
136
120
|
...input.modelValues
|
|
137
121
|
.filter((name) => !declaredNames.has(name))
|
|
138
122
|
.map((name) => indent(`${name} = ${name}`, 1)),
|
|
139
|
-
...(isLasso ? [`${LASSO_START} = ${
|
|
123
|
+
...(isLasso ? [`${LASSO_START} = ${loopStart + 1}`, `${LASSO_END} = ${states.length}`] : []),
|
|
140
124
|
];
|
|
141
125
|
const teConstants = [
|
|
142
126
|
...input.modelValues.filter((name) => !input.isDefined(name)),
|
|
@@ -158,16 +142,16 @@ export const writeTraceSpec = (input: TraceSpecInput) => {
|
|
|
158
142
|
const expressionModule = `${specName}_TEExpression`;
|
|
159
143
|
const traceModule = `${specName}_TETrace`;
|
|
160
144
|
|
|
161
|
-
const property =
|
|
145
|
+
const property = isStuttering
|
|
162
146
|
? {
|
|
163
147
|
config: "\nPROPERTY\n _prop\n",
|
|
164
|
-
definition: `\n_prop ==\n${INDENT}~<>[](\n${getConjunction(
|
|
148
|
+
definition: `\n_prop ==\n${INDENT}~<>[](\n${getConjunction(final)}\n${INDENT})`,
|
|
165
149
|
}
|
|
166
150
|
: isLasso
|
|
167
151
|
? {
|
|
168
152
|
config: "\nPROPERTY\n _prop\n",
|
|
169
153
|
definition: `\n_prop ==\n${indent(
|
|
170
|
-
`~(([]<>(\n${getConjunction(
|
|
154
|
+
`~(([]<>(\n${getConjunction(final)}\n))/\\([]<>(\n${getConjunction(states[loopStart])}\n)))`,
|
|
171
155
|
1,
|
|
172
156
|
)}`,
|
|
173
157
|
}
|
|
@@ -196,11 +180,8 @@ ${lassoStep}${variables
|
|
|
196
180
|
\\* IN J!JsonSerialize("${input.module}.json", _TETrace)
|
|
197
181
|
|
|
198
182
|
`;
|
|
199
|
-
const statesWithoutLasso = trace.filter((state) => !state.isBackToState && !state.isStuttering);
|
|
200
183
|
const isViewed =
|
|
201
|
-
isLasso &&
|
|
202
|
-
new Set(statesWithoutLasso.map((state) => JSON.stringify(state.values))).size <
|
|
203
|
-
statesWithoutLasso.length;
|
|
184
|
+
isLasso && new Set(states.map((state) => JSON.stringify(state))).size < states.length;
|
|
204
185
|
const view = isViewed
|
|
205
186
|
? {
|
|
206
187
|
config: "\nVIEW\n _view\n",
|
|
@@ -208,10 +189,9 @@ ${lassoStep}${variables
|
|
|
208
189
|
}
|
|
209
190
|
: { config: "", definition: "" };
|
|
210
191
|
const deserializedTrace = `\n${getPrimer(traceModule, getHashOrder(["IOUtils", ...constantModules, specName]))}trace == IODeserialize("${input.module}.bin", TRUE)\n\n${CLOSING_TAG}`;
|
|
211
|
-
const traceFunction = `${INDENT}<<\n${
|
|
192
|
+
const traceFunction = `${INDENT}<<\n${states
|
|
212
193
|
.map(
|
|
213
|
-
(state) =>
|
|
214
|
-
`${INDENT}([${state.values.map(([name, value]) => `${name} |-> ${value}`).join(",")}])`,
|
|
194
|
+
(state) => `${INDENT}([${state.map(([name, value]) => `${name} |-> ${value}`).join(",")}])`,
|
|
215
195
|
)
|
|
216
196
|
.join(",\n")}\n${INDENT}>>${SEPARATOR}\n`;
|
|
217
197
|
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import ts from "@typescript/typescript6";
|
|
2
|
-
import { getUpdatedValue, MUTATING_METHODS } from "./collections";
|
|
2
|
+
import { getUpdatedValue, MUTATING_METHODS, REMOVALS } from "./collections";
|
|
3
3
|
import {
|
|
4
4
|
type Context,
|
|
5
5
|
getFunction,
|
|
@@ -177,9 +177,7 @@ const getRemovedValue = (
|
|
|
177
177
|
const sequence = translateExpression(receiver, path.scope, context);
|
|
178
178
|
return {
|
|
179
179
|
value: method === "shift" ? `Head(${sequence})` : `${wrap(sequence)}[Len(${sequence})]`,
|
|
180
|
-
path: assign(receiver, path, context,
|
|
181
|
-
method === "shift" ? `Tail(${current})` : `SubSeq(${current}, 1, Len(${current}) - 1)`,
|
|
182
|
-
),
|
|
180
|
+
path: assign(receiver, path, context, REMOVALS[method]),
|
|
183
181
|
};
|
|
184
182
|
};
|
|
185
183
|
|
|
@@ -278,6 +278,12 @@ const translateFirstIndex = (
|
|
|
278
278
|
};
|
|
279
279
|
};
|
|
280
280
|
|
|
281
|
+
const orUndefined = (exists: string, value: string, isDefined: boolean, context: Context) => {
|
|
282
|
+
if (isDefined) return value;
|
|
283
|
+
context.prelude.add("Undefined");
|
|
284
|
+
return `IF ${exists} THEN ${value} ELSE Undefined`;
|
|
285
|
+
};
|
|
286
|
+
|
|
281
287
|
const translateSequenceOperation = (
|
|
282
288
|
node: MethodCall,
|
|
283
289
|
sequence: string,
|
|
@@ -293,11 +299,6 @@ const translateSequenceOperation = (
|
|
|
293
299
|
ts.isPrefixUnaryExpression(inner) && inner.operator === ts.SyntaxKind.MinusToken;
|
|
294
300
|
const getOffset = (inner: ts.Expression) =>
|
|
295
301
|
isNegative(inner) ? `Len(${sequence}) - ${wrap(translate(inner.operand))}` : translate(inner);
|
|
296
|
-
const orUndefined = (exists: string, value: string) => {
|
|
297
|
-
if (isDefined) return value;
|
|
298
|
-
context.prelude.add("Undefined");
|
|
299
|
-
return `IF ${exists} THEN ${value} ELSE Undefined`;
|
|
300
|
-
};
|
|
301
302
|
const translateEach = (format: (index: string, body: string) => string) => () => {
|
|
302
303
|
const index = context.names.getFresh("index");
|
|
303
304
|
const inner = bindIndexed(argument, `${wrapped}[${index}]`, index, scope, context);
|
|
@@ -310,7 +311,12 @@ const translateSequenceOperation = (
|
|
|
310
311
|
const index = isNegative(argument)
|
|
311
312
|
? `${getOffset(argument)} + 1`
|
|
312
313
|
: `${wrap(translate(argument))} + 1`;
|
|
313
|
-
return orUndefined(
|
|
314
|
+
return orUndefined(
|
|
315
|
+
`${index} \\in DOMAIN ${wrapped}`,
|
|
316
|
+
`${wrapped}[${index}]`,
|
|
317
|
+
isDefined,
|
|
318
|
+
context,
|
|
319
|
+
);
|
|
314
320
|
},
|
|
315
321
|
],
|
|
316
322
|
[
|
|
@@ -383,7 +389,7 @@ const translateSequenceOperation = (
|
|
|
383
389
|
"find",
|
|
384
390
|
() => {
|
|
385
391
|
const result = translateFirstIndex(sequence, argument, scope, context);
|
|
386
|
-
return orUndefined(result.exists, `${wrapped}[${result.first}]
|
|
392
|
+
return orUndefined(result.exists, `${wrapped}[${result.first}]`, isDefined, context);
|
|
387
393
|
},
|
|
388
394
|
],
|
|
389
395
|
[
|
|
@@ -421,9 +427,7 @@ const translateUnorderedMethod = (
|
|
|
421
427
|
const binding = `${element.variable} \\in ${wrap(source.set)} : ${body}`;
|
|
422
428
|
if (method === "every") return `\\A ${binding}`;
|
|
423
429
|
if (method === "some") return `\\E ${binding}`;
|
|
424
|
-
|
|
425
|
-
context.prelude.add("Undefined");
|
|
426
|
-
return `IF \\E ${binding} THEN CHOOSE ${binding} ELSE Undefined`;
|
|
430
|
+
return orUndefined(`\\E ${binding}`, `CHOOSE ${binding}`, isDefined, context);
|
|
427
431
|
};
|
|
428
432
|
|
|
429
433
|
const translateSetMethod = (node: MethodCall, scope: Scope, context: Context) => {
|
|
@@ -446,6 +450,8 @@ const translateSetMethod = (node: MethodCall, scope: Scope, context: Context) =>
|
|
|
446
450
|
const operation = operations.get(method);
|
|
447
451
|
if (operation === undefined)
|
|
448
452
|
throw new TlaTypeScriptError(`Unsupported Set method: ${method}`, node);
|
|
453
|
+
if (node.arguments[0] === undefined)
|
|
454
|
+
throw new TlaTypeScriptError(`Set method needs an argument: ${method}`, node);
|
|
449
455
|
return operation;
|
|
450
456
|
};
|
|
451
457
|
|
|
@@ -461,21 +467,29 @@ const translateMapMethod = (
|
|
|
461
467
|
node.arguments[0] === undefined
|
|
462
468
|
? ""
|
|
463
469
|
: wrap(translateExpression(node.arguments[0], scope, context));
|
|
470
|
+
if (method !== "has" && method !== "get")
|
|
471
|
+
throw new TlaTypeScriptError(`Unsupported Map method: ${method}`, node);
|
|
472
|
+
if (node.arguments[0] === undefined)
|
|
473
|
+
throw new TlaTypeScriptError(`Map method needs a key: ${method}`, node);
|
|
464
474
|
if (method === "has") return `${key} \\in DOMAIN ${map}`;
|
|
465
|
-
if (method !== "get") throw new TlaTypeScriptError(`Unsupported Map method: ${method}`, node);
|
|
466
475
|
if (isDefined) return `${map}[${key}]`;
|
|
467
|
-
context.prelude.add("Undefined");
|
|
468
476
|
return share(map, "map", context, (sharedMap) =>
|
|
469
|
-
share(
|
|
470
|
-
|
|
471
|
-
|
|
472
|
-
|
|
473
|
-
|
|
474
|
-
|
|
477
|
+
share(key, "key", context, (sharedKey) =>
|
|
478
|
+
orUndefined(
|
|
479
|
+
`${sharedKey} \\in DOMAIN ${sharedMap}`,
|
|
480
|
+
`${sharedMap}[${sharedKey}]`,
|
|
481
|
+
isDefined,
|
|
482
|
+
context,
|
|
483
|
+
),
|
|
475
484
|
),
|
|
476
485
|
);
|
|
477
486
|
};
|
|
478
487
|
|
|
488
|
+
export const REMOVALS = {
|
|
489
|
+
pop: (current: string) => `SubSeq(${current}, 1, Len(${current}) - 1)`,
|
|
490
|
+
shift: (current: string) => `Tail(${current})`,
|
|
491
|
+
};
|
|
492
|
+
|
|
479
493
|
const UPDATES = new Map<Kind, Map<string, Update>>([
|
|
480
494
|
[
|
|
481
495
|
"sequence",
|
|
@@ -488,8 +502,8 @@ const UPDATES = new Map<Kind, Map<string, Update>>([
|
|
|
488
502
|
: `${wrap(current)} \\o <<${values.join(", ")}>>`,
|
|
489
503
|
],
|
|
490
504
|
["unshift", (current, values) => `<<${values.join(", ")}>> \\o ${wrap(current)}`],
|
|
491
|
-
["pop",
|
|
492
|
-
["shift",
|
|
505
|
+
["pop", REMOVALS.pop],
|
|
506
|
+
["shift", REMOVALS.shift],
|
|
493
507
|
]),
|
|
494
508
|
],
|
|
495
509
|
[
|
|
@@ -31,11 +31,9 @@ const translateExported = (
|
|
|
31
31
|
) => {
|
|
32
32
|
const tag = [...definition.tags.keys()].find((candidate) => VALUE_TAGS.has(candidate));
|
|
33
33
|
if (tag !== undefined) return translateProperty(definition, tag, model, sections, context);
|
|
34
|
-
if (writesState(definition.body, context)) {
|
|
35
|
-
return translateStep(definition, sections, context);
|
|
36
|
-
}
|
|
37
34
|
const returnType = context.checker.getSignatureFromDeclaration(definition.node)?.getReturnType();
|
|
38
35
|
if (
|
|
36
|
+
writesState(definition.body, context) ||
|
|
39
37
|
returnType === undefined ||
|
|
40
38
|
(returnType.flags & (ts.TypeFlags.Void | ts.TypeFlags.Undefined)) !== 0
|
|
41
39
|
) {
|
|
@@ -142,11 +142,13 @@ const LOOSE_OPERATORS = [
|
|
|
142
142
|
" ~> ",
|
|
143
143
|
];
|
|
144
144
|
|
|
145
|
-
export const wrapEquated = (expression: string) =>
|
|
146
|
-
expression.startsWith("~")
|
|
147
|
-
|
|
145
|
+
export const wrapEquated = (expression: string) => {
|
|
146
|
+
if (expression.startsWith("~")) return `(${expression})`;
|
|
147
|
+
const surface = getSurface(expression);
|
|
148
|
+
return LOOSE_OPERATORS.some((operator) => surface.includes(operator))
|
|
148
149
|
? `(${expression})`
|
|
149
150
|
: expression;
|
|
151
|
+
};
|
|
150
152
|
|
|
151
153
|
export const indent = (expression: string, prefix: string) =>
|
|
152
154
|
expression.split("\n").join(`\n${prefix}`);
|
package/src/typescript/model.ts
CHANGED
|
@@ -66,9 +66,8 @@ const getTags = (node: ts.Node) =>
|
|
|
66
66
|
const isExported = (node: ts.Declaration) =>
|
|
67
67
|
(ts.getCombinedModifierFlags(node) & ts.ModifierFlags.Export) !== 0;
|
|
68
68
|
|
|
69
|
-
const isLet = (
|
|
70
|
-
ts.isVariableDeclaration(
|
|
71
|
-
(declared.declaration.parent.flags & ts.NodeFlags.Let) !== 0;
|
|
69
|
+
const isLet = (declaration: ts.Declaration): declaration is ts.VariableDeclaration =>
|
|
70
|
+
ts.isVariableDeclaration(declaration) && (declaration.parent.flags & ts.NodeFlags.Let) !== 0;
|
|
72
71
|
|
|
73
72
|
const declareModelValues = (statement: ts.TypeAliasDeclaration, context: Context) => {
|
|
74
73
|
const type = context.checker.getTypeAtLocation(statement.name);
|
|
@@ -126,7 +125,7 @@ export const readModel = (sourceFile: ts.SourceFile, context: Context): Model =>
|
|
|
126
125
|
const declarations = statements.flatMap(getDeclarations);
|
|
127
126
|
const variables = declarations.flatMap((declared) => {
|
|
128
127
|
const declaration = declared.declaration;
|
|
129
|
-
if (!isLet(
|
|
128
|
+
if (!isLet(declaration)) return [];
|
|
130
129
|
const symbol = getSymbol(declaration.name, context.checker);
|
|
131
130
|
if (isExported(declaration) || symbol === undefined) {
|
|
132
131
|
throw new TlaTypeScriptError("State variables can't be exported", declaration);
|
|
@@ -135,7 +134,7 @@ export const readModel = (sourceFile: ts.SourceFile, context: Context): Model =>
|
|
|
135
134
|
context.variables.set(symbol, name);
|
|
136
135
|
return [{ name, declaration }];
|
|
137
136
|
});
|
|
138
|
-
const helpers = declarations.filter((declared) => !isLet(declared));
|
|
137
|
+
const helpers = declarations.filter((declared) => !isLet(declared.declaration));
|
|
139
138
|
const exported = helpers.flatMap((declared) => {
|
|
140
139
|
const declaration = declared.declaration;
|
|
141
140
|
const node = getFunction(declaration);
|
package/src/typescript/steps.ts
CHANGED
|
@@ -130,15 +130,16 @@ export const translateStep = (definition: Exported, sections: Sections, context:
|
|
|
130
130
|
return;
|
|
131
131
|
}
|
|
132
132
|
const getType = (parameter: Parameter) => context.checker.getTypeAtLocation(parameter.node.name);
|
|
133
|
-
const
|
|
134
|
-
(parameter)
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
133
|
+
const choices = parameters.map((parameter) => {
|
|
134
|
+
const chosen = guards.chosen.get(parameter);
|
|
135
|
+
return {
|
|
136
|
+
parameter,
|
|
137
|
+
chosen,
|
|
138
|
+
domain: chosen?.domain ?? getDomain(getType(parameter), parameter.node, context),
|
|
139
|
+
};
|
|
140
|
+
});
|
|
141
|
+
const independent = choices.flatMap((choice) =>
|
|
142
|
+
choice.chosen?.isDependent === true ? [] : [`${choice.parameter.name} \\in ${choice.domain}`],
|
|
142
143
|
);
|
|
143
144
|
const dependent = [...guards.chosen]
|
|
144
145
|
.filter((entry) => entry[1].isDependent)
|
|
@@ -146,18 +147,19 @@ export const translateStep = (definition: Exported, sections: Sections, context:
|
|
|
146
147
|
const step = `\\E ${independent.join(", ")} : ${dependent.join("")}${head}`;
|
|
147
148
|
sections.next.push(step);
|
|
148
149
|
if (fairness === undefined) return;
|
|
149
|
-
const
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
150
|
+
const forAll = choices.map((choice) => {
|
|
151
|
+
const typeDomain =
|
|
152
|
+
choice.chosen === undefined ? choice.domain : findDomain(getType(choice.parameter), context);
|
|
153
|
+
return typeof typeDomain === "string"
|
|
154
|
+
? `${choice.parameter.name} \\in ${typeDomain}`
|
|
155
|
+
: undefined;
|
|
156
|
+
});
|
|
157
|
+
if (!forAll.every((bound) => bound !== undefined)) {
|
|
156
158
|
sections.fairness.push(`${fairness}(${step})`);
|
|
157
159
|
return;
|
|
158
160
|
}
|
|
159
|
-
const
|
|
160
|
-
|
|
161
|
+
const conditions = choices.flatMap((choice) =>
|
|
162
|
+
choice.chosen === undefined ? [] : [`${choice.parameter.name} \\in ${wrap(choice.domain)}`],
|
|
161
163
|
);
|
|
162
164
|
sections.fairness.push(
|
|
163
165
|
`\\A ${forAll.join(", ")} : ${fairness}(${[...conditions, head].join(" /\\ ")})`,
|