tla-ts 0.0.10-dev.3a85c3a9e → 0.0.10-dev.45c0eaef5
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 +3 -3
- package/dist/compile.js +1 -1
- package/dist/deciders.cjs +36 -36
- package/dist/deciders.js +53 -53
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +18 -4
- package/dist/index.d.ts +18 -4
- 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 +56 -56
- package/dist/prove.js +79 -79
- package/dist/run.cjs +40 -44
- package/dist/run.js +42 -46
- package/dist/tlapm.cjs +1 -1
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +97 -92
- package/dist/transfer.js +97 -92
- package/dist/worker.cjs +7 -7
- package/dist/worker.js +7 -7
- package/package.json +1 -1
- package/src/ast.ts +31 -3
- package/src/bags.ts +50 -29
- package/src/builtins.ts +4 -3
- package/src/check-failure.ts +13 -11
- package/src/check-trace.ts +146 -107
- package/src/check.ts +535 -281
- package/src/cli/runtime-invariants.ts +20 -56
- package/src/cli/tlc-arguments.ts +2 -2
- package/src/cli/tlc-output.ts +21 -7
- package/src/cli/tlc.ts +31 -11
- package/src/cli/xml-exporter.ts +1 -1
- package/src/codegen.ts +23 -10
- package/src/coverage.ts +255 -18
- package/src/dependencies.ts +68 -15
- package/src/dfid.ts +101 -36
- package/src/environment.ts +131 -41
- package/src/errors.ts +7 -0
- package/src/evaluate.ts +424 -135
- package/src/exit-codes.ts +28 -13
- package/src/instances.ts +135 -11
- package/src/java-hash.ts +14 -0
- package/src/java-overrides.ts +2 -2
- package/src/levels.ts +675 -236
- package/src/lexer.ts +12 -2
- package/src/liveness-checker.ts +204 -62
- package/src/liveness.ts +55 -10
- package/src/obligations/index.ts +1 -1
- package/src/obligations/normalize.ts +1 -4
- package/src/obligations/printer.ts +5 -5
- package/src/obligations/source.ts +2 -0
- package/src/parallel-worker.ts +8 -2
- package/src/parallel.ts +5 -0
- package/src/parser.ts +180 -149
- package/src/prover/isabelle/isar/attrib.ts +4 -4
- package/src/prover/isabelle/isar/rule-cases.ts +8 -6
- package/src/prover/isabelle/provers/clasimp.ts +1 -1
- package/src/prover/isabelle/provers/hypsubst.ts +2 -2
- package/src/prover/isabelle/pure/rewriter.ts +3 -3
- package/src/prover/isabelle/pure/term.ts +3 -3
- package/src/prover/prep/md5.ts +26 -29
- package/src/prover/smt/rewrite.ts +2 -7
- package/src/prover/smt/simplify.ts +1 -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 +171 -58
- package/src/prover/smt/solver/ast-lt.ts +1 -1
- package/src/prover/smt/solver/ast.ts +66 -14
- package/src/prover/smt/solver/auf-solver.ts +23 -12
- package/src/prover/smt/solver/bit-blast-tactic.ts +27 -1
- package/src/prover/smt/solver/blast-term-ite.ts +47 -0
- package/src/prover/smt/solver/bound-simplifier.ts +11 -13
- package/src/prover/smt/solver/bv-decl-plugin.ts +13 -10
- package/src/prover/smt/solver/bv-rewriter.ts +1 -1
- package/src/prover/smt/solver/card2bv.ts +35 -18
- package/src/prover/smt/solver/cofactor-elim-term-ite.ts +39 -24
- package/src/prover/smt/solver/context.ts +84 -15
- package/src/prover/smt/solver/ctx-simplify.ts +1 -2
- package/src/prover/smt/solver/datatype-decl-plugin.ts +15 -7
- package/src/prover/smt/solver/dependent-expr-state.ts +28 -16
- package/src/prover/smt/solver/diff-neq.ts +1 -2
- package/src/prover/smt/solver/dt2bv-tactic.ts +57 -21
- package/src/prover/smt/solver/elim-bounds.ts +89 -0
- package/src/prover/smt/solver/elim-term-ite-tactic.ts +48 -0
- package/src/prover/smt/solver/elim-uncnstr.ts +5 -8
- package/src/prover/smt/solver/euf/arith-internalize.ts +1 -1
- package/src/prover/smt/solver/euf/array-internalize.ts +1 -1
- package/src/prover/smt/solver/euf/bv-internalize.ts +1 -1
- package/src/prover/smt/solver/euf/egraph.ts +4 -10
- package/src/prover/smt/solver/euf/euf-solver.ts +1 -2
- package/src/prover/smt/solver/euf/mam.ts +1 -5
- package/src/prover/smt/solver/euf/q-ematch.ts +1 -2
- package/src/prover/smt/solver/euf/th-solver.ts +0 -7
- package/src/prover/smt/solver/expr2polynomial.ts +204 -79
- package/src/prover/smt/solver/factor.ts +36 -14
- package/src/prover/smt/solver/fd-solver.ts +608 -139
- package/src/prover/smt/solver/fix-dl-var.ts +1 -2
- package/src/prover/smt/solver/fpa-rewriter.ts +1 -2
- package/src/prover/smt/solver/fpa2bv-converter.ts +3 -1
- package/src/prover/smt/solver/fpa2bv-rewriter.ts +1 -0
- package/src/prover/smt/solver/goal.ts +6 -3
- package/src/prover/smt/solver/goal2nlsat.ts +57 -30
- package/src/prover/smt/solver/hashtable.ts +4 -0
- package/src/prover/smt/solver/internalizer.ts +1 -1
- package/src/prover/smt/solver/logic-tactics.ts +15 -5
- package/src/prover/smt/solver/lp/containers.ts +7 -1
- package/src/prover/smt/solver/lp/core-solver.ts +12 -8
- package/src/prover/smt/solver/lp/cross-nested.ts +1 -3
- package/src/prover/smt/solver/lp/lar-solver.ts +1 -1
- package/src/prover/smt/solver/lp/lp-settings.ts +6 -2
- package/src/prover/smt/solver/lp/nex-creator.ts +3 -2
- package/src/prover/smt/solver/lp/nex.ts +2 -1
- package/src/prover/smt/solver/lp/nla-basics.ts +46 -1
- package/src/prover/smt/solver/lp/nla-core.ts +26 -6
- package/src/prover/smt/solver/lp/nla-grobner.ts +158 -81
- package/src/prover/smt/solver/lp/nra-solver.ts +138 -95
- package/src/prover/smt/solver/lp/pdd-interval.ts +6 -2
- package/src/prover/smt/solver/lp/pdd-simplifier.ts +60 -20
- package/src/prover/smt/solver/lp/pdd-solver.ts +72 -39
- package/src/prover/smt/solver/lp/pdd.ts +725 -290
- package/src/prover/smt/solver/lp/union-find.ts +1 -1
- package/src/prover/smt/solver/mam-compiler.ts +1 -1
- 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-based-opt.ts +1 -1
- 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 +85 -43
- package/src/prover/smt/solver/mpf.ts +2 -4
- package/src/prover/smt/solver/mus.ts +2 -3
- package/src/prover/smt/solver/muz/dl-context.ts +22 -44
- package/src/prover/smt/solver/muz/dl-mk-coi-filter.ts +1 -1
- package/src/prover/smt/solver/muz/dl-mk-slice.ts +3 -3
- package/src/prover/smt/solver/muz/dl-rule.ts +8 -9
- package/src/prover/smt/solver/muz/hnf.ts +2 -2
- package/src/prover/smt/solver/muz/horn-subsume-model-converter.ts +1 -1
- package/src/prover/smt/solver/muz/horn-tactic.ts +15 -2
- package/src/prover/smt/solver/muz/rule-properties.ts +22 -0
- package/src/prover/smt/solver/muz/spacer-context.ts +2 -4
- package/src/prover/smt/solver/muz/spacer-pdr.ts +1 -0
- package/src/prover/smt/solver/muz/spacer-prop-solver.ts +1 -1
- package/src/prover/smt/solver/nlqsat.ts +1 -1
- package/src/prover/smt/solver/nlsat/algebraic.ts +196 -92
- package/src/prover/smt/solver/nlsat/atoms.ts +52 -33
- package/src/prover/smt/solver/nlsat/explain.ts +375 -217
- package/src/prover/smt/solver/nlsat/levelwise.ts +460 -240
- package/src/prover/smt/solver/nlsat/polynomial.ts +2366 -681
- package/src/prover/smt/solver/nlsat/solver.ts +74 -71
- package/src/prover/smt/solver/nlsat/transcendentals.ts +41 -17
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +8 -4
- package/src/prover/smt/solver/nlsat/upolynomial.ts +41 -18
- package/src/prover/smt/solver/nlsat-tactic.ts +1 -1
- package/src/prover/smt/solver/nnf.ts +6 -2
- package/src/prover/smt/solver/opt-context.ts +21 -7
- package/src/prover/smt/solver/opt-nlsat.ts +29 -18
- package/src/prover/smt/solver/opt-pareto.ts +19 -0
- package/src/prover/smt/solver/opt-preprocess.ts +1 -1
- package/src/prover/smt/solver/opt-solver.ts +10 -6
- package/src/prover/smt/solver/optsmt.ts +1 -1
- package/src/prover/smt/solver/parallel-tactic.ts +1 -1
- package/src/prover/smt/solver/pb-rewriter.ts +1 -4
- package/src/prover/smt/solver/poly-rewriter.ts +75 -18
- package/src/prover/smt/solver/probes.ts +88 -23
- package/src/prover/smt/solver/proto-model.ts +8 -8
- package/src/prover/smt/solver/push-app-ite.ts +37 -0
- package/src/prover/smt/solver/qe-arith-plugin.ts +2 -4
- package/src/prover/smt/solver/qe-lite.ts +2 -2
- package/src/prover/smt/solver/qe.ts +3 -2
- package/src/prover/smt/solver/qsat.ts +23 -8
- package/src/prover/smt/solver/quantifier-manager.ts +14 -9
- package/src/prover/smt/solver/recfun-decl-plugin.ts +2 -1
- package/src/prover/smt/solver/rewriter-tpl.ts +7 -6
- package/src/prover/smt/solver/rewriter.ts +31 -25
- package/src/prover/smt/solver/rlimit.ts +20 -3
- package/src/prover/smt/solver/sat/config.ts +1 -1
- package/src/prover/smt/solver/sat/goal2sat.ts +65 -12
- package/src/prover/smt/solver/sat/inc-sat-solver.ts +129 -43
- package/src/prover/smt/solver/sat/model-converter.ts +1 -1
- package/src/prover/smt/solver/sat/pb-constraint.ts +7 -0
- package/src/prover/smt/solver/sat/pb-solver.ts +26 -7
- package/src/prover/smt/solver/sat/sat-tactic.ts +17 -7
- package/src/prover/smt/solver/sat/sat2goal.ts +72 -48
- package/src/prover/smt/solver/sat/simplifier.ts +1 -1
- package/src/prover/smt/solver/sat/solver.ts +27 -47
- package/src/prover/smt/solver/seq-axioms.ts +20 -35
- package/src/prover/smt/solver/seq-decl-plugin.ts +1 -1
- package/src/prover/smt/solver/seq-derive.ts +4 -7
- package/src/prover/smt/solver/seq-eq-solver.ts +2 -2
- package/src/prover/smt/solver/seq-monadic.ts +7 -5
- package/src/prover/smt/solver/seq-re-rewriter.ts +2 -1
- package/src/prover/smt/solver/seq-re-util.ts +1 -1
- package/src/prover/smt/solver/seq-regex-bisim.ts +1 -1
- package/src/prover/smt/solver/seq-regex-live.ts +2 -2
- package/src/prover/smt/solver/seq-rewriter.ts +31 -29
- package/src/prover/smt/solver/seq-skolem.ts +0 -23
- package/src/prover/smt/solver/seq-view-witness.ts +4 -4
- package/src/prover/smt/solver/smt-consequences.ts +1 -1
- package/src/prover/smt/solver/smt-kernel.ts +48 -7
- package/src/prover/smt/solver/smt-setup.ts +106 -13
- package/src/prover/smt/solver/smtlib-parser.ts +589 -224
- package/src/prover/smt/solver/smtlib-script.ts +713 -210
- package/src/prover/smt/solver/solve-eqs.ts +36 -37
- package/src/prover/smt/solver/solver.ts +18 -3
- package/src/prover/smt/solver/tactic.ts +350 -195
- package/src/prover/smt/solver/theory-bv.ts +13 -3
- 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 +10 -0
- package/src/prover/smt/solver/theory-lra-propagate.ts +11 -3
- package/src/prover/smt/solver/theory-lra-state.ts +1 -1
- package/src/prover/smt/solver/theory-lra.ts +1 -1
- package/src/prover/smt/solver/theory-pb.ts +24 -7
- package/src/prover/smt/solver/theory-seq-solve.ts +1 -1
- package/src/prover/smt/solver/theory-seq-state.ts +2 -21
- package/src/prover/smt/solver/theory-without-terms.ts +24 -0
- package/src/prover/smt/solver/tseitin-cnf.ts +1 -0
- package/src/prover/tlapm/cache.ts +8 -8
- package/src/prover/zenon/equality-rules.ts +24 -0
- package/src/prover/zenon/expr.ts +21 -0
- package/src/prover/zenon/index-table.ts +7 -2
- package/src/prover/zenon/isar-case.ts +1 -1
- package/src/prover/zenon/isar.ts +2 -2
- package/src/prover/zenon/phrase.ts +1 -1
- package/src/prover/zenon/rules.ts +2 -1
- package/src/resolve.ts +1274 -258
- package/src/runtime.ts +25 -2
- package/src/sany/builtins.ts +10 -10
- package/src/sany/generation.ts +5 -15
- package/src/sany/generator-def-entries.ts +123 -36
- package/src/sany/generator-definitions.ts +5 -3
- package/src/sany/generator-expressions.ts +60 -37
- package/src/sany/generator-proofs.ts +18 -12
- package/src/sany/generator.ts +12 -6
- package/src/sany/lexer.ts +15 -7
- package/src/sany/modules.ts +4 -2
- package/src/sany/nodes.ts +1 -1
- package/src/sany/selectors.ts +11 -6
- package/src/sany/xml.ts +2 -3
- package/src/search.ts +348 -153
- package/src/simulate.ts +250 -185
- package/src/spec-description.ts +15 -7
- package/src/standard-definitions.ts +5 -0
- package/src/standard-modules.ts +56 -22
- package/src/subexpressions.ts +564 -138
- package/src/successors.ts +50 -20
- package/src/symmetry.ts +2 -1
- package/src/tlc/jar-data.ts +10 -0
- package/src/tlc/messages.ts +3 -3
- package/src/tlc/order.ts +14 -3
- package/src/tlc/random.ts +2 -1
- package/src/tlc/replay.ts +147 -46
- package/src/tlc/tlc-operators.ts +10 -8
- package/src/tlc/tlcext-operators.ts +87 -26
- package/src/tlc/trace-spec.ts +11 -25
- package/src/trace-liveness.ts +529 -0
- package/src/typed-tier.ts +52 -31
- package/src/typescript/types.ts +2 -2
- package/src/values.ts +150 -79
package/src/runtime.ts
CHANGED
|
@@ -14,18 +14,23 @@ export interface CheckerRuntime {
|
|
|
14
14
|
getCurrentState: () => Value[] | undefined;
|
|
15
15
|
getFingerprint: (state: Value[]) => bigint;
|
|
16
16
|
getRandom: () => JavaRandom;
|
|
17
|
+
reseedRandom: () => void;
|
|
18
|
+
runWithNewRandom: <Result>(evaluate: () => Result) => Result;
|
|
17
19
|
getSimulationValue:
|
|
18
20
|
| ((key: string, state: (Value | undefined)[] | undefined) => Value | undefined)
|
|
19
21
|
| undefined;
|
|
20
22
|
evaluateAtStartup: <Result>(evaluate: () => Result) => Result;
|
|
21
23
|
pause: (() => void) | undefined;
|
|
24
|
+
readLine: (() => string | undefined) | undefined;
|
|
22
25
|
warn: (code: number, text: string) => void;
|
|
23
26
|
isWarningEnabled: boolean;
|
|
24
27
|
isTool: boolean;
|
|
25
28
|
version: TlcVersion;
|
|
26
29
|
seed: bigint;
|
|
27
30
|
isSeen: (state: Value[]) => boolean;
|
|
31
|
+
markExplored: ((state: Value[]) => void) | undefined;
|
|
28
32
|
getSuccessorAction: (state: Value[], next: Value[]) => SpecAction | undefined;
|
|
33
|
+
toRecord: (state: Value[]) => Record<string, Value>;
|
|
29
34
|
generatedStates: number;
|
|
30
35
|
distinctStates: number;
|
|
31
36
|
initialStates: number;
|
|
@@ -43,7 +48,7 @@ export interface CheckerRuntime {
|
|
|
43
48
|
|
|
44
49
|
export const createRuntime = (checkDeadlock: boolean, seed = 0n): CheckerRuntime => {
|
|
45
50
|
const startupRandom = createJavaRandom(seed);
|
|
46
|
-
|
|
51
|
+
let workerRandom = createJavaRandom(seed);
|
|
47
52
|
let seededState: Value[] | undefined;
|
|
48
53
|
let isStartup = false;
|
|
49
54
|
const runtime: CheckerRuntime = {
|
|
@@ -53,7 +58,9 @@ export const createRuntime = (checkDeadlock: boolean, seed = 0n): CheckerRuntime
|
|
|
53
58
|
counterExample: undefined,
|
|
54
59
|
deferred: undefined,
|
|
55
60
|
isSeen: () => false,
|
|
61
|
+
markExplored: undefined,
|
|
56
62
|
getSuccessorAction: () => undefined,
|
|
63
|
+
toRecord: () => ({}),
|
|
57
64
|
setLivenessSource: () => {},
|
|
58
65
|
getCurrentState: () => undefined,
|
|
59
66
|
getFingerprint: getTlcFingerprint,
|
|
@@ -67,6 +74,21 @@ export const createRuntime = (checkDeadlock: boolean, seed = 0n): CheckerRuntime
|
|
|
67
74
|
}
|
|
68
75
|
return workerRandom;
|
|
69
76
|
},
|
|
77
|
+
reseedRandom: () => {
|
|
78
|
+
seededState = undefined;
|
|
79
|
+
},
|
|
80
|
+
runWithNewRandom: (evaluate) => {
|
|
81
|
+
const random = workerRandom;
|
|
82
|
+
const state = seededState;
|
|
83
|
+
workerRandom = createJavaRandom(seed);
|
|
84
|
+
seededState = undefined;
|
|
85
|
+
try {
|
|
86
|
+
return evaluate();
|
|
87
|
+
} finally {
|
|
88
|
+
workerRandom = random;
|
|
89
|
+
seededState = state;
|
|
90
|
+
}
|
|
91
|
+
},
|
|
70
92
|
evaluateAtStartup: (evaluate) => {
|
|
71
93
|
const wasStartup = isStartup;
|
|
72
94
|
isStartup = true;
|
|
@@ -77,6 +99,7 @@ export const createRuntime = (checkDeadlock: boolean, seed = 0n): CheckerRuntime
|
|
|
77
99
|
}
|
|
78
100
|
},
|
|
79
101
|
pause: undefined,
|
|
102
|
+
readLine: undefined,
|
|
80
103
|
warn: () => {},
|
|
81
104
|
isWarningEnabled: true,
|
|
82
105
|
isTool: false,
|
|
@@ -104,7 +127,7 @@ export const NAMED_REGISTER_PREFIX = "s:";
|
|
|
104
127
|
const POSSIBLE_REGISTER = "s:_possible";
|
|
105
128
|
|
|
106
129
|
export const getPossibleCounts = (runtime: CheckerRuntime) =>
|
|
107
|
-
createFunction([...runtime.possibleCounts].map((
|
|
130
|
+
createFunction([...runtime.possibleCounts].map((entry): [Value, Value] => [entry[0], entry[1]]));
|
|
108
131
|
|
|
109
132
|
export const getNamedRegisters = (runtime: CheckerRuntime): Map<string, Value> =>
|
|
110
133
|
runtime.possibleCounts.size === 0
|
package/src/sany/builtins.ts
CHANGED
|
@@ -98,28 +98,28 @@ export const createLevelFields = (id: number): LevelFields => ({
|
|
|
98
98
|
|
|
99
99
|
// SANY's order: OpDefNode's constructor numbers each builtin, then its phony parameters.
|
|
100
100
|
export const createBuiltins = (getId: () => number) =>
|
|
101
|
-
BUILTIN_OPERATORS.map((
|
|
101
|
+
BUILTIN_OPERATORS.map((operator): OpDefNode => {
|
|
102
102
|
const id = getId();
|
|
103
103
|
const params =
|
|
104
|
-
|
|
104
|
+
operator[1] < 0
|
|
105
105
|
? undefined
|
|
106
|
-
: Array.from({ length:
|
|
106
|
+
: Array.from({ length: operator[1] }, (_value, index): FormalParamNode => ({
|
|
107
107
|
...createLevelFields(getId()),
|
|
108
108
|
kind: "FormalParam",
|
|
109
109
|
name: `Formal_${index}`,
|
|
110
110
|
arity: 0,
|
|
111
111
|
location: undefined,
|
|
112
112
|
}));
|
|
113
|
-
const isLevelSet =
|
|
114
|
-
const isLeibnizArg =
|
|
113
|
+
const isLevelSet = operator[3] !== undefined && operator[4] !== undefined;
|
|
114
|
+
const isLeibnizArg = operator[4]?.map((weight) => weight > 0);
|
|
115
115
|
return {
|
|
116
116
|
...createLevelFields(id),
|
|
117
117
|
levelChecked: isLevelSet ? 99 : 0,
|
|
118
|
-
level,
|
|
118
|
+
level: operator[2],
|
|
119
119
|
kind: "OpDef",
|
|
120
120
|
defKind: "BuiltIn",
|
|
121
|
-
name,
|
|
122
|
-
arity,
|
|
121
|
+
name: operator[0],
|
|
122
|
+
arity: operator[1],
|
|
123
123
|
params,
|
|
124
124
|
body: undefined,
|
|
125
125
|
isLocal: false,
|
|
@@ -132,11 +132,11 @@ export const createBuiltins = (getId: () => number) =>
|
|
|
132
132
|
inRecursiveSection: false,
|
|
133
133
|
recursiveSection: -1,
|
|
134
134
|
letInLevel: 0,
|
|
135
|
-
weights:
|
|
135
|
+
weights: operator[1] < 0 ? (operator[4] ?? []).slice(0, 1) : (operator[4] ?? []),
|
|
136
136
|
isLeibnizArg: isLevelSet ? isLeibnizArg : undefined,
|
|
137
137
|
isLeibniz: isLeibnizArg?.every(Boolean) ?? true,
|
|
138
138
|
opLevelCond: undefined,
|
|
139
|
-
maxLevels:
|
|
139
|
+
maxLevels: operator[1] < 0 ? (operator[3] ?? []).slice(0, 1) : (operator[3] ?? []),
|
|
140
140
|
minMaxLevel: undefined,
|
|
141
141
|
labels: new Map(),
|
|
142
142
|
step: undefined,
|
package/src/sany/generation.ts
CHANGED
|
@@ -34,19 +34,7 @@ import {
|
|
|
34
34
|
getTokenIndex,
|
|
35
35
|
type SourceFile,
|
|
36
36
|
} from "./source";
|
|
37
|
-
import {
|
|
38
|
-
|
|
39
|
-
const SYNONYMS = new Map(
|
|
40
|
-
SANY_OPERATOR_SYNONYMS.flatMap(([canonical, ...synonyms]) =>
|
|
41
|
-
synonyms.map((synonym) => [synonym, canonical]),
|
|
42
|
-
),
|
|
43
|
-
);
|
|
44
|
-
|
|
45
|
-
export const resolveSynonym = (name: string) =>
|
|
46
|
-
name
|
|
47
|
-
.split("!")
|
|
48
|
-
.map((part) => SYNONYMS.get(part) ?? (part === "~" ? "\\lnot" : part))
|
|
49
|
-
.join("!");
|
|
37
|
+
import { resolveSynonym } from "../tlc/jar-data";
|
|
50
38
|
|
|
51
39
|
export interface AssumeProveScope {
|
|
52
40
|
isDeclaredBefore: boolean[];
|
|
@@ -127,7 +115,8 @@ export interface ModuleGeneration {
|
|
|
127
115
|
curLevel: number;
|
|
128
116
|
unresolvedCount: number[];
|
|
129
117
|
unresolvedSum: number;
|
|
130
|
-
recursiveSectionCount
|
|
118
|
+
// Generator#recursiveSectionCount counts the recursive sections of a file's modules together.
|
|
119
|
+
recursiveSections: { count: number };
|
|
131
120
|
functions: { name: string; node: OpApplNode }[];
|
|
132
121
|
exceptStack: OpApplNode[];
|
|
133
122
|
exceptSpecStack: OpApplNode[];
|
|
@@ -271,7 +260,7 @@ export const createOpDef = (
|
|
|
271
260
|
export const setRecursionFields = (generation: ModuleGeneration, definition: OpDefNode) => {
|
|
272
261
|
definition.letInLevel = generation.curLevel;
|
|
273
262
|
if (generation.unresolvedSum > 0) {
|
|
274
|
-
definition.recursiveSection = generation.
|
|
263
|
+
definition.recursiveSection = generation.recursiveSections.count;
|
|
275
264
|
definition.inRecursiveSection = generation.unresolvedCount[generation.curLevel] > 0;
|
|
276
265
|
generation.currentModule.opDefsInRecursiveSection.push(definition);
|
|
277
266
|
}
|
|
@@ -382,6 +371,7 @@ export const matchArguments = (
|
|
|
382
371
|
getSymbolArity(operand.op) === param.arity &&
|
|
383
372
|
!(
|
|
384
373
|
operand.op.kind === "OpDef" &&
|
|
374
|
+
// Deviation from SANY: OpDefNode#matchingOpArgOperand reads as many parameters as a RECURSIVE declaration gives and crashes when the definition has fewer.
|
|
385
375
|
(operand.op.params ?? []).some((parameter) => parameter.arity > 0)
|
|
386
376
|
);
|
|
387
377
|
if (param.arity > 0 && !isMatching) {
|
|
@@ -9,14 +9,19 @@ import {
|
|
|
9
9
|
type SourceFile,
|
|
10
10
|
type TokenSpan,
|
|
11
11
|
} from "./source";
|
|
12
|
-
import type {
|
|
12
|
+
import type { SanyLocation } from "./nodes";
|
|
13
13
|
|
|
14
14
|
interface DefEntryParts {
|
|
15
15
|
hasChildlessFirstChild: boolean | undefined;
|
|
16
|
-
last:
|
|
16
|
+
last: SanyLocation;
|
|
17
17
|
lastKind: string | undefined;
|
|
18
18
|
}
|
|
19
19
|
|
|
20
|
+
export interface DefEntryError {
|
|
21
|
+
location: SanyLocation;
|
|
22
|
+
message: string;
|
|
23
|
+
}
|
|
24
|
+
|
|
20
25
|
const SYNTAX_KINDS = new Map<Expression["kind"], string>([
|
|
21
26
|
["Identifier", "N_GeneralId"],
|
|
22
27
|
["Subexpression", "N_GeneralId"],
|
|
@@ -26,6 +31,7 @@ const SYNTAX_KINDS = new Map<Expression["kind"], string>([
|
|
|
26
31
|
["SetFilter", "N_SubsetOf"],
|
|
27
32
|
["SetMap", "N_SetOfAll"],
|
|
28
33
|
["Tuple", "N_Tuple"],
|
|
34
|
+
["Product", "N_Times"],
|
|
29
35
|
["FunctionApplication", "N_FcnAppl"],
|
|
30
36
|
["FunctionConstruction", "N_FcnConst"],
|
|
31
37
|
["FunctionSet", "N_SetOfFcns"],
|
|
@@ -82,6 +88,10 @@ const getSyntaxKind = (file: SourceFile, expression: Expression, span: TokenSpan
|
|
|
82
88
|
if (isParenthesized(file, span)) return "N_ParenExpr";
|
|
83
89
|
if (expression.kind === "String") return getTokenSource(file, span.start);
|
|
84
90
|
if (expression.kind === "Apply") return getApplicationKind(file, expression, span);
|
|
91
|
+
if (expression.kind === "And" || expression.kind === "Or") {
|
|
92
|
+
if (!expression.isBulleted) return "N_InfixExpr";
|
|
93
|
+
return expression.kind === "And" ? "N_ConjList" : "N_DisjList";
|
|
94
|
+
}
|
|
85
95
|
return SYNTAX_KINDS.get(expression.kind);
|
|
86
96
|
};
|
|
87
97
|
|
|
@@ -97,10 +107,24 @@ const getDefEntryParts = (
|
|
|
97
107
|
expression: Expression,
|
|
98
108
|
span: TokenSpan,
|
|
99
109
|
): DefEntryParts | undefined => {
|
|
110
|
+
const getLocation = (start: number, end = start) => getSpanLocation(file, { start, end });
|
|
100
111
|
const getPart = (operand: Expression, partSpan = getOperandSpan(file, operand)) => ({
|
|
101
|
-
last: partSpan,
|
|
112
|
+
last: getSpanLocation(file, partSpan),
|
|
102
113
|
lastKind: getSyntaxKind(file, operand, partSpan),
|
|
103
114
|
});
|
|
115
|
+
const getSecondHeir = (end: number, lastKind: string) => ({
|
|
116
|
+
hasChildlessFirstChild: false,
|
|
117
|
+
last: getLocation(span.start + 1, end),
|
|
118
|
+
lastKind,
|
|
119
|
+
});
|
|
120
|
+
const getOperator = (left: Expression, lastKind: string) => {
|
|
121
|
+
const leftSpan = getOperandSpan(file, left);
|
|
122
|
+
return {
|
|
123
|
+
hasChildlessFirstChild: hasChildlessFirstChild(file, left, leftSpan),
|
|
124
|
+
last: getLocation(leftSpan.end + 1),
|
|
125
|
+
lastKind,
|
|
126
|
+
};
|
|
127
|
+
};
|
|
104
128
|
if (isParenthesized(file, span)) {
|
|
105
129
|
const inner = { start: span.start + 1, end: span.end - 1 };
|
|
106
130
|
return { hasChildlessFirstChild: false, ...getPart(expression, inner) };
|
|
@@ -119,11 +143,71 @@ const getDefEntryParts = (
|
|
|
119
143
|
return first === undefined
|
|
120
144
|
? {
|
|
121
145
|
hasChildlessFirstChild: false,
|
|
122
|
-
last:
|
|
146
|
+
last: getLocation(span.end),
|
|
123
147
|
lastKind: file.tokens[span.end].text,
|
|
124
148
|
}
|
|
125
149
|
: { hasChildlessFirstChild: false, ...getPart(first) };
|
|
126
150
|
}
|
|
151
|
+
case "Except":
|
|
152
|
+
return { hasChildlessFirstChild: false, ...getPart(expression.function) };
|
|
153
|
+
case "FunctionSet":
|
|
154
|
+
return { hasChildlessFirstChild: false, ...getPart(expression.domain) };
|
|
155
|
+
case "SetMap":
|
|
156
|
+
return { hasChildlessFirstChild: false, ...getPart(expression.expression) };
|
|
157
|
+
case "WeakFairness":
|
|
158
|
+
case "StrongFairness":
|
|
159
|
+
return { hasChildlessFirstChild: false, ...getPart(expression.subscript) };
|
|
160
|
+
case "Case":
|
|
161
|
+
return getSecondHeir(getOperandSpan(file, expression.arms[0].body).end, "N_CaseArm");
|
|
162
|
+
case "Record":
|
|
163
|
+
case "RecordSet":
|
|
164
|
+
return getSecondHeir(
|
|
165
|
+
getOperandSpan(file, expression.fields[0].value).end,
|
|
166
|
+
expression.kind === "Record" ? "N_FieldVal" : "N_FieldSet",
|
|
167
|
+
);
|
|
168
|
+
case "FunctionConstruction":
|
|
169
|
+
case "Forall":
|
|
170
|
+
case "Exists":
|
|
171
|
+
return getSecondHeir(getOperandSpan(file, expression.bounds[0].set).end, "N_QuantBound");
|
|
172
|
+
case "Choose":
|
|
173
|
+
case "SetFilter":
|
|
174
|
+
return (expression.kind === "Choose" ? expression.pattern : expression.bound.pattern).kind ===
|
|
175
|
+
"Tuple"
|
|
176
|
+
? getSecondHeir(getMatchingIndex(file, span.start + 1), "N_IdentifierTuple")
|
|
177
|
+
: undefined;
|
|
178
|
+
case "Decimal": {
|
|
179
|
+
const token = file.tokens[span.start];
|
|
180
|
+
const point = token.column + token.text.indexOf(".");
|
|
181
|
+
return {
|
|
182
|
+
hasChildlessFirstChild: false,
|
|
183
|
+
last: { ...getLocation(span.start), beginColumn: point, endColumn: point },
|
|
184
|
+
lastKind: ".",
|
|
185
|
+
};
|
|
186
|
+
}
|
|
187
|
+
case "Let":
|
|
188
|
+
return getSecondHeir(getOperandSpan(file, expression.body).start - 2, "N_LetDefinitions");
|
|
189
|
+
case "Product":
|
|
190
|
+
return getOperator(expression.factors[0], "N_GenInfixOp");
|
|
191
|
+
case "And":
|
|
192
|
+
case "Or": {
|
|
193
|
+
if (expression.operands.length === 1) return undefined;
|
|
194
|
+
if (!expression.isBulleted && expression.operands.length > 2) {
|
|
195
|
+
return {
|
|
196
|
+
hasChildlessFirstChild: undefined,
|
|
197
|
+
last: getLocation(
|
|
198
|
+
getOperandSpan(file, expression.operands[expression.operands.length - 1]).start - 1,
|
|
199
|
+
),
|
|
200
|
+
lastKind: "N_GenInfixOp",
|
|
201
|
+
};
|
|
202
|
+
}
|
|
203
|
+
if (!expression.isBulleted) return getOperator(expression.operands[0], "N_GenInfixOp");
|
|
204
|
+
const item = getOperandSpan(file, expression.operands[1]);
|
|
205
|
+
return {
|
|
206
|
+
hasChildlessFirstChild: true,
|
|
207
|
+
last: getLocation(item.start - 1, item.end),
|
|
208
|
+
lastKind: expression.kind === "And" ? "N_ConjItem" : "N_DisjItem",
|
|
209
|
+
};
|
|
210
|
+
}
|
|
127
211
|
case "Always":
|
|
128
212
|
case "Eventually":
|
|
129
213
|
case "Enabled":
|
|
@@ -139,7 +223,7 @@ const getDefEntryParts = (
|
|
|
139
223
|
expression.expression,
|
|
140
224
|
getOperandSpan(file, expression.expression),
|
|
141
225
|
),
|
|
142
|
-
last:
|
|
226
|
+
last: getLocation(span.end),
|
|
143
227
|
lastKind: "N_GenPostfixOp",
|
|
144
228
|
};
|
|
145
229
|
case "FunctionApplication":
|
|
@@ -150,7 +234,7 @@ const getDefEntryParts = (
|
|
|
150
234
|
const next = operandSpan.end + 1;
|
|
151
235
|
return {
|
|
152
236
|
hasChildlessFirstChild: hasChildlessFirstChild(file, operand, operandSpan),
|
|
153
|
-
last:
|
|
237
|
+
last: getLocation(next),
|
|
154
238
|
lastKind: file.tokens[next].text,
|
|
155
239
|
};
|
|
156
240
|
}
|
|
@@ -161,7 +245,7 @@ const getDefEntryParts = (
|
|
|
161
245
|
? undefined
|
|
162
246
|
: {
|
|
163
247
|
hasChildlessFirstChild: true,
|
|
164
|
-
last:
|
|
248
|
+
last: getLocation(span.start + 1, span.end),
|
|
165
249
|
lastKind: "N_OpArgs",
|
|
166
250
|
};
|
|
167
251
|
}
|
|
@@ -171,40 +255,43 @@ const getDefEntryParts = (
|
|
|
171
255
|
...getPart(expression.args[0], { start: span.start + 1, end: span.end }),
|
|
172
256
|
};
|
|
173
257
|
}
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
last: { start: operator, end: operator },
|
|
179
|
-
lastKind: kind === "N_InfixExpr" ? "N_GenInfixOp" : "N_GenPostfixOp",
|
|
180
|
-
};
|
|
258
|
+
return getOperator(
|
|
259
|
+
expression.args[0],
|
|
260
|
+
kind === "N_InfixExpr" ? "N_GenInfixOp" : "N_GenPostfixOp",
|
|
261
|
+
);
|
|
181
262
|
}
|
|
182
263
|
}
|
|
183
264
|
return undefined;
|
|
184
265
|
};
|
|
185
266
|
|
|
186
|
-
export const
|
|
187
|
-
const span = getOperandSpan(
|
|
188
|
-
const
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
expression.kind === "
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
if (parts
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
generation.addError(getSpanLocation(generation.file, span), "Was expecting a GeneralId.");
|
|
267
|
+
export const getDefEntryErrors = (file: SourceFile, expression: Expression): DefEntryError[] => {
|
|
268
|
+
const span = getOperandSpan(file, expression);
|
|
269
|
+
const location = getSpanLocation(file, span);
|
|
270
|
+
const parts = getDefEntryParts(file, expression, span);
|
|
271
|
+
const isOneHeir =
|
|
272
|
+
expression.kind === "Number" ||
|
|
273
|
+
expression.kind === "String" ||
|
|
274
|
+
((expression.kind === "And" || expression.kind === "Or") && expression.operands.length === 1);
|
|
275
|
+
if (parts === undefined && isOneHeir) {
|
|
276
|
+
// Deviation from SANY: Generator#genIdToSelector throws ArrayIndexOutOfBoundsException on a node with one heir, such as a number, a string, or a one-item junction list; tla-ts rejects it as an entry that describes no definition.
|
|
277
|
+
return [{ location, message: "DEF clause entry should describe a defined operator." }];
|
|
198
278
|
}
|
|
199
|
-
if (parts.
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
generation.addError(lastLocation, "Unexpected token found.");
|
|
203
|
-
generation.addError(lastLocation, `Need name or step number here, not \`${parts.lastKind}'.`);
|
|
279
|
+
if (parts !== undefined && parts.hasChildlessFirstChild === undefined) {
|
|
280
|
+
// Deviation from SANY: Generator#genIdToSelector selects the empty N_IdPrefix of a nested first child, as in A + B + A, and reports it at line 2147483647, col 2147483647; tla-ts rejects it as an entry that describes no definition.
|
|
281
|
+
return [{ location, message: "DEF clause entry should describe a defined operator." }];
|
|
204
282
|
}
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
283
|
+
if (parts?.hasChildlessFirstChild === undefined || parts.lastKind === undefined) return [];
|
|
284
|
+
return [
|
|
285
|
+
...(parts.hasChildlessFirstChild ? [{ location, message: "Was expecting a GeneralId." }] : []),
|
|
286
|
+
...(parts.lastKind === "N_OpArgs"
|
|
287
|
+
? [{ location: parts.last, message: "Selector `!(...)' should not have argument(s)." }]
|
|
288
|
+
: [
|
|
289
|
+
{ location: parts.last, message: "Unexpected token found." },
|
|
290
|
+
{
|
|
291
|
+
location: parts.last,
|
|
292
|
+
message: `Need name or step number here, not \`${parts.lastKind}'.`,
|
|
293
|
+
},
|
|
294
|
+
]),
|
|
295
|
+
{ location, message: "DEF clause entry should describe a defined operator." },
|
|
296
|
+
];
|
|
210
297
|
};
|
|
@@ -60,10 +60,10 @@ import {
|
|
|
60
60
|
popLabels,
|
|
61
61
|
pushLabelScope,
|
|
62
62
|
resolveSymbol,
|
|
63
|
-
resolveSynonym,
|
|
64
63
|
setRecursionFields,
|
|
65
64
|
withContext,
|
|
66
65
|
} from "./generation";
|
|
66
|
+
import { resolveSynonym } from "../tlc/jar-data";
|
|
67
67
|
import {
|
|
68
68
|
findNameOrKeyword,
|
|
69
69
|
generateBounds,
|
|
@@ -123,6 +123,7 @@ export const processOperator = (
|
|
|
123
123
|
const params = getParams(generation, definition, paramsSpan, true);
|
|
124
124
|
const existing = resolveSymbol(generation.contexts, name);
|
|
125
125
|
if (existing?.kind === "OpDef" && existing.inRecursive && !existing.isDefined) {
|
|
126
|
+
// Deviation from SANY: Generator#processOperator compares only the last parameter's arity with the RECURSIVE declaration's.
|
|
126
127
|
const isMatching =
|
|
127
128
|
existing.params?.length === params.length && params.every((param) => param.arity === 0);
|
|
128
129
|
if (existing.letInLevel !== generation.curLevel) {
|
|
@@ -273,7 +274,7 @@ export const processFunction = (
|
|
|
273
274
|
};
|
|
274
275
|
|
|
275
276
|
export const processRecursive = (generation: ModuleGeneration, declarations: Declaration[]) => {
|
|
276
|
-
if (generation.unresolvedSum === 0) generation.
|
|
277
|
+
if (generation.unresolvedSum === 0) generation.recursiveSections.count++;
|
|
277
278
|
generation.unresolvedCount[generation.curLevel] += declarations.length;
|
|
278
279
|
generation.unresolvedSum += declarations.length;
|
|
279
280
|
declarations.forEach((declaration) => {
|
|
@@ -290,7 +291,7 @@ export const processRecursive = (generation: ModuleGeneration, declarations: Dec
|
|
|
290
291
|
isDefined: false,
|
|
291
292
|
inRecursive: true,
|
|
292
293
|
inRecursiveSection: true,
|
|
293
|
-
recursiveSection: generation.
|
|
294
|
+
recursiveSection: generation.recursiveSections.count,
|
|
294
295
|
letInLevel: generation.curLevel,
|
|
295
296
|
});
|
|
296
297
|
addSymbol(generation, node);
|
|
@@ -356,6 +357,7 @@ const processSubstitutions = (
|
|
|
356
357
|
if (targetIndex !== -1) {
|
|
357
358
|
cursor = getExpressionSpan(generation.file, substitution.expression).end + 1;
|
|
358
359
|
}
|
|
360
|
+
// Deviation from SANY: Generator#generateSubst looks a target up as spelled, so it rejects `<= <- G` for a CONSTANT _ <= _.
|
|
359
361
|
const target = getContextSymbol(instanceeContext, resolveSynonym(substitution.name));
|
|
360
362
|
if (target?.kind !== "OpDecl") {
|
|
361
363
|
generation.addError(
|