tla-ts 0.0.10-dev.28c823e4b → 0.0.10-dev.4a2a53c48
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 +57 -53
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +3 -0
- package/dist/index.d.ts +3 -0
- package/dist/index.js +1 -1
- package/dist/parallel-worker.cjs +1 -1
- package/dist/parallel-worker.js +1 -1
- package/dist/prove.cjs +2683 -427
- package/dist/prove.js +2681 -425
- package/dist/run.cjs +45 -42
- package/dist/run.js +47 -44
- package/dist/tlapm.cjs +2 -2
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +42 -39
- package/dist/transfer.js +44 -41
- package/dist/worker.cjs +7 -7
- package/dist/worker.js +7 -7
- package/package.json +1 -1
- package/src/ast.ts +41 -36
- package/src/builtins.ts +4 -13
- package/src/check-failure.ts +116 -0
- package/src/check-trace.ts +282 -0
- package/src/check.ts +353 -549
- package/src/cli/options.ts +6 -31
- package/src/cli/shared.ts +1 -1
- package/src/cli/tlapm.ts +433 -70
- package/src/cli/tlc-arguments.ts +222 -210
- package/src/cli/tlc-output.ts +687 -0
- package/src/cli/tlc-usage.ts +1 -2
- package/src/cli/tlc.ts +49 -702
- package/src/cli/xml-exporter.ts +23 -33
- package/src/codegen.ts +5 -10
- package/src/coverage.ts +3 -10
- package/src/dependencies.ts +30 -14
- package/src/dfid.ts +16 -16
- package/src/environment-config.ts +315 -0
- package/src/environment.ts +55 -338
- package/src/errors.ts +33 -5
- package/src/evaluate.ts +5 -4
- package/src/exit-codes.ts +1 -0
- package/src/fingerprints.ts +65 -1
- package/src/instances.ts +47 -10
- package/src/java-hash.ts +7 -0
- package/src/json.ts +4 -7
- package/src/levels.ts +39 -42
- package/src/lexer.ts +5 -3
- package/src/liveness-checker.ts +553 -237
- package/src/liveness.ts +94 -86
- 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 +38 -8
- package/src/obligations/levels.ts +24 -11
- package/src/obligations/module.ts +28 -41
- package/src/obligations/normalize.ts +26 -14
- package/src/obligations/operators.ts +0 -2
- package/src/obligations/pragma.ts +53 -16
- package/src/obligations/printer.ts +43 -13
- 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 +118 -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 +10 -30
- package/src/parallel.ts +24 -47
- package/src/parser.ts +580 -180
- 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 +224 -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 +0 -2
- package/src/prover/isabelle/provers/classical.ts +45 -20
- package/src/prover/isabelle/provers/hypsubst.ts +17 -28
- 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 +6 -17
- 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 +0 -2
- 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/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 +1021 -618
- 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 -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 +613 -6
- 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 +309 -0
- package/src/prover/smt/solver/asserted-formulas.ts +87 -16
- package/src/prover/smt/solver/ast-lt.ts +166 -12
- package/src/prover/smt/solver/ast-util.ts +160 -2
- package/src/prover/smt/solver/ast.ts +1427 -41
- package/src/prover/smt/solver/auf-solver.ts +2 -6
- package/src/prover/smt/solver/bit-blast-tactic.ts +582 -0
- package/src/prover/smt/solver/bit-blaster.ts +871 -0
- package/src/prover/smt/solver/bound-manager.ts +196 -0
- package/src/prover/smt/solver/bound-simplifier.ts +600 -0
- package/src/prover/smt/solver/bv-bound-chk.ts +492 -0
- package/src/prover/smt/solver/bv-decl-plugin.ts +338 -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 +110 -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 +278 -0
- package/src/prover/smt/solver/conflict-resolution.ts +78 -2
- package/src/prover/smt/solver/context.ts +516 -115
- package/src/prover/smt/solver/ctx-simplify.ts +20 -10
- package/src/prover/smt/solver/ctx-solver-simplify.ts +122 -0
- package/src/prover/smt/solver/datatype-decl-plugin.ts +572 -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 +81 -0
- package/src/prover/smt/solver/der.ts +38 -10
- package/src/prover/smt/solver/diff-neq.ts +206 -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 +260 -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-small-bv-tactic.ts +129 -0
- package/src/prover/smt/solver/elim-uncnstr.ts +545 -0
- package/src/prover/smt/solver/enode.ts +100 -3
- 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 +907 -0
- package/src/prover/smt/solver/euf/euf-solver.ts +1205 -0
- package/src/prover/smt/solver/euf/fpa-solver.ts +317 -0
- package/src/prover/smt/solver/euf/mam.ts +1050 -0
- package/src/prover/smt/solver/euf/q-ematch.ts +830 -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 +335 -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 +146 -0
- package/src/prover/smt/solver/factor.ts +141 -0
- package/src/prover/smt/solver/fd-solver.ts +265 -0
- package/src/prover/smt/solver/fingerprints.ts +15 -15
- package/src/prover/smt/solver/fix-dl-var.ts +148 -0
- package/src/prover/smt/solver/flat-literals.ts +0 -1
- 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 +640 -0
- package/src/prover/smt/solver/fpa2bv-converter.ts +2249 -0
- package/src/prover/smt/solver/fpa2bv-rewriter.ts +348 -0
- package/src/prover/smt/solver/fpa2bv-tactic.ts +73 -0
- package/src/prover/smt/solver/goal.ts +175 -15
- package/src/prover/smt/solver/goal2nlsat.ts +189 -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 +30 -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 +110 -38
- 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 +345 -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 +0 -1
- package/src/prover/smt/solver/lp/core-solver.ts +18 -3
- package/src/prover/smt/solver/lp/cross-nested.ts +0 -1
- 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 +40 -4
- package/src/prover/smt/solver/lp/lar-term.ts +0 -1
- package/src/prover/smt/solver/lp/lp-settings.ts +0 -1
- package/src/prover/smt/solver/lp/maximize-term.ts +59 -10
- package/src/prover/smt/solver/lp/nex-creator.ts +0 -1
- package/src/prover/smt/solver/lp/nex.ts +0 -1
- package/src/prover/smt/solver/lp/nla-backoff.ts +0 -2
- package/src/prover/smt/solver/lp/nla-basics.ts +0 -2
- package/src/prover/smt/solver/lp/nla-core.ts +42 -11
- 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 +9 -4
- 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 +25 -4
- package/src/prover/smt/solver/lp/numeric-pair.ts +0 -1
- package/src/prover/smt/solver/lp/pdd-interval.ts +0 -1
- package/src/prover/smt/solver/lp/pdd-simplifier.ts +0 -1
- package/src/prover/smt/solver/lp/pdd-solver.ts +0 -2
- package/src/prover/smt/solver/lp/pdd.ts +2 -2
- 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 +309 -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 +105 -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 +18 -27
- package/src/prover/smt/solver/model-evaluator.ts +188 -12
- package/src/prover/smt/solver/model-finder.ts +12 -18
- package/src/prover/smt/solver/model-generator.ts +56 -29
- 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 +711 -0
- package/src/prover/smt/solver/mus.ts +51 -0
- package/src/prover/smt/solver/muz/dl-context.ts +404 -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 +496 -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 +201 -0
- package/src/prover/smt/solver/muz/rule-properties.ts +337 -0
- package/src/prover/smt/solver/muz/spacer-context.ts +1406 -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 +218 -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 +125 -12
- package/src/prover/smt/solver/nlsat/atoms.ts +20 -6
- package/src/prover/smt/solver/nlsat/evaluator.ts +0 -1
- package/src/prover/smt/solver/nlsat/explain.ts +63 -23
- package/src/prover/smt/solver/nlsat/interval-set.ts +1 -2
- package/src/prover/smt/solver/nlsat/levelwise.ts +3 -9
- package/src/prover/smt/solver/nlsat/mpbq.ts +45 -1
- package/src/prover/smt/solver/nlsat/polynomial.ts +13 -6
- package/src/prover/smt/solver/nlsat/solver.ts +234 -36
- package/src/prover/smt/solver/nlsat/transcendental-eval.ts +310 -0
- package/src/prover/smt/solver/nlsat/transcendentals.ts +367 -0
- package/src/prover/smt/solver/nlsat/types.ts +0 -2
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +1 -4
- package/src/prover/smt/solver/nlsat/upolynomial.ts +0 -2
- package/src/prover/smt/solver/nlsat-tactic.ts +82 -0
- package/src/prover/smt/solver/nnf.ts +105 -23
- 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 +787 -0
- package/src/prover/smt/solver/opt-nlsat.ts +375 -0
- package/src/prover/smt/solver/opt-pareto.ts +282 -0
- package/src/prover/smt/solver/opt-preprocess.ts +101 -0
- package/src/prover/smt/solver/opt-solver.ts +308 -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 +284 -0
- package/src/prover/smt/solver/pb2bv-tactic.ts +540 -0
- package/src/prover/smt/solver/poly-rewriter.ts +202 -57
- package/src/prover/smt/solver/probes.ts +512 -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 +632 -0
- package/src/prover/smt/solver/qe-arith-plugin.ts +1098 -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 +37 -17
- package/src/prover/smt/solver/qe-mbp.ts +270 -0
- package/src/prover/smt/solver/qe.ts +1498 -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 +814 -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 +8 -16
- 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 +261 -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 +77 -10
- package/src/prover/smt/solver/rewriter.ts +475 -36
- package/src/prover/smt/solver/rlimit.ts +25 -2
- 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 +526 -0
- package/src/prover/smt/solver/sat/inc-sat-solver.ts +378 -0
- package/src/prover/smt/solver/sat/model-converter.ts +136 -0
- package/src/prover/smt/solver/sat/pb-constraint.ts +261 -0
- package/src/prover/smt/solver/sat/pb-solver.ts +1577 -0
- package/src/prover/smt/solver/sat/probing.ts +170 -0
- package/src/prover/smt/solver/sat/sat-tactic.ts +43 -0
- package/src/prover/smt/solver/sat/sat2goal.ts +165 -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 +2127 -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 +1010 -0
- package/src/prover/smt/solver/seq-decl-plugin.ts +819 -0
- package/src/prover/smt/solver/seq-derive.ts +1301 -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 +728 -0
- package/src/prover/smt/solver/seq-range-predicate.ts +235 -0
- package/src/prover/smt/solver/seq-re-rewriter.ts +1170 -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 +2402 -0
- package/src/prover/smt/solver/seq-skolem.ts +317 -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 +83 -0
- package/src/prover/smt/solver/smt-logics.ts +66 -0
- package/src/prover/smt/solver/smt-setup.ts +496 -0
- package/src/prover/smt/solver/smt2-printer.ts +765 -0
- package/src/prover/smt/solver/smtlib-parser.ts +3126 -316
- package/src/prover/smt/solver/smtlib-script.ts +1631 -0
- package/src/prover/smt/solver/solve-eqs.ts +929 -0
- package/src/prover/smt/solver/solver.ts +113 -22
- 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 +1986 -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 +1200 -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 +56 -70
- package/src/prover/smt/solver/theory-lra-internalize.ts +86 -27
- package/src/prover/smt/solver/theory-lra-model.ts +20 -35
- package/src/prover/smt/solver/theory-lra-propagate.ts +24 -26
- package/src/prover/smt/solver/theory-lra-state.ts +6 -22
- package/src/prover/smt/solver/theory-lra.ts +188 -1
- package/src/prover/smt/solver/theory-pb.ts +934 -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 +871 -0
- package/src/prover/smt/solver/theory-seq.ts +961 -0
- package/src/prover/smt/solver/theory.ts +189 -0
- package/src/prover/smt/solver/tseitin-cnf.ts +485 -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 +50 -19
- 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 +0 -2
- package/src/prover/zenon/expr.ts +7 -2
- package/src/prover/zenon/index-table.ts +9 -21
- package/src/prover/zenon/isar-case.ts +0 -2
- package/src/prover/zenon/isar.ts +35 -37
- 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 +0 -2
- package/src/prover/zenon/proof.ts +0 -2
- package/src/prover/zenon/propositional-rules.ts +0 -2
- package/src/prover/zenon/rules.ts +0 -2
- 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 +56 -74
- package/src/runtime.ts +4 -0
- package/src/sany/generation.ts +394 -0
- package/src/sany/generator-def-entries.ts +210 -0
- package/src/sany/generator-definitions.ts +686 -0
- package/src/sany/generator-expressions.ts +1100 -0
- package/src/sany/generator-proofs.ts +662 -0
- package/src/sany/generator.ts +155 -2625
- package/src/sany/levels.ts +0 -2
- package/src/sany/lexer.ts +17 -16
- package/src/sany/linter.ts +0 -2
- package/src/sany/nodes.ts +6 -13
- package/src/sany/report.ts +3 -6
- package/src/sany/selectors.ts +35 -38
- package/src/sany/xml.ts +23 -55
- package/src/search.ts +205 -43
- package/src/simulate.ts +160 -133
- package/src/spec-description.ts +33 -48
- package/src/standard-definitions.ts +4 -0
- package/src/standard-modules.ts +16 -32
- package/src/state-graph.ts +2 -9
- package/src/substitution-levels.ts +5 -4
- package/src/successors.ts +6 -8
- package/src/symmetry.ts +2 -2
- package/src/tableau.ts +2 -2
- package/src/tlc/fingerprint.ts +81 -9
- package/src/tlc/messages.ts +20 -15
- package/src/tlc/order.ts +2 -9
- package/src/tlc/random.ts +4 -4
- package/src/tlc/replay.ts +8 -15
- package/src/tlc/summary.ts +29 -14
- package/src/tlc/tlc-operators.ts +2 -3
- package/src/tlc/tlcext-operators.ts +44 -12
- package/src/tlc/trace-spec.ts +25 -45
- package/src/typed-tier.ts +6535 -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/values.ts +63 -158
- 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
package/src/simulate.ts
CHANGED
|
@@ -11,15 +11,9 @@ import {
|
|
|
11
11
|
UNEXPECTED_EXCEPTION,
|
|
12
12
|
} from "./errors";
|
|
13
13
|
import { EXIT_STATUS, getMessageExitStatus, withLivenessExitCode } from "./exit-codes";
|
|
14
|
-
import { createLivenessChecker } from "./liveness-checker";
|
|
14
|
+
import { createLivenessChecker, type LivenessChecker } from "./liveness-checker";
|
|
15
15
|
import { getIncompleteSuccessorMessage, prepareSearch, reportAssumptionViolation } from "./search";
|
|
16
|
-
import {
|
|
17
|
-
getActionLabel,
|
|
18
|
-
getInitActions,
|
|
19
|
-
getNextActions,
|
|
20
|
-
toActionValue,
|
|
21
|
-
type SpecAction,
|
|
22
|
-
} from "./spec-description";
|
|
16
|
+
import { getActionLabel, toActionValue, type SpecAction } from "./spec-description";
|
|
23
17
|
import { forEachInitialState, forEachSuccessor } from "./successors";
|
|
24
18
|
import {
|
|
25
19
|
formatInnerMessage,
|
|
@@ -32,7 +26,7 @@ import {
|
|
|
32
26
|
MESSAGE_CODE,
|
|
33
27
|
withUnexpectedException,
|
|
34
28
|
} from "./tlc/messages";
|
|
35
|
-
import { createJavaRandom, nextPrime } from "./tlc/random";
|
|
29
|
+
import { createJavaRandom, nextPrime, type JavaRandom } from "./tlc/random";
|
|
36
30
|
import { createCounterExample } from "./tlc/tlcext-operators";
|
|
37
31
|
import {
|
|
38
32
|
createModelValue,
|
|
@@ -100,8 +94,131 @@ const RL_REWARD = -10;
|
|
|
100
94
|
const isSameState = (left: Value[], right: Value[]) =>
|
|
101
95
|
left.every((value, index) => isSameValue(value, right[index]));
|
|
102
96
|
|
|
97
|
+
const getTrace = (last: TraceNode) => {
|
|
98
|
+
const trace: TraceNode[] = [];
|
|
99
|
+
for (let node: TraceNode | undefined = last; node; node = node.predecessor) {
|
|
100
|
+
const predecessor = node.predecessor;
|
|
101
|
+
if (predecessor && isSameState(node.state, predecessor.state)) continue;
|
|
102
|
+
trace.unshift(node);
|
|
103
|
+
}
|
|
104
|
+
trace.forEach((node, index) => {
|
|
105
|
+
node.predecessor = trace[index - 1];
|
|
106
|
+
node.level = index + 1;
|
|
107
|
+
});
|
|
108
|
+
return trace;
|
|
109
|
+
};
|
|
110
|
+
|
|
111
|
+
const findTemporalViolation = (
|
|
112
|
+
trace: TraceNode[],
|
|
113
|
+
getFingerprint: (state: Value[]) => bigint,
|
|
114
|
+
createChecker: (successors: number[][], states: Value[][]) => LivenessChecker | undefined,
|
|
115
|
+
) => {
|
|
116
|
+
const fingerprints = trace.map((node) => getFingerprint(node.state));
|
|
117
|
+
const indices = new Map<bigint, number>();
|
|
118
|
+
const states: Value[][] = [];
|
|
119
|
+
const successors: number[][] = [];
|
|
120
|
+
fingerprints.forEach((fingerprint, position) => {
|
|
121
|
+
if (!indices.has(fingerprint)) {
|
|
122
|
+
indices.set(fingerprint, states.length);
|
|
123
|
+
states.push(trace[position].state);
|
|
124
|
+
successors.push([]);
|
|
125
|
+
}
|
|
126
|
+
if (position === 0) return;
|
|
127
|
+
const source = indices.get(fingerprints[position - 1]) ?? 0;
|
|
128
|
+
const target = indices.get(fingerprint) ?? 0;
|
|
129
|
+
if (source !== target && !successors[source].includes(target)) {
|
|
130
|
+
successors[source].push(target);
|
|
131
|
+
}
|
|
132
|
+
});
|
|
133
|
+
const checker = createChecker(successors, states);
|
|
134
|
+
if (!checker) return undefined;
|
|
135
|
+
checker.addInitialState(0, states[0]);
|
|
136
|
+
states.forEach((state, index) =>
|
|
137
|
+
checker.addState(
|
|
138
|
+
index,
|
|
139
|
+
state,
|
|
140
|
+
successors[index].map((successor) => ({ index: successor, state: states[successor] })),
|
|
141
|
+
),
|
|
142
|
+
);
|
|
143
|
+
const lasso = checker.findViolation();
|
|
144
|
+
if (!lasso) return undefined;
|
|
145
|
+
const getLength = (path: number[]) =>
|
|
146
|
+
path.filter((index, position) => position === 0 || index !== path[position - 1]).length;
|
|
147
|
+
const path = [...lasso.prefix, ...lasso.cycle];
|
|
148
|
+
const length = getLength(path);
|
|
149
|
+
const cyclePosition = getLength(path.slice(0, lasso.prefix.length + 1));
|
|
150
|
+
const isStuttering =
|
|
151
|
+
fingerprints[length - 1] === getFingerprint(states[path[lasso.prefix.length]]);
|
|
152
|
+
return {
|
|
153
|
+
length,
|
|
154
|
+
loopStart: isStuttering ? length - 1 : cyclePosition - 1,
|
|
155
|
+
properties: checker.getViolatedProperties(
|
|
156
|
+
trace.slice(0, length).map((node) => node.state),
|
|
157
|
+
cyclePosition - 1,
|
|
158
|
+
),
|
|
159
|
+
};
|
|
160
|
+
};
|
|
161
|
+
|
|
162
|
+
const createScheduler = (
|
|
163
|
+
scheduler: SimulationOptions["scheduler"],
|
|
164
|
+
nextActions: SpecAction[],
|
|
165
|
+
random: JavaRandom,
|
|
166
|
+
getFingerprint: (state: Value[]) => bigint,
|
|
167
|
+
getReward: (state: Value[] | undefined, next: Value[], fallback: number) => number,
|
|
168
|
+
) => {
|
|
169
|
+
const qualities = nextActions.map(() => new Map<bigint | SpecAction, number>());
|
|
170
|
+
const getQualityKey = (node: TraceNode) =>
|
|
171
|
+
scheduler === "rlaction" ? node.action : getFingerprint(node.state);
|
|
172
|
+
const getRewardOf = (node: TraceNode) =>
|
|
173
|
+
getReward(node.predecessor?.state, node.state, RL_REWARD);
|
|
174
|
+
return {
|
|
175
|
+
getNextActionIndex: (node: TraceNode) => {
|
|
176
|
+
if (scheduler === "random") {
|
|
177
|
+
return Math.floor(random.nextDouble() * nextActions.length);
|
|
178
|
+
}
|
|
179
|
+
const key = getQualityKey(node);
|
|
180
|
+
qualities.forEach((quality) => {
|
|
181
|
+
if (!quality.has(key)) quality.set(key, 0);
|
|
182
|
+
});
|
|
183
|
+
const weights = qualities.map((quality) => Math.exp(quality.get(key) ?? 0));
|
|
184
|
+
const total = weights.reduce((sum, weight) => sum + weight, 0);
|
|
185
|
+
const ranked = weights
|
|
186
|
+
.map((weight, index) => ({ index, weight: weight / total }))
|
|
187
|
+
.sort((left, right) => right.weight - left.weight);
|
|
188
|
+
const threshold = random.nextDouble();
|
|
189
|
+
let cumulativeWeight = 0;
|
|
190
|
+
const chosen = ranked.find((item, position) => {
|
|
191
|
+
cumulativeWeight = position === 0 ? item.weight : cumulativeWeight + item.weight;
|
|
192
|
+
return cumulativeWeight >= threshold;
|
|
193
|
+
});
|
|
194
|
+
return (chosen ?? ranked[ranked.length - 1]).index;
|
|
195
|
+
},
|
|
196
|
+
markDisabled: (index: number, node: TraceNode) => {
|
|
197
|
+
if (scheduler === "random") return;
|
|
198
|
+
// TLC's rlaction scheduler stores the reward, then overwrites it as the rl scheduler does.
|
|
199
|
+
if (scheduler === "rlaction") getRewardOf(node);
|
|
200
|
+
qualities[index].set(getQualityKey(node), -Number.MAX_VALUE);
|
|
201
|
+
},
|
|
202
|
+
learnTrace: (last: TraceNode) => {
|
|
203
|
+
for (let node = last; node.predecessor; node = node.predecessor) {
|
|
204
|
+
const key = getQualityKey(node);
|
|
205
|
+
const maxQuality = qualities.reduce(
|
|
206
|
+
(max, quality) => Math.max(max, quality.get(key) ?? -Number.MAX_VALUE),
|
|
207
|
+
-Number.MAX_VALUE,
|
|
208
|
+
);
|
|
209
|
+
const quality = qualities[nextActions.indexOf(node.action)];
|
|
210
|
+
const predecessorKey = getQualityKey(node.predecessor);
|
|
211
|
+
quality.set(
|
|
212
|
+
predecessorKey,
|
|
213
|
+
(1 - RL_ALPHA) * (quality.get(predecessorKey) ?? 0) +
|
|
214
|
+
RL_ALPHA * (getRewardOf(node) + RL_GAMMA * maxQuality),
|
|
215
|
+
);
|
|
216
|
+
}
|
|
217
|
+
},
|
|
218
|
+
};
|
|
219
|
+
};
|
|
220
|
+
|
|
103
221
|
export const simulate = (options: SimulationOptions): number => {
|
|
104
|
-
const isTool = options.isTool ?? false;
|
|
105
222
|
const output = options.onSimulation;
|
|
106
223
|
const prepared = prepareSearch(options);
|
|
107
224
|
const config = prepared.config;
|
|
@@ -111,6 +228,7 @@ export const simulate = (options: SimulationOptions): number => {
|
|
|
111
228
|
const search = prepared.search;
|
|
112
229
|
const seed = options.seed ?? 0n;
|
|
113
230
|
const traceDepth = options.traceDepth === -1 ? INFINITE_DEPTH : options.traceDepth;
|
|
231
|
+
const traceLimit = options.traceCount ?? (1n << 63n) - 1n;
|
|
114
232
|
const random = createJavaRandom(seed);
|
|
115
233
|
for (let index = 0n; index < options.aril; index++) random.nextDouble();
|
|
116
234
|
const workerRandom = createJavaRandom(random.nextLong());
|
|
@@ -126,10 +244,13 @@ export const simulate = (options: SimulationOptions): number => {
|
|
|
126
244
|
output({ kind: "message", code, isError, message: text, toolMessage: toolText });
|
|
127
245
|
const printSummary = () => output({ kind: "summary", statistics: { ...statistics } });
|
|
128
246
|
const nodes = new WeakMap<(Value | undefined)[], TraceNode>();
|
|
129
|
-
const
|
|
130
|
-
const
|
|
247
|
+
const description = prepared.getDescription();
|
|
248
|
+
const initActions = description.inits;
|
|
249
|
+
const nextActions = description.actions;
|
|
131
250
|
let traceCount = 0;
|
|
132
251
|
let currentTrace = 0;
|
|
252
|
+
let evaluatedAction: SpecAction | undefined;
|
|
253
|
+
runtime.getSuccessorAction = () => evaluatedAction;
|
|
133
254
|
runtime.getLevel = (state) => nodes.get(state)?.level ?? 0;
|
|
134
255
|
runtime.getBehavior = (state) => {
|
|
135
256
|
const node = nodes.get(state);
|
|
@@ -150,7 +271,7 @@ export const simulate = (options: SimulationOptions): number => {
|
|
|
150
271
|
return createRecord([
|
|
151
272
|
["mode", options.isGenerating ? "generate" : "simulate"],
|
|
152
273
|
["depth", traceDepth === INFINITE_DEPTH ? -1 : traceDepth],
|
|
153
|
-
["traces", Number(BigInt.asIntN(32,
|
|
274
|
+
["traces", Number(BigInt.asIntN(32, traceLimit))],
|
|
154
275
|
["deadlock", config.checkDeadlock],
|
|
155
276
|
["seed", String(seed)],
|
|
156
277
|
["aril", String(options.aril)],
|
|
@@ -227,19 +348,6 @@ export const simulate = (options: SimulationOptions): number => {
|
|
|
227
348
|
nodes.set(state, node);
|
|
228
349
|
return node;
|
|
229
350
|
};
|
|
230
|
-
const getTrace = (last: TraceNode) => {
|
|
231
|
-
const trace: TraceNode[] = [];
|
|
232
|
-
for (let node: TraceNode | undefined = last; node; node = node.predecessor) {
|
|
233
|
-
const predecessor = node.predecessor;
|
|
234
|
-
if (predecessor && isSameState(node.state, predecessor.state)) continue;
|
|
235
|
-
trace.unshift(node);
|
|
236
|
-
}
|
|
237
|
-
trace.forEach((node, index) => {
|
|
238
|
-
node.predecessor = trace[index - 1];
|
|
239
|
-
node.level = index + 1;
|
|
240
|
-
});
|
|
241
|
-
return trace;
|
|
242
|
-
};
|
|
243
351
|
const toRecord = (state: (Value | undefined)[]) =>
|
|
244
352
|
search.toRecord(state.map((value) => value ?? createModelValue("null")));
|
|
245
353
|
const toTraceSteps = (trace: TraceNode[]): TraceStep[] =>
|
|
@@ -253,7 +361,7 @@ export const simulate = (options: SimulationOptions): number => {
|
|
|
253
361
|
config.alias,
|
|
254
362
|
node.state,
|
|
255
363
|
(trace[index + 1] ?? node).state,
|
|
256
|
-
isTool,
|
|
364
|
+
options.isTool ?? false,
|
|
257
365
|
),
|
|
258
366
|
}));
|
|
259
367
|
const getCounterExample = (trace: TraceNode[]) =>
|
|
@@ -368,60 +476,6 @@ export const simulate = (options: SimulationOptions): number => {
|
|
|
368
476
|
false,
|
|
369
477
|
);
|
|
370
478
|
|
|
371
|
-
const findTemporalViolation = (last: TraceNode): Violation | undefined => {
|
|
372
|
-
if (temporalProperties.length === 0) return undefined;
|
|
373
|
-
const trace = getTrace(last);
|
|
374
|
-
const fingerprints = trace.map((node) => runtime.getFingerprint(node.state));
|
|
375
|
-
const indices = new Map<bigint, number>();
|
|
376
|
-
const states: Value[][] = [];
|
|
377
|
-
const successors: number[][] = [];
|
|
378
|
-
fingerprints.forEach((fingerprint, position) => {
|
|
379
|
-
if (!indices.has(fingerprint)) {
|
|
380
|
-
indices.set(fingerprint, states.length);
|
|
381
|
-
states.push(trace[position].state);
|
|
382
|
-
successors.push([]);
|
|
383
|
-
}
|
|
384
|
-
if (position === 0) return;
|
|
385
|
-
const source = indices.get(fingerprints[position - 1]) ?? 0;
|
|
386
|
-
const target = indices.get(fingerprint) ?? 0;
|
|
387
|
-
if (source !== target && !successors[source].includes(target)) {
|
|
388
|
-
successors[source].push(target);
|
|
389
|
-
}
|
|
390
|
-
});
|
|
391
|
-
const checker = createTemporalChecker(successors, states);
|
|
392
|
-
if (!checker) return undefined;
|
|
393
|
-
checker.addInitialState(0, states[0]);
|
|
394
|
-
states.forEach((state, index) =>
|
|
395
|
-
checker.addState(
|
|
396
|
-
index,
|
|
397
|
-
state,
|
|
398
|
-
successors[index].map((successor) => ({ index: successor, state: states[successor] })),
|
|
399
|
-
),
|
|
400
|
-
);
|
|
401
|
-
const lasso = checker.findViolation();
|
|
402
|
-
if (!lasso) return undefined;
|
|
403
|
-
const getLength = (path: number[]) =>
|
|
404
|
-
path.filter((index, position) => position === 0 || index !== path[position - 1]).length;
|
|
405
|
-
const path = [...lasso.prefix, ...lasso.cycle];
|
|
406
|
-
const length = getLength(path);
|
|
407
|
-
const cyclePosition = getLength(path.slice(0, lasso.prefix.length + 1));
|
|
408
|
-
const printed = trace.slice(0, length);
|
|
409
|
-
const isStuttering =
|
|
410
|
-
fingerprints[length - 1] === runtime.getFingerprint(states[path[lasso.prefix.length]]);
|
|
411
|
-
const loopStart = isStuttering ? length - 1 : cyclePosition - 1;
|
|
412
|
-
const properties = checker.getViolatedProperties(
|
|
413
|
-
printed.map((node) => node.state),
|
|
414
|
-
cyclePosition - 1,
|
|
415
|
-
);
|
|
416
|
-
const back = trace[length];
|
|
417
|
-
return {
|
|
418
|
-
name: properties[0],
|
|
419
|
-
properties,
|
|
420
|
-
trace: toTraceSteps(printed),
|
|
421
|
-
loopStart,
|
|
422
|
-
loopLabel: back && getActionLabel(back.action, options.version, back.level === 1),
|
|
423
|
-
};
|
|
424
|
-
};
|
|
425
479
|
const toWorkerError = (code: number, text: string, node: TraceNode): WorkerError => ({
|
|
426
480
|
code,
|
|
427
481
|
message: text,
|
|
@@ -434,6 +488,7 @@ export const simulate = (options: SimulationOptions): number => {
|
|
|
434
488
|
const successors: TraceNode[] = [];
|
|
435
489
|
let failure: WorkerError | undefined;
|
|
436
490
|
runtime.deferred = undefined;
|
|
491
|
+
evaluatedAction = action;
|
|
437
492
|
try {
|
|
438
493
|
forEachSuccessor(
|
|
439
494
|
action.expression,
|
|
@@ -501,59 +556,32 @@ export const simulate = (options: SimulationOptions): number => {
|
|
|
501
556
|
return { successors, error: failure };
|
|
502
557
|
};
|
|
503
558
|
let currentNode = initialStates[0];
|
|
504
|
-
const
|
|
505
|
-
|
|
506
|
-
|
|
507
|
-
|
|
508
|
-
|
|
509
|
-
|
|
510
|
-
|
|
511
|
-
|
|
512
|
-
|
|
513
|
-
const
|
|
514
|
-
|
|
515
|
-
|
|
516
|
-
|
|
517
|
-
|
|
518
|
-
|
|
519
|
-
|
|
520
|
-
.
|
|
521
|
-
.
|
|
522
|
-
|
|
523
|
-
|
|
524
|
-
const chosen = ranked.find((item, position) => {
|
|
525
|
-
cumulativeWeight = position === 0 ? item.weight : cumulativeWeight + item.weight;
|
|
526
|
-
return cumulativeWeight >= threshold;
|
|
527
|
-
});
|
|
528
|
-
return (chosen ?? ranked[ranked.length - 1]).index;
|
|
529
|
-
};
|
|
530
|
-
const markDisabled = (index: number, node: TraceNode) => {
|
|
531
|
-
if (options.scheduler === "random") return;
|
|
532
|
-
// TLC's rlaction scheduler stores the reward, then overwrites it as the rl scheduler does.
|
|
533
|
-
if (options.scheduler === "rlaction") getRewardOf(node);
|
|
534
|
-
qualities[index].set(getQualityKey(node), -Number.MAX_VALUE);
|
|
535
|
-
};
|
|
536
|
-
const learnTrace = (last: TraceNode) => {
|
|
537
|
-
for (let node = last; node.predecessor; node = node.predecessor) {
|
|
538
|
-
const key = getQualityKey(node);
|
|
539
|
-
const maxQuality = qualities.reduce(
|
|
540
|
-
(max, quality) => Math.max(max, quality.get(key) ?? -Number.MAX_VALUE),
|
|
541
|
-
-Number.MAX_VALUE,
|
|
542
|
-
);
|
|
543
|
-
const quality = qualities[nextActions.indexOf(node.action)];
|
|
544
|
-
const predecessorKey = getQualityKey(node.predecessor);
|
|
545
|
-
quality.set(
|
|
546
|
-
predecessorKey,
|
|
547
|
-
(1 - RL_ALPHA) * (quality.get(predecessorKey) ?? 0) +
|
|
548
|
-
RL_ALPHA * (getRewardOf(node) + RL_GAMMA * maxQuality),
|
|
549
|
-
);
|
|
550
|
-
}
|
|
559
|
+
const scheduler = createScheduler(
|
|
560
|
+
options.scheduler,
|
|
561
|
+
nextActions,
|
|
562
|
+
workerRandom,
|
|
563
|
+
runtime.getFingerprint,
|
|
564
|
+
search.getReward,
|
|
565
|
+
);
|
|
566
|
+
const getTemporalViolation = (last: TraceNode): Violation | undefined => {
|
|
567
|
+
if (temporalProperties.length === 0) return undefined;
|
|
568
|
+
const trace = getTrace(last);
|
|
569
|
+
const found = findTemporalViolation(trace, runtime.getFingerprint, createTemporalChecker);
|
|
570
|
+
if (!found) return undefined;
|
|
571
|
+
const back = trace[found.length];
|
|
572
|
+
return {
|
|
573
|
+
name: found.properties[0],
|
|
574
|
+
properties: found.properties,
|
|
575
|
+
trace: toTraceSteps(trace.slice(0, found.length)),
|
|
576
|
+
loopStart: found.loopStart,
|
|
577
|
+
loopLabel: back && getActionLabel(back.action, options.version, back.level === 1),
|
|
578
|
+
};
|
|
551
579
|
};
|
|
552
580
|
const simulateTrace = (): WorkerError | "stopped" | undefined => {
|
|
553
581
|
currentNode = initialStates[Math.floor(workerRandom.nextDouble() * initialStates.length)];
|
|
554
582
|
for (let depth = 0; depth < traceDepth; depth++) {
|
|
555
583
|
if (runtime.isStopped) return "stopped";
|
|
556
|
-
let actionIndex = getNextActionIndex(currentNode);
|
|
584
|
+
let actionIndex = scheduler.getNextActionIndex(currentNode);
|
|
557
585
|
const prime = nextPrime(workerRandom);
|
|
558
586
|
let successors: TraceNode[] = [];
|
|
559
587
|
for (let attempt = 0; attempt < nextActions.length; attempt++) {
|
|
@@ -561,7 +589,7 @@ export const simulate = (options: SimulationOptions): number => {
|
|
|
561
589
|
if (result.error) return result.error;
|
|
562
590
|
successors = result.successors;
|
|
563
591
|
if (successors.length > 0) break;
|
|
564
|
-
markDisabled(actionIndex, currentNode);
|
|
592
|
+
scheduler.markDisabled(actionIndex, currentNode);
|
|
565
593
|
actionIndex = (actionIndex + prime) % nextActions.length;
|
|
566
594
|
}
|
|
567
595
|
if (successors.length === 0) {
|
|
@@ -574,7 +602,7 @@ export const simulate = (options: SimulationOptions): number => {
|
|
|
574
602
|
currentNode.deferred?.(currentNode.state);
|
|
575
603
|
}
|
|
576
604
|
if (runtime.isStopped) return "stopped";
|
|
577
|
-
const violation =
|
|
605
|
+
const violation = getTemporalViolation(currentNode);
|
|
578
606
|
if (violation) {
|
|
579
607
|
return {
|
|
580
608
|
...toWorkerError(MESSAGE_CODE.temporalPropertyViolated, "", currentNode),
|
|
@@ -586,7 +614,7 @@ export const simulate = (options: SimulationOptions): number => {
|
|
|
586
614
|
const delta = length - statistics.levelMean;
|
|
587
615
|
statistics.levelMean += Math.trunc(delta / Math.max(statistics.traces, 1));
|
|
588
616
|
statistics.levelM2 += delta * (length - statistics.levelMean);
|
|
589
|
-
if (options.scheduler === "rl") learnTrace(currentNode);
|
|
617
|
+
if (options.scheduler === "rl") scheduler.learnTrace(currentNode);
|
|
590
618
|
return undefined;
|
|
591
619
|
};
|
|
592
620
|
const toException = (error: unknown, node: TraceNode): WorkerError => {
|
|
@@ -617,7 +645,6 @@ export const simulate = (options: SimulationOptions): number => {
|
|
|
617
645
|
runtime.getRandom = () => enumerableRandom;
|
|
618
646
|
const errors: WorkerError[] = [];
|
|
619
647
|
const isContinued = options.isContinued ?? false;
|
|
620
|
-
const traceLimit = options.traceCount ?? (1n << 63n) - 1n;
|
|
621
648
|
while (true) {
|
|
622
649
|
statistics.traces++;
|
|
623
650
|
currentTrace = statistics.traces;
|
package/src/spec-description.ts
CHANGED
|
@@ -39,10 +39,13 @@ export interface SpecAction {
|
|
|
39
39
|
scope: Scope | undefined;
|
|
40
40
|
}
|
|
41
41
|
|
|
42
|
-
interface SpecDescription {
|
|
42
|
+
export interface SpecDescription {
|
|
43
43
|
inits: SpecAction[];
|
|
44
44
|
actions: SpecAction[];
|
|
45
45
|
temporals: SpecAction[];
|
|
46
|
+
}
|
|
47
|
+
|
|
48
|
+
interface PropertyDescription {
|
|
46
49
|
invariants: SpecAction[];
|
|
47
50
|
impliedInits: SpecAction[];
|
|
48
51
|
impliedActions: SpecAction[];
|
|
@@ -180,6 +183,16 @@ const unwrapBinding = (
|
|
|
180
183
|
return thunk && { expression: thunk.expression, scope: thunk.scope };
|
|
181
184
|
};
|
|
182
185
|
|
|
186
|
+
const getCallScope = (
|
|
187
|
+
called: Closure,
|
|
188
|
+
expression: Expression,
|
|
189
|
+
scope: Scope | undefined,
|
|
190
|
+
environment: Environment,
|
|
191
|
+
) =>
|
|
192
|
+
expression.kind === "Apply"
|
|
193
|
+
? bindOperatorArguments(called, expression.args, getConstantContext(environment, scope))
|
|
194
|
+
: called.scope;
|
|
195
|
+
|
|
183
196
|
const getParameters = (closure: Closure | undefined, scope: Scope | undefined) =>
|
|
184
197
|
(closure?.params ?? []).flatMap((param): [string, Value][] => {
|
|
185
198
|
const binding = lookupScope(scope, param.name);
|
|
@@ -388,7 +401,7 @@ const describeProperty = (
|
|
|
388
401
|
expression: Expression,
|
|
389
402
|
scope: Scope | undefined,
|
|
390
403
|
environment: Environment,
|
|
391
|
-
description:
|
|
404
|
+
description: PropertyDescription,
|
|
392
405
|
): void => {
|
|
393
406
|
const recurse = (inner: Expression, innerScope: Scope | undefined) =>
|
|
394
407
|
describeProperty(configName, inner, innerScope, environment, description);
|
|
@@ -400,12 +413,7 @@ const describeProperty = (
|
|
|
400
413
|
const called = resolveClosure(expression, scope, environment);
|
|
401
414
|
if (called && isConstantDefinition(called, environment)) return;
|
|
402
415
|
if (called && called.params.length === getArguments(expression).length) {
|
|
403
|
-
recurse(
|
|
404
|
-
called.body,
|
|
405
|
-
expression.kind === "Apply"
|
|
406
|
-
? bindOperatorArguments(called, expression.args, getConstantContext(environment, scope))
|
|
407
|
-
: called.scope,
|
|
408
|
-
);
|
|
416
|
+
recurse(called.body, getCallScope(called, expression, scope, environment));
|
|
409
417
|
return;
|
|
410
418
|
}
|
|
411
419
|
if (expression.kind === "Forall") {
|
|
@@ -451,20 +459,13 @@ const getOperatorDefinition = (name: string, environment: Environment) => {
|
|
|
451
459
|
: undefined;
|
|
452
460
|
};
|
|
453
461
|
|
|
454
|
-
|
|
462
|
+
// Tool's constructor describes the specification once, so a caller keeps the description and never walks it again.
|
|
463
|
+
export const getSpecDescription = (
|
|
455
464
|
config: ModelConfig,
|
|
456
465
|
environment: Environment,
|
|
457
466
|
instanceActions: Map<string, InstanceAction>,
|
|
458
467
|
) => {
|
|
459
|
-
const description: SpecDescription = {
|
|
460
|
-
inits: [],
|
|
461
|
-
actions: [],
|
|
462
|
-
temporals: [],
|
|
463
|
-
invariants: [],
|
|
464
|
-
impliedInits: [],
|
|
465
|
-
impliedActions: [],
|
|
466
|
-
impliedTemporals: [],
|
|
467
|
-
};
|
|
468
|
+
const description: SpecDescription = { inits: [], actions: [], temporals: [] };
|
|
468
469
|
const next: NextItem[] = [];
|
|
469
470
|
const specification =
|
|
470
471
|
config.specification === undefined
|
|
@@ -546,32 +547,11 @@ export const getSubscriptVariables = (
|
|
|
546
547
|
if (!called || called.params.length !== getArguments(expression).length) return true;
|
|
547
548
|
const definition = getDefinition(called.name, environment);
|
|
548
549
|
if (definition?.body === called.body && isStartupValue(definition, environment)) return true;
|
|
549
|
-
return collect(
|
|
550
|
-
called.body,
|
|
551
|
-
expression.kind === "Apply"
|
|
552
|
-
? bindOperatorArguments(
|
|
553
|
-
called,
|
|
554
|
-
expression.args,
|
|
555
|
-
getConstantContext(environment, innerScope),
|
|
556
|
-
)
|
|
557
|
-
: called.scope,
|
|
558
|
-
);
|
|
550
|
+
return collect(called.body, getCallScope(called, expression, innerScope, environment));
|
|
559
551
|
};
|
|
560
552
|
return collect(subscript, scope) ? variables : undefined;
|
|
561
553
|
};
|
|
562
554
|
|
|
563
|
-
export const getInitActions = (
|
|
564
|
-
config: ModelConfig,
|
|
565
|
-
environment: Environment,
|
|
566
|
-
instanceActions: Map<string, InstanceAction>,
|
|
567
|
-
) => getSpecDescription(config, environment, instanceActions).inits;
|
|
568
|
-
|
|
569
|
-
export const getNextActions = (
|
|
570
|
-
config: ModelConfig,
|
|
571
|
-
environment: Environment,
|
|
572
|
-
instanceActions: Map<string, InstanceAction>,
|
|
573
|
-
) => getSpecDescription(config, environment, instanceActions).actions;
|
|
574
|
-
|
|
575
555
|
const formatParameters = (action: SpecAction) =>
|
|
576
556
|
action.parameters.length === 0
|
|
577
557
|
? ""
|
|
@@ -584,19 +564,24 @@ export const getActionSignature = (action: SpecAction) =>
|
|
|
584
564
|
`${action.name}${formatParameters(action)}`;
|
|
585
565
|
|
|
586
566
|
export const getSpecificationValue = (
|
|
567
|
+
description: SpecDescription,
|
|
587
568
|
config: ModelConfig,
|
|
588
569
|
environment: Environment,
|
|
589
570
|
variableLocations: SourceLocation[],
|
|
590
|
-
instanceActions: Map<string, InstanceAction>,
|
|
591
571
|
): Value => {
|
|
592
|
-
const
|
|
572
|
+
const properties: PropertyDescription = {
|
|
573
|
+
invariants: [],
|
|
574
|
+
impliedInits: [],
|
|
575
|
+
impliedActions: [],
|
|
576
|
+
impliedTemporals: [],
|
|
577
|
+
};
|
|
593
578
|
config.invariants.forEach((name) => {
|
|
594
579
|
const definition = getOperatorDefinition(name, environment);
|
|
595
|
-
if (definition)
|
|
580
|
+
if (definition) properties.invariants.push(createAction(name, definition.body));
|
|
596
581
|
});
|
|
597
582
|
config.properties.forEach((name) => {
|
|
598
583
|
const definition = getOperatorDefinition(name, environment);
|
|
599
|
-
if (definition) describeProperty(name, definition.body, undefined, environment,
|
|
584
|
+
if (definition) describeProperty(name, definition.body, undefined, environment, properties);
|
|
600
585
|
});
|
|
601
586
|
const coverage = environment.coverage;
|
|
602
587
|
const toSet = (actions: SpecAction[], kind?: CoverageKind) =>
|
|
@@ -624,10 +609,10 @@ export const getSpecificationValue = (
|
|
|
624
609
|
["inits", toSet(description.inits, "init")],
|
|
625
610
|
["actions", toSet(description.actions, "next")],
|
|
626
611
|
["temporals", toSet(description.temporals)],
|
|
627
|
-
["invariants", toSet(
|
|
628
|
-
["impliedinits", toSet(
|
|
629
|
-
["impliedactions", toSet(
|
|
630
|
-
["impliedtemporals", toSet(
|
|
612
|
+
["invariants", toSet(properties.invariants, "invariant")],
|
|
613
|
+
["impliedinits", toSet(properties.impliedInits, "implied")],
|
|
614
|
+
["impliedactions", toSet(properties.impliedActions, "implied")],
|
|
615
|
+
["impliedtemporals", toSet(properties.impliedTemporals)],
|
|
631
616
|
[
|
|
632
617
|
"variables",
|
|
633
618
|
createSet(
|
|
@@ -81,6 +81,10 @@ const SIGNATURES: Signature[] = [
|
|
|
81
81
|
["RandomSubset", 0, [0, 0], [2, 2], [1, 1]],
|
|
82
82
|
["RandomSetOfSubsets", 0, [0, 0, 0], [2, 3, 2], [1, 0, 1]],
|
|
83
83
|
["TestRandomSetOfSubsets", 0, [0, 0, 0], [2, 3, 2], [1, 0, 1]],
|
|
84
|
+
["_Track", 0, [0, 0], [3, 2], [0, 0]],
|
|
85
|
+
["_Counts", 0, [], [], []],
|
|
86
|
+
["_CheckName", 0, [0], [2], [1]],
|
|
87
|
+
["_PrintCounts", 0, [], [], []],
|
|
84
88
|
];
|
|
85
89
|
|
|
86
90
|
export const STANDARD_LEVELS = new Map(
|
package/src/standard-modules.ts
CHANGED
|
@@ -35,7 +35,6 @@ import {
|
|
|
35
35
|
createSet,
|
|
36
36
|
createSortedSet,
|
|
37
37
|
compareValues,
|
|
38
|
-
describeKind,
|
|
39
38
|
createTuple,
|
|
40
39
|
getSortedDifference,
|
|
41
40
|
formatValue,
|
|
@@ -76,11 +75,6 @@ import {
|
|
|
76
75
|
import type { TlcVersion } from "./tlc/version";
|
|
77
76
|
import { getSanyStandardModules } from "./sany/modules";
|
|
78
77
|
|
|
79
|
-
interface StandardModule {
|
|
80
|
-
extends: string[];
|
|
81
|
-
operators: Builtin[];
|
|
82
|
-
}
|
|
83
|
-
|
|
84
78
|
const isSubsetOf = (left: Value[], right: Value) =>
|
|
85
79
|
left.every((element) => isElementOf(element, right));
|
|
86
80
|
|
|
@@ -501,16 +495,7 @@ const createSequencesOperators = (version: TlcVersion) =>
|
|
|
501
495
|
|
|
502
496
|
const createFiniteSetsOperators = (version: TlcVersion) =>
|
|
503
497
|
withJavaMethods("FiniteSets", [
|
|
504
|
-
defineOperator("IsFiniteSet", 1, (args) =>
|
|
505
|
-
const value = getValue(args, 0, "IsFiniteSet");
|
|
506
|
-
if (isSetValue(value)) return isFiniteSet(value);
|
|
507
|
-
if (typeof value === "object" && value.kind === "Function") return true;
|
|
508
|
-
throw new TlaEvaluationError(
|
|
509
|
-
typeof value === "object" && value.kind === "LazyFunction"
|
|
510
|
-
? `Attempted to check if the function:\n${formatValue(value)}\nis a finite set.`
|
|
511
|
-
: `Attempted to check if the ${describeKind(value)} ${formatValue(value)} is a finite set.`,
|
|
512
|
-
);
|
|
513
|
-
}),
|
|
498
|
+
defineOperator("IsFiniteSet", 1, (args) => isFiniteSet(getValue(args, 0, "IsFiniteSet"))),
|
|
514
499
|
defineOperator("Cardinality", 1, (args) => {
|
|
515
500
|
const set = getValue(args, 0, "Cardinality");
|
|
516
501
|
if (
|
|
@@ -593,7 +578,7 @@ export const getJavaOverrides = (
|
|
|
593
578
|
if (name === "IOUtils") return createIoUtilsOperators(files, evaluateReplaced);
|
|
594
579
|
if (name === "_TLCTrace") return createTlcTraceOperators(files);
|
|
595
580
|
if (!getSanyStandardModules(runtime.version).has(name)) return undefined;
|
|
596
|
-
const operators =
|
|
581
|
+
const operators = getStandardOperators(name, print, runtime, files, builtins);
|
|
597
582
|
return name === "Randomization" && operators
|
|
598
583
|
? [...operators, createRandomSubsetSet(runtime)]
|
|
599
584
|
: operators;
|
|
@@ -611,37 +596,36 @@ export const STANDARD_DEPENDENCIES = new Map([
|
|
|
611
596
|
["TLCExt", ["TLC", "Integers", "Naturals", "Sequences", "FiniteSets"]],
|
|
612
597
|
]);
|
|
613
598
|
|
|
614
|
-
export const
|
|
599
|
+
export const STANDARD_EXTENDS = new Map([["Integers", ["Naturals"]]]);
|
|
600
|
+
|
|
601
|
+
export const getStandardOperators = (
|
|
615
602
|
name: string,
|
|
616
603
|
print: (text: string) => void,
|
|
617
604
|
runtime: CheckerRuntime,
|
|
618
605
|
files: FileSystem,
|
|
619
606
|
builtins: ReadonlyMap<string, Builtin>,
|
|
620
|
-
):
|
|
607
|
+
): Builtin[] | undefined => {
|
|
621
608
|
switch (name) {
|
|
622
609
|
case "Naturals":
|
|
623
|
-
return
|
|
610
|
+
return NATURALS_OPERATORS;
|
|
624
611
|
case "Integers":
|
|
625
|
-
return
|
|
612
|
+
return INTEGERS_OPERATORS;
|
|
626
613
|
case "Sequences":
|
|
627
|
-
return
|
|
614
|
+
return createSequencesOperators(runtime.version);
|
|
628
615
|
case "FiniteSets":
|
|
629
|
-
return
|
|
616
|
+
return createFiniteSetsOperators(runtime.version);
|
|
630
617
|
case "TLC":
|
|
631
|
-
return
|
|
618
|
+
return withJavaMethods("TLC", createTlcOperators(print, runtime));
|
|
632
619
|
case "Randomization":
|
|
633
|
-
return
|
|
620
|
+
return createRandomizationOperators(runtime);
|
|
634
621
|
case "_Possible":
|
|
635
|
-
return
|
|
622
|
+
return createPossibleOperators(print, runtime);
|
|
636
623
|
case "Json":
|
|
637
|
-
return
|
|
624
|
+
return createJsonOperators(files);
|
|
638
625
|
case "Bags":
|
|
639
|
-
return
|
|
626
|
+
return withJavaMethods("Bags", createBagsOperators(builtins));
|
|
640
627
|
case "TLCExt":
|
|
641
|
-
return
|
|
642
|
-
extends: [],
|
|
643
|
-
operators: withJavaMethods("TLCExt", createTlcExtOperators(print, runtime)),
|
|
644
|
-
};
|
|
628
|
+
return withJavaMethods("TLCExt", createTlcExtOperators(print, runtime));
|
|
645
629
|
default:
|
|
646
630
|
return undefined;
|
|
647
631
|
}
|