tla-ts 0.0.10-dev.094b9b512 → 0.0.10-dev.1ebc153bd
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/dist/compile.cjs +3 -3
- package/dist/compile.js +1 -1
- package/dist/deciders.cjs +37 -36
- package/dist/deciders.js +38 -37
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +5 -1
- package/dist/index.d.ts +5 -1
- package/dist/index.js +1 -1
- package/dist/parallel-worker.cjs +1 -1
- package/dist/parallel-worker.js +1 -1
- package/dist/prove-worker.cjs +1 -1
- package/dist/prove-worker.js +1 -1
- package/dist/prove.cjs +146 -58
- package/dist/prove.js +145 -57
- package/dist/run.cjs +43 -43
- package/dist/run.js +45 -45
- package/dist/tlapm.cjs +1 -1
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +40 -37
- package/dist/transfer.js +38 -35
- package/dist/worker.cjs +6 -6
- package/dist/worker.js +6 -6
- package/package.json +1 -1
- package/src/ast.ts +4 -3
- package/src/bags.ts +46 -28
- package/src/check-trace.ts +2 -16
- package/src/check.ts +349 -91
- package/src/cli/runtime-invariants.ts +20 -56
- package/src/cli/tlapm.ts +268 -71
- package/src/cli/tlc-arguments.ts +2 -2
- package/src/cli/tlc-output.ts +4 -5
- package/src/cli/tlc-usage.ts +0 -1
- package/src/cli/tlc.ts +26 -7
- package/src/cli/xml-exporter.ts +1 -1
- package/src/codegen.ts +9 -5
- package/src/dependencies.ts +72 -11
- package/src/dfid.ts +9 -2
- package/src/environment.ts +65 -36
- package/src/errors.ts +8 -1
- package/src/evaluate.ts +92 -32
- package/src/exit-codes.ts +5 -2
- package/src/instances.ts +5 -5
- package/src/java-overrides.ts +2 -2
- package/src/levels.ts +138 -90
- package/src/liveness-checker.ts +572 -204
- package/src/liveness.ts +47 -32
- package/src/obligations/action.ts +0 -2
- package/src/obligations/anonymize.ts +2 -6
- package/src/obligations/equality.ts +0 -2
- package/src/obligations/expression.ts +0 -2
- package/src/obligations/format.ts +0 -2
- package/src/obligations/generate.ts +0 -2
- package/src/obligations/index.ts +9 -8
- package/src/obligations/levels.ts +0 -2
- package/src/obligations/module.ts +0 -2
- package/src/obligations/normalize.ts +1 -6
- package/src/obligations/operators.ts +0 -2
- package/src/obligations/pragma.ts +2 -2
- package/src/obligations/printer.ts +5 -7
- package/src/obligations/proof.ts +0 -2
- package/src/obligations/regroup.ts +0 -2
- package/src/obligations/simplify.ts +0 -2
- package/src/obligations/subexpression.ts +1 -4
- package/src/obligations/substitution.ts +0 -2
- package/src/obligations/temporal.ts +0 -2
- package/src/obligations/tuples.ts +0 -2
- package/src/parallel-worker.ts +8 -2
- package/src/parallel.ts +7 -2
- package/src/parser.ts +256 -185
- package/src/pretty-print.ts +1 -1
- package/src/prover/deciders.ts +1 -8
- package/src/prover/isabelle/encode.ts +0 -2
- package/src/prover/isabelle/isar/attrib.ts +86 -55
- package/src/prover/isabelle/isar/context.ts +25 -26
- package/src/prover/isabelle/isar/induct.ts +2 -12
- package/src/prover/isabelle/isar/method.ts +6 -10
- package/src/prover/isabelle/isar/proof.ts +40 -39
- package/src/prover/isabelle/isar/rule-cases.ts +14 -22
- package/src/prover/isabelle/isar/theory.ts +16 -17
- package/src/prover/isabelle/isar/toplevel.ts +46 -56
- package/src/prover/isabelle/isar/type-check.ts +0 -2
- package/src/prover/isabelle/provers/blast/blast.ts +0 -2
- package/src/prover/isabelle/provers/blast/branch.ts +0 -2
- package/src/prover/isabelle/provers/blast/prove.ts +0 -2
- package/src/prover/isabelle/provers/blast/rules.ts +0 -2
- package/src/prover/isabelle/provers/blast/state.ts +0 -2
- package/src/prover/isabelle/provers/blast/term.ts +0 -2
- package/src/prover/isabelle/provers/clasimp.ts +1 -3
- package/src/prover/isabelle/provers/classical.ts +1 -3
- package/src/prover/isabelle/provers/hypsubst.ts +2 -4
- package/src/prover/isabelle/pure/bicompose.ts +0 -2
- package/src/prover/isabelle/pure/consts.ts +0 -2
- package/src/prover/isabelle/pure/conv.ts +0 -2
- package/src/prover/isabelle/pure/drule.ts +0 -2
- package/src/prover/isabelle/pure/envir.ts +0 -2
- package/src/prover/isabelle/pure/goal.ts +0 -2
- package/src/prover/isabelle/pure/logic.ts +0 -2
- 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 +0 -2
- package/src/prover/isabelle/pure/pattern.ts +0 -2
- package/src/prover/isabelle/pure/raw-simplifier.ts +0 -2
- package/src/prover/isabelle/pure/rewriter.ts +3 -5
- 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 +0 -2
- package/src/prover/isabelle/pure/table.ts +0 -2
- package/src/prover/isabelle/pure/tactic.ts +0 -2
- package/src/prover/isabelle/pure/tactical.ts +0 -2
- package/src/prover/isabelle/pure/term-ord.ts +0 -2
- package/src/prover/isabelle/pure/term.ts +3 -5
- package/src/prover/isabelle/pure/thm.ts +0 -2
- 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 +0 -2
- package/src/prover/isabelle/tla/simpdata.ts +0 -2
- package/src/prover/isabelle/tools/intuitionistic.ts +0 -2
- package/src/prover/ocaml.ts +4 -1
- package/src/prover/prep/action.ts +1 -0
- package/src/prover/prep/md5.ts +26 -29
- package/src/prover/prep/methods.ts +55 -6
- package/src/prover/prep/normalize.ts +4 -1
- package/src/prover/prove.ts +58 -32
- package/src/prover/ptl/decide.ts +43 -63
- package/src/prover/smt/context.ts +10 -14
- package/src/prover/smt/data.ts +51 -45
- package/src/prover/smt/encode.ts +1 -2
- package/src/prover/smt/rewrite.ts +3 -7
- package/src/prover/smt/simplify.ts +1 -1
- package/src/prover/smt/solver/ackermannize-bv-tactic.ts +0 -2
- package/src/prover/smt/solver/ackr-helper.ts +0 -3
- package/src/prover/smt/solver/ackr-model-converter.ts +1 -8
- package/src/prover/smt/solver/act-cache.ts +0 -1
- package/src/prover/smt/solver/add-bounds-tactic.ts +0 -1
- package/src/prover/smt/solver/aig-tactic.ts +25 -16
- package/src/prover/smt/solver/aig.ts +2 -3
- package/src/prover/smt/solver/arith-rewriter.ts +4 -7
- package/src/prover/smt/solver/arith-terms.ts +0 -2
- package/src/prover/smt/solver/array-decl-plugin.ts +0 -1
- package/src/prover/smt/solver/array-rewriter.ts +1 -4
- package/src/prover/smt/solver/asserted-formulas.ts +67 -3
- package/src/prover/smt/solver/ast-lt.ts +2 -3
- package/src/prover/smt/solver/ast-util.ts +4 -5
- package/src/prover/smt/solver/ast.ts +171 -168
- package/src/prover/smt/solver/auf-solver.ts +0 -1
- package/src/prover/smt/solver/bit-blast-tactic.ts +2 -11
- package/src/prover/smt/solver/bit-blaster.ts +0 -3
- package/src/prover/smt/solver/blast-term-ite.ts +47 -0
- package/src/prover/smt/solver/bound-manager.ts +39 -29
- package/src/prover/smt/solver/bound-simplifier.ts +2 -5
- package/src/prover/smt/solver/bv-bound-chk.ts +2 -10
- package/src/prover/smt/solver/bv-decl-plugin.ts +13 -11
- package/src/prover/smt/solver/bv-divrem-bounds.ts +0 -2
- package/src/prover/smt/solver/bv-rewriter.ts +15 -19
- package/src/prover/smt/solver/bv1-blast.ts +1 -11
- package/src/prover/smt/solver/bv2fpa-converter.ts +0 -1
- package/src/prover/smt/solver/bv2int-rewriter.ts +0 -1
- package/src/prover/smt/solver/bv2real-rewriter.ts +0 -1
- package/src/prover/smt/solver/card2bv.ts +3 -7
- package/src/prover/smt/solver/case-split-queue.ts +0 -2
- package/src/prover/smt/solver/cg-table.ts +19 -16
- package/src/prover/smt/solver/check-logic.ts +6 -2
- package/src/prover/smt/solver/clause.ts +0 -1
- package/src/prover/smt/solver/cofactor-elim-term-ite.ts +2 -5
- package/src/prover/smt/solver/conflict-resolution.ts +8 -8
- package/src/prover/smt/solver/context.ts +45 -15
- package/src/prover/smt/solver/ctx-simplify.ts +1 -3
- package/src/prover/smt/solver/ctx-solver-simplify.ts +0 -2
- package/src/prover/smt/solver/datatype-decl-plugin.ts +22 -17
- package/src/prover/smt/solver/datatype-rewriter.ts +0 -1
- package/src/prover/smt/solver/demodulator.ts +2 -5
- package/src/prover/smt/solver/dependent-expr-state.ts +25 -7
- package/src/prover/smt/solver/der.ts +0 -1
- package/src/prover/smt/solver/diff-neq.ts +1 -3
- package/src/prover/smt/solver/distribute-forall.ts +1 -11
- package/src/prover/smt/solver/dom-simplify.ts +1 -3
- package/src/prover/smt/solver/dt2bv-tactic.ts +2 -9
- package/src/prover/smt/solver/dyn-ack.ts +0 -1
- package/src/prover/smt/solver/e-matching.ts +6 -7
- package/src/prover/smt/solver/elim-small-bv-tactic.ts +0 -1
- package/src/prover/smt/solver/elim-term-ite-tactic.ts +48 -0
- package/src/prover/smt/solver/elim-uncnstr.ts +7 -23
- package/src/prover/smt/solver/enode.ts +16 -10
- package/src/prover/smt/solver/eq2bv-tactic.ts +0 -1
- package/src/prover/smt/solver/euf/arith-axioms.ts +0 -1
- package/src/prover/smt/solver/euf/arith-internalize.ts +2 -8
- package/src/prover/smt/solver/euf/arith-solver.ts +0 -6
- package/src/prover/smt/solver/euf/array-axioms.ts +0 -1
- package/src/prover/smt/solver/euf/array-internalize.ts +21 -12
- package/src/prover/smt/solver/euf/array-solver.ts +0 -2
- package/src/prover/smt/solver/euf/bv-ackerman.ts +0 -2
- package/src/prover/smt/solver/euf/bv-internalize.ts +1 -3
- package/src/prover/smt/solver/euf/bv-solver.ts +0 -2
- package/src/prover/smt/solver/euf/dt-solver.ts +19 -21
- package/src/prover/smt/solver/euf/egraph.ts +69 -53
- package/src/prover/smt/solver/euf/euf-solver.ts +38 -37
- package/src/prover/smt/solver/euf/fpa-solver.ts +37 -53
- package/src/prover/smt/solver/euf/mam.ts +7 -55
- package/src/prover/smt/solver/euf/q-ematch.ts +27 -98
- package/src/prover/smt/solver/euf/q-mbi.ts +4 -4
- package/src/prover/smt/solver/euf/q-model-fixer.ts +1 -4
- package/src/prover/smt/solver/euf/q-solver.ts +3 -3
- package/src/prover/smt/solver/euf/th-solver.ts +1 -16
- package/src/prover/smt/solver/euf/th-solvers.ts +0 -1
- package/src/prover/smt/solver/expr-ref.ts +0 -1
- package/src/prover/smt/solver/expr-safe-replace.ts +0 -1
- package/src/prover/smt/solver/expr2polynomial.ts +204 -80
- package/src/prover/smt/solver/factor.ts +37 -26
- package/src/prover/smt/solver/fd-solver.ts +3 -5
- package/src/prover/smt/solver/fingerprints.ts +0 -1
- package/src/prover/smt/solver/fix-dl-var.ts +2 -4
- package/src/prover/smt/solver/flat-literals.ts +0 -1
- package/src/prover/smt/solver/fm-tactic.ts +25 -14
- package/src/prover/smt/solver/fpa-decl-plugin.ts +0 -1
- package/src/prover/smt/solver/fpa-rewriter.ts +12 -14
- package/src/prover/smt/solver/fpa2bv-converter.ts +13 -8
- package/src/prover/smt/solver/fpa2bv-rewriter.ts +1 -1
- package/src/prover/smt/solver/fpa2bv-tactic.ts +1 -3
- package/src/prover/smt/solver/goal.ts +6 -4
- package/src/prover/smt/solver/goal2nlsat.ts +57 -32
- package/src/prover/smt/solver/guard-set.ts +0 -1
- package/src/prover/smt/solver/hash.ts +0 -1
- package/src/prover/smt/solver/hashtable.ts +4 -1
- package/src/prover/smt/solver/inf-eps.ts +1 -2
- package/src/prover/smt/solver/inj-axiom.ts +0 -1
- package/src/prover/smt/solver/internalizer.ts +41 -3
- package/src/prover/smt/solver/lackr.ts +0 -2
- package/src/prover/smt/solver/lbool.ts +0 -1
- package/src/prover/smt/solver/lia2card.ts +1 -2
- package/src/prover/smt/solver/lia2pb.ts +18 -5
- package/src/prover/smt/solver/literal.ts +0 -1
- package/src/prover/smt/solver/logic-tactics.ts +9 -6
- 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 +0 -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 +0 -2
- 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 +0 -1
- package/src/prover/smt/solver/lp/hnf.ts +0 -3
- package/src/prover/smt/solver/lp/int-cube.ts +0 -1
- package/src/prover/smt/solver/lp/int-solver.ts +0 -2
- package/src/prover/smt/solver/lp/lar-solver.ts +1 -2
- package/src/prover/smt/solver/lp/lar-term.ts +0 -1
- package/src/prover/smt/solver/lp/lp-settings.ts +1 -2
- package/src/prover/smt/solver/lp/maximize-term.ts +0 -3
- 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 +26 -7
- 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 +158 -82
- 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 +144 -108
- 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 +50 -19
- 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 +138 -97
- package/src/prover/smt/solver/lp/numeric-pair.ts +0 -1
- package/src/prover/smt/solver/lp/pdd-interval.ts +6 -3
- package/src/prover/smt/solver/lp/pdd-simplifier.ts +60 -21
- package/src/prover/smt/solver/lp/pdd-solver.ts +72 -41
- package/src/prover/smt/solver/lp/pdd.ts +725 -290
- package/src/prover/smt/solver/lp/random-updater.ts +0 -2
- package/src/prover/smt/solver/lp/static-matrix.ts +0 -1
- package/src/prover/smt/solver/lp/union-find.ts +1 -2
- package/src/prover/smt/solver/macro-finder.ts +1 -4
- package/src/prover/smt/solver/mam-compiler.ts +14 -15
- package/src/prover/smt/solver/mam-interpreter.ts +0 -1
- package/src/prover/smt/solver/max-bv-sharing-tactic.ts +1 -13
- package/src/prover/smt/solver/max-cliques.ts +0 -2
- package/src/prover/smt/solver/maxcore.ts +6 -15
- package/src/prover/smt/solver/maximize-ac-sharing.ts +0 -2
- package/src/prover/smt/solver/maxlex.ts +0 -8
- package/src/prover/smt/solver/maxsmt-base.ts +7 -1
- package/src/prover/smt/solver/maxsmt.ts +0 -1
- package/src/prover/smt/solver/mbp/mbp-arith.ts +2 -12
- package/src/prover/smt/solver/mbp/mbp-basic-tg.ts +0 -1
- package/src/prover/smt/solver/mbp/mbp-plugin.ts +10 -3
- package/src/prover/smt/solver/mbp/mbp-qel.ts +0 -1
- package/src/prover/smt/solver/mbp/mbp-solve-plugin.ts +1 -10
- package/src/prover/smt/solver/mbp/mbp-term-graph.ts +1 -19
- package/src/prover/smt/solver/model-based-opt.ts +1 -2
- package/src/prover/smt/solver/model-checker.ts +2 -3
- package/src/prover/smt/solver/model-evaluator.ts +9 -6
- package/src/prover/smt/solver/model-finder.ts +0 -1
- package/src/prover/smt/solver/model-generator.ts +3 -2
- package/src/prover/smt/solver/model-macro-solver.ts +3 -4
- package/src/prover/smt/solver/model-printer.ts +0 -1
- package/src/prover/smt/solver/mpf.ts +2 -5
- package/src/prover/smt/solver/mus.ts +2 -4
- package/src/prover/smt/solver/muz/dl-context.ts +67 -19
- package/src/prover/smt/solver/muz/dl-mk-bit-blast.ts +0 -1
- package/src/prover/smt/solver/muz/dl-mk-coi-filter.ts +68 -22
- package/src/prover/smt/solver/muz/dl-mk-elim-term-ite.ts +7 -3
- package/src/prover/smt/solver/muz/dl-mk-interp-tail-simplifier.ts +0 -6
- package/src/prover/smt/solver/muz/dl-mk-rule-inliner.ts +39 -11
- package/src/prover/smt/solver/muz/dl-mk-slice.ts +78 -16
- package/src/prover/smt/solver/muz/dl-mk-subsumption-checker.ts +9 -4
- package/src/prover/smt/solver/muz/dl-rule-set.ts +0 -30
- package/src/prover/smt/solver/muz/dl-rule-transformer.ts +0 -4
- package/src/prover/smt/solver/muz/dl-rule.ts +93 -57
- package/src/prover/smt/solver/muz/hnf.ts +6 -6
- package/src/prover/smt/solver/muz/horn-subsume-model-converter.ts +176 -0
- package/src/prover/smt/solver/muz/horn-tactic.ts +15 -6
- package/src/prover/smt/solver/muz/rule-properties.ts +195 -37
- package/src/prover/smt/solver/muz/spacer-context.ts +111 -102
- package/src/prover/smt/solver/muz/spacer-dl-interface.ts +15 -4
- package/src/prover/smt/solver/muz/spacer-generalizers.ts +0 -3
- package/src/prover/smt/solver/muz/spacer-manager.ts +0 -6
- package/src/prover/smt/solver/muz/spacer-pdr.ts +4 -4
- package/src/prover/smt/solver/muz/spacer-prop-solver.ts +4 -15
- package/src/prover/smt/solver/muz/spacer-util.ts +2 -29
- package/src/prover/smt/solver/muz/substitution.ts +88 -39
- package/src/prover/smt/solver/nla2bv-tactic.ts +0 -1
- package/src/prover/smt/solver/nlqsat.ts +5 -5
- package/src/prover/smt/solver/nlsat/algebraic.ts +197 -96
- package/src/prover/smt/solver/nlsat/atoms.ts +52 -35
- package/src/prover/smt/solver/nlsat/evaluator.ts +0 -1
- package/src/prover/smt/solver/nlsat/explain.ts +379 -217
- package/src/prover/smt/solver/nlsat/interval-set.ts +0 -1
- package/src/prover/smt/solver/nlsat/levelwise.ts +460 -241
- package/src/prover/smt/solver/nlsat/mpbq.ts +0 -1
- package/src/prover/smt/solver/nlsat/polynomial.ts +2366 -683
- package/src/prover/smt/solver/nlsat/solver.ts +118 -105
- package/src/prover/smt/solver/nlsat/transcendental-eval.ts +2 -3
- package/src/prover/smt/solver/nlsat/transcendentals.ts +41 -19
- package/src/prover/smt/solver/nlsat/types.ts +0 -2
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +8 -7
- package/src/prover/smt/solver/nlsat/upolynomial.ts +41 -20
- package/src/prover/smt/solver/nlsat-tactic.ts +1 -2
- package/src/prover/smt/solver/nnf.ts +6 -3
- package/src/prover/smt/solver/normalize-bounds.ts +0 -1
- package/src/prover/smt/solver/occf.ts +0 -1
- package/src/prover/smt/solver/opt-context.ts +19 -13
- package/src/prover/smt/solver/opt-nlsat.ts +97 -77
- package/src/prover/smt/solver/opt-pareto.ts +0 -2
- package/src/prover/smt/solver/opt-preprocess.ts +1 -2
- package/src/prover/smt/solver/opt-solver.ts +22 -11
- package/src/prover/smt/solver/opt-value.ts +0 -1
- package/src/prover/smt/solver/optsmt.ts +13 -12
- package/src/prover/smt/solver/parallel-tactic.ts +0 -2
- package/src/prover/smt/solver/pattern-inference.ts +2 -3
- package/src/prover/smt/solver/pb-rewriter.ts +15 -30
- package/src/prover/smt/solver/pb2bv-tactic.ts +0 -2
- package/src/prover/smt/solver/poly-rewriter.ts +76 -21
- package/src/prover/smt/solver/probes.ts +91 -28
- package/src/prover/smt/solver/propagate-values.ts +4 -1
- package/src/prover/smt/solver/proto-model.ts +9 -12
- package/src/prover/smt/solver/pull-quant.ts +0 -1
- package/src/prover/smt/solver/purify-arith.ts +50 -16
- package/src/prover/smt/solver/qe-arith-plugin.ts +4 -7
- package/src/prover/smt/solver/qe-lite-der.ts +0 -1
- package/src/prover/smt/solver/qe-lite-fm.ts +0 -1
- package/src/prover/smt/solver/qe-lite.ts +2 -3
- package/src/prover/smt/solver/qe-mbp.ts +13 -24
- package/src/prover/smt/solver/qe.ts +48 -57
- package/src/prover/smt/solver/qel.ts +0 -1
- package/src/prover/smt/solver/qi-queue.ts +0 -1
- package/src/prover/smt/solver/qsat.ts +71 -97
- package/src/prover/smt/solver/quant-hoist.ts +2 -1
- package/src/prover/smt/solver/quant-tactics.ts +0 -1
- package/src/prover/smt/solver/quantifier-analyzer.ts +9 -10
- package/src/prover/smt/solver/quantifier-manager.ts +14 -10
- package/src/prover/smt/solver/quasi-macros.ts +9 -20
- package/src/prover/smt/solver/random-gen.ts +0 -1
- package/src/prover/smt/solver/rational.ts +17 -1
- package/src/prover/smt/solver/recfun-decl-plugin.ts +35 -21
- package/src/prover/smt/solver/recfun-rewriter.ts +1 -2
- package/src/prover/smt/solver/reduce-args.ts +0 -1
- package/src/prover/smt/solver/reduce-bv-size.ts +0 -1
- package/src/prover/smt/solver/ref-vector.ts +0 -1
- package/src/prover/smt/solver/relevancy.ts +0 -1
- package/src/prover/smt/solver/rewriter-tpl.ts +6 -3
- package/src/prover/smt/solver/rewriter.ts +1 -2
- package/src/prover/smt/solver/rlimit.ts +17 -1
- package/src/prover/smt/solver/sat/asymm-branch.ts +59 -48
- package/src/prover/smt/solver/sat/big.ts +0 -1
- package/src/prover/smt/solver/sat/clause-use-list.ts +0 -8
- package/src/prover/smt/solver/sat/clause.ts +2 -20
- package/src/prover/smt/solver/sat/cleaner.ts +0 -2
- package/src/prover/smt/solver/sat/config.ts +6 -9
- package/src/prover/smt/solver/sat/consequences.ts +1 -2
- package/src/prover/smt/solver/sat/elim-eqs.ts +0 -2
- package/src/prover/smt/solver/sat/goal2sat.ts +1 -3
- package/src/prover/smt/solver/sat/inc-sat-solver.ts +30 -15
- package/src/prover/smt/solver/sat/model-converter.ts +2 -22
- package/src/prover/smt/solver/sat/pb-constraint.ts +0 -3
- package/src/prover/smt/solver/sat/pb-solver.ts +50 -26
- package/src/prover/smt/solver/sat/probing.ts +22 -21
- package/src/prover/smt/solver/sat/sat-tactic.ts +4 -4
- package/src/prover/smt/solver/sat/sat2goal.ts +9 -15
- package/src/prover/smt/solver/sat/scc.ts +1 -2
- package/src/prover/smt/solver/sat/simplifier.ts +16 -60
- package/src/prover/smt/solver/sat/solver.ts +47 -70
- package/src/prover/smt/solver/sat/var-queue.ts +0 -2
- package/src/prover/smt/solver/sat/watch-list.ts +7 -3
- package/src/prover/smt/solver/search-tree.ts +0 -1
- package/src/prover/smt/solver/seq-axioms.ts +21 -39
- package/src/prover/smt/solver/seq-decl-plugin.ts +10 -14
- package/src/prover/smt/solver/seq-derive.ts +11 -16
- package/src/prover/smt/solver/seq-eq-approx.ts +0 -2
- package/src/prover/smt/solver/seq-eq-solver.ts +9 -10
- package/src/prover/smt/solver/seq-factory.ts +2 -4
- package/src/prover/smt/solver/seq-monadic.ts +7 -7
- package/src/prover/smt/solver/seq-range-predicate.ts +18 -8
- package/src/prover/smt/solver/seq-re-rewriter.ts +5 -130
- package/src/prover/smt/solver/seq-re-util.ts +8 -27
- package/src/prover/smt/solver/seq-regex-bisim.ts +2 -3
- package/src/prover/smt/solver/seq-regex-live.ts +6 -8
- package/src/prover/smt/solver/seq-rewriter.ts +32 -35
- package/src/prover/smt/solver/seq-skolem.ts +0 -24
- package/src/prover/smt/solver/seq-subset.ts +0 -1
- package/src/prover/smt/solver/seq-view-witness.ts +4 -6
- package/src/prover/smt/solver/smt-consequences.ts +0 -2
- package/src/prover/smt/solver/smt-kernel.ts +9 -5
- package/src/prover/smt/solver/smt-logics.ts +0 -1
- package/src/prover/smt/solver/smt-setup.ts +86 -20
- package/src/prover/smt/solver/smt2-printer.ts +0 -2
- package/src/prover/smt/solver/smtlib-parser.ts +1681 -721
- package/src/prover/smt/solver/smtlib-script.ts +1273 -793
- package/src/prover/smt/solver/solve-eqs.ts +13 -23
- package/src/prover/smt/solver/solver.ts +1 -2
- package/src/prover/smt/solver/static-features.ts +0 -5
- package/src/prover/smt/solver/sticky-generations.ts +0 -1
- package/src/prover/smt/solver/tactic.ts +269 -130
- package/src/prover/smt/solver/term-enumeration.ts +0 -1
- package/src/prover/smt/solver/theory-array.ts +25 -60
- package/src/prover/smt/solver/theory-bv.ts +15 -54
- package/src/prover/smt/solver/theory-char.ts +0 -1
- package/src/prover/smt/solver/theory-datatype.ts +0 -1
- package/src/prover/smt/solver/theory-finite-set.ts +2 -2
- package/src/prover/smt/solver/theory-fpa.ts +46 -79
- package/src/prover/smt/solver/theory-lra-axioms.ts +0 -1
- package/src/prover/smt/solver/theory-lra-bounds.ts +0 -1
- package/src/prover/smt/solver/theory-lra-final-check.ts +1 -2
- package/src/prover/smt/solver/theory-lra-internalize.ts +9 -1
- package/src/prover/smt/solver/theory-lra-model.ts +0 -1
- package/src/prover/smt/solver/theory-lra-propagate.ts +6 -5
- package/src/prover/smt/solver/theory-lra-state.ts +0 -1
- package/src/prover/smt/solver/theory-lra.ts +0 -7
- package/src/prover/smt/solver/theory-pb.ts +34 -15
- package/src/prover/smt/solver/theory-polymorphism.ts +3 -4
- package/src/prover/smt/solver/theory-recfun.ts +2 -3
- package/src/prover/smt/solver/theory-seq-regex.ts +3 -7
- package/src/prover/smt/solver/theory-seq-solve.ts +6 -8
- package/src/prover/smt/solver/theory-seq-state.ts +8 -36
- package/src/prover/smt/solver/theory-seq.ts +32 -55
- package/src/prover/smt/solver/theory.ts +16 -2
- package/src/prover/smt/solver/tseitin-cnf.ts +3 -5
- package/src/prover/smt/solver/var-subst.ts +6 -6
- package/src/prover/smt/table.ts +3 -2
- package/src/prover/tlapm/cache.ts +8 -8
- package/src/prover/zenon/decide.ts +9 -13
- package/src/prover/zenon/encode.ts +0 -2
- package/src/prover/zenon/eqrel.ts +0 -2
- package/src/prover/zenon/equality-rules.ts +24 -2
- package/src/prover/zenon/expr.ts +21 -2
- package/src/prover/zenon/index-table.ts +7 -4
- package/src/prover/zenon/isar-case.ts +1 -3
- package/src/prover/zenon/isar.ts +2 -4
- package/src/prover/zenon/llproof.ts +0 -2
- package/src/prover/zenon/mltoll.ts +0 -2
- package/src/prover/zenon/node.ts +12 -13
- package/src/prover/zenon/parse.ts +0 -2
- package/src/prover/zenon/phrase.ts +1 -3
- package/src/prover/zenon/proof.ts +0 -2
- package/src/prover/zenon/propositional-rules.ts +0 -2
- package/src/prover/zenon/rules.ts +2 -3
- package/src/prover/zenon/search.ts +0 -2
- package/src/prover/zenon/tla/functions.ts +0 -2
- package/src/prover/zenon/tla/llproof.ts +0 -2
- package/src/prover/zenon/tla/records.ts +0 -2
- package/src/prover/zenon/tla/rewrites.ts +0 -2
- package/src/prover/zenon/tla/sets.ts +1 -3
- package/src/prover/zenon/tla/terms.ts +0 -2
- package/src/prover/zenon/tla/tla.ts +0 -2
- package/src/resolve.ts +625 -189
- package/src/runtime.ts +7 -1
- package/src/sany/builtins.ts +10 -10
- package/src/sany/generation.ts +2 -13
- package/src/sany/generator-definitions.ts +3 -1
- package/src/sany/generator-expressions.ts +36 -30
- package/src/sany/generator-proofs.ts +5 -3
- package/src/sany/generator.ts +2 -1
- package/src/sany/levels.ts +0 -2
- package/src/sany/lexer.ts +3 -3
- package/src/sany/linter.ts +0 -2
- package/src/sany/modules.ts +4 -2
- package/src/sany/nodes.ts +1 -1
- package/src/sany/selectors.ts +11 -6
- package/src/sany/xml.ts +2 -3
- package/src/search.ts +209 -56
- package/src/simulate.ts +3 -0
- package/src/spec-description.ts +2 -2
- package/src/standard-definitions.ts +4 -0
- package/src/state-graph.ts +0 -2
- package/src/subexpressions.ts +265 -94
- package/src/successors.ts +2 -1
- package/src/symmetry.ts +3 -3
- package/src/tableau.ts +2 -2
- package/src/tlc/fingerprint.ts +81 -9
- package/src/tlc/jar-data.ts +10 -0
- package/src/tlc/messages.ts +3 -3
- package/src/tlc/order.ts +14 -3
- package/src/tlc/summary.ts +29 -14
- package/src/tlc/tlc-operators.ts +3 -1
- package/src/tlc/tlcext-operators.ts +61 -16
- package/src/tlc/trace-spec.ts +5 -5
- package/src/typed-tier.ts +6541 -0
- package/src/typescript/types.ts +2 -2
- package/src/values.ts +46 -27
- package/src/prover/smt/solver/seq-regex-witness.ts +0 -100
- package/src/prover/smt/solver/z3-license.txt +0 -10
- package/src/prover/zenon/LICENSE +0 -32
|
@@ -3,14 +3,9 @@ import { EXIT_STATUS, setExitCode } from "../exit-codes";
|
|
|
3
3
|
import { parseModule } from "../parser";
|
|
4
4
|
import { generateSanySpecification } from "../sany/generator";
|
|
5
5
|
import { checkModuleLevels } from "../sany/levels";
|
|
6
|
-
import {
|
|
7
|
-
VARIABLE_DECL_KIND,
|
|
8
|
-
type ModuleNode,
|
|
9
|
-
type OpDefNode,
|
|
10
|
-
type SymbolNode,
|
|
11
|
-
} from "../sany/nodes";
|
|
6
|
+
import type { ModuleNode, OpDefNode, SymbolNode } from "../sany/nodes";
|
|
12
7
|
import type { TlcVersion } from "../tlc/version";
|
|
13
|
-
import type {
|
|
8
|
+
import type { RuntimeInvariantTemplate } from "./tlc-arguments";
|
|
14
9
|
|
|
15
10
|
const CONSTANT_LEVEL = 0;
|
|
16
11
|
const TEMPORAL_LEVEL = 3;
|
|
@@ -31,21 +26,20 @@ const createParsingFailure = (detail: string) =>
|
|
|
31
26
|
EXIT_STATUS.specParseError,
|
|
32
27
|
);
|
|
33
28
|
|
|
34
|
-
const
|
|
35
|
-
|
|
29
|
+
const checkDebuggerExpression = (
|
|
30
|
+
source: string,
|
|
31
|
+
moduleName: string,
|
|
36
32
|
name: string,
|
|
37
33
|
expression: string,
|
|
38
34
|
loadModule: (name: string) => string | undefined,
|
|
39
35
|
version: TlcVersion,
|
|
40
36
|
) => {
|
|
41
|
-
const moduleName = name.replace("__DebuggerExpr__", "__DebuggerModule__");
|
|
42
|
-
const text = `---- MODULE ${moduleName} ----\nEXTENDS ${root}\n\n${name} == ${expression}\n====`;
|
|
43
37
|
const createFailure = (message: string) =>
|
|
44
38
|
createParsingFailure(
|
|
45
39
|
`Unknown location\n\n${message} while parsing breakpoint expression "${expression}"`,
|
|
46
40
|
);
|
|
47
41
|
try {
|
|
48
|
-
parseModule(
|
|
42
|
+
parseModule(source);
|
|
49
43
|
} catch (error) {
|
|
50
44
|
if (!(error instanceof TlaSyntaxError)) throw error;
|
|
51
45
|
throw createParsingFailure(`Syntax error while parsing breakpoint expression "${expression}"`);
|
|
@@ -54,7 +48,7 @@ const getDebuggerExpressionLevel = (
|
|
|
54
48
|
let isLevelCorrect = false;
|
|
55
49
|
const specification = (() => {
|
|
56
50
|
try {
|
|
57
|
-
return generateSanySpecification(
|
|
51
|
+
return generateSanySpecification(source, loadModule, {
|
|
58
52
|
version,
|
|
59
53
|
onModule: (module, messages) => {
|
|
60
54
|
const isCorrect = () => messages.every((message) => message.isWarning);
|
|
@@ -81,56 +75,26 @@ const getDebuggerExpressionLevel = (
|
|
|
81
75
|
`Unknown location\n\nDebug expressions must be action-level or below; actual level: ${level} (Temporal)`,
|
|
82
76
|
);
|
|
83
77
|
}
|
|
84
|
-
return level;
|
|
85
78
|
};
|
|
86
79
|
|
|
87
|
-
|
|
88
|
-
export const addRuntimeInvariants = (
|
|
80
|
+
export const getRuntimeInvariants = (
|
|
89
81
|
source: string,
|
|
90
82
|
root: ModuleNode,
|
|
91
|
-
invariants:
|
|
83
|
+
invariants: RuntimeInvariantTemplate[],
|
|
92
84
|
loadModule: (name: string) => string | undefined,
|
|
93
85
|
version: TlcVersion,
|
|
94
86
|
) => {
|
|
95
|
-
const stamp = Date.now();
|
|
96
|
-
const named = invariants.map((invariant, index) => ({
|
|
97
|
-
expression: invariant.expression,
|
|
98
|
-
name: findDefinition(root, invariant.expression)
|
|
99
|
-
? invariant.expression
|
|
100
|
-
: `__DebuggerExpr__${stamp + index}`,
|
|
101
|
-
}));
|
|
102
|
-
const names = named.map((invariant) => invariant.name);
|
|
103
|
-
const generated = named.filter((invariant) => invariant.name !== invariant.expression);
|
|
104
|
-
if (generated.length === 0) return { names, source };
|
|
105
87
|
const loadDependency = (name: string) => (name === root.name ? source : loadModule(name));
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
)
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
);
|
|
118
|
-
// HACK: TLC checks a constant-level -inv in every state, so an unused LET makes it depend on one.
|
|
119
|
-
return level === CONSTANT_LEVEL && variable
|
|
120
|
-
? `${invariant.name} ==\nLET ${invariant.name}State == ${variable.name} IN\n${" ".repeat(head.length)}${invariant.expression}`
|
|
121
|
-
: `${head}${invariant.expression}`;
|
|
88
|
+
// Deviation from TLC: TLC reads the clock for each name, which no fixed output can match; one reading plus an index keeps the names apart.
|
|
89
|
+
const stamp = Date.now();
|
|
90
|
+
return invariants.map((invariant, index) => {
|
|
91
|
+
if (findDefinition(root, invariant.expression)) {
|
|
92
|
+
return { name: invariant.expression, module: undefined, source: undefined };
|
|
93
|
+
}
|
|
94
|
+
const module = `__DebuggerModule__${stamp + index}`;
|
|
95
|
+
const name = `__DebuggerExpr__${stamp + index}`;
|
|
96
|
+
const text = `---- MODULE ${module} ----\nEXTENDS ${root.name}\n\n${name} == ${invariant.expression}\n====`;
|
|
97
|
+
checkDebuggerExpression(text, module, name, invariant.expression, loadDependency, version);
|
|
98
|
+
return { name, module, source: text };
|
|
122
99
|
});
|
|
123
|
-
const lines = source.split("\n");
|
|
124
|
-
const end = (parseModule(source).location.range?.end.line ?? lines.length) - 1;
|
|
125
|
-
const terminator = lines[end].search(/={4,}/);
|
|
126
|
-
return {
|
|
127
|
-
names,
|
|
128
|
-
source: [
|
|
129
|
-
...lines.slice(0, end),
|
|
130
|
-
lines[end].slice(0, terminator),
|
|
131
|
-
...definitions,
|
|
132
|
-
lines[end].slice(terminator),
|
|
133
|
-
...lines.slice(end + 1),
|
|
134
|
-
].join("\n"),
|
|
135
|
-
};
|
|
136
100
|
};
|
package/src/cli/tlapm.ts
CHANGED
|
@@ -2,7 +2,7 @@ import { spawnSync } from "node:child_process";
|
|
|
2
2
|
import { existsSync, mkdirSync, readFileSync, realpathSync, rmSync, writeFileSync } from "node:fs";
|
|
3
3
|
import { dirname, join } from "node:path";
|
|
4
4
|
import { availableParallelism } from "node:os";
|
|
5
|
-
import { TlaProofError } from "../errors";
|
|
5
|
+
import { TlaProofError, TlaProverError } from "../errors";
|
|
6
6
|
import { EXIT_STATUS } from "../exit-codes";
|
|
7
7
|
import type { LineRange } from "../obligations/generate";
|
|
8
8
|
import { getAtPrefix, getLocusText, type ObligationWarning } from "../obligations/expression";
|
|
@@ -15,7 +15,7 @@ import {
|
|
|
15
15
|
} from "../obligations";
|
|
16
16
|
import { format, renderDoc } from "../obligations/format";
|
|
17
17
|
import { printSequent, type PrinterOptions } from "../obligations/printer";
|
|
18
|
-
import { parseDefaultMethods } from "../prover/prep/methods";
|
|
18
|
+
import { parseDefaultMethods, parseOcamlFloat, parseOcamlInt } from "../prover/prep/methods";
|
|
19
19
|
import {
|
|
20
20
|
encodeProofTheory,
|
|
21
21
|
formatNormalized,
|
|
@@ -39,7 +39,186 @@ import { formatTlcDate } from "../tlc/messages";
|
|
|
39
39
|
import { TLAPM_COMMAND, USAGE, type ParsedArgs } from "./options";
|
|
40
40
|
import { getInputPaths } from "./shared";
|
|
41
41
|
|
|
42
|
-
|
|
42
|
+
interface TlapmArgument {
|
|
43
|
+
name: string;
|
|
44
|
+
values: ("int" | "float" | "string")[];
|
|
45
|
+
doc: string;
|
|
46
|
+
}
|
|
47
|
+
|
|
48
|
+
const BLANK_ARGUMENT: TlapmArgument = { name: "", values: [], doc: " " };
|
|
49
|
+
|
|
50
|
+
// The option list of tlapm_args.ml's init.
|
|
51
|
+
const TLAPM_ARGUMENTS: TlapmArgument[] = [
|
|
52
|
+
BLANK_ARGUMENT,
|
|
53
|
+
{ name: "(basic options)", values: [], doc: " " },
|
|
54
|
+
BLANK_ARGUMENT,
|
|
55
|
+
{ name: "--help", values: [], doc: " show this help message and exit" },
|
|
56
|
+
{ name: "-help", values: [], doc: " (same as --help)" },
|
|
57
|
+
{ name: "--version", values: [], doc: " show version number and exit" },
|
|
58
|
+
{ name: "--verbose", values: [], doc: " produce verbose messages" },
|
|
59
|
+
{ name: "-v", values: [], doc: " (same as --verbose)" },
|
|
60
|
+
BLANK_ARGUMENT,
|
|
61
|
+
{ name: "--where", values: [], doc: " show location of standard library and exit" },
|
|
62
|
+
{ name: "--config", values: [], doc: " show configuration and exit" },
|
|
63
|
+
{ name: "--summary", values: [], doc: " show summary of theorems (implies -N and not -C)" },
|
|
64
|
+
{
|
|
65
|
+
name: "--strict",
|
|
66
|
+
values: [],
|
|
67
|
+
doc: " report incomplete proofs, empty proof targets and failed obligations as errors and exit with a non-zero status",
|
|
68
|
+
},
|
|
69
|
+
{ name: "--timing", values: [], doc: " show runtime statistics" },
|
|
70
|
+
BLANK_ARGUMENT,
|
|
71
|
+
{ name: "-I", values: ["string"], doc: "<dir> add <dir> to search path" },
|
|
72
|
+
{ name: "-d", values: ["string"], doc: "" },
|
|
73
|
+
BLANK_ARGUMENT,
|
|
74
|
+
{ name: "-k", values: [], doc: " keep going on backend failures" },
|
|
75
|
+
{ name: "-N", values: [], doc: " do not run any backend verifiers" },
|
|
76
|
+
{ name: "-C", values: [], doc: " check proofs in Isabelle/TLA+" },
|
|
77
|
+
BLANK_ARGUMENT,
|
|
78
|
+
{ name: "--threads", values: ["int"], doc: "<int> set number of worker threads to <int>" },
|
|
79
|
+
{
|
|
80
|
+
name: "--method",
|
|
81
|
+
values: ["string"],
|
|
82
|
+
doc: "<meth> set default method to <meth> (try --method help)",
|
|
83
|
+
},
|
|
84
|
+
{ name: "--solver", values: ["string"], doc: "<solver> set SMT solver to <solver>" },
|
|
85
|
+
{ name: "--smt-logic", values: ["string"], doc: "<logic> set SMT logic to <logic>" },
|
|
86
|
+
{ name: "--stretch", values: ["float"], doc: "<f> multiply all timeouts by <f>" },
|
|
87
|
+
{ name: "--fast-isabelle", values: [], doc: "" },
|
|
88
|
+
BLANK_ARGUMENT,
|
|
89
|
+
{ name: "(advanced options)", values: [], doc: " " },
|
|
90
|
+
BLANK_ARGUMENT,
|
|
91
|
+
{ name: "--noflatten", values: [], doc: " do not flatten obligations" },
|
|
92
|
+
{ name: "--nonormal", values: [], doc: " do not normalize obligations before printing" },
|
|
93
|
+
{ name: "--debug", values: ["string"], doc: "{[-]<flag>} enable/disable debugging flags" },
|
|
94
|
+
{ name: "--paranoid", values: [], doc: "" },
|
|
95
|
+
{ name: "--isaprove", values: [], doc: "" },
|
|
96
|
+
BLANK_ARGUMENT,
|
|
97
|
+
{ name: "--toolbox", values: ["int", "int"], doc: "<int><int> toolbox mode" },
|
|
98
|
+
{
|
|
99
|
+
name: "--toolbox-vsn",
|
|
100
|
+
values: ["int"],
|
|
101
|
+
doc: "<int> Toolbox protocol version, 1|2, 1 by default.",
|
|
102
|
+
},
|
|
103
|
+
{ name: "--line", values: ["int"], doc: "<int> line to prove" },
|
|
104
|
+
{
|
|
105
|
+
name: "--wait",
|
|
106
|
+
values: ["int"],
|
|
107
|
+
doc: "<time> wait for <time> before printing obligations in progress",
|
|
108
|
+
},
|
|
109
|
+
{
|
|
110
|
+
name: "--stdin",
|
|
111
|
+
values: [],
|
|
112
|
+
doc: " read the tla file from stdin instead of file system. Only applies if single tla file is provided as input.",
|
|
113
|
+
},
|
|
114
|
+
{
|
|
115
|
+
name: "--prefer-stdlib",
|
|
116
|
+
values: [],
|
|
117
|
+
doc: " prefer built-in standard modules if the module search path contains files with the same names as modules in stdlib.",
|
|
118
|
+
},
|
|
119
|
+
{
|
|
120
|
+
name: "--parser",
|
|
121
|
+
values: ["string"],
|
|
122
|
+
doc: " Set parser backend to use: TLAPM (default) or SANY.",
|
|
123
|
+
},
|
|
124
|
+
{
|
|
125
|
+
name: "--module-jar",
|
|
126
|
+
values: ["string"],
|
|
127
|
+
doc: " Add a path to a .jar file containing additional TLA+ modules, such\n as the community modules. Multiple .jar files can be added by using\n this option multiple times.",
|
|
128
|
+
},
|
|
129
|
+
{ name: "--noproving", values: [], doc: " do not prove, report fingerprinted results only" },
|
|
130
|
+
BLANK_ARGUMENT,
|
|
131
|
+
{ name: "--printallobs", values: [], doc: " print obligations in all toolbox messages" },
|
|
132
|
+
BLANK_ARGUMENT,
|
|
133
|
+
{ name: "--fpdir", values: ["string"], doc: "" },
|
|
134
|
+
{ name: "--safefp", values: [], doc: " check tlapm, zenon, Isabelle versions for fingerprints" },
|
|
135
|
+
{
|
|
136
|
+
name: "--nofp",
|
|
137
|
+
values: [],
|
|
138
|
+
doc: " do not use existing fingerprints, but overwrite any preexisting fingerprints associated with the current proof obligations, using the newly computed fingerprints and results",
|
|
139
|
+
},
|
|
140
|
+
{
|
|
141
|
+
name: "--nofpl",
|
|
142
|
+
values: ["int", "int"],
|
|
143
|
+
doc: "<int><int> disable fingerprint use between given lines",
|
|
144
|
+
},
|
|
145
|
+
{ name: "--cleanfp", values: [], doc: " erase fingerprint file before starting" },
|
|
146
|
+
BLANK_ARGUMENT,
|
|
147
|
+
{
|
|
148
|
+
name: "--erasefp",
|
|
149
|
+
values: ["string", "string"],
|
|
150
|
+
doc: "<f><back> erase from file <f> all results of backend <back>",
|
|
151
|
+
},
|
|
152
|
+
{
|
|
153
|
+
name: "--printfp",
|
|
154
|
+
values: ["string"],
|
|
155
|
+
doc: "<f> print the fingerprints stored in file <f> and quit",
|
|
156
|
+
},
|
|
157
|
+
{
|
|
158
|
+
name: "--usefp",
|
|
159
|
+
values: ["string"],
|
|
160
|
+
doc: "<f> load fingerprints from file <f> (save as usual)",
|
|
161
|
+
},
|
|
162
|
+
{ name: "--fpp", values: [], doc: " print the fingerprints of obligations in toolbox messages" },
|
|
163
|
+
{
|
|
164
|
+
name: "--cache-dir",
|
|
165
|
+
values: ["string"],
|
|
166
|
+
doc: '<directory> save auxiliary and temporary files under <directory>. Alternatively, this directory can be defined via the variable `TLAPM_CACHE_DIR` of the runtime environment. The command-line parameter takes precedence over the environment variable. If neither is specified, the default value is ".tlacache".',
|
|
167
|
+
},
|
|
168
|
+
];
|
|
169
|
+
|
|
170
|
+
const getMetavariableLength = (doc: string) => /^[^ ]* */.exec(doc)?.[0].length ?? 0;
|
|
171
|
+
|
|
172
|
+
// OCaml's Arg.align and Arg.usage_string.
|
|
173
|
+
const getArgumentUsage = () => {
|
|
174
|
+
const width = Math.max(
|
|
175
|
+
...TLAPM_ARGUMENTS.map(
|
|
176
|
+
(argument) => argument.name.length + getMetavariableLength(argument.doc),
|
|
177
|
+
),
|
|
178
|
+
);
|
|
179
|
+
return `Usage: tla-ts tlapm <options> FILE ...\noptions are:\n${TLAPM_ARGUMENTS.filter(
|
|
180
|
+
(argument) => argument.doc !== "",
|
|
181
|
+
)
|
|
182
|
+
.map((argument) => {
|
|
183
|
+
const cut = getMetavariableLength(argument.doc);
|
|
184
|
+
return ` ${argument.name} ${argument.doc.slice(0, cut)}${" ".repeat(width - argument.name.length - cut)}${argument.doc.slice(cut)}\n`;
|
|
185
|
+
})
|
|
186
|
+
.join("")}`;
|
|
187
|
+
};
|
|
188
|
+
|
|
189
|
+
// OCaml's Arg.parse_argv: the first argument it rejects, with the Arg.Bad of tlapm_args.ml's setters.
|
|
190
|
+
const getArgumentError = (args: string[]) => {
|
|
191
|
+
for (let index = 0; index < args.length; index++) {
|
|
192
|
+
const name = args[index];
|
|
193
|
+
if (name === "--version") return undefined;
|
|
194
|
+
if (!name.startsWith("-")) continue;
|
|
195
|
+
const argument = TLAPM_ARGUMENTS.find((innerArgument) => innerArgument.name === name);
|
|
196
|
+
if (!argument) return `unknown option '${name}'`;
|
|
197
|
+
for (const kind of argument.values) {
|
|
198
|
+
index++;
|
|
199
|
+
if (index === args.length) return `option '${name}' needs an argument`;
|
|
200
|
+
const value = args[index];
|
|
201
|
+
if (kind === "int" && parseOcamlInt(value) === undefined)
|
|
202
|
+
return `wrong argument '${value}'; option '${name}' expects an integer`;
|
|
203
|
+
if (kind === "float" && parseOcamlFloat(value) === undefined)
|
|
204
|
+
return `wrong argument '${value}'; option '${name}' expects a float`;
|
|
205
|
+
}
|
|
206
|
+
const value = args[index];
|
|
207
|
+
if (name === "--threads" && (parseOcamlInt(value) ?? 0) < 0)
|
|
208
|
+
return "--threads requires a positive argument";
|
|
209
|
+
if (name === "--debug" && value.split(",").includes("oldsmt"))
|
|
210
|
+
return "--debug oldsmt: the old SMT encoding has been removed";
|
|
211
|
+
if (name === "--method") {
|
|
212
|
+
try {
|
|
213
|
+
parseDefaultMethods(value);
|
|
214
|
+
} catch (error) {
|
|
215
|
+
if (!(error instanceof TlaProverError)) throw error;
|
|
216
|
+
return error.message;
|
|
217
|
+
}
|
|
218
|
+
}
|
|
219
|
+
}
|
|
220
|
+
return undefined;
|
|
221
|
+
};
|
|
43
222
|
|
|
44
223
|
const getLibraryDirectories = (parsed: ParsedArgs) => [
|
|
45
224
|
".",
|
|
@@ -93,6 +272,8 @@ const checkStrictly = (module: ModuleObligations, isTargeted: boolean, isSummary
|
|
|
93
272
|
|
|
94
273
|
const TLAPM_FAILURE_STATUS = 3;
|
|
95
274
|
|
|
275
|
+
const TLAPM_USAGE_STATUS = 2;
|
|
276
|
+
|
|
96
277
|
const UNPROVED_ENDING = [
|
|
97
278
|
' tlapm ending abnormally with Failure("backend errors: there are unproved obligations")',
|
|
98
279
|
'Raised at Stdlib.failwith in file "stdlib.ml", line 29, characters 17-33',
|
|
@@ -130,17 +311,18 @@ const reportAbnormalEnding = (
|
|
|
130
311
|
);
|
|
131
312
|
};
|
|
132
313
|
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
)
|
|
137
|
-
|
|
314
|
+
type Outcome<Value> = { kind: "done"; value: Value } | { kind: "aborted"; error: TlaProofError };
|
|
315
|
+
|
|
316
|
+
const getAbortedOutcome = (error: unknown): Outcome<never> => {
|
|
317
|
+
if (!(error instanceof TlaProofError)) throw error;
|
|
318
|
+
return { kind: "aborted", error };
|
|
319
|
+
};
|
|
320
|
+
|
|
321
|
+
const generateObligations = (generate: () => ModuleObligations[]): Outcome<ModuleObligations[]> => {
|
|
138
322
|
try {
|
|
139
|
-
return generate(
|
|
323
|
+
return { kind: "done", value: generate() };
|
|
140
324
|
} catch (error) {
|
|
141
|
-
|
|
142
|
-
reportAbnormalEnding(error, errorSetting, isToolbox);
|
|
143
|
-
return undefined;
|
|
325
|
+
return getAbortedOutcome(error);
|
|
144
326
|
}
|
|
145
327
|
};
|
|
146
328
|
|
|
@@ -162,8 +344,15 @@ const printAttempt = (
|
|
|
162
344
|
const reason = getFailureReason(attempt);
|
|
163
345
|
const isProved = isProvedAttempt(attempt);
|
|
164
346
|
const isReused = attempt.kind === "reused";
|
|
165
|
-
const note =
|
|
166
|
-
|
|
347
|
+
const note =
|
|
348
|
+
attempt.kind === "decided"
|
|
349
|
+
? attempt.note
|
|
350
|
+
: attempt.kind === "refused"
|
|
351
|
+
? `${attempt.reason}\nObligation:\n\n`
|
|
352
|
+
: attempt.kind === "unavailable"
|
|
353
|
+
? `\n\\* ${attempt.warning}\n`
|
|
354
|
+
: undefined;
|
|
355
|
+
const shipped = attempt.kind === "unavailable" || isReused ? attempt.shipped : undefined;
|
|
167
356
|
printObligationMessage(obligation, isProved ? "proved" : "failed", [
|
|
168
357
|
`prover:${attempt.method.prover}`,
|
|
169
358
|
...(method === "" ? [] : [`meth:${method}`]),
|
|
@@ -262,19 +451,21 @@ const proveModule = async (
|
|
|
262
451
|
report.attempts.forEach((attempt) => {
|
|
263
452
|
if (attempt.kind === "decided" && attempt.errorOutput !== undefined)
|
|
264
453
|
process.stdout.write(attempt.errorOutput);
|
|
265
|
-
if (attempt.kind === "
|
|
266
|
-
process.stderr.write(`${attempt.warning}\n`);
|
|
454
|
+
if (attempt.kind === "unavailable") process.stderr.write(`${attempt.warning}\n`);
|
|
267
455
|
});
|
|
268
456
|
report.warnings.forEach((warning) => printWarning(warning, settings.isToolbox));
|
|
269
457
|
if (!settings.isToolbox) return;
|
|
270
|
-
if (report.obligation.status === "trivial")
|
|
271
|
-
return printObligationMessage(obligation, "trivial", ["prover:tlapm", "already:false"]);
|
|
272
458
|
if (obligation.kind.kind === "Error") return printFailedObligation(obligation, "user error");
|
|
273
459
|
report.attempts.forEach((attempt) => printAttempt(obligation, attempt, settings.printing));
|
|
460
|
+
if (report.obligation.status === "trivial")
|
|
461
|
+
printObligationMessage(obligation, "trivial", ["prover:tlapm", "already:false"]);
|
|
274
462
|
},
|
|
275
463
|
});
|
|
276
464
|
const theoryPath = `${directory}/${module.name}.thy`;
|
|
277
|
-
writeFileSync(
|
|
465
|
+
writeFileSync(
|
|
466
|
+
theoryPath,
|
|
467
|
+
encodeProofTheory(module.name, reports, module.obligations, settings.backends.isFlattened),
|
|
468
|
+
);
|
|
278
469
|
console.log(`(* created new ${JSON.stringify(theoryPath)} *)`);
|
|
279
470
|
knownResults.save(fingerprintsPath);
|
|
280
471
|
console.log(`(* fingerprints written in ${JSON.stringify(fingerprintsPath)} *)`);
|
|
@@ -305,6 +496,8 @@ const proveModule = async (
|
|
|
305
496
|
return unproved.length > 0;
|
|
306
497
|
};
|
|
307
498
|
|
|
499
|
+
const REWRITE_FLAGS = ["rwsetext", "rw", "rw+"];
|
|
500
|
+
|
|
308
501
|
const DEBUG_FLAGS = new Set([
|
|
309
502
|
"tempfiles",
|
|
310
503
|
"hidden",
|
|
@@ -321,7 +514,9 @@ export const runTlapm = async (args: string[]) => {
|
|
|
321
514
|
const parsed = TLAPM_COMMAND.parse(args);
|
|
322
515
|
const isProcessing = !parsed.has("-N") && !parsed.has("--summary");
|
|
323
516
|
const debugFlags = parsed.options
|
|
324
|
-
.flatMap((option) =>
|
|
517
|
+
.flatMap((option) =>
|
|
518
|
+
option.name === "--debug" ? option.values.flatMap((value) => value.split(",")) : [],
|
|
519
|
+
)
|
|
325
520
|
.reduce(
|
|
326
521
|
(flags, flag) =>
|
|
327
522
|
flag.startsWith("-")
|
|
@@ -333,13 +528,22 @@ export const runTlapm = async (args: string[]) => {
|
|
|
333
528
|
isShowingHidden: debugFlags.has("hidden"),
|
|
334
529
|
isShowingAllDefinitions: debugFlags.has("alldefs"),
|
|
335
530
|
};
|
|
336
|
-
const rewriteFlags =
|
|
531
|
+
const rewriteFlags = REWRITE_FLAGS.filter((flag) => debugFlags.has(flag));
|
|
337
532
|
const isTyped = debugFlags.has("smarter_types") && !debugFlags.has("disable_arithmetic");
|
|
338
533
|
// tla-ts rewrites sets before it types expressions, though tlapm types them first.
|
|
339
534
|
const unsupportedFlag =
|
|
340
535
|
isTyped && rewriteFlags.length > 0
|
|
341
536
|
? `smarter_types with --debug ${rewriteFlags.at(-1)}`
|
|
342
537
|
: [...debugFlags].find((flag) => !DEBUG_FLAGS.has(flag));
|
|
538
|
+
const argumentError = getArgumentError(args);
|
|
539
|
+
if (argumentError !== undefined) {
|
|
540
|
+
console.error(`tla-ts tlapm: ${argumentError}.\n${getArgumentUsage()}`);
|
|
541
|
+
return TLAPM_USAGE_STATUS;
|
|
542
|
+
}
|
|
543
|
+
if (parsed.has("--version")) {
|
|
544
|
+
console.log(TLAPM_VERSION);
|
|
545
|
+
return EXIT_STATUS.success;
|
|
546
|
+
}
|
|
343
547
|
const unsupported =
|
|
344
548
|
parsed.unknown[0] ??
|
|
345
549
|
(isProcessing && parsed.has("--printallobs") ? "--printallobs" : undefined) ??
|
|
@@ -348,27 +552,6 @@ export const runTlapm = async (args: string[]) => {
|
|
|
348
552
|
console.error(`Error: tla-ts tlapm does not support the tlapm option ${unsupported}.`);
|
|
349
553
|
return 1;
|
|
350
554
|
}
|
|
351
|
-
if (parsed.incomplete) {
|
|
352
|
-
console.error(`Error: option '${parsed.incomplete.name}' needs an argument.`);
|
|
353
|
-
return 1;
|
|
354
|
-
}
|
|
355
|
-
const nonInteger = parsed.options.find(
|
|
356
|
-
(option) =>
|
|
357
|
-
TLAPM_INTEGER_OPTIONS.has(option.name) &&
|
|
358
|
-
option.values.some((value) => !/^-?\d+$/.test(value)),
|
|
359
|
-
);
|
|
360
|
-
if (nonInteger) {
|
|
361
|
-
console.error(`Error: option '${nonInteger.name}' expects an integer.`);
|
|
362
|
-
return 1;
|
|
363
|
-
}
|
|
364
|
-
if (parsed.get("--stretch")?.some((value) => Number.isNaN(Number(value)))) {
|
|
365
|
-
console.error("Error: option '--stretch' expects a float.");
|
|
366
|
-
return 1;
|
|
367
|
-
}
|
|
368
|
-
if (parsed.has("--version")) {
|
|
369
|
-
console.log(TLAPM_VERSION);
|
|
370
|
-
return EXIT_STATUS.success;
|
|
371
|
-
}
|
|
372
555
|
const files = getInputPaths(parsed.positionals).map((input) => input.path);
|
|
373
556
|
const modulePaths = files.map((path) => (path.endsWith(".tla") ? path : `${path}.tla`));
|
|
374
557
|
if (modulePaths.length === 0) {
|
|
@@ -382,7 +565,7 @@ export const runTlapm = async (args: string[]) => {
|
|
|
382
565
|
);
|
|
383
566
|
}
|
|
384
567
|
const lines = parsed.options.reduce<LineRange>((range, option) => {
|
|
385
|
-
const [start, end] = option.values.map(
|
|
568
|
+
const [start, end] = option.values.map((value) => parseOcamlInt(value) ?? 0);
|
|
386
569
|
if (option.name === "--toolbox") return { start, end: end === 0 ? Infinity : end };
|
|
387
570
|
if (option.name === "--line") return start === 0 ? WHOLE_MODULE : { start, end: start };
|
|
388
571
|
return range;
|
|
@@ -392,7 +575,8 @@ export const runTlapm = async (args: string[]) => {
|
|
|
392
575
|
getLibraryDirectories(parsed),
|
|
393
576
|
);
|
|
394
577
|
const moduleNames = new Set<string>();
|
|
395
|
-
const
|
|
578
|
+
const errorSettings: ObligationWarning[] = [];
|
|
579
|
+
const generation = generateObligations(() => {
|
|
396
580
|
const missingIndex = modulePaths.findIndex((path) => !existsSync(path));
|
|
397
581
|
if (missingIndex !== -1) {
|
|
398
582
|
const missing = files[missingIndex];
|
|
@@ -412,25 +596,40 @@ export const runTlapm = async (args: string[]) => {
|
|
|
412
596
|
lines,
|
|
413
597
|
printing,
|
|
414
598
|
onWarning: (warning) => {
|
|
415
|
-
if (warning.channel === "error")
|
|
416
|
-
|
|
417
|
-
errorSetting.message = `${warning.text}\n\n${errorSetting.message}`;
|
|
418
|
-
return;
|
|
419
|
-
}
|
|
420
|
-
printWarning(warning, isToolbox);
|
|
599
|
+
if (warning.channel === "error") errorSettings.push(warning);
|
|
600
|
+
else printWarning(warning, isToolbox);
|
|
421
601
|
},
|
|
422
602
|
},
|
|
423
603
|
);
|
|
424
|
-
}
|
|
425
|
-
if (
|
|
604
|
+
});
|
|
605
|
+
if (generation.kind === "aborted") {
|
|
606
|
+
const lastLocus = errorSettings.at(-1)?.locus;
|
|
607
|
+
// Errors.set keeps the last location and puts each message before the earlier ones.
|
|
608
|
+
reportAbnormalEnding(
|
|
609
|
+
generation.error,
|
|
610
|
+
{
|
|
611
|
+
location: lastLocus && getLocusText(lastLocus),
|
|
612
|
+
message: errorSettings
|
|
613
|
+
.toReversed()
|
|
614
|
+
.map((setting) => `${setting.text}\n\n`)
|
|
615
|
+
.join(""),
|
|
616
|
+
},
|
|
617
|
+
isToolbox,
|
|
618
|
+
);
|
|
619
|
+
return TLAPM_FAILURE_STATUS;
|
|
620
|
+
}
|
|
621
|
+
const modules = generation.value;
|
|
426
622
|
const cacheDirectory =
|
|
427
623
|
parsed.get("--cache-dir")?.[0] ?? process.env.TLAPM_CACHE_DIR ?? ".tlacache";
|
|
428
|
-
const forgottenLines = parsed.get("--nofpl")?.map(
|
|
624
|
+
const forgottenLines = parsed.get("--nofpl")?.map((value) => parseOcamlInt(value) ?? 0) ?? [0, 0];
|
|
429
625
|
const methods = parsed.get("--method")?.[0];
|
|
430
626
|
const settings: ProvingSettings = {
|
|
431
627
|
isToolbox,
|
|
432
628
|
isProving: !parsed.has("--noproving"),
|
|
433
|
-
workers: Math.max(
|
|
629
|
+
workers: Math.max(
|
|
630
|
+
1,
|
|
631
|
+
parseOcamlInt(parsed.get("--threads")?.[0] ?? "") ?? availableParallelism(),
|
|
632
|
+
),
|
|
434
633
|
isFingerprinted: (obligation) =>
|
|
435
634
|
!parsed.has("--nofp") &&
|
|
436
635
|
!(
|
|
@@ -441,14 +640,16 @@ export const runTlapm = async (args: string[]) => {
|
|
|
441
640
|
fingerprints: new Map(),
|
|
442
641
|
backends: {
|
|
443
642
|
defaultMethods: methods === undefined ? undefined : parseDefaultMethods(methods),
|
|
444
|
-
stretch:
|
|
445
|
-
isFlattened:
|
|
643
|
+
stretch: parseOcamlFloat(parsed.get("--stretch")?.[0] ?? "1") ?? 1,
|
|
644
|
+
isFlattened:
|
|
645
|
+
!parsed.has("--noflatten") &&
|
|
646
|
+
["yes", "true", undefined].includes(process.env.TLAPM_FLATTEN),
|
|
446
647
|
smtLogic: debugFlags.has("disable_arithmetic")
|
|
447
648
|
? "UF"
|
|
448
649
|
: (parsed.get("--smt-logic")?.[0] ?? "UFNIA"),
|
|
449
650
|
smtEncoding: {
|
|
450
651
|
isArithmetic: !debugFlags.has("disable_arithmetic"),
|
|
451
|
-
rewriteLevel:
|
|
652
|
+
rewriteLevel: REWRITE_FLAGS.findLastIndex((flag) => debugFlags.has(flag)) + 1,
|
|
452
653
|
isSetExtensional: !debugFlags.has("no_smt_set_extensionality"),
|
|
453
654
|
isTyped,
|
|
454
655
|
},
|
|
@@ -497,26 +698,22 @@ export const runTlapm = async (args: string[]) => {
|
|
|
497
698
|
(name) => `${name}.tla`,
|
|
498
699
|
),
|
|
499
700
|
);
|
|
500
|
-
const
|
|
501
|
-
(
|
|
502
|
-
|
|
503
|
-
return error;
|
|
504
|
-
},
|
|
701
|
+
const proving = await proveModule(module, directory, fingerprintsPath, settings).then(
|
|
702
|
+
(isFailed): Outcome<boolean> => ({ kind: "done", value: isFailed }),
|
|
703
|
+
getAbortedOutcome,
|
|
505
704
|
);
|
|
506
|
-
if (
|
|
507
|
-
|
|
705
|
+
if (proving.kind === "aborted") {
|
|
706
|
+
const error = proving.error;
|
|
707
|
+
console.error(`${getAtPrefix(error.locus)}Error: ${error.message}`);
|
|
508
708
|
reportAbnormalEnding(
|
|
509
|
-
|
|
510
|
-
{
|
|
511
|
-
location: isFailed.locus && getLocusText(isFailed.locus),
|
|
512
|
-
message: isFailed.message,
|
|
513
|
-
},
|
|
709
|
+
error,
|
|
710
|
+
{ location: error.locus && getLocusText(error.locus), message: error.message },
|
|
514
711
|
isToolbox,
|
|
515
712
|
);
|
|
516
713
|
return TLAPM_FAILURE_STATUS;
|
|
517
714
|
}
|
|
518
|
-
if (
|
|
519
|
-
if (
|
|
715
|
+
if (proving.value && parsed.has("--strict")) statuses.push(STRICT_EXIT_STATUS.failed);
|
|
716
|
+
if (proving.value && !parsed.has("--strict") && !isToolbox) {
|
|
520
717
|
console.error(UNPROVED_ENDING);
|
|
521
718
|
return TLAPM_FAILURE_STATUS;
|
|
522
719
|
}
|
package/src/cli/tlc-arguments.ts
CHANGED
|
@@ -35,11 +35,11 @@ export interface TlcArguments {
|
|
|
35
35
|
suppressedCodes: number[];
|
|
36
36
|
errorCodes: number[];
|
|
37
37
|
userFile: string | undefined;
|
|
38
|
-
invariants:
|
|
38
|
+
invariants: RuntimeInvariantTemplate[];
|
|
39
39
|
moduleOperators: ModuleOperator[];
|
|
40
40
|
}
|
|
41
41
|
|
|
42
|
-
export interface
|
|
42
|
+
export interface RuntimeInvariantTemplate {
|
|
43
43
|
modules: string[];
|
|
44
44
|
expression: string;
|
|
45
45
|
}
|
package/src/cli/tlc-output.ts
CHANGED
|
@@ -320,11 +320,10 @@ export const printCheckProgress = (
|
|
|
320
320
|
timing.livenessStartTime = Date.now();
|
|
321
321
|
if (progress.isComplete) printProgress(printer, progress.statistics);
|
|
322
322
|
const branches = progress.branches > 1 ? `${progress.branches} branches of ` : "";
|
|
323
|
-
const states = progress.branches * progress.states;
|
|
324
323
|
print(
|
|
325
324
|
MESSAGE_CODE.checkingTemporal,
|
|
326
325
|
MESSAGE_LEVEL.none,
|
|
327
|
-
`Checking ${branches}temporal properties for the ${progress.isComplete ? "complete" : "current"} state space with ${states} total distinct states at (${formatTlcDate(new Date())})`,
|
|
326
|
+
`Checking ${branches}temporal properties for the ${progress.isComplete ? "complete" : "current"} state space with ${progress.states} total distinct states at (${formatTlcDate(new Date())})`,
|
|
328
327
|
);
|
|
329
328
|
return;
|
|
330
329
|
}
|
|
@@ -609,9 +608,9 @@ export const printCommandLineError = (isTool: boolean, version: TlcVersion, mess
|
|
|
609
608
|
return 1;
|
|
610
609
|
};
|
|
611
610
|
|
|
612
|
-
//
|
|
611
|
+
// TLC prints the JVM's default direct memory limit and its default fingerprint set and state queue.
|
|
613
612
|
export const printStartupBanner = (printer: MessagePrinter, args: TlcArguments) => {
|
|
614
|
-
const workers = `${args.workers} worker${args.workers === 1 ? "" : "s"} on ${availableParallelism()} cores with ${Math.floor(getHeapStatistics().heap_size_limit / 1024 / 1024)}MB heap and
|
|
613
|
+
const workers = `${args.workers} worker${args.workers === 1 ? "" : "s"} on ${availableParallelism()} cores with ${Math.floor(getHeapStatistics().heap_size_limit / 1024 / 1024)}MB heap and 64MB offheap memory [pid: ${process.pid}] (${type()} ${release()} ${arch()}, Node.js ${process.versions.node} ${process.arch.endsWith("64") ? 64 : 32}bit`;
|
|
615
614
|
if (args.mode === "model-check" && args.dfidDepth !== undefined) {
|
|
616
615
|
printer.print(
|
|
617
616
|
MESSAGE_CODE.depthFirstModelChecking,
|
|
@@ -624,7 +623,7 @@ export const printStartupBanner = (printer: MessagePrinter, args: TlcArguments)
|
|
|
624
623
|
printer.print(
|
|
625
624
|
MESSAGE_CODE.modelChecking,
|
|
626
625
|
MESSAGE_LEVEL.none,
|
|
627
|
-
`Running breadth-first search Model-Checking with fp ${args.fingerprintIndex} and seed ${args.seed} with ${workers},
|
|
626
|
+
`Running breadth-first search Model-Checking with fp ${args.fingerprintIndex} and seed ${args.seed} with ${workers}, MSBDiskFPSet, DiskStateQueue).`,
|
|
628
627
|
);
|
|
629
628
|
return;
|
|
630
629
|
}
|
package/src/cli/tlc-usage.ts
CHANGED