tla-ts 0.0.10-dev.f16792fed → 0.0.10-dev.f57f64938
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +2 -1
- package/dist/compile.cjs +6 -6
- package/dist/compile.js +10 -10
- package/dist/deciders.cjs +41 -37
- package/dist/deciders.js +57 -53
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +3 -0
- package/dist/index.d.ts +3 -0
- package/dist/index.js +1 -1
- package/dist/parallel-worker.cjs +1 -1
- package/dist/parallel-worker.js +1 -1
- package/dist/prove.cjs +2682 -426
- package/dist/prove.js +2681 -425
- package/dist/run.cjs +45 -42
- package/dist/run.js +47 -44
- package/dist/tlapm.cjs +2 -2
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +42 -39
- package/dist/transfer.js +42 -39
- package/dist/worker.cjs +7 -7
- package/dist/worker.js +7 -7
- package/package.json +1 -1
- package/src/ast.ts +41 -36
- package/src/builtins.ts +4 -13
- package/src/check-failure.ts +116 -0
- package/src/check-trace.ts +282 -0
- package/src/check.ts +353 -549
- package/src/cli/options.ts +6 -31
- package/src/cli/shared.ts +1 -1
- package/src/cli/tlapm.ts +433 -70
- package/src/cli/tlc-arguments.ts +222 -210
- package/src/cli/tlc-output.ts +687 -0
- package/src/cli/tlc-usage.ts +1 -2
- package/src/cli/tlc.ts +49 -702
- package/src/cli/xml-exporter.ts +23 -33
- package/src/codegen.ts +5 -10
- package/src/coverage.ts +0 -2
- package/src/dependencies.ts +30 -14
- package/src/dfid.ts +16 -16
- package/src/environment-config.ts +315 -0
- package/src/environment.ts +55 -338
- package/src/errors.ts +33 -5
- package/src/evaluate.ts +5 -4
- package/src/exit-codes.ts +1 -0
- package/src/fingerprints.ts +65 -1
- package/src/instances.ts +47 -10
- package/src/json.ts +4 -7
- package/src/levels.ts +39 -42
- package/src/lexer.ts +5 -3
- package/src/liveness-checker.ts +553 -237
- package/src/liveness.ts +94 -86
- package/src/obligations/action.ts +14 -17
- package/src/obligations/anonymize.ts +37 -16
- package/src/obligations/enabled-axioms.ts +218 -0
- package/src/obligations/equality.ts +1 -3
- package/src/obligations/expression.ts +36 -8
- package/src/obligations/format.ts +0 -2
- package/src/obligations/generate.ts +66 -54
- package/src/obligations/index.ts +38 -8
- package/src/obligations/levels.ts +24 -11
- package/src/obligations/module.ts +28 -41
- package/src/obligations/normalize.ts +26 -14
- package/src/obligations/operators.ts +0 -2
- package/src/obligations/pragma.ts +53 -16
- package/src/obligations/printer.ts +43 -13
- package/src/obligations/proof.ts +3 -2
- package/src/obligations/regroup.ts +0 -2
- package/src/obligations/simplify.ts +55 -50
- package/src/obligations/source.ts +118 -74
- package/src/obligations/subexpression.ts +45 -18
- package/src/obligations/substitution.ts +1 -3
- package/src/obligations/temporal.ts +5 -7
- package/src/obligations/tuples.ts +0 -2
- package/src/parallel-worker.ts +10 -30
- package/src/parallel.ts +24 -47
- package/src/parser.ts +580 -180
- package/src/pretty-print.ts +1 -1
- package/src/prover/decide-pool.ts +3 -3
- package/src/prover/deciders.ts +12 -9
- package/src/prover/isabelle/decide.ts +3 -25
- package/src/prover/isabelle/encode.ts +72 -42
- package/src/prover/isabelle/isar/attrib.ts +250 -0
- package/src/prover/isabelle/isar/context.ts +335 -0
- package/src/prover/isabelle/isar/induct.ts +382 -0
- package/src/prover/isabelle/isar/inner-syntax.ts +158 -7
- package/src/prover/isabelle/isar/method.ts +509 -212
- package/src/prover/isabelle/isar/proof.ts +570 -14
- package/src/prover/isabelle/isar/rule-cases.ts +224 -0
- package/src/prover/isabelle/isar/theory.ts +487 -76
- package/src/prover/isabelle/isar/toplevel.ts +331 -0
- package/src/prover/isabelle/isar/type-check.ts +89 -14
- package/src/prover/isabelle/provers/blast/blast.ts +7 -65
- package/src/prover/isabelle/provers/blast/branch.ts +0 -2
- package/src/prover/isabelle/provers/blast/prove.ts +0 -2
- package/src/prover/isabelle/provers/blast/rules.ts +0 -2
- package/src/prover/isabelle/provers/blast/state.ts +0 -2
- package/src/prover/isabelle/provers/blast/term.ts +0 -2
- package/src/prover/isabelle/provers/clasimp.ts +0 -2
- package/src/prover/isabelle/provers/classical.ts +45 -20
- package/src/prover/isabelle/provers/hypsubst.ts +17 -28
- package/src/prover/isabelle/pure/bicompose.ts +9 -27
- package/src/prover/isabelle/pure/consts.ts +0 -2
- package/src/prover/isabelle/pure/conv.ts +2 -10
- package/src/prover/isabelle/pure/drule.ts +72 -6
- package/src/prover/isabelle/pure/envir.ts +0 -2
- package/src/prover/isabelle/pure/goal.ts +1 -3
- package/src/prover/isabelle/pure/logic.ts +1 -3
- package/src/prover/isabelle/pure/name.ts +0 -2
- package/src/prover/isabelle/pure/net.ts +0 -2
- package/src/prover/isabelle/pure/object-logic.ts +13 -7
- package/src/prover/isabelle/pure/pattern.ts +0 -2
- package/src/prover/isabelle/pure/raw-simplifier.ts +4 -15
- package/src/prover/isabelle/pure/rewriter.ts +6 -17
- package/src/prover/isabelle/pure/search.ts +0 -2
- package/src/prover/isabelle/pure/seq.ts +0 -2
- package/src/prover/isabelle/pure/simplifier.ts +26 -7
- package/src/prover/isabelle/pure/table.ts +2 -3
- package/src/prover/isabelle/pure/tactic.ts +0 -2
- package/src/prover/isabelle/pure/tactical.ts +42 -37
- package/src/prover/isabelle/pure/term-ord.ts +0 -2
- package/src/prover/isabelle/pure/term.ts +0 -2
- package/src/prover/isabelle/pure/thm.ts +14 -13
- package/src/prover/isabelle/pure/type.ts +0 -2
- package/src/prover/isabelle/pure/unify.ts +0 -2
- package/src/prover/isabelle/pure/variable.ts +0 -2
- package/src/prover/isabelle/tla/classical-setup.ts +18 -16
- package/src/prover/isabelle/tla/context.ts +58 -11
- package/src/prover/isabelle/tla/logic-data.ts +1 -1
- package/src/prover/isabelle/tla/logic.ts +49 -21
- package/src/prover/isabelle/tla/simpdata.ts +1 -12
- package/src/prover/isabelle/tools/intuitionistic.ts +28 -12
- package/src/prover/ocaml.ts +4 -1
- package/src/prover/prep/action.ts +30 -31
- package/src/prover/prep/enabled-axioms.ts +11 -2
- package/src/prover/prep/fingerprint.ts +2 -5
- package/src/prover/prep/methods.ts +181 -51
- package/src/prover/prep/normalize.ts +38 -9
- package/src/prover/prove.ts +395 -94
- package/src/prover/ptl/decide.ts +95 -50
- package/src/prover/ptl/encode.ts +2 -3
- package/src/prover/ptl/tableau.ts +28 -2
- package/src/prover/smt/arithmetic.ts +310 -0
- package/src/prover/smt/axioms.ts +12 -8
- package/src/prover/smt/context.ts +43 -8
- package/src/prover/smt/data.ts +498 -379
- package/src/prover/smt/encode.ts +148 -57
- package/src/prover/smt/extensionality.ts +5 -3
- package/src/prover/smt/flatten.ts +4 -6
- package/src/prover/smt/format.ts +28 -4
- package/src/prover/smt/instances.ts +7 -1
- package/src/prover/smt/layout.ts +91 -0
- package/src/prover/smt/rewrite.ts +1021 -618
- package/src/prover/smt/simplify.ts +441 -0
- package/src/prover/smt/solver/ackermannize-bv-tactic.ts +61 -0
- package/src/prover/smt/solver/ackr-helper.ts +179 -0
- package/src/prover/smt/solver/ackr-model-converter.ts +105 -0
- package/src/prover/smt/solver/act-cache.ts +0 -1
- package/src/prover/smt/solver/add-bounds-tactic.ts +59 -0
- package/src/prover/smt/solver/aig-tactic.ts +52 -0
- package/src/prover/smt/solver/aig.ts +889 -0
- package/src/prover/smt/solver/arith-rewriter.ts +613 -6
- package/src/prover/smt/solver/arith-terms.ts +121 -0
- package/src/prover/smt/solver/array-decl-plugin.ts +175 -0
- package/src/prover/smt/solver/array-rewriter.ts +309 -0
- package/src/prover/smt/solver/asserted-formulas.ts +87 -16
- package/src/prover/smt/solver/ast-lt.ts +166 -12
- package/src/prover/smt/solver/ast-util.ts +160 -2
- package/src/prover/smt/solver/ast.ts +1427 -41
- package/src/prover/smt/solver/auf-solver.ts +2 -6
- package/src/prover/smt/solver/bit-blast-tactic.ts +582 -0
- package/src/prover/smt/solver/bit-blaster.ts +871 -0
- package/src/prover/smt/solver/bound-manager.ts +196 -0
- package/src/prover/smt/solver/bound-simplifier.ts +600 -0
- package/src/prover/smt/solver/bv-bound-chk.ts +492 -0
- package/src/prover/smt/solver/bv-decl-plugin.ts +338 -0
- package/src/prover/smt/solver/bv-divrem-bounds.ts +95 -0
- package/src/prover/smt/solver/bv-rewriter.ts +1901 -0
- package/src/prover/smt/solver/bv1-blast.ts +214 -0
- package/src/prover/smt/solver/bv2fpa-converter.ts +174 -0
- package/src/prover/smt/solver/bv2int-rewriter.ts +544 -0
- package/src/prover/smt/solver/bv2real-rewriter.ts +533 -0
- package/src/prover/smt/solver/card2bv.ts +110 -0
- package/src/prover/smt/solver/case-split-queue.ts +0 -2
- package/src/prover/smt/solver/cg-table.ts +39 -25
- package/src/prover/smt/solver/check-logic.ts +330 -0
- package/src/prover/smt/solver/clause.ts +0 -1
- package/src/prover/smt/solver/cofactor-elim-term-ite.ts +278 -0
- package/src/prover/smt/solver/conflict-resolution.ts +78 -2
- package/src/prover/smt/solver/context.ts +516 -115
- package/src/prover/smt/solver/ctx-simplify.ts +20 -10
- package/src/prover/smt/solver/ctx-solver-simplify.ts +122 -0
- package/src/prover/smt/solver/datatype-decl-plugin.ts +572 -0
- package/src/prover/smt/solver/datatype-rewriter.ts +82 -0
- package/src/prover/smt/solver/demodulator.ts +786 -0
- package/src/prover/smt/solver/dependent-expr-state.ts +81 -0
- package/src/prover/smt/solver/der.ts +38 -10
- package/src/prover/smt/solver/diff-neq.ts +206 -0
- package/src/prover/smt/solver/distribute-forall.ts +57 -0
- package/src/prover/smt/solver/dom-simplify.ts +511 -0
- package/src/prover/smt/solver/dt2bv-tactic.ts +260 -0
- package/src/prover/smt/solver/dyn-ack.ts +0 -1
- package/src/prover/smt/solver/e-matching.ts +7 -8
- package/src/prover/smt/solver/elim-small-bv-tactic.ts +129 -0
- package/src/prover/smt/solver/elim-uncnstr.ts +545 -0
- package/src/prover/smt/solver/enode.ts +100 -3
- package/src/prover/smt/solver/eq2bv-tactic.ts +218 -0
- package/src/prover/smt/solver/euf/arith-axioms.ts +403 -0
- package/src/prover/smt/solver/euf/arith-internalize.ts +653 -0
- package/src/prover/smt/solver/euf/arith-solver.ts +889 -0
- package/src/prover/smt/solver/euf/array-axioms.ts +527 -0
- package/src/prover/smt/solver/euf/array-internalize.ts +428 -0
- package/src/prover/smt/solver/euf/array-solver.ts +306 -0
- package/src/prover/smt/solver/euf/bv-ackerman.ts +162 -0
- package/src/prover/smt/solver/euf/bv-internalize.ts +748 -0
- package/src/prover/smt/solver/euf/bv-solver.ts +449 -0
- package/src/prover/smt/solver/euf/dt-solver.ts +618 -0
- package/src/prover/smt/solver/euf/egraph.ts +907 -0
- package/src/prover/smt/solver/euf/euf-solver.ts +1205 -0
- package/src/prover/smt/solver/euf/fpa-solver.ts +317 -0
- package/src/prover/smt/solver/euf/mam.ts +1050 -0
- package/src/prover/smt/solver/euf/q-ematch.ts +830 -0
- package/src/prover/smt/solver/euf/q-mbi.ts +587 -0
- package/src/prover/smt/solver/euf/q-model-fixer.ts +296 -0
- package/src/prover/smt/solver/euf/q-solver.ts +361 -0
- package/src/prover/smt/solver/euf/th-solver.ts +335 -0
- package/src/prover/smt/solver/euf/th-solvers.ts +30 -0
- package/src/prover/smt/solver/expr-ref.ts +0 -1
- package/src/prover/smt/solver/expr-safe-replace.ts +26 -2
- package/src/prover/smt/solver/expr2polynomial.ts +146 -0
- package/src/prover/smt/solver/factor.ts +141 -0
- package/src/prover/smt/solver/fd-solver.ts +265 -0
- package/src/prover/smt/solver/fingerprints.ts +15 -15
- package/src/prover/smt/solver/fix-dl-var.ts +148 -0
- package/src/prover/smt/solver/flat-literals.ts +0 -1
- package/src/prover/smt/solver/fm-tactic.ts +884 -0
- package/src/prover/smt/solver/fpa-decl-plugin.ts +618 -0
- package/src/prover/smt/solver/fpa-rewriter.ts +640 -0
- package/src/prover/smt/solver/fpa2bv-converter.ts +2249 -0
- package/src/prover/smt/solver/fpa2bv-rewriter.ts +348 -0
- package/src/prover/smt/solver/fpa2bv-tactic.ts +73 -0
- package/src/prover/smt/solver/goal.ts +175 -15
- package/src/prover/smt/solver/goal2nlsat.ts +189 -0
- package/src/prover/smt/solver/guard-set.ts +219 -0
- package/src/prover/smt/solver/hash.ts +0 -1
- package/src/prover/smt/solver/hashtable.ts +30 -16
- package/src/prover/smt/solver/inf-eps.ts +63 -0
- package/src/prover/smt/solver/inj-axiom.ts +101 -0
- package/src/prover/smt/solver/internalizer.ts +110 -38
- package/src/prover/smt/solver/lackr.ts +381 -0
- package/src/prover/smt/solver/lbool.ts +0 -1
- package/src/prover/smt/solver/lia2card.ts +268 -0
- package/src/prover/smt/solver/lia2pb.ts +154 -0
- package/src/prover/smt/solver/literal.ts +0 -1
- package/src/prover/smt/solver/logic-tactics.ts +345 -0
- package/src/prover/smt/solver/lp/bound-propagator.ts +0 -1
- package/src/prover/smt/solver/lp/constraints.ts +0 -1
- package/src/prover/smt/solver/lp/containers.ts +0 -1
- package/src/prover/smt/solver/lp/core-solver.ts +18 -3
- package/src/prover/smt/solver/lp/cross-nested.ts +0 -1
- package/src/prover/smt/solver/lp/dep-intervals.ts +0 -3
- package/src/prover/smt/solver/lp/dependency.ts +0 -2
- package/src/prover/smt/solver/lp/dioph-eq.ts +1 -10
- package/src/prover/smt/solver/lp/explanation.ts +0 -1
- package/src/prover/smt/solver/lp/gomory.ts +0 -1
- package/src/prover/smt/solver/lp/hnf-cutter.ts +1 -2
- package/src/prover/smt/solver/lp/hnf.ts +0 -3
- package/src/prover/smt/solver/lp/int-cube.ts +3 -4
- package/src/prover/smt/solver/lp/int-solver.ts +0 -2
- package/src/prover/smt/solver/lp/lar-solver.ts +40 -4
- package/src/prover/smt/solver/lp/lar-term.ts +0 -1
- package/src/prover/smt/solver/lp/lp-settings.ts +0 -1
- package/src/prover/smt/solver/lp/maximize-term.ts +59 -10
- package/src/prover/smt/solver/lp/nex-creator.ts +0 -1
- package/src/prover/smt/solver/lp/nex.ts +0 -1
- package/src/prover/smt/solver/lp/nla-backoff.ts +0 -2
- package/src/prover/smt/solver/lp/nla-basics.ts +0 -2
- package/src/prover/smt/solver/lp/nla-core.ts +42 -11
- package/src/prover/smt/solver/lp/nla-divisions.ts +0 -2
- package/src/prover/smt/solver/lp/nla-emonics.ts +0 -1
- package/src/prover/smt/solver/lp/nla-factorization.ts +0 -1
- package/src/prover/smt/solver/lp/nla-grobner.ts +9 -4
- package/src/prover/smt/solver/lp/nla-horner.ts +0 -2
- package/src/prover/smt/solver/lp/nla-intervals.ts +0 -1
- package/src/prover/smt/solver/lp/nla-monomial-bounds.ts +0 -2
- package/src/prover/smt/solver/lp/nla-monotone.ts +0 -1
- package/src/prover/smt/solver/lp/nla-order.ts +0 -2
- package/src/prover/smt/solver/lp/nla-patcher.ts +0 -1
- package/src/prover/smt/solver/lp/nla-powers.ts +220 -0
- package/src/prover/smt/solver/lp/nla-tangents.ts +0 -2
- package/src/prover/smt/solver/lp/nla-throttle.ts +0 -1
- package/src/prover/smt/solver/lp/nla-transcendentals.ts +324 -0
- package/src/prover/smt/solver/lp/nla-types.ts +0 -2
- package/src/prover/smt/solver/lp/nla-var-eqs.ts +0 -1
- package/src/prover/smt/solver/lp/nra-solver.ts +25 -4
- package/src/prover/smt/solver/lp/numeric-pair.ts +0 -1
- package/src/prover/smt/solver/lp/pdd-interval.ts +0 -1
- package/src/prover/smt/solver/lp/pdd-simplifier.ts +0 -1
- package/src/prover/smt/solver/lp/pdd-solver.ts +0 -2
- package/src/prover/smt/solver/lp/pdd.ts +2 -2
- package/src/prover/smt/solver/lp/random-updater.ts +0 -2
- package/src/prover/smt/solver/lp/static-matrix.ts +0 -1
- package/src/prover/smt/solver/lp/union-find.ts +7 -2
- package/src/prover/smt/solver/macro-finder.ts +530 -0
- package/src/prover/smt/solver/mam-compiler.ts +122 -90
- package/src/prover/smt/solver/mam-interpreter.ts +0 -1
- package/src/prover/smt/solver/max-bv-sharing-tactic.ts +17 -0
- package/src/prover/smt/solver/max-cliques.ts +105 -0
- package/src/prover/smt/solver/maxcore.ts +309 -0
- package/src/prover/smt/solver/maximize-ac-sharing.ts +8 -6
- package/src/prover/smt/solver/maxlex.ts +115 -0
- package/src/prover/smt/solver/maxsmt-base.ts +105 -0
- package/src/prover/smt/solver/maxsmt.ts +92 -0
- package/src/prover/smt/solver/mbp/mbp-arith.ts +467 -0
- package/src/prover/smt/solver/mbp/mbp-basic-tg.ts +101 -0
- package/src/prover/smt/solver/mbp/mbp-plugin.ts +287 -0
- package/src/prover/smt/solver/mbp/mbp-qel.ts +48 -0
- package/src/prover/smt/solver/mbp/mbp-solve-plugin.ts +271 -0
- package/src/prover/smt/solver/mbp/mbp-term-graph.ts +606 -0
- package/src/prover/smt/solver/model-based-opt.ts +844 -0
- package/src/prover/smt/solver/model-checker.ts +18 -27
- package/src/prover/smt/solver/model-evaluator.ts +188 -12
- package/src/prover/smt/solver/model-finder.ts +12 -18
- package/src/prover/smt/solver/model-generator.ts +56 -29
- package/src/prover/smt/solver/model-macro-solver.ts +49 -46
- package/src/prover/smt/solver/model-printer.ts +214 -0
- package/src/prover/smt/solver/mpf.ts +711 -0
- package/src/prover/smt/solver/mus.ts +51 -0
- package/src/prover/smt/solver/muz/dl-context.ts +404 -0
- package/src/prover/smt/solver/muz/dl-mk-bit-blast.ts +97 -0
- package/src/prover/smt/solver/muz/dl-mk-coi-filter.ts +167 -0
- package/src/prover/smt/solver/muz/dl-mk-elim-term-ite.ts +125 -0
- package/src/prover/smt/solver/muz/dl-mk-interp-tail-simplifier.ts +299 -0
- package/src/prover/smt/solver/muz/dl-mk-rule-inliner.ts +455 -0
- package/src/prover/smt/solver/muz/dl-mk-slice.ts +340 -0
- package/src/prover/smt/solver/muz/dl-mk-subsumption-checker.ts +163 -0
- package/src/prover/smt/solver/muz/dl-rule-set.ts +273 -0
- package/src/prover/smt/solver/muz/dl-rule-transformer.ts +123 -0
- package/src/prover/smt/solver/muz/dl-rule.ts +496 -0
- package/src/prover/smt/solver/muz/hnf.ts +201 -0
- package/src/prover/smt/solver/muz/horn-subsume-model-converter.ts +176 -0
- package/src/prover/smt/solver/muz/horn-tactic.ts +201 -0
- package/src/prover/smt/solver/muz/rule-properties.ts +337 -0
- package/src/prover/smt/solver/muz/spacer-context.ts +1406 -0
- package/src/prover/smt/solver/muz/spacer-dl-interface.ts +52 -0
- package/src/prover/smt/solver/muz/spacer-generalizers.ts +241 -0
- package/src/prover/smt/solver/muz/spacer-manager.ts +127 -0
- package/src/prover/smt/solver/muz/spacer-pdr.ts +218 -0
- package/src/prover/smt/solver/muz/spacer-prop-solver.ts +333 -0
- package/src/prover/smt/solver/muz/spacer-util.ts +282 -0
- package/src/prover/smt/solver/muz/substitution.ts +203 -0
- package/src/prover/smt/solver/nla2bv-tactic.ts +285 -0
- package/src/prover/smt/solver/nlqsat.ts +484 -0
- package/src/prover/smt/solver/nlsat/algebraic.ts +125 -12
- package/src/prover/smt/solver/nlsat/atoms.ts +20 -6
- package/src/prover/smt/solver/nlsat/evaluator.ts +0 -1
- package/src/prover/smt/solver/nlsat/explain.ts +63 -23
- package/src/prover/smt/solver/nlsat/interval-set.ts +1 -2
- package/src/prover/smt/solver/nlsat/levelwise.ts +3 -9
- package/src/prover/smt/solver/nlsat/mpbq.ts +45 -1
- package/src/prover/smt/solver/nlsat/polynomial.ts +13 -6
- package/src/prover/smt/solver/nlsat/solver.ts +234 -36
- package/src/prover/smt/solver/nlsat/transcendental-eval.ts +310 -0
- package/src/prover/smt/solver/nlsat/transcendentals.ts +367 -0
- package/src/prover/smt/solver/nlsat/types.ts +0 -2
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +1 -4
- package/src/prover/smt/solver/nlsat/upolynomial.ts +0 -2
- package/src/prover/smt/solver/nlsat-tactic.ts +82 -0
- package/src/prover/smt/solver/nnf.ts +105 -23
- package/src/prover/smt/solver/normalize-bounds.ts +53 -0
- package/src/prover/smt/solver/occf.ts +97 -0
- package/src/prover/smt/solver/opt-context.ts +787 -0
- package/src/prover/smt/solver/opt-nlsat.ts +375 -0
- package/src/prover/smt/solver/opt-pareto.ts +282 -0
- package/src/prover/smt/solver/opt-preprocess.ts +101 -0
- package/src/prover/smt/solver/opt-solver.ts +308 -0
- package/src/prover/smt/solver/opt-value.ts +55 -0
- package/src/prover/smt/solver/optsmt.ts +692 -0
- package/src/prover/smt/solver/parallel-tactic.ts +299 -0
- package/src/prover/smt/solver/pattern-inference.ts +19 -11
- package/src/prover/smt/solver/pb-rewriter.ts +284 -0
- package/src/prover/smt/solver/pb2bv-tactic.ts +540 -0
- package/src/prover/smt/solver/poly-rewriter.ts +202 -57
- package/src/prover/smt/solver/probes.ts +512 -0
- package/src/prover/smt/solver/propagate-values.ts +37 -21
- package/src/prover/smt/solver/proto-model.ts +648 -19
- package/src/prover/smt/solver/pull-quant.ts +28 -12
- package/src/prover/smt/solver/purify-arith.ts +632 -0
- package/src/prover/smt/solver/qe-arith-plugin.ts +1098 -0
- package/src/prover/smt/solver/qe-lite-der.ts +2 -3
- package/src/prover/smt/solver/qe-lite-fm.ts +3 -4
- package/src/prover/smt/solver/qe-lite.ts +37 -17
- package/src/prover/smt/solver/qe-mbp.ts +270 -0
- package/src/prover/smt/solver/qe.ts +1498 -0
- package/src/prover/smt/solver/qel.ts +25 -0
- package/src/prover/smt/solver/qi-queue.ts +0 -1
- package/src/prover/smt/solver/qsat.ts +814 -0
- package/src/prover/smt/solver/quant-hoist.ts +196 -0
- package/src/prover/smt/solver/quant-tactics.ts +16 -56
- package/src/prover/smt/solver/quantifier-analyzer.ts +19 -20
- package/src/prover/smt/solver/quantifier-manager.ts +8 -16
- package/src/prover/smt/solver/quasi-macros.ts +243 -0
- package/src/prover/smt/solver/random-gen.ts +0 -1
- package/src/prover/smt/solver/rational.ts +45 -1
- package/src/prover/smt/solver/recfun-decl-plugin.ts +261 -0
- package/src/prover/smt/solver/recfun-rewriter.ts +107 -0
- package/src/prover/smt/solver/reduce-args.ts +225 -0
- package/src/prover/smt/solver/reduce-bv-size.ts +119 -0
- package/src/prover/smt/solver/ref-vector.ts +0 -1
- package/src/prover/smt/solver/relevancy.ts +1 -2
- package/src/prover/smt/solver/rewriter-tpl.ts +77 -10
- package/src/prover/smt/solver/rewriter.ts +475 -36
- package/src/prover/smt/solver/rlimit.ts +25 -2
- package/src/prover/smt/solver/sat/asymm-branch.ts +325 -0
- package/src/prover/smt/solver/sat/big.ts +177 -0
- package/src/prover/smt/solver/sat/clause-use-list.ts +71 -0
- package/src/prover/smt/solver/sat/clause.ts +203 -0
- package/src/prover/smt/solver/sat/cleaner.ts +94 -0
- package/src/prover/smt/solver/sat/config.ts +122 -0
- package/src/prover/smt/solver/sat/consequences.ts +203 -0
- package/src/prover/smt/solver/sat/elim-eqs.ts +142 -0
- package/src/prover/smt/solver/sat/goal2sat.ts +526 -0
- package/src/prover/smt/solver/sat/inc-sat-solver.ts +378 -0
- package/src/prover/smt/solver/sat/model-converter.ts +136 -0
- package/src/prover/smt/solver/sat/pb-constraint.ts +261 -0
- package/src/prover/smt/solver/sat/pb-solver.ts +1577 -0
- package/src/prover/smt/solver/sat/probing.ts +170 -0
- package/src/prover/smt/solver/sat/sat-tactic.ts +43 -0
- package/src/prover/smt/solver/sat/sat2goal.ts +165 -0
- package/src/prover/smt/solver/sat/scc.ts +142 -0
- package/src/prover/smt/solver/sat/simplifier.ts +1618 -0
- package/src/prover/smt/solver/sat/solver.ts +2127 -0
- package/src/prover/smt/solver/sat/var-queue.ts +117 -0
- package/src/prover/smt/solver/sat/watch-list.ts +140 -0
- package/src/prover/smt/solver/search-tree.ts +284 -0
- package/src/prover/smt/solver/seq-axioms.ts +1010 -0
- package/src/prover/smt/solver/seq-decl-plugin.ts +819 -0
- package/src/prover/smt/solver/seq-derive.ts +1301 -0
- package/src/prover/smt/solver/seq-eq-approx.ts +236 -0
- package/src/prover/smt/solver/seq-eq-solver.ts +439 -0
- package/src/prover/smt/solver/seq-factory.ts +89 -0
- package/src/prover/smt/solver/seq-monadic.ts +728 -0
- package/src/prover/smt/solver/seq-range-predicate.ts +235 -0
- package/src/prover/smt/solver/seq-re-rewriter.ts +1170 -0
- package/src/prover/smt/solver/seq-re-util.ts +758 -0
- package/src/prover/smt/solver/seq-regex-bisim.ts +144 -0
- package/src/prover/smt/solver/seq-regex-live.ts +200 -0
- package/src/prover/smt/solver/seq-rewriter.ts +2402 -0
- package/src/prover/smt/solver/seq-skolem.ts +317 -0
- package/src/prover/smt/solver/seq-subset.ts +165 -0
- package/src/prover/smt/solver/seq-view-witness.ts +353 -0
- package/src/prover/smt/solver/smt-consequences.ts +297 -0
- package/src/prover/smt/solver/smt-kernel.ts +83 -0
- package/src/prover/smt/solver/smt-logics.ts +66 -0
- package/src/prover/smt/solver/smt-setup.ts +496 -0
- package/src/prover/smt/solver/smt2-printer.ts +765 -0
- package/src/prover/smt/solver/smtlib-parser.ts +3126 -316
- package/src/prover/smt/solver/smtlib-script.ts +1631 -0
- package/src/prover/smt/solver/solve-eqs.ts +929 -0
- package/src/prover/smt/solver/solver.ts +113 -22
- package/src/prover/smt/solver/static-features.ts +314 -0
- package/src/prover/smt/solver/sticky-generations.ts +0 -1
- package/src/prover/smt/solver/tactic.ts +1986 -0
- package/src/prover/smt/solver/term-enumeration.ts +205 -0
- package/src/prover/smt/solver/theory-array.ts +1240 -0
- package/src/prover/smt/solver/theory-bv.ts +1200 -0
- package/src/prover/smt/solver/theory-char.ts +355 -0
- package/src/prover/smt/solver/theory-datatype.ts +598 -0
- package/src/prover/smt/solver/theory-finite-set.ts +30 -0
- package/src/prover/smt/solver/theory-fpa.ts +389 -0
- package/src/prover/smt/solver/theory-lra-axioms.ts +53 -2
- package/src/prover/smt/solver/theory-lra-bounds.ts +31 -6
- package/src/prover/smt/solver/theory-lra-final-check.ts +56 -70
- package/src/prover/smt/solver/theory-lra-internalize.ts +86 -27
- package/src/prover/smt/solver/theory-lra-model.ts +20 -35
- package/src/prover/smt/solver/theory-lra-propagate.ts +24 -26
- package/src/prover/smt/solver/theory-lra-state.ts +6 -22
- package/src/prover/smt/solver/theory-lra.ts +188 -1
- package/src/prover/smt/solver/theory-pb.ts +934 -0
- package/src/prover/smt/solver/theory-polymorphism.ts +58 -0
- package/src/prover/smt/solver/theory-recfun.ts +307 -0
- package/src/prover/smt/solver/theory-seq-regex.ts +867 -0
- package/src/prover/smt/solver/theory-seq-solve.ts +1373 -0
- package/src/prover/smt/solver/theory-seq-state.ts +871 -0
- package/src/prover/smt/solver/theory-seq.ts +961 -0
- package/src/prover/smt/solver/theory.ts +189 -0
- package/src/prover/smt/solver/tseitin-cnf.ts +485 -0
- package/src/prover/smt/solver/var-subst.ts +36 -14
- package/src/prover/smt/table.ts +3 -2
- package/src/prover/smt/types.ts +146 -0
- package/src/prover/tlapm/cache.ts +50 -19
- package/src/prover/tlapm/tlapm.ts +15 -9
- package/src/prover/tlapm-library.ts +3208 -0
- package/src/prover/verdict.ts +9 -0
- package/src/prover/zenon/check/check.ts +1 -2
- package/src/prover/zenon/check/records.ts +1 -1
- package/src/prover/zenon/check/relations.ts +2 -1
- package/src/prover/zenon/check/rewrites.ts +2 -15
- package/src/prover/zenon/check/sets.ts +40 -58
- package/src/prover/zenon/check/terms.ts +1 -2
- package/src/prover/zenon/decide.ts +10 -7
- package/src/prover/zenon/encode.ts +0 -2
- package/src/prover/zenon/eqrel.ts +2 -2
- package/src/prover/zenon/equality-rules.ts +0 -2
- package/src/prover/zenon/expr.ts +7 -2
- package/src/prover/zenon/index-table.ts +9 -21
- package/src/prover/zenon/isar-case.ts +0 -2
- package/src/prover/zenon/isar.ts +35 -37
- package/src/prover/zenon/llproof.ts +2 -13
- package/src/prover/zenon/mltoll.ts +12 -30
- package/src/prover/zenon/node.ts +20 -5
- package/src/prover/zenon/parse.ts +9 -8
- package/src/prover/zenon/phrase.ts +0 -2
- package/src/prover/zenon/proof.ts +0 -2
- package/src/prover/zenon/propositional-rules.ts +0 -2
- package/src/prover/zenon/rules.ts +0 -2
- package/src/prover/zenon/search.ts +11 -19
- package/src/prover/zenon/tla/functions.ts +2 -4
- package/src/prover/zenon/tla/llproof.ts +9 -13
- package/src/prover/zenon/tla/records.ts +1 -8
- package/src/prover/zenon/tla/rewrites.ts +0 -2
- package/src/prover/zenon/tla/sets.ts +22 -22
- package/src/prover/zenon/tla/terms.ts +0 -2
- package/src/prover/zenon/tla/tla.ts +7 -8
- package/src/resolve.ts +56 -74
- package/src/runtime.ts +4 -0
- package/src/sany/generation.ts +394 -0
- package/src/sany/generator-def-entries.ts +210 -0
- package/src/sany/generator-definitions.ts +686 -0
- package/src/sany/generator-expressions.ts +1100 -0
- package/src/sany/generator-proofs.ts +662 -0
- package/src/sany/generator.ts +155 -2625
- package/src/sany/levels.ts +0 -2
- package/src/sany/lexer.ts +17 -16
- package/src/sany/linter.ts +0 -2
- package/src/sany/nodes.ts +2 -3
- package/src/sany/report.ts +3 -6
- package/src/sany/selectors.ts +35 -38
- package/src/sany/xml.ts +23 -55
- package/src/search.ts +205 -43
- package/src/simulate.ts +157 -133
- package/src/spec-description.ts +33 -48
- package/src/standard-definitions.ts +4 -0
- package/src/standard-modules.ts +16 -32
- package/src/state-graph.ts +0 -2
- package/src/substitution-levels.ts +5 -4
- package/src/successors.ts +6 -8
- package/src/symmetry.ts +2 -2
- package/src/tableau.ts +2 -2
- package/src/tlc/fingerprint.ts +81 -9
- package/src/tlc/messages.ts +20 -15
- package/src/tlc/random.ts +4 -4
- package/src/tlc/replay.ts +8 -15
- package/src/tlc/summary.ts +29 -14
- package/src/tlc/tlc-operators.ts +2 -3
- package/src/tlc/tlcext-operators.ts +44 -12
- package/src/tlc/trace-spec.ts +21 -40
- package/src/typed-tier.ts +6535 -0
- package/src/typescript/actions.ts +2 -4
- package/src/typescript/collections.ts +34 -20
- package/src/typescript/compile.ts +1 -3
- package/src/typescript/formula.ts +5 -3
- package/src/typescript/model.ts +4 -5
- package/src/typescript/steps.ts +20 -18
- package/src/values.ts +62 -152
- 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
|
@@ -1,11 +1,13 @@
|
|
|
1
|
-
// A port of tlapm's Proof.Simplify.
|
|
2
|
-
|
|
3
1
|
import { TlaProofError } from "../errors";
|
|
4
2
|
import { isEqualExpr } from "./equality";
|
|
5
3
|
import {
|
|
4
|
+
AT_NOWHERE,
|
|
5
|
+
adjoinAll,
|
|
6
6
|
applyBuiltin,
|
|
7
7
|
at,
|
|
8
|
+
getDefinitionHyp,
|
|
8
9
|
getFact,
|
|
10
|
+
getTrue,
|
|
9
11
|
isBuiltinApply,
|
|
10
12
|
mapAccumulate,
|
|
11
13
|
mapBoundDomains,
|
|
@@ -15,11 +17,12 @@ import {
|
|
|
15
17
|
type Builtin,
|
|
16
18
|
type Expr,
|
|
17
19
|
type Hyp,
|
|
20
|
+
type Locus,
|
|
18
21
|
type Sequent,
|
|
19
22
|
type Time,
|
|
20
23
|
} from "./expression";
|
|
21
24
|
import { format, renderDoc, type Doc } from "./format";
|
|
22
|
-
import {
|
|
25
|
+
import { proveAssertion, useAssertion } from "./generate";
|
|
23
26
|
import { printExpression } from "./printer";
|
|
24
27
|
import { getUnique, type Counter, type Proof, type Step, type StepNumber } from "./proof";
|
|
25
28
|
import {
|
|
@@ -30,15 +33,20 @@ import {
|
|
|
30
33
|
substituteBounds,
|
|
31
34
|
substituteExpr,
|
|
32
35
|
} from "./substitution";
|
|
36
|
+
import { getTime } from "./temporal";
|
|
33
37
|
|
|
34
38
|
const getProps = (from: Step) => ({
|
|
35
39
|
location: from.location,
|
|
36
40
|
step: from.step,
|
|
37
41
|
method: from.method,
|
|
42
|
+
isSuppressed: from.isSuppressed,
|
|
38
43
|
});
|
|
39
44
|
|
|
40
45
|
const getLevel = (step: StepNumber | undefined) => step?.level ?? 0;
|
|
41
46
|
|
|
47
|
+
const getVisibleFact = (context: Hyp[], expression: Expr, location: Locus | undefined) =>
|
|
48
|
+
getFact(expression, "Visible", getTime(adjoinAll(undefined, context), expression), location);
|
|
49
|
+
|
|
42
50
|
const isBinary = (
|
|
43
51
|
expression: Expr,
|
|
44
52
|
builtin: Builtin,
|
|
@@ -85,7 +93,7 @@ const getRemainingBounds = (first: Bound, rest: Bound[]): Bound[] => {
|
|
|
85
93
|
};
|
|
86
94
|
|
|
87
95
|
const getWitnessProof = (step: Step, sideFacts: Expr[]): Proof => {
|
|
88
|
-
if (sideFacts.length === 0) return { kind: "Obvious", ...getProps(step) };
|
|
96
|
+
if (sideFacts.length === 0 || step.isSuppressed) return { kind: "Obvious", ...getProps(step) };
|
|
89
97
|
const steps = sideFacts.map((item, index): Step => {
|
|
90
98
|
const active = shiftExpr(2 * index + 2, item);
|
|
91
99
|
return {
|
|
@@ -127,6 +135,13 @@ const replaceAt = (expression: Expr, replacement: Expr): Expr =>
|
|
|
127
135
|
? at(stripProps(replacement), expression)
|
|
128
136
|
: mapChildren(expression, (inner) => replaceAt(inner, replacement));
|
|
129
137
|
|
|
138
|
+
interface SimplifiedSteps {
|
|
139
|
+
context: Hyp[];
|
|
140
|
+
goal: Expr;
|
|
141
|
+
steps: Step[];
|
|
142
|
+
time: Time;
|
|
143
|
+
}
|
|
144
|
+
|
|
130
145
|
export const createSimplifier = (counter: Counter) => {
|
|
131
146
|
const getAnonymous = (level: number): StepNumber => ({
|
|
132
147
|
kind: "Named",
|
|
@@ -245,6 +260,7 @@ export const createSimplifier = (counter: Counter) => {
|
|
|
245
260
|
isOnly: false,
|
|
246
261
|
location: fact.location,
|
|
247
262
|
useLocation: proof.location,
|
|
263
|
+
isSuppressed: proof.isSuppressed,
|
|
248
264
|
}));
|
|
249
265
|
const forget: Step[] = proof.isOnly
|
|
250
266
|
? [{ kind: "Forget", count: usable.facts.length, location: proof.location }]
|
|
@@ -259,6 +275,7 @@ export const createSimplifier = (counter: Counter) => {
|
|
|
259
275
|
location: proof.location,
|
|
260
276
|
step: getAnonymous(level),
|
|
261
277
|
method: proof.method,
|
|
278
|
+
isSuppressed: proof.isSuppressed,
|
|
262
279
|
};
|
|
263
280
|
return {
|
|
264
281
|
kind: "Steps",
|
|
@@ -273,13 +290,8 @@ export const createSimplifier = (counter: Counter) => {
|
|
|
273
290
|
{ context, goal, time },
|
|
274
291
|
proof.steps,
|
|
275
292
|
(state, step) => {
|
|
276
|
-
const
|
|
277
|
-
|
|
278
|
-
state.goal,
|
|
279
|
-
step,
|
|
280
|
-
state.time,
|
|
281
|
-
);
|
|
282
|
-
return [{ context: nextContext, goal: nextGoal, time: nextTime }, simplified];
|
|
293
|
+
const next = simplifyStep(state.context, state.goal, step, state.time);
|
|
294
|
+
return [next, next.steps];
|
|
283
295
|
},
|
|
284
296
|
);
|
|
285
297
|
const qedProof = simplify(inner.context, inner.goal, proof.qed.proof, inner.time);
|
|
@@ -288,16 +300,11 @@ export const createSimplifier = (counter: Counter) => {
|
|
|
288
300
|
}
|
|
289
301
|
};
|
|
290
302
|
|
|
291
|
-
const simplifyStep = (
|
|
292
|
-
context: Hyp[],
|
|
293
|
-
goal: Expr,
|
|
294
|
-
step: Step,
|
|
295
|
-
time: Time,
|
|
296
|
-
): [Hyp[], Expr, Step[], Time] => {
|
|
303
|
+
const simplifyStep = (context: Hyp[], goal: Expr, step: Step, time: Time): SimplifiedSteps => {
|
|
297
304
|
const level = getLevel(step.step);
|
|
298
305
|
switch (step.kind) {
|
|
299
306
|
case "Forget":
|
|
300
|
-
return
|
|
307
|
+
return { context, goal, steps: [step], time };
|
|
301
308
|
case "Assert": {
|
|
302
309
|
const inner = proveAssertion(context, step.sequent, step, time);
|
|
303
310
|
const simplified: Step = {
|
|
@@ -305,7 +312,7 @@ export const createSimplifier = (counter: Counter) => {
|
|
|
305
312
|
proof: simplify(inner.context, inner.active, step.proof, inner.time),
|
|
306
313
|
};
|
|
307
314
|
const next = useAssertion(false, context, goal, step.sequent, simplified, time);
|
|
308
|
-
return
|
|
315
|
+
return { context: next.context, goal: next.active, steps: [simplified], time };
|
|
309
316
|
}
|
|
310
317
|
case "Suffices": {
|
|
311
318
|
const inner = useAssertion(true, context, goal, step.sequent, step, time);
|
|
@@ -314,7 +321,7 @@ export const createSimplifier = (counter: Counter) => {
|
|
|
314
321
|
proof: simplify(inner.context, inner.active, step.proof, time),
|
|
315
322
|
};
|
|
316
323
|
const next = proveAssertion(context, step.sequent, simplified, time);
|
|
317
|
-
return
|
|
324
|
+
return { context: next.context, goal: next.active, steps: [simplified], time: next.time };
|
|
318
325
|
}
|
|
319
326
|
case "Use": {
|
|
320
327
|
const byProof: Proof = {
|
|
@@ -324,6 +331,7 @@ export const createSimplifier = (counter: Counter) => {
|
|
|
324
331
|
location: step.location,
|
|
325
332
|
step: step.step,
|
|
326
333
|
method: step.method,
|
|
334
|
+
isSuppressed: step.isSuppressed,
|
|
327
335
|
};
|
|
328
336
|
const simplified = simplify(context, goal, byProof, time);
|
|
329
337
|
if (simplified.kind !== "Steps")
|
|
@@ -331,12 +339,12 @@ export const createSimplifier = (counter: Counter) => {
|
|
|
331
339
|
const assumed = step.usable.facts.map(() =>
|
|
332
340
|
getFact(AT_NOWHERE, "Visible", time, step.location),
|
|
333
341
|
);
|
|
334
|
-
return
|
|
335
|
-
[...context, ...assumed],
|
|
336
|
-
shiftExpr(step.usable.facts.length, goal),
|
|
337
|
-
simplified.steps,
|
|
342
|
+
return {
|
|
343
|
+
context: [...context, ...assumed],
|
|
344
|
+
goal: shiftExpr(step.usable.facts.length, goal),
|
|
345
|
+
steps: simplified.steps,
|
|
338
346
|
time,
|
|
339
|
-
|
|
347
|
+
};
|
|
340
348
|
}
|
|
341
349
|
case "Hide": {
|
|
342
350
|
const hidden = step.usable.defs.reduce((current, def) => {
|
|
@@ -353,30 +361,25 @@ export const createSimplifier = (counter: Counter) => {
|
|
|
353
361
|
position === index ? { ...hyp, visibility: "Hidden", location: step.location } : entry,
|
|
354
362
|
);
|
|
355
363
|
}, context);
|
|
356
|
-
return
|
|
364
|
+
return { context: hidden, goal, steps: [step], time };
|
|
357
365
|
}
|
|
358
366
|
case "Define":
|
|
359
|
-
return
|
|
360
|
-
[
|
|
367
|
+
return {
|
|
368
|
+
context: [
|
|
361
369
|
...context,
|
|
362
|
-
...step.definitions.map((definition)
|
|
363
|
-
kind: "
|
|
364
|
-
|
|
365
|
-
whereDefined: { kind: "Proof", time },
|
|
366
|
-
visibility: "Visible",
|
|
367
|
-
isLocal: true,
|
|
368
|
-
location: step.location,
|
|
369
|
-
})),
|
|
370
|
+
...step.definitions.map((definition) =>
|
|
371
|
+
getDefinitionHyp(definition, { kind: "Proof", time }, "Visible", true, step.location),
|
|
372
|
+
),
|
|
370
373
|
],
|
|
371
|
-
shiftExpr(step.definitions.length, goal),
|
|
372
|
-
[step],
|
|
374
|
+
goal: shiftExpr(step.definitions.length, goal),
|
|
375
|
+
steps: [step],
|
|
373
376
|
time,
|
|
374
|
-
|
|
377
|
+
};
|
|
375
378
|
case "Have": {
|
|
376
379
|
const connective = exposeConnective(context, goal);
|
|
377
380
|
const isImplication = isBinary(connective, "Implies");
|
|
378
381
|
const sequent: Sequent = {
|
|
379
|
-
context: [
|
|
382
|
+
context: [getVisibleFact(context, step.expression, step.location)],
|
|
380
383
|
active: isImplication ? shiftExpr(1, connective.args[1]) : connective,
|
|
381
384
|
};
|
|
382
385
|
const proof: Proof = isImplication
|
|
@@ -423,7 +426,7 @@ export const createSimplifier = (counter: Counter) => {
|
|
|
423
426
|
const assertion: Step = {
|
|
424
427
|
kind: "Assert",
|
|
425
428
|
sequent: {
|
|
426
|
-
context: [
|
|
429
|
+
context: [getVisibleFact(context, step.expression, step.location)],
|
|
427
430
|
active: shiftExpr(1, goal),
|
|
428
431
|
},
|
|
429
432
|
proof: step.proof,
|
|
@@ -437,7 +440,7 @@ export const createSimplifier = (counter: Counter) => {
|
|
|
437
440
|
step,
|
|
438
441
|
);
|
|
439
442
|
const salted = getSalted(step.step, "ex");
|
|
440
|
-
const
|
|
443
|
+
const asserted = simplifyStep(
|
|
441
444
|
context,
|
|
442
445
|
goal,
|
|
443
446
|
{
|
|
@@ -451,22 +454,23 @@ export const createSimplifier = (counter: Counter) => {
|
|
|
451
454
|
);
|
|
452
455
|
const shifted = shiftExpr(2, existential);
|
|
453
456
|
if (shifted.kind !== "Quant") throw new TlaProofError("Proof.Simplify.simplify_step/PICK");
|
|
457
|
+
const boundHyps = getBoundHyps(shifted.bounds);
|
|
454
458
|
const hyps = [
|
|
455
|
-
...
|
|
456
|
-
|
|
459
|
+
...boundHyps,
|
|
460
|
+
getVisibleFact([...asserted.context, ...boundHyps], shifted.body, shifted.body.location),
|
|
457
461
|
];
|
|
458
|
-
const
|
|
459
|
-
|
|
460
|
-
|
|
462
|
+
const sufficed = simplifyStep(
|
|
463
|
+
asserted.context,
|
|
464
|
+
asserted.goal,
|
|
461
465
|
{
|
|
462
466
|
kind: "Suffices",
|
|
463
|
-
sequent: { context: hyps, active: shiftExpr(hyps.length,
|
|
467
|
+
sequent: { context: hyps, active: shiftExpr(hyps.length, asserted.goal) },
|
|
464
468
|
proof: { kind: "Omitted", omission: "Elsewhere", ...getProps(step) },
|
|
465
469
|
...getProps(step),
|
|
466
470
|
},
|
|
467
|
-
|
|
471
|
+
asserted.time,
|
|
468
472
|
);
|
|
469
|
-
return
|
|
473
|
+
return { ...sufficed, steps: [...asserted.steps, ...sufficed.steps] };
|
|
470
474
|
}
|
|
471
475
|
}
|
|
472
476
|
};
|
|
@@ -534,6 +538,7 @@ export const createSimplifier = (counter: Counter) => {
|
|
|
534
538
|
kind: "Apply",
|
|
535
539
|
operator: { kind: "Internal", builtin: "Subseteq" },
|
|
536
540
|
args: [goalDomain.expression, domain.expression],
|
|
541
|
+
location: bound.location,
|
|
537
542
|
} satisfies Expr,
|
|
538
543
|
...sideFacts,
|
|
539
544
|
]
|
|
@@ -16,6 +16,7 @@ import { TlaProofError, TlaUnsupportedError } from "../errors";
|
|
|
16
16
|
import {
|
|
17
17
|
at,
|
|
18
18
|
getFact,
|
|
19
|
+
mapChildren,
|
|
19
20
|
type Bound,
|
|
20
21
|
type Builtin,
|
|
21
22
|
type Defn,
|
|
@@ -27,7 +28,7 @@ import {
|
|
|
27
28
|
type Sequent,
|
|
28
29
|
} from "./expression";
|
|
29
30
|
import type { ModuleUnit, Mule } from "./module";
|
|
30
|
-
import { findPragma, readNewMethod, readOldMethod } from "./pragma";
|
|
31
|
+
import { findPragma, findSuppressPragma, readNewMethod, readOldMethod } from "./pragma";
|
|
31
32
|
import {
|
|
32
33
|
expandChoose,
|
|
33
34
|
expandFcn,
|
|
@@ -48,36 +49,38 @@ import {
|
|
|
48
49
|
type Usable,
|
|
49
50
|
} from "./proof";
|
|
50
51
|
|
|
51
|
-
const BUILTINS
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
52
|
+
const BUILTINS = new Map<string, Builtin>(
|
|
53
|
+
Object.entries({
|
|
54
|
+
"=>": "Implies",
|
|
55
|
+
"<=>": "Equiv",
|
|
56
|
+
"/\\": "Conj",
|
|
57
|
+
"\\/": "Disj",
|
|
58
|
+
"~": "Neg",
|
|
59
|
+
"=": "Eq",
|
|
60
|
+
"#": "Neq",
|
|
61
|
+
SUBSET: "SUBSET",
|
|
62
|
+
UNION: "UNION",
|
|
63
|
+
DOMAIN: "DOMAIN",
|
|
64
|
+
"\\subseteq": "Subseteq",
|
|
65
|
+
"\\in": "Mem",
|
|
66
|
+
"\\notin": "Notmem",
|
|
67
|
+
"\\": "Setminus",
|
|
68
|
+
"\\cap": "Cap",
|
|
69
|
+
"\\cup": "Cup",
|
|
70
|
+
"'": "Prime",
|
|
71
|
+
"~>": "Leadsto",
|
|
72
|
+
ENABLED: "ENABLED",
|
|
73
|
+
UNCHANGED: "UNCHANGED",
|
|
74
|
+
"\\cdot": "Cdot",
|
|
75
|
+
"-+->": "Actplus",
|
|
76
|
+
"[]": "BoxTrue",
|
|
77
|
+
"<>": "Diamond",
|
|
78
|
+
TRUE: "TRUE",
|
|
79
|
+
FALSE: "FALSE",
|
|
80
|
+
BOOLEAN: "BOOLEAN",
|
|
81
|
+
STRING: "STRING",
|
|
82
|
+
}),
|
|
83
|
+
);
|
|
81
84
|
|
|
82
85
|
const getCanonicalName = (name: string) => lookupOperator(name).name;
|
|
83
86
|
|
|
@@ -101,11 +104,12 @@ const mergeLoci = (left: Locus | undefined, right: Locus | undefined): Locus | u
|
|
|
101
104
|
};
|
|
102
105
|
|
|
103
106
|
const TUPLY_FAILURE = "use instead the class`E_visit.iter_concrete`";
|
|
107
|
+
const STEP_TUPLY_FAILURE = "use instead the class `P_visit.map_concrete`";
|
|
104
108
|
|
|
105
109
|
const isDitto = (bounds: QuantifierExpression["bounds"], index: number) =>
|
|
106
110
|
index > 0 && bounds[index - 1].set === bounds[index].set;
|
|
107
111
|
|
|
108
|
-
export const
|
|
112
|
+
export const createModuleConverter = (
|
|
109
113
|
file: string,
|
|
110
114
|
text: string,
|
|
111
115
|
counter: Counter,
|
|
@@ -134,6 +138,11 @@ export const createSource = (
|
|
|
134
138
|
const getMethod = (range: SourceRange | undefined) =>
|
|
135
139
|
range && readOldMethod(lines, { line: range.end.line - 1, column: range.end.column });
|
|
136
140
|
|
|
141
|
+
const getSuppressPragma = (keyword: SourceRange) =>
|
|
142
|
+
findSuppressPragma(lines, { line: keyword.start.line - 1, column: keyword.start.column - 1 });
|
|
143
|
+
|
|
144
|
+
const isSuppressed = (keyword: SourceRange) => getSuppressPragma(keyword) !== undefined;
|
|
145
|
+
|
|
137
146
|
const withMethod = (range: SourceRange) => {
|
|
138
147
|
const method = getMethod(range);
|
|
139
148
|
const location = getRangeLocus(range);
|
|
@@ -158,7 +167,7 @@ export const createSource = (
|
|
|
158
167
|
|
|
159
168
|
const convertOperator = (name: string, location: Locus | undefined): Expr => {
|
|
160
169
|
const canonical = getCanonicalName(name);
|
|
161
|
-
const builtin = BUILTINS
|
|
170
|
+
const builtin = BUILTINS.get(canonical);
|
|
162
171
|
return at(builtin ? { kind: "Internal", builtin } : { kind: "Opaque", name: canonical }, {
|
|
163
172
|
location,
|
|
164
173
|
});
|
|
@@ -174,7 +183,7 @@ export const createSource = (
|
|
|
174
183
|
const operator = at({ kind: "Opaque", name }, { location });
|
|
175
184
|
return at({ kind: "Bang", expression: operator, selectors: [] }, { location });
|
|
176
185
|
}
|
|
177
|
-
const builtin = BUILTINS
|
|
186
|
+
const builtin = BUILTINS.get(name);
|
|
178
187
|
if (builtin && args.length === 0) return at({ kind: "Internal", builtin }, { location });
|
|
179
188
|
const names = name.split("!");
|
|
180
189
|
if (names.length === 1) {
|
|
@@ -209,12 +218,14 @@ export const createSource = (
|
|
|
209
218
|
bounds.map((bound, index) => {
|
|
210
219
|
if (bound.pattern.kind === "Tuple")
|
|
211
220
|
throw new TlaProofError("Unexpected tuple declaration", { failure: TUPLY_FAILURE });
|
|
221
|
+
const range = bound.pattern.ranges?.[0];
|
|
212
222
|
return {
|
|
213
223
|
name: bound.pattern.name,
|
|
214
224
|
level: "Constant",
|
|
215
225
|
domain: isDitto(bounds, index)
|
|
216
226
|
? { kind: "Ditto" }
|
|
217
227
|
: { kind: "Domain", expression: convertExpression(bound.set, isExcept) },
|
|
228
|
+
...(range && { location: getRangeLocus(range) }),
|
|
218
229
|
};
|
|
219
230
|
});
|
|
220
231
|
|
|
@@ -233,6 +244,13 @@ export const createSource = (
|
|
|
233
244
|
};
|
|
234
245
|
});
|
|
235
246
|
|
|
247
|
+
// P_visit.map fails on the tuples a TAKE or PICK declares before the expression visitors do.
|
|
248
|
+
const convertStepBounds = (body: { names: string[]; bounds: QuantifierExpression["bounds"] }) => {
|
|
249
|
+
if (body.bounds.some((bound) => bound.pattern.kind === "Tuple"))
|
|
250
|
+
throw new TlaProofError("Unexpected tuple declaration", { failure: STEP_TUPLY_FAILURE });
|
|
251
|
+
return body.names.length > 0 ? getUnbounded(body.names) : convertBounds(body.bounds, false);
|
|
252
|
+
};
|
|
253
|
+
|
|
236
254
|
const expandTuples = (expanded: Expr, location: Locus) => {
|
|
237
255
|
if (!isExpandingTuples)
|
|
238
256
|
throw new TlaProofError("Unexpected tuple declaration", { failure: TUPLY_FAILURE });
|
|
@@ -293,9 +311,18 @@ export const createSource = (
|
|
|
293
311
|
const args = expression.args.map(recurse);
|
|
294
312
|
const operator = lookupOperator(expression.operator);
|
|
295
313
|
if (operator.fixity !== "Nonfix") {
|
|
314
|
+
const operatorLocus = getPointLocus(expression.location, 1);
|
|
315
|
+
const first = args[0]?.location;
|
|
316
|
+
const isNonfix =
|
|
317
|
+
args.length === 2 &&
|
|
318
|
+
first !== undefined &&
|
|
319
|
+
(operatorLocus.startLine < first.startLine ||
|
|
320
|
+
(operatorLocus.startLine === first.startLine &&
|
|
321
|
+
operatorLocus.startColumn < first.startColumn));
|
|
322
|
+
const operands = getOperatorLocus(args, operator.fixity);
|
|
296
323
|
return at(
|
|
297
324
|
{ kind: "Apply", operator: convertOperator(expression.operator, undefined), args },
|
|
298
|
-
{ location:
|
|
325
|
+
{ location: isNonfix ? mergeLoci(operatorLocus, operands) : operands },
|
|
299
326
|
);
|
|
300
327
|
}
|
|
301
328
|
return convertName(expression.operator, args, location, expression.argumentCounts);
|
|
@@ -552,22 +579,14 @@ export const createSource = (
|
|
|
552
579
|
case "Always":
|
|
553
580
|
case "Eventually": {
|
|
554
581
|
const inner = expression.expression;
|
|
555
|
-
if (
|
|
556
|
-
|
|
557
|
-
|
|
558
|
-
|
|
559
|
-
modal: "Box",
|
|
560
|
-
action: recurse(inner.action),
|
|
561
|
-
subscript: recurse(inner.subscript),
|
|
562
|
-
},
|
|
563
|
-
{ location },
|
|
564
|
-
);
|
|
565
|
-
}
|
|
566
|
-
if (expression.kind === "Eventually" && inner.kind === "AngleAction") {
|
|
582
|
+
if (
|
|
583
|
+
(expression.kind === "Always" && inner.kind === "BoxAction") ||
|
|
584
|
+
(expression.kind === "Eventually" && inner.kind === "AngleAction")
|
|
585
|
+
) {
|
|
567
586
|
return at(
|
|
568
587
|
{
|
|
569
588
|
kind: "Tsub",
|
|
570
|
-
modal: "Dia",
|
|
589
|
+
modal: expression.kind === "Always" ? "Box" : "Dia",
|
|
571
590
|
action: recurse(inner.action),
|
|
572
591
|
subscript: recurse(inner.subscript),
|
|
573
592
|
},
|
|
@@ -588,22 +607,39 @@ export const createSource = (
|
|
|
588
607
|
{ location },
|
|
589
608
|
);
|
|
590
609
|
case "WeakFairness":
|
|
591
|
-
case "StrongFairness":
|
|
610
|
+
case "StrongFairness": {
|
|
611
|
+
// tlapm lexes WF_vars as WF_ and vars, both located at the whole word.
|
|
612
|
+
const isGlued = /\w/.test(lines[location.startLine - 1]?.[location.startColumn + 2] ?? "");
|
|
613
|
+
const moveGluedStart = (inner: Expr): Expr =>
|
|
614
|
+
isGlued &&
|
|
615
|
+
inner.location?.startLine === location.startLine &&
|
|
616
|
+
inner.location.startColumn === location.startColumn + 3
|
|
617
|
+
? mapChildren(
|
|
618
|
+
{ ...inner, location: { ...inner.location, startColumn: location.startColumn } },
|
|
619
|
+
moveGluedStart,
|
|
620
|
+
)
|
|
621
|
+
: inner;
|
|
592
622
|
return at(
|
|
593
623
|
{
|
|
594
624
|
kind: "Fair",
|
|
595
625
|
fairness: expression.kind === "WeakFairness" ? "Weak" : "Strong",
|
|
596
|
-
subscript: recurse(expression.subscript),
|
|
626
|
+
subscript: moveGluedStart(recurse(expression.subscript)),
|
|
597
627
|
action: recurse(expression.action),
|
|
598
628
|
},
|
|
599
629
|
{ location },
|
|
600
630
|
);
|
|
631
|
+
}
|
|
601
632
|
case "Label":
|
|
602
633
|
return at(
|
|
603
634
|
{
|
|
604
635
|
kind: "Parens",
|
|
605
636
|
expression: recurse(expression.body),
|
|
606
|
-
form: {
|
|
637
|
+
form: {
|
|
638
|
+
kind: "Nlabel",
|
|
639
|
+
label: expression.name,
|
|
640
|
+
names: expression.params,
|
|
641
|
+
location: expression.head && getRangeLocus(expression.head),
|
|
642
|
+
},
|
|
607
643
|
},
|
|
608
644
|
{ location },
|
|
609
645
|
);
|
|
@@ -648,11 +684,13 @@ export const createSource = (
|
|
|
648
684
|
|
|
649
685
|
const convertInstance = (instance: Instance): InstanceDefinition => ({
|
|
650
686
|
location: getRangeLocus(instance.definitionRange ?? instance.instanceRange),
|
|
687
|
+
instanceLocation: getRangeLocus(instance.instanceRange),
|
|
651
688
|
args: instance.params.map((param) => param.name),
|
|
652
689
|
module: instance.module,
|
|
653
690
|
substitutions: instance.substitutions.map((substitution) => ({
|
|
654
691
|
name: getCanonicalName(substitution.name),
|
|
655
692
|
expression: convertExpression(substitution.expression, false),
|
|
693
|
+
location: getRangeLocus(substitution.nameRange),
|
|
656
694
|
})),
|
|
657
695
|
});
|
|
658
696
|
|
|
@@ -672,20 +710,16 @@ export const createSource = (
|
|
|
672
710
|
? "-."
|
|
673
711
|
: getCanonicalName(definition.name);
|
|
674
712
|
const body = convertExpression(definition.body, isExcept);
|
|
675
|
-
if (definition.kind === "Function" && hasTuple(definition.bounds)) {
|
|
676
|
-
return {
|
|
677
|
-
kind: "Operator",
|
|
678
|
-
name,
|
|
679
|
-
body: expandTuples(expandFcn(getTuplyBounds(definition.bounds, isExcept), body), location),
|
|
680
|
-
location,
|
|
681
|
-
};
|
|
682
|
-
}
|
|
683
713
|
if (definition.kind === "Function") {
|
|
684
|
-
const bounds = convertBounds(definition.bounds, isExcept);
|
|
685
714
|
return {
|
|
686
715
|
kind: "Operator",
|
|
687
716
|
name,
|
|
688
|
-
body:
|
|
717
|
+
body: hasTuple(definition.bounds)
|
|
718
|
+
? expandTuples(expandFcn(getTuplyBounds(definition.bounds, isExcept), body), location)
|
|
719
|
+
: at(
|
|
720
|
+
{ kind: "Fcn", bounds: convertBounds(definition.bounds, isExcept), body },
|
|
721
|
+
{ location },
|
|
722
|
+
),
|
|
689
723
|
location,
|
|
690
724
|
};
|
|
691
725
|
}
|
|
@@ -707,7 +741,7 @@ export const createSource = (
|
|
|
707
741
|
{ location },
|
|
708
742
|
);
|
|
709
743
|
const end = definition.location.range?.end;
|
|
710
|
-
const methods = end && readNewMethod(lines, { line: end.line - 1, column: end.column });
|
|
744
|
+
const methods = end && readNewMethod(lines, { line: end.line - 1, column: end.column }, file);
|
|
711
745
|
return methods
|
|
712
746
|
? { kind: "Bpragma", name, body: operatorBody, methods, location }
|
|
713
747
|
: { kind: "Operator", name, body: operatorBody, location };
|
|
@@ -798,7 +832,11 @@ export const createSource = (
|
|
|
798
832
|
if (!proof) return { kind: "Omitted", omission: "Implicit", location: enclosing };
|
|
799
833
|
switch (proof.kind) {
|
|
800
834
|
case "Obvious":
|
|
801
|
-
return {
|
|
835
|
+
return {
|
|
836
|
+
kind: "Obvious",
|
|
837
|
+
...withMethod(proof.keyword),
|
|
838
|
+
isSuppressed: isSuppressed(proof.keyword),
|
|
839
|
+
};
|
|
802
840
|
case "Omitted":
|
|
803
841
|
return {
|
|
804
842
|
kind: "Omitted",
|
|
@@ -813,6 +851,7 @@ export const createSource = (
|
|
|
813
851
|
location: getRangeLocus(proof.keyword),
|
|
814
852
|
step: { kind: "Unnamed", level, id: 0 },
|
|
815
853
|
method: getMethod(proof.location.range),
|
|
854
|
+
isSuppressed: isSuppressed(proof.keyword),
|
|
816
855
|
};
|
|
817
856
|
case "Steps": {
|
|
818
857
|
const tokens = proof.steps.map((step) => STEP_PATTERN.exec(step.token));
|
|
@@ -854,6 +893,7 @@ export const createSource = (
|
|
|
854
893
|
...converted,
|
|
855
894
|
...withMethod(step.head),
|
|
856
895
|
step: number,
|
|
896
|
+
isSuppressed: isSuppressed(step.statement),
|
|
857
897
|
});
|
|
858
898
|
switch (body.kind) {
|
|
859
899
|
case "Use":
|
|
@@ -871,6 +911,7 @@ export const createSource = (
|
|
|
871
911
|
location,
|
|
872
912
|
step: number,
|
|
873
913
|
method: getMethod(body.location.range),
|
|
914
|
+
isSuppressed: isSuppressed(body.keyword),
|
|
874
915
|
}
|
|
875
916
|
: { kind: "Hide", usable, location, step: number };
|
|
876
917
|
}
|
|
@@ -889,19 +930,14 @@ export const createSource = (
|
|
|
889
930
|
expression: convertExpression(body.expression, false),
|
|
890
931
|
});
|
|
891
932
|
case "Take":
|
|
892
|
-
return withStepMethod({
|
|
893
|
-
kind: "Take",
|
|
894
|
-
bounds:
|
|
895
|
-
body.names.length > 0 ? getUnbounded(body.names) : convertBounds(body.bounds, false),
|
|
896
|
-
});
|
|
933
|
+
return withStepMethod({ kind: "Take", bounds: convertStepBounds(body) });
|
|
897
934
|
case "Witness":
|
|
898
935
|
return withStepMethod({
|
|
899
936
|
kind: "Witness",
|
|
900
937
|
expressions: body.expressions.map((expression) => convertExpression(expression, false)),
|
|
901
938
|
});
|
|
902
939
|
case "Pick": {
|
|
903
|
-
const bounds =
|
|
904
|
-
body.names.length > 0 ? getUnbounded(body.names) : convertBounds(body.bounds, false);
|
|
940
|
+
const bounds = convertStepBounds(body);
|
|
905
941
|
const expression = convertExpression(body.body, false);
|
|
906
942
|
return withProof((proof) => ({ kind: "Pick", bounds, expression, proof }));
|
|
907
943
|
}
|
|
@@ -938,7 +974,9 @@ export const createSource = (
|
|
|
938
974
|
name: getCanonicalName(declaration.name),
|
|
939
975
|
shape: declaration.arity,
|
|
940
976
|
})),
|
|
941
|
-
location: getLocus(
|
|
977
|
+
location: getLocus(
|
|
978
|
+
unit.kind === "Constants" ? unit.declarations[0].location : unit.location,
|
|
979
|
+
),
|
|
942
980
|
};
|
|
943
981
|
case "Variables":
|
|
944
982
|
return {
|
|
@@ -1005,18 +1043,24 @@ export const createSource = (
|
|
|
1005
1043
|
location,
|
|
1006
1044
|
};
|
|
1007
1045
|
}
|
|
1008
|
-
case "Use":
|
|
1046
|
+
case "Use": {
|
|
1047
|
+
// A module unit's locus takes in the suppress pragma that tlapm reads as its first tokens.
|
|
1048
|
+
const pragma = getSuppressPragma(unit.use.keyword);
|
|
1009
1049
|
return {
|
|
1010
1050
|
kind: "Mutate",
|
|
1011
1051
|
mode: unit.use.kind,
|
|
1012
1052
|
usable: convertUsable(unit.use),
|
|
1013
|
-
location:
|
|
1053
|
+
location: mergeLoci(
|
|
1054
|
+
pragma && getPointLocus({ line: pragma.line + 1, column: pragma.column + 1 }, 0),
|
|
1055
|
+
getUseLocus(unit.use),
|
|
1056
|
+
),
|
|
1014
1057
|
};
|
|
1058
|
+
}
|
|
1015
1059
|
case "Module":
|
|
1016
1060
|
return { kind: "Submod", module: { ...convertModule(unit.module), isImportant: true } };
|
|
1017
1061
|
}
|
|
1018
1062
|
}),
|
|
1019
1063
|
});
|
|
1020
1064
|
|
|
1021
|
-
return
|
|
1065
|
+
return convertModule;
|
|
1022
1066
|
};
|