tla-ts 0.0.10-dev.b4a856304 → 0.0.10-dev.c92e6a4ea
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 +37 -0
- package/dist/index.d.ts +37 -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 -44
- package/dist/run.js +45 -44
- package/dist/tlapm.cjs +2 -2
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +44 -41
- package/dist/transfer.js +45 -42
- package/dist/worker.cjs +7 -7
- package/dist/worker.js +7 -7
- package/package.json +1 -1
- package/src/ast.ts +41 -41
- package/src/bags.ts +2 -5
- package/src/builtins.ts +5 -21
- package/src/check-failure.ts +116 -0
- package/src/check-trace.ts +268 -0
- package/src/check.ts +578 -757
- package/src/cli/options.ts +6 -31
- package/src/cli/run.ts +0 -2
- package/src/cli/runtime-invariants.ts +27 -62
- package/src/cli/shared.ts +1 -5
- package/src/cli/tlapm.ts +433 -70
- package/src/cli/tlc-arguments.ts +246 -240
- package/src/cli/tlc-output.ts +686 -0
- package/src/cli/tlc-usage.ts +3 -5
- package/src/cli/tlc.ts +59 -707
- 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 +73 -338
- package/src/errors.ts +33 -5
- package/src/evaluate.ts +34 -107
- package/src/exit-codes.ts +3 -0
- package/src/fingerprints.ts +65 -1
- package/src/instances.ts +47 -10
- package/src/java-hash.ts +7 -0
- package/src/java-overrides.ts +4 -9
- package/src/json-reader.ts +1 -2
- package/src/json.ts +8 -18
- package/src/levels.ts +46 -57
- package/src/lexer.ts +76 -85
- package/src/liveness-checker.ts +634 -306
- package/src/liveness.ts +104 -120
- 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 +17 -31
- package/src/parallel.ts +55 -80
- package/src/parser.ts +722 -385
- package/src/pcal/ast.ts +53 -65
- package/src/pcal/parse.ts +144 -191
- package/src/pcal/tokenize.ts +91 -115
- package/src/pcal/translate.ts +83 -98
- package/src/pcal/validate.ts +48 -50
- package/src/pretty-print.ts +7 -7
- 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 +908 -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 +7 -2
- package/src/prover/smt/solver/lp/core-solver.ts +18 -3
- 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 +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 +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 +67 -16
- 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 +165 -83
- 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 +122 -64
- 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 -289
- 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 +236 -45
- 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 +38 -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 +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 +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 +94 -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 +24 -2
- package/src/prover/zenon/expr.ts +28 -2
- package/src/prover/zenon/index-table.ts +11 -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 +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/randomization.ts +1 -4
- package/src/resolve.ts +67 -143
- package/src/runtime.ts +17 -18
- package/src/sany/builtins.ts +1 -3
- 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 +160 -2683
- package/src/sany/levels.ts +5 -11
- package/src/sany/lexer.ts +57 -60
- package/src/sany/linter.ts +0 -3
- 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 +244 -53
- package/src/simulate.ts +202 -184
- package/src/spec-description.ts +56 -82
- package/src/standard-definitions.ts +4 -3
- package/src/standard-modules.ts +17 -44
- package/src/state-graph.ts +3 -17
- package/src/subexpressions.ts +38 -47
- package/src/substitution-levels.ts +5 -4
- package/src/successors.ts +20 -43
- package/src/symmetry.ts +6 -21
- package/src/tableau.ts +2 -2
- package/src/tlc/fingerprint.ts +96 -30
- package/src/tlc/jar-data.ts +0 -1
- package/src/tlc/messages.ts +22 -36
- package/src/tlc/order.ts +36 -50
- package/src/tlc/random.ts +22 -34
- package/src/tlc/replay.ts +21 -48
- package/src/tlc/summary.ts +64 -58
- package/src/tlc/tlc-operators.ts +6 -17
- package/src/tlc/tlcext-operators.ts +70 -29
- package/src/tlc/trace-spec.ts +26 -51
- package/src/tlc/value-stream.ts +9 -13
- package/src/tlc/version.ts +0 -1
- 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 +136 -338
- 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/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[];
|
|
@@ -165,6 +168,31 @@ const getThunk = (expression: Expression, scope: Scope | undefined) => {
|
|
|
165
168
|
return binding?.kind === "Thunk" ? binding : undefined;
|
|
166
169
|
};
|
|
167
170
|
|
|
171
|
+
const unwrapBinding = (
|
|
172
|
+
expression: Expression,
|
|
173
|
+
scope: Scope | undefined,
|
|
174
|
+
environment: Environment,
|
|
175
|
+
) => {
|
|
176
|
+
if (expression.kind === "Let") {
|
|
177
|
+
return {
|
|
178
|
+
expression: expression.body,
|
|
179
|
+
scope: bindDefinitions(expression.definitions, getConstantContext(environment, scope)),
|
|
180
|
+
};
|
|
181
|
+
}
|
|
182
|
+
const thunk = getThunk(expression, scope);
|
|
183
|
+
return thunk && { expression: thunk.expression, scope: thunk.scope };
|
|
184
|
+
};
|
|
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
|
+
|
|
168
196
|
const getParameters = (closure: Closure | undefined, scope: Scope | undefined) =>
|
|
169
197
|
(closure?.params ?? []).flatMap((param): [string, Value][] => {
|
|
170
198
|
const binding = lookupScope(scope, param.name);
|
|
@@ -191,7 +219,6 @@ const getInstanceActions = (
|
|
|
191
219
|
const callAction = (): SpecAction[] => [
|
|
192
220
|
{ name: instanceAction.name, location: expression.location, parameters: [], expression, scope },
|
|
193
221
|
];
|
|
194
|
-
// TLC's action is the SubstInNode the instance puts around the operator's body.
|
|
195
222
|
if (called && args.length === 0) {
|
|
196
223
|
return [{ ...instanceAction, parameters: [], expression: called.body, scope: called.scope }];
|
|
197
224
|
}
|
|
@@ -279,7 +306,6 @@ const getActions = (
|
|
|
279
306
|
return getInstanceActions(instanceAction, expression, scope, called, environment);
|
|
280
307
|
if (!called) return [createSplitAction()];
|
|
281
308
|
const args = getArguments(expression);
|
|
282
|
-
// TLC names an action after the operator it applies, as SANY names it in the spec.
|
|
283
309
|
const calledName = isLocallyResolved(expression)
|
|
284
310
|
? called.name
|
|
285
311
|
: (environment.instanceNames.get(getOperatorName(expression) ?? "") ?? called.name);
|
|
@@ -322,19 +348,11 @@ const describeSpecification = (
|
|
|
322
348
|
): void => {
|
|
323
349
|
const recurse = (inner: Expression, innerScope: Scope | undefined, innerFrames = frames) =>
|
|
324
350
|
describeSpecification(inner, innerScope, environment, description, next, innerFrames);
|
|
325
|
-
// TLC wraps each conjunct it takes from an instance in the instance's SubstInNode.
|
|
326
351
|
const createConjunct = (name: string, conjunct: Expression, conjunctScope: Scope | undefined) =>
|
|
327
352
|
createAction(name, withSubstitutionFrames(conjunct, frames), conjunctScope);
|
|
328
|
-
|
|
329
|
-
|
|
330
|
-
|
|
331
|
-
bindDefinitions(expression.definitions, getConstantContext(environment, scope)),
|
|
332
|
-
);
|
|
333
|
-
return;
|
|
334
|
-
}
|
|
335
|
-
const thunk = getThunk(expression, scope);
|
|
336
|
-
if (thunk) {
|
|
337
|
-
recurse(thunk.expression, thunk.scope);
|
|
353
|
+
const unwrapped = unwrapBinding(expression, scope, environment);
|
|
354
|
+
if (unwrapped) {
|
|
355
|
+
recurse(unwrapped.expression, unwrapped.scope);
|
|
338
356
|
return;
|
|
339
357
|
}
|
|
340
358
|
const called = resolveClosure(expression, scope, environment);
|
|
@@ -383,31 +401,19 @@ const describeProperty = (
|
|
|
383
401
|
expression: Expression,
|
|
384
402
|
scope: Scope | undefined,
|
|
385
403
|
environment: Environment,
|
|
386
|
-
description:
|
|
404
|
+
description: PropertyDescription,
|
|
387
405
|
): void => {
|
|
388
406
|
const recurse = (inner: Expression, innerScope: Scope | undefined) =>
|
|
389
407
|
describeProperty(configName, inner, innerScope, environment, description);
|
|
390
|
-
|
|
391
|
-
|
|
392
|
-
|
|
393
|
-
bindDefinitions(expression.definitions, getConstantContext(environment, scope)),
|
|
394
|
-
);
|
|
395
|
-
return;
|
|
396
|
-
}
|
|
397
|
-
const thunk = getThunk(expression, scope);
|
|
398
|
-
if (thunk) {
|
|
399
|
-
recurse(thunk.expression, thunk.scope);
|
|
408
|
+
const unwrapped = unwrapBinding(expression, scope, environment);
|
|
409
|
+
if (unwrapped) {
|
|
410
|
+
recurse(unwrapped.expression, unwrapped.scope);
|
|
400
411
|
return;
|
|
401
412
|
}
|
|
402
413
|
const called = resolveClosure(expression, scope, environment);
|
|
403
414
|
if (called && isConstantDefinition(called, environment)) return;
|
|
404
415
|
if (called && called.params.length === getArguments(expression).length) {
|
|
405
|
-
recurse(
|
|
406
|
-
called.body,
|
|
407
|
-
expression.kind === "Apply"
|
|
408
|
-
? bindOperatorArguments(called, expression.args, getConstantContext(environment, scope))
|
|
409
|
-
: called.scope,
|
|
410
|
-
);
|
|
416
|
+
recurse(called.body, getCallScope(called, expression, scope, environment));
|
|
411
417
|
return;
|
|
412
418
|
}
|
|
413
419
|
if (expression.kind === "Forall") {
|
|
@@ -453,20 +459,13 @@ const getOperatorDefinition = (name: string, environment: Environment) => {
|
|
|
453
459
|
: undefined;
|
|
454
460
|
};
|
|
455
461
|
|
|
456
|
-
|
|
462
|
+
// Tool's constructor describes the specification once, so a caller keeps the description and never walks it again.
|
|
463
|
+
export const getSpecDescription = (
|
|
457
464
|
config: ModelConfig,
|
|
458
465
|
environment: Environment,
|
|
459
466
|
instanceActions: Map<string, InstanceAction>,
|
|
460
467
|
) => {
|
|
461
|
-
const description: SpecDescription = {
|
|
462
|
-
inits: [],
|
|
463
|
-
actions: [],
|
|
464
|
-
temporals: [],
|
|
465
|
-
invariants: [],
|
|
466
|
-
impliedInits: [],
|
|
467
|
-
impliedActions: [],
|
|
468
|
-
impliedTemporals: [],
|
|
469
|
-
};
|
|
468
|
+
const description: SpecDescription = { inits: [], actions: [], temporals: [] };
|
|
470
469
|
const next: NextItem[] = [];
|
|
471
470
|
const specification =
|
|
472
471
|
config.specification === undefined
|
|
@@ -476,7 +475,6 @@ const getSpecDescription = (
|
|
|
476
475
|
describeSpecification(specification.body, undefined, environment, description, next);
|
|
477
476
|
next.forEach((item) =>
|
|
478
477
|
description.actions.push(
|
|
479
|
-
// TLC takes an instance's SubstInNode as one action, located at the instance.
|
|
480
478
|
...(item.frames.length > 0
|
|
481
479
|
? [
|
|
482
480
|
{
|
|
@@ -528,14 +526,8 @@ export const getSubscriptVariables = (
|
|
|
528
526
|
return expression.elements.every((element) => collect(element, innerScope));
|
|
529
527
|
}
|
|
530
528
|
if (expression.kind === "Label") return collect(expression.body, innerScope);
|
|
531
|
-
|
|
532
|
-
|
|
533
|
-
expression.body,
|
|
534
|
-
bindDefinitions(expression.definitions, getConstantContext(environment, innerScope)),
|
|
535
|
-
);
|
|
536
|
-
}
|
|
537
|
-
const thunk = getThunk(expression, innerScope);
|
|
538
|
-
if (thunk) return collect(thunk.expression, thunk.scope);
|
|
529
|
+
const unwrapped = unwrapBinding(expression, innerScope, environment);
|
|
530
|
+
if (unwrapped) return collect(unwrapped.expression, unwrapped.scope);
|
|
539
531
|
const argument =
|
|
540
532
|
expression.kind === "Identifier" && isLocallyResolved(expression)
|
|
541
533
|
? lookupScope(innerScope, expression.name)
|
|
@@ -555,32 +547,11 @@ export const getSubscriptVariables = (
|
|
|
555
547
|
if (!called || called.params.length !== getArguments(expression).length) return true;
|
|
556
548
|
const definition = getDefinition(called.name, environment);
|
|
557
549
|
if (definition?.body === called.body && isStartupValue(definition, environment)) return true;
|
|
558
|
-
return collect(
|
|
559
|
-
called.body,
|
|
560
|
-
expression.kind === "Apply"
|
|
561
|
-
? bindOperatorArguments(
|
|
562
|
-
called,
|
|
563
|
-
expression.args,
|
|
564
|
-
getConstantContext(environment, innerScope),
|
|
565
|
-
)
|
|
566
|
-
: called.scope,
|
|
567
|
-
);
|
|
550
|
+
return collect(called.body, getCallScope(called, expression, innerScope, environment));
|
|
568
551
|
};
|
|
569
552
|
return collect(subscript, scope) ? variables : undefined;
|
|
570
553
|
};
|
|
571
554
|
|
|
572
|
-
export const getInitActions = (
|
|
573
|
-
config: ModelConfig,
|
|
574
|
-
environment: Environment,
|
|
575
|
-
instanceActions: Map<string, InstanceAction>,
|
|
576
|
-
) => getSpecDescription(config, environment, instanceActions).inits;
|
|
577
|
-
|
|
578
|
-
export const getNextActions = (
|
|
579
|
-
config: ModelConfig,
|
|
580
|
-
environment: Environment,
|
|
581
|
-
instanceActions: Map<string, InstanceAction>,
|
|
582
|
-
) => getSpecDescription(config, environment, instanceActions).actions;
|
|
583
|
-
|
|
584
555
|
const formatParameters = (action: SpecAction) =>
|
|
585
556
|
action.parameters.length === 0
|
|
586
557
|
? ""
|
|
@@ -593,21 +564,24 @@ export const getActionSignature = (action: SpecAction) =>
|
|
|
593
564
|
`${action.name}${formatParameters(action)}`;
|
|
594
565
|
|
|
595
566
|
export const getSpecificationValue = (
|
|
567
|
+
description: SpecDescription,
|
|
596
568
|
config: ModelConfig,
|
|
597
569
|
environment: Environment,
|
|
598
570
|
variableLocations: SourceLocation[],
|
|
599
|
-
instanceActions: Map<string, InstanceAction>,
|
|
600
571
|
): Value => {
|
|
601
|
-
const
|
|
602
|
-
|
|
603
|
-
|
|
572
|
+
const properties: PropertyDescription = {
|
|
573
|
+
invariants: [],
|
|
574
|
+
impliedInits: [],
|
|
575
|
+
impliedActions: [],
|
|
576
|
+
impliedTemporals: [],
|
|
577
|
+
};
|
|
604
578
|
config.invariants.forEach((name) => {
|
|
605
579
|
const definition = getOperatorDefinition(name, environment);
|
|
606
|
-
if (definition)
|
|
580
|
+
if (definition) properties.invariants.push(createAction(name, definition.body));
|
|
607
581
|
});
|
|
608
582
|
config.properties.forEach((name) => {
|
|
609
583
|
const definition = getOperatorDefinition(name, environment);
|
|
610
|
-
if (definition) describeProperty(name, definition.body, undefined, environment,
|
|
584
|
+
if (definition) describeProperty(name, definition.body, undefined, environment, properties);
|
|
611
585
|
});
|
|
612
586
|
const coverage = environment.coverage;
|
|
613
587
|
const toSet = (actions: SpecAction[], kind?: CoverageKind) =>
|
|
@@ -635,10 +609,10 @@ export const getSpecificationValue = (
|
|
|
635
609
|
["inits", toSet(description.inits, "init")],
|
|
636
610
|
["actions", toSet(description.actions, "next")],
|
|
637
611
|
["temporals", toSet(description.temporals)],
|
|
638
|
-
["invariants", toSet(
|
|
639
|
-
["impliedinits", toSet(
|
|
640
|
-
["impliedactions", toSet(
|
|
641
|
-
["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)],
|
|
642
616
|
[
|
|
643
617
|
"variables",
|
|
644
618
|
createSet(
|
|
@@ -1,9 +1,6 @@
|
|
|
1
1
|
import type { SourceRange } from "./ast";
|
|
2
2
|
import type { OperatorLevels } from "./levels";
|
|
3
3
|
|
|
4
|
-
// SANY's view of the dummy definitions in tla2sany/StandardModules of the operators tla-ts
|
|
5
|
-
// implements natively: their levels, and where SANY reports a spec that defines one again.
|
|
6
|
-
|
|
7
4
|
type Signature =
|
|
8
5
|
| [string, number, number[], number[], number[]]
|
|
9
6
|
| [string, number, number[], number[], number[], number[][], string[]];
|
|
@@ -84,6 +81,10 @@ const SIGNATURES: Signature[] = [
|
|
|
84
81
|
["RandomSubset", 0, [0, 0], [2, 2], [1, 1]],
|
|
85
82
|
["RandomSetOfSubsets", 0, [0, 0, 0], [2, 3, 2], [1, 0, 1]],
|
|
86
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, [], [], []],
|
|
87
88
|
];
|
|
88
89
|
|
|
89
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,18 +75,12 @@ 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
|
|
|
87
81
|
const BOOLEAN_SET = createSet([false, true]);
|
|
88
82
|
markNormalized(BOOLEAN_SET);
|
|
89
83
|
|
|
90
|
-
// A balanced merge compares each element about log2 of the set count times.
|
|
91
84
|
const getBalancedUnion = (sets: SetValue[], start: number, end: number): SetValue => {
|
|
92
85
|
if (end - start === 1) return sets[start];
|
|
93
86
|
const middle = (start + end) >> 1;
|
|
@@ -100,11 +93,9 @@ type ReducibleSet = SetValue | MixedSetValue | IntervalValue;
|
|
|
100
93
|
|
|
101
94
|
const isMixedSet = (value: Value) => typeof value === "object" && value.kind === "MixedSet";
|
|
102
95
|
|
|
103
|
-
// These keep the intersection and difference they compute normalized.
|
|
104
96
|
const isNormalizedReducible = (set: ReducibleSet) =>
|
|
105
97
|
set.kind === "Interval" || (set.kind === "Set" && set.isNormalized);
|
|
106
98
|
|
|
107
|
-
// TLC combines a set enumeration or an interval with a set by testing each element's membership.
|
|
108
99
|
const combineReducible = (
|
|
109
100
|
operator: SetOperationValue["operator"],
|
|
110
101
|
set: ReducibleSet,
|
|
@@ -165,7 +156,6 @@ export const CORE_OPERATORS: Builtin[] = [
|
|
|
165
156
|
2,
|
|
166
157
|
(args) => !isElementOf(getValue(args, 0, "\\notin"), getValue(args, 1, "\\notin")),
|
|
167
158
|
),
|
|
168
|
-
// TLC tests each element of the left set for membership in the right value.
|
|
169
159
|
defineBinary("\\subseteq", (left, right) => {
|
|
170
160
|
if (!isSetValue(left)) {
|
|
171
161
|
throw new TlaEvaluationError(`\\subseteq expects a set but received ${formatValue(left)}`);
|
|
@@ -191,7 +181,6 @@ export const CORE_OPERATORS: Builtin[] = [
|
|
|
191
181
|
}
|
|
192
182
|
return !someStreamedElement(left, (element) => !isElementOf(element, right));
|
|
193
183
|
}),
|
|
194
|
-
// TLC defers set operations on non-sets to enumerating or testing membership in the result.
|
|
195
184
|
...SET_OPERATORS.map((operator) =>
|
|
196
185
|
defineOperator(operator, 2, (args) => {
|
|
197
186
|
const left = getValue(args, 0, operator);
|
|
@@ -218,14 +207,12 @@ export const CORE_OPERATORS: Builtin[] = [
|
|
|
218
207
|
: operator === "\\cap"
|
|
219
208
|
? getSortedIntersection
|
|
220
209
|
: getSortedDifference;
|
|
221
|
-
// The merge compares the elements, which TLC tests for membership one by one instead.
|
|
222
210
|
return computeLikeTlcOnFailure(
|
|
223
211
|
(finiteLeft, finiteRight) => {
|
|
224
212
|
const leftSet = toFiniteSet(finiteLeft);
|
|
225
213
|
const rightSet = toFiniteSet(finiteRight);
|
|
226
214
|
const merged = merge(leftSet, rightSet);
|
|
227
215
|
if (operator === "\\cup") {
|
|
228
|
-
// TLC appends the right set's new elements to the left set's, unsorted.
|
|
229
216
|
const written = getWrittenElements(leftSet);
|
|
230
217
|
const added = getSortedDifference(rightSet, leftSet).elements;
|
|
231
218
|
const isSorted =
|
|
@@ -268,7 +255,6 @@ export const CORE_OPERATORS: Builtin[] = [
|
|
|
268
255
|
if (!isEnumeratedSet(outer) || sets.length !== written.length) {
|
|
269
256
|
return markStreamedSet({ kind: "Union", base: outer });
|
|
270
257
|
}
|
|
271
|
-
// TLC adds each set's elements in written order, and only those not yet in the union.
|
|
272
258
|
const added = sets.flatMap(getWrittenElements);
|
|
273
259
|
const getUnionLikeTlc = () => {
|
|
274
260
|
const union: MixedSetValue = { kind: "MixedSet", elements: [] };
|
|
@@ -298,7 +284,6 @@ export const CORE_OPERATORS: Builtin[] = [
|
|
|
298
284
|
|
|
299
285
|
const NEG_SIGNATURE = getJavaSignature("Integers", "Neg", "IntValue", 1);
|
|
300
286
|
|
|
301
|
-
// TLC computes this arithmetic in tlc2.module.Naturals, or Integers if loaded, named in errors.
|
|
302
287
|
const createArithmeticOperators = (module: string) => {
|
|
303
288
|
const dotDotSignature = getJavaSignature(module, "DotDot", "IntervalValue", 2);
|
|
304
289
|
return [
|
|
@@ -341,14 +326,12 @@ const NATURALS_ARITHMETIC = createArithmeticOperators("Naturals");
|
|
|
341
326
|
|
|
342
327
|
const INTEGERS_ARITHMETIC = createArithmeticOperators("Integers");
|
|
343
328
|
|
|
344
|
-
// TLC loads Integers for a trace exploration spec, whose methods then replace these.
|
|
345
329
|
export const getTraceSpecArithmetic = (builtin: Builtin) => {
|
|
346
330
|
const index = NATURALS_ARITHMETIC.indexOf(builtin);
|
|
347
331
|
return index === -1 ? undefined : INTEGERS_ARITHMETIC[index];
|
|
348
332
|
};
|
|
349
333
|
|
|
350
|
-
// Naturals#GEQ names itself > in its errors, and Integers#GT returns a BoolValue.
|
|
351
|
-
// spec that extends Integers gets Integers' comparisons.
|
|
334
|
+
// Naturals#GEQ names itself > in its errors, and Integers#GT returns a BoolValue.
|
|
352
335
|
const createComparisonOperators = (module: string) => {
|
|
353
336
|
const getSignature = (method: string, result = "tlc2.value.IBoolValue") =>
|
|
354
337
|
`public static ${result} tlc2.module.${module}.${method}(tlc2.value.impl.Value,tlc2.value.impl.Value)`;
|
|
@@ -512,16 +495,7 @@ const createSequencesOperators = (version: TlcVersion) =>
|
|
|
512
495
|
|
|
513
496
|
const createFiniteSetsOperators = (version: TlcVersion) =>
|
|
514
497
|
withJavaMethods("FiniteSets", [
|
|
515
|
-
defineOperator("IsFiniteSet", 1, (args) =>
|
|
516
|
-
const value = getValue(args, 0, "IsFiniteSet");
|
|
517
|
-
if (isSetValue(value)) return isFiniteSet(value);
|
|
518
|
-
if (typeof value === "object" && value.kind === "Function") return true;
|
|
519
|
-
throw new TlaEvaluationError(
|
|
520
|
-
typeof value === "object" && value.kind === "LazyFunction"
|
|
521
|
-
? `Attempted to check if the function:\n${formatValue(value)}\nis a finite set.`
|
|
522
|
-
: `Attempted to check if the ${describeKind(value)} ${formatValue(value)} is a finite set.`,
|
|
523
|
-
);
|
|
524
|
-
}),
|
|
498
|
+
defineOperator("IsFiniteSet", 1, (args) => isFiniteSet(getValue(args, 0, "IsFiniteSet"))),
|
|
525
499
|
defineOperator("Cardinality", 1, (args) => {
|
|
526
500
|
const set = getValue(args, 0, "Cardinality");
|
|
527
501
|
if (
|
|
@@ -604,7 +578,7 @@ export const getJavaOverrides = (
|
|
|
604
578
|
if (name === "IOUtils") return createIoUtilsOperators(files, evaluateReplaced);
|
|
605
579
|
if (name === "_TLCTrace") return createTlcTraceOperators(files);
|
|
606
580
|
if (!getSanyStandardModules(runtime.version).has(name)) return undefined;
|
|
607
|
-
const operators =
|
|
581
|
+
const operators = getStandardOperators(name, print, runtime, files, builtins);
|
|
608
582
|
return name === "Randomization" && operators
|
|
609
583
|
? [...operators, createRandomSubsetSet(runtime)]
|
|
610
584
|
: operators;
|
|
@@ -622,37 +596,36 @@ export const STANDARD_DEPENDENCIES = new Map([
|
|
|
622
596
|
["TLCExt", ["TLC", "Integers", "Naturals", "Sequences", "FiniteSets"]],
|
|
623
597
|
]);
|
|
624
598
|
|
|
625
|
-
export const
|
|
599
|
+
export const STANDARD_EXTENDS = new Map([["Integers", ["Naturals"]]]);
|
|
600
|
+
|
|
601
|
+
export const getStandardOperators = (
|
|
626
602
|
name: string,
|
|
627
603
|
print: (text: string) => void,
|
|
628
604
|
runtime: CheckerRuntime,
|
|
629
605
|
files: FileSystem,
|
|
630
606
|
builtins: ReadonlyMap<string, Builtin>,
|
|
631
|
-
):
|
|
607
|
+
): Builtin[] | undefined => {
|
|
632
608
|
switch (name) {
|
|
633
609
|
case "Naturals":
|
|
634
|
-
return
|
|
610
|
+
return NATURALS_OPERATORS;
|
|
635
611
|
case "Integers":
|
|
636
|
-
return
|
|
612
|
+
return INTEGERS_OPERATORS;
|
|
637
613
|
case "Sequences":
|
|
638
|
-
return
|
|
614
|
+
return createSequencesOperators(runtime.version);
|
|
639
615
|
case "FiniteSets":
|
|
640
|
-
return
|
|
616
|
+
return createFiniteSetsOperators(runtime.version);
|
|
641
617
|
case "TLC":
|
|
642
|
-
return
|
|
618
|
+
return withJavaMethods("TLC", createTlcOperators(print, runtime));
|
|
643
619
|
case "Randomization":
|
|
644
|
-
return
|
|
620
|
+
return createRandomizationOperators(runtime);
|
|
645
621
|
case "_Possible":
|
|
646
|
-
return
|
|
622
|
+
return createPossibleOperators(print, runtime);
|
|
647
623
|
case "Json":
|
|
648
|
-
return
|
|
624
|
+
return createJsonOperators(files);
|
|
649
625
|
case "Bags":
|
|
650
|
-
return
|
|
626
|
+
return withJavaMethods("Bags", createBagsOperators(builtins));
|
|
651
627
|
case "TLCExt":
|
|
652
|
-
return
|
|
653
|
-
extends: [],
|
|
654
|
-
operators: withJavaMethods("TLCExt", createTlcExtOperators(print, runtime)),
|
|
655
|
-
};
|
|
628
|
+
return withJavaMethods("TLCExt", createTlcExtOperators(print, runtime));
|
|
656
629
|
default:
|
|
657
630
|
return undefined;
|
|
658
631
|
}
|
package/src/state-graph.ts
CHANGED
|
@@ -1,5 +1,4 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
1
|
+
import { getJavaHashCode } from "./java-hash";
|
|
3
2
|
import type { TlcVersion } from "./tlc/version";
|
|
4
3
|
|
|
5
4
|
export interface StateDump {
|
|
@@ -52,8 +51,6 @@ const INITIAL_CAPACITY = 16;
|
|
|
52
51
|
const getCapacity = (size: number, capacity = INITIAL_CAPACITY): number =>
|
|
53
52
|
size <= capacity * LOAD_FACTOR ? capacity : getCapacity(size, capacity * 2);
|
|
54
53
|
|
|
55
|
-
// The order in which a java.util.HashMap iterates over keys put in this order: by bucket, and in
|
|
56
|
-
// insertion order within a bucket. A bucket only becomes a tree once 8 keys collide in it.
|
|
57
54
|
const getJavaHashOrder = <Key>(keys: Key[], getHash: (key: Key) => number) => {
|
|
58
55
|
const mask = getCapacity(keys.length) - 1;
|
|
59
56
|
const getBucket = (key: Key) => {
|
|
@@ -69,12 +66,6 @@ const getJavaHashOrder = <Key>(keys: Key[], getHash: (key: Key) => number) => {
|
|
|
69
66
|
const getLongHash = (value: bigint) =>
|
|
70
67
|
Number(BigInt.asIntN(32, value ^ (BigInt.asUintN(64, value) >> 32n)));
|
|
71
68
|
|
|
72
|
-
const getStringHash = (text: string) =>
|
|
73
|
-
[...Array(text.length).keys()].reduce(
|
|
74
|
-
(hash, index) => (Math.imul(31, hash) + text.charCodeAt(index)) | 0,
|
|
75
|
-
0,
|
|
76
|
-
);
|
|
77
|
-
|
|
78
69
|
const escapeDotString = (text: string) =>
|
|
79
70
|
text.replaceAll("\\", "\\\\").replaceAll('"', '\\"').trim();
|
|
80
71
|
|
|
@@ -90,14 +81,11 @@ const createPlainWriter = (dump: StateDump, writeFile: WriteFile): StateWriter =
|
|
|
90
81
|
if (!isSeen) writeState(successor);
|
|
91
82
|
},
|
|
92
83
|
writeConstrained: () => {},
|
|
93
|
-
// TLC 1.7.4 writes the state again, as it takes the stuttering step for one to a new state.
|
|
94
84
|
writeStuttering: writeState,
|
|
95
85
|
close: () => writeFile?.(dump.path, states.join("")),
|
|
96
86
|
};
|
|
97
87
|
};
|
|
98
88
|
|
|
99
|
-
// TLC 1.7.4 draws its nodes as ellipses, gives them no tooltip, and labels an edge with the name
|
|
100
|
-
// of its action alone.
|
|
101
89
|
const createDotWriter = (
|
|
102
90
|
dump: StateDump,
|
|
103
91
|
writeFile: WriteFile,
|
|
@@ -114,8 +102,7 @@ const createDotWriter = (
|
|
|
114
102
|
];
|
|
115
103
|
const ranks = new Map<number, Set<bigint>>();
|
|
116
104
|
const colors = new Map<string, number>();
|
|
117
|
-
// TLC
|
|
118
|
-
// stuttering step and an edge with its reverse, so tla-ts keys it by both.
|
|
105
|
+
// Deviation from TLC: it keys an edge by the XOR of its fingerprints, which merges distinct edges.
|
|
119
106
|
const edges = new Set<string>();
|
|
120
107
|
const isDuplicate = (state: GraphState, successor: GraphState) => {
|
|
121
108
|
if (!dump.strict) return false;
|
|
@@ -128,7 +115,6 @@ const createDotWriter = (
|
|
|
128
115
|
const rank = ranks.get(state.level) ?? new Set();
|
|
129
116
|
ranks.set(state.level, rank.add(state.fingerprint));
|
|
130
117
|
};
|
|
131
|
-
// TLC colors an edge by the name of its action, numbering the names from 2 as it finds them.
|
|
132
118
|
const getColor = (action: GraphAction | undefined) => {
|
|
133
119
|
if (!action) return 1;
|
|
134
120
|
const color = colors.get(action.name) ?? colors.size + 2;
|
|
@@ -139,7 +125,7 @@ const createDotWriter = (
|
|
|
139
125
|
[
|
|
140
126
|
`subgraph cluster_legend {graph[style=bold];label = "Next State Actions" style="solid"\n`,
|
|
141
127
|
`node [ labeljust="l",colorscheme="${COLOR_SCHEME}",style=filled,shape=record ]\n`,
|
|
142
|
-
...getJavaHashOrder([...colors.keys()],
|
|
128
|
+
...getJavaHashOrder([...colors.keys()], getJavaHashCode).map(
|
|
143
129
|
(name) => `${name.replaceAll("!", ":")} [label="${name}",fillcolor=${colors.get(name)}]\n`,
|
|
144
130
|
),
|
|
145
131
|
"}",
|