tla-ts 0.0.10-dev.63a6693bd → 0.0.10-dev.7a3bb1545
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 +3 -3
- package/dist/compile.js +1 -1
- package/dist/deciders.cjs +41 -37
- package/dist/deciders.js +58 -54
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +4 -1
- package/dist/index.d.ts +4 -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 +2682 -426
- package/dist/prove.js +2679 -423
- package/dist/run.cjs +43 -42
- package/dist/run.js +45 -44
- package/dist/tlapm.cjs +1 -1
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +43 -40
- package/dist/transfer.js +43 -40
- package/dist/worker.cjs +7 -7
- package/dist/worker.js +7 -7
- package/package.json +1 -1
- package/src/ast.ts +3 -3
- package/src/bags.ts +46 -28
- package/src/check-trace.ts +2 -16
- package/src/check.ts +336 -88
- package/src/cli/runtime-invariants.ts +20 -56
- package/src/cli/tlapm.ts +424 -62
- 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/dependencies.ts +23 -2
- package/src/dfid.ts +9 -2
- package/src/environment.ts +27 -5
- package/src/errors.ts +30 -3
- package/src/evaluate.ts +9 -3
- package/src/exit-codes.ts +5 -2
- package/src/instances.ts +1 -1
- package/src/levels.ts +3 -2
- package/src/lexer.ts +5 -3
- package/src/liveness-checker.ts +572 -204
- package/src/liveness.ts +47 -32
- package/src/obligations/action.ts +10 -6
- package/src/obligations/anonymize.ts +33 -14
- package/src/obligations/enabled-axioms.ts +218 -0
- package/src/obligations/equality.ts +1 -3
- package/src/obligations/expression.ts +18 -6
- package/src/obligations/format.ts +0 -2
- package/src/obligations/generate.ts +22 -17
- package/src/obligations/index.ts +36 -6
- package/src/obligations/levels.ts +24 -11
- package/src/obligations/module.ts +1 -3
- package/src/obligations/normalize.ts +24 -13
- 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 +17 -7
- package/src/obligations/source.ts +71 -17
- package/src/obligations/subexpression.ts +45 -18
- package/src/obligations/substitution.ts +1 -3
- 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 +633 -186
- package/src/pretty-print.ts +1 -1
- package/src/prover/deciders.ts +11 -8
- package/src/prover/isabelle/decide.ts +3 -25
- package/src/prover/isabelle/encode.ts +71 -41
- 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 +149 -3
- package/src/prover/isabelle/isar/method.ts +506 -198
- package/src/prover/isabelle/isar/proof.ts +570 -14
- package/src/prover/isabelle/isar/rule-cases.ts +226 -0
- package/src/prover/isabelle/isar/theory.ts +479 -69
- package/src/prover/isabelle/isar/toplevel.ts +331 -0
- package/src/prover/isabelle/isar/type-check.ts +83 -8
- 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 +45 -20
- 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 +63 -4
- 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 +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 +13 -7
- 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 +1 -8
- 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 +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 +0 -2
- 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 +1 -2
- package/src/prover/isabelle/tla/context.ts +51 -9
- package/src/prover/isabelle/tla/logic-data.ts +1 -1
- package/src/prover/isabelle/tla/logic.ts +40 -1
- package/src/prover/isabelle/tla/simpdata.ts +0 -2
- package/src/prover/isabelle/tools/intuitionistic.ts +28 -12
- package/src/prover/ocaml.ts +4 -1
- package/src/prover/prep/action.ts +19 -12
- package/src/prover/prep/enabled-axioms.ts +11 -2
- package/src/prover/prep/methods.ts +159 -50
- package/src/prover/prep/normalize.ts +38 -9
- package/src/prover/prove.ts +343 -65
- 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 +42 -6
- package/src/prover/smt/data.ts +191 -84
- package/src/prover/smt/encode.ts +122 -43
- 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 +483 -116
- 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 +93 -15
- package/src/prover/smt/solver/ast-lt.ts +165 -11
- package/src/prover/smt/solver/ast-util.ts +160 -2
- package/src/prover/smt/solver/ast.ts +1448 -41
- package/src/prover/smt/solver/auf-solver.ts +0 -1
- 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 +109 -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 +533 -114
- package/src/prover/smt/solver/ctx-simplify.ts +21 -12
- 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 +205 -0
- package/src/prover/smt/solver/distribute-forall.ts +57 -0
- package/src/prover/smt/solver/dom-simplify.ts +511 -0
- package/src/prover/smt/solver/dt2bv-tactic.ts +260 -0
- 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 +129 -0
- package/src/prover/smt/solver/elim-uncnstr.ts +542 -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 +901 -0
- package/src/prover/smt/solver/euf/euf-solver.ts +1204 -0
- package/src/prover/smt/solver/euf/fpa-solver.ts +317 -0
- package/src/prover/smt/solver/euf/mam.ts +1046 -0
- package/src/prover/smt/solver/euf/q-ematch.ts +829 -0
- package/src/prover/smt/solver/euf/q-mbi.ts +587 -0
- package/src/prover/smt/solver/euf/q-model-fixer.ts +296 -0
- package/src/prover/smt/solver/euf/q-solver.ts +361 -0
- package/src/prover/smt/solver/euf/th-solver.ts +328 -0
- package/src/prover/smt/solver/euf/th-solvers.ts +30 -0
- package/src/prover/smt/solver/expr-ref.ts +0 -1
- package/src/prover/smt/solver/expr-safe-replace.ts +26 -2
- package/src/prover/smt/solver/expr2polynomial.ts +271 -0
- package/src/prover/smt/solver/factor.ts +163 -0
- package/src/prover/smt/solver/fd-solver.ts +267 -0
- package/src/prover/smt/solver/fingerprints.ts +15 -15
- package/src/prover/smt/solver/fix-dl-var.ts +147 -0
- package/src/prover/smt/solver/flat-literals.ts +0 -1
- package/src/prover/smt/solver/fm-tactic.ts +884 -0
- package/src/prover/smt/solver/fpa-decl-plugin.ts +618 -0
- package/src/prover/smt/solver/fpa-rewriter.ts +639 -0
- package/src/prover/smt/solver/fpa2bv-converter.ts +2251 -0
- package/src/prover/smt/solver/fpa2bv-rewriter.ts +348 -0
- package/src/prover/smt/solver/fpa2bv-tactic.ts +73 -0
- package/src/prover/smt/solver/goal.ts +177 -15
- package/src/prover/smt/solver/goal2nlsat.ts +216 -0
- package/src/prover/smt/solver/guard-set.ts +219 -0
- package/src/prover/smt/solver/hash.ts +0 -1
- package/src/prover/smt/solver/hashtable.ts +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 +109 -36
- 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 +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 +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 +66 -11
- package/src/prover/smt/solver/lp/nla-divisions.ts +0 -2
- package/src/prover/smt/solver/lp/nla-emonics.ts +0 -1
- package/src/prover/smt/solver/lp/nla-factorization.ts +0 -1
- package/src/prover/smt/solver/lp/nla-grobner.ts +167 -85
- package/src/prover/smt/solver/lp/nla-horner.ts +0 -2
- package/src/prover/smt/solver/lp/nla-intervals.ts +0 -1
- package/src/prover/smt/solver/lp/nla-monomial-bounds.ts +0 -2
- package/src/prover/smt/solver/lp/nla-monotone.ts +0 -1
- package/src/prover/smt/solver/lp/nla-order.ts +0 -2
- package/src/prover/smt/solver/lp/nla-patcher.ts +0 -1
- package/src/prover/smt/solver/lp/nla-powers.ts +220 -0
- package/src/prover/smt/solver/lp/nla-tangents.ts +0 -2
- package/src/prover/smt/solver/lp/nla-throttle.ts +0 -1
- package/src/prover/smt/solver/lp/nla-transcendentals.ts +324 -0
- package/src/prover/smt/solver/lp/nla-types.ts +0 -2
- package/src/prover/smt/solver/lp/nla-var-eqs.ts +0 -1
- package/src/prover/smt/solver/lp/nra-solver.ts +163 -99
- package/src/prover/smt/solver/lp/numeric-pair.ts +0 -1
- package/src/prover/smt/solver/lp/pdd-interval.ts +6 -3
- package/src/prover/smt/solver/lp/pdd-simplifier.ts +60 -21
- package/src/prover/smt/solver/lp/pdd-solver.ts +72 -41
- package/src/prover/smt/solver/lp/pdd.ts +725 -290
- package/src/prover/smt/solver/lp/random-updater.ts +0 -2
- package/src/prover/smt/solver/lp/static-matrix.ts +0 -1
- package/src/prover/smt/solver/lp/union-find.ts +7 -2
- package/src/prover/smt/solver/macro-finder.ts +530 -0
- package/src/prover/smt/solver/mam-compiler.ts +118 -88
- 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 +17 -26
- package/src/prover/smt/solver/model-evaluator.ts +188 -12
- package/src/prover/smt/solver/model-finder.ts +0 -1
- package/src/prover/smt/solver/model-generator.ts +59 -30
- package/src/prover/smt/solver/model-macro-solver.ts +38 -27
- package/src/prover/smt/solver/model-printer.ts +214 -0
- package/src/prover/smt/solver/mpf.ts +709 -0
- package/src/prover/smt/solver/mus.ts +50 -0
- package/src/prover/smt/solver/muz/dl-context.ts +410 -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 +1404 -0
- package/src/prover/smt/solver/muz/spacer-dl-interface.ts +52 -0
- package/src/prover/smt/solver/muz/spacer-generalizers.ts +241 -0
- package/src/prover/smt/solver/muz/spacer-manager.ts +127 -0
- package/src/prover/smt/solver/muz/spacer-pdr.ts +219 -0
- package/src/prover/smt/solver/muz/spacer-prop-solver.ts +333 -0
- package/src/prover/smt/solver/muz/spacer-util.ts +282 -0
- package/src/prover/smt/solver/muz/substitution.ts +203 -0
- package/src/prover/smt/solver/nla2bv-tactic.ts +285 -0
- package/src/prover/smt/solver/nlqsat.ts +484 -0
- package/src/prover/smt/solver/nlsat/algebraic.ts +305 -88
- 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 +424 -211
- package/src/prover/smt/solver/nlsat/interval-set.ts +1 -2
- package/src/prover/smt/solver/nlsat/levelwise.ts +460 -241
- package/src/prover/smt/solver/nlsat/mpbq.ts +45 -1
- package/src/prover/smt/solver/nlsat/polynomial.ts +2366 -683
- package/src/prover/smt/solver/nlsat/solver.ts +282 -69
- package/src/prover/smt/solver/nlsat/transcendental-eval.ts +310 -0
- package/src/prover/smt/solver/nlsat/transcendentals.ts +391 -0
- package/src/prover/smt/solver/nlsat/types.ts +0 -2
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +8 -7
- package/src/prover/smt/solver/nlsat/upolynomial.ts +41 -20
- package/src/prover/smt/solver/nlsat-tactic.ts +82 -0
- package/src/prover/smt/solver/nnf.ts +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 +792 -0
- package/src/prover/smt/solver/opt-nlsat.ts +386 -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 +311 -0
- package/src/prover/smt/solver/opt-value.ts +55 -0
- package/src/prover/smt/solver/optsmt.ts +692 -0
- package/src/prover/smt/solver/parallel-tactic.ts +299 -0
- package/src/prover/smt/solver/pattern-inference.ts +19 -11
- package/src/prover/smt/solver/pb-rewriter.ts +281 -0
- package/src/prover/smt/solver/pb2bv-tactic.ts +540 -0
- package/src/prover/smt/solver/poly-rewriter.ts +202 -57
- package/src/prover/smt/solver/probes.ts +511 -0
- package/src/prover/smt/solver/propagate-values.ts +37 -21
- package/src/prover/smt/solver/proto-model.ts +650 -17
- 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 +1096 -0
- package/src/prover/smt/solver/qe-lite-der.ts +2 -3
- package/src/prover/smt/solver/qe-lite-fm.ts +3 -4
- package/src/prover/smt/solver/qe-lite.ts +37 -17
- package/src/prover/smt/solver/qe-mbp.ts +270 -0
- package/src/prover/smt/solver/qe.ts +1499 -0
- package/src/prover/smt/solver/qel.ts +25 -0
- package/src/prover/smt/solver/qi-queue.ts +0 -1
- package/src/prover/smt/solver/qsat.ts +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 +9 -10
- package/src/prover/smt/solver/quantifier-manager.ts +25 -24
- package/src/prover/smt/solver/quasi-macros.ts +243 -0
- package/src/prover/smt/solver/random-gen.ts +0 -1
- package/src/prover/smt/solver/rational.ts +45 -1
- package/src/prover/smt/solver/recfun-decl-plugin.ts +262 -0
- package/src/prover/smt/solver/recfun-rewriter.ts +107 -0
- package/src/prover/smt/solver/reduce-args.ts +225 -0
- package/src/prover/smt/solver/reduce-bv-size.ts +119 -0
- package/src/prover/smt/solver/ref-vector.ts +0 -1
- package/src/prover/smt/solver/relevancy.ts +1 -2
- package/src/prover/smt/solver/rewriter-tpl.ts +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 +44 -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 +2105 -0
- package/src/prover/smt/solver/sat/var-queue.ts +117 -0
- package/src/prover/smt/solver/sat/watch-list.ts +140 -0
- package/src/prover/smt/solver/search-tree.ts +284 -0
- package/src/prover/smt/solver/seq-axioms.ts +995 -0
- package/src/prover/smt/solver/seq-decl-plugin.ts +819 -0
- package/src/prover/smt/solver/seq-derive.ts +1298 -0
- package/src/prover/smt/solver/seq-eq-approx.ts +236 -0
- package/src/prover/smt/solver/seq-eq-solver.ts +439 -0
- package/src/prover/smt/solver/seq-factory.ts +89 -0
- package/src/prover/smt/solver/seq-monadic.ts +730 -0
- package/src/prover/smt/solver/seq-range-predicate.ts +235 -0
- package/src/prover/smt/solver/seq-re-rewriter.ts +1171 -0
- package/src/prover/smt/solver/seq-re-util.ts +758 -0
- package/src/prover/smt/solver/seq-regex-bisim.ts +144 -0
- package/src/prover/smt/solver/seq-regex-live.ts +200 -0
- package/src/prover/smt/solver/seq-rewriter.ts +2404 -0
- package/src/prover/smt/solver/seq-skolem.ts +294 -0
- package/src/prover/smt/solver/seq-subset.ts +165 -0
- package/src/prover/smt/solver/seq-view-witness.ts +353 -0
- package/src/prover/smt/solver/smt-consequences.ts +297 -0
- package/src/prover/smt/solver/smt-kernel.ts +90 -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 +3154 -326
- package/src/prover/smt/solver/smtlib-script.ts +1702 -0
- package/src/prover/smt/solver/solve-eqs.ts +923 -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 +1995 -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 -5
- package/src/prover/smt/solver/theory-lra-final-check.ts +56 -71
- package/src/prover/smt/solver/theory-lra-internalize.ts +89 -11
- package/src/prover/smt/solver/theory-lra-model.ts +20 -35
- package/src/prover/smt/solver/theory-lra-propagate.ts +24 -28
- package/src/prover/smt/solver/theory-lra-state.ts +6 -22
- package/src/prover/smt/solver/theory-lra.ts +188 -2
- package/src/prover/smt/solver/theory-pb.ts +933 -0
- package/src/prover/smt/solver/theory-polymorphism.ts +58 -0
- package/src/prover/smt/solver/theory-recfun.ts +307 -0
- package/src/prover/smt/solver/theory-seq-regex.ts +867 -0
- package/src/prover/smt/solver/theory-seq-solve.ts +1373 -0
- package/src/prover/smt/solver/theory-seq-state.ts +852 -0
- package/src/prover/smt/solver/theory-seq.ts +961 -0
- package/src/prover/smt/solver/theory.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 +29 -8
- package/src/prover/tlapm-library.ts +3208 -0
- package/src/prover/verdict.ts +2 -0
- package/src/prover/zenon/decide.ts +10 -7
- 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 +20 -5
- package/src/prover/zenon/parse.ts +6 -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 +7 -5
- 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 +7 -8
- package/src/prover/zenon/tla/terms.ts +0 -2
- package/src/prover/zenon/tla/tla.ts +0 -2
- package/src/resolve.ts +72 -36
- package/src/runtime.ts +6 -0
- package/src/sany/generation.ts +1 -13
- package/src/sany/generator-definitions.ts +1 -1
- package/src/sany/generator-expressions.ts +9 -17
- package/src/sany/generator-proofs.ts +1 -1
- package/src/sany/generator.ts +1 -1
- package/src/sany/levels.ts +0 -2
- package/src/sany/linter.ts +0 -2
- package/src/search.ts +198 -45
- package/src/simulate.ts +3 -0
- package/src/standard-definitions.ts +4 -0
- package/src/state-graph.ts +0 -2
- package/src/subexpressions.ts +4 -2
- package/src/successors.ts +1 -1
- package/src/symmetry.ts +2 -2
- package/src/tableau.ts +2 -2
- package/src/tlc/fingerprint.ts +81 -9
- package/src/tlc/jar-data.ts +12 -0
- package/src/tlc/order.ts +14 -3
- package/src/tlc/summary.ts +29 -14
- package/src/tlc/tlcext-operators.ts +61 -16
- package/src/tlc/trace-spec.ts +2 -3
- package/src/typed-tier.ts +6541 -0
- package/src/typescript/types.ts +2 -2
- package/src/values.ts +1 -1
- 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/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
package/src/cli/tlc.ts
CHANGED
|
@@ -29,6 +29,7 @@ import { EXIT_STATUS } from "../exit-codes";
|
|
|
29
29
|
import { check } from "../parallel";
|
|
30
30
|
import { extractModule, parseModule } from "../parser";
|
|
31
31
|
import { simulate } from "../simulate";
|
|
32
|
+
import type { CliSettings } from "../search";
|
|
32
33
|
import type { StateDump } from "../state-graph";
|
|
33
34
|
import {
|
|
34
35
|
getSanyStandardModules,
|
|
@@ -48,7 +49,7 @@ import {
|
|
|
48
49
|
type MessagePrinter,
|
|
49
50
|
zeroPad,
|
|
50
51
|
} from "../tlc/messages";
|
|
51
|
-
import {
|
|
52
|
+
import { getRuntimeInvariants } from "./runtime-invariants";
|
|
52
53
|
import { parseTlcArguments, type TlcArguments } from "./tlc-arguments";
|
|
53
54
|
import {
|
|
54
55
|
getClassPath,
|
|
@@ -377,15 +378,14 @@ const checkSpec = async (
|
|
|
377
378
|
}
|
|
378
379
|
const userFile = args.userFile;
|
|
379
380
|
const standardModules = getSanyStandardModules(version);
|
|
380
|
-
const
|
|
381
|
+
const runtimeInvariants = getRuntimeInvariants(
|
|
381
382
|
source,
|
|
382
383
|
specification.root,
|
|
383
384
|
args.invariants,
|
|
384
385
|
(name) => loadModule(name) ?? standardModules.get(name) ?? extractModule(source, name),
|
|
385
386
|
version,
|
|
386
387
|
);
|
|
387
|
-
|
|
388
|
-
const options: CheckOptions = {
|
|
388
|
+
const options: CheckOptions & CliSettings = {
|
|
389
389
|
workers: args.workers,
|
|
390
390
|
livenessCheck:
|
|
391
391
|
livenessCheck === "off"
|
|
@@ -409,10 +409,17 @@ const checkSpec = async (
|
|
|
409
409
|
version,
|
|
410
410
|
onProgress: (progress) => printCheckProgress(printer, progress, timing, directory),
|
|
411
411
|
onPrint: userFile === undefined ? undefined : (text) => appendFileSync(userFile, `${text}\n`),
|
|
412
|
-
source
|
|
412
|
+
source,
|
|
413
413
|
config,
|
|
414
414
|
onPause: () => readSync(0, Buffer.alloc(1)),
|
|
415
|
-
|
|
415
|
+
readLine: readStandardInputLine,
|
|
416
|
+
runtimeInvariants: runtimeInvariants.map((invariant) => ({
|
|
417
|
+
name: invariant.name,
|
|
418
|
+
module: invariant.module,
|
|
419
|
+
})),
|
|
420
|
+
loadModule: (name) =>
|
|
421
|
+
runtimeInvariants.find((invariant) => invariant.module === name)?.source ??
|
|
422
|
+
loadModule(name),
|
|
416
423
|
loadClass: (name) => {
|
|
417
424
|
const classPath = getClassPath(directory, name);
|
|
418
425
|
return existsSync(classPath) ? readFileSync(classPath) : undefined;
|
|
@@ -478,6 +485,18 @@ const checkSpec = async (
|
|
|
478
485
|
}
|
|
479
486
|
};
|
|
480
487
|
|
|
488
|
+
const readStandardInputLine = () => {
|
|
489
|
+
const bytes: number[] = [];
|
|
490
|
+
const byte = Buffer.alloc(1);
|
|
491
|
+
let isRead = false;
|
|
492
|
+
while (readSync(0, byte) === 1) {
|
|
493
|
+
isRead = true;
|
|
494
|
+
if (byte[0] === 0x0a) break;
|
|
495
|
+
bytes.push(byte[0]);
|
|
496
|
+
}
|
|
497
|
+
return isRead ? Buffer.from(bytes).toString().replace(/\r$/, "") : undefined;
|
|
498
|
+
};
|
|
499
|
+
|
|
481
500
|
const formatSanyErrors = (error: TlaSyntaxError, specName: string) => {
|
|
482
501
|
const isFatal = error instanceof TlaSanyFatalError;
|
|
483
502
|
if (!isFatal && !error.failure)
|
|
@@ -572,7 +591,7 @@ export const checkSpecs = async (args: string[], java: JavaProperties) => {
|
|
|
572
591
|
exitCodes.push(
|
|
573
592
|
await reportErrors(async () => {
|
|
574
593
|
const specPath = path.endsWith(".ts") ? await writeTypeScriptSpec(path) : path;
|
|
575
|
-
//
|
|
594
|
+
// An extension: TLC refuses more than one spec, and tla-ts checks each one under its name.
|
|
576
595
|
if (paths.length > 1) {
|
|
577
596
|
console.log(`Checking ${basename(specPath)} with ${basename(specPath, ".tla")}.cfg`);
|
|
578
597
|
}
|
package/src/dependencies.ts
CHANGED
|
@@ -28,6 +28,7 @@ const READS_IMPURE = 16;
|
|
|
28
28
|
const VARIABLE_LEVEL_FLAGS = 32;
|
|
29
29
|
const ACTION_LEVEL_FLAGS = VARIABLE_LEVEL_FLAGS | 64;
|
|
30
30
|
const TEMPORAL_LEVEL_FLAGS = ACTION_LEVEL_FLAGS | 128;
|
|
31
|
+
const RANDOM = 256;
|
|
31
32
|
|
|
32
33
|
const ACTION_KINDS = new Set<Expression["kind"]>([
|
|
33
34
|
"Prime",
|
|
@@ -65,6 +66,13 @@ const IMPURE_BUILTINS = new Set([
|
|
|
65
66
|
|
|
66
67
|
const STREAMED_BUILTINS = new Set(["UNION", "\\cup"]);
|
|
67
68
|
|
|
69
|
+
const RANDOM_BUILTINS = new Set([
|
|
70
|
+
"RandomSubset",
|
|
71
|
+
"RandomSetOfSubsets",
|
|
72
|
+
"TestRandomSetOfSubsets",
|
|
73
|
+
"RandomSubsetSet",
|
|
74
|
+
]);
|
|
75
|
+
|
|
68
76
|
const isImpureBuiltin = (name: string, environment: DefinitionNames) =>
|
|
69
77
|
IMPURE_BUILTINS.has(name) || environment.builtins.get(name)?.isStateLevel === true;
|
|
70
78
|
|
|
@@ -133,6 +141,7 @@ const collectLocalFacts = (
|
|
|
133
141
|
row[0] |= IMPURE | (name === "Assert" ? 0 : REPEATED_EFFECT);
|
|
134
142
|
}
|
|
135
143
|
if (STREAMED_BUILTINS.has(name)) row[0] |= STREAMED;
|
|
144
|
+
if (RANDOM_BUILTINS.has(name)) row[0] |= RANDOM;
|
|
136
145
|
if (!isOverridden && isImpureBuiltin(target, environment)) row[0] |= READS_IMPURE;
|
|
137
146
|
const builtin = environment.builtins.get(target);
|
|
138
147
|
if (
|
|
@@ -219,7 +228,7 @@ const closeRows = (local: Uint32Array, words: number, edges: Int32Array[], mask:
|
|
|
219
228
|
return closed;
|
|
220
229
|
};
|
|
221
230
|
|
|
222
|
-
const PURITY_MASK = IMPURE | REPEATED_EFFECT | STREAMED;
|
|
231
|
+
const PURITY_MASK = IMPURE | REPEATED_EFFECT | STREAMED | RANDOM;
|
|
223
232
|
const READ_MASK = NONCONSTANT | READS_IMPURE;
|
|
224
233
|
|
|
225
234
|
const isEvaluatedOnce = (definition: Definition, flags: number) =>
|
|
@@ -293,7 +302,19 @@ const getExpressionsRow = (expressions: Expression[], environment: Environment)
|
|
|
293
302
|
export const isConstantLevel = (definition: Definition, environment: Environment) =>
|
|
294
303
|
(getRow(definition, environment)[0] & NONCONSTANT) === 0;
|
|
295
304
|
|
|
296
|
-
const EFFECT_FLAGS = {
|
|
305
|
+
const EFFECT_FLAGS = {
|
|
306
|
+
any: IMPURE,
|
|
307
|
+
repeated: REPEATED_EFFECT,
|
|
308
|
+
streamed: STREAMED,
|
|
309
|
+
// What a second evaluation shows: output again, or other random draws.
|
|
310
|
+
replayed: REPEATED_EFFECT | RANDOM,
|
|
311
|
+
};
|
|
312
|
+
|
|
313
|
+
export const isExpressionImpure = (
|
|
314
|
+
expressions: Expression[],
|
|
315
|
+
environment: Environment,
|
|
316
|
+
effect: keyof typeof EFFECT_FLAGS,
|
|
317
|
+
) => (getExpressionsRow(expressions, environment)[0] & EFFECT_FLAGS[effect]) !== 0;
|
|
297
318
|
|
|
298
319
|
export const isImpureDefinition = (
|
|
299
320
|
definition: Definition,
|
package/src/dfid.ts
CHANGED
|
@@ -15,7 +15,7 @@ import { EXIT_STATUS, getMessageExitStatus, withLivenessExitCode } from "./exit-
|
|
|
15
15
|
import { createLivenessChecker } from "./liveness-checker";
|
|
16
16
|
import { getIncompleteSuccessorMessage, prepareSearch, reportAssumptionViolation } from "./search";
|
|
17
17
|
import type { SpecAction } from "./spec-description";
|
|
18
|
-
import { forEachInitialState, forEachSuccessor } from "./successors";
|
|
18
|
+
import { forEachInitialState, forEachSuccessor, getSuccessors } from "./successors";
|
|
19
19
|
import {
|
|
20
20
|
formatNestedMessage,
|
|
21
21
|
formatTlcDate,
|
|
@@ -28,7 +28,7 @@ import {
|
|
|
28
28
|
import { getTlcFingerprint } from "./tlc/fingerprint";
|
|
29
29
|
import { replaySuccessors } from "./tlc/replay";
|
|
30
30
|
import { getOptimisticProbability, getActualProbability } from "./tlc/summary";
|
|
31
|
-
import { createModelValue, formatState, getSetBound, type Value } from "./values";
|
|
31
|
+
import { createModelValue, formatState, getSetBound, isSameValue, type Value } from "./values";
|
|
32
32
|
|
|
33
33
|
export interface DepthFirstOptions extends CheckOptions {
|
|
34
34
|
maxDepth: number;
|
|
@@ -165,6 +165,13 @@ export const checkDepthFirst = (options: DepthFirstOptions): number => {
|
|
|
165
165
|
if (assumptionStatus !== undefined) return assumptionStatus;
|
|
166
166
|
|
|
167
167
|
const nextActions = prepared.getDescription().actions;
|
|
168
|
+
// Deviation from TLC: TLCExt#pickSuccessor casts the DFID checker to ModelChecker and fails, so tla-ts asks as model checking does.
|
|
169
|
+
runtime.getSuccessorAction = (state, next) =>
|
|
170
|
+
nextActions.find((action) =>
|
|
171
|
+
getSuccessors(action.expression, state, environment, action.scope).some((successor) =>
|
|
172
|
+
successor.state.every((value, index) => isSameValue(value, next[index])),
|
|
173
|
+
),
|
|
174
|
+
);
|
|
168
175
|
const statuses = new Map<bigint, number>();
|
|
169
176
|
const fingerprintSet = { level: 1, leveled: 0, buckets: INITIAL_BUCKETS };
|
|
170
177
|
const setStatus = (fingerprint: bigint, status: number) => {
|
package/src/environment.ts
CHANGED
|
@@ -99,6 +99,13 @@ interface EnvironmentOptions {
|
|
|
99
99
|
isWarningEnabled?: boolean;
|
|
100
100
|
version?: TlcVersion;
|
|
101
101
|
moduleOperators?: ModuleOperator[];
|
|
102
|
+
readLine?: () => string | undefined;
|
|
103
|
+
runtimeInvariants?: RuntimeInvariant[];
|
|
104
|
+
}
|
|
105
|
+
|
|
106
|
+
export interface RuntimeInvariant {
|
|
107
|
+
name: string;
|
|
108
|
+
module: string | undefined;
|
|
102
109
|
}
|
|
103
110
|
|
|
104
111
|
export interface ResolvedModuleOperator extends ModuleOperator {
|
|
@@ -113,6 +120,7 @@ export interface Specification {
|
|
|
113
120
|
startupDefinitions: Definition[];
|
|
114
121
|
javaOverrides: JavaOverride[];
|
|
115
122
|
moduleOperators: ResolvedModuleOperator[];
|
|
123
|
+
runtimeInvariants: RuntimeInvariant[];
|
|
116
124
|
rootName: string;
|
|
117
125
|
}
|
|
118
126
|
|
|
@@ -260,6 +268,7 @@ export const createEnvironment = (
|
|
|
260
268
|
runtime.isWarningEnabled = options.isWarningEnabled ?? true;
|
|
261
269
|
runtime.isTool = options.isTool ?? false;
|
|
262
270
|
runtime.version = options.version ?? "master";
|
|
271
|
+
runtime.readLine = options.readLine;
|
|
263
272
|
const linkedModules = new Map<string, LinkedModule>();
|
|
264
273
|
const checkedModules = new Map<string, LinkedModule>();
|
|
265
274
|
const linkOrder: LinkedModule[] = [];
|
|
@@ -586,8 +595,11 @@ export const createEnvironment = (
|
|
|
586
595
|
);
|
|
587
596
|
};
|
|
588
597
|
|
|
589
|
-
const createArgumentParams = (arity: number) =>
|
|
590
|
-
Array.from({ length: arity }, (_value, index) => ({
|
|
598
|
+
const createArgumentParams = (arity: number, params: number[] | undefined) =>
|
|
599
|
+
Array.from({ length: arity }, (_value, index) => ({
|
|
600
|
+
name: `argument${index}`,
|
|
601
|
+
arity: params?.[index] ?? 0,
|
|
602
|
+
}));
|
|
591
603
|
|
|
592
604
|
const getSubstitutionBody = (
|
|
593
605
|
replacement: Expression,
|
|
@@ -601,7 +613,7 @@ export const createEnvironment = (
|
|
|
601
613
|
body: replacement.body,
|
|
602
614
|
};
|
|
603
615
|
}
|
|
604
|
-
const params = createArgumentParams(declaration.arity);
|
|
616
|
+
const params = createArgumentParams(declaration.arity, undefined);
|
|
605
617
|
const operator =
|
|
606
618
|
replacement.kind === "Identifier"
|
|
607
619
|
? replacement.name
|
|
@@ -625,7 +637,7 @@ export const createEnvironment = (
|
|
|
625
637
|
if (standardSymbols) {
|
|
626
638
|
if (instance.name === undefined) return [];
|
|
627
639
|
return [...standardSymbols].map(([name, symbol]) => {
|
|
628
|
-
const forwarded = createArgumentParams(symbol.arity);
|
|
640
|
+
const forwarded = createArgumentParams(symbol.arity, symbol.params);
|
|
629
641
|
return createLocalAlias(
|
|
630
642
|
`${instance.name}!${name}`,
|
|
631
643
|
symbol.key,
|
|
@@ -712,7 +724,7 @@ export const createEnvironment = (
|
|
|
712
724
|
.filter(([name]) => !declared.has(name))
|
|
713
725
|
.map(([name, symbol]) => {
|
|
714
726
|
const key = instantiation.getKey(symbol.key);
|
|
715
|
-
const ownParams = createArgumentParams(symbol.arity);
|
|
727
|
+
const ownParams = createArgumentParams(symbol.arity, symbol.params);
|
|
716
728
|
const params = [...instance.params, ...ownParams];
|
|
717
729
|
return createLocalAlias(
|
|
718
730
|
instance.name === undefined ? name : `${instance.name}!${name}`,
|
|
@@ -1026,6 +1038,15 @@ export const createEnvironment = (
|
|
|
1026
1038
|
);
|
|
1027
1039
|
linkOrder.push(...linkOrder.splice(linkOrder.indexOf(linkedRoot), 1));
|
|
1028
1040
|
if (warnings.length > 0 && !options.isSanyReported) options.print(formatSanyWarnings(warnings));
|
|
1041
|
+
const runtimeInvariants = options.runtimeInvariants ?? [];
|
|
1042
|
+
runtimeInvariants.forEach((invariant) => {
|
|
1043
|
+
if (invariant.module === undefined) return;
|
|
1044
|
+
linkedModules.set(root.name, linkedRoot);
|
|
1045
|
+
const linked = getLinkedModule(invariant.module, root.name);
|
|
1046
|
+
linkOrder.splice(linkOrder.indexOf(linked), 1);
|
|
1047
|
+
const definition = definitions.get(linked.visible.get(invariant.name)?.key ?? invariant.name);
|
|
1048
|
+
if (definition) definitions.set(invariant.name, definition);
|
|
1049
|
+
});
|
|
1029
1050
|
linkedRoot.visible.forEach((symbol, name) => {
|
|
1030
1051
|
const definition = definitions.get(symbol.key);
|
|
1031
1052
|
if (definition && symbol.key !== name) definitions.set(name, definition);
|
|
@@ -1166,6 +1187,7 @@ export const createEnvironment = (
|
|
|
1166
1187
|
),
|
|
1167
1188
|
javaOverrides: linkOrder.flatMap((linked) => javaOverrides.get(linked.module.name) ?? []),
|
|
1168
1189
|
moduleOperators,
|
|
1190
|
+
runtimeInvariants,
|
|
1169
1191
|
rootName: root.name,
|
|
1170
1192
|
};
|
|
1171
1193
|
};
|
package/src/errors.ts
CHANGED
|
@@ -28,7 +28,7 @@ export interface SyntaxFailure {
|
|
|
28
28
|
line: number;
|
|
29
29
|
column: number;
|
|
30
30
|
isEnd: boolean;
|
|
31
|
-
proof?: { stop: { line: number; column: number }; exception: string };
|
|
31
|
+
proof?: { stop: { line: number; column: number }; exception: string; printed: string };
|
|
32
32
|
}
|
|
33
33
|
|
|
34
34
|
export interface SanyError {
|
|
@@ -258,6 +258,16 @@ export class TlaProverError extends TlaError {
|
|
|
258
258
|
}
|
|
259
259
|
}
|
|
260
260
|
|
|
261
|
+
export class TlaMethodError extends TlaProverError {
|
|
262
|
+
readonly locus: Locus | undefined;
|
|
263
|
+
|
|
264
|
+
constructor(message: string, locus: Locus | undefined) {
|
|
265
|
+
super(message);
|
|
266
|
+
this.name = "TlaMethodError";
|
|
267
|
+
this.locus = locus;
|
|
268
|
+
}
|
|
269
|
+
}
|
|
270
|
+
|
|
261
271
|
export class TlaZenonError extends TlaError {
|
|
262
272
|
constructor(message: string, cause?: unknown) {
|
|
263
273
|
super(message, cause);
|
|
@@ -303,6 +313,13 @@ export class SmtCanceledError extends TlaError {
|
|
|
303
313
|
}
|
|
304
314
|
}
|
|
305
315
|
|
|
316
|
+
export class SmtTacticError extends TlaError {
|
|
317
|
+
constructor(message: string) {
|
|
318
|
+
super(message);
|
|
319
|
+
this.name = "SmtTacticError";
|
|
320
|
+
}
|
|
321
|
+
}
|
|
322
|
+
|
|
306
323
|
export class SmtInvariantError extends TlaError {
|
|
307
324
|
constructor(message: string) {
|
|
308
325
|
super(message);
|
|
@@ -324,10 +341,20 @@ export class PddMemoryOutError extends TlaError {
|
|
|
324
341
|
}
|
|
325
342
|
}
|
|
326
343
|
|
|
344
|
+
export interface SmtPosition {
|
|
345
|
+
line: number;
|
|
346
|
+
column: number;
|
|
347
|
+
}
|
|
348
|
+
|
|
327
349
|
export class SmtParseError extends TlaError {
|
|
328
|
-
|
|
329
|
-
|
|
350
|
+
line: number;
|
|
351
|
+
column: number;
|
|
352
|
+
|
|
353
|
+
constructor(message: string, position: SmtPosition) {
|
|
354
|
+
super(message);
|
|
330
355
|
this.name = "SmtParseError";
|
|
356
|
+
this.line = position.line;
|
|
357
|
+
this.column = position.column;
|
|
331
358
|
}
|
|
332
359
|
}
|
|
333
360
|
|
package/src/evaluate.ts
CHANGED
|
@@ -615,12 +615,16 @@ export const bindLazyArguments = (
|
|
|
615
615
|
typeof value.domain === "object" && value.domain.kind === "ProductSet"
|
|
616
616
|
? value.domain.factors
|
|
617
617
|
: [];
|
|
618
|
-
|
|
618
|
+
if (elements === undefined) {
|
|
619
|
+
throw new TlaEvaluationError(
|
|
620
|
+
`Attempted to apply a function to an argument not in its domain.\n${describeRange(expression.function)}`,
|
|
621
|
+
);
|
|
622
|
+
}
|
|
623
|
+
// Deviation from TLC: Tool#getFcnContext indexes past an argument tuple shorter than the bounds and ignores a longer one.
|
|
619
624
|
const createListError = () =>
|
|
620
625
|
new TlaEvaluationError(
|
|
621
626
|
`In applying the function\n${prettyPrint(formatValue(value))},\nthe argument list is:\n${prettyPrint(formatValue(argument))}\nwhich does not match its formal parameter.\n`,
|
|
622
627
|
);
|
|
623
|
-
if (elements === undefined) throw createListError();
|
|
624
628
|
bounds.forEach((bound, index) => {
|
|
625
629
|
if (index >= elements.length) throw createListError();
|
|
626
630
|
const element = elements[index];
|
|
@@ -1177,7 +1181,9 @@ const evaluateLocalIdentifier = (name: string, expression: Expression, context:
|
|
|
1177
1181
|
}
|
|
1178
1182
|
const builtin = context.environment.builtins.get(name);
|
|
1179
1183
|
if (builtin?.arity === 0) return builtin.evaluate([], context);
|
|
1180
|
-
throw new TlaEvaluationError(
|
|
1184
|
+
throw new TlaEvaluationError(
|
|
1185
|
+
`In evaluation, the identifier ${name} is either undefined or not an operator.\n${describeRange(expression)}`,
|
|
1186
|
+
);
|
|
1181
1187
|
};
|
|
1182
1188
|
|
|
1183
1189
|
export const getReevaluatedDefinitions = (
|
package/src/exit-codes.ts
CHANGED
|
@@ -17,13 +17,13 @@ export const EXIT_STATUS = {
|
|
|
17
17
|
|
|
18
18
|
const MESSAGE_EXIT_STATUSES = new Map<number, number>([
|
|
19
19
|
...[
|
|
20
|
-
...Array.from({ length: 24 }, (
|
|
20
|
+
...Array.from({ length: 24 }, (_value, index) => 2222 + index),
|
|
21
21
|
2272,
|
|
22
22
|
2273,
|
|
23
23
|
2274,
|
|
24
24
|
2280,
|
|
25
25
|
2281,
|
|
26
|
-
...Array.from({ length: 7 }, (
|
|
26
|
+
...Array.from({ length: 7 }, (_value, index) => 5001 + index),
|
|
27
27
|
].map((code): [number, number] => [code, EXIT_STATUS.configParseError]),
|
|
28
28
|
[2253, EXIT_STATUS.livenessEvaluationFailure],
|
|
29
29
|
[2109, EXIT_STATUS.specEvaluationFailure],
|
|
@@ -76,10 +76,13 @@ export const withLivenessExitCode = (
|
|
|
76
76
|
return (
|
|
77
77
|
checker && {
|
|
78
78
|
branches: checker.branches,
|
|
79
|
+
solutions: checker.solutions,
|
|
79
80
|
addInitialState: (index, state, tracing) =>
|
|
80
81
|
withErrorExitCode(() => checker.addInitialState(index, state, tracing)),
|
|
81
82
|
addState: (index, state, successors, tracing) =>
|
|
82
83
|
withErrorExitCode(() => checker.addState(index, state, successors, tracing)),
|
|
84
|
+
storeState: checker.storeState,
|
|
85
|
+
getStateCounts: checker.getStateCounts,
|
|
83
86
|
findViolation: () => withErrorExitCode(() => checker.findViolation()),
|
|
84
87
|
getViolatedProperties: (path, cycleStart) =>
|
|
85
88
|
withErrorExitCode(() => checker.getViolatedProperties(path, cycleStart)),
|
package/src/instances.ts
CHANGED
|
@@ -522,7 +522,7 @@ const getInstanceOperator = (
|
|
|
522
522
|
arity: number,
|
|
523
523
|
location: SourceLocation,
|
|
524
524
|
): Expression => {
|
|
525
|
-
const names = Array.from({ length: arity }, (
|
|
525
|
+
const names = Array.from({ length: arity }, (_value, index) => `argument${index}`);
|
|
526
526
|
return {
|
|
527
527
|
kind: "Lambda",
|
|
528
528
|
params: names,
|
package/src/levels.ts
CHANGED
|
@@ -18,6 +18,7 @@ import {
|
|
|
18
18
|
} from "./errors";
|
|
19
19
|
import { forEachChild } from "./instances";
|
|
20
20
|
import { collectSemanticErrors, getBoundNames, getPatternNames } from "./resolve";
|
|
21
|
+
import { resolveSynonym } from "./tlc/jar-data";
|
|
21
22
|
import { STANDARD_LEVELS } from "./standard-definitions";
|
|
22
23
|
|
|
23
24
|
interface LevelData {
|
|
@@ -253,13 +254,13 @@ export const createLevelAnalyzer = (context: LevelContext) => {
|
|
|
253
254
|
if (operand.kind !== "Value") return;
|
|
254
255
|
if (operand.data.level > getMaxLevel(operator, index)) {
|
|
255
256
|
throw new TlaSyntaxError(
|
|
256
|
-
`Level error in applying operator ${operator.name}:\nThe level of argument ${index + 1} exceeds the maximum level allowed by the operator`,
|
|
257
|
+
`Level error in applying operator ${resolveSynonym(operator.name)}:\nThe level of argument ${index + 1} exceeds the maximum level allowed by the operator`,
|
|
257
258
|
);
|
|
258
259
|
}
|
|
259
260
|
});
|
|
260
261
|
if (ranges.some((range) => range.level > ACTION_LEVEL)) {
|
|
261
262
|
throw new TlaSyntaxError(
|
|
262
|
-
`Level error in applying operator ${operator.name}:\nThe level of the range for a bounded variable exceeds the maximum level allowed by the operator`,
|
|
263
|
+
`Level error in applying operator ${resolveSynonym(operator.name)}:\nThe level of the range for a bounded variable exceeds the maximum level allowed by the operator`,
|
|
263
264
|
);
|
|
264
265
|
}
|
|
265
266
|
const getOperand = (formal: string) => {
|
package/src/lexer.ts
CHANGED
|
@@ -467,9 +467,11 @@ const BASED_NUMBER_DIGITS = new Map([
|
|
|
467
467
|
["h", HEX_DIGIT],
|
|
468
468
|
]);
|
|
469
469
|
|
|
470
|
-
|
|
470
|
+
// tlapm's lexer reads only \b, \o and \h, and SANY's their capitals too.
|
|
471
|
+
export const matchBasedNumber = (source: string, index: number, isTlapm = false) => {
|
|
471
472
|
if (source.charCodeAt(index) !== CODE_BACKSLASH) return 0;
|
|
472
|
-
const
|
|
473
|
+
const base = source.charAt(index + 1);
|
|
474
|
+
const digits = BASED_NUMBER_DIGITS.get(isTlapm ? base : base.toLowerCase());
|
|
473
475
|
if (digits === undefined) return 0;
|
|
474
476
|
const end = skipClass(source, index + 2, digits);
|
|
475
477
|
return end === index + 2 ? 0 : end - index;
|
|
@@ -605,7 +607,7 @@ export const tokenize = (source: string, isTlapm = false): Token[] => {
|
|
|
605
607
|
});
|
|
606
608
|
continue;
|
|
607
609
|
}
|
|
608
|
-
const basedLength = matchBasedNumber(source, index);
|
|
610
|
+
const basedLength = matchBasedNumber(source, index, isTlapm);
|
|
609
611
|
if (basedLength > 0) {
|
|
610
612
|
pushToken("Number", source.slice(index, index + basedLength), basedLength);
|
|
611
613
|
continue;
|