tla-ts 0.0.10-dev.f16792fed → 0.0.10-dev.fdc173479
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 +2 -1
- package/dist/compile.cjs +6 -6
- package/dist/compile.js +10 -10
- package/dist/deciders.cjs +41 -37
- package/dist/deciders.js +41 -37
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +21 -4
- package/dist/index.d.ts +21 -4
- package/dist/index.js +1 -1
- package/dist/parallel-worker.cjs +1 -1
- package/dist/parallel-worker.js +1 -1
- package/dist/prove-worker.cjs +1 -1
- package/dist/prove-worker.js +1 -1
- package/dist/prove.cjs +2681 -425
- package/dist/prove.js +2681 -425
- package/dist/run.cjs +41 -42
- package/dist/run.js +41 -42
- package/dist/tlapm.cjs +2 -2
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +97 -89
- package/dist/transfer.js +97 -89
- package/dist/worker.cjs +7 -7
- package/dist/worker.js +7 -7
- package/package.json +1 -1
- package/src/ast.ts +72 -39
- package/src/bags.ts +50 -29
- package/src/builtins.ts +8 -16
- package/src/check-failure.ts +118 -0
- package/src/check-trace.ts +321 -0
- package/src/check.ts +828 -770
- package/src/cli/options.ts +6 -31
- package/src/cli/runtime-invariants.ts +20 -56
- package/src/cli/shared.ts +1 -1
- package/src/cli/tlapm.ts +433 -70
- package/src/cli/tlc-arguments.ts +224 -212
- package/src/cli/tlc-output.ts +701 -0
- package/src/cli/tlc-usage.ts +1 -2
- package/src/cli/tlc.ts +65 -712
- package/src/cli/xml-exporter.ts +23 -33
- package/src/codegen.ts +28 -20
- package/src/coverage.ts +255 -20
- package/src/dependencies.ts +96 -27
- package/src/dfid.ts +115 -50
- package/src/environment-config.ts +315 -0
- package/src/environment.ts +175 -373
- package/src/errors.ts +40 -5
- package/src/evaluate.ts +429 -139
- package/src/exit-codes.ts +28 -12
- package/src/fingerprints.ts +65 -1
- package/src/instances.ts +178 -17
- package/src/java-hash.ts +14 -0
- package/src/java-overrides.ts +2 -2
- package/src/json.ts +4 -7
- package/src/levels.ts +708 -272
- package/src/lexer.ts +17 -5
- package/src/liveness-checker.ts +707 -249
- package/src/liveness.ts +148 -95
- package/src/obligations/action.ts +14 -17
- package/src/obligations/anonymize.ts +37 -16
- package/src/obligations/enabled-axioms.ts +218 -0
- package/src/obligations/equality.ts +1 -3
- package/src/obligations/expression.ts +36 -8
- package/src/obligations/format.ts +0 -2
- package/src/obligations/generate.ts +66 -54
- package/src/obligations/index.ts +39 -9
- package/src/obligations/levels.ts +24 -11
- package/src/obligations/module.ts +28 -41
- package/src/obligations/normalize.ts +27 -18
- package/src/obligations/operators.ts +0 -2
- package/src/obligations/pragma.ts +53 -16
- package/src/obligations/printer.ts +48 -18
- package/src/obligations/proof.ts +3 -2
- package/src/obligations/regroup.ts +0 -2
- package/src/obligations/simplify.ts +55 -50
- package/src/obligations/source.ts +120 -74
- package/src/obligations/subexpression.ts +45 -18
- package/src/obligations/substitution.ts +1 -3
- package/src/obligations/temporal.ts +5 -7
- package/src/obligations/tuples.ts +0 -2
- package/src/parallel-worker.ts +17 -31
- package/src/parallel.ts +29 -47
- package/src/parser.ts +757 -326
- package/src/pretty-print.ts +1 -1
- package/src/prover/decide-pool.ts +3 -3
- package/src/prover/deciders.ts +12 -9
- package/src/prover/isabelle/decide.ts +3 -25
- package/src/prover/isabelle/encode.ts +72 -42
- 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 +158 -7
- package/src/prover/isabelle/isar/method.ts +509 -212
- package/src/prover/isabelle/isar/proof.ts +570 -14
- package/src/prover/isabelle/isar/rule-cases.ts +226 -0
- package/src/prover/isabelle/isar/theory.ts +487 -76
- package/src/prover/isabelle/isar/toplevel.ts +331 -0
- package/src/prover/isabelle/isar/type-check.ts +89 -14
- package/src/prover/isabelle/provers/blast/blast.ts +7 -65
- package/src/prover/isabelle/provers/blast/branch.ts +0 -2
- package/src/prover/isabelle/provers/blast/prove.ts +0 -2
- package/src/prover/isabelle/provers/blast/rules.ts +0 -2
- package/src/prover/isabelle/provers/blast/state.ts +0 -2
- package/src/prover/isabelle/provers/blast/term.ts +0 -2
- package/src/prover/isabelle/provers/clasimp.ts +1 -3
- package/src/prover/isabelle/provers/classical.ts +45 -20
- package/src/prover/isabelle/provers/hypsubst.ts +19 -30
- package/src/prover/isabelle/pure/bicompose.ts +9 -27
- package/src/prover/isabelle/pure/consts.ts +0 -2
- package/src/prover/isabelle/pure/conv.ts +2 -10
- package/src/prover/isabelle/pure/drule.ts +72 -6
- package/src/prover/isabelle/pure/envir.ts +0 -2
- package/src/prover/isabelle/pure/goal.ts +1 -3
- package/src/prover/isabelle/pure/logic.ts +1 -3
- package/src/prover/isabelle/pure/name.ts +0 -2
- package/src/prover/isabelle/pure/net.ts +0 -2
- package/src/prover/isabelle/pure/object-logic.ts +13 -7
- package/src/prover/isabelle/pure/pattern.ts +0 -2
- package/src/prover/isabelle/pure/raw-simplifier.ts +4 -15
- package/src/prover/isabelle/pure/rewriter.ts +9 -20
- package/src/prover/isabelle/pure/search.ts +0 -2
- package/src/prover/isabelle/pure/seq.ts +0 -2
- package/src/prover/isabelle/pure/simplifier.ts +26 -7
- package/src/prover/isabelle/pure/table.ts +2 -3
- package/src/prover/isabelle/pure/tactic.ts +0 -2
- package/src/prover/isabelle/pure/tactical.ts +42 -37
- package/src/prover/isabelle/pure/term-ord.ts +0 -2
- package/src/prover/isabelle/pure/term.ts +3 -5
- package/src/prover/isabelle/pure/thm.ts +14 -13
- package/src/prover/isabelle/pure/type.ts +0 -2
- package/src/prover/isabelle/pure/unify.ts +0 -2
- package/src/prover/isabelle/pure/variable.ts +0 -2
- package/src/prover/isabelle/tla/classical-setup.ts +18 -16
- package/src/prover/isabelle/tla/context.ts +58 -11
- package/src/prover/isabelle/tla/logic-data.ts +1 -1
- package/src/prover/isabelle/tla/logic.ts +49 -21
- package/src/prover/isabelle/tla/simpdata.ts +1 -12
- package/src/prover/isabelle/tools/intuitionistic.ts +28 -12
- package/src/prover/ocaml.ts +4 -1
- package/src/prover/prep/action.ts +30 -31
- package/src/prover/prep/enabled-axioms.ts +11 -2
- package/src/prover/prep/fingerprint.ts +2 -5
- package/src/prover/prep/md5.ts +26 -29
- package/src/prover/prep/methods.ts +181 -51
- package/src/prover/prep/normalize.ts +38 -9
- package/src/prover/prove.ts +395 -94
- package/src/prover/ptl/decide.ts +95 -50
- package/src/prover/ptl/encode.ts +2 -3
- package/src/prover/ptl/tableau.ts +28 -2
- package/src/prover/smt/arithmetic.ts +310 -0
- package/src/prover/smt/axioms.ts +12 -8
- package/src/prover/smt/context.ts +43 -8
- package/src/prover/smt/data.ts +498 -379
- package/src/prover/smt/encode.ts +148 -57
- package/src/prover/smt/extensionality.ts +5 -3
- package/src/prover/smt/flatten.ts +4 -6
- package/src/prover/smt/format.ts +28 -4
- package/src/prover/smt/instances.ts +7 -1
- package/src/prover/smt/layout.ts +91 -0
- package/src/prover/smt/rewrite.ts +1016 -618
- package/src/prover/smt/simplify.ts +441 -0
- package/src/prover/smt/solver/ackermannize-bv-tactic.ts +62 -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 -1
- 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 +624 -9
- 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/asserted-formulas.ts +240 -56
- package/src/prover/smt/solver/ast-lt.ts +165 -11
- package/src/prover/smt/solver/ast-util.ts +160 -2
- package/src/prover/smt/solver/ast.ts +1483 -45
- package/src/prover/smt/solver/auf-solver.ts +25 -18
- 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 -2
- package/src/prover/smt/solver/cg-table.ts +39 -25
- package/src/prover/smt/solver/check-logic.ts +330 -0
- package/src/prover/smt/solver/clause.ts +0 -1
- package/src/prover/smt/solver/cofactor-elim-term-ite.ts +293 -0
- package/src/prover/smt/solver/conflict-resolution.ts +78 -2
- package/src/prover/smt/solver/context.ts +598 -128
- package/src/prover/smt/solver/ctx-simplify.ts +29 -14
- 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 +38 -10
- package/src/prover/smt/solver/diff-neq.ts +207 -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 +298 -0
- package/src/prover/smt/solver/dyn-ack.ts +0 -1
- package/src/prover/smt/solver/e-matching.ts +7 -8
- 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 +548 -0
- package/src/prover/smt/solver/enode.ts +100 -3
- package/src/prover/smt/solver/eq2bv-tactic.ts +227 -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 -1
- package/src/prover/smt/solver/expr-safe-replace.ts +26 -2
- 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 -15
- package/src/prover/smt/solver/fix-dl-var.ts +147 -0
- package/src/prover/smt/solver/flat-literals.ts +0 -1
- package/src/prover/smt/solver/fm-tactic.ts +886 -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 +178 -15
- 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 -1
- package/src/prover/smt/solver/hashtable.ts +34 -16
- 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 +111 -39
- package/src/prover/smt/solver/lackr.ts +381 -0
- package/src/prover/smt/solver/lbool.ts +0 -1
- 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 -1
- package/src/prover/smt/solver/logic-tactics.ts +355 -0
- package/src/prover/smt/solver/lp/bound-propagator.ts +0 -1
- package/src/prover/smt/solver/lp/constraints.ts +0 -1
- package/src/prover/smt/solver/lp/containers.ts +7 -2
- package/src/prover/smt/solver/lp/core-solver.ts +30 -11
- package/src/prover/smt/solver/lp/cross-nested.ts +1 -4
- package/src/prover/smt/solver/lp/dep-intervals.ts +0 -3
- package/src/prover/smt/solver/lp/dependency.ts +0 -2
- package/src/prover/smt/solver/lp/dioph-eq.ts +1 -10
- package/src/prover/smt/solver/lp/explanation.ts +0 -1
- package/src/prover/smt/solver/lp/gomory.ts +0 -1
- package/src/prover/smt/solver/lp/hnf-cutter.ts +1 -2
- package/src/prover/smt/solver/lp/hnf.ts +0 -3
- package/src/prover/smt/solver/lp/int-cube.ts +3 -4
- package/src/prover/smt/solver/lp/int-solver.ts +0 -2
- package/src/prover/smt/solver/lp/lar-solver.ts +41 -5
- package/src/prover/smt/solver/lp/lar-term.ts +0 -1
- package/src/prover/smt/solver/lp/lp-settings.ts +6 -3
- package/src/prover/smt/solver/lp/maximize-term.ts +59 -10
- package/src/prover/smt/solver/lp/nex-creator.ts +3 -3
- package/src/prover/smt/solver/lp/nex.ts +2 -2
- package/src/prover/smt/solver/lp/nla-backoff.ts +0 -2
- package/src/prover/smt/solver/lp/nla-basics.ts +46 -3
- package/src/prover/smt/solver/lp/nla-core.ts +68 -17
- package/src/prover/smt/solver/lp/nla-divisions.ts +0 -2
- package/src/prover/smt/solver/lp/nla-emonics.ts +0 -1
- package/src/prover/smt/solver/lp/nla-factorization.ts +0 -1
- package/src/prover/smt/solver/lp/nla-grobner.ts +167 -85
- package/src/prover/smt/solver/lp/nla-horner.ts +0 -2
- package/src/prover/smt/solver/lp/nla-intervals.ts +0 -1
- package/src/prover/smt/solver/lp/nla-monomial-bounds.ts +0 -2
- package/src/prover/smt/solver/lp/nla-monotone.ts +0 -1
- package/src/prover/smt/solver/lp/nla-order.ts +0 -2
- package/src/prover/smt/solver/lp/nla-patcher.ts +0 -1
- package/src/prover/smt/solver/lp/nla-powers.ts +220 -0
- package/src/prover/smt/solver/lp/nla-tangents.ts +0 -2
- package/src/prover/smt/solver/lp/nla-throttle.ts +0 -1
- package/src/prover/smt/solver/lp/nla-transcendentals.ts +324 -0
- package/src/prover/smt/solver/lp/nla-types.ts +0 -2
- package/src/prover/smt/solver/lp/nla-var-eqs.ts +0 -1
- package/src/prover/smt/solver/lp/nra-solver.ts +163 -99
- package/src/prover/smt/solver/lp/numeric-pair.ts +0 -1
- package/src/prover/smt/solver/lp/pdd-interval.ts +6 -3
- package/src/prover/smt/solver/lp/pdd-simplifier.ts +60 -21
- package/src/prover/smt/solver/lp/pdd-solver.ts +72 -41
- package/src/prover/smt/solver/lp/pdd.ts +725 -290
- package/src/prover/smt/solver/lp/random-updater.ts +0 -2
- package/src/prover/smt/solver/lp/static-matrix.ts +0 -1
- package/src/prover/smt/solver/lp/union-find.ts +7 -2
- package/src/prover/smt/solver/macro-finder.ts +530 -0
- package/src/prover/smt/solver/mam-compiler.ts +122 -90
- package/src/prover/smt/solver/mam-interpreter.ts +0 -1
- 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 -6
- 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 +19 -28
- package/src/prover/smt/solver/model-evaluator.ts +190 -12
- package/src/prover/smt/solver/model-finder.ts +12 -18
- package/src/prover/smt/solver/model-generator.ts +104 -35
- package/src/prover/smt/solver/model-macro-solver.ts +49 -46
- 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 +485 -0
- package/src/prover/smt/solver/nlsat/algebraic.ts +315 -98
- package/src/prover/smt/solver/nlsat/atoms.ts +71 -38
- package/src/prover/smt/solver/nlsat/evaluator.ts +0 -1
- package/src/prover/smt/solver/nlsat/explain.ts +427 -229
- package/src/prover/smt/solver/nlsat/interval-set.ts +1 -2
- package/src/prover/smt/solver/nlsat/levelwise.ts +460 -246
- package/src/prover/smt/solver/nlsat/mpbq.ts +45 -1
- package/src/prover/smt/solver/nlsat/polynomial.ts +2376 -684
- package/src/prover/smt/solver/nlsat/solver.ts +293 -92
- 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 -2
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +9 -8
- package/src/prover/smt/solver/nlsat/upolynomial.ts +41 -20
- package/src/prover/smt/solver/nlsat-tactic.ts +82 -0
- package/src/prover/smt/solver/nnf.ts +110 -24
- 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 +19 -11
- package/src/prover/smt/solver/pb-rewriter.ts +281 -0
- package/src/prover/smt/solver/pb2bv-tactic.ts +546 -0
- package/src/prover/smt/solver/poly-rewriter.ts +259 -57
- package/src/prover/smt/solver/probes.ts +577 -0
- package/src/prover/smt/solver/propagate-values.ts +37 -21
- package/src/prover/smt/solver/proto-model.ts +648 -19
- package/src/prover/smt/solver/pull-quant.ts +28 -12
- package/src/prover/smt/solver/purify-arith.ts +634 -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 -3
- package/src/prover/smt/solver/qe-lite-fm.ts +3 -4
- package/src/prover/smt/solver/qe-lite.ts +39 -19
- 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 -1
- 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 +16 -56
- package/src/prover/smt/solver/quantifier-analyzer.ts +19 -20
- package/src/prover/smt/solver/quantifier-manager.ts +22 -25
- package/src/prover/smt/solver/quasi-macros.ts +243 -0
- package/src/prover/smt/solver/random-gen.ts +0 -1
- package/src/prover/smt/solver/rational.ts +45 -1
- 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 -1
- package/src/prover/smt/solver/relevancy.ts +1 -2
- package/src/prover/smt/solver/rewriter-tpl.ts +82 -14
- package/src/prover/smt/solver/rewriter.ts +505 -60
- package/src/prover/smt/solver/rlimit.ts +45 -5
- 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 +589 -0
- package/src/prover/smt/solver/sat/inc-sat-solver.ts +480 -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 +72 -0
- package/src/prover/smt/solver/sat/sat2goal.ts +190 -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 +3535 -360
- package/src/prover/smt/solver/smtlib-script.ts +2136 -0
- package/src/prover/smt/solver/solve-eqs.ts +928 -0
- package/src/prover/smt/solver/solver.ts +128 -23
- package/src/prover/smt/solver/static-features.ts +314 -0
- package/src/prover/smt/solver/sticky-generations.ts +0 -1
- package/src/prover/smt/solver/tactic.ts +2176 -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 +53 -2
- package/src/prover/smt/solver/theory-lra-bounds.ts +31 -6
- package/src/prover/smt/solver/theory-lra-final-check.ts +57 -70
- package/src/prover/smt/solver/theory-lra-internalize.ts +96 -27
- package/src/prover/smt/solver/theory-lra-model.ts +20 -35
- package/src/prover/smt/solver/theory-lra-propagate.ts +35 -28
- package/src/prover/smt/solver/theory-lra-state.ts +7 -23
- package/src/prover/smt/solver/theory-lra.ts +189 -2
- 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 +495 -0
- package/src/prover/smt/solver/var-subst.ts +36 -14
- package/src/prover/smt/table.ts +3 -2
- package/src/prover/smt/types.ts +146 -0
- package/src/prover/tlapm/cache.ts +57 -26
- package/src/prover/tlapm/tlapm.ts +15 -9
- package/src/prover/tlapm-library.ts +3208 -0
- package/src/prover/verdict.ts +9 -0
- package/src/prover/zenon/check/check.ts +1 -2
- package/src/prover/zenon/check/records.ts +1 -1
- package/src/prover/zenon/check/relations.ts +2 -1
- package/src/prover/zenon/check/rewrites.ts +2 -15
- package/src/prover/zenon/check/sets.ts +40 -58
- package/src/prover/zenon/check/terms.ts +1 -2
- package/src/prover/zenon/decide.ts +10 -7
- package/src/prover/zenon/encode.ts +0 -2
- package/src/prover/zenon/eqrel.ts +2 -2
- package/src/prover/zenon/equality-rules.ts +24 -2
- package/src/prover/zenon/expr.ts +28 -2
- package/src/prover/zenon/index-table.ts +16 -23
- package/src/prover/zenon/isar-case.ts +1 -3
- package/src/prover/zenon/isar.ts +37 -39
- package/src/prover/zenon/llproof.ts +2 -13
- package/src/prover/zenon/mltoll.ts +12 -30
- package/src/prover/zenon/node.ts +20 -5
- package/src/prover/zenon/parse.ts +9 -8
- package/src/prover/zenon/phrase.ts +1 -3
- package/src/prover/zenon/proof.ts +0 -2
- package/src/prover/zenon/propositional-rules.ts +0 -2
- package/src/prover/zenon/rules.ts +2 -3
- package/src/prover/zenon/search.ts +11 -19
- package/src/prover/zenon/tla/functions.ts +2 -4
- package/src/prover/zenon/tla/llproof.ts +9 -13
- package/src/prover/zenon/tla/records.ts +1 -8
- package/src/prover/zenon/tla/rewrites.ts +0 -2
- package/src/prover/zenon/tla/sets.ts +22 -22
- package/src/prover/zenon/tla/terms.ts +0 -2
- package/src/prover/zenon/tla/tla.ts +7 -8
- package/src/resolve.ts +1327 -328
- package/src/runtime.ts +25 -2
- package/src/sany/builtins.ts +10 -10
- package/src/sany/generation.ts +384 -0
- package/src/sany/generator-def-entries.ts +297 -0
- package/src/sany/generator-definitions.ts +688 -0
- package/src/sany/generator-expressions.ts +1123 -0
- package/src/sany/generator-proofs.ts +668 -0
- package/src/sany/generator.ts +161 -2625
- package/src/sany/levels.ts +0 -2
- package/src/sany/lexer.ts +32 -23
- package/src/sany/linter.ts +0 -2
- package/src/sany/modules.ts +4 -2
- package/src/sany/nodes.ts +3 -4
- package/src/sany/report.ts +3 -6
- package/src/sany/selectors.ts +46 -44
- package/src/sany/xml.ts +25 -58
- package/src/search.ts +513 -165
- package/src/simulate.ts +340 -251
- package/src/spec-description.ts +48 -55
- package/src/standard-definitions.ts +5 -0
- package/src/standard-modules.ts +72 -54
- package/src/state-graph.ts +0 -2
- package/src/subexpressions.ts +564 -138
- package/src/substitution-levels.ts +5 -4
- package/src/successors.ts +56 -28
- package/src/symmetry.ts +4 -3
- package/src/tableau.ts +2 -2
- package/src/tlc/fingerprint.ts +81 -9
- package/src/tlc/jar-data.ts +10 -0
- package/src/tlc/messages.ts +23 -18
- package/src/tlc/order.ts +14 -3
- package/src/tlc/random.ts +6 -5
- package/src/tlc/replay.ts +152 -58
- package/src/tlc/summary.ts +29 -14
- package/src/tlc/tlc-operators.ts +12 -11
- package/src/tlc/tlcext-operators.ts +87 -26
- package/src/tlc/trace-spec.ts +27 -60
- package/src/trace-liveness.ts +529 -0
- package/src/typed-tier.ts +6556 -0
- package/src/typescript/actions.ts +2 -4
- package/src/typescript/collections.ts +34 -20
- package/src/typescript/compile.ts +1 -3
- package/src/typescript/formula.ts +5 -3
- package/src/typescript/model.ts +4 -5
- package/src/typescript/steps.ts +20 -18
- package/src/typescript/types.ts +2 -2
- package/src/values.ts +208 -227
- package/src/prover/isabelle/isar/statement.ts +0 -52
- 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
|
@@ -151,12 +151,13 @@ export const createInstanceChecker = (getModule: (name: string) => ModuleContext
|
|
|
151
151
|
return [{ ...declaration, level: data.level, operator: undefined, isLeibniz: true }];
|
|
152
152
|
}
|
|
153
153
|
const operand = analyzer.toOperand(expression, scope);
|
|
154
|
+
const operator = operand.kind === "Operator" ? operand.data : undefined;
|
|
154
155
|
return [
|
|
155
156
|
{
|
|
156
157
|
...declaration,
|
|
157
158
|
level: operand.data.level,
|
|
158
|
-
operator
|
|
159
|
-
isLeibniz:
|
|
159
|
+
operator,
|
|
160
|
+
isLeibniz: operator === undefined || operator.nonLeibniz.size === 0,
|
|
160
161
|
},
|
|
161
162
|
];
|
|
162
163
|
});
|
|
@@ -178,14 +179,14 @@ export const createInstanceChecker = (getModule: (name: string) => ModuleContext
|
|
|
178
179
|
addMessage(getLevelMessage(item.name, maximum));
|
|
179
180
|
const operator = item.operator;
|
|
180
181
|
if (!operator) return;
|
|
181
|
-
|
|
182
|
+
for (let index = 0; index < item.arity; index++) {
|
|
182
183
|
const minimum = levels.argConstraints.get(getArgumentKey(item.name, index));
|
|
183
184
|
if (minimum !== undefined && getMaxLevel(operator, index) < minimum) {
|
|
184
185
|
addMessage(
|
|
185
186
|
`Level error in instantiating module '${check.module}':\nThe level of the argument ${index + 1} of the operator ${operator.name} \nmust be at least ${minimum}.`,
|
|
186
187
|
);
|
|
187
188
|
}
|
|
188
|
-
}
|
|
189
|
+
}
|
|
189
190
|
});
|
|
190
191
|
levels.argParams.forEach((key) => {
|
|
191
192
|
const parameter = parseArgumentParamKey(key);
|
package/src/successors.ts
CHANGED
|
@@ -44,7 +44,7 @@ import {
|
|
|
44
44
|
type Scope,
|
|
45
45
|
type State,
|
|
46
46
|
} from "./evaluate";
|
|
47
|
-
import {
|
|
47
|
+
import { forEachChild } from "./instances";
|
|
48
48
|
import { CORE_OPERATORS } from "./standard-modules";
|
|
49
49
|
import { getRandomSubset, nextPrime, type JavaRandom } from "./tlc/random";
|
|
50
50
|
import {
|
|
@@ -68,13 +68,18 @@ export interface Successor {
|
|
|
68
68
|
action: string | undefined;
|
|
69
69
|
}
|
|
70
70
|
|
|
71
|
+
export interface SuccessorGenerator {
|
|
72
|
+
random: JavaRandom;
|
|
73
|
+
kept: number;
|
|
74
|
+
}
|
|
75
|
+
|
|
71
76
|
interface Run {
|
|
72
77
|
environment: Environment;
|
|
73
78
|
isInit: boolean;
|
|
74
79
|
isEnabled: boolean;
|
|
75
80
|
current: Value[] | undefined;
|
|
76
81
|
isStopped: boolean;
|
|
77
|
-
generator:
|
|
82
|
+
generator: SuccessorGenerator | undefined;
|
|
78
83
|
successors: number;
|
|
79
84
|
onUnsatisfied?: (state: Value[], conjunct: Expression) => void;
|
|
80
85
|
}
|
|
@@ -274,6 +279,7 @@ const getUnchangedVariables = (
|
|
|
274
279
|
|
|
275
280
|
const ACTION_KINDS = new Set([
|
|
276
281
|
"Label",
|
|
282
|
+
"Selection",
|
|
277
283
|
"And",
|
|
278
284
|
"Or",
|
|
279
285
|
"Exists",
|
|
@@ -319,18 +325,17 @@ const getReadLocals = (
|
|
|
319
325
|
}
|
|
320
326
|
const names: string[] = [];
|
|
321
327
|
let isReadOnly = true;
|
|
322
|
-
|
|
328
|
+
forEachChild(expression, (child, childNames) => {
|
|
323
329
|
const childLocals = isReadOnly
|
|
324
330
|
? getReadLocals(child, childNames.length === 0 ? bound : new Set([...bound, ...childNames]))
|
|
325
331
|
: [];
|
|
326
332
|
if (childLocals) names.push(...childLocals);
|
|
327
333
|
else isReadOnly = false;
|
|
328
|
-
return child;
|
|
329
334
|
});
|
|
330
335
|
return isReadOnly ? names : undefined;
|
|
331
336
|
};
|
|
332
337
|
|
|
333
|
-
const hasBranches = (
|
|
338
|
+
export const hasBranches = (
|
|
334
339
|
expression: Expression,
|
|
335
340
|
environment: Environment,
|
|
336
341
|
visited: Set<Definition>,
|
|
@@ -526,7 +531,7 @@ const compileMembership = (
|
|
|
526
531
|
run.environment.runtime.version,
|
|
527
532
|
)) {
|
|
528
533
|
onComplete(assign(partial, index, element), action);
|
|
529
|
-
if (run.
|
|
534
|
+
if (run.generator.kept > 0 || run.isStopped) return;
|
|
530
535
|
}
|
|
531
536
|
}
|
|
532
537
|
for (let position = 0; position < elements.length && !run.isStopped; position++) {
|
|
@@ -615,11 +620,10 @@ const compileFunctionAction = (
|
|
|
615
620
|
};
|
|
616
621
|
|
|
617
622
|
const compileUnchanged = (expression: Expression, environment: Environment): Runner => {
|
|
618
|
-
if (getUnchangedVariables(expression, environment))
|
|
619
|
-
return compileConjunction([getUnchangedWrapper(expression)], environment, false);
|
|
620
|
-
if (expression.kind === "Tuple")
|
|
621
|
-
return getRunner(getUnchangedWrapper(expression), environment, false);
|
|
622
623
|
const unchanged = getUnchangedWrapper(expression);
|
|
624
|
+
if (getUnchangedVariables(expression, environment))
|
|
625
|
+
return compileConjunction([unchanged], environment, false);
|
|
626
|
+
if (expression.kind === "Tuple") return getRunner(unchanged, environment, false);
|
|
623
627
|
return (run, scope, partial, action, isFixed, onComplete) => {
|
|
624
628
|
const binding =
|
|
625
629
|
expression.kind === "Identifier" ? lookupScope(scope, expression.name) : undefined;
|
|
@@ -725,6 +729,7 @@ const compileIdentifier = (
|
|
|
725
729
|
!definition ||
|
|
726
730
|
(expression.location.range && getStartupValue(definition, environment) !== undefined)
|
|
727
731
|
) {
|
|
732
|
+
// Deviation from TLC: Tool#getInitStates prints an unassigned variable's declaration as the non-boolean value it found.
|
|
728
733
|
guard(run, scope, partial, action, isFixed, onComplete);
|
|
729
734
|
return;
|
|
730
735
|
}
|
|
@@ -882,8 +887,8 @@ const compileRandomChoice =
|
|
|
882
887
|
(run, scope, partial, action, isFixed, onComplete) => {
|
|
883
888
|
const generator = run.generator;
|
|
884
889
|
if (!generator) throw new Error("A random choice needs the run's generator");
|
|
885
|
-
const start = Math.floor(generator.nextDouble() * choices.length);
|
|
886
|
-
const prime = nextPrime(generator);
|
|
890
|
+
const start = Math.floor(generator.random.nextDouble() * choices.length);
|
|
891
|
+
const prime = nextPrime(generator.random);
|
|
887
892
|
for (let attempt = 0; attempt < choices.length; attempt++) {
|
|
888
893
|
choices[(start + attempt * prime) % choices.length](
|
|
889
894
|
run,
|
|
@@ -893,7 +898,7 @@ const compileRandomChoice =
|
|
|
893
898
|
isFixed,
|
|
894
899
|
onComplete,
|
|
895
900
|
);
|
|
896
|
-
if (
|
|
901
|
+
if (generator.kept > 0 || run.isStopped) return;
|
|
897
902
|
}
|
|
898
903
|
};
|
|
899
904
|
|
|
@@ -917,7 +922,7 @@ const compileRandomExists = (
|
|
|
917
922
|
const visit = (position: number, boundScope: Scope | undefined): boolean => {
|
|
918
923
|
if (position < 0) {
|
|
919
924
|
body(run, boundScope, partial, action, isFixed, onComplete);
|
|
920
|
-
return run.
|
|
925
|
+
return (run.generator?.kept ?? 0) > 0 || run.isStopped;
|
|
921
926
|
}
|
|
922
927
|
const pattern = expression.bounds[position].pattern;
|
|
923
928
|
return orders[position].some((element) =>
|
|
@@ -928,6 +933,7 @@ const compileRandomExists = (
|
|
|
928
933
|
};
|
|
929
934
|
};
|
|
930
935
|
|
|
936
|
+
// Deviation from TLC: Tool#getNextStates in -generate throws an UnsupportedOperationException at a CASE, which tla-ts takes as the model checker does.
|
|
931
937
|
const compileRandomAction = (expression: Expression, environment: Environment) => {
|
|
932
938
|
if (expression.kind === "Exists") return compileRandomExists(expression, environment);
|
|
933
939
|
if (expression.kind !== "Or") return undefined;
|
|
@@ -1093,10 +1099,16 @@ const compileAction = (
|
|
|
1093
1099
|
case "Let": {
|
|
1094
1100
|
const body = getChildRunner(expression.body);
|
|
1095
1101
|
const reevaluated = getReevaluatedDefinitions(expression.definitions, environment);
|
|
1102
|
+
// TLC's Tool#enabled binds a LET's definitions to lazy values it caches, where Tool#getNextStates evaluates them at every use.
|
|
1103
|
+
const cached = { impure: new Set<Definition>(), streamed: reevaluated.streamed };
|
|
1096
1104
|
return (run, scope, partial, action, isFixed, onComplete) =>
|
|
1097
1105
|
body(
|
|
1098
1106
|
run,
|
|
1099
|
-
bindDefinitions(
|
|
1107
|
+
bindDefinitions(
|
|
1108
|
+
expression.definitions,
|
|
1109
|
+
getContext(run, scope, partial),
|
|
1110
|
+
run.isEnabled ? cached : reevaluated,
|
|
1111
|
+
),
|
|
1100
1112
|
partial,
|
|
1101
1113
|
action,
|
|
1102
1114
|
isFixed,
|
|
@@ -1141,6 +1153,8 @@ const compileAction = (
|
|
|
1141
1153
|
);
|
|
1142
1154
|
case "Label":
|
|
1143
1155
|
return getChildRunner(expression.body);
|
|
1156
|
+
case "Selection":
|
|
1157
|
+
return getChildRunner(expression.expression);
|
|
1144
1158
|
case "Identifier":
|
|
1145
1159
|
return compileIdentifier(expression, environment, isInit);
|
|
1146
1160
|
case "FunctionApplication":
|
|
@@ -1205,7 +1219,9 @@ export const isEnabled = (expression: Expression, context: Context): boolean =>
|
|
|
1205
1219
|
);
|
|
1206
1220
|
}
|
|
1207
1221
|
const environment = context.environment;
|
|
1208
|
-
if (environment.callStack
|
|
1222
|
+
if (environment.callStack || (environment.coverage && environment.coverage.current !== -1)) {
|
|
1223
|
+
return replayEnabled(expression, context.scope, state, environment);
|
|
1224
|
+
}
|
|
1209
1225
|
const run: Run = {
|
|
1210
1226
|
environment,
|
|
1211
1227
|
isInit: false,
|
|
@@ -1282,14 +1298,29 @@ export const getInitialStates = (
|
|
|
1282
1298
|
return states;
|
|
1283
1299
|
};
|
|
1284
1300
|
|
|
1301
|
+
export const createIncompleteSuccessorError = (
|
|
1302
|
+
partial: State,
|
|
1303
|
+
action: string | undefined,
|
|
1304
|
+
environment: Environment,
|
|
1305
|
+
) => {
|
|
1306
|
+
const missing = environment.variables.filter((_name, index) => partial[index] === undefined);
|
|
1307
|
+
return new TlaIncompleteSuccessorError(
|
|
1308
|
+
`Successor state is not completely specified by action ${action ?? "Next"}. The following variables are not assigned: ${missing.join(", ")}`,
|
|
1309
|
+
partial,
|
|
1310
|
+
action,
|
|
1311
|
+
missing,
|
|
1312
|
+
);
|
|
1313
|
+
};
|
|
1314
|
+
|
|
1285
1315
|
export const forEachSuccessor = (
|
|
1286
1316
|
expression: Expression,
|
|
1287
1317
|
state: Value[],
|
|
1288
1318
|
environment: Environment,
|
|
1289
1319
|
onSuccessor: (successor: Successor) => boolean,
|
|
1290
1320
|
scope?: Scope,
|
|
1291
|
-
generator?:
|
|
1321
|
+
generator?: SuccessorGenerator,
|
|
1292
1322
|
onUnsatisfied?: Run["onUnsatisfied"],
|
|
1323
|
+
onIncomplete?: (state: State, action: string | undefined) => void,
|
|
1293
1324
|
) => {
|
|
1294
1325
|
const run: Run = {
|
|
1295
1326
|
environment,
|
|
@@ -1310,15 +1341,11 @@ export const forEachSuccessor = (
|
|
|
1310
1341
|
(partial, action) => {
|
|
1311
1342
|
if (run.isStopped) return;
|
|
1312
1343
|
if (!isComplete(partial)) {
|
|
1313
|
-
|
|
1314
|
-
(
|
|
1315
|
-
|
|
1316
|
-
|
|
1317
|
-
|
|
1318
|
-
partial,
|
|
1319
|
-
action,
|
|
1320
|
-
missing,
|
|
1321
|
-
);
|
|
1344
|
+
if (onIncomplete) {
|
|
1345
|
+
onIncomplete(partial, action);
|
|
1346
|
+
return;
|
|
1347
|
+
}
|
|
1348
|
+
throw createIncompleteSuccessorError(partial, action, environment);
|
|
1322
1349
|
}
|
|
1323
1350
|
run.successors++;
|
|
1324
1351
|
run.isStopped = onSuccessor({ state: partial, action });
|
|
@@ -1342,6 +1369,7 @@ export const hasIncompleteSuccessor = (
|
|
|
1342
1369
|
generator: undefined,
|
|
1343
1370
|
successors: 0,
|
|
1344
1371
|
};
|
|
1372
|
+
// TLC's Tool#getState generates every successor of the action before it compares them.
|
|
1345
1373
|
getRunner(expression, environment, false)(
|
|
1346
1374
|
run,
|
|
1347
1375
|
scope,
|
|
@@ -1349,10 +1377,10 @@ export const hasIncompleteSuccessor = (
|
|
|
1349
1377
|
undefined,
|
|
1350
1378
|
false,
|
|
1351
1379
|
(partial) => {
|
|
1352
|
-
if (!isComplete(partial)) run.
|
|
1380
|
+
if (!isComplete(partial)) run.successors++;
|
|
1353
1381
|
},
|
|
1354
1382
|
);
|
|
1355
|
-
return run.
|
|
1383
|
+
return run.successors > 0;
|
|
1356
1384
|
};
|
|
1357
1385
|
|
|
1358
1386
|
export const getSuccessors = (
|
package/src/symmetry.ts
CHANGED
|
@@ -20,11 +20,11 @@ import {
|
|
|
20
20
|
type Value,
|
|
21
21
|
} from "./values";
|
|
22
22
|
|
|
23
|
-
type Images = Map<string, ModelValue>;
|
|
23
|
+
export type Images = Map<string, ModelValue>;
|
|
24
24
|
|
|
25
25
|
const getPermutationKey = (permutation: Images) =>
|
|
26
26
|
[...permutation]
|
|
27
|
-
.map((
|
|
27
|
+
.map((entry) => `${entry[0]}>${entry[1].name}`)
|
|
28
28
|
.sort()
|
|
29
29
|
.join(",");
|
|
30
30
|
|
|
@@ -139,6 +139,7 @@ export const getSymmetryGroup = (
|
|
|
139
139
|
`The set${isPlural ? "s" : ""} ${names.join(", and ")} ${isPlural ? "have" : "has"} been defined to be a symmetry set but contain${isPlural ? "" : "s"} less than two elements.`,
|
|
140
140
|
);
|
|
141
141
|
};
|
|
142
|
+
// Deviation from TLC: MVPerms#permutationSubgroup sizes a util.Set one below the number of permutations, which throws for fewer than two.
|
|
142
143
|
if (permutedSets.length >= elements.length) {
|
|
143
144
|
warnSmallSets(permutedSets);
|
|
144
145
|
return undefined;
|
|
@@ -222,7 +223,7 @@ const permuteSortedElements = (elements: Value[], images: Images) => {
|
|
|
222
223
|
return merged;
|
|
223
224
|
};
|
|
224
225
|
|
|
225
|
-
const permuteValue = (value: Value, images: Images): Value => {
|
|
226
|
+
export const permuteValue = (value: Value, images: Images): Value => {
|
|
226
227
|
if (typeof value !== "object") return value;
|
|
227
228
|
const kind = value.kind;
|
|
228
229
|
if (kind === "ModelValue") return images.get(value.name) ?? value;
|
package/src/tableau.ts
CHANGED
|
@@ -8,7 +8,7 @@ interface LiveBoolean {
|
|
|
8
8
|
value: boolean;
|
|
9
9
|
}
|
|
10
10
|
|
|
11
|
-
interface LiveState {
|
|
11
|
+
export interface LiveState {
|
|
12
12
|
kind: "State";
|
|
13
13
|
expression: Expression;
|
|
14
14
|
scope: Scope | undefined;
|
|
@@ -20,7 +20,7 @@ export interface LiveEnabled {
|
|
|
20
20
|
scope: Scope | undefined;
|
|
21
21
|
}
|
|
22
22
|
|
|
23
|
-
interface LiveAction {
|
|
23
|
+
export interface LiveAction {
|
|
24
24
|
kind: "Action";
|
|
25
25
|
expression: Expression;
|
|
26
26
|
subscript: Expression | undefined;
|
package/src/tlc/fingerprint.ts
CHANGED
|
@@ -249,21 +249,87 @@ const extendScalar = (value: boolean | number | string | ModelValue) => {
|
|
|
249
249
|
return 5;
|
|
250
250
|
};
|
|
251
251
|
|
|
252
|
+
// TLC's fingerprint is linear in the bytes it extends by. A scalar extends it as zero bytes of its
|
|
253
|
+
// length would, and then by its fingerprint from zero, so code may extend by a scalar it knows
|
|
254
|
+
// without inspecting it.
|
|
255
|
+
export const getScalarExtension = (value: boolean | number | string | ModelValue) => {
|
|
256
|
+
const outerHigh = high;
|
|
257
|
+
const outerLow = low;
|
|
258
|
+
high = 0;
|
|
259
|
+
low = 0;
|
|
260
|
+
const extension = [extendScalar(value), high, low];
|
|
261
|
+
high = outerHigh;
|
|
262
|
+
low = outerLow;
|
|
263
|
+
return extension;
|
|
264
|
+
};
|
|
265
|
+
|
|
266
|
+
// Code that extends a fingerprint in the locals h and l as the functions here extend theirs, with
|
|
267
|
+
// a local m and the tables FINGERPRINT_TABLES gives as H0 to H3 and L0 to L3.
|
|
268
|
+
const getByteCode = (byte: string) =>
|
|
269
|
+
`m = (${byte} ^ l) & 255; l = ((l >>> 8) | (h << 24)) ^ L0[m]; h = (h >>> 8) ^ H0[m];`;
|
|
270
|
+
const getWordCode = (word: string) =>
|
|
271
|
+
`m = l ^ ${word}; l = h ^ L3[m & 255] ^ L2[(m >>> 8) & 255] ^ L1[(m >>> 16) & 255] ^ L0[m >>> 24]; h = H3[m & 255] ^ H2[(m >>> 8) & 255] ^ H1[(m >>> 16) & 255] ^ H0[m >>> 24];`;
|
|
272
|
+
|
|
273
|
+
export const FINGERPRINT_CODE = {
|
|
274
|
+
integer: (value: string) => `${getByteCode(String(INT_VALUE))} ${getWordCode(value)}`,
|
|
275
|
+
boolean: (value: string) =>
|
|
276
|
+
`${getByteCode(String(BOOL_VALUE))} ${getByteCode(`(${value} ? 116 : 102)`)}`,
|
|
277
|
+
set: (length: string) => `${getByteCode(String(SET_ENUM_VALUE))} ${getWordCode(length)}`,
|
|
278
|
+
function: (length: string) => `${getByteCode(String(FCN_RCD_VALUE))} ${getWordCode(length)}`,
|
|
279
|
+
// A scalar of the extension getScalarExtension gives.
|
|
280
|
+
scalar: (length: string, scalarHigh: string, scalarLow: string) =>
|
|
281
|
+
`{ let r = ${length}; for (; r >= 4; r -= 4) { ${getWordCode("0")} } for (; r > 0; r--) { ${getByteCode("0")} } h ^= ${scalarHigh}; l ^= ${scalarLow}; }`,
|
|
282
|
+
};
|
|
283
|
+
|
|
284
|
+
export const getFingerprintTables = () => ({
|
|
285
|
+
H0: SLICE_HIGH_0,
|
|
286
|
+
H1: SLICE_HIGH_1,
|
|
287
|
+
H2: SLICE_HIGH_2,
|
|
288
|
+
H3: SLICE_HIGH_3,
|
|
289
|
+
L0: SLICE_LOW_0,
|
|
290
|
+
L1: SLICE_LOW_1,
|
|
291
|
+
L2: SLICE_LOW_2,
|
|
292
|
+
L3: SLICE_LOW_3,
|
|
293
|
+
initialHigh,
|
|
294
|
+
initialLow,
|
|
295
|
+
});
|
|
296
|
+
|
|
297
|
+
// Extends the fingerprint held in state, as low and high words, by a value.
|
|
298
|
+
export const extendFingerprint = (state: Int32Array, value: Value) => {
|
|
299
|
+
const outerHigh = high;
|
|
300
|
+
const outerLow = low;
|
|
301
|
+
low = state[0];
|
|
302
|
+
high = state[1];
|
|
303
|
+
extendValue(value);
|
|
304
|
+
state[0] = low;
|
|
305
|
+
state[1] = high;
|
|
306
|
+
high = outerHigh;
|
|
307
|
+
low = outerLow;
|
|
308
|
+
};
|
|
309
|
+
|
|
310
|
+
const extendSet = (length: number) => {
|
|
311
|
+
extendByte(SET_ENUM_VALUE);
|
|
312
|
+
extendInt(length);
|
|
313
|
+
};
|
|
314
|
+
|
|
315
|
+
const extendFunction = (length: number) => {
|
|
316
|
+
extendByte(FCN_RCD_VALUE);
|
|
317
|
+
extendInt(length);
|
|
318
|
+
};
|
|
319
|
+
|
|
252
320
|
const extendValue = (value: Value) => {
|
|
253
321
|
if (typeof value !== "object" || isModelValue(value)) {
|
|
254
322
|
extendScalar(value);
|
|
255
323
|
} else if (isFunctionValue(value)) {
|
|
256
324
|
const functionValue = toFiniteFunction(value);
|
|
257
|
-
|
|
258
|
-
extendInt(functionValue.domain.length);
|
|
325
|
+
extendFunction(functionValue.domain.length);
|
|
259
326
|
for (let index = 0; index < functionValue.domain.length; index++) {
|
|
260
327
|
extendValue(functionValue.domain[index]);
|
|
261
328
|
extendValue(functionValue.range[index]);
|
|
262
329
|
}
|
|
263
330
|
} else {
|
|
264
331
|
const elements = toFiniteSet(value).elements;
|
|
265
|
-
|
|
266
|
-
extendInt(elements.length);
|
|
332
|
+
extendSet(elements.length);
|
|
267
333
|
for (const element of elements) extendValue(element);
|
|
268
334
|
}
|
|
269
335
|
};
|
|
@@ -280,19 +346,25 @@ export const getTlcFingerprint = (state: Value[]) => {
|
|
|
280
346
|
return fingerprint;
|
|
281
347
|
};
|
|
282
348
|
|
|
283
|
-
|
|
284
|
-
|
|
349
|
+
// Fingerprints each of count states from the values extend adds for it.
|
|
350
|
+
const getExtendedFingerprints = (count: number, extend: (position: number) => void) => {
|
|
351
|
+
const fingerprints = new BigInt64Array(count);
|
|
285
352
|
const words = new Int32Array(fingerprints.buffer);
|
|
286
353
|
const outerHigh = high;
|
|
287
354
|
const outerLow = low;
|
|
288
|
-
|
|
355
|
+
for (let position = 0; position < count; position++) {
|
|
289
356
|
high = initialHigh;
|
|
290
357
|
low = initialLow;
|
|
291
|
-
|
|
358
|
+
extend(position);
|
|
292
359
|
words[2 * position] = low;
|
|
293
360
|
words[2 * position + 1] = high;
|
|
294
|
-
}
|
|
361
|
+
}
|
|
295
362
|
high = outerHigh;
|
|
296
363
|
low = outerLow;
|
|
297
364
|
return fingerprints;
|
|
298
365
|
};
|
|
366
|
+
|
|
367
|
+
export const getTlcFingerprints = (states: Value[][], order: number[]) =>
|
|
368
|
+
getExtendedFingerprints(states.length, (position) => {
|
|
369
|
+
for (const index of order) extendValue(states[position][index]);
|
|
370
|
+
});
|
package/src/tlc/jar-data.ts
CHANGED
|
@@ -143,6 +143,16 @@ export const SANY_OPERATOR_SYNONYMS = [
|
|
|
143
143
|
["^+", "⁺"],
|
|
144
144
|
];
|
|
145
145
|
|
|
146
|
+
const SYNONYMS = new Map(
|
|
147
|
+
SANY_OPERATOR_SYNONYMS.flatMap((names) => names.slice(1).map((synonym) => [synonym, names[0]])),
|
|
148
|
+
);
|
|
149
|
+
|
|
150
|
+
export const resolveSynonym = (name: string) =>
|
|
151
|
+
name
|
|
152
|
+
.split("!")
|
|
153
|
+
.map((part) => SYNONYMS.get(part) ?? (part === "~" ? "\\lnot" : part))
|
|
154
|
+
.join("!");
|
|
155
|
+
|
|
146
156
|
export const TLC_STARTUP_STRINGS = [
|
|
147
157
|
"STRING",
|
|
148
158
|
"FALSE",
|
package/src/tlc/messages.ts
CHANGED
|
@@ -116,38 +116,43 @@ const LEVEL_PREFIXES: Record<MessageLevel, string> = {
|
|
|
116
116
|
|
|
117
117
|
export interface MessagePrinter {
|
|
118
118
|
isTool: boolean;
|
|
119
|
+
isDiffTrace: boolean;
|
|
119
120
|
version: TlcVersion;
|
|
120
121
|
print: (code: number, level: MessageLevel, text: string) => void;
|
|
121
122
|
}
|
|
122
123
|
|
|
124
|
+
interface MessagePrinterOptions {
|
|
125
|
+
isTool: boolean;
|
|
126
|
+
isWarningEnabled?: boolean;
|
|
127
|
+
isDiffTrace?: boolean;
|
|
128
|
+
version?: TlcVersion;
|
|
129
|
+
suppressedCodes?: number[];
|
|
130
|
+
errorCodes?: number[];
|
|
131
|
+
}
|
|
132
|
+
|
|
123
133
|
export const formatMessage = (isTool: boolean, code: number, level: MessageLevel, text: string) =>
|
|
124
134
|
isTool
|
|
125
135
|
? `@!@!@STARTMSG ${code}:${level} @!@!@\n${text}\n@!@!@ENDMSG ${code} @!@!@`
|
|
126
136
|
: `${LEVEL_PREFIXES[level]}${text}`;
|
|
127
137
|
|
|
128
|
-
export const createMessagePrinter = (
|
|
129
|
-
isTool: boolean,
|
|
130
|
-
isWarningEnabled = true,
|
|
131
|
-
version: TlcVersion = "master",
|
|
132
|
-
suppressedCodes: number[] = [],
|
|
133
|
-
errorCodes: number[] = [],
|
|
134
|
-
): MessagePrinter => {
|
|
138
|
+
export const createMessagePrinter = (options: MessagePrinterOptions): MessagePrinter => {
|
|
135
139
|
const warnings = new Set<string>();
|
|
136
140
|
return {
|
|
137
|
-
isTool,
|
|
138
|
-
|
|
141
|
+
isTool: options.isTool,
|
|
142
|
+
isDiffTrace: options.isDiffTrace ?? false,
|
|
143
|
+
version: options.version ?? "master",
|
|
139
144
|
print: (code, level, text) => {
|
|
140
145
|
const isWarning = level === MESSAGE_LEVEL.warning;
|
|
141
|
-
if (isWarning && errorCodes
|
|
146
|
+
if (isWarning && options.errorCodes?.includes(code)) {
|
|
142
147
|
throw new TlaWarningAsError(code, text);
|
|
143
148
|
}
|
|
144
|
-
if (isWarning &&
|
|
145
|
-
if (level !== MESSAGE_LEVEL.error && suppressedCodes
|
|
149
|
+
if (isWarning && options.isWarningEnabled === false) return;
|
|
150
|
+
if (level !== MESSAGE_LEVEL.error && options.suppressedCodes?.includes(code)) return;
|
|
146
151
|
const hint =
|
|
147
|
-
isWarning && !isTool && warnings.size === 0
|
|
152
|
+
isWarning && !options.isTool && warnings.size === 0
|
|
148
153
|
? "\n(Use the -nowarning option to disable this warning.)"
|
|
149
154
|
: "";
|
|
150
|
-
const message = formatMessage(isTool, code, level, `${text}${hint}`);
|
|
155
|
+
const message = formatMessage(options.isTool, code, level, `${text}${hint}`);
|
|
151
156
|
if (isWarning && warnings.has(message)) return;
|
|
152
157
|
if (isWarning) warnings.add(message);
|
|
153
158
|
console.log(message);
|
|
@@ -340,14 +345,14 @@ interface CodedMessage {
|
|
|
340
345
|
let codedMessagePatterns: { pattern: RegExp; message: CodedMessage }[] | undefined;
|
|
341
346
|
|
|
342
347
|
const getCodedMessagePatterns = () =>
|
|
343
|
-
(codedMessagePatterns ??= CODED_MESSAGES.map((
|
|
348
|
+
(codedMessagePatterns ??= CODED_MESSAGES.map((codedMessage) => ({
|
|
344
349
|
pattern: new RegExp(
|
|
345
|
-
`^${
|
|
350
|
+
`^${codedMessage[1]
|
|
346
351
|
.split(/%\d+%/)
|
|
347
352
|
.map((part) => part.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"))
|
|
348
353
|
.join("[\\s\\S]*")}$`,
|
|
349
354
|
),
|
|
350
|
-
message: { code, isEvalException },
|
|
355
|
+
message: { code: codedMessage[0], isEvalException: codedMessage[2] },
|
|
351
356
|
})));
|
|
352
357
|
|
|
353
358
|
const UNCODED_MESSAGE_PATTERN =
|
|
@@ -386,7 +391,7 @@ export const formatNestedMessage = (text: string, isTool: boolean): string => {
|
|
|
386
391
|
: `@!@!@STARTMSG ${code}:${MESSAGE_LEVEL.none} @!@!@\n${formatInnerMessage(code, text, isTool)}\n@!@!@ENDMSG ${code} @!@!@`;
|
|
387
392
|
};
|
|
388
393
|
|
|
389
|
-
const zeroPad = (value: number) => String(value).padStart(
|
|
394
|
+
export const zeroPad = (value: number, length = 2) => String(value).padStart(length, "0");
|
|
390
395
|
|
|
391
396
|
export const formatTlcDuration = (milliseconds: number) => {
|
|
392
397
|
const seconds = Math.floor(milliseconds / 1000) % 60;
|
package/src/tlc/order.ts
CHANGED
|
@@ -444,7 +444,11 @@ const createContexts = (getParsed: ModuleSet) => {
|
|
|
444
444
|
};
|
|
445
445
|
};
|
|
446
446
|
|
|
447
|
-
const getStringOrder = (
|
|
447
|
+
const getStringOrder = (
|
|
448
|
+
getParsed: ModuleSet,
|
|
449
|
+
config: ModelConfig,
|
|
450
|
+
runtimeModules: string[],
|
|
451
|
+
): string[] => {
|
|
448
452
|
const order = new Set<string>();
|
|
449
453
|
const intern = (text: string) => {
|
|
450
454
|
order.add(text);
|
|
@@ -541,12 +545,19 @@ const getStringOrder = (getParsed: ModuleSet, config: ModelConfig): string[] =>
|
|
|
541
545
|
});
|
|
542
546
|
};
|
|
543
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
|
+
});
|
|
544
555
|
TLC_RUNTIME_STRINGS.forEach(intern);
|
|
545
556
|
return [...order];
|
|
546
557
|
};
|
|
547
558
|
|
|
548
559
|
export interface TlcOrder {
|
|
549
|
-
getStringOrder: (config: ModelConfig) => string[];
|
|
560
|
+
getStringOrder: (config: ModelConfig, runtimeModules: string[]) => string[];
|
|
550
561
|
getDeclarationOrder: (kind: "variable" | "constant") => string[];
|
|
551
562
|
createDefinitionOrder: () => (name: string | undefined) => string[];
|
|
552
563
|
parseModule: (source: string) => Module;
|
|
@@ -558,7 +569,7 @@ export const createTlcOrder = (source: string, loadModule: ModuleLoader): TlcOrd
|
|
|
558
569
|
let contexts: ReturnType<typeof createContexts> | undefined;
|
|
559
570
|
const getContexts = () => (contexts ??= createContexts(getParsed));
|
|
560
571
|
return {
|
|
561
|
-
getStringOrder: (config) => getStringOrder(getParsed, config),
|
|
572
|
+
getStringOrder: (config, runtimeModules) => getStringOrder(getParsed, config, runtimeModules),
|
|
562
573
|
getDeclarationOrder: (kind) =>
|
|
563
574
|
getContexts()
|
|
564
575
|
.getContext(undefined)
|
package/src/tlc/random.ts
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { toEnumeratedSet } from "../builtins";
|
|
2
2
|
import { TlaEvaluationError } from "../errors";
|
|
3
|
+
import { prettyPrint } from "../pretty-print";
|
|
3
4
|
import type { TlcVersion } from "./version";
|
|
4
5
|
import {
|
|
5
6
|
createRecord,
|
|
@@ -8,6 +9,7 @@ import {
|
|
|
8
9
|
formatValue,
|
|
9
10
|
getFunctionDomain,
|
|
10
11
|
isEmptySet,
|
|
12
|
+
MAXIMUM_INTEGER,
|
|
11
13
|
toFiniteSet,
|
|
12
14
|
type Value,
|
|
13
15
|
} from "../values";
|
|
@@ -21,7 +23,6 @@ export interface JavaRandom {
|
|
|
21
23
|
|
|
22
24
|
const MULTIPLIER = 0x5deece66dn;
|
|
23
25
|
const SEED_MASK = (1n << 48n) - 1n;
|
|
24
|
-
const MAXIMUM_INT = 2147483647;
|
|
25
26
|
|
|
26
27
|
export const createJavaRandom = (seed: bigint): JavaRandom => {
|
|
27
28
|
let state = (BigInt.asUintN(64, seed) ^ MULTIPLIER) & SEED_MASK;
|
|
@@ -39,7 +40,7 @@ export const createJavaRandom = (seed: bigint): JavaRandom => {
|
|
|
39
40
|
if ((bound & mask) === 0) return Number((BigInt(bound) * BigInt(first)) >> 31n);
|
|
40
41
|
for (let candidate = first; ; candidate = next(31)) {
|
|
41
42
|
const value = candidate % bound;
|
|
42
|
-
if (candidate - value + mask <=
|
|
43
|
+
if (candidate - value + mask <= MAXIMUM_INTEGER) return value;
|
|
43
44
|
}
|
|
44
45
|
},
|
|
45
46
|
nextLong: () => BigInt.asIntN(64, (BigInt(next(32)) << 32n) + BigInt(next(32))),
|
|
@@ -111,7 +112,7 @@ const getSubsetIndicesMaster = (count: number, size: number, random: JavaRandom)
|
|
|
111
112
|
|
|
112
113
|
const getSubsetIndices174 = (count: number, size: number, random: JavaRandom) => {
|
|
113
114
|
if (size <= 0) return [];
|
|
114
|
-
const stride = BigInt(size < 191 ? 191 :
|
|
115
|
+
const stride = BigInt(size < 191 ? 191 : MAXIMUM_INTEGER);
|
|
115
116
|
const offset = BigInt(random.nextInt(size));
|
|
116
117
|
return Array.from(
|
|
117
118
|
{ length: Math.min(count, size) },
|
|
@@ -192,7 +193,7 @@ export const getRandomSubset = (
|
|
|
192
193
|
if (product) {
|
|
193
194
|
const size = product.lists.reduce((total, list) => total * BigInt(list.length), 1n);
|
|
194
195
|
const indices =
|
|
195
|
-
size > BigInt(
|
|
196
|
+
size > BigInt(MAXIMUM_INTEGER)
|
|
196
197
|
? getLargeSubsetIndices(count, size, random)
|
|
197
198
|
: getSubsetIndices(count, Number(size), random);
|
|
198
199
|
return indices.map((index) => product.create(getProductElements(product.lists, index)));
|
|
@@ -226,7 +227,7 @@ export const getRandomElement = (set: Value, random: JavaRandom): Value => {
|
|
|
226
227
|
const offset = Math.floor(random.nextDouble() * size);
|
|
227
228
|
if (offset >= size) {
|
|
228
229
|
throw new TlaEvaluationError(
|
|
229
|
-
`Attempted to retrieve out-of-bounds element from the interval value ${formatValue(set)}.`,
|
|
230
|
+
`Attempted to retrieve out-of-bounds element from the interval value ${prettyPrint(formatValue(set))}.`,
|
|
230
231
|
);
|
|
231
232
|
}
|
|
232
233
|
return set.low + offset;
|