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/tlc/order.ts
CHANGED
|
@@ -1,11 +1,11 @@
|
|
|
1
|
-
// TLC orders strings and model values by when it first interned their text, and compares a
|
|
2
|
-
// state's variables in the order of SANY's symbol table. This reproduces both orders.
|
|
3
1
|
import type { Module, SourceLocation } from "../ast";
|
|
4
2
|
import type { ConfigValue, ModelConfig } from "../config";
|
|
5
3
|
import { createMissingModuleError } from "../errors";
|
|
4
|
+
import { getJavaHashCode } from "../java-hash";
|
|
6
5
|
import { tokenize, type Token } from "../lexer";
|
|
7
6
|
import { extractModule, parseModule, parseModuleTokens } from "../parser";
|
|
8
7
|
import { isBefore } from "../resolve";
|
|
8
|
+
import { SANY_STANDARD_MODULES } from "../sany/modules";
|
|
9
9
|
import {
|
|
10
10
|
SANY_BUILTINS,
|
|
11
11
|
SANY_NODE_NAMES,
|
|
@@ -13,7 +13,6 @@ import {
|
|
|
13
13
|
TLC_MODULE_SOURCES,
|
|
14
14
|
TLC_RUNTIME_STRINGS,
|
|
15
15
|
TLC_STARTUP_STRINGS,
|
|
16
|
-
USER_STANDARD_MODULES,
|
|
17
16
|
} from "./jar-data";
|
|
18
17
|
|
|
19
18
|
type SymbolKind = "builtin" | "constant" | "variable" | "definition" | "theorem" | "module";
|
|
@@ -29,7 +28,6 @@ interface SymbolEntry {
|
|
|
29
28
|
interface SymbolTable {
|
|
30
29
|
put: (entry: SymbolEntry) => void;
|
|
31
30
|
inserted: SymbolEntry[];
|
|
32
|
-
// Where the entries the module adds itself start, after those of the modules it extends.
|
|
33
31
|
ownStart: number;
|
|
34
32
|
enumerate: () => SymbolEntry[];
|
|
35
33
|
}
|
|
@@ -58,17 +56,6 @@ const CANONICAL_OPERATORS = new Map(
|
|
|
58
56
|
|
|
59
57
|
const getCanonicalName = (name: string) => CANONICAL_OPERATORS.get(name) ?? name;
|
|
60
58
|
|
|
61
|
-
const getJavaHash = (text: string) => {
|
|
62
|
-
let hash = 0;
|
|
63
|
-
for (let index = 0; index < text.length; index++) {
|
|
64
|
-
hash = (Math.imul(hash, 31) + text.charCodeAt(index)) | 0;
|
|
65
|
-
}
|
|
66
|
-
return hash;
|
|
67
|
-
};
|
|
68
|
-
|
|
69
|
-
// java.util.Hashtable as SANY's Context uses it: default capacity 11, load factor 0.75, new
|
|
70
|
-
// entries at the head of their bucket, and enumeration from the last bucket to the first. Each
|
|
71
|
-
// bucket lists its entries from tail to head, so a new entry goes at the end.
|
|
72
59
|
const createSymbolTable = (): SymbolTable => {
|
|
73
60
|
let buckets: SymbolEntry[][] = Array.from({ length: 11 }, () => []);
|
|
74
61
|
let threshold = 8;
|
|
@@ -108,7 +95,7 @@ const createSymbolTable = (): SymbolTable => {
|
|
|
108
95
|
const createEntry = (name: string, kind: SymbolKind, isLocal: boolean): SymbolEntry => ({
|
|
109
96
|
key: kind === "module" ? `module ${name}` : name,
|
|
110
97
|
name,
|
|
111
|
-
hash:
|
|
98
|
+
hash: getJavaHashCode(name) & 0x7fffffff,
|
|
112
99
|
kind,
|
|
113
100
|
isLocal,
|
|
114
101
|
});
|
|
@@ -156,8 +143,6 @@ type ModuleSearch = (
|
|
|
156
143
|
visited: Set<string>,
|
|
157
144
|
) => [ModuleReferences, string] | undefined;
|
|
158
145
|
|
|
159
|
-
// The modules a module extends and instantiates, with its inner modules, as SANY's SpecObj
|
|
160
|
-
// walks them to decide which module to parse next.
|
|
161
146
|
const getModuleReferences = (
|
|
162
147
|
tokens: Token[],
|
|
163
148
|
unit: string | undefined,
|
|
@@ -182,10 +167,10 @@ const getModuleReferences = (
|
|
|
182
167
|
innerModules.set(name, inner.references);
|
|
183
168
|
references.inner.push(inner.references);
|
|
184
169
|
index = inner.end;
|
|
185
|
-
} else if (tokens[index - 1]?.text === ".") {
|
|
186
|
-
// A record field named EXTENDS or INSTANCE, as in r.EXTENDS or [r EXCEPT !.INSTANCE = 0].
|
|
187
170
|
continue;
|
|
188
|
-
}
|
|
171
|
+
}
|
|
172
|
+
if (tokens[index - 1]?.text === ".") continue;
|
|
173
|
+
if (token.text === "EXTENDS") {
|
|
189
174
|
const names = getDeclarations(tokens, index + 1);
|
|
190
175
|
references.extends.push(...names);
|
|
191
176
|
names.forEach((name) => allExtends.add(name));
|
|
@@ -212,9 +197,6 @@ const STRING_ESCAPES: Record<string, string> = {
|
|
|
212
197
|
"\f": "\\f",
|
|
213
198
|
};
|
|
214
199
|
|
|
215
|
-
// The texts SANY interns while parsing, in order. SANY reads a proof step label such as <1>2 and
|
|
216
|
-
// a module header such as ---- MODULE as one token. It interns a string literal as written, quotes
|
|
217
|
-
// included, and interns the literal's contents only during semantic analysis.
|
|
218
200
|
const getParsedTexts = (tokens: Token[]) => {
|
|
219
201
|
const texts: string[] = [];
|
|
220
202
|
for (let index = 0; index < tokens.length; index++) {
|
|
@@ -240,7 +222,6 @@ const getParsedTexts = (tokens: Token[]) => {
|
|
|
240
222
|
return texts;
|
|
241
223
|
};
|
|
242
224
|
|
|
243
|
-
// A module starts with ---- MODULE Name, so its third token is its name.
|
|
244
225
|
const getModuleName = (tokens: Token[]) => tokens[2]?.text;
|
|
245
226
|
|
|
246
227
|
const getRanges = (tokens: Token[]) => {
|
|
@@ -268,26 +249,20 @@ interface ModuleText {
|
|
|
268
249
|
getModule: () => Module;
|
|
269
250
|
}
|
|
270
251
|
|
|
271
|
-
// A module's source is read into tokens once, and parsed from them once, for every order and for
|
|
272
|
-
// the environment that evaluates it.
|
|
273
252
|
const readModuleText = (text: string | undefined): ModuleText => {
|
|
274
253
|
const tokens = text === undefined ? [] : tokenize(text);
|
|
275
|
-
|
|
254
|
+
let parsedModule: Module | undefined;
|
|
276
255
|
return {
|
|
277
256
|
tokens,
|
|
278
257
|
ranges: getRanges(tokens),
|
|
279
258
|
getModule: () =>
|
|
280
|
-
(
|
|
259
|
+
(parsedModule ??= text === undefined ? parseModule("") : parseModuleTokens(text, tokens)),
|
|
281
260
|
};
|
|
282
261
|
};
|
|
283
262
|
|
|
284
|
-
// The modules TLC reads for a spec: the root module, TLC's standard modules, the files the loader
|
|
285
|
-
// returns, the modules that follow the root module, and the modules nested in any of these. A
|
|
286
|
-
// module without a source has no tokens.
|
|
287
263
|
const createModuleSet = (source: string, loadModule: ModuleLoader) => {
|
|
288
264
|
const files = new Map<string, ParsedModule>();
|
|
289
265
|
const nestedModules = new Map<string, ParsedModule>();
|
|
290
|
-
// The read of each module text, so that the environment parses a text the order read only once.
|
|
291
266
|
const texts = new Map<string, ModuleText>();
|
|
292
267
|
const readText = (text: string | undefined) => {
|
|
293
268
|
const known = text === undefined ? undefined : texts.get(text);
|
|
@@ -302,15 +277,16 @@ const createModuleSet = (source: string, loadModule: ModuleLoader) => {
|
|
|
302
277
|
const text =
|
|
303
278
|
name === undefined
|
|
304
279
|
? source
|
|
305
|
-
: (
|
|
280
|
+
: (loadModule?.(name) ??
|
|
306
281
|
TLC_MODULE_SOURCES.get(name) ??
|
|
307
|
-
|
|
282
|
+
SANY_STANDARD_MODULES.get(name) ??
|
|
308
283
|
extractModule(source, name));
|
|
309
|
-
const
|
|
310
|
-
const
|
|
311
|
-
const
|
|
284
|
+
const moduleText = readText(text);
|
|
285
|
+
const tokens = moduleText.tokens;
|
|
286
|
+
const range = moduleText.ranges.get(getModuleName(tokens) ?? "") ?? { start: 0, end: 0 };
|
|
287
|
+
const file = { tokens, ...range, getModule: moduleText.getModule };
|
|
312
288
|
files.set(name ?? "", file);
|
|
313
|
-
ranges.forEach((nestedRange, nestedName) => {
|
|
289
|
+
moduleText.ranges.forEach((nestedRange, nestedName) => {
|
|
314
290
|
if (nestedRange.start === range.start || nestedModules.has(nestedName)) return;
|
|
315
291
|
nestedModules.set(nestedName, {
|
|
316
292
|
tokens,
|
|
@@ -328,7 +304,6 @@ const createModuleSet = (source: string, loadModule: ModuleLoader) => {
|
|
|
328
304
|
};
|
|
329
305
|
};
|
|
330
306
|
|
|
331
|
-
// SANY's Context of each module, which the root module has under undefined.
|
|
332
307
|
type ModuleSet = ReturnType<typeof createModuleSet>["getParsed"];
|
|
333
308
|
|
|
334
309
|
const createContexts = (getParsed: ModuleSet) => {
|
|
@@ -347,13 +322,19 @@ const createContexts = (getParsed: ModuleSet) => {
|
|
|
347
322
|
const recursiveNames = new Set(
|
|
348
323
|
module.definitions.filter((definition) => definition.isRecursive).map((item) => item.name),
|
|
349
324
|
);
|
|
350
|
-
const
|
|
351
|
-
|
|
325
|
+
const declarationKeywords = new Set(
|
|
326
|
+
module.units.flatMap((moduleUnit) =>
|
|
327
|
+
moduleUnit.kind === "Constants" || moduleUnit.kind === "Variables"
|
|
328
|
+
? [`${moduleUnit.location.line}:${moduleUnit.location.column}`]
|
|
329
|
+
: [],
|
|
330
|
+
),
|
|
331
|
+
);
|
|
332
|
+
let depth = 0;
|
|
333
|
+
tokens.slice(unit.start, unit.end).forEach((token, offset) => {
|
|
352
334
|
const index = unit.start + offset;
|
|
353
|
-
const token = tokens[index];
|
|
354
335
|
if (token.kind === "Separator" && tokens[index + 1]?.text === "MODULE") {
|
|
355
|
-
depth
|
|
356
|
-
if (depth
|
|
336
|
+
depth++;
|
|
337
|
+
if (depth === 2) {
|
|
357
338
|
const name = tokens[index + 2].text;
|
|
358
339
|
units.push({
|
|
359
340
|
location: getLocation(token),
|
|
@@ -362,10 +343,15 @@ const createContexts = (getParsed: ModuleSet) => {
|
|
|
362
343
|
}
|
|
363
344
|
return;
|
|
364
345
|
}
|
|
365
|
-
if (token.kind === "ModuleEnd") depth
|
|
366
|
-
if (depth
|
|
367
|
-
|
|
368
|
-
if (token.text === "
|
|
346
|
+
if (token.kind === "ModuleEnd") depth--;
|
|
347
|
+
if (depth !== 1 || token.kind !== "Keyword") return;
|
|
348
|
+
const isDeclaration = declarationKeywords.has(`${token.line}:${token.column}`);
|
|
349
|
+
if (isDeclaration && (token.text === "CONSTANT" || token.text === "CONSTANTS")) {
|
|
350
|
+
declare(index, "constant");
|
|
351
|
+
}
|
|
352
|
+
if (isDeclaration && (token.text === "VARIABLE" || token.text === "VARIABLES")) {
|
|
353
|
+
declare(index, "variable");
|
|
354
|
+
}
|
|
369
355
|
if (token.text === "RECURSIVE") {
|
|
370
356
|
const names = getDeclarations(tokens, index + 1);
|
|
371
357
|
if (names.every((name) => recursiveNames.has(name))) declare(index, "definition");
|
|
@@ -458,10 +444,11 @@ const createContexts = (getParsed: ModuleSet) => {
|
|
|
458
444
|
};
|
|
459
445
|
};
|
|
460
446
|
|
|
461
|
-
|
|
462
|
-
|
|
463
|
-
|
|
464
|
-
|
|
447
|
+
const getStringOrder = (
|
|
448
|
+
getParsed: ModuleSet,
|
|
449
|
+
config: ModelConfig,
|
|
450
|
+
runtimeModules: string[],
|
|
451
|
+
): string[] => {
|
|
465
452
|
const order = new Set<string>();
|
|
466
453
|
const intern = (text: string) => {
|
|
467
454
|
order.add(text);
|
|
@@ -536,7 +523,6 @@ const getStringOrder = (getParsed: ModuleSet, config: ModelConfig): string[] =>
|
|
|
536
523
|
dependencies.set(module.unit, [...(dependencies.get(module.unit) ?? []), name]);
|
|
537
524
|
if (parsedUnits.has(name)) continue;
|
|
538
525
|
parsedUnits.add(name);
|
|
539
|
-
// SANY stops at the first module it can't find, in the order it reads them.
|
|
540
526
|
if (getParsed(name).tokens.length === 0) {
|
|
541
527
|
const importer = module.unit ?? getModuleName(getParsed(undefined).tokens);
|
|
542
528
|
throw createMissingModuleError(name, importer);
|
|
@@ -559,35 +545,31 @@ const getStringOrder = (getParsed: ModuleSet, config: ModelConfig): string[] =>
|
|
|
559
545
|
});
|
|
560
546
|
};
|
|
561
547
|
analyze(undefined);
|
|
548
|
+
runtimeModules.forEach((name) => {
|
|
549
|
+
const tokens = getUnitTokens(name);
|
|
550
|
+
getParsedTexts(tokens).forEach(intern);
|
|
551
|
+
tokens.forEach((token) => {
|
|
552
|
+
if (token.kind === "String") intern(token.text);
|
|
553
|
+
});
|
|
554
|
+
});
|
|
562
555
|
TLC_RUNTIME_STRINGS.forEach(intern);
|
|
563
556
|
return [...order];
|
|
564
557
|
};
|
|
565
558
|
|
|
566
559
|
export interface TlcOrder {
|
|
567
|
-
|
|
568
|
-
getStringOrder: (config: ModelConfig) => string[];
|
|
569
|
-
// The variables or constants of the root module in the reverse of its context enumeration, as
|
|
570
|
-
// ModuleNode.getVariableDecls and getConstantDecls return them. TLC compares variables in this
|
|
571
|
-
// order, and checks that the configuration assigns each constant in it.
|
|
560
|
+
getStringOrder: (config: ModelConfig, runtimeModules: string[]) => string[];
|
|
572
561
|
getDeclarationOrder: (kind: "variable" | "constant") => string[];
|
|
573
|
-
// The names of the definitions each module adds to its context, in the order of
|
|
574
|
-
// ModuleNode.getOpDefs, in which TLC computes the constant definitions as it starts. An INSTANCE
|
|
575
|
-
// adds the definitions of the module it instantiates in the order that module's Hashtable
|
|
576
|
-
// enumerates them.
|
|
577
562
|
createDefinitionOrder: () => (name: string | undefined) => string[];
|
|
578
|
-
// Parses a module's source, once for the order and the environment.
|
|
579
563
|
parseModule: (source: string) => Module;
|
|
580
564
|
}
|
|
581
565
|
|
|
582
|
-
// One check reads the spec's modules once, and every order shares their tokens, parses and
|
|
583
|
-
// contexts.
|
|
584
566
|
export const createTlcOrder = (source: string, loadModule: ModuleLoader): TlcOrder => {
|
|
585
567
|
const modules = createModuleSet(source, loadModule);
|
|
586
568
|
const getParsed = modules.getParsed;
|
|
587
569
|
let contexts: ReturnType<typeof createContexts> | undefined;
|
|
588
570
|
const getContexts = () => (contexts ??= createContexts(getParsed));
|
|
589
571
|
return {
|
|
590
|
-
getStringOrder: (config) => getStringOrder(getParsed, config),
|
|
572
|
+
getStringOrder: (config, runtimeModules) => getStringOrder(getParsed, config, runtimeModules),
|
|
591
573
|
getDeclarationOrder: (kind) =>
|
|
592
574
|
getContexts()
|
|
593
575
|
.getContext(undefined)
|
|
@@ -597,12 +579,11 @@ export const createTlcOrder = (source: string, loadModule: ModuleLoader): TlcOrd
|
|
|
597
579
|
.reverse(),
|
|
598
580
|
parseModule: modules.parseText,
|
|
599
581
|
createDefinitionOrder: () => {
|
|
600
|
-
const
|
|
601
|
-
|
|
602
|
-
// in the files it extends or instantiates.
|
|
603
|
-
getContext(undefined);
|
|
582
|
+
const moduleContexts = getContexts();
|
|
583
|
+
moduleContexts.getContext(undefined);
|
|
604
584
|
return (name) =>
|
|
605
|
-
|
|
585
|
+
moduleContexts
|
|
586
|
+
.getOwnEntries(name)
|
|
606
587
|
.filter((entry) => entry.kind === "definition")
|
|
607
588
|
.map((entry) => entry.name);
|
|
608
589
|
},
|
package/src/tlc/random.ts
CHANGED
|
@@ -1,11 +1,15 @@
|
|
|
1
|
+
import { toEnumeratedSet } from "../builtins";
|
|
1
2
|
import { TlaEvaluationError } from "../errors";
|
|
3
|
+
import { prettyPrint } from "../pretty-print";
|
|
2
4
|
import type { TlcVersion } from "./version";
|
|
3
5
|
import {
|
|
4
6
|
createRecord,
|
|
5
7
|
createSortedFunction,
|
|
6
8
|
createTuple,
|
|
9
|
+
formatValue,
|
|
7
10
|
getFunctionDomain,
|
|
8
11
|
isEmptySet,
|
|
12
|
+
MAXIMUM_INTEGER,
|
|
9
13
|
toFiniteSet,
|
|
10
14
|
type Value,
|
|
11
15
|
} from "../values";
|
|
@@ -19,18 +23,16 @@ export interface JavaRandom {
|
|
|
19
23
|
|
|
20
24
|
const MULTIPLIER = 0x5deece66dn;
|
|
21
25
|
const SEED_MASK = (1n << 48n) - 1n;
|
|
22
|
-
const MAXIMUM_INT = 2147483647;
|
|
23
26
|
|
|
24
|
-
// java.util.Random, which TLC's RandomEnumerableValues extends.
|
|
25
27
|
export const createJavaRandom = (seed: bigint): JavaRandom => {
|
|
26
|
-
|
|
28
|
+
let state = (BigInt.asUintN(64, seed) ^ MULTIPLIER) & SEED_MASK;
|
|
27
29
|
const next = (bits: number) => {
|
|
28
|
-
state
|
|
29
|
-
return Number(BigInt.asIntN(32, state
|
|
30
|
+
state = (state * MULTIPLIER + 0xbn) & SEED_MASK;
|
|
31
|
+
return Number(BigInt.asIntN(32, state >> BigInt(48 - bits)));
|
|
30
32
|
};
|
|
31
33
|
return {
|
|
32
34
|
setSeed: (value) => {
|
|
33
|
-
state
|
|
35
|
+
state = (BigInt.asUintN(64, value) ^ MULTIPLIER) & SEED_MASK;
|
|
34
36
|
},
|
|
35
37
|
nextInt: (bound) => {
|
|
36
38
|
const first = next(31);
|
|
@@ -38,7 +40,7 @@ export const createJavaRandom = (seed: bigint): JavaRandom => {
|
|
|
38
40
|
if ((bound & mask) === 0) return Number((BigInt(bound) * BigInt(first)) >> 31n);
|
|
39
41
|
for (let candidate = first; ; candidate = next(31)) {
|
|
40
42
|
const value = candidate % bound;
|
|
41
|
-
if (candidate - value + mask <=
|
|
43
|
+
if (candidate - value + mask <= MAXIMUM_INTEGER) return value;
|
|
42
44
|
}
|
|
43
45
|
},
|
|
44
46
|
nextLong: () => BigInt.asIntN(64, (BigInt(next(32)) << 32n) + BigInt(next(32))),
|
|
@@ -46,7 +48,6 @@ export const createJavaRandom = (seed: bigint): JavaRandom => {
|
|
|
46
48
|
};
|
|
47
49
|
};
|
|
48
50
|
|
|
49
|
-
// RandomGenerator.primes holds the 1341 consecutive primes from 1277011 to 1295953.
|
|
50
51
|
const PRIMES: number[] = [];
|
|
51
52
|
|
|
52
53
|
const isPrime = (candidate: number) => {
|
|
@@ -63,31 +64,26 @@ const getPrimes = () => {
|
|
|
63
64
|
return PRIMES;
|
|
64
65
|
};
|
|
65
66
|
|
|
66
|
-
const nextPrime = (random: JavaRandom) => {
|
|
67
|
+
export const nextPrime = (random: JavaRandom) => {
|
|
67
68
|
const primes = getPrimes();
|
|
68
|
-
|
|
69
|
-
while (
|
|
70
|
-
|
|
71
|
-
}
|
|
72
|
-
return primes[choice.index];
|
|
69
|
+
let index = primes.length;
|
|
70
|
+
while (index === primes.length) index = Math.floor(random.nextDouble() * primes.length);
|
|
71
|
+
return primes[index];
|
|
73
72
|
};
|
|
74
73
|
|
|
75
74
|
const getPrimeFactors = (value: number) => {
|
|
76
75
|
const factors: number[] = [];
|
|
77
|
-
|
|
78
|
-
for (let divisor = 2; divisor * divisor <= remaining
|
|
79
|
-
while (remaining
|
|
76
|
+
let remaining = value;
|
|
77
|
+
for (let divisor = 2; divisor * divisor <= remaining; divisor++) {
|
|
78
|
+
while (remaining % divisor === 0) {
|
|
80
79
|
factors.push(divisor);
|
|
81
|
-
remaining
|
|
80
|
+
remaining /= divisor;
|
|
82
81
|
}
|
|
83
82
|
}
|
|
84
|
-
if (remaining
|
|
83
|
+
if (remaining > 1) factors.push(remaining);
|
|
85
84
|
return factors;
|
|
86
85
|
};
|
|
87
86
|
|
|
88
|
-
// EnumerableValue.computeOptimalMandA: the smallest modulus m >= max(size, 9) that isn't a
|
|
89
|
-
// multiple of 4 and has a repeated prime factor, and the multiplier 1 + the product of its
|
|
90
|
-
// distinct prime factors.
|
|
91
87
|
const getModulusAndMultiplier = (size: number) => {
|
|
92
88
|
for (let modulus = Math.max(size, 9); ; modulus++) {
|
|
93
89
|
const factors = getPrimeFactors(modulus);
|
|
@@ -101,41 +97,35 @@ const getModulusAndMultiplier = (size: number) => {
|
|
|
101
97
|
}
|
|
102
98
|
};
|
|
103
99
|
|
|
104
|
-
// EnumerableValue.SubsetEnumerator: count indices below size from a full-period linear
|
|
105
|
-
// congruential generator that starts at random.nextInt(size).
|
|
106
100
|
const getSubsetIndicesMaster = (count: number, size: number, random: JavaRandom) => {
|
|
107
101
|
if (size <= 0) return [];
|
|
108
102
|
const generator = getModulusAndMultiplier(size);
|
|
109
|
-
|
|
103
|
+
let index = BigInt(random.nextInt(size));
|
|
110
104
|
const increment = BigInt(nextPrime(random));
|
|
111
105
|
return Array.from({ length: count }, () => {
|
|
112
106
|
do {
|
|
113
|
-
|
|
114
|
-
} while (
|
|
115
|
-
return
|
|
107
|
+
index = (generator.multiplier * index + increment) % generator.modulus;
|
|
108
|
+
} while (index >= size);
|
|
109
|
+
return index;
|
|
116
110
|
});
|
|
117
111
|
};
|
|
118
112
|
|
|
119
|
-
// TLC 1.7.4's EnumerableValue.SubsetEnumerator: the i-th index is (x * i + a) mod size, for a
|
|
120
|
-
// prime x above size and a = random.nextInt(size), so the first size indices are distinct.
|
|
121
113
|
const getSubsetIndices174 = (count: number, size: number, random: JavaRandom) => {
|
|
122
114
|
if (size <= 0) return [];
|
|
123
|
-
const stride = BigInt(size < 191 ? 191 :
|
|
115
|
+
const stride = BigInt(size < 191 ? 191 : MAXIMUM_INTEGER);
|
|
124
116
|
const offset = BigInt(random.nextInt(size));
|
|
125
117
|
return Array.from(
|
|
126
118
|
{ length: Math.min(count, size) },
|
|
127
|
-
(
|
|
119
|
+
(_value, index) => (stride * BigInt(index) + offset) % BigInt(size),
|
|
128
120
|
);
|
|
129
121
|
};
|
|
130
122
|
|
|
131
123
|
const LARGE_STRIDE = (1n << 63n) - 1n - 24n;
|
|
132
124
|
|
|
133
|
-
// SetOfFcnsOrRcdsValue.BigIntegerSubsetEnumerator, for products with more than 2^31 - 1
|
|
134
|
-
// elements.
|
|
135
125
|
const getLargeSubsetIndices = (count: number, size: bigint, random: JavaRandom) => {
|
|
136
126
|
const signed = random.nextLong();
|
|
137
127
|
const offset = BigInt.asIntN(64, signed < 0n ? -signed : signed);
|
|
138
|
-
return Array.from({ length: count }, (
|
|
128
|
+
return Array.from({ length: count }, (_value, index) => {
|
|
139
129
|
const value = (LARGE_STRIDE * BigInt(index) + offset) % size;
|
|
140
130
|
return value < 0n ? value + size : value;
|
|
141
131
|
});
|
|
@@ -181,13 +171,11 @@ const getProduct = (set: Value): Product | undefined => {
|
|
|
181
171
|
return undefined;
|
|
182
172
|
};
|
|
183
173
|
|
|
184
|
-
// TLC 1.7.4 enumerates a set of tuples to draw from it.
|
|
185
174
|
export const getEnumeratedFactors = (set: Value, version: TlcVersion) =>
|
|
186
175
|
version === "1.7.4" && typeof set === "object" && set.kind === "ProductSet"
|
|
187
176
|
? set.factors
|
|
188
177
|
: undefined;
|
|
189
178
|
|
|
190
|
-
// Enumerable#getRandomSubset, which Randomization's RandomSubset calls.
|
|
191
179
|
export const getRandomSubset = (
|
|
192
180
|
count: number,
|
|
193
181
|
set: Value,
|
|
@@ -205,7 +193,7 @@ export const getRandomSubset = (
|
|
|
205
193
|
if (product) {
|
|
206
194
|
const size = product.lists.reduce((total, list) => total * BigInt(list.length), 1n);
|
|
207
195
|
const indices =
|
|
208
|
-
size > BigInt(
|
|
196
|
+
size > BigInt(MAXIMUM_INTEGER)
|
|
209
197
|
? getLargeSubsetIndices(count, size, random)
|
|
210
198
|
: getSubsetIndices(count, Number(size), random);
|
|
211
199
|
return indices.map((index) => product.create(getProductElements(product.lists, index)));
|
|
@@ -214,18 +202,10 @@ export const getRandomSubset = (
|
|
|
214
202
|
return getSubsetIndices(count, elements.length, random).map((index) => elements[Number(index)]);
|
|
215
203
|
};
|
|
216
204
|
|
|
217
|
-
const pickElement = (elements: Value[], random: JavaRandom) => {
|
|
218
|
-
const element = elements[Math.floor(random.nextDouble() * elements.length)];
|
|
219
|
-
if (element === undefined) throw new TlaEvaluationError("RandomElement of the empty set");
|
|
220
|
-
return element;
|
|
221
|
-
};
|
|
222
|
-
|
|
223
|
-
// TLC!RandomElement chooses each component of a set of functions, records, or tuples
|
|
224
|
-
// separately, and otherwise indexes the enumerated set with nextDouble.
|
|
225
205
|
export const getRandomElement = (set: Value, random: JavaRandom): Value => {
|
|
226
206
|
if (typeof set === "object" && set.kind === "FunctionSet") {
|
|
227
207
|
// TLC builds the chosen function without the interval its domain came from.
|
|
228
|
-
const domain = [...
|
|
208
|
+
const domain = [...toEnumeratedSet(set.domain, "RandomElement", set).elements];
|
|
229
209
|
return createSortedFunction(
|
|
230
210
|
domain,
|
|
231
211
|
domain.map(() => getRandomElement(set.range, random)),
|
|
@@ -245,8 +225,17 @@ export const getRandomElement = (set: Value, random: JavaRandom): Value => {
|
|
|
245
225
|
if (typeof set === "object" && set.kind === "Interval") {
|
|
246
226
|
const size = Math.max(0, set.high - set.low + 1);
|
|
247
227
|
const offset = Math.floor(random.nextDouble() * size);
|
|
248
|
-
if (offset >= size)
|
|
228
|
+
if (offset >= size) {
|
|
229
|
+
throw new TlaEvaluationError(
|
|
230
|
+
`Attempted to retrieve out-of-bounds element from the interval value ${prettyPrint(formatValue(set))}.`,
|
|
231
|
+
);
|
|
232
|
+
}
|
|
249
233
|
return set.low + offset;
|
|
250
234
|
}
|
|
251
|
-
|
|
235
|
+
const elements = toEnumeratedSet(set, "RandomElement").elements;
|
|
236
|
+
const index = Math.floor(random.nextDouble() * elements.length);
|
|
237
|
+
if (index >= elements.length) {
|
|
238
|
+
throw new TlaEvaluationError(`Index ${index} out of bounds for length ${elements.length}`);
|
|
239
|
+
}
|
|
240
|
+
return elements[index];
|
|
252
241
|
};
|