tla-ts 0.0.10-dev.b4a856304 → 0.0.10-dev.c92e6a4ea
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +2 -1
- package/dist/compile.cjs +6 -6
- package/dist/compile.js +10 -10
- package/dist/deciders.cjs +41 -37
- package/dist/deciders.js +57 -53
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +37 -0
- package/dist/index.d.ts +37 -0
- package/dist/index.js +1 -1
- package/dist/parallel-worker.cjs +1 -1
- package/dist/parallel-worker.js +1 -1
- package/dist/prove.cjs +2683 -427
- package/dist/prove.js +2681 -425
- package/dist/run.cjs +45 -44
- package/dist/run.js +45 -44
- package/dist/tlapm.cjs +2 -2
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +44 -41
- package/dist/transfer.js +45 -42
- package/dist/worker.cjs +7 -7
- package/dist/worker.js +7 -7
- package/package.json +1 -1
- package/src/ast.ts +41 -41
- package/src/bags.ts +2 -5
- package/src/builtins.ts +5 -21
- package/src/check-failure.ts +116 -0
- package/src/check-trace.ts +268 -0
- package/src/check.ts +578 -757
- package/src/cli/options.ts +6 -31
- package/src/cli/run.ts +0 -2
- package/src/cli/runtime-invariants.ts +27 -62
- package/src/cli/shared.ts +1 -5
- package/src/cli/tlapm.ts +433 -70
- package/src/cli/tlc-arguments.ts +246 -240
- package/src/cli/tlc-output.ts +686 -0
- package/src/cli/tlc-usage.ts +3 -5
- package/src/cli/tlc.ts +59 -707
- package/src/cli/xml-exporter.ts +23 -33
- package/src/codegen.ts +5 -10
- package/src/coverage.ts +3 -10
- package/src/dependencies.ts +30 -14
- package/src/dfid.ts +16 -16
- package/src/environment-config.ts +315 -0
- package/src/environment.ts +73 -338
- package/src/errors.ts +33 -5
- package/src/evaluate.ts +34 -107
- package/src/exit-codes.ts +3 -0
- package/src/fingerprints.ts +65 -1
- package/src/instances.ts +47 -10
- package/src/java-hash.ts +7 -0
- package/src/java-overrides.ts +4 -9
- package/src/json-reader.ts +1 -2
- package/src/json.ts +8 -18
- package/src/levels.ts +46 -57
- package/src/lexer.ts +76 -85
- package/src/liveness-checker.ts +634 -306
- package/src/liveness.ts +104 -120
- package/src/obligations/action.ts +14 -17
- package/src/obligations/anonymize.ts +37 -16
- package/src/obligations/enabled-axioms.ts +218 -0
- package/src/obligations/equality.ts +1 -3
- package/src/obligations/expression.ts +36 -8
- package/src/obligations/format.ts +0 -2
- package/src/obligations/generate.ts +66 -54
- package/src/obligations/index.ts +38 -8
- package/src/obligations/levels.ts +24 -11
- package/src/obligations/module.ts +28 -41
- package/src/obligations/normalize.ts +26 -14
- package/src/obligations/operators.ts +0 -2
- package/src/obligations/pragma.ts +53 -16
- package/src/obligations/printer.ts +43 -13
- package/src/obligations/proof.ts +3 -2
- package/src/obligations/regroup.ts +0 -2
- package/src/obligations/simplify.ts +55 -50
- package/src/obligations/source.ts +118 -74
- package/src/obligations/subexpression.ts +45 -18
- package/src/obligations/substitution.ts +1 -3
- package/src/obligations/temporal.ts +5 -7
- package/src/obligations/tuples.ts +0 -2
- package/src/parallel-worker.ts +17 -31
- package/src/parallel.ts +55 -80
- package/src/parser.ts +722 -385
- package/src/pcal/ast.ts +53 -65
- package/src/pcal/parse.ts +144 -191
- package/src/pcal/tokenize.ts +91 -115
- package/src/pcal/translate.ts +83 -98
- package/src/pcal/validate.ts +48 -50
- package/src/pretty-print.ts +7 -7
- package/src/prover/decide-pool.ts +3 -3
- package/src/prover/deciders.ts +12 -9
- package/src/prover/isabelle/decide.ts +3 -25
- package/src/prover/isabelle/encode.ts +72 -42
- package/src/prover/isabelle/isar/attrib.ts +250 -0
- package/src/prover/isabelle/isar/context.ts +335 -0
- package/src/prover/isabelle/isar/induct.ts +382 -0
- package/src/prover/isabelle/isar/inner-syntax.ts +158 -7
- package/src/prover/isabelle/isar/method.ts +509 -212
- package/src/prover/isabelle/isar/proof.ts +570 -14
- package/src/prover/isabelle/isar/rule-cases.ts +224 -0
- package/src/prover/isabelle/isar/theory.ts +487 -76
- package/src/prover/isabelle/isar/toplevel.ts +331 -0
- package/src/prover/isabelle/isar/type-check.ts +89 -14
- package/src/prover/isabelle/provers/blast/blast.ts +7 -65
- package/src/prover/isabelle/provers/blast/branch.ts +0 -2
- package/src/prover/isabelle/provers/blast/prove.ts +0 -2
- package/src/prover/isabelle/provers/blast/rules.ts +0 -2
- package/src/prover/isabelle/provers/blast/state.ts +0 -2
- package/src/prover/isabelle/provers/blast/term.ts +0 -2
- package/src/prover/isabelle/provers/clasimp.ts +0 -2
- package/src/prover/isabelle/provers/classical.ts +45 -20
- package/src/prover/isabelle/provers/hypsubst.ts +17 -28
- package/src/prover/isabelle/pure/bicompose.ts +9 -27
- package/src/prover/isabelle/pure/consts.ts +0 -2
- package/src/prover/isabelle/pure/conv.ts +2 -10
- package/src/prover/isabelle/pure/drule.ts +72 -6
- package/src/prover/isabelle/pure/envir.ts +0 -2
- package/src/prover/isabelle/pure/goal.ts +1 -3
- package/src/prover/isabelle/pure/logic.ts +1 -3
- package/src/prover/isabelle/pure/name.ts +0 -2
- package/src/prover/isabelle/pure/net.ts +0 -2
- package/src/prover/isabelle/pure/object-logic.ts +13 -7
- package/src/prover/isabelle/pure/pattern.ts +0 -2
- package/src/prover/isabelle/pure/raw-simplifier.ts +4 -15
- package/src/prover/isabelle/pure/rewriter.ts +6 -17
- package/src/prover/isabelle/pure/search.ts +0 -2
- package/src/prover/isabelle/pure/seq.ts +0 -2
- package/src/prover/isabelle/pure/simplifier.ts +26 -7
- package/src/prover/isabelle/pure/table.ts +2 -3
- package/src/prover/isabelle/pure/tactic.ts +0 -2
- package/src/prover/isabelle/pure/tactical.ts +42 -37
- package/src/prover/isabelle/pure/term-ord.ts +0 -2
- package/src/prover/isabelle/pure/term.ts +0 -2
- package/src/prover/isabelle/pure/thm.ts +14 -13
- package/src/prover/isabelle/pure/type.ts +0 -2
- package/src/prover/isabelle/pure/unify.ts +0 -2
- package/src/prover/isabelle/pure/variable.ts +0 -2
- package/src/prover/isabelle/tla/classical-setup.ts +18 -16
- package/src/prover/isabelle/tla/context.ts +58 -11
- package/src/prover/isabelle/tla/logic-data.ts +1 -1
- package/src/prover/isabelle/tla/logic.ts +49 -21
- package/src/prover/isabelle/tla/simpdata.ts +1 -12
- package/src/prover/isabelle/tools/intuitionistic.ts +28 -12
- package/src/prover/ocaml.ts +4 -1
- package/src/prover/prep/action.ts +30 -31
- package/src/prover/prep/enabled-axioms.ts +11 -2
- package/src/prover/prep/fingerprint.ts +2 -5
- package/src/prover/prep/methods.ts +181 -51
- package/src/prover/prep/normalize.ts +38 -9
- package/src/prover/prove.ts +395 -94
- package/src/prover/ptl/decide.ts +95 -50
- package/src/prover/ptl/encode.ts +2 -3
- package/src/prover/ptl/tableau.ts +28 -2
- package/src/prover/smt/arithmetic.ts +310 -0
- package/src/prover/smt/axioms.ts +12 -8
- package/src/prover/smt/context.ts +43 -8
- package/src/prover/smt/data.ts +498 -379
- package/src/prover/smt/encode.ts +148 -57
- package/src/prover/smt/extensionality.ts +5 -3
- package/src/prover/smt/flatten.ts +4 -6
- package/src/prover/smt/format.ts +28 -4
- package/src/prover/smt/instances.ts +7 -1
- package/src/prover/smt/layout.ts +91 -0
- package/src/prover/smt/rewrite.ts +1021 -618
- package/src/prover/smt/simplify.ts +441 -0
- package/src/prover/smt/solver/ackermannize-bv-tactic.ts +61 -0
- package/src/prover/smt/solver/ackr-helper.ts +179 -0
- package/src/prover/smt/solver/ackr-model-converter.ts +105 -0
- package/src/prover/smt/solver/act-cache.ts +0 -1
- package/src/prover/smt/solver/add-bounds-tactic.ts +59 -0
- package/src/prover/smt/solver/aig-tactic.ts +52 -0
- package/src/prover/smt/solver/aig.ts +889 -0
- package/src/prover/smt/solver/arith-rewriter.ts +613 -6
- package/src/prover/smt/solver/arith-terms.ts +121 -0
- package/src/prover/smt/solver/array-decl-plugin.ts +175 -0
- package/src/prover/smt/solver/array-rewriter.ts +309 -0
- package/src/prover/smt/solver/asserted-formulas.ts +87 -16
- package/src/prover/smt/solver/ast-lt.ts +166 -12
- package/src/prover/smt/solver/ast-util.ts +160 -2
- package/src/prover/smt/solver/ast.ts +1427 -41
- package/src/prover/smt/solver/auf-solver.ts +2 -6
- package/src/prover/smt/solver/bit-blast-tactic.ts +582 -0
- package/src/prover/smt/solver/bit-blaster.ts +871 -0
- package/src/prover/smt/solver/bound-manager.ts +196 -0
- package/src/prover/smt/solver/bound-simplifier.ts +600 -0
- package/src/prover/smt/solver/bv-bound-chk.ts +492 -0
- package/src/prover/smt/solver/bv-decl-plugin.ts +338 -0
- package/src/prover/smt/solver/bv-divrem-bounds.ts +95 -0
- package/src/prover/smt/solver/bv-rewriter.ts +1901 -0
- package/src/prover/smt/solver/bv1-blast.ts +214 -0
- package/src/prover/smt/solver/bv2fpa-converter.ts +174 -0
- package/src/prover/smt/solver/bv2int-rewriter.ts +544 -0
- package/src/prover/smt/solver/bv2real-rewriter.ts +533 -0
- package/src/prover/smt/solver/card2bv.ts +110 -0
- package/src/prover/smt/solver/case-split-queue.ts +0 -2
- package/src/prover/smt/solver/cg-table.ts +39 -25
- package/src/prover/smt/solver/check-logic.ts +330 -0
- package/src/prover/smt/solver/clause.ts +0 -1
- package/src/prover/smt/solver/cofactor-elim-term-ite.ts +278 -0
- package/src/prover/smt/solver/conflict-resolution.ts +78 -2
- package/src/prover/smt/solver/context.ts +516 -115
- package/src/prover/smt/solver/ctx-simplify.ts +20 -10
- package/src/prover/smt/solver/ctx-solver-simplify.ts +122 -0
- package/src/prover/smt/solver/datatype-decl-plugin.ts +572 -0
- package/src/prover/smt/solver/datatype-rewriter.ts +82 -0
- package/src/prover/smt/solver/demodulator.ts +786 -0
- package/src/prover/smt/solver/dependent-expr-state.ts +81 -0
- package/src/prover/smt/solver/der.ts +38 -10
- package/src/prover/smt/solver/diff-neq.ts +206 -0
- package/src/prover/smt/solver/distribute-forall.ts +57 -0
- package/src/prover/smt/solver/dom-simplify.ts +511 -0
- package/src/prover/smt/solver/dt2bv-tactic.ts +260 -0
- package/src/prover/smt/solver/dyn-ack.ts +0 -1
- package/src/prover/smt/solver/e-matching.ts +7 -8
- package/src/prover/smt/solver/elim-small-bv-tactic.ts +129 -0
- package/src/prover/smt/solver/elim-uncnstr.ts +545 -0
- package/src/prover/smt/solver/enode.ts +100 -3
- package/src/prover/smt/solver/eq2bv-tactic.ts +218 -0
- package/src/prover/smt/solver/euf/arith-axioms.ts +403 -0
- package/src/prover/smt/solver/euf/arith-internalize.ts +653 -0
- package/src/prover/smt/solver/euf/arith-solver.ts +889 -0
- package/src/prover/smt/solver/euf/array-axioms.ts +527 -0
- package/src/prover/smt/solver/euf/array-internalize.ts +428 -0
- package/src/prover/smt/solver/euf/array-solver.ts +306 -0
- package/src/prover/smt/solver/euf/bv-ackerman.ts +162 -0
- package/src/prover/smt/solver/euf/bv-internalize.ts +748 -0
- package/src/prover/smt/solver/euf/bv-solver.ts +449 -0
- package/src/prover/smt/solver/euf/dt-solver.ts +618 -0
- package/src/prover/smt/solver/euf/egraph.ts +908 -0
- package/src/prover/smt/solver/euf/euf-solver.ts +1205 -0
- package/src/prover/smt/solver/euf/fpa-solver.ts +317 -0
- package/src/prover/smt/solver/euf/mam.ts +1050 -0
- package/src/prover/smt/solver/euf/q-ematch.ts +830 -0
- package/src/prover/smt/solver/euf/q-mbi.ts +587 -0
- package/src/prover/smt/solver/euf/q-model-fixer.ts +296 -0
- package/src/prover/smt/solver/euf/q-solver.ts +361 -0
- package/src/prover/smt/solver/euf/th-solver.ts +335 -0
- package/src/prover/smt/solver/euf/th-solvers.ts +30 -0
- package/src/prover/smt/solver/expr-ref.ts +0 -1
- package/src/prover/smt/solver/expr-safe-replace.ts +26 -2
- package/src/prover/smt/solver/expr2polynomial.ts +146 -0
- package/src/prover/smt/solver/factor.ts +141 -0
- package/src/prover/smt/solver/fd-solver.ts +265 -0
- package/src/prover/smt/solver/fingerprints.ts +15 -15
- package/src/prover/smt/solver/fix-dl-var.ts +148 -0
- package/src/prover/smt/solver/flat-literals.ts +0 -1
- package/src/prover/smt/solver/fm-tactic.ts +884 -0
- package/src/prover/smt/solver/fpa-decl-plugin.ts +618 -0
- package/src/prover/smt/solver/fpa-rewriter.ts +640 -0
- package/src/prover/smt/solver/fpa2bv-converter.ts +2249 -0
- package/src/prover/smt/solver/fpa2bv-rewriter.ts +348 -0
- package/src/prover/smt/solver/fpa2bv-tactic.ts +73 -0
- package/src/prover/smt/solver/goal.ts +175 -15
- package/src/prover/smt/solver/goal2nlsat.ts +189 -0
- package/src/prover/smt/solver/guard-set.ts +219 -0
- package/src/prover/smt/solver/hash.ts +0 -1
- package/src/prover/smt/solver/hashtable.ts +30 -16
- package/src/prover/smt/solver/inf-eps.ts +63 -0
- package/src/prover/smt/solver/inj-axiom.ts +101 -0
- package/src/prover/smt/solver/internalizer.ts +110 -38
- package/src/prover/smt/solver/lackr.ts +381 -0
- package/src/prover/smt/solver/lbool.ts +0 -1
- package/src/prover/smt/solver/lia2card.ts +268 -0
- package/src/prover/smt/solver/lia2pb.ts +154 -0
- package/src/prover/smt/solver/literal.ts +0 -1
- package/src/prover/smt/solver/logic-tactics.ts +345 -0
- package/src/prover/smt/solver/lp/bound-propagator.ts +0 -1
- package/src/prover/smt/solver/lp/constraints.ts +0 -1
- package/src/prover/smt/solver/lp/containers.ts +7 -2
- package/src/prover/smt/solver/lp/core-solver.ts +18 -3
- package/src/prover/smt/solver/lp/cross-nested.ts +1 -4
- package/src/prover/smt/solver/lp/dep-intervals.ts +0 -3
- package/src/prover/smt/solver/lp/dependency.ts +0 -2
- package/src/prover/smt/solver/lp/dioph-eq.ts +1 -10
- package/src/prover/smt/solver/lp/explanation.ts +0 -1
- package/src/prover/smt/solver/lp/gomory.ts +0 -1
- package/src/prover/smt/solver/lp/hnf-cutter.ts +1 -2
- package/src/prover/smt/solver/lp/hnf.ts +0 -3
- package/src/prover/smt/solver/lp/int-cube.ts +3 -4
- package/src/prover/smt/solver/lp/int-solver.ts +0 -2
- package/src/prover/smt/solver/lp/lar-solver.ts +40 -4
- package/src/prover/smt/solver/lp/lar-term.ts +0 -1
- package/src/prover/smt/solver/lp/lp-settings.ts +0 -1
- package/src/prover/smt/solver/lp/maximize-term.ts +59 -10
- package/src/prover/smt/solver/lp/nex-creator.ts +3 -3
- package/src/prover/smt/solver/lp/nex.ts +2 -2
- package/src/prover/smt/solver/lp/nla-backoff.ts +0 -2
- package/src/prover/smt/solver/lp/nla-basics.ts +46 -3
- package/src/prover/smt/solver/lp/nla-core.ts +67 -16
- package/src/prover/smt/solver/lp/nla-divisions.ts +0 -2
- package/src/prover/smt/solver/lp/nla-emonics.ts +0 -1
- package/src/prover/smt/solver/lp/nla-factorization.ts +0 -1
- package/src/prover/smt/solver/lp/nla-grobner.ts +165 -83
- package/src/prover/smt/solver/lp/nla-horner.ts +0 -2
- package/src/prover/smt/solver/lp/nla-intervals.ts +0 -1
- package/src/prover/smt/solver/lp/nla-monomial-bounds.ts +0 -2
- package/src/prover/smt/solver/lp/nla-monotone.ts +0 -1
- package/src/prover/smt/solver/lp/nla-order.ts +0 -2
- package/src/prover/smt/solver/lp/nla-patcher.ts +0 -1
- package/src/prover/smt/solver/lp/nla-powers.ts +220 -0
- package/src/prover/smt/solver/lp/nla-tangents.ts +0 -2
- package/src/prover/smt/solver/lp/nla-throttle.ts +0 -1
- package/src/prover/smt/solver/lp/nla-transcendentals.ts +324 -0
- package/src/prover/smt/solver/lp/nla-types.ts +0 -2
- package/src/prover/smt/solver/lp/nla-var-eqs.ts +0 -1
- package/src/prover/smt/solver/lp/nra-solver.ts +122 -64
- package/src/prover/smt/solver/lp/numeric-pair.ts +0 -1
- package/src/prover/smt/solver/lp/pdd-interval.ts +6 -3
- package/src/prover/smt/solver/lp/pdd-simplifier.ts +60 -21
- package/src/prover/smt/solver/lp/pdd-solver.ts +72 -41
- package/src/prover/smt/solver/lp/pdd.ts +725 -289
- package/src/prover/smt/solver/lp/random-updater.ts +0 -2
- package/src/prover/smt/solver/lp/static-matrix.ts +0 -1
- package/src/prover/smt/solver/lp/union-find.ts +7 -2
- package/src/prover/smt/solver/macro-finder.ts +530 -0
- package/src/prover/smt/solver/mam-compiler.ts +122 -90
- package/src/prover/smt/solver/mam-interpreter.ts +0 -1
- package/src/prover/smt/solver/max-bv-sharing-tactic.ts +17 -0
- package/src/prover/smt/solver/max-cliques.ts +105 -0
- package/src/prover/smt/solver/maxcore.ts +309 -0
- package/src/prover/smt/solver/maximize-ac-sharing.ts +8 -6
- package/src/prover/smt/solver/maxlex.ts +115 -0
- package/src/prover/smt/solver/maxsmt-base.ts +105 -0
- package/src/prover/smt/solver/maxsmt.ts +92 -0
- package/src/prover/smt/solver/mbp/mbp-arith.ts +467 -0
- package/src/prover/smt/solver/mbp/mbp-basic-tg.ts +101 -0
- package/src/prover/smt/solver/mbp/mbp-plugin.ts +287 -0
- package/src/prover/smt/solver/mbp/mbp-qel.ts +48 -0
- package/src/prover/smt/solver/mbp/mbp-solve-plugin.ts +271 -0
- package/src/prover/smt/solver/mbp/mbp-term-graph.ts +606 -0
- package/src/prover/smt/solver/model-based-opt.ts +844 -0
- package/src/prover/smt/solver/model-checker.ts +18 -27
- package/src/prover/smt/solver/model-evaluator.ts +188 -12
- package/src/prover/smt/solver/model-finder.ts +12 -18
- package/src/prover/smt/solver/model-generator.ts +56 -29
- package/src/prover/smt/solver/model-macro-solver.ts +49 -46
- package/src/prover/smt/solver/model-printer.ts +214 -0
- package/src/prover/smt/solver/mpf.ts +711 -0
- package/src/prover/smt/solver/mus.ts +51 -0
- package/src/prover/smt/solver/muz/dl-context.ts +404 -0
- package/src/prover/smt/solver/muz/dl-mk-bit-blast.ts +97 -0
- package/src/prover/smt/solver/muz/dl-mk-coi-filter.ts +167 -0
- package/src/prover/smt/solver/muz/dl-mk-elim-term-ite.ts +125 -0
- package/src/prover/smt/solver/muz/dl-mk-interp-tail-simplifier.ts +299 -0
- package/src/prover/smt/solver/muz/dl-mk-rule-inliner.ts +455 -0
- package/src/prover/smt/solver/muz/dl-mk-slice.ts +340 -0
- package/src/prover/smt/solver/muz/dl-mk-subsumption-checker.ts +163 -0
- package/src/prover/smt/solver/muz/dl-rule-set.ts +273 -0
- package/src/prover/smt/solver/muz/dl-rule-transformer.ts +123 -0
- package/src/prover/smt/solver/muz/dl-rule.ts +496 -0
- package/src/prover/smt/solver/muz/hnf.ts +201 -0
- package/src/prover/smt/solver/muz/horn-subsume-model-converter.ts +176 -0
- package/src/prover/smt/solver/muz/horn-tactic.ts +201 -0
- package/src/prover/smt/solver/muz/rule-properties.ts +337 -0
- package/src/prover/smt/solver/muz/spacer-context.ts +1406 -0
- package/src/prover/smt/solver/muz/spacer-dl-interface.ts +52 -0
- package/src/prover/smt/solver/muz/spacer-generalizers.ts +241 -0
- package/src/prover/smt/solver/muz/spacer-manager.ts +127 -0
- package/src/prover/smt/solver/muz/spacer-pdr.ts +218 -0
- package/src/prover/smt/solver/muz/spacer-prop-solver.ts +333 -0
- package/src/prover/smt/solver/muz/spacer-util.ts +282 -0
- package/src/prover/smt/solver/muz/substitution.ts +203 -0
- package/src/prover/smt/solver/nla2bv-tactic.ts +285 -0
- package/src/prover/smt/solver/nlqsat.ts +484 -0
- package/src/prover/smt/solver/nlsat/algebraic.ts +125 -12
- package/src/prover/smt/solver/nlsat/atoms.ts +20 -6
- package/src/prover/smt/solver/nlsat/evaluator.ts +0 -1
- package/src/prover/smt/solver/nlsat/explain.ts +63 -23
- package/src/prover/smt/solver/nlsat/interval-set.ts +1 -2
- package/src/prover/smt/solver/nlsat/levelwise.ts +3 -9
- package/src/prover/smt/solver/nlsat/mpbq.ts +45 -1
- package/src/prover/smt/solver/nlsat/polynomial.ts +13 -6
- package/src/prover/smt/solver/nlsat/solver.ts +236 -45
- package/src/prover/smt/solver/nlsat/transcendental-eval.ts +310 -0
- package/src/prover/smt/solver/nlsat/transcendentals.ts +367 -0
- package/src/prover/smt/solver/nlsat/types.ts +0 -2
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +1 -4
- package/src/prover/smt/solver/nlsat/upolynomial.ts +0 -2
- package/src/prover/smt/solver/nlsat-tactic.ts +82 -0
- package/src/prover/smt/solver/nnf.ts +105 -23
- package/src/prover/smt/solver/normalize-bounds.ts +53 -0
- package/src/prover/smt/solver/occf.ts +97 -0
- package/src/prover/smt/solver/opt-context.ts +787 -0
- package/src/prover/smt/solver/opt-nlsat.ts +375 -0
- package/src/prover/smt/solver/opt-pareto.ts +282 -0
- package/src/prover/smt/solver/opt-preprocess.ts +101 -0
- package/src/prover/smt/solver/opt-solver.ts +308 -0
- package/src/prover/smt/solver/opt-value.ts +55 -0
- package/src/prover/smt/solver/optsmt.ts +692 -0
- package/src/prover/smt/solver/parallel-tactic.ts +299 -0
- package/src/prover/smt/solver/pattern-inference.ts +19 -11
- package/src/prover/smt/solver/pb-rewriter.ts +284 -0
- package/src/prover/smt/solver/pb2bv-tactic.ts +540 -0
- package/src/prover/smt/solver/poly-rewriter.ts +202 -57
- package/src/prover/smt/solver/probes.ts +512 -0
- package/src/prover/smt/solver/propagate-values.ts +37 -21
- package/src/prover/smt/solver/proto-model.ts +648 -19
- package/src/prover/smt/solver/pull-quant.ts +28 -12
- package/src/prover/smt/solver/purify-arith.ts +632 -0
- package/src/prover/smt/solver/qe-arith-plugin.ts +1098 -0
- package/src/prover/smt/solver/qe-lite-der.ts +2 -3
- package/src/prover/smt/solver/qe-lite-fm.ts +3 -4
- package/src/prover/smt/solver/qe-lite.ts +37 -17
- package/src/prover/smt/solver/qe-mbp.ts +270 -0
- package/src/prover/smt/solver/qe.ts +1498 -0
- package/src/prover/smt/solver/qel.ts +25 -0
- package/src/prover/smt/solver/qi-queue.ts +0 -1
- package/src/prover/smt/solver/qsat.ts +814 -0
- package/src/prover/smt/solver/quant-hoist.ts +196 -0
- package/src/prover/smt/solver/quant-tactics.ts +16 -56
- package/src/prover/smt/solver/quantifier-analyzer.ts +19 -20
- package/src/prover/smt/solver/quantifier-manager.ts +8 -16
- package/src/prover/smt/solver/quasi-macros.ts +243 -0
- package/src/prover/smt/solver/random-gen.ts +0 -1
- package/src/prover/smt/solver/rational.ts +45 -1
- package/src/prover/smt/solver/recfun-decl-plugin.ts +261 -0
- package/src/prover/smt/solver/recfun-rewriter.ts +107 -0
- package/src/prover/smt/solver/reduce-args.ts +225 -0
- package/src/prover/smt/solver/reduce-bv-size.ts +119 -0
- package/src/prover/smt/solver/ref-vector.ts +0 -1
- package/src/prover/smt/solver/relevancy.ts +1 -2
- package/src/prover/smt/solver/rewriter-tpl.ts +77 -10
- package/src/prover/smt/solver/rewriter.ts +475 -36
- package/src/prover/smt/solver/rlimit.ts +38 -2
- package/src/prover/smt/solver/sat/asymm-branch.ts +325 -0
- package/src/prover/smt/solver/sat/big.ts +177 -0
- package/src/prover/smt/solver/sat/clause-use-list.ts +71 -0
- package/src/prover/smt/solver/sat/clause.ts +203 -0
- package/src/prover/smt/solver/sat/cleaner.ts +94 -0
- package/src/prover/smt/solver/sat/config.ts +122 -0
- package/src/prover/smt/solver/sat/consequences.ts +203 -0
- package/src/prover/smt/solver/sat/elim-eqs.ts +142 -0
- package/src/prover/smt/solver/sat/goal2sat.ts +526 -0
- package/src/prover/smt/solver/sat/inc-sat-solver.ts +378 -0
- package/src/prover/smt/solver/sat/model-converter.ts +136 -0
- package/src/prover/smt/solver/sat/pb-constraint.ts +261 -0
- package/src/prover/smt/solver/sat/pb-solver.ts +1577 -0
- package/src/prover/smt/solver/sat/probing.ts +170 -0
- package/src/prover/smt/solver/sat/sat-tactic.ts +43 -0
- package/src/prover/smt/solver/sat/sat2goal.ts +165 -0
- package/src/prover/smt/solver/sat/scc.ts +142 -0
- package/src/prover/smt/solver/sat/simplifier.ts +1618 -0
- package/src/prover/smt/solver/sat/solver.ts +2127 -0
- package/src/prover/smt/solver/sat/var-queue.ts +117 -0
- package/src/prover/smt/solver/sat/watch-list.ts +140 -0
- package/src/prover/smt/solver/search-tree.ts +284 -0
- package/src/prover/smt/solver/seq-axioms.ts +1010 -0
- package/src/prover/smt/solver/seq-decl-plugin.ts +819 -0
- package/src/prover/smt/solver/seq-derive.ts +1298 -0
- package/src/prover/smt/solver/seq-eq-approx.ts +236 -0
- package/src/prover/smt/solver/seq-eq-solver.ts +439 -0
- package/src/prover/smt/solver/seq-factory.ts +89 -0
- package/src/prover/smt/solver/seq-monadic.ts +728 -0
- package/src/prover/smt/solver/seq-range-predicate.ts +235 -0
- package/src/prover/smt/solver/seq-re-rewriter.ts +1170 -0
- package/src/prover/smt/solver/seq-re-util.ts +758 -0
- package/src/prover/smt/solver/seq-regex-bisim.ts +144 -0
- package/src/prover/smt/solver/seq-regex-live.ts +200 -0
- package/src/prover/smt/solver/seq-rewriter.ts +2402 -0
- package/src/prover/smt/solver/seq-skolem.ts +317 -0
- package/src/prover/smt/solver/seq-subset.ts +165 -0
- package/src/prover/smt/solver/seq-view-witness.ts +353 -0
- package/src/prover/smt/solver/smt-consequences.ts +297 -0
- package/src/prover/smt/solver/smt-kernel.ts +83 -0
- package/src/prover/smt/solver/smt-logics.ts +66 -0
- package/src/prover/smt/solver/smt-setup.ts +496 -0
- package/src/prover/smt/solver/smt2-printer.ts +765 -0
- package/src/prover/smt/solver/smtlib-parser.ts +3126 -316
- package/src/prover/smt/solver/smtlib-script.ts +1631 -0
- package/src/prover/smt/solver/solve-eqs.ts +929 -0
- package/src/prover/smt/solver/solver.ts +113 -22
- package/src/prover/smt/solver/static-features.ts +314 -0
- package/src/prover/smt/solver/sticky-generations.ts +0 -1
- package/src/prover/smt/solver/tactic.ts +1986 -0
- package/src/prover/smt/solver/term-enumeration.ts +205 -0
- package/src/prover/smt/solver/theory-array.ts +1240 -0
- package/src/prover/smt/solver/theory-bv.ts +1200 -0
- package/src/prover/smt/solver/theory-char.ts +355 -0
- package/src/prover/smt/solver/theory-datatype.ts +598 -0
- package/src/prover/smt/solver/theory-finite-set.ts +30 -0
- package/src/prover/smt/solver/theory-fpa.ts +389 -0
- package/src/prover/smt/solver/theory-lra-axioms.ts +53 -2
- package/src/prover/smt/solver/theory-lra-bounds.ts +31 -6
- package/src/prover/smt/solver/theory-lra-final-check.ts +56 -70
- package/src/prover/smt/solver/theory-lra-internalize.ts +94 -27
- package/src/prover/smt/solver/theory-lra-model.ts +20 -35
- package/src/prover/smt/solver/theory-lra-propagate.ts +24 -26
- package/src/prover/smt/solver/theory-lra-state.ts +6 -22
- package/src/prover/smt/solver/theory-lra.ts +188 -1
- package/src/prover/smt/solver/theory-pb.ts +934 -0
- package/src/prover/smt/solver/theory-polymorphism.ts +58 -0
- package/src/prover/smt/solver/theory-recfun.ts +307 -0
- package/src/prover/smt/solver/theory-seq-regex.ts +867 -0
- package/src/prover/smt/solver/theory-seq-solve.ts +1373 -0
- package/src/prover/smt/solver/theory-seq-state.ts +871 -0
- package/src/prover/smt/solver/theory-seq.ts +961 -0
- package/src/prover/smt/solver/theory.ts +189 -0
- package/src/prover/smt/solver/tseitin-cnf.ts +485 -0
- package/src/prover/smt/solver/var-subst.ts +36 -14
- package/src/prover/smt/table.ts +3 -2
- package/src/prover/smt/types.ts +146 -0
- package/src/prover/tlapm/cache.ts +50 -19
- package/src/prover/tlapm/tlapm.ts +15 -9
- package/src/prover/tlapm-library.ts +3208 -0
- package/src/prover/verdict.ts +9 -0
- package/src/prover/zenon/check/check.ts +1 -2
- package/src/prover/zenon/check/records.ts +1 -1
- package/src/prover/zenon/check/relations.ts +2 -1
- package/src/prover/zenon/check/rewrites.ts +2 -15
- package/src/prover/zenon/check/sets.ts +40 -58
- package/src/prover/zenon/check/terms.ts +1 -2
- package/src/prover/zenon/decide.ts +10 -7
- package/src/prover/zenon/encode.ts +0 -2
- package/src/prover/zenon/eqrel.ts +2 -2
- package/src/prover/zenon/equality-rules.ts +24 -2
- package/src/prover/zenon/expr.ts +28 -2
- package/src/prover/zenon/index-table.ts +11 -21
- package/src/prover/zenon/isar-case.ts +0 -2
- package/src/prover/zenon/isar.ts +35 -37
- package/src/prover/zenon/llproof.ts +2 -13
- package/src/prover/zenon/mltoll.ts +12 -30
- package/src/prover/zenon/node.ts +20 -5
- package/src/prover/zenon/parse.ts +9 -8
- package/src/prover/zenon/phrase.ts +0 -2
- package/src/prover/zenon/proof.ts +0 -2
- package/src/prover/zenon/propositional-rules.ts +0 -2
- package/src/prover/zenon/rules.ts +2 -3
- package/src/prover/zenon/search.ts +11 -19
- package/src/prover/zenon/tla/functions.ts +2 -4
- package/src/prover/zenon/tla/llproof.ts +9 -13
- package/src/prover/zenon/tla/records.ts +1 -8
- package/src/prover/zenon/tla/rewrites.ts +0 -2
- package/src/prover/zenon/tla/sets.ts +22 -22
- package/src/prover/zenon/tla/terms.ts +0 -2
- package/src/prover/zenon/tla/tla.ts +7 -8
- package/src/randomization.ts +1 -4
- package/src/resolve.ts +67 -143
- package/src/runtime.ts +17 -18
- package/src/sany/builtins.ts +1 -3
- package/src/sany/generation.ts +394 -0
- package/src/sany/generator-def-entries.ts +210 -0
- package/src/sany/generator-definitions.ts +686 -0
- package/src/sany/generator-expressions.ts +1100 -0
- package/src/sany/generator-proofs.ts +662 -0
- package/src/sany/generator.ts +160 -2683
- package/src/sany/levels.ts +5 -11
- package/src/sany/lexer.ts +57 -60
- package/src/sany/linter.ts +0 -3
- package/src/sany/nodes.ts +6 -13
- package/src/sany/report.ts +3 -6
- package/src/sany/selectors.ts +35 -38
- package/src/sany/xml.ts +23 -55
- package/src/search.ts +244 -53
- package/src/simulate.ts +202 -184
- package/src/spec-description.ts +56 -82
- package/src/standard-definitions.ts +4 -3
- package/src/standard-modules.ts +17 -44
- package/src/state-graph.ts +3 -17
- package/src/subexpressions.ts +38 -47
- package/src/substitution-levels.ts +5 -4
- package/src/successors.ts +20 -43
- package/src/symmetry.ts +6 -21
- package/src/tableau.ts +2 -2
- package/src/tlc/fingerprint.ts +96 -30
- package/src/tlc/jar-data.ts +0 -1
- package/src/tlc/messages.ts +22 -36
- package/src/tlc/order.ts +36 -50
- package/src/tlc/random.ts +22 -34
- package/src/tlc/replay.ts +21 -48
- package/src/tlc/summary.ts +64 -58
- package/src/tlc/tlc-operators.ts +6 -17
- package/src/tlc/tlcext-operators.ts +70 -29
- package/src/tlc/trace-spec.ts +26 -51
- package/src/tlc/value-stream.ts +9 -13
- package/src/tlc/version.ts +0 -1
- package/src/typed-tier.ts +6535 -0
- package/src/typescript/actions.ts +2 -4
- package/src/typescript/collections.ts +34 -20
- package/src/typescript/compile.ts +1 -3
- package/src/typescript/formula.ts +5 -3
- package/src/typescript/model.ts +4 -5
- package/src/typescript/steps.ts +20 -18
- package/src/values.ts +136 -338
- package/src/prover/isabelle/isar/statement.ts +0 -52
- package/src/prover/smt/solver/z3-license.txt +0 -10
- package/src/prover/tlaps-module.ts +0 -510
- package/src/prover/zenon/LICENSE +0 -32
|
@@ -1,4 +1,7 @@
|
|
|
1
|
-
//
|
|
1
|
+
// tlapm's method pragmas: the new (*{ by (prover:"zenon"; timeout:@) }*) after a definition, which
|
|
2
|
+
// E_parser.read_new_method reads, and the old (*{ by (zenon) }*) of Method_prs.
|
|
3
|
+
|
|
4
|
+
import type { Locus } from "./expression";
|
|
2
5
|
|
|
3
6
|
type PragmaValue =
|
|
4
7
|
| { kind: "Default" }
|
|
@@ -8,6 +11,7 @@ type PragmaValue =
|
|
|
8
11
|
export interface PragmaSetting {
|
|
9
12
|
hint: string;
|
|
10
13
|
value: PragmaValue;
|
|
14
|
+
location: Locus;
|
|
11
15
|
}
|
|
12
16
|
|
|
13
17
|
interface Position {
|
|
@@ -15,11 +19,12 @@ interface Position {
|
|
|
15
19
|
column: number;
|
|
16
20
|
}
|
|
17
21
|
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
22
|
+
interface Token {
|
|
23
|
+
kind: "Ident" | "String" | "Number" | "Punct";
|
|
24
|
+
text: string;
|
|
25
|
+
start: Position;
|
|
26
|
+
length: number;
|
|
27
|
+
}
|
|
23
28
|
|
|
24
29
|
const PUNCTUATION = ["(", ")", ";", ":", "@", ","];
|
|
25
30
|
|
|
@@ -56,18 +61,18 @@ const tokenizePragma = (lines: string[], start: Position) => {
|
|
|
56
61
|
/^"(\\.|[^"\\])*"/.exec(rest);
|
|
57
62
|
if (match) {
|
|
58
63
|
const text = match[0];
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
);
|
|
64
|
+
const isString = text.startsWith('"');
|
|
65
|
+
tokens.push({
|
|
66
|
+
kind: isString ? "String" : /^\d/.test(text) ? "Number" : "Ident",
|
|
67
|
+
text: isString ? JSON.parse(text) : text,
|
|
68
|
+
start: { ...position },
|
|
69
|
+
length: text.length,
|
|
70
|
+
});
|
|
66
71
|
position.column += text.length;
|
|
67
72
|
continue;
|
|
68
73
|
}
|
|
69
74
|
if (!PUNCTUATION.includes(rest[0])) return undefined;
|
|
70
|
-
tokens.push({ kind: "Punct", text: rest[0] });
|
|
75
|
+
tokens.push({ kind: "Punct", text: rest[0], start: { ...position }, length: 1 });
|
|
71
76
|
position.column++;
|
|
72
77
|
}
|
|
73
78
|
return undefined;
|
|
@@ -155,7 +160,8 @@ export const readOldMethod = (lines: string[], start: Position) => {
|
|
|
155
160
|
return index === tokens.length ? method : undefined;
|
|
156
161
|
};
|
|
157
162
|
|
|
158
|
-
|
|
163
|
+
// A value is a string, a number, or @ for the argument the definition is applied to.
|
|
164
|
+
export const readNewMethod = (lines: string[], start: Position, file: string) => {
|
|
159
165
|
const tokens = tokenizePragma(lines, start);
|
|
160
166
|
if (!tokens) return undefined;
|
|
161
167
|
let index = 0;
|
|
@@ -174,7 +180,17 @@ export const readNewMethod = (lines: string[], start: Position) => {
|
|
|
174
180
|
index++;
|
|
175
181
|
const value = getValue(tokens[index++]);
|
|
176
182
|
if (!value) return undefined;
|
|
177
|
-
settings.push({
|
|
183
|
+
settings.push({
|
|
184
|
+
hint: hint.text,
|
|
185
|
+
value,
|
|
186
|
+
location: {
|
|
187
|
+
file,
|
|
188
|
+
startLine: hint.start.line + 1,
|
|
189
|
+
startColumn: hint.start.column + 1,
|
|
190
|
+
endLine: hint.start.line + 1,
|
|
191
|
+
endColumn: hint.start.column + 1 + hint.length,
|
|
192
|
+
},
|
|
193
|
+
});
|
|
178
194
|
if (isPunct(tokens[index], ")")) break;
|
|
179
195
|
if (!isPunct(tokens[index], ";")) return undefined;
|
|
180
196
|
index++;
|
|
@@ -184,3 +200,24 @@ export const readNewMethod = (lines: string[], start: Position) => {
|
|
|
184
200
|
}
|
|
185
201
|
return groups;
|
|
186
202
|
};
|
|
203
|
+
|
|
204
|
+
export const findSuppressPragma = (lines: string[], keyword: Position) => {
|
|
205
|
+
const close = { ...keyword };
|
|
206
|
+
while (lines[close.line].slice(0, close.column).trimEnd() === "") {
|
|
207
|
+
if (close.line === 0) return undefined;
|
|
208
|
+
close.line--;
|
|
209
|
+
close.column = lines[close.line].length;
|
|
210
|
+
}
|
|
211
|
+
if (!lines[close.line].slice(0, close.column).trimEnd().endsWith("}*)")) return undefined;
|
|
212
|
+
for (let line = close.line; line >= 0; line--) {
|
|
213
|
+
const open = lines[line].lastIndexOf("(*{", line === close.line ? close.column : undefined);
|
|
214
|
+
if (open === -1) continue;
|
|
215
|
+
const tokens = tokenizePragma(lines, { line, column: open });
|
|
216
|
+
const isSuppress =
|
|
217
|
+
tokens?.length === 1 &&
|
|
218
|
+
tokens[0].kind === "Ident" &&
|
|
219
|
+
(tokens[0].text === "_" || tokens[0].text === "suppress");
|
|
220
|
+
return isSuppress ? { line, column: open } : undefined;
|
|
221
|
+
}
|
|
222
|
+
return undefined;
|
|
223
|
+
};
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// A port of tlapm's obligation printer (E_fmt, Fmtutil and Ctx).
|
|
2
|
-
|
|
3
1
|
import { TlaProofError } from "../errors";
|
|
4
2
|
import {
|
|
5
3
|
getHypName,
|
|
@@ -145,11 +143,21 @@ const isWith = (expression: Expr): boolean => {
|
|
|
145
143
|
return expression.kind === "With";
|
|
146
144
|
};
|
|
147
145
|
|
|
148
|
-
|
|
146
|
+
export interface PrinterOptions {
|
|
147
|
+
isShowingHidden?: boolean;
|
|
148
|
+
isShowingAllDefinitions?: boolean;
|
|
149
|
+
isTemporal?: boolean;
|
|
150
|
+
}
|
|
151
|
+
|
|
152
|
+
const isElided = (hyp: Hyp, options: PrinterOptions) => {
|
|
153
|
+
if (options.isShowingHidden) return false;
|
|
149
154
|
if (hyp.kind === "Defn") {
|
|
150
155
|
const definition = hyp.definition;
|
|
151
156
|
const hasWith = definition.kind === "Operator" && isWith(definition.body);
|
|
152
|
-
return
|
|
157
|
+
return (
|
|
158
|
+
!options.isShowingAllDefinitions &&
|
|
159
|
+
(hyp.visibility === "Hidden" || hasWith || hyp.whereDefined !== "User")
|
|
160
|
+
);
|
|
153
161
|
}
|
|
154
162
|
if (hyp.kind === "Fact") return hyp.visibility === "Hidden" || isWith(hyp.expression);
|
|
155
163
|
return false;
|
|
@@ -176,7 +184,7 @@ const LEVEL_NAMES = {
|
|
|
176
184
|
Unknown: "UNKNOWN",
|
|
177
185
|
};
|
|
178
186
|
|
|
179
|
-
const createPrinter = (hyps: Hyp[] = []) => {
|
|
187
|
+
const createPrinter = (hyps: Hyp[] = [], options: PrinterOptions = {}) => {
|
|
180
188
|
const context = createContext();
|
|
181
189
|
const printExpr = (expression: Expr): Doc => printMinimal(formatExpr(expression));
|
|
182
190
|
|
|
@@ -686,10 +694,24 @@ const createPrinter = (hyps: Hyp[] = []) => {
|
|
|
686
694
|
}
|
|
687
695
|
case "Flex":
|
|
688
696
|
return format("NEW VARIABLE %s", pushName(context, hyp.name));
|
|
689
|
-
case "Defn":
|
|
690
|
-
|
|
697
|
+
case "Defn": {
|
|
698
|
+
const origin =
|
|
699
|
+
hyp.whereDefined === "Builtin"
|
|
700
|
+
? "(* builtin *)@\n"
|
|
701
|
+
: typeof hyp.whereDefined === "object"
|
|
702
|
+
? "(* from proof *)@\n"
|
|
703
|
+
: "";
|
|
704
|
+
return [
|
|
705
|
+
options.isShowingAllDefinitions ? format(origin) : [],
|
|
706
|
+
printDefinition(hyp.definition),
|
|
707
|
+
];
|
|
708
|
+
}
|
|
691
709
|
case "Fact": {
|
|
692
|
-
const doc = format(
|
|
710
|
+
const doc = format(
|
|
711
|
+
"@[<h>%a %s@]",
|
|
712
|
+
printExpr(hyp.expression),
|
|
713
|
+
options.isTemporal && hyp.time === "Now" ? "(* non-[] *)" : "",
|
|
714
|
+
);
|
|
693
715
|
pushName(context, "");
|
|
694
716
|
return doc;
|
|
695
717
|
}
|
|
@@ -700,8 +722,15 @@ const createPrinter = (hyps: Hyp[] = []) => {
|
|
|
700
722
|
if (sequent.context.length === 0) return printExpr(sequent.active);
|
|
701
723
|
const hypDocs: Doc[] = [];
|
|
702
724
|
for (const hyp of sequent.context) {
|
|
703
|
-
if (isElided(hyp
|
|
704
|
-
|
|
725
|
+
if (isElided(hyp, options)) {
|
|
726
|
+
pushName(context, getHypName(hyp) ?? "");
|
|
727
|
+
continue;
|
|
728
|
+
}
|
|
729
|
+
const isHidden = (hyp.kind === "Defn" || hyp.kind === "Fact") && hyp.visibility === "Hidden";
|
|
730
|
+
hypDocs.push([
|
|
731
|
+
options.isShowingHidden && isHidden ? format("(* hidden *)@\n") : [],
|
|
732
|
+
printHyp(hyp),
|
|
733
|
+
]);
|
|
705
734
|
}
|
|
706
735
|
const activeDoc = printExpr(sequent.active);
|
|
707
736
|
popNames(context, sequent.context.length);
|
|
@@ -719,7 +748,8 @@ const createPrinter = (hyps: Hyp[] = []) => {
|
|
|
719
748
|
export const printExpression = (hyps: Hyp[], expression: Expr) =>
|
|
720
749
|
createPrinter(hyps).printExpr(expression);
|
|
721
750
|
|
|
722
|
-
export const printSequent = (sequent: Sequent) =>
|
|
751
|
+
export const printSequent = (sequent: Sequent, options: PrinterOptions = {}) =>
|
|
752
|
+
createPrinter([], options).printSequent(sequent);
|
|
723
753
|
|
|
724
|
-
export const formatObligation = (sequent: Sequent) =>
|
|
725
|
-
renderDoc(format("@[<b0>%a@]", printSequent(sequent))).trimEnd();
|
|
754
|
+
export const formatObligation = (sequent: Sequent, options: PrinterOptions = {}) =>
|
|
755
|
+
renderDoc(format("@[<b0>%a@]", printSequent(sequent, options))).trimEnd();
|
package/src/obligations/proof.ts
CHANGED
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// A port of tlapm's proof IR (P_t).
|
|
2
|
-
|
|
3
1
|
import type { Bound, Defn, Expr, Locus, Sequent } from "./expression";
|
|
4
2
|
import type { OldMethod } from "./pragma";
|
|
5
3
|
|
|
@@ -29,6 +27,7 @@ export interface Obligation {
|
|
|
29
27
|
location: Locus | undefined;
|
|
30
28
|
kind: ObligationKind;
|
|
31
29
|
method?: OldMethod;
|
|
30
|
+
isEnabledAxiomsSound?: boolean;
|
|
32
31
|
}
|
|
33
32
|
|
|
34
33
|
interface ProofProps {
|
|
@@ -37,6 +36,8 @@ interface ProofProps {
|
|
|
37
36
|
obligations?: Obligation[];
|
|
38
37
|
method?: OldMethod;
|
|
39
38
|
useLocation?: Locus;
|
|
39
|
+
isSuppressed?: boolean;
|
|
40
|
+
isEnabledAxiomsSound?: boolean;
|
|
40
41
|
}
|
|
41
42
|
|
|
42
43
|
export type Proof = ProofCore & ProofProps;
|
|
@@ -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
|
]
|