tla-ts 0.0.9 → 0.0.10-dev.06b481ee0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +30 -1
- package/dist/compile.cjs +23 -0
- package/dist/compile.js +23 -0
- package/dist/deciders.cjs +41 -37
- package/dist/deciders.js +48 -44
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +122 -12
- package/dist/index.d.ts +122 -12
- 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 +2746 -410
- package/dist/prove.js +2745 -409
- package/dist/run.cjs +144 -31
- package/dist/run.js +144 -31
- package/dist/tlapm.cjs +2 -2
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +134 -104
- package/dist/transfer.js +134 -104
- package/dist/worker.cjs +7 -7
- package/dist/worker.js +7 -7
- package/package.json +3 -1
- package/src/ast.ts +56 -60
- package/src/bags.ts +128 -110
- package/src/builtins.ts +31 -77
- package/src/bundled-modules.ts +1 -8
- package/src/check-failure.ts +118 -0
- package/src/check-trace.ts +320 -0
- package/src/check.ts +1156 -888
- package/src/cli/options.ts +12 -32
- package/src/cli/run.ts +0 -2
- package/src/cli/runtime-invariants.ts +100 -0
- package/src/cli/shared.ts +19 -12
- package/src/cli/tlapm.ts +433 -82
- package/src/cli/tlc-arguments.ts +652 -0
- package/src/cli/tlc-output.ts +701 -0
- package/src/cli/tlc-usage.ts +360 -0
- package/src/cli/tlc.ts +330 -659
- package/src/cli/typescript.ts +23 -0
- package/src/cli/xml-exporter.ts +27 -49
- package/src/cli.ts +0 -1
- package/src/codegen.ts +217 -82
- package/src/config.ts +140 -109
- package/src/coverage.ts +1019 -0
- package/src/dependencies.ts +101 -66
- package/src/dfid.ts +683 -0
- package/src/environment-config.ts +315 -0
- package/src/environment.ts +263 -370
- package/src/errors.ts +107 -57
- package/src/evaluate.ts +898 -369
- package/src/exit-codes.ts +63 -13
- package/src/fingerprints.ts +75 -11
- package/src/index.ts +3 -0
- package/src/instances.ts +137 -22
- package/src/java-hash.ts +21 -0
- package/src/java-overrides.ts +6 -21
- package/src/json-reader.ts +455 -0
- package/src/json.ts +252 -139
- package/src/levels.ts +231 -154
- package/src/lexer.ts +83 -101
- package/src/liveness-checker.ts +743 -322
- package/src/liveness.ts +230 -133
- package/src/obligations/action.ts +17 -44
- package/src/obligations/anonymize.ts +120 -95
- package/src/obligations/enabled-axioms.ts +218 -0
- package/src/obligations/equality.ts +1 -3
- package/src/obligations/expression.ts +37 -26
- package/src/obligations/format.ts +0 -10
- package/src/obligations/generate.ts +66 -64
- package/src/obligations/index.ts +39 -20
- package/src/obligations/levels.ts +27 -18
- package/src/obligations/module.ts +28 -55
- package/src/obligations/normalize.ts +31 -41
- package/src/obligations/operators.ts +0 -3
- package/src/obligations/pragma.ts +52 -24
- package/src/obligations/printer.ts +94 -63
- package/src/obligations/proof.ts +3 -6
- package/src/obligations/regroup.ts +0 -5
- package/src/obligations/simplify.ts +57 -63
- package/src/obligations/source.ts +121 -95
- package/src/obligations/subexpression.ts +49 -28
- package/src/obligations/substitution.ts +1 -5
- package/src/obligations/temporal.ts +12 -20
- package/src/obligations/tuples.ts +2 -10
- package/src/parallel-worker.ts +36 -60
- package/src/parallel.ts +64 -73
- package/src/parser.ts +1184 -531
- package/src/pcal/ast.ts +53 -86
- package/src/pcal/parse.ts +144 -219
- package/src/pcal/tokenize.ts +91 -131
- package/src/pcal/translate.ts +83 -130
- package/src/pcal/validate.ts +48 -68
- package/src/pretty-print.ts +7 -8
- package/src/prover/decide-pool.ts +8 -13
- package/src/prover/deciders.ts +12 -13
- package/src/prover/first-order.ts +0 -11
- package/src/prover/isabelle/decide.ts +3 -31
- package/src/prover/isabelle/encode.ts +82 -64
- package/src/prover/isabelle/isar/attrib.ts +250 -0
- package/src/prover/isabelle/isar/context.ts +335 -0
- package/src/prover/isabelle/isar/induct.ts +382 -0
- package/src/prover/isabelle/isar/inner-syntax.ts +262 -117
- package/src/prover/isabelle/isar/method.ts +510 -226
- package/src/prover/isabelle/isar/proof.ts +570 -23
- package/src/prover/isabelle/isar/rule-cases.ts +226 -0
- package/src/prover/isabelle/isar/theory.ts +488 -88
- package/src/prover/isabelle/isar/toplevel.ts +331 -0
- package/src/prover/isabelle/isar/type-check.ts +99 -38
- package/src/prover/isabelle/provers/blast/blast.ts +16 -105
- package/src/prover/isabelle/provers/blast/branch.ts +0 -33
- package/src/prover/isabelle/provers/blast/prove.ts +0 -36
- package/src/prover/isabelle/provers/blast/rules.ts +5 -45
- package/src/prover/isabelle/provers/blast/state.ts +1 -29
- package/src/prover/isabelle/provers/blast/term.ts +8 -37
- package/src/prover/isabelle/provers/clasimp.ts +1 -15
- package/src/prover/isabelle/provers/classical.ts +58 -61
- package/src/prover/isabelle/provers/hypsubst.ts +29 -54
- package/src/prover/isabelle/pure/bicompose.ts +24 -39
- package/src/prover/isabelle/pure/consts.ts +0 -8
- package/src/prover/isabelle/pure/conv.ts +2 -18
- package/src/prover/isabelle/pure/drule.ts +95 -45
- package/src/prover/isabelle/pure/envir.ts +2 -53
- package/src/prover/isabelle/pure/goal.ts +1 -9
- package/src/prover/isabelle/pure/interrupt.ts +0 -5
- package/src/prover/isabelle/pure/list.ts +0 -3
- package/src/prover/isabelle/pure/logic.ts +1 -16
- package/src/prover/isabelle/pure/name.ts +1 -10
- package/src/prover/isabelle/pure/net.ts +2 -60
- package/src/prover/isabelle/pure/object-logic.ts +15 -16
- package/src/prover/isabelle/pure/pattern.ts +1 -20
- package/src/prover/isabelle/pure/raw-simplifier.ts +16 -63
- package/src/prover/isabelle/pure/rewriter.ts +34 -77
- package/src/prover/isabelle/pure/search.ts +2 -11
- package/src/prover/isabelle/pure/seq.ts +0 -11
- package/src/prover/isabelle/pure/simplifier.ts +27 -16
- package/src/prover/isabelle/pure/table.ts +2 -33
- package/src/prover/isabelle/pure/tactic.ts +11 -23
- package/src/prover/isabelle/pure/tactical.ts +47 -48
- package/src/prover/isabelle/pure/term-ord.ts +1 -7
- package/src/prover/isabelle/pure/term.ts +4 -47
- package/src/prover/isabelle/pure/thm.ts +26 -48
- package/src/prover/isabelle/pure/type.ts +1 -16
- package/src/prover/isabelle/pure/unify.ts +19 -31
- package/src/prover/isabelle/pure/variable.ts +2 -8
- package/src/prover/isabelle/tla/classical-setup.ts +17 -25
- package/src/prover/isabelle/tla/context.ts +65 -26
- package/src/prover/isabelle/tla/logic-data.ts +1 -1
- package/src/prover/isabelle/tla/logic.ts +53 -32
- package/src/prover/isabelle/tla/simpdata.ts +45 -44
- package/src/prover/isabelle/tools/intuitionistic.ts +28 -21
- package/src/prover/ocaml.ts +4 -7
- package/src/prover/prep/action.ts +33 -66
- package/src/prover/prep/enabled-axioms.ts +22 -20
- package/src/prover/prep/fingerprint.ts +2 -21
- package/src/prover/prep/level-comparison.ts +8 -12
- package/src/prover/prep/md5.ts +26 -31
- package/src/prover/prep/methods.ts +189 -86
- package/src/prover/prep/normalize.ts +42 -37
- package/src/prover/prove-worker.ts +0 -2
- package/src/prover/prove.ts +398 -133
- package/src/prover/ptl/decide.ts +96 -56
- package/src/prover/ptl/encode.ts +15 -38
- package/src/prover/ptl/sat.ts +24 -32
- package/src/prover/ptl/tableau.ts +40 -28
- package/src/prover/smt/arithmetic.ts +310 -0
- package/src/prover/smt/axioms.ts +12 -15
- package/src/prover/smt/context.ts +60 -32
- package/src/prover/smt/data.ts +517 -401
- package/src/prover/smt/encode.ts +155 -85
- package/src/prover/smt/extensionality.ts +5 -13
- package/src/prover/smt/flatten.ts +7 -28
- package/src/prover/smt/format.ts +33 -14
- package/src/prover/smt/instances.ts +7 -11
- package/src/prover/smt/layout.ts +91 -0
- package/src/prover/smt/rewrite.ts +1021 -658
- package/src/prover/smt/simplify.ts +441 -0
- package/src/prover/smt/solver/ackermannize-bv-tactic.ts +61 -0
- package/src/prover/smt/solver/ackr-helper.ts +179 -0
- package/src/prover/smt/solver/ackr-model-converter.ts +105 -0
- package/src/prover/smt/solver/act-cache.ts +0 -16
- package/src/prover/smt/solver/add-bounds-tactic.ts +59 -0
- package/src/prover/smt/solver/aig-tactic.ts +52 -0
- package/src/prover/smt/solver/aig.ts +889 -0
- package/src/prover/smt/solver/arith-rewriter.ts +626 -56
- package/src/prover/smt/solver/arith-terms.ts +121 -0
- package/src/prover/smt/solver/array-decl-plugin.ts +175 -0
- package/src/prover/smt/solver/array-rewriter.ts +319 -0
- package/src/prover/smt/solver/array.ts +1 -3
- package/src/prover/smt/solver/asserted-formulas.ts +241 -99
- package/src/prover/smt/solver/ast-lt.ts +165 -21
- package/src/prover/smt/solver/ast-util.ts +160 -7
- package/src/prover/smt/solver/ast.ts +1480 -184
- package/src/prover/smt/solver/auf-solver.ts +30 -56
- package/src/prover/smt/solver/bit-blast-tactic.ts +608 -0
- package/src/prover/smt/solver/bit-blaster.ts +871 -0
- package/src/prover/smt/solver/blast-term-ite.ts +47 -0
- package/src/prover/smt/solver/bound-manager.ts +196 -0
- package/src/prover/smt/solver/bound-simplifier.ts +598 -0
- package/src/prover/smt/solver/bv-bound-chk.ts +492 -0
- package/src/prover/smt/solver/bv-decl-plugin.ts +341 -0
- package/src/prover/smt/solver/bv-divrem-bounds.ts +95 -0
- package/src/prover/smt/solver/bv-rewriter.ts +1901 -0
- package/src/prover/smt/solver/bv1-blast.ts +214 -0
- package/src/prover/smt/solver/bv2fpa-converter.ts +174 -0
- package/src/prover/smt/solver/bv2int-rewriter.ts +544 -0
- package/src/prover/smt/solver/bv2real-rewriter.ts +533 -0
- package/src/prover/smt/solver/card2bv.ts +127 -0
- package/src/prover/smt/solver/case-split-queue.ts +0 -10
- package/src/prover/smt/solver/cg-table.ts +39 -42
- package/src/prover/smt/solver/check-logic.ts +330 -0
- package/src/prover/smt/solver/clause.ts +0 -27
- package/src/prover/smt/solver/cofactor-elim-term-ite.ts +293 -0
- package/src/prover/smt/solver/conflict-resolution.ts +78 -11
- package/src/prover/smt/solver/context.ts +600 -187
- package/src/prover/smt/solver/ctx-simplify.ts +34 -52
- package/src/prover/smt/solver/ctx-solver-simplify.ts +122 -0
- package/src/prover/smt/solver/datatype-decl-plugin.ts +580 -0
- package/src/prover/smt/solver/datatype-rewriter.ts +82 -0
- package/src/prover/smt/solver/demodulator.ts +786 -0
- package/src/prover/smt/solver/dependent-expr-state.ts +93 -0
- package/src/prover/smt/solver/der.ts +39 -30
- package/src/prover/smt/solver/diff-neq.ts +205 -0
- package/src/prover/smt/solver/distribute-forall.ts +57 -0
- package/src/prover/smt/solver/dom-simplify.ts +511 -0
- package/src/prover/smt/solver/dt2bv-tactic.ts +296 -0
- package/src/prover/smt/solver/dyn-ack.ts +0 -11
- package/src/prover/smt/solver/e-matching.ts +9 -41
- package/src/prover/smt/solver/elim-bounds.ts +89 -0
- package/src/prover/smt/solver/elim-small-bv-tactic.ts +129 -0
- package/src/prover/smt/solver/elim-term-ite-tactic.ts +48 -0
- package/src/prover/smt/solver/elim-uncnstr.ts +542 -0
- package/src/prover/smt/solver/enode.ts +100 -23
- package/src/prover/smt/solver/eq2bv-tactic.ts +218 -0
- package/src/prover/smt/solver/euf/arith-axioms.ts +403 -0
- package/src/prover/smt/solver/euf/arith-internalize.ts +653 -0
- package/src/prover/smt/solver/euf/arith-solver.ts +889 -0
- package/src/prover/smt/solver/euf/array-axioms.ts +527 -0
- package/src/prover/smt/solver/euf/array-internalize.ts +428 -0
- package/src/prover/smt/solver/euf/array-solver.ts +306 -0
- package/src/prover/smt/solver/euf/bv-ackerman.ts +162 -0
- package/src/prover/smt/solver/euf/bv-internalize.ts +748 -0
- package/src/prover/smt/solver/euf/bv-solver.ts +449 -0
- package/src/prover/smt/solver/euf/dt-solver.ts +618 -0
- package/src/prover/smt/solver/euf/egraph.ts +901 -0
- package/src/prover/smt/solver/euf/euf-solver.ts +1204 -0
- package/src/prover/smt/solver/euf/fpa-solver.ts +317 -0
- package/src/prover/smt/solver/euf/mam.ts +1046 -0
- package/src/prover/smt/solver/euf/q-ematch.ts +829 -0
- package/src/prover/smt/solver/euf/q-mbi.ts +587 -0
- package/src/prover/smt/solver/euf/q-model-fixer.ts +296 -0
- package/src/prover/smt/solver/euf/q-solver.ts +361 -0
- package/src/prover/smt/solver/euf/th-solver.ts +328 -0
- package/src/prover/smt/solver/euf/th-solvers.ts +30 -0
- package/src/prover/smt/solver/expr-ref.ts +0 -5
- package/src/prover/smt/solver/expr-safe-replace.ts +26 -7
- package/src/prover/smt/solver/expr2polynomial.ts +271 -0
- package/src/prover/smt/solver/factor.ts +163 -0
- package/src/prover/smt/solver/fd-solver.ts +734 -0
- package/src/prover/smt/solver/fingerprints.ts +15 -26
- package/src/prover/smt/solver/fix-dl-var.ts +147 -0
- package/src/prover/smt/solver/flat-literals.ts +0 -9
- package/src/prover/smt/solver/fm-tactic.ts +884 -0
- package/src/prover/smt/solver/fpa-decl-plugin.ts +618 -0
- package/src/prover/smt/solver/fpa-rewriter.ts +639 -0
- package/src/prover/smt/solver/fpa2bv-converter.ts +2251 -0
- package/src/prover/smt/solver/fpa2bv-rewriter.ts +349 -0
- package/src/prover/smt/solver/fpa2bv-tactic.ts +73 -0
- package/src/prover/smt/solver/goal.ts +179 -28
- package/src/prover/smt/solver/goal2nlsat.ts +216 -0
- package/src/prover/smt/solver/guard-set.ts +219 -0
- package/src/prover/smt/solver/hash.ts +0 -9
- package/src/prover/smt/solver/hashtable.ts +30 -23
- package/src/prover/smt/solver/inf-eps.ts +63 -0
- package/src/prover/smt/solver/inj-axiom.ts +101 -0
- package/src/prover/smt/solver/internalizer.ts +113 -133
- package/src/prover/smt/solver/lackr.ts +381 -0
- package/src/prover/smt/solver/lbool.ts +0 -2
- package/src/prover/smt/solver/lia2card.ts +268 -0
- package/src/prover/smt/solver/lia2pb.ts +154 -0
- package/src/prover/smt/solver/literal.ts +0 -4
- package/src/prover/smt/solver/logic-tactics.ts +355 -0
- package/src/prover/smt/solver/lp/bound-propagator.ts +7 -26
- package/src/prover/smt/solver/lp/constraints.ts +1 -8
- package/src/prover/smt/solver/lp/containers.ts +18 -31
- package/src/prover/smt/solver/lp/core-solver.ts +35 -37
- package/src/prover/smt/solver/lp/cross-nested.ts +4 -21
- package/src/prover/smt/solver/lp/dep-intervals.ts +6 -24
- package/src/prover/smt/solver/lp/dependency.ts +0 -5
- package/src/prover/smt/solver/lp/dioph-eq.ts +8 -103
- package/src/prover/smt/solver/lp/explanation.ts +0 -6
- package/src/prover/smt/solver/lp/gomory.ts +8 -22
- package/src/prover/smt/solver/lp/hnf-cutter.ts +16 -23
- package/src/prover/smt/solver/lp/hnf.ts +10 -28
- package/src/prover/smt/solver/lp/int-cube.ts +17 -39
- package/src/prover/smt/solver/lp/int-solver.ts +3 -35
- package/src/prover/smt/solver/lp/lar-solver.ts +70 -83
- package/src/prover/smt/solver/lp/lar-term.ts +0 -5
- package/src/prover/smt/solver/lp/lp-settings.ts +6 -16
- package/src/prover/smt/solver/lp/maximize-term.ts +76 -52
- package/src/prover/smt/solver/lp/nex-creator.ts +7 -30
- package/src/prover/smt/solver/lp/nex.ts +2 -7
- package/src/prover/smt/solver/lp/nla-backoff.ts +0 -5
- package/src/prover/smt/solver/lp/nla-basics.ts +48 -30
- package/src/prover/smt/solver/lp/nla-core.ts +92 -136
- package/src/prover/smt/solver/lp/nla-divisions.ts +31 -43
- package/src/prover/smt/solver/lp/nla-emonics.ts +3 -21
- package/src/prover/smt/solver/lp/nla-factorization.ts +0 -4
- package/src/prover/smt/solver/lp/nla-grobner.ts +177 -149
- package/src/prover/smt/solver/lp/nla-horner.ts +2 -12
- package/src/prover/smt/solver/lp/nla-intervals.ts +1 -12
- package/src/prover/smt/solver/lp/nla-monomial-bounds.ts +15 -42
- package/src/prover/smt/solver/lp/nla-monotone.ts +1 -6
- package/src/prover/smt/solver/lp/nla-order.ts +0 -13
- package/src/prover/smt/solver/lp/nla-patcher.ts +3 -7
- package/src/prover/smt/solver/lp/nla-powers.ts +220 -0
- package/src/prover/smt/solver/lp/nla-tangents.ts +0 -10
- package/src/prover/smt/solver/lp/nla-throttle.ts +0 -6
- package/src/prover/smt/solver/lp/nla-transcendentals.ts +324 -0
- package/src/prover/smt/solver/lp/nla-types.ts +0 -12
- package/src/prover/smt/solver/lp/nla-var-eqs.ts +4 -26
- package/src/prover/smt/solver/lp/nra-solver.ts +164 -147
- package/src/prover/smt/solver/lp/numeric-pair.ts +0 -4
- package/src/prover/smt/solver/lp/pdd-interval.ts +6 -5
- package/src/prover/smt/solver/lp/pdd-simplifier.ts +61 -34
- package/src/prover/smt/solver/lp/pdd-solver.ts +74 -72
- package/src/prover/smt/solver/lp/pdd.ts +730 -358
- package/src/prover/smt/solver/lp/random-updater.ts +0 -9
- package/src/prover/smt/solver/lp/static-matrix.ts +8 -19
- package/src/prover/smt/solver/lp/union-find.ts +5 -5
- package/src/prover/smt/solver/macro-finder.ts +530 -0
- package/src/prover/smt/solver/mam-compiler.ts +129 -139
- package/src/prover/smt/solver/mam-interpreter.ts +0 -21
- package/src/prover/smt/solver/max-bv-sharing-tactic.ts +17 -0
- package/src/prover/smt/solver/max-cliques.ts +105 -0
- package/src/prover/smt/solver/maxcore.ts +310 -0
- package/src/prover/smt/solver/maximize-ac-sharing.ts +8 -21
- package/src/prover/smt/solver/maxlex.ts +115 -0
- package/src/prover/smt/solver/maxsmt-base.ts +106 -0
- package/src/prover/smt/solver/maxsmt.ts +92 -0
- package/src/prover/smt/solver/mbp/mbp-arith.ts +467 -0
- package/src/prover/smt/solver/mbp/mbp-basic-tg.ts +101 -0
- package/src/prover/smt/solver/mbp/mbp-plugin.ts +287 -0
- package/src/prover/smt/solver/mbp/mbp-qel.ts +48 -0
- package/src/prover/smt/solver/mbp/mbp-solve-plugin.ts +271 -0
- package/src/prover/smt/solver/mbp/mbp-term-graph.ts +606 -0
- package/src/prover/smt/solver/model-based-opt.ts +844 -0
- package/src/prover/smt/solver/model-checker.ts +20 -63
- package/src/prover/smt/solver/model-evaluator.ts +192 -40
- package/src/prover/smt/solver/model-finder.ts +14 -32
- package/src/prover/smt/solver/model-generator.ts +104 -46
- package/src/prover/smt/solver/model-macro-solver.ts +60 -114
- package/src/prover/smt/solver/model-printer.ts +214 -0
- package/src/prover/smt/solver/mpf.ts +709 -0
- package/src/prover/smt/solver/mus.ts +50 -0
- package/src/prover/smt/solver/muz/dl-context.ts +382 -0
- package/src/prover/smt/solver/muz/dl-mk-bit-blast.ts +97 -0
- package/src/prover/smt/solver/muz/dl-mk-coi-filter.ts +167 -0
- package/src/prover/smt/solver/muz/dl-mk-elim-term-ite.ts +125 -0
- package/src/prover/smt/solver/muz/dl-mk-interp-tail-simplifier.ts +299 -0
- package/src/prover/smt/solver/muz/dl-mk-rule-inliner.ts +455 -0
- package/src/prover/smt/solver/muz/dl-mk-slice.ts +340 -0
- package/src/prover/smt/solver/muz/dl-mk-subsumption-checker.ts +163 -0
- package/src/prover/smt/solver/muz/dl-rule-set.ts +273 -0
- package/src/prover/smt/solver/muz/dl-rule-transformer.ts +123 -0
- package/src/prover/smt/solver/muz/dl-rule.ts +495 -0
- package/src/prover/smt/solver/muz/hnf.ts +201 -0
- package/src/prover/smt/solver/muz/horn-subsume-model-converter.ts +176 -0
- package/src/prover/smt/solver/muz/horn-tactic.ts +214 -0
- package/src/prover/smt/solver/muz/rule-properties.ts +359 -0
- package/src/prover/smt/solver/muz/spacer-context.ts +1404 -0
- package/src/prover/smt/solver/muz/spacer-dl-interface.ts +52 -0
- package/src/prover/smt/solver/muz/spacer-generalizers.ts +241 -0
- package/src/prover/smt/solver/muz/spacer-manager.ts +127 -0
- package/src/prover/smt/solver/muz/spacer-pdr.ts +219 -0
- package/src/prover/smt/solver/muz/spacer-prop-solver.ts +333 -0
- package/src/prover/smt/solver/muz/spacer-util.ts +282 -0
- package/src/prover/smt/solver/muz/substitution.ts +203 -0
- package/src/prover/smt/solver/nla2bv-tactic.ts +285 -0
- package/src/prover/smt/solver/nlqsat.ts +484 -0
- package/src/prover/smt/solver/nlsat/algebraic.ts +357 -236
- package/src/prover/smt/solver/nlsat/atoms.ts +73 -54
- package/src/prover/smt/solver/nlsat/evaluator.ts +16 -22
- package/src/prover/smt/solver/nlsat/explain.ts +429 -275
- package/src/prover/smt/solver/nlsat/interval-set.ts +9 -51
- package/src/prover/smt/solver/nlsat/levelwise.ts +477 -344
- package/src/prover/smt/solver/nlsat/mpbq.ts +47 -14
- package/src/prover/smt/solver/nlsat/polynomial.ts +2385 -832
- package/src/prover/smt/solver/nlsat/solver.ts +297 -156
- package/src/prover/smt/solver/nlsat/transcendental-eval.ts +310 -0
- package/src/prover/smt/solver/nlsat/transcendentals.ts +391 -0
- package/src/prover/smt/solver/nlsat/types.ts +0 -9
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +9 -51
- package/src/prover/smt/solver/nlsat/upolynomial.ts +49 -109
- package/src/prover/smt/solver/nlsat-tactic.ts +82 -0
- package/src/prover/smt/solver/nnf.ts +112 -61
- package/src/prover/smt/solver/normalize-bounds.ts +53 -0
- package/src/prover/smt/solver/occf.ts +97 -0
- package/src/prover/smt/solver/opt-context.ts +801 -0
- package/src/prover/smt/solver/opt-nlsat.ts +386 -0
- package/src/prover/smt/solver/opt-pareto.ts +301 -0
- package/src/prover/smt/solver/opt-preprocess.ts +101 -0
- package/src/prover/smt/solver/opt-solver.ts +312 -0
- package/src/prover/smt/solver/opt-value.ts +55 -0
- package/src/prover/smt/solver/optsmt.ts +692 -0
- package/src/prover/smt/solver/parallel-tactic.ts +299 -0
- package/src/prover/smt/solver/pattern-inference.ts +21 -26
- package/src/prover/smt/solver/pb-rewriter.ts +281 -0
- package/src/prover/smt/solver/pb2bv-tactic.ts +540 -0
- package/src/prover/smt/solver/poly-rewriter.ts +261 -79
- package/src/prover/smt/solver/probes.ts +577 -0
- package/src/prover/smt/solver/propagate-values.ts +37 -30
- package/src/prover/smt/solver/proto-model.ts +650 -66
- package/src/prover/smt/solver/pull-quant.ts +28 -23
- package/src/prover/smt/solver/purify-arith.ts +632 -0
- package/src/prover/smt/solver/push-app-ite.ts +37 -0
- package/src/prover/smt/solver/qe-arith-plugin.ts +1096 -0
- package/src/prover/smt/solver/qe-lite-der.ts +2 -31
- package/src/prover/smt/solver/qe-lite-fm.ts +4 -28
- package/src/prover/smt/solver/qe-lite.ts +41 -51
- package/src/prover/smt/solver/qe-mbp.ts +270 -0
- package/src/prover/smt/solver/qe.ts +1499 -0
- package/src/prover/smt/solver/qel.ts +25 -0
- package/src/prover/smt/solver/qi-queue.ts +0 -16
- package/src/prover/smt/solver/qsat.ts +829 -0
- package/src/prover/smt/solver/quant-hoist.ts +196 -0
- package/src/prover/smt/solver/quant-tactics.ts +17 -74
- package/src/prover/smt/solver/quantifier-analyzer.ts +26 -47
- package/src/prover/smt/solver/quantifier-manager.ts +22 -32
- package/src/prover/smt/solver/quasi-macros.ts +243 -0
- package/src/prover/smt/solver/random-gen.ts +0 -2
- package/src/prover/smt/solver/rational.ts +45 -8
- package/src/prover/smt/solver/recfun-decl-plugin.ts +262 -0
- package/src/prover/smt/solver/recfun-rewriter.ts +107 -0
- package/src/prover/smt/solver/reduce-args.ts +225 -0
- package/src/prover/smt/solver/reduce-bv-size.ts +119 -0
- package/src/prover/smt/solver/ref-vector.ts +0 -6
- package/src/prover/smt/solver/relevancy.ts +2 -16
- package/src/prover/smt/solver/rewriter-tpl.ts +59 -135
- package/src/prover/smt/solver/rewriter.ts +507 -144
- package/src/prover/smt/solver/rlimit.ts +46 -24
- package/src/prover/smt/solver/sat/asymm-branch.ts +325 -0
- package/src/prover/smt/solver/sat/big.ts +177 -0
- package/src/prover/smt/solver/sat/clause-use-list.ts +71 -0
- package/src/prover/smt/solver/sat/clause.ts +203 -0
- package/src/prover/smt/solver/sat/cleaner.ts +94 -0
- package/src/prover/smt/solver/sat/config.ts +122 -0
- package/src/prover/smt/solver/sat/consequences.ts +203 -0
- package/src/prover/smt/solver/sat/elim-eqs.ts +142 -0
- package/src/prover/smt/solver/sat/goal2sat.ts +579 -0
- package/src/prover/smt/solver/sat/inc-sat-solver.ts +464 -0
- package/src/prover/smt/solver/sat/model-converter.ts +136 -0
- package/src/prover/smt/solver/sat/pb-constraint.ts +268 -0
- package/src/prover/smt/solver/sat/pb-solver.ts +1596 -0
- package/src/prover/smt/solver/sat/probing.ts +170 -0
- package/src/prover/smt/solver/sat/sat-tactic.ts +53 -0
- package/src/prover/smt/solver/sat/sat2goal.ts +189 -0
- package/src/prover/smt/solver/sat/scc.ts +142 -0
- package/src/prover/smt/solver/sat/simplifier.ts +1618 -0
- package/src/prover/smt/solver/sat/solver.ts +2107 -0
- package/src/prover/smt/solver/sat/var-queue.ts +117 -0
- package/src/prover/smt/solver/sat/watch-list.ts +140 -0
- package/src/prover/smt/solver/search-tree.ts +284 -0
- package/src/prover/smt/solver/seq-axioms.ts +995 -0
- package/src/prover/smt/solver/seq-decl-plugin.ts +819 -0
- package/src/prover/smt/solver/seq-derive.ts +1298 -0
- package/src/prover/smt/solver/seq-eq-approx.ts +236 -0
- package/src/prover/smt/solver/seq-eq-solver.ts +439 -0
- package/src/prover/smt/solver/seq-factory.ts +89 -0
- package/src/prover/smt/solver/seq-monadic.ts +730 -0
- package/src/prover/smt/solver/seq-range-predicate.ts +235 -0
- package/src/prover/smt/solver/seq-re-rewriter.ts +1171 -0
- package/src/prover/smt/solver/seq-re-util.ts +758 -0
- package/src/prover/smt/solver/seq-regex-bisim.ts +144 -0
- package/src/prover/smt/solver/seq-regex-live.ts +200 -0
- package/src/prover/smt/solver/seq-rewriter.ts +2404 -0
- package/src/prover/smt/solver/seq-skolem.ts +294 -0
- package/src/prover/smt/solver/seq-subset.ts +165 -0
- package/src/prover/smt/solver/seq-view-witness.ts +353 -0
- package/src/prover/smt/solver/smt-consequences.ts +297 -0
- package/src/prover/smt/solver/smt-kernel.ts +124 -0
- package/src/prover/smt/solver/smt-logics.ts +66 -0
- package/src/prover/smt/solver/smt-setup.ts +589 -0
- package/src/prover/smt/solver/smt2-printer.ts +765 -0
- package/src/prover/smt/solver/smtlib-parser.ts +3546 -406
- package/src/prover/smt/solver/smtlib-script.ts +2134 -0
- package/src/prover/smt/solver/solve-eqs.ts +928 -0
- package/src/prover/smt/solver/solver.ts +135 -40
- package/src/prover/smt/solver/sort.ts +1 -5
- package/src/prover/smt/solver/static-features.ts +314 -0
- package/src/prover/smt/solver/sticky-generations.ts +0 -6
- package/src/prover/smt/solver/tactic.ts +2141 -0
- package/src/prover/smt/solver/term-enumeration.ts +205 -0
- package/src/prover/smt/solver/theory-array.ts +1240 -0
- package/src/prover/smt/solver/theory-bv.ts +1210 -0
- package/src/prover/smt/solver/theory-char.ts +355 -0
- package/src/prover/smt/solver/theory-datatype.ts +598 -0
- package/src/prover/smt/solver/theory-finite-set.ts +30 -0
- package/src/prover/smt/solver/theory-fpa.ts +389 -0
- package/src/prover/smt/solver/theory-lra-axioms.ts +55 -25
- package/src/prover/smt/solver/theory-lra-bounds.ts +31 -11
- package/src/prover/smt/solver/theory-lra-final-check.ts +60 -91
- package/src/prover/smt/solver/theory-lra-internalize.ts +96 -53
- package/src/prover/smt/solver/theory-lra-model.ts +23 -53
- package/src/prover/smt/solver/theory-lra-propagate.ts +34 -42
- package/src/prover/smt/solver/theory-lra-state.ts +7 -28
- package/src/prover/smt/solver/theory-lra.ts +189 -9
- package/src/prover/smt/solver/theory-pb.ts +951 -0
- package/src/prover/smt/solver/theory-polymorphism.ts +58 -0
- package/src/prover/smt/solver/theory-recfun.ts +307 -0
- package/src/prover/smt/solver/theory-seq-regex.ts +867 -0
- package/src/prover/smt/solver/theory-seq-solve.ts +1373 -0
- package/src/prover/smt/solver/theory-seq-state.ts +852 -0
- package/src/prover/smt/solver/theory-seq.ts +961 -0
- package/src/prover/smt/solver/theory-without-terms.ts +24 -0
- package/src/prover/smt/solver/theory.ts +189 -0
- package/src/prover/smt/solver/tseitin-cnf.ts +486 -0
- package/src/prover/smt/solver/var-subst.ts +37 -39
- package/src/prover/smt/table.ts +3 -10
- package/src/prover/smt/types.ts +146 -0
- package/src/prover/tlapm/cache.ts +74 -48
- package/src/prover/tlapm/ocaml-marshal.ts +19 -21
- package/src/prover/tlapm/tlapm.ts +21 -20
- package/src/prover/tlapm-library.ts +3208 -0
- package/src/prover/verdict.ts +9 -2
- package/src/prover/zenon/check/check.ts +1 -11
- package/src/prover/zenon/check/definitions.ts +5 -15
- package/src/prover/zenon/check/equality.ts +0 -8
- package/src/prover/zenon/check/functions.ts +0 -4
- package/src/prover/zenon/check/keys.ts +0 -7
- package/src/prover/zenon/check/propositional.ts +0 -3
- package/src/prover/zenon/check/records.ts +1 -6
- package/src/prover/zenon/check/relations.ts +2 -14
- package/src/prover/zenon/check/rewrites.ts +2 -21
- package/src/prover/zenon/check/sets.ts +40 -61
- package/src/prover/zenon/check/terms.ts +1 -19
- package/src/prover/zenon/check/tla.ts +0 -6
- package/src/prover/zenon/decide.ts +10 -19
- package/src/prover/zenon/encode.ts +0 -9
- package/src/prover/zenon/eqrel.ts +2 -15
- package/src/prover/zenon/equality-rules.ts +24 -6
- package/src/prover/zenon/expr.ts +29 -28
- package/src/prover/zenon/index-table.ts +33 -61
- package/src/prover/zenon/isar-case.ts +9 -21
- package/src/prover/zenon/isar.ts +37 -67
- package/src/prover/zenon/limits.ts +0 -4
- package/src/prover/zenon/llproof.ts +2 -22
- package/src/prover/zenon/mltoll.ts +66 -106
- package/src/prover/zenon/node.ts +20 -15
- package/src/prover/zenon/ocaml.ts +1 -17
- package/src/prover/zenon/parse.ts +9 -13
- package/src/prover/zenon/phrase.ts +2 -14
- package/src/prover/zenon/proof.ts +0 -11
- package/src/prover/zenon/propositional-rules.ts +0 -7
- package/src/prover/zenon/rules.ts +3 -8
- package/src/prover/zenon/search.ts +11 -35
- package/src/prover/zenon/tla/functions.ts +59 -33
- package/src/prover/zenon/tla/llproof.ts +67 -78
- package/src/prover/zenon/tla/records.ts +57 -35
- package/src/prover/zenon/tla/rewrites.ts +12 -21
- package/src/prover/zenon/tla/sets.ts +88 -59
- package/src/prover/zenon/tla/terms.ts +0 -8
- package/src/prover/zenon/tla/tla.ts +66 -66
- package/src/randomization.ts +81 -35
- package/src/resolve.ts +1132 -430
- package/src/runtime.ts +33 -23
- package/src/sany/builtins.ts +11 -14
- package/src/sany/generation.ts +383 -0
- package/src/sany/generator-def-entries.ts +210 -0
- package/src/sany/generator-definitions.ts +688 -0
- package/src/sany/generator-expressions.ts +1108 -0
- package/src/sany/generator-proofs.ts +665 -0
- package/src/sany/generator.ts +192 -2764
- package/src/sany/levels.ts +5 -35
- package/src/sany/lexer.ts +61 -80
- package/src/sany/linter.ts +0 -10
- package/src/sany/modules.ts +5 -7
- package/src/sany/nodes.ts +6 -44
- package/src/sany/parse-error.ts +39 -117
- package/src/sany/report.ts +32 -69
- package/src/sany/selectors.ts +60 -82
- package/src/sany/source.ts +1 -17
- package/src/sany/xml.ts +37 -120
- package/src/search.ts +913 -227
- package/src/simulate.ts +765 -0
- package/src/spec-description.ts +198 -104
- package/src/standard-definitions.ts +4 -4
- package/src/standard-modules.ts +302 -99
- package/src/state-graph.ts +52 -33
- package/src/subexpressions.ts +578 -166
- package/src/substitution-levels.ts +7 -7
- package/src/successors.ts +299 -108
- package/src/symmetry.ts +37 -28
- package/src/tableau.ts +29 -26
- package/src/tlc/fingerprint.ts +267 -79
- package/src/tlc/jar-data.ts +122 -6
- package/src/tlc/messages.ts +127 -56
- package/src/tlc/order.ts +53 -72
- package/src/tlc/random.ts +38 -49
- package/src/tlc/replay.ts +579 -230
- package/src/tlc/summary.ts +64 -60
- package/src/tlc/tlc-operators.ts +83 -47
- package/src/tlc/tlcext-operators.ts +205 -127
- package/src/tlc/trace-spec.ts +235 -0
- package/src/tlc/value-stream.ts +139 -0
- package/src/tlc/version.ts +1 -4
- package/src/trace-liveness.ts +529 -0
- package/src/transfer.ts +22 -25
- package/src/typed-tier.ts +6556 -0
- package/src/typescript/actions.ts +479 -0
- package/src/typescript/collections.ts +614 -0
- package/src/typescript/compile.ts +63 -0
- package/src/typescript/context.ts +94 -0
- package/src/typescript/emit.ts +121 -0
- package/src/typescript/expressions.ts +496 -0
- package/src/typescript/formula.ts +154 -0
- package/src/typescript/functions.ts +284 -0
- package/src/typescript/model.ts +162 -0
- package/src/typescript/names.ts +114 -0
- package/src/typescript/program.ts +48 -0
- package/src/typescript/properties.ts +139 -0
- package/src/typescript/scope.ts +112 -0
- package/src/typescript/steps.ts +167 -0
- package/src/typescript/types.ts +171 -0
- package/src/values.ts +945 -526
- package/src/worker.ts +7 -8
- package/src/prover/isabelle/isar/statement.ts +0 -57
- package/src/prover/smt/solver/z3-license.txt +0 -10
- package/src/prover/tlaps-module.ts +0 -510
- package/src/prover/zenon/LICENSE +0 -32
package/src/exit-codes.ts
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import type { LivenessChecker } from "./liveness-checker";
|
|
1
|
+
import type { LivenessChecker, LivenessChecks } from "./liveness-checker";
|
|
2
2
|
|
|
3
|
-
// TLC's exit statuses, from EC.ExitStatus.
|
|
4
3
|
export const EXIT_STATUS = {
|
|
5
4
|
success: 0,
|
|
5
|
+
abort: 1,
|
|
6
6
|
assumptionViolation: 10,
|
|
7
7
|
deadlock: 11,
|
|
8
8
|
safetyViolation: 12,
|
|
@@ -16,9 +16,45 @@ export const EXIT_STATUS = {
|
|
|
16
16
|
error: 255,
|
|
17
17
|
} as const;
|
|
18
18
|
|
|
19
|
+
const MESSAGE_EXIT_STATUSES = new Map<number, number>([
|
|
20
|
+
...[
|
|
21
|
+
...Array.from({ length: 24 }, (_value, index) => 2222 + index),
|
|
22
|
+
2272,
|
|
23
|
+
2273,
|
|
24
|
+
2274,
|
|
25
|
+
2280,
|
|
26
|
+
2281,
|
|
27
|
+
...Array.from({ length: 7 }, (_value, index) => 5001 + index),
|
|
28
|
+
].map((code): [number, number] => [code, EXIT_STATUS.configParseError]),
|
|
29
|
+
[2253, EXIT_STATUS.livenessEvaluationFailure],
|
|
30
|
+
[2109, EXIT_STATUS.specEvaluationFailure],
|
|
31
|
+
[2115, EXIT_STATUS.specEvaluationFailure],
|
|
32
|
+
[2103, EXIT_STATUS.specEvaluationFailure],
|
|
33
|
+
[2147, EXIT_STATUS.specEvaluationFailure],
|
|
34
|
+
[2111, EXIT_STATUS.safetyEvaluationFailure],
|
|
35
|
+
[2146, EXIT_STATUS.safetyEvaluationFailure],
|
|
36
|
+
[2107, EXIT_STATUS.safetyViolation],
|
|
37
|
+
[2110, EXIT_STATUS.safetyViolation],
|
|
38
|
+
[2112, EXIT_STATUS.livenessViolation],
|
|
39
|
+
[2113, EXIT_STATUS.livenessViolation],
|
|
40
|
+
[2116, EXIT_STATUS.livenessViolation],
|
|
41
|
+
[2108, EXIT_STATUS.livenessViolation],
|
|
42
|
+
[2114, EXIT_STATUS.deadlock],
|
|
43
|
+
[2104, EXIT_STATUS.assumptionViolation],
|
|
44
|
+
[2105, EXIT_STATUS.assumptionViolation],
|
|
45
|
+
[2404, EXIT_STATUS.assumptionViolation],
|
|
46
|
+
[2405, EXIT_STATUS.assumptionViolation],
|
|
47
|
+
[2780, EXIT_STATUS.assumptionViolation],
|
|
48
|
+
[2132, EXIT_STATUS.assertViolation],
|
|
49
|
+
[2171, EXIT_STATUS.specParseError],
|
|
50
|
+
[3002, EXIT_STATUS.specParseError],
|
|
51
|
+
]);
|
|
52
|
+
|
|
53
|
+
export const getMessageExitStatus = (code: number) =>
|
|
54
|
+
MESSAGE_EXIT_STATUSES.get(code) ?? EXIT_STATUS.error;
|
|
55
|
+
|
|
19
56
|
const exitCodes = new WeakMap<Error, number>();
|
|
20
57
|
|
|
21
|
-
// The innermost site that knows TLC's exit status for an error sets it first and wins.
|
|
22
58
|
export const setExitCode = <Thrown>(error: Thrown, code: number) => {
|
|
23
59
|
if (error instanceof Error && !exitCodes.has(error)) exitCodes.set(error, code);
|
|
24
60
|
return error;
|
|
@@ -26,7 +62,6 @@ export const setExitCode = <Thrown>(error: Thrown, code: number) => {
|
|
|
26
62
|
|
|
27
63
|
export const getExitCode = (error: Error) => exitCodes.get(error);
|
|
28
64
|
|
|
29
|
-
// TLC exits with 255 when it fails to process or evaluate a liveness property, in any phase.
|
|
30
65
|
const withErrorExitCode = <Result>(run: () => Result) => {
|
|
31
66
|
try {
|
|
32
67
|
return run();
|
|
@@ -35,20 +70,35 @@ const withErrorExitCode = <Result>(run: () => Result) => {
|
|
|
35
70
|
}
|
|
36
71
|
};
|
|
37
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
|
+
|
|
38
86
|
export const withLivenessExitCode = (
|
|
39
87
|
create: () => LivenessChecker | undefined,
|
|
40
88
|
): LivenessChecker | undefined => {
|
|
41
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);
|
|
42
97
|
return (
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
withErrorExitCode(() =>
|
|
47
|
-
addState: (index, state, successors, tracing) =>
|
|
48
|
-
withErrorExitCode(() => checker.addState(index, state, successors, tracing)),
|
|
49
|
-
findViolation: () => withErrorExitCode(() => checker.findViolation()),
|
|
50
|
-
getViolatedProperties: (path, cycleStart) =>
|
|
51
|
-
withErrorExitCode(() => checker.getViolatedProperties(path, cycleStart)),
|
|
98
|
+
checks && {
|
|
99
|
+
solutions: checks.solutions,
|
|
100
|
+
findTraceViolation: (trace, fingerprints) =>
|
|
101
|
+
withErrorExitCode(() => checks.findTraceViolation(trace, fingerprints)),
|
|
52
102
|
}
|
|
53
103
|
);
|
|
54
104
|
};
|
package/src/fingerprints.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { getValueFingerprint, getValueHash, type Value } from "./values";
|
|
1
|
+
import { combineHash, getValueFingerprint, getValueHash, isSameValue, type Value } from "./values";
|
|
2
2
|
|
|
3
3
|
const EMPTY = 0;
|
|
4
4
|
const INITIAL_CAPACITY = 1 << 12;
|
|
@@ -25,7 +25,8 @@ export const writeStateFingerprint = (state: Value[], fingerprint: Int32Array) =
|
|
|
25
25
|
};
|
|
26
26
|
|
|
27
27
|
export const createFingerprintTable = (): FingerprintTable => {
|
|
28
|
-
|
|
28
|
+
let tableSlots = new Int32Array(INITIAL_CAPACITY * 2);
|
|
29
|
+
let used = 0;
|
|
29
30
|
const findSlot = (slots: Int32Array, first: number, second: number) => {
|
|
30
31
|
const mask = slots.length / 2 - 1;
|
|
31
32
|
for (let index = first & mask; ; index = (index + 1) & mask) {
|
|
@@ -35,7 +36,7 @@ export const createFingerprintTable = (): FingerprintTable => {
|
|
|
35
36
|
}
|
|
36
37
|
};
|
|
37
38
|
const grow = () => {
|
|
38
|
-
const previous =
|
|
39
|
+
const previous = tableSlots;
|
|
39
40
|
const slots = new Int32Array(previous.length * 2);
|
|
40
41
|
for (let index = 0; index < previous.length; index += 2) {
|
|
41
42
|
if (previous[index] === EMPTY) continue;
|
|
@@ -43,22 +44,85 @@ export const createFingerprintTable = (): FingerprintTable => {
|
|
|
43
44
|
slots[slot * 2] = previous[index];
|
|
44
45
|
slots[slot * 2 + 1] = previous[index + 1];
|
|
45
46
|
}
|
|
46
|
-
|
|
47
|
+
tableSlots = slots;
|
|
47
48
|
};
|
|
48
49
|
return {
|
|
49
50
|
insert: (first, second) => {
|
|
50
|
-
if (
|
|
51
|
-
const slot = findSlot(
|
|
52
|
-
if (
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
51
|
+
if (used * 4 >= tableSlots.length) grow();
|
|
52
|
+
const slot = findSlot(tableSlots, first, second);
|
|
53
|
+
if (tableSlots[slot * 2] === first) return false;
|
|
54
|
+
tableSlots[slot * 2] = first;
|
|
55
|
+
tableSlots[slot * 2 + 1] = second;
|
|
56
|
+
used++;
|
|
56
57
|
return true;
|
|
57
58
|
},
|
|
58
59
|
};
|
|
59
60
|
};
|
|
60
61
|
|
|
61
|
-
|
|
62
|
+
export interface StateTable {
|
|
63
|
+
slots: Int32Array;
|
|
64
|
+
size: number;
|
|
65
|
+
shift: number;
|
|
66
|
+
states: Value[][];
|
|
67
|
+
}
|
|
68
|
+
|
|
69
|
+
// A Map holds at most 2^24 entries, so an open-addressing table keeps each hash and index + 1.
|
|
70
|
+
export const createStateTable = (states: Value[][]): StateTable => ({
|
|
71
|
+
slots: new Int32Array(1 << 17),
|
|
72
|
+
size: 0,
|
|
73
|
+
shift: 16,
|
|
74
|
+
states,
|
|
75
|
+
});
|
|
76
|
+
|
|
77
|
+
export const getStateHash = (state: Value[]) => {
|
|
78
|
+
let hash = 0x811c9dc5;
|
|
79
|
+
for (let index = 0; index < state.length; index++)
|
|
80
|
+
hash = combineHash(hash, getValueHash(state[index]));
|
|
81
|
+
return hash & 0x3fffffff;
|
|
82
|
+
};
|
|
83
|
+
|
|
84
|
+
export const isSameState = (stored: Value[], state: Value[]) => {
|
|
85
|
+
for (let position = 0; position < state.length; position++) {
|
|
86
|
+
if (!isSameValue(stored[position], state[position])) return false;
|
|
87
|
+
}
|
|
88
|
+
return true;
|
|
89
|
+
};
|
|
90
|
+
|
|
91
|
+
const getSlot = (table: StateTable, hash: number) =>
|
|
92
|
+
(Math.imul(hash, 0x9e3779b1) >>> table.shift) << 1;
|
|
93
|
+
|
|
94
|
+
export const findStateIndex = (table: StateTable, hash: number, state: Value[]) => {
|
|
95
|
+
const mask = table.slots.length - 1;
|
|
96
|
+
for (let slot = getSlot(table, hash); ; slot = (slot + 2) & mask) {
|
|
97
|
+
const entry = table.slots[slot + 1];
|
|
98
|
+
if (entry === 0) return -1;
|
|
99
|
+
if (table.slots[slot] === hash && isSameState(table.states[entry - 1], state)) {
|
|
100
|
+
return entry - 1;
|
|
101
|
+
}
|
|
102
|
+
}
|
|
103
|
+
};
|
|
104
|
+
|
|
105
|
+
const insertSeenState = (table: StateTable, hash: number, entry: number) => {
|
|
106
|
+
const mask = table.slots.length - 1;
|
|
107
|
+
let slot = getSlot(table, hash);
|
|
108
|
+
while (table.slots[slot + 1] !== 0) slot = (slot + 2) & mask;
|
|
109
|
+
table.slots[slot] = hash;
|
|
110
|
+
table.slots[slot + 1] = entry;
|
|
111
|
+
};
|
|
112
|
+
|
|
113
|
+
export const markSeenState = (table: StateTable, hash: number, index: number) => {
|
|
114
|
+
table.size++;
|
|
115
|
+
if (table.size * 4 > table.slots.length) {
|
|
116
|
+
const slots = table.slots;
|
|
117
|
+
table.slots = new Int32Array(slots.length * 2);
|
|
118
|
+
table.shift--;
|
|
119
|
+
for (let slot = 0; slot < slots.length; slot += 2) {
|
|
120
|
+
if (slots[slot + 1] !== 0) insertSeenState(table, slots[slot], slots[slot + 1]);
|
|
121
|
+
}
|
|
122
|
+
}
|
|
123
|
+
insertSeenState(table, hash, index + 1);
|
|
124
|
+
};
|
|
125
|
+
|
|
62
126
|
export interface SharedFingerprints {
|
|
63
127
|
slots: BigInt64Array;
|
|
64
128
|
used: Int32Array;
|
package/src/index.ts
CHANGED
|
@@ -4,10 +4,13 @@ export type {
|
|
|
4
4
|
CheckResult,
|
|
5
5
|
CheckStatus,
|
|
6
6
|
EvaluationFailure,
|
|
7
|
+
ModuleOperator,
|
|
8
|
+
TraceSpecOptions,
|
|
7
9
|
TraceStep,
|
|
8
10
|
Violation,
|
|
9
11
|
} from "./check";
|
|
10
12
|
export { parseConfig } from "./config";
|
|
13
|
+
export type { CoverageReport } from "./coverage";
|
|
11
14
|
export type { ConfigValue, ConstantAssignment, ModelConfig, Substitution } from "./config";
|
|
12
15
|
export {
|
|
13
16
|
TlaConfigError,
|
package/src/instances.ts
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import {
|
|
2
2
|
getChildren,
|
|
3
|
+
getReferencedName,
|
|
3
4
|
isLocallyResolved,
|
|
4
5
|
type Bound,
|
|
5
6
|
type BoundPattern,
|
|
@@ -14,12 +15,18 @@ import {
|
|
|
14
15
|
import { TlaSyntaxError } from "./errors";
|
|
15
16
|
import { getArity, getBoundNames, getPatternNames, isBefore, LOCAL_RESOLUTION } from "./resolve";
|
|
16
17
|
|
|
17
|
-
export const substitutedExpressions = new WeakSet<Expression>();
|
|
18
|
-
|
|
19
|
-
// Applications inside an instance with substitutions or parameters, which TLC evaluates in a
|
|
20
|
-
// context that binds them.
|
|
21
18
|
export const contextualApplications = new WeakSet<Expression>();
|
|
22
19
|
|
|
20
|
+
export const substitutionFrames = new WeakMap<Expression, Expression[]>();
|
|
21
|
+
|
|
22
|
+
export const withSubstitutionFrames = (expression: Expression, frames: Expression[]) => {
|
|
23
|
+
if (frames.length === 0) return expression;
|
|
24
|
+
const copy = { ...expression };
|
|
25
|
+
if (contextualApplications.has(expression)) contextualApplications.add(copy);
|
|
26
|
+
substitutionFrames.set(copy, [...frames, ...(substitutionFrames.get(expression) ?? [])]);
|
|
27
|
+
return copy;
|
|
28
|
+
};
|
|
29
|
+
|
|
23
30
|
export const renameLocals = (
|
|
24
31
|
expression: Expression,
|
|
25
32
|
names: Map<string, string>,
|
|
@@ -38,6 +45,9 @@ export const renameLocals = (
|
|
|
38
45
|
if (mapped.kind === "Apply" && isLocallyResolved(mapped) && !bound.has(mapped.operator)) {
|
|
39
46
|
return { ...mapped, operator: names.get(mapped.operator) ?? mapped.operator };
|
|
40
47
|
}
|
|
48
|
+
if (mapped.kind === "OperatorReference" && !bound.has(mapped.operator)) {
|
|
49
|
+
return { ...mapped, operator: names.get(mapped.operator) ?? mapped.operator };
|
|
50
|
+
}
|
|
41
51
|
return mapped;
|
|
42
52
|
};
|
|
43
53
|
|
|
@@ -209,6 +219,8 @@ export const mapChildren = (
|
|
|
209
219
|
};
|
|
210
220
|
case "Label":
|
|
211
221
|
return { ...expression, body: mapUnbound(expression.body) };
|
|
222
|
+
case "Selection":
|
|
223
|
+
return { ...expression, expression: mapUnbound(expression.expression) };
|
|
212
224
|
case "Subexpression":
|
|
213
225
|
return {
|
|
214
226
|
...expression,
|
|
@@ -219,17 +231,28 @@ export const mapChildren = (
|
|
|
219
231
|
}
|
|
220
232
|
};
|
|
221
233
|
|
|
234
|
+
export const forEachChild = (
|
|
235
|
+
expression: Expression,
|
|
236
|
+
visit: (child: Expression, bound: string[]) => void,
|
|
237
|
+
): void => {
|
|
238
|
+
mapChildren(expression, (child, bound) => {
|
|
239
|
+
visit(child, bound);
|
|
240
|
+
return child;
|
|
241
|
+
});
|
|
242
|
+
};
|
|
243
|
+
|
|
222
244
|
interface Instantiation {
|
|
223
245
|
params: OperatorParam[];
|
|
224
246
|
substitutions: Map<string, Expression>;
|
|
225
247
|
variables: Set<string>;
|
|
226
248
|
getDefinition: (key: string) => Definition | undefined;
|
|
249
|
+
getOuterDefinition: (name: string) => Definition | undefined;
|
|
227
250
|
isParameterized: (key: string) => boolean;
|
|
228
251
|
addDefinition: (source: string, name: string, create: (key: string) => Definition) => string;
|
|
229
252
|
createName: (name: string) => string;
|
|
253
|
+
frame?: Expression;
|
|
230
254
|
}
|
|
231
255
|
|
|
232
|
-
// LAMBDA is a keyword, so no name bound inside the instance can capture it.
|
|
233
256
|
const LAMBDA_NAME = "LAMBDA";
|
|
234
257
|
|
|
235
258
|
type RewriteMode = "Normal" | "Enabled" | "Primed";
|
|
@@ -240,22 +263,44 @@ interface Rewrite {
|
|
|
240
263
|
copies: Map<string, string>;
|
|
241
264
|
mode: RewriteMode;
|
|
242
265
|
modes: Map<RewriteMode, Rewrite>;
|
|
266
|
+
bindings?: Map<string, Expression>;
|
|
267
|
+
selections: Map<Expression, Expression>;
|
|
243
268
|
}
|
|
244
269
|
|
|
270
|
+
const getSubstitutionName = (name: string) => `${name}@SUBSTITUTION`;
|
|
271
|
+
|
|
272
|
+
const isVariableAlias = (expression: Expression): boolean =>
|
|
273
|
+
expression.kind === "Identifier" ||
|
|
274
|
+
(expression.kind === "Tuple" && expression.elements.every(isVariableAlias));
|
|
275
|
+
|
|
276
|
+
const isBoundOnce = (replacement: Expression, instantiation: Instantiation) => {
|
|
277
|
+
if (replacement.kind !== "Identifier") {
|
|
278
|
+
return (
|
|
279
|
+
!isVariableAlias(replacement) &&
|
|
280
|
+
replacement.kind !== "OperatorReference" &&
|
|
281
|
+
replacement.kind !== "Lambda" &&
|
|
282
|
+
replacement.kind !== "Number" &&
|
|
283
|
+
replacement.kind !== "String"
|
|
284
|
+
);
|
|
285
|
+
}
|
|
286
|
+
const definition = isLocallyResolved(replacement)
|
|
287
|
+
? undefined
|
|
288
|
+
: instantiation.getOuterDefinition(replacement.name);
|
|
289
|
+
return (
|
|
290
|
+
definition?.kind === "Operator" &&
|
|
291
|
+
definition.params.length === 0 &&
|
|
292
|
+
!isVariableAlias(definition.body)
|
|
293
|
+
);
|
|
294
|
+
};
|
|
295
|
+
|
|
245
296
|
const getFreeNames = (expression: Expression, bound = new Set<string>()): string[] => {
|
|
246
|
-
const name =
|
|
247
|
-
expression.kind === "Identifier"
|
|
248
|
-
? expression.name
|
|
249
|
-
: expression.kind === "Apply" || expression.kind === "OperatorReference"
|
|
250
|
-
? expression.operator
|
|
251
|
-
: undefined;
|
|
297
|
+
const name = getReferencedName(expression);
|
|
252
298
|
const names = name === undefined || bound.has(name) ? [] : [name];
|
|
253
|
-
|
|
299
|
+
forEachChild(expression, (child, childBound) =>
|
|
254
300
|
names.push(
|
|
255
301
|
...getFreeNames(child, childBound.length === 0 ? bound : new Set([...bound, ...childBound])),
|
|
256
|
-
)
|
|
257
|
-
|
|
258
|
-
});
|
|
302
|
+
),
|
|
303
|
+
);
|
|
259
304
|
return names;
|
|
260
305
|
};
|
|
261
306
|
|
|
@@ -450,13 +495,37 @@ export const createLocalIdentifier = (name: string, location: SourceLocation): E
|
|
|
450
495
|
export const createLocalArguments = (params: OperatorParam[], location: SourceLocation) =>
|
|
451
496
|
params.map((param) => createLocalIdentifier(param.name, location));
|
|
452
497
|
|
|
498
|
+
export const createLocalAlias = (
|
|
499
|
+
name: string,
|
|
500
|
+
key: string,
|
|
501
|
+
params: OperatorParam[],
|
|
502
|
+
forwarded: OperatorParam[],
|
|
503
|
+
location: SourceLocation,
|
|
504
|
+
): Definition => ({
|
|
505
|
+
kind: "Operator",
|
|
506
|
+
name,
|
|
507
|
+
params,
|
|
508
|
+
body:
|
|
509
|
+
forwarded.length === 0
|
|
510
|
+
? { kind: "Identifier", name: key, location }
|
|
511
|
+
: {
|
|
512
|
+
kind: "Apply",
|
|
513
|
+
operator: key,
|
|
514
|
+
args: createLocalArguments(forwarded, location),
|
|
515
|
+
location,
|
|
516
|
+
},
|
|
517
|
+
isLocal: true,
|
|
518
|
+
isRecursive: false,
|
|
519
|
+
location,
|
|
520
|
+
});
|
|
521
|
+
|
|
453
522
|
const getInstanceOperator = (
|
|
454
523
|
key: string,
|
|
455
524
|
params: OperatorParam[],
|
|
456
525
|
arity: number,
|
|
457
526
|
location: SourceLocation,
|
|
458
527
|
): Expression => {
|
|
459
|
-
const names = Array.from({ length: arity }, (
|
|
528
|
+
const names = Array.from({ length: arity }, (_value, index) => `argument${index}`);
|
|
460
529
|
return {
|
|
461
530
|
kind: "Lambda",
|
|
462
531
|
params: names,
|
|
@@ -482,6 +551,12 @@ const substitute = (
|
|
|
482
551
|
bound: Map<string, string>,
|
|
483
552
|
): Expression => {
|
|
484
553
|
const recurse = (node: Expression) => substitute(node, rewrite, bound);
|
|
554
|
+
if (expression.kind === "Selection" && [...bound].every((entry) => entry[0] === entry[1])) {
|
|
555
|
+
const selected = expression.expression;
|
|
556
|
+
const substituted = rewrite.selections.get(selected) ?? recurse(selected);
|
|
557
|
+
rewrite.selections.set(selected, substituted);
|
|
558
|
+
return { ...expression, expression: substituted };
|
|
559
|
+
}
|
|
485
560
|
const instantiation = rewrite.instantiation;
|
|
486
561
|
const params = instantiation.params;
|
|
487
562
|
const isFree = (name: string) => !bound.has(name) && !isLocallyResolved(expression);
|
|
@@ -515,9 +590,14 @@ const substitute = (
|
|
|
515
590
|
if (enabled) return enabled;
|
|
516
591
|
if (expression.kind === "Identifier" && isFree(expression.name)) {
|
|
517
592
|
const replacement = instantiation.substitutions.get(expression.name);
|
|
518
|
-
|
|
519
|
-
|
|
520
|
-
return replacement;
|
|
593
|
+
const bindings = rewrite.bindings;
|
|
594
|
+
if (replacement && (bindings === undefined || !isBoundOnce(replacement, instantiation))) {
|
|
595
|
+
return withSubstitutionFrames(replacement, [expression]);
|
|
596
|
+
}
|
|
597
|
+
if (replacement && bindings) {
|
|
598
|
+
const name = getSubstitutionName(expression.name);
|
|
599
|
+
bindings.set(name, replacement);
|
|
600
|
+
return createLocalIdentifier(name, expression.location);
|
|
521
601
|
}
|
|
522
602
|
const copy = getCopy(rewrite, expression.name);
|
|
523
603
|
if (copy === undefined) return expression;
|
|
@@ -598,6 +678,14 @@ const substitute = (
|
|
|
598
678
|
};
|
|
599
679
|
}
|
|
600
680
|
if (expression.kind === "OperatorReference" && isFree(expression.operator)) {
|
|
681
|
+
const replacement = instantiation.substitutions.get(expression.operator);
|
|
682
|
+
if (
|
|
683
|
+
replacement?.kind === "Identifier" ||
|
|
684
|
+
replacement?.kind === "OperatorReference" ||
|
|
685
|
+
replacement?.kind === "Lambda"
|
|
686
|
+
) {
|
|
687
|
+
return withSubstitutionFrames(replacement, [expression]);
|
|
688
|
+
}
|
|
601
689
|
const copy = getCopy(rewrite, expression.operator);
|
|
602
690
|
if (copy === undefined) return expression;
|
|
603
691
|
const definition = instantiation.getDefinition(expression.operator);
|
|
@@ -649,13 +737,40 @@ const copyDefinition = (rewrite: Rewrite, key: string): string => {
|
|
|
649
737
|
return instantiation.addDefinition(key, definition.name, (copyKey) => {
|
|
650
738
|
rewrite.copies.set(key, copyKey);
|
|
651
739
|
const rename = createRenamer(rewrite);
|
|
740
|
+
const bindings = new Map<string, Expression>();
|
|
741
|
+
const bodyRewrite =
|
|
742
|
+
definition.kind === "Operator" && rewrite.mode === "Normal"
|
|
743
|
+
? { ...rewrite, bindings, selections: new Map<Expression, Expression>() }
|
|
744
|
+
: rewrite;
|
|
652
745
|
const mapped = renameParams(
|
|
653
746
|
mapDefinition(definition, (child, bound) =>
|
|
654
|
-
substitute(child,
|
|
747
|
+
substitute(child, bodyRewrite, bindNames(new Map(), bound, rename)),
|
|
655
748
|
),
|
|
656
749
|
rename,
|
|
657
750
|
);
|
|
658
|
-
|
|
751
|
+
const body: Expression =
|
|
752
|
+
mapped.kind !== "Operator" || bindings.size === 0
|
|
753
|
+
? mapped.body
|
|
754
|
+
: {
|
|
755
|
+
kind: "Let",
|
|
756
|
+
definitions: [...bindings].map((entry): Definition => ({
|
|
757
|
+
kind: "Operator",
|
|
758
|
+
name: entry[0],
|
|
759
|
+
params: [],
|
|
760
|
+
body: entry[1],
|
|
761
|
+
isLocal: true,
|
|
762
|
+
isRecursive: false,
|
|
763
|
+
location: entry[1].location,
|
|
764
|
+
})),
|
|
765
|
+
body: mapped.body,
|
|
766
|
+
// TLC has no such LET, so the call stack it prints has no position for it.
|
|
767
|
+
location: { line: mapped.body.location.line, column: mapped.body.location.column },
|
|
768
|
+
};
|
|
769
|
+
const frame = instantiation.frame;
|
|
770
|
+
// TLC's call stack holds the SubstInNode an instance puts around each definition it copies.
|
|
771
|
+
if (frame)
|
|
772
|
+
substitutionFrames.set(body, [frame, ...(substitutionFrames.get(definition.body) ?? [])]);
|
|
773
|
+
return withInstanceParams({ ...mapped, body }, instantiation.params, definition.location);
|
|
659
774
|
});
|
|
660
775
|
};
|
|
661
776
|
|
|
@@ -671,6 +786,7 @@ export const createInstantiation = (instantiation: Instantiation) => {
|
|
|
671
786
|
copies: new Map<string, string>(),
|
|
672
787
|
mode,
|
|
673
788
|
modes,
|
|
789
|
+
selections: new Map<Expression, Expression>(),
|
|
674
790
|
};
|
|
675
791
|
modes.set(mode, created);
|
|
676
792
|
return created;
|
|
@@ -720,7 +836,6 @@ const expandLetInstances = (
|
|
|
720
836
|
return { ...mapped, definitions };
|
|
721
837
|
};
|
|
722
838
|
|
|
723
|
-
// A named theorem's statement is linked as its definition.
|
|
724
839
|
const getUnnamedStatement = (theorem: Theorem) =>
|
|
725
840
|
theorem.name === undefined && theorem.statement.kind !== "AssumeProve"
|
|
726
841
|
? theorem.statement
|
package/src/java-hash.ts
ADDED
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
export const getJavaHashCode = (text: string): number => {
|
|
2
|
+
let hash = 0;
|
|
3
|
+
for (let index = 0; index < text.length; index++) {
|
|
4
|
+
hash = (Math.imul(hash, 31) + text.charCodeAt(index)) | 0;
|
|
5
|
+
}
|
|
6
|
+
return hash;
|
|
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
|
@@ -12,13 +12,10 @@ interface PoolEntry {
|
|
|
12
12
|
interface JavaMethod {
|
|
13
13
|
name: string;
|
|
14
14
|
arity: number;
|
|
15
|
-
// Method#toString, which TLC prints as the signature of an override.
|
|
16
15
|
signature: string;
|
|
17
16
|
code: Uint8Array | undefined;
|
|
18
17
|
}
|
|
19
18
|
|
|
20
|
-
// A public static method of the class named after a module, which TLC reports as it loads the
|
|
21
|
-
// class, with whether it overrides an operator.
|
|
22
19
|
export interface JavaOverride {
|
|
23
20
|
module: string;
|
|
24
21
|
operator: string;
|
|
@@ -38,7 +35,6 @@ const ACCESS_PUBLIC = 0x0001;
|
|
|
38
35
|
const ACCESS_STATIC = 0x0008;
|
|
39
36
|
const VALUE_PACKAGE = "tlc2/value/impl/";
|
|
40
37
|
|
|
41
|
-
// The constant pool tags of the JVM specification, section 4.4.
|
|
42
38
|
const POOL_TAG = {
|
|
43
39
|
utf8: 1,
|
|
44
40
|
integer: 3,
|
|
@@ -53,7 +49,6 @@ const POOL_TAG = {
|
|
|
53
49
|
package: 20,
|
|
54
50
|
};
|
|
55
51
|
|
|
56
|
-
// The JVM opcodes that an override returning a constant value uses.
|
|
57
52
|
const OPCODE = {
|
|
58
53
|
iconstM1: 0x02,
|
|
59
54
|
iconst0: 0x03,
|
|
@@ -72,10 +67,10 @@ const OPCODE = {
|
|
|
72
67
|
|
|
73
68
|
const createReader = (bytes: Uint8Array) => {
|
|
74
69
|
const view = new DataView(bytes.buffer, bytes.byteOffset, bytes.byteLength);
|
|
75
|
-
|
|
70
|
+
let offset = 0;
|
|
76
71
|
const advance = (length: number) => {
|
|
77
|
-
const start =
|
|
78
|
-
|
|
72
|
+
const start = offset;
|
|
73
|
+
offset += length;
|
|
79
74
|
return start;
|
|
80
75
|
};
|
|
81
76
|
return {
|
|
@@ -83,7 +78,7 @@ const createReader = (bytes: Uint8Array) => {
|
|
|
83
78
|
readUint16: () => view.getUint16(advance(2)),
|
|
84
79
|
readUint32: () => view.getUint32(advance(4)),
|
|
85
80
|
readInt32: () => view.getInt32(advance(4)),
|
|
86
|
-
readBytes: (length: number) => bytes.subarray(advance(length),
|
|
81
|
+
readBytes: (length: number) => bytes.subarray(advance(length), offset),
|
|
87
82
|
};
|
|
88
83
|
};
|
|
89
84
|
|
|
@@ -99,7 +94,6 @@ const PRIMITIVE_TYPES = new Map([
|
|
|
99
94
|
["V", "void"],
|
|
100
95
|
]);
|
|
101
96
|
|
|
102
|
-
// The modifiers Method#toString prints, in the order of Modifier#toString.
|
|
103
97
|
const METHOD_MODIFIERS: [number, string][] = [
|
|
104
98
|
[0x0001, "public"],
|
|
105
99
|
[0x0004, "protected"],
|
|
@@ -123,8 +117,6 @@ const getClassName = (pool: PoolEntry[], index: number) => pool[pool[index].firs
|
|
|
123
117
|
const getJavaClassName = (pool: PoolEntry[], index: number) =>
|
|
124
118
|
getClassName(pool, index).replaceAll("/", ".");
|
|
125
119
|
|
|
126
|
-
// The public static methods of a class file and their bytecode, in the order of the class file.
|
|
127
|
-
// Class#getDeclaredMethods orders them by where HotSpot allocated the symbols of their names.
|
|
128
120
|
const readClassFile = (bytes: Uint8Array) => {
|
|
129
121
|
const reader = createReader(bytes);
|
|
130
122
|
if (reader.readUint32() !== CLASS_MAGIC)
|
|
@@ -185,7 +177,6 @@ const readClassFile = (bytes: Uint8Array) => {
|
|
|
185
177
|
const isOverride = (access & ACCESS_PUBLIC) !== 0 && (access & ACCESS_STATIC) !== 0;
|
|
186
178
|
if (!isOverride) continue;
|
|
187
179
|
const code = attributes.find((attribute) => attribute.name === "Code")?.reader;
|
|
188
|
-
// A Code attribute holds max_stack and max_locals before the length of the bytecode.
|
|
189
180
|
code?.readBytes(4);
|
|
190
181
|
const thrown = attributes.find((attribute) => attribute.name === "Exceptions")?.reader;
|
|
191
182
|
const exceptions = thrown
|
|
@@ -193,8 +184,8 @@ const readClassFile = (bytes: Uint8Array) => {
|
|
|
193
184
|
getJavaClassName(pool, thrown.readUint16()),
|
|
194
185
|
)
|
|
195
186
|
: [];
|
|
196
|
-
const modifiers = METHOD_MODIFIERS.filter((
|
|
197
|
-
(
|
|
187
|
+
const modifiers = METHOD_MODIFIERS.filter((entry) => (access & entry[0]) !== 0).map(
|
|
188
|
+
(entry) => entry[1],
|
|
198
189
|
);
|
|
199
190
|
const returnType = getTypeNames(descriptor.slice(parametersEnd + 1))[0];
|
|
200
191
|
const throwsClause = exceptions.length === 0 ? "" : ` throws ${exceptions.join(",")}`;
|
|
@@ -217,9 +208,6 @@ const getMemberReference = (pool: PoolEntry[], index: number) => {
|
|
|
217
208
|
};
|
|
218
209
|
};
|
|
219
210
|
|
|
220
|
-
// Runs the bytecode of an override that returns a constant TLC value, such as
|
|
221
|
-
// BoolValue.ValTrue, IntValue.gen(3), or new StringValue("a"), and returns that value as a
|
|
222
|
-
// literal.
|
|
223
211
|
const getReturnedLiteral = (
|
|
224
212
|
method: JavaMethod,
|
|
225
213
|
pool: PoolEntry[],
|
|
@@ -316,9 +304,6 @@ const getReturnedLiteral = (
|
|
|
316
304
|
throw createUnsupportedError();
|
|
317
305
|
};
|
|
318
306
|
|
|
319
|
-
// TLC loads a class named after each module and replaces each operator of the module that the
|
|
320
|
-
// root module sees with the public static method of the same name and arity. It reports whether
|
|
321
|
-
// each method matched an operator.
|
|
322
307
|
export const overrideDefinitions = (
|
|
323
308
|
module: Module,
|
|
324
309
|
bytes: Uint8Array | undefined,
|