tla-ts 0.0.10-dev.28c823e4b → 0.0.10-dev.4a2a53c48
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 +2683 -427
- 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 +44 -41
- 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 +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 +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/java-hash.ts +7 -0
- 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 +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 +205 -43
- package/src/simulate.ts +160 -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 +2 -9
- 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/order.ts +2 -9
- 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 +25 -45
- 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 +63 -158
- package/src/prover/isabelle/isar/statement.ts +0 -52
- package/src/prover/smt/solver/z3-license.txt +0 -10
- package/src/prover/tlaps-module.ts +0 -510
- package/src/prover/zenon/LICENSE +0 -32
package/src/prover/smt/encode.ts
CHANGED
|
@@ -8,10 +8,27 @@ import {
|
|
|
8
8
|
} from "../../obligations/expression";
|
|
9
9
|
import { compareStrings } from "../ocaml";
|
|
10
10
|
import { createPrinter } from "./context";
|
|
11
|
+
import { simplifySets } from "./simplify";
|
|
12
|
+
import { layOutCommand } from "./layout";
|
|
11
13
|
import { getSymbolSpec, type CollectState, type SymbolSpec } from "./data";
|
|
12
14
|
import type { Entry } from "./flatten";
|
|
13
|
-
import { declare, getTlaName,
|
|
14
|
-
import {
|
|
15
|
+
import { declare, getTlaName, NATIVE_OPERATORS, replaceTokens } from "./format";
|
|
16
|
+
import { getSort } from "./types";
|
|
17
|
+
import {
|
|
18
|
+
createEncoder,
|
|
19
|
+
declareConstant,
|
|
20
|
+
encodeBool,
|
|
21
|
+
getEntries,
|
|
22
|
+
getUniqueName,
|
|
23
|
+
push,
|
|
24
|
+
searchDeclarationType,
|
|
25
|
+
type Binding,
|
|
26
|
+
type Encoder,
|
|
27
|
+
type EncodingSession,
|
|
28
|
+
type Env,
|
|
29
|
+
type Mode,
|
|
30
|
+
type SmtEncoding,
|
|
31
|
+
} from "./rewrite";
|
|
15
32
|
import { compareAxioms, getAxiomKey, type Axiom } from "./table";
|
|
16
33
|
|
|
17
34
|
type RecordExpr = Extract<Expr, { kind: "Record" }>;
|
|
@@ -65,8 +82,11 @@ const sortRecordFields = (expression: Expr): Expr =>
|
|
|
65
82
|
|
|
66
83
|
const collectSymbols = (entries: Entry[], encoder: Encoder) => {
|
|
67
84
|
const state: CollectState = {
|
|
85
|
+
encoding: encoder.encoding,
|
|
68
86
|
recordFields: encoder.recordFields,
|
|
87
|
+
setTypes: encoder.setTypes,
|
|
69
88
|
strings: [],
|
|
89
|
+
integers: [],
|
|
70
90
|
isFunConstr: false,
|
|
71
91
|
isFunSet: false,
|
|
72
92
|
isExcept: false,
|
|
@@ -97,7 +117,7 @@ const collectSymbols = (entries: Entry[], encoder: Encoder) => {
|
|
|
97
117
|
if (pending.at(-1)?.depth === depth) visit(pending.pop()?.text ?? "");
|
|
98
118
|
return depth - 1;
|
|
99
119
|
}
|
|
100
|
-
const flat = encoder.flattened.get(token);
|
|
120
|
+
const flat = encoder.flattener.flattened.get(token);
|
|
101
121
|
if (!flat) {
|
|
102
122
|
const builtin = getTlaName(token);
|
|
103
123
|
if (builtin !== undefined) add(builtin);
|
|
@@ -116,8 +136,6 @@ const collectSymbols = (entries: Entry[], encoder: Encoder) => {
|
|
|
116
136
|
return { symbols, axioms };
|
|
117
137
|
};
|
|
118
138
|
|
|
119
|
-
type Encoder = ReturnType<typeof createEncoder>;
|
|
120
|
-
|
|
121
139
|
const HYPOTHESIS: Mode = { isOmitted: false, polarity: "Negative", at: undefined, depth: 0 };
|
|
122
140
|
|
|
123
141
|
const isExpanded = (hyp: Extract<Hyp, { kind: "Defn" }>) =>
|
|
@@ -133,32 +151,56 @@ interface EncodedContext {
|
|
|
133
151
|
entries: Entry[];
|
|
134
152
|
}
|
|
135
153
|
|
|
136
|
-
const encodeContext = (
|
|
137
|
-
context.reduce<EncodedContext>(
|
|
138
|
-
(state, hyp) => {
|
|
154
|
+
const encodeContext = (sequent: Sequent, encoder: Encoder) =>
|
|
155
|
+
sequent.context.reduce<EncodedContext>(
|
|
156
|
+
(state, hyp, index) => {
|
|
139
157
|
const extend = (binding: Binding, entries: Entry[] = []) => ({
|
|
140
|
-
env:
|
|
158
|
+
env: push(state.env, binding),
|
|
141
159
|
entries: [...state.entries, ...entries],
|
|
142
160
|
});
|
|
161
|
+
const rest: Expr = {
|
|
162
|
+
kind: "Sequent",
|
|
163
|
+
sequent: { context: sequent.context.slice(index + 1), active: sequent.active },
|
|
164
|
+
};
|
|
143
165
|
switch (hyp.kind) {
|
|
144
166
|
case "Fresh": {
|
|
145
|
-
const symbol =
|
|
146
|
-
|
|
147
|
-
hyp.shape
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
const
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
167
|
+
const symbol = getUniqueName(encoder, hyp.name);
|
|
168
|
+
if (hyp.shape > 0)
|
|
169
|
+
return extend({ kind: "operator", symbol, arity: hyp.shape }, [
|
|
170
|
+
declare(symbol, hyp.shape),
|
|
171
|
+
]);
|
|
172
|
+
const declared = declareConstant(
|
|
173
|
+
encoder,
|
|
174
|
+
hyp,
|
|
175
|
+
hyp.domainVisibility === "Visible" ? hyp.domain : undefined,
|
|
176
|
+
rest.sequent,
|
|
177
|
+
state.env,
|
|
178
|
+
HYPOTHESIS,
|
|
179
|
+
);
|
|
180
|
+
const binding: Binding = { kind: "constant", symbol, type: declared.type };
|
|
181
|
+
const declaration = declare(symbol, 0, getSort(declared.type));
|
|
182
|
+
const guard = declared.getGuard(symbol);
|
|
183
|
+
if (guard === undefined) return extend(binding, [declaration]);
|
|
184
|
+
return extend(binding, [declaration, ...getEntries(encoder, `(assert ${guard})`)]);
|
|
155
185
|
}
|
|
186
|
+
// Rewrite.elim_flex declares a variable and then its primed copy, so the hypotheses after
|
|
187
|
+
// it type both.
|
|
156
188
|
case "Flex": {
|
|
157
|
-
const symbol =
|
|
158
|
-
const primed =
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
189
|
+
const symbol = getUniqueName(encoder, hyp.name);
|
|
190
|
+
const primed = getUniqueName(encoder, `${hyp.name}_prime`);
|
|
191
|
+
const type = searchDeclarationType(encoder, rest, true, state.env, HYPOTHESIS);
|
|
192
|
+
const variable: Binding = { kind: "variable", name: hyp.name, symbol, primed, type };
|
|
193
|
+
const primedType = searchDeclarationType(
|
|
194
|
+
encoder,
|
|
195
|
+
rest,
|
|
196
|
+
true,
|
|
197
|
+
push(state.env, variable),
|
|
198
|
+
HYPOTHESIS,
|
|
199
|
+
`${hyp.name}#prime`,
|
|
200
|
+
);
|
|
201
|
+
return extend({ ...variable, primedType }, [
|
|
202
|
+
declare(symbol, 0, getSort(type)),
|
|
203
|
+
declare(primed, 0, getSort(primedType)),
|
|
162
204
|
]);
|
|
163
205
|
}
|
|
164
206
|
case "Defn": {
|
|
@@ -166,9 +208,11 @@ const encodeContext = (context: Hyp[], encoder: Encoder) =>
|
|
|
166
208
|
if (isExpanded(hyp))
|
|
167
209
|
return extend({ kind: "unsupported", reason: "an expanded definition" });
|
|
168
210
|
if (definition.kind === "Instance")
|
|
169
|
-
return extend({ kind: "unsupported", reason: "an instance" }
|
|
211
|
+
return extend({ kind: "unsupported", reason: "an instance" }, [
|
|
212
|
+
`; omitted declaration of '${definition.name}' (missing type)`,
|
|
213
|
+
]);
|
|
170
214
|
if (definition.kind === "Recursive") {
|
|
171
|
-
const symbol =
|
|
215
|
+
const symbol = getUniqueName(encoder, `CONSTANT_${definition.name}_`);
|
|
172
216
|
return extend({ kind: "operator", symbol, arity: definition.shape }, [
|
|
173
217
|
declare(symbol, definition.shape),
|
|
174
218
|
]);
|
|
@@ -178,27 +222,43 @@ const encodeContext = (context: Hyp[], encoder: Encoder) =>
|
|
|
178
222
|
const body = definition.body;
|
|
179
223
|
const params = body.kind === "Lambda" ? body.params : [];
|
|
180
224
|
if (params.some((param) => param.shape > 0))
|
|
181
|
-
return extend(
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
225
|
+
return extend(
|
|
226
|
+
{
|
|
227
|
+
kind: "secondOrder",
|
|
228
|
+
name: definition.name,
|
|
229
|
+
shapes: params.map((param) => param.shape),
|
|
230
|
+
},
|
|
231
|
+
[`; omitted declaration of '${definition.name}' (second-order)`],
|
|
232
|
+
);
|
|
233
|
+
const symbol = getUniqueName(encoder, definition.name);
|
|
234
|
+
// Type.Synthesize types a hidden constant definition as it types a NEW constant.
|
|
235
|
+
const type =
|
|
236
|
+
hyp.visibility === "Hidden" && body.kind !== "Lambda"
|
|
237
|
+
? searchDeclarationType(encoder, rest, true, state.env, HYPOTHESIS)
|
|
238
|
+
: undefined;
|
|
239
|
+
if (type !== undefined)
|
|
240
|
+
return extend({ kind: "constant", symbol, type }, [declare(symbol, 0, getSort(type))]);
|
|
187
241
|
return extend({ kind: "operator", symbol, arity: params.length }, [
|
|
188
242
|
declare(symbol, params.length),
|
|
189
243
|
]);
|
|
190
244
|
}
|
|
191
245
|
case "Fact": {
|
|
192
246
|
const binding: Binding = { kind: "unsupported", reason: "a reference to a fact" };
|
|
193
|
-
if (hyp.visibility === "Hidden") return extend(binding);
|
|
247
|
+
if (hyp.visibility === "Hidden") return extend(binding, ["; hidden fact"]);
|
|
194
248
|
const isOmitted = isSecondOrder(hyp.expression);
|
|
195
|
-
const entries =
|
|
196
|
-
|
|
249
|
+
const entries = getEntries(
|
|
250
|
+
encoder,
|
|
251
|
+
`(assert ${encodeBool(encoder, hyp.expression, state.env, { ...HYPOTHESIS, isOmitted })})`,
|
|
197
252
|
);
|
|
198
253
|
return extend(
|
|
199
254
|
binding,
|
|
200
255
|
isOmitted
|
|
201
|
-
?
|
|
256
|
+
? [
|
|
257
|
+
...entries.map((entry) =>
|
|
258
|
+
typeof entry === "string" ? { omitted: entry } : entry,
|
|
259
|
+
),
|
|
260
|
+
"; omitted fact (second-order)",
|
|
261
|
+
]
|
|
202
262
|
: entries,
|
|
203
263
|
);
|
|
204
264
|
}
|
|
@@ -207,38 +267,54 @@ const encodeContext = (context: Hyp[], encoder: Encoder) =>
|
|
|
207
267
|
{ env: undefined, entries: [] },
|
|
208
268
|
);
|
|
209
269
|
|
|
210
|
-
|
|
270
|
+
interface SmtHeader {
|
|
271
|
+
version: string;
|
|
272
|
+
id: number;
|
|
273
|
+
location: string;
|
|
274
|
+
logic: string;
|
|
275
|
+
}
|
|
276
|
+
|
|
277
|
+
export const encodeSmt = (
|
|
278
|
+
prepared: Sequent,
|
|
279
|
+
session: EncodingSession,
|
|
280
|
+
header: SmtHeader,
|
|
281
|
+
encoding: SmtEncoding,
|
|
282
|
+
) => {
|
|
211
283
|
const simplified = sortRecordFields(
|
|
212
284
|
simplifyRecordEqualities({ kind: "Sequent", sequent: prepared }),
|
|
213
285
|
);
|
|
214
|
-
const sequent =
|
|
215
|
-
|
|
216
|
-
|
|
286
|
+
const sequent = simplifySets(
|
|
287
|
+
simplified.kind === "Sequent" ? simplified.sequent : prepared,
|
|
288
|
+
encoding.rewriteLevel,
|
|
289
|
+
);
|
|
290
|
+
const encoder = createEncoder(session, encoding);
|
|
291
|
+
const context = encodeContext(sequent, encoder);
|
|
217
292
|
const goal = isSecondOrder(sequent.active)
|
|
218
293
|
? []
|
|
219
|
-
:
|
|
220
|
-
|
|
294
|
+
: getEntries(
|
|
295
|
+
encoder,
|
|
296
|
+
`(assert (! (not ${encodeBool(encoder, sequent.active, context.env, { ...HYPOTHESIS, polarity: "Positive" })}) :named |Goal|))`,
|
|
221
297
|
);
|
|
222
|
-
const
|
|
223
|
-
const
|
|
224
|
-
const collected = collectSymbols(entries, encoder);
|
|
298
|
+
const resolve = createPrinter(encoder.declared);
|
|
299
|
+
const collected = collectSymbols([...context.entries, ...goal], encoder);
|
|
225
300
|
const declarations = [...collected.symbols]
|
|
226
301
|
.toSorted((left, right) => compareStrings(left[0], right[0]))
|
|
227
302
|
.flatMap((symbol) => (symbol[1].declaration === undefined ? [] : [symbol[1].declaration]));
|
|
228
303
|
const axioms = [...collected.axioms.values()]
|
|
229
304
|
.toSorted(compareAxioms)
|
|
230
|
-
.
|
|
231
|
-
entry.formula === undefined
|
|
305
|
+
.map((entry) =>
|
|
306
|
+
entry.formula === undefined
|
|
307
|
+
? "; omitted fact (second-order)"
|
|
308
|
+
: `(assert (! ${entry.formula} :named |${entry.label}|))`,
|
|
232
309
|
);
|
|
233
310
|
const keys = new Set(collected.axioms.keys());
|
|
234
|
-
const
|
|
235
|
-
|
|
236
|
-
...axioms,
|
|
237
|
-
...entries.flatMap((entry) => {
|
|
311
|
+
const getLines = (entries: Entry[]) =>
|
|
312
|
+
entries.flatMap((entry) => {
|
|
238
313
|
if (typeof entry === "string") return [entry];
|
|
239
314
|
return "omitted" in entry ? [] : entry.getLines(keys);
|
|
240
|
-
})
|
|
241
|
-
];
|
|
315
|
+
});
|
|
316
|
+
const hypotheses = [...declarations, ...axioms, ...getLines(context.entries)];
|
|
317
|
+
const lines = [...hypotheses, ...getLines(goal)];
|
|
242
318
|
const isIdvUsed =
|
|
243
319
|
lines.some((line) => /\bIdv\b/.test(line)) ||
|
|
244
320
|
sequent.context.some(
|
|
@@ -247,8 +323,23 @@ export const encodeSmt = (prepared: Sequent, session: EncodingSession) => {
|
|
|
247
323
|
(hyp.definition.kind === "Operator" || hyp.definition.kind === "Recursive") &&
|
|
248
324
|
!isExpanded(hyp),
|
|
249
325
|
);
|
|
250
|
-
|
|
251
|
-
.
|
|
252
|
-
|
|
253
|
-
|
|
326
|
+
const printCommand = (line: string) => {
|
|
327
|
+
if (line.startsWith(";")) return line;
|
|
328
|
+
const command = layOutCommand(replaceTokens(resolve(line), NATIVE_OPERATORS));
|
|
329
|
+
const name = /:named \|([^|]*)\|\)\)$/.exec(line)?.[1];
|
|
330
|
+
if (name === undefined) return command;
|
|
331
|
+
return `;; ${name === "Goal" ? name : `Axiom: ${name}`}\n${command}`;
|
|
332
|
+
};
|
|
333
|
+
return [
|
|
334
|
+
`;; TLA+ Proof Manager ${header.version}\n`,
|
|
335
|
+
`;; Proof obligation #${header.id}\n`,
|
|
336
|
+
`;; Generated from ${header.location}\n\n`,
|
|
337
|
+
`(set-logic ${header.logic})\n\n`,
|
|
338
|
+
";; Sorts\n\n",
|
|
339
|
+
isIdvUsed ? "(declare-sort Idv 0)\n" : "",
|
|
340
|
+
"\n;; Hypotheses\n\n",
|
|
341
|
+
hypotheses.length === 0 ? "\n" : "",
|
|
342
|
+
...lines.map((line) => `${printCommand(line)}\n\n`),
|
|
343
|
+
"(check-sat)\n(exit)\n",
|
|
344
|
+
].join("");
|
|
254
345
|
};
|
|
@@ -42,12 +42,14 @@ export const resolveTriggers = (text: string, isTriggered: boolean): string => {
|
|
|
42
42
|
export const getEquality = (
|
|
43
43
|
left: string,
|
|
44
44
|
right: string,
|
|
45
|
-
polarity: Polarity,
|
|
45
|
+
polarity: Polarity | undefined,
|
|
46
46
|
isNegated: boolean,
|
|
47
|
+
setTrigger?: string,
|
|
47
48
|
) => {
|
|
48
|
-
const triggered = `(${TRIG_EQ} ${left} ${right})`;
|
|
49
|
+
const triggered = `(${setTrigger ?? TRIG_EQ} ${left} ${right})`;
|
|
49
50
|
const kept = isNegated ? `(distinct ${left} ${right})` : `(= ${left} ${right})`;
|
|
50
|
-
if (!isSetTerm(left) && !isSetTerm(right))
|
|
51
|
+
if (polarity === undefined || (setTrigger === undefined && !isSetTerm(left) && !isSetTerm(right)))
|
|
52
|
+
return kept;
|
|
51
53
|
const text = isNegated ? `(not ${triggered})` : triggered;
|
|
52
54
|
return polarity === (isNegated ? "Positive" : "Negative")
|
|
53
55
|
? `(${UNRESOLVED_TRIGGER} ${text} ${kept})`
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { formatName, getClosing } from "./format";
|
|
2
2
|
import type { Axiom } from "./table";
|
|
3
3
|
|
|
4
4
|
export interface Flattened {
|
|
@@ -14,8 +14,6 @@ interface OmittedFact {
|
|
|
14
14
|
|
|
15
15
|
export type Entry = string | Flattened | OmittedFact;
|
|
16
16
|
|
|
17
|
-
export const getVariable = (name: string, depth: number) => `${name}#${depth}`;
|
|
18
|
-
|
|
19
17
|
export const getDepth = (variable: string) => Number(variable.slice(variable.lastIndexOf("#") + 1));
|
|
20
18
|
|
|
21
19
|
export const UNPRIMABLE = "?unprimable";
|
|
@@ -32,7 +30,7 @@ export const removeUnprimable = (text: string): string => {
|
|
|
32
30
|
};
|
|
33
31
|
|
|
34
32
|
const getFlatKey = (text: string, depth: number) =>
|
|
35
|
-
/\((forall|exists|ite) /.test(text)
|
|
33
|
+
/\((forall|exists|ite|let) /.test(text)
|
|
36
34
|
? undefined
|
|
37
35
|
: text.replace(/[^\s()]+#(\d+)/g, (_match, found: string) =>
|
|
38
36
|
Number(found) < depth ? "#" : `#${Number(found) - depth}`,
|
|
@@ -54,7 +52,7 @@ export const createFlattener = () => {
|
|
|
54
52
|
visit: string,
|
|
55
53
|
site: Site,
|
|
56
54
|
getAxioms: (symbol: string, axioms: Set<string>) => Axiom[],
|
|
57
|
-
|
|
55
|
+
sorts: string[],
|
|
58
56
|
name = `TLA__${kind}`,
|
|
59
57
|
) => {
|
|
60
58
|
if (site.isOmitted) {
|
|
@@ -74,7 +72,7 @@ export const createFlattener = () => {
|
|
|
74
72
|
kind,
|
|
75
73
|
visit: removeUnprimable(visit),
|
|
76
74
|
getLines: (axioms) => [
|
|
77
|
-
declare
|
|
75
|
+
`(declare-fun ${symbol} (${sorts.join(" ")}) Idv)`,
|
|
78
76
|
...getAxioms(symbol, axioms).map(
|
|
79
77
|
(entry) =>
|
|
80
78
|
`(assert (! ${removeUnprimable(entry.formula ?? "")} :named |${entry.label} ${raw}|))`,
|
package/src/prover/smt/format.ts
CHANGED
|
@@ -61,6 +61,8 @@ export const NAT_SET = tla("NatSet");
|
|
|
61
61
|
export const CAST_INT = tla("Cast_Int");
|
|
62
62
|
export const PROJ_INT = tla("Proj_Int");
|
|
63
63
|
export const INT_LTEQ = tla("IntLteq");
|
|
64
|
+
export const INT_PLUS = tla("IntPlus");
|
|
65
|
+
export const INT_MINUS = tla("IntMinus");
|
|
64
66
|
export const INT_RANGE = tla("IntRange");
|
|
65
67
|
export const FUN_APP = tla("FunApp");
|
|
66
68
|
export const FUN_DOM = tla("FunDom");
|
|
@@ -78,6 +80,19 @@ export const TAIL = tla("Tail");
|
|
|
78
80
|
export const SUB_SEQ = tla("SubSeq");
|
|
79
81
|
export const TUPLE_0 = tla("Tuple_0");
|
|
80
82
|
|
|
83
|
+
export const NATIVE_OPERATORS = new Map(
|
|
84
|
+
[
|
|
85
|
+
["TIntPlus", "+"],
|
|
86
|
+
["TIntMinus", "-"],
|
|
87
|
+
["TIntTimes", "*"],
|
|
88
|
+
["TIntUminus", "-"],
|
|
89
|
+
["TIntLteq", "<="],
|
|
90
|
+
["TIntLt", "<"],
|
|
91
|
+
["TIntGteq", ">="],
|
|
92
|
+
["TIntGt", ">"],
|
|
93
|
+
].map((entry) => [tla(entry[0]), entry[1]]),
|
|
94
|
+
);
|
|
95
|
+
|
|
81
96
|
export const BUILTIN_SYMBOLS: Partial<Record<Builtin, string>> = {
|
|
82
97
|
Cup: CUP,
|
|
83
98
|
Cap: CAP,
|
|
@@ -85,8 +100,8 @@ export const BUILTIN_SYMBOLS: Partial<Record<Builtin, string>> = {
|
|
|
85
100
|
SUBSET,
|
|
86
101
|
UNION,
|
|
87
102
|
DOMAIN: FUN_DOM,
|
|
88
|
-
Plus:
|
|
89
|
-
Minus:
|
|
103
|
+
Plus: INT_PLUS,
|
|
104
|
+
Minus: INT_MINUS,
|
|
90
105
|
Times: tla("IntTimes"),
|
|
91
106
|
Exp: tla("IntExp"),
|
|
92
107
|
Quotient: tla("IntQuotient"),
|
|
@@ -106,8 +121,14 @@ export const BUILTIN_SYMBOLS: Partial<Record<Builtin, string>> = {
|
|
|
106
121
|
export const getNames = (prefix: string, count: number) =>
|
|
107
122
|
Array.from({ length: count }, (_value, index) => `${prefix}${index + 1}`);
|
|
108
123
|
|
|
124
|
+
// A bound variable is name#depth, or name:Sort#depth when Type.Synthesize sorts it Int or Bool.
|
|
125
|
+
export const getVariable = (name: string, depth: number, sort = "Idv") =>
|
|
126
|
+
`${name}${sort === "Idv" ? "" : `:${sort}`}#${depth}`;
|
|
127
|
+
|
|
128
|
+
export const getVariableSort = (variable: string) => /:(\w+)#\d+$/.exec(variable)?.[1];
|
|
129
|
+
|
|
109
130
|
export const getBinders = (variables: string[], sort = "Idv") =>
|
|
110
|
-
variables.map((variable) => `(${variable} ${sort})`).join(" ");
|
|
131
|
+
variables.map((variable) => `(${variable} ${getVariableSort(variable) ?? sort})`).join(" ");
|
|
111
132
|
|
|
112
133
|
export const forall = (
|
|
113
134
|
variables: string[],
|
|
@@ -145,5 +166,8 @@ export const getClosing = (text: string, from: number) => {
|
|
|
145
166
|
return text.length;
|
|
146
167
|
};
|
|
147
168
|
|
|
169
|
+
export const replaceTokens = (text: string, replacements: Map<string, string>) =>
|
|
170
|
+
text.replace(/[^\s()]+/g, (found) => replacements.get(found) ?? found);
|
|
171
|
+
|
|
148
172
|
export const replaceToken = (text: string, token: string, replacement: string) =>
|
|
149
|
-
text
|
|
173
|
+
replaceTokens(text, new Map([[token, replacement]]));
|
|
@@ -9,6 +9,7 @@ import {
|
|
|
9
9
|
FUN_SET,
|
|
10
10
|
getBinders,
|
|
11
11
|
getNames,
|
|
12
|
+
INT_LTEQ,
|
|
12
13
|
IS_SET_OF,
|
|
13
14
|
LEN,
|
|
14
15
|
MEM,
|
|
@@ -127,6 +128,7 @@ export const getSelectSeqAxioms = (
|
|
|
127
128
|
free: string[],
|
|
128
129
|
body: string,
|
|
129
130
|
variable: string,
|
|
131
|
+
isArithmetic: boolean,
|
|
130
132
|
) => {
|
|
131
133
|
const select = (sequence: string) => call(name, [sequence, ...free]);
|
|
132
134
|
const test = (term: string) => replaceToken(body, variable, term);
|
|
@@ -144,7 +146,11 @@ export const getSelectSeqAxioms = (
|
|
|
144
146
|
[],
|
|
145
147
|
forall(
|
|
146
148
|
[...free, "s"],
|
|
147
|
-
`(=> (${MEM} (${LEN} s) ${NAT_SET})
|
|
149
|
+
`(=> (${MEM} (${LEN} s) ${NAT_SET}) ${
|
|
150
|
+
isArithmetic
|
|
151
|
+
? `(<= (${PROJ_INT} (${LEN} ${select("s")})) (${PROJ_INT} (${LEN} s)))`
|
|
152
|
+
: `(${INT_LTEQ} (${LEN} ${select("s")}) (${LEN} s))`
|
|
153
|
+
})`,
|
|
148
154
|
[[select("s")]],
|
|
149
155
|
),
|
|
150
156
|
),
|
|
@@ -0,0 +1,91 @@
|
|
|
1
|
+
import { format, renderDoc, text, type Doc } from "../../obligations/format";
|
|
2
|
+
|
|
3
|
+
type Sexp = string | Sexp[];
|
|
4
|
+
|
|
5
|
+
const parseSexp = (command: string): Sexp => {
|
|
6
|
+
const tokens = command.match(/\|[^|]*\||[()]|[^\s()|]+/g) ?? [];
|
|
7
|
+
const stack: Sexp[][] = [[]];
|
|
8
|
+
tokens.forEach((token) => {
|
|
9
|
+
if (token === "(") {
|
|
10
|
+
stack.push([]);
|
|
11
|
+
return;
|
|
12
|
+
}
|
|
13
|
+
if (token === ")") {
|
|
14
|
+
const done = stack.pop() ?? [];
|
|
15
|
+
stack.at(-1)?.push(done);
|
|
16
|
+
return;
|
|
17
|
+
}
|
|
18
|
+
stack.at(-1)?.push(token);
|
|
19
|
+
});
|
|
20
|
+
return stack[0][0];
|
|
21
|
+
};
|
|
22
|
+
|
|
23
|
+
const printFlat = (sexp: Sexp): string =>
|
|
24
|
+
typeof sexp === "string" ? sexp : `(${sexp.map(printFlat).join(" ")})`;
|
|
25
|
+
const printSexpr = (...docs: Doc[]): Doc => [format("@[<hov2>("), docs, format("@])")];
|
|
26
|
+
const printBox = (doc: Doc) => format("@[<hov0>%a@]", doc);
|
|
27
|
+
const printSpaced = (docs: Doc[]) =>
|
|
28
|
+
docs.flatMap((doc, index) => (index === 0 ? [doc] : [format("@ "), doc]));
|
|
29
|
+
|
|
30
|
+
const getList = (sexp: Sexp | undefined) => (Array.isArray(sexp) ? sexp : []);
|
|
31
|
+
const printAttributes = (attributes: Sexp[]): Doc[] =>
|
|
32
|
+
attributes.flatMap((attribute, index) => {
|
|
33
|
+
if (index % 2 === 1) return [];
|
|
34
|
+
const value = attributes[index + 1] ?? "";
|
|
35
|
+
return attribute === ":pattern"
|
|
36
|
+
? [[text(":pattern "), printSexpr(printSpaced(getList(value).map(printTerm)))]]
|
|
37
|
+
: [text(`${printFlat(attribute)} ${printFlat(value)}`)];
|
|
38
|
+
});
|
|
39
|
+
|
|
40
|
+
const printTerm = (sexp: Sexp): Doc => printBox(printExpression(sexp));
|
|
41
|
+
const printExpression = (sexp: Sexp): Doc => {
|
|
42
|
+
if (typeof sexp === "string") return text(sexp);
|
|
43
|
+
const head = printFlat(sexp[0]);
|
|
44
|
+
const args = sexp.slice(1);
|
|
45
|
+
if (head === "forall" || head === "exists")
|
|
46
|
+
return printSexpr(
|
|
47
|
+
text(head),
|
|
48
|
+
format("@ "),
|
|
49
|
+
printSexpr(printSpaced(getList(args[0]).map((binding) => text(printFlat(binding))))),
|
|
50
|
+
format("@ "),
|
|
51
|
+
printTerm(args[1]),
|
|
52
|
+
);
|
|
53
|
+
if (head === "let")
|
|
54
|
+
return printSexpr(
|
|
55
|
+
text("let "),
|
|
56
|
+
printSexpr(
|
|
57
|
+
printSpaced(
|
|
58
|
+
getList(args[0]).map((binding) => {
|
|
59
|
+
const parts = getList(binding);
|
|
60
|
+
return [text(`(${printFlat(parts[0])} `), printExpression(parts[1]), text(")")];
|
|
61
|
+
}),
|
|
62
|
+
),
|
|
63
|
+
),
|
|
64
|
+
format("@ "),
|
|
65
|
+
printTerm(args[1]),
|
|
66
|
+
);
|
|
67
|
+
if (head === "!")
|
|
68
|
+
return printSexpr(
|
|
69
|
+
text("!"),
|
|
70
|
+
format("@ "),
|
|
71
|
+
printTerm(args[0]),
|
|
72
|
+
format("@ "),
|
|
73
|
+
printSpaced(printAttributes(args.slice(1))),
|
|
74
|
+
);
|
|
75
|
+
return printSexpr(text(head), format("@ "), printSpaced(args.map(printTerm)));
|
|
76
|
+
};
|
|
77
|
+
export const layOutCommand = (command: string) => {
|
|
78
|
+
const sexp = getList(parseSexp(command));
|
|
79
|
+
const head = sexp[0];
|
|
80
|
+
if (head === "declare-fun")
|
|
81
|
+
return renderDoc(
|
|
82
|
+
printSexpr(
|
|
83
|
+
text(`declare-fun ${printFlat(sexp[1])} (`),
|
|
84
|
+
printSpaced(getList(sexp[2]).map((sort) => text(printFlat(sort)))),
|
|
85
|
+
text(`) ${printFlat(sexp[3])}`),
|
|
86
|
+
),
|
|
87
|
+
);
|
|
88
|
+
if (head === "assert")
|
|
89
|
+
return renderDoc(printSexpr(text("assert"), format("@ "), printTerm(sexp[1])));
|
|
90
|
+
return command;
|
|
91
|
+
};
|