tla-ts 0.0.10-dev.d618a2d79 → 0.0.10-dev.e5c8dc315
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 +78 -78
- 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 -93
- package/src/check.ts +518 -281
- package/src/cli/runtime-invariants.ts +20 -56
- package/src/cli/tlc-arguments.ts +2 -2
- package/src/cli/tlc-output.ts +18 -4
- package/src/cli/tlc.ts +18 -12
- 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 +155 -66
- package/src/errors.ts +7 -0
- package/src/evaluate.ts +424 -135
- package/src/exit-codes.ts +28 -14
- package/src/instances.ts +152 -25
- 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 +179 -60
- 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/ackermannize-bv-tactic.ts +3 -2
- 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 +28 -2
- 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/bv1-blast.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 +9 -4
- 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 +9 -8
- package/src/prover/smt/solver/dt2bv-tactic.ts +66 -28
- 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 +31 -28
- package/src/prover/smt/solver/eq2bv-tactic.ts +15 -6
- 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 -11
- 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 +2 -3
- package/src/prover/smt/solver/fm-tactic.ts +9 -7
- 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/fpa2bv-tactic.ts +1 -1
- 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/lia2pb.ts +1 -1
- package/src/prover/smt/solver/logic-tactics.ts +15 -5
- package/src/prover/smt/solver/lp/core-solver.ts +12 -8
- 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/nla-core.ts +1 -1
- package/src/prover/smt/solver/lp/nla-grobner.ts +158 -80
- package/src/prover/smt/solver/lp/nra-solver.ts +45 -39
- 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 +2 -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 -64
- 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/normalize-bounds.ts +2 -2
- package/src/prover/smt/solver/occf.ts +1 -1
- 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/pb2bv-tactic.ts +9 -3
- 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/purify-arith.ts +51 -49
- 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/reduce-args.ts +2 -2
- 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 +7 -3
- package/src/prover/smt/solver/sat/config.ts +1 -1
- package/src/prover/smt/solver/sat/goal2sat.ts +75 -12
- package/src/prover/smt/solver/sat/inc-sat-solver.ts +149 -47
- 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 +54 -25
- package/src/prover/smt/solver/sat/sat2goal.ts +75 -50
- 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 +2 -2
- 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 +718 -213
- package/src/prover/smt/solver/solve-eqs.ts +36 -37
- package/src/prover/smt/solver/solver.ts +18 -4
- package/src/prover/smt/solver/tactic.ts +389 -199
- 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 +2 -0
- package/src/prover/smt/solver/theory-lra-propagate.ts +12 -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 +15 -5
- package/src/prover/tlapm/cache.ts +8 -8
- package/src/prover/zenon/index-table.ts +5 -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/resolve.ts +1311 -268
- package/src/runtime.ts +21 -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 +19 -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 +12 -6
- package/src/sany/xml.ts +2 -3
- package/src/search.ts +321 -135
- package/src/simulate.ts +247 -185
- package/src/spec-description.ts +15 -7
- package/src/standard-definitions.ts +1 -0
- package/src/standard-modules.ts +56 -22
- package/src/subexpressions.ts +666 -147
- 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 +44 -15
- package/src/tlc/trace-spec.ts +9 -22
- 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/exit-codes.ts
CHANGED
|
@@ -1,7 +1,8 @@
|
|
|
1
|
-
import type { LivenessChecker } from "./liveness-checker";
|
|
1
|
+
import type { LivenessChecker, LivenessChecks } from "./liveness-checker";
|
|
2
2
|
|
|
3
3
|
export const EXIT_STATUS = {
|
|
4
4
|
success: 0,
|
|
5
|
+
abort: 1,
|
|
5
6
|
assumptionViolation: 10,
|
|
6
7
|
deadlock: 11,
|
|
7
8
|
safetyViolation: 12,
|
|
@@ -17,13 +18,13 @@ export const EXIT_STATUS = {
|
|
|
17
18
|
|
|
18
19
|
const MESSAGE_EXIT_STATUSES = new Map<number, number>([
|
|
19
20
|
...[
|
|
20
|
-
...Array.from({ length: 24 }, (
|
|
21
|
+
...Array.from({ length: 24 }, (_value, index) => 2222 + index),
|
|
21
22
|
2272,
|
|
22
23
|
2273,
|
|
23
24
|
2274,
|
|
24
25
|
2280,
|
|
25
26
|
2281,
|
|
26
|
-
...Array.from({ length: 7 }, (
|
|
27
|
+
...Array.from({ length: 7 }, (_value, index) => 5001 + index),
|
|
27
28
|
].map((code): [number, number] => [code, EXIT_STATUS.configParseError]),
|
|
28
29
|
[2253, EXIT_STATUS.livenessEvaluationFailure],
|
|
29
30
|
[2109, EXIT_STATUS.specEvaluationFailure],
|
|
@@ -69,22 +70,35 @@ const withErrorExitCode = <Result>(run: () => Result) => {
|
|
|
69
70
|
}
|
|
70
71
|
};
|
|
71
72
|
|
|
73
|
+
const withCheckerExitCode = (checker: LivenessChecker): LivenessChecker => ({
|
|
74
|
+
branches: checker.branches,
|
|
75
|
+
solutions: checker.solutions,
|
|
76
|
+
addInitialState: checker.addInitialState,
|
|
77
|
+
addState: (index, state, successors, tracing) =>
|
|
78
|
+
withErrorExitCode(() => checker.addState(index, state, successors, tracing)),
|
|
79
|
+
storeState: checker.storeState,
|
|
80
|
+
getStateCounts: checker.getStateCounts,
|
|
81
|
+
findViolation: () => withErrorExitCode(() => checker.findViolation()),
|
|
82
|
+
getViolatedProperties: (path, cycleStart) =>
|
|
83
|
+
withErrorExitCode(() => checker.getViolatedProperties(path, cycleStart)),
|
|
84
|
+
});
|
|
85
|
+
|
|
72
86
|
export const withLivenessExitCode = (
|
|
73
87
|
create: () => LivenessChecker | undefined,
|
|
74
88
|
): LivenessChecker | undefined => {
|
|
75
89
|
const checker = withErrorExitCode(create);
|
|
90
|
+
return checker && withCheckerExitCode(checker);
|
|
91
|
+
};
|
|
92
|
+
|
|
93
|
+
export const withLivenessChecksExitCode = (
|
|
94
|
+
create: () => LivenessChecks | undefined,
|
|
95
|
+
): LivenessChecks | undefined => {
|
|
96
|
+
const checks = withErrorExitCode(create);
|
|
76
97
|
return (
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
withErrorExitCode(() => checker.addInitialState(index, state, tracing)),
|
|
82
|
-
addState: (index, state, successors, tracing) =>
|
|
83
|
-
withErrorExitCode(() => checker.addState(index, state, successors, tracing)),
|
|
84
|
-
storeState: checker.storeState,
|
|
85
|
-
findViolation: () => withErrorExitCode(() => checker.findViolation()),
|
|
86
|
-
getViolatedProperties: (path, cycleStart) =>
|
|
87
|
-
withErrorExitCode(() => checker.getViolatedProperties(path, cycleStart)),
|
|
98
|
+
checks && {
|
|
99
|
+
solutions: checks.solutions,
|
|
100
|
+
findTraceViolation: (trace, fingerprints) =>
|
|
101
|
+
withErrorExitCode(() => checks.findTraceViolation(trace, fingerprints)),
|
|
88
102
|
}
|
|
89
103
|
);
|
|
90
104
|
};
|
package/src/instances.ts
CHANGED
|
@@ -1,11 +1,13 @@
|
|
|
1
1
|
import {
|
|
2
2
|
getChildren,
|
|
3
|
+
getFunctionConstruction,
|
|
3
4
|
getReferencedName,
|
|
4
5
|
isLocallyResolved,
|
|
5
6
|
type Bound,
|
|
6
7
|
type BoundPattern,
|
|
7
8
|
type Definition,
|
|
8
9
|
type Expression,
|
|
10
|
+
type FunctionDefinition,
|
|
9
11
|
type Instance,
|
|
10
12
|
type Module,
|
|
11
13
|
type OperatorParam,
|
|
@@ -185,8 +187,9 @@ export const mapChildren = (
|
|
|
185
187
|
...expression,
|
|
186
188
|
function: mapUnbound(expression.function),
|
|
187
189
|
updates: expression.updates.map((update) => ({
|
|
190
|
+
...update,
|
|
188
191
|
path: update.path.map((step) =>
|
|
189
|
-
step.kind === "Index" ? {
|
|
192
|
+
step.kind === "Index" ? { ...step, args: step.args.map(mapUnbound) } : step,
|
|
190
193
|
),
|
|
191
194
|
value: mapUnbound(update.value),
|
|
192
195
|
})),
|
|
@@ -219,6 +222,8 @@ export const mapChildren = (
|
|
|
219
222
|
};
|
|
220
223
|
case "Label":
|
|
221
224
|
return { ...expression, body: mapUnbound(expression.body) };
|
|
225
|
+
case "Selection":
|
|
226
|
+
return { ...expression, expression: mapUnbound(expression.expression) };
|
|
222
227
|
case "Subexpression":
|
|
223
228
|
return {
|
|
224
229
|
...expression,
|
|
@@ -229,14 +234,127 @@ export const mapChildren = (
|
|
|
229
234
|
}
|
|
230
235
|
};
|
|
231
236
|
|
|
237
|
+
const NO_NAMES: string[] = [];
|
|
238
|
+
|
|
239
|
+
const visitAll = (children: Expression[], visit: (child: Expression, bound: string[]) => void) => {
|
|
240
|
+
for (let index = 0; index < children.length; index++) visit(children[index], NO_NAMES);
|
|
241
|
+
};
|
|
242
|
+
|
|
243
|
+
const visitBoundSets = (bounds: Bound[], visit: (child: Expression, bound: string[]) => void) => {
|
|
244
|
+
for (let index = 0; index < bounds.length; index++) visit(bounds[index].set, NO_NAMES);
|
|
245
|
+
};
|
|
246
|
+
|
|
232
247
|
export const forEachChild = (
|
|
233
248
|
expression: Expression,
|
|
234
249
|
visit: (child: Expression, bound: string[]) => void,
|
|
235
250
|
): void => {
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
|
|
251
|
+
switch (expression.kind) {
|
|
252
|
+
case "Number":
|
|
253
|
+
case "Decimal":
|
|
254
|
+
case "String":
|
|
255
|
+
case "Identifier":
|
|
256
|
+
case "OperatorReference":
|
|
257
|
+
case "ExceptAt":
|
|
258
|
+
return;
|
|
259
|
+
case "Apply":
|
|
260
|
+
case "Bracket":
|
|
261
|
+
return visitAll(expression.args, visit);
|
|
262
|
+
case "Lambda":
|
|
263
|
+
return visit(expression.body, expression.params);
|
|
264
|
+
case "And":
|
|
265
|
+
case "Or":
|
|
266
|
+
return visitAll(expression.operands, visit);
|
|
267
|
+
case "Prime":
|
|
268
|
+
case "Unchanged":
|
|
269
|
+
case "Enabled":
|
|
270
|
+
case "Always":
|
|
271
|
+
case "Eventually":
|
|
272
|
+
case "Selection":
|
|
273
|
+
return visit(expression.expression, NO_NAMES);
|
|
274
|
+
case "If":
|
|
275
|
+
visit(expression.condition, NO_NAMES);
|
|
276
|
+
visit(expression.consequent, NO_NAMES);
|
|
277
|
+
return visit(expression.alternative, NO_NAMES);
|
|
278
|
+
case "Case":
|
|
279
|
+
for (let index = 0; index < expression.arms.length; index++) {
|
|
280
|
+
visit(expression.arms[index].condition, NO_NAMES);
|
|
281
|
+
visit(expression.arms[index].body, NO_NAMES);
|
|
282
|
+
}
|
|
283
|
+
if (expression.other) visit(expression.other, NO_NAMES);
|
|
284
|
+
return;
|
|
285
|
+
case "Let": {
|
|
286
|
+
const names = expression.definitions.map((definition) => definition.name);
|
|
287
|
+
expression.definitions.forEach((definition) => {
|
|
288
|
+
if (definition.kind === "Function") {
|
|
289
|
+
visitBoundSets(definition.bounds, (child) => visit(child, names));
|
|
290
|
+
visit(definition.body, [...names, ...getBoundNames(definition.bounds)]);
|
|
291
|
+
} else {
|
|
292
|
+
visit(definition.body, [...names, ...definition.params.map((param) => param.name)]);
|
|
293
|
+
}
|
|
294
|
+
});
|
|
295
|
+
return visit(expression.body, names);
|
|
296
|
+
}
|
|
297
|
+
case "Forall":
|
|
298
|
+
case "Exists":
|
|
299
|
+
case "FunctionConstruction":
|
|
300
|
+
visitBoundSets(expression.bounds, visit);
|
|
301
|
+
return visit(expression.body, getBoundNames(expression.bounds));
|
|
302
|
+
case "UnboundedQuantifier":
|
|
303
|
+
return visit(expression.body, expression.names);
|
|
304
|
+
case "Choose":
|
|
305
|
+
if (expression.set) visit(expression.set, NO_NAMES);
|
|
306
|
+
return visit(expression.body, getPatternNames(expression.pattern));
|
|
307
|
+
case "SetEnumeration":
|
|
308
|
+
case "Tuple":
|
|
309
|
+
return visitAll(expression.elements, visit);
|
|
310
|
+
case "SetFilter":
|
|
311
|
+
visit(expression.bound.set, NO_NAMES);
|
|
312
|
+
return visit(expression.predicate, getPatternNames(expression.bound.pattern));
|
|
313
|
+
case "SetMap":
|
|
314
|
+
visitBoundSets(expression.bounds, visit);
|
|
315
|
+
return visit(expression.expression, getBoundNames(expression.bounds));
|
|
316
|
+
case "FunctionSet":
|
|
317
|
+
visit(expression.domain, NO_NAMES);
|
|
318
|
+
return visit(expression.range, NO_NAMES);
|
|
319
|
+
case "Record":
|
|
320
|
+
case "RecordSet":
|
|
321
|
+
for (let index = 0; index < expression.fields.length; index++) {
|
|
322
|
+
visit(expression.fields[index].value, NO_NAMES);
|
|
323
|
+
}
|
|
324
|
+
return;
|
|
325
|
+
case "Except":
|
|
326
|
+
visit(expression.function, NO_NAMES);
|
|
327
|
+
for (let index = 0; index < expression.updates.length; index++) {
|
|
328
|
+
const update = expression.updates[index];
|
|
329
|
+
for (let step = 0; step < update.path.length; step++) {
|
|
330
|
+
const component = update.path[step];
|
|
331
|
+
if (component.kind === "Index") visitAll(component.args, visit);
|
|
332
|
+
}
|
|
333
|
+
visit(update.value, NO_NAMES);
|
|
334
|
+
}
|
|
335
|
+
return;
|
|
336
|
+
case "FunctionApplication":
|
|
337
|
+
visit(expression.function, NO_NAMES);
|
|
338
|
+
return visitAll(expression.args, visit);
|
|
339
|
+
case "FieldAccess":
|
|
340
|
+
return visit(expression.record, NO_NAMES);
|
|
341
|
+
case "Product":
|
|
342
|
+
return visitAll(expression.factors, visit);
|
|
343
|
+
case "BoxAction":
|
|
344
|
+
case "AngleAction":
|
|
345
|
+
visit(expression.action, NO_NAMES);
|
|
346
|
+
return visit(expression.subscript, NO_NAMES);
|
|
347
|
+
case "WeakFairness":
|
|
348
|
+
case "StrongFairness":
|
|
349
|
+
visit(expression.subscript, NO_NAMES);
|
|
350
|
+
return visit(expression.action, NO_NAMES);
|
|
351
|
+
case "Label":
|
|
352
|
+
return visit(expression.body, NO_NAMES);
|
|
353
|
+
case "Subexpression":
|
|
354
|
+
expression.selectors.forEach((selector) => {
|
|
355
|
+
if ("args" in selector) visitAll(selector.args, visit);
|
|
356
|
+
});
|
|
357
|
+
}
|
|
240
358
|
};
|
|
241
359
|
|
|
242
360
|
interface Instantiation {
|
|
@@ -262,6 +380,7 @@ interface Rewrite {
|
|
|
262
380
|
mode: RewriteMode;
|
|
263
381
|
modes: Map<RewriteMode, Rewrite>;
|
|
264
382
|
bindings?: Map<string, Expression>;
|
|
383
|
+
selections: Map<Expression, Expression>;
|
|
265
384
|
}
|
|
266
385
|
|
|
267
386
|
const getSubstitutionName = (name: string) => `${name}@SUBSTITUTION`;
|
|
@@ -522,7 +641,7 @@ const getInstanceOperator = (
|
|
|
522
641
|
arity: number,
|
|
523
642
|
location: SourceLocation,
|
|
524
643
|
): Expression => {
|
|
525
|
-
const names = Array.from({ length: arity }, (
|
|
644
|
+
const names = Array.from({ length: arity }, (_value, index) => `argument${index}`);
|
|
526
645
|
return {
|
|
527
646
|
kind: "Lambda",
|
|
528
647
|
params: names,
|
|
@@ -548,6 +667,12 @@ const substitute = (
|
|
|
548
667
|
bound: Map<string, string>,
|
|
549
668
|
): Expression => {
|
|
550
669
|
const recurse = (node: Expression) => substitute(node, rewrite, bound);
|
|
670
|
+
if (expression.kind === "Selection" && [...bound].every((entry) => entry[0] === entry[1])) {
|
|
671
|
+
const selected = expression.expression;
|
|
672
|
+
const substituted = rewrite.selections.get(selected) ?? recurse(selected);
|
|
673
|
+
rewrite.selections.set(selected, substituted);
|
|
674
|
+
return { ...expression, expression: substituted };
|
|
675
|
+
}
|
|
551
676
|
const instantiation = rewrite.instantiation;
|
|
552
677
|
const params = instantiation.params;
|
|
553
678
|
const isFree = (name: string) => !bound.has(name) && !isLocallyResolved(expression);
|
|
@@ -652,7 +777,7 @@ const substitute = (
|
|
|
652
777
|
args,
|
|
653
778
|
resolution: LOCAL_RESOLUTION,
|
|
654
779
|
},
|
|
655
|
-
location: expression.location,
|
|
780
|
+
location: { line: expression.location.line, column: expression.location.column },
|
|
656
781
|
};
|
|
657
782
|
}
|
|
658
783
|
if (replacement) {
|
|
@@ -694,11 +819,17 @@ const substitute = (
|
|
|
694
819
|
return renameNames(mapped, bound, rename);
|
|
695
820
|
};
|
|
696
821
|
|
|
697
|
-
const
|
|
698
|
-
definition
|
|
699
|
-
|
|
700
|
-
|
|
701
|
-
|
|
822
|
+
export const getFunctionBody = (definition: FunctionDefinition): Expression =>
|
|
823
|
+
definition.isSelfReferential
|
|
824
|
+
? {
|
|
825
|
+
kind: "Let",
|
|
826
|
+
definitions: [definition],
|
|
827
|
+
body: createLocalIdentifier(definition.name, definition.location),
|
|
828
|
+
location: { line: definition.location.line, column: definition.location.column },
|
|
829
|
+
}
|
|
830
|
+
: getFunctionConstruction(definition, true);
|
|
831
|
+
|
|
832
|
+
export const withInstanceParams = (definition: Definition, params: OperatorParam[]): Definition => {
|
|
702
833
|
if (params.length === 0) return definition;
|
|
703
834
|
if (definition.kind === "Operator") {
|
|
704
835
|
return { ...definition, params: [...params, ...definition.params] };
|
|
@@ -707,12 +838,7 @@ const withInstanceParams = (
|
|
|
707
838
|
kind: "Operator",
|
|
708
839
|
name: definition.name,
|
|
709
840
|
params,
|
|
710
|
-
body:
|
|
711
|
-
kind: "Let",
|
|
712
|
-
definitions: [definition],
|
|
713
|
-
body: createLocalIdentifier(definition.name, location),
|
|
714
|
-
location,
|
|
715
|
-
},
|
|
841
|
+
body: getFunctionBody(definition),
|
|
716
842
|
isLocal: definition.isLocal,
|
|
717
843
|
isRecursive: false,
|
|
718
844
|
location: definition.location,
|
|
@@ -731,7 +857,7 @@ const copyDefinition = (rewrite: Rewrite, key: string): string => {
|
|
|
731
857
|
const bindings = new Map<string, Expression>();
|
|
732
858
|
const bodyRewrite =
|
|
733
859
|
definition.kind === "Operator" && rewrite.mode === "Normal"
|
|
734
|
-
? { ...rewrite, bindings }
|
|
860
|
+
? { ...rewrite, bindings, selections: new Map<Expression, Expression>() }
|
|
735
861
|
: rewrite;
|
|
736
862
|
const mapped = renameParams(
|
|
737
863
|
mapDefinition(definition, (child, bound) =>
|
|
@@ -744,14 +870,14 @@ const copyDefinition = (rewrite: Rewrite, key: string): string => {
|
|
|
744
870
|
? mapped.body
|
|
745
871
|
: {
|
|
746
872
|
kind: "Let",
|
|
747
|
-
definitions: [...bindings].map((
|
|
873
|
+
definitions: [...bindings].map((entry): Definition => ({
|
|
748
874
|
kind: "Operator",
|
|
749
|
-
name,
|
|
875
|
+
name: entry[0],
|
|
750
876
|
params: [],
|
|
751
|
-
body:
|
|
877
|
+
body: entry[1],
|
|
752
878
|
isLocal: true,
|
|
753
879
|
isRecursive: false,
|
|
754
|
-
location:
|
|
880
|
+
location: entry[1].location,
|
|
755
881
|
})),
|
|
756
882
|
body: mapped.body,
|
|
757
883
|
// TLC has no such LET, so the call stack it prints has no position for it.
|
|
@@ -761,7 +887,7 @@ const copyDefinition = (rewrite: Rewrite, key: string): string => {
|
|
|
761
887
|
// TLC's call stack holds the SubstInNode an instance puts around each definition it copies.
|
|
762
888
|
if (frame)
|
|
763
889
|
substitutionFrames.set(body, [frame, ...(substitutionFrames.get(definition.body) ?? [])]);
|
|
764
|
-
return withInstanceParams({ ...mapped, body }, instantiation.params
|
|
890
|
+
return withInstanceParams({ ...mapped, body }, instantiation.params);
|
|
765
891
|
});
|
|
766
892
|
};
|
|
767
893
|
|
|
@@ -777,6 +903,7 @@ export const createInstantiation = (instantiation: Instantiation) => {
|
|
|
777
903
|
copies: new Map<string, string>(),
|
|
778
904
|
mode,
|
|
779
905
|
modes,
|
|
906
|
+
selections: new Map<Expression, Expression>(),
|
|
780
907
|
};
|
|
781
908
|
modes.set(mode, created);
|
|
782
909
|
return created;
|
|
@@ -792,7 +919,7 @@ export const createInstantiation = (instantiation: Instantiation) => {
|
|
|
792
919
|
const definition = instantiation.getDefinition(key);
|
|
793
920
|
if (!definition) return key;
|
|
794
921
|
return instantiation.addDefinition(key, definition.name, () =>
|
|
795
|
-
withInstanceParams(definition, instantiation.params
|
|
922
|
+
withInstanceParams(definition, instantiation.params),
|
|
796
923
|
);
|
|
797
924
|
},
|
|
798
925
|
};
|
package/src/java-hash.ts
CHANGED
|
@@ -5,3 +5,17 @@ export const getJavaHashCode = (text: string): number => {
|
|
|
5
5
|
}
|
|
6
6
|
return hash;
|
|
7
7
|
};
|
|
8
|
+
|
|
9
|
+
const getHashMapHash = (text: string) => {
|
|
10
|
+
const hash = getJavaHashCode(text);
|
|
11
|
+
return hash ^ (hash >>> 16);
|
|
12
|
+
};
|
|
13
|
+
|
|
14
|
+
export const getHashMapOrder = (names: string[]) => {
|
|
15
|
+
const unique = [...new Set(names)];
|
|
16
|
+
const capacity = 2 ** Math.max(4, Math.ceil(Math.log2(unique.length / 0.75)));
|
|
17
|
+
return unique
|
|
18
|
+
.map((name, index) => ({ name, index, bucket: getHashMapHash(name) & (capacity - 1) }))
|
|
19
|
+
.sort((left, right) => left.bucket - right.bucket || left.index - right.index)
|
|
20
|
+
.map((entry) => entry.name);
|
|
21
|
+
};
|
package/src/java-overrides.ts
CHANGED
|
@@ -184,8 +184,8 @@ const readClassFile = (bytes: Uint8Array) => {
|
|
|
184
184
|
getJavaClassName(pool, thrown.readUint16()),
|
|
185
185
|
)
|
|
186
186
|
: [];
|
|
187
|
-
const modifiers = METHOD_MODIFIERS.filter((
|
|
188
|
-
(
|
|
187
|
+
const modifiers = METHOD_MODIFIERS.filter((entry) => (access & entry[0]) !== 0).map(
|
|
188
|
+
(entry) => entry[1],
|
|
189
189
|
);
|
|
190
190
|
const returnType = getTypeNames(descriptor.slice(parametersEnd + 1))[0];
|
|
191
191
|
const throwsClause = exceptions.length === 0 ? "" : ` throws ${exceptions.join(",")}`;
|