tla-ts 0.0.10-dev.63a6693bd → 0.0.10-dev.6b2a6741a
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +2 -1
- package/dist/compile.cjs +3 -3
- package/dist/compile.js +1 -1
- package/dist/deciders.cjs +41 -37
- package/dist/deciders.js +45 -41
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +5 -1
- package/dist/index.d.ts +5 -1
- package/dist/index.js +1 -1
- package/dist/parallel-worker.cjs +1 -1
- package/dist/parallel-worker.js +1 -1
- package/dist/prove-worker.cjs +1 -1
- package/dist/prove-worker.js +1 -1
- package/dist/prove.cjs +2682 -426
- package/dist/prove.js +2679 -423
- package/dist/run.cjs +43 -42
- package/dist/run.js +44 -43
- package/dist/tlapm.cjs +1 -1
- package/dist/tlapm.js +1 -1
- package/dist/transfer.cjs +43 -40
- package/dist/transfer.js +43 -40
- package/dist/worker.cjs +7 -7
- package/dist/worker.js +7 -7
- package/package.json +1 -1
- package/src/ast.ts +4 -3
- package/src/bags.ts +46 -28
- package/src/check-trace.ts +2 -16
- package/src/check.ts +349 -91
- package/src/cli/runtime-invariants.ts +20 -56
- package/src/cli/tlapm.ts +424 -62
- package/src/cli/tlc-arguments.ts +2 -2
- package/src/cli/tlc-output.ts +4 -5
- package/src/cli/tlc-usage.ts +0 -1
- package/src/cli/tlc.ts +26 -7
- package/src/cli/xml-exporter.ts +1 -1
- package/src/codegen.ts +9 -5
- package/src/dependencies.ts +72 -11
- package/src/dfid.ts +9 -2
- package/src/environment.ts +65 -36
- package/src/errors.ts +38 -3
- package/src/evaluate.ts +92 -32
- package/src/exit-codes.ts +5 -2
- package/src/instances.ts +5 -5
- package/src/java-overrides.ts +2 -2
- package/src/levels.ts +138 -90
- package/src/lexer.ts +5 -3
- package/src/liveness-checker.ts +572 -204
- package/src/liveness.ts +47 -32
- package/src/obligations/action.ts +10 -6
- package/src/obligations/anonymize.ts +33 -14
- package/src/obligations/enabled-axioms.ts +218 -0
- package/src/obligations/equality.ts +1 -3
- package/src/obligations/expression.ts +18 -6
- package/src/obligations/format.ts +0 -2
- package/src/obligations/generate.ts +22 -17
- package/src/obligations/index.ts +37 -7
- package/src/obligations/levels.ts +24 -11
- package/src/obligations/module.ts +1 -3
- package/src/obligations/normalize.ts +25 -17
- package/src/obligations/operators.ts +0 -2
- package/src/obligations/pragma.ts +53 -16
- package/src/obligations/printer.ts +48 -18
- package/src/obligations/proof.ts +3 -2
- package/src/obligations/regroup.ts +0 -2
- package/src/obligations/simplify.ts +17 -7
- package/src/obligations/source.ts +71 -17
- package/src/obligations/subexpression.ts +45 -18
- package/src/obligations/substitution.ts +1 -3
- package/src/obligations/temporal.ts +0 -2
- package/src/obligations/tuples.ts +0 -2
- package/src/parallel-worker.ts +8 -2
- package/src/parallel.ts +7 -2
- package/src/parser.ts +664 -287
- package/src/pretty-print.ts +1 -1
- package/src/prover/deciders.ts +11 -8
- package/src/prover/isabelle/decide.ts +3 -25
- package/src/prover/isabelle/encode.ts +71 -41
- package/src/prover/isabelle/isar/attrib.ts +250 -0
- package/src/prover/isabelle/isar/context.ts +335 -0
- package/src/prover/isabelle/isar/induct.ts +382 -0
- package/src/prover/isabelle/isar/inner-syntax.ts +149 -3
- package/src/prover/isabelle/isar/method.ts +506 -198
- package/src/prover/isabelle/isar/proof.ts +570 -14
- package/src/prover/isabelle/isar/rule-cases.ts +226 -0
- package/src/prover/isabelle/isar/theory.ts +479 -69
- package/src/prover/isabelle/isar/toplevel.ts +331 -0
- package/src/prover/isabelle/isar/type-check.ts +83 -8
- package/src/prover/isabelle/provers/blast/blast.ts +0 -2
- package/src/prover/isabelle/provers/blast/branch.ts +0 -2
- package/src/prover/isabelle/provers/blast/prove.ts +0 -2
- package/src/prover/isabelle/provers/blast/rules.ts +0 -2
- package/src/prover/isabelle/provers/blast/state.ts +0 -2
- package/src/prover/isabelle/provers/blast/term.ts +0 -2
- package/src/prover/isabelle/provers/clasimp.ts +1 -3
- package/src/prover/isabelle/provers/classical.ts +45 -20
- package/src/prover/isabelle/provers/hypsubst.ts +2 -4
- package/src/prover/isabelle/pure/bicompose.ts +0 -2
- package/src/prover/isabelle/pure/consts.ts +0 -2
- package/src/prover/isabelle/pure/conv.ts +0 -2
- package/src/prover/isabelle/pure/drule.ts +63 -4
- package/src/prover/isabelle/pure/envir.ts +0 -2
- package/src/prover/isabelle/pure/goal.ts +1 -3
- package/src/prover/isabelle/pure/logic.ts +0 -2
- package/src/prover/isabelle/pure/name.ts +0 -2
- package/src/prover/isabelle/pure/net.ts +0 -2
- package/src/prover/isabelle/pure/object-logic.ts +13 -7
- package/src/prover/isabelle/pure/pattern.ts +0 -2
- package/src/prover/isabelle/pure/raw-simplifier.ts +0 -2
- package/src/prover/isabelle/pure/rewriter.ts +4 -11
- package/src/prover/isabelle/pure/search.ts +0 -2
- package/src/prover/isabelle/pure/seq.ts +0 -2
- package/src/prover/isabelle/pure/simplifier.ts +26 -7
- package/src/prover/isabelle/pure/table.ts +0 -2
- package/src/prover/isabelle/pure/tactic.ts +0 -2
- package/src/prover/isabelle/pure/tactical.ts +0 -2
- package/src/prover/isabelle/pure/term-ord.ts +0 -2
- package/src/prover/isabelle/pure/term.ts +3 -5
- package/src/prover/isabelle/pure/thm.ts +0 -2
- package/src/prover/isabelle/pure/type.ts +0 -2
- package/src/prover/isabelle/pure/unify.ts +0 -2
- package/src/prover/isabelle/pure/variable.ts +0 -2
- package/src/prover/isabelle/tla/classical-setup.ts +1 -2
- package/src/prover/isabelle/tla/context.ts +51 -9
- package/src/prover/isabelle/tla/logic-data.ts +1 -1
- package/src/prover/isabelle/tla/logic.ts +40 -1
- package/src/prover/isabelle/tla/simpdata.ts +0 -2
- package/src/prover/isabelle/tools/intuitionistic.ts +28 -12
- package/src/prover/ocaml.ts +4 -1
- package/src/prover/prep/action.ts +19 -12
- package/src/prover/prep/enabled-axioms.ts +11 -2
- package/src/prover/prep/md5.ts +26 -29
- package/src/prover/prep/methods.ts +159 -50
- package/src/prover/prep/normalize.ts +38 -9
- package/src/prover/prove.ts +343 -65
- package/src/prover/ptl/decide.ts +95 -50
- package/src/prover/ptl/encode.ts +2 -3
- package/src/prover/ptl/tableau.ts +28 -2
- package/src/prover/smt/arithmetic.ts +310 -0
- package/src/prover/smt/axioms.ts +12 -8
- package/src/prover/smt/context.ts +42 -6
- package/src/prover/smt/data.ts +191 -84
- package/src/prover/smt/encode.ts +122 -43
- package/src/prover/smt/extensionality.ts +5 -3
- package/src/prover/smt/flatten.ts +4 -6
- package/src/prover/smt/format.ts +28 -4
- package/src/prover/smt/instances.ts +7 -1
- package/src/prover/smt/layout.ts +91 -0
- package/src/prover/smt/rewrite.ts +483 -116
- package/src/prover/smt/simplify.ts +441 -0
- package/src/prover/smt/solver/ackermannize-bv-tactic.ts +61 -0
- package/src/prover/smt/solver/ackr-helper.ts +179 -0
- package/src/prover/smt/solver/ackr-model-converter.ts +105 -0
- package/src/prover/smt/solver/act-cache.ts +0 -1
- package/src/prover/smt/solver/add-bounds-tactic.ts +59 -0
- package/src/prover/smt/solver/aig-tactic.ts +52 -0
- package/src/prover/smt/solver/aig.ts +889 -0
- package/src/prover/smt/solver/arith-rewriter.ts +613 -6
- package/src/prover/smt/solver/arith-terms.ts +121 -0
- package/src/prover/smt/solver/array-decl-plugin.ts +175 -0
- package/src/prover/smt/solver/array-rewriter.ts +309 -0
- package/src/prover/smt/solver/asserted-formulas.ts +93 -15
- package/src/prover/smt/solver/ast-lt.ts +165 -11
- package/src/prover/smt/solver/ast-util.ts +160 -2
- package/src/prover/smt/solver/ast.ts +1449 -41
- package/src/prover/smt/solver/auf-solver.ts +0 -1
- package/src/prover/smt/solver/bit-blast-tactic.ts +582 -0
- package/src/prover/smt/solver/bit-blaster.ts +871 -0
- package/src/prover/smt/solver/bound-manager.ts +196 -0
- package/src/prover/smt/solver/bound-simplifier.ts +600 -0
- package/src/prover/smt/solver/bv-bound-chk.ts +492 -0
- package/src/prover/smt/solver/bv-decl-plugin.ts +341 -0
- package/src/prover/smt/solver/bv-divrem-bounds.ts +95 -0
- package/src/prover/smt/solver/bv-rewriter.ts +1901 -0
- package/src/prover/smt/solver/bv1-blast.ts +214 -0
- package/src/prover/smt/solver/bv2fpa-converter.ts +174 -0
- package/src/prover/smt/solver/bv2int-rewriter.ts +544 -0
- package/src/prover/smt/solver/bv2real-rewriter.ts +533 -0
- package/src/prover/smt/solver/card2bv.ts +109 -0
- package/src/prover/smt/solver/case-split-queue.ts +0 -2
- package/src/prover/smt/solver/cg-table.ts +39 -25
- package/src/prover/smt/solver/check-logic.ts +330 -0
- package/src/prover/smt/solver/clause.ts +0 -1
- package/src/prover/smt/solver/cofactor-elim-term-ite.ts +278 -0
- package/src/prover/smt/solver/conflict-resolution.ts +78 -2
- package/src/prover/smt/solver/context.ts +533 -114
- package/src/prover/smt/solver/ctx-simplify.ts +21 -12
- package/src/prover/smt/solver/ctx-solver-simplify.ts +122 -0
- package/src/prover/smt/solver/datatype-decl-plugin.ts +572 -0
- package/src/prover/smt/solver/datatype-rewriter.ts +82 -0
- package/src/prover/smt/solver/demodulator.ts +786 -0
- package/src/prover/smt/solver/dependent-expr-state.ts +81 -0
- package/src/prover/smt/solver/der.ts +38 -10
- package/src/prover/smt/solver/diff-neq.ts +205 -0
- package/src/prover/smt/solver/distribute-forall.ts +57 -0
- package/src/prover/smt/solver/dom-simplify.ts +511 -0
- package/src/prover/smt/solver/dt2bv-tactic.ts +260 -0
- package/src/prover/smt/solver/dyn-ack.ts +0 -1
- package/src/prover/smt/solver/e-matching.ts +6 -7
- package/src/prover/smt/solver/elim-small-bv-tactic.ts +129 -0
- package/src/prover/smt/solver/elim-uncnstr.ts +542 -0
- package/src/prover/smt/solver/enode.ts +100 -3
- package/src/prover/smt/solver/eq2bv-tactic.ts +218 -0
- package/src/prover/smt/solver/euf/arith-axioms.ts +403 -0
- package/src/prover/smt/solver/euf/arith-internalize.ts +653 -0
- package/src/prover/smt/solver/euf/arith-solver.ts +889 -0
- package/src/prover/smt/solver/euf/array-axioms.ts +527 -0
- package/src/prover/smt/solver/euf/array-internalize.ts +428 -0
- package/src/prover/smt/solver/euf/array-solver.ts +306 -0
- package/src/prover/smt/solver/euf/bv-ackerman.ts +162 -0
- package/src/prover/smt/solver/euf/bv-internalize.ts +748 -0
- package/src/prover/smt/solver/euf/bv-solver.ts +449 -0
- package/src/prover/smt/solver/euf/dt-solver.ts +618 -0
- package/src/prover/smt/solver/euf/egraph.ts +901 -0
- package/src/prover/smt/solver/euf/euf-solver.ts +1204 -0
- package/src/prover/smt/solver/euf/fpa-solver.ts +317 -0
- package/src/prover/smt/solver/euf/mam.ts +1046 -0
- package/src/prover/smt/solver/euf/q-ematch.ts +829 -0
- package/src/prover/smt/solver/euf/q-mbi.ts +587 -0
- package/src/prover/smt/solver/euf/q-model-fixer.ts +296 -0
- package/src/prover/smt/solver/euf/q-solver.ts +361 -0
- package/src/prover/smt/solver/euf/th-solver.ts +328 -0
- package/src/prover/smt/solver/euf/th-solvers.ts +30 -0
- package/src/prover/smt/solver/expr-ref.ts +0 -1
- package/src/prover/smt/solver/expr-safe-replace.ts +26 -2
- package/src/prover/smt/solver/expr2polynomial.ts +271 -0
- package/src/prover/smt/solver/factor.ts +163 -0
- package/src/prover/smt/solver/fd-solver.ts +267 -0
- package/src/prover/smt/solver/fingerprints.ts +15 -15
- package/src/prover/smt/solver/fix-dl-var.ts +147 -0
- package/src/prover/smt/solver/flat-literals.ts +0 -1
- package/src/prover/smt/solver/fm-tactic.ts +884 -0
- package/src/prover/smt/solver/fpa-decl-plugin.ts +618 -0
- package/src/prover/smt/solver/fpa-rewriter.ts +639 -0
- package/src/prover/smt/solver/fpa2bv-converter.ts +2251 -0
- package/src/prover/smt/solver/fpa2bv-rewriter.ts +349 -0
- package/src/prover/smt/solver/fpa2bv-tactic.ts +73 -0
- package/src/prover/smt/solver/goal.ts +177 -15
- package/src/prover/smt/solver/goal2nlsat.ts +216 -0
- package/src/prover/smt/solver/guard-set.ts +219 -0
- package/src/prover/smt/solver/hash.ts +0 -1
- package/src/prover/smt/solver/hashtable.ts +30 -16
- package/src/prover/smt/solver/inf-eps.ts +63 -0
- package/src/prover/smt/solver/inj-axiom.ts +101 -0
- package/src/prover/smt/solver/internalizer.ts +109 -36
- package/src/prover/smt/solver/lackr.ts +381 -0
- package/src/prover/smt/solver/lbool.ts +0 -1
- package/src/prover/smt/solver/lia2card.ts +268 -0
- package/src/prover/smt/solver/lia2pb.ts +154 -0
- package/src/prover/smt/solver/literal.ts +0 -1
- package/src/prover/smt/solver/logic-tactics.ts +345 -0
- package/src/prover/smt/solver/lp/bound-propagator.ts +0 -1
- package/src/prover/smt/solver/lp/constraints.ts +0 -1
- package/src/prover/smt/solver/lp/containers.ts +7 -2
- package/src/prover/smt/solver/lp/core-solver.ts +18 -3
- package/src/prover/smt/solver/lp/cross-nested.ts +1 -4
- package/src/prover/smt/solver/lp/dep-intervals.ts +0 -3
- package/src/prover/smt/solver/lp/dependency.ts +0 -2
- package/src/prover/smt/solver/lp/dioph-eq.ts +0 -2
- package/src/prover/smt/solver/lp/explanation.ts +0 -1
- package/src/prover/smt/solver/lp/gomory.ts +0 -1
- package/src/prover/smt/solver/lp/hnf-cutter.ts +0 -1
- package/src/prover/smt/solver/lp/hnf.ts +0 -3
- package/src/prover/smt/solver/lp/int-cube.ts +3 -4
- package/src/prover/smt/solver/lp/int-solver.ts +0 -2
- package/src/prover/smt/solver/lp/lar-solver.ts +40 -4
- package/src/prover/smt/solver/lp/lar-term.ts +0 -1
- package/src/prover/smt/solver/lp/lp-settings.ts +0 -1
- package/src/prover/smt/solver/lp/maximize-term.ts +59 -10
- package/src/prover/smt/solver/lp/nex-creator.ts +3 -3
- package/src/prover/smt/solver/lp/nex.ts +2 -2
- package/src/prover/smt/solver/lp/nla-backoff.ts +0 -2
- package/src/prover/smt/solver/lp/nla-basics.ts +46 -3
- package/src/prover/smt/solver/lp/nla-core.ts +66 -11
- package/src/prover/smt/solver/lp/nla-divisions.ts +0 -2
- package/src/prover/smt/solver/lp/nla-emonics.ts +0 -1
- package/src/prover/smt/solver/lp/nla-factorization.ts +0 -1
- package/src/prover/smt/solver/lp/nla-grobner.ts +167 -85
- package/src/prover/smt/solver/lp/nla-horner.ts +0 -2
- package/src/prover/smt/solver/lp/nla-intervals.ts +0 -1
- package/src/prover/smt/solver/lp/nla-monomial-bounds.ts +0 -2
- package/src/prover/smt/solver/lp/nla-monotone.ts +0 -1
- package/src/prover/smt/solver/lp/nla-order.ts +0 -2
- package/src/prover/smt/solver/lp/nla-patcher.ts +0 -1
- package/src/prover/smt/solver/lp/nla-powers.ts +220 -0
- package/src/prover/smt/solver/lp/nla-tangents.ts +0 -2
- package/src/prover/smt/solver/lp/nla-throttle.ts +0 -1
- package/src/prover/smt/solver/lp/nla-transcendentals.ts +324 -0
- package/src/prover/smt/solver/lp/nla-types.ts +0 -2
- package/src/prover/smt/solver/lp/nla-var-eqs.ts +0 -1
- package/src/prover/smt/solver/lp/nra-solver.ts +163 -99
- package/src/prover/smt/solver/lp/numeric-pair.ts +0 -1
- package/src/prover/smt/solver/lp/pdd-interval.ts +6 -3
- package/src/prover/smt/solver/lp/pdd-simplifier.ts +60 -21
- package/src/prover/smt/solver/lp/pdd-solver.ts +72 -41
- package/src/prover/smt/solver/lp/pdd.ts +725 -290
- package/src/prover/smt/solver/lp/random-updater.ts +0 -2
- package/src/prover/smt/solver/lp/static-matrix.ts +0 -1
- package/src/prover/smt/solver/lp/union-find.ts +7 -2
- package/src/prover/smt/solver/macro-finder.ts +530 -0
- package/src/prover/smt/solver/mam-compiler.ts +118 -88
- package/src/prover/smt/solver/mam-interpreter.ts +0 -1
- package/src/prover/smt/solver/max-bv-sharing-tactic.ts +17 -0
- package/src/prover/smt/solver/max-cliques.ts +105 -0
- package/src/prover/smt/solver/maxcore.ts +309 -0
- package/src/prover/smt/solver/maximize-ac-sharing.ts +8 -6
- package/src/prover/smt/solver/maxlex.ts +115 -0
- package/src/prover/smt/solver/maxsmt-base.ts +105 -0
- package/src/prover/smt/solver/maxsmt.ts +92 -0
- package/src/prover/smt/solver/mbp/mbp-arith.ts +467 -0
- package/src/prover/smt/solver/mbp/mbp-basic-tg.ts +101 -0
- package/src/prover/smt/solver/mbp/mbp-plugin.ts +287 -0
- package/src/prover/smt/solver/mbp/mbp-qel.ts +48 -0
- package/src/prover/smt/solver/mbp/mbp-solve-plugin.ts +271 -0
- package/src/prover/smt/solver/mbp/mbp-term-graph.ts +606 -0
- package/src/prover/smt/solver/model-based-opt.ts +844 -0
- package/src/prover/smt/solver/model-checker.ts +17 -26
- package/src/prover/smt/solver/model-evaluator.ts +188 -12
- package/src/prover/smt/solver/model-finder.ts +0 -1
- package/src/prover/smt/solver/model-generator.ts +59 -30
- package/src/prover/smt/solver/model-macro-solver.ts +38 -27
- package/src/prover/smt/solver/model-printer.ts +214 -0
- package/src/prover/smt/solver/mpf.ts +709 -0
- package/src/prover/smt/solver/mus.ts +50 -0
- package/src/prover/smt/solver/muz/dl-context.ts +410 -0
- package/src/prover/smt/solver/muz/dl-mk-bit-blast.ts +97 -0
- package/src/prover/smt/solver/muz/dl-mk-coi-filter.ts +167 -0
- package/src/prover/smt/solver/muz/dl-mk-elim-term-ite.ts +125 -0
- package/src/prover/smt/solver/muz/dl-mk-interp-tail-simplifier.ts +299 -0
- package/src/prover/smt/solver/muz/dl-mk-rule-inliner.ts +455 -0
- package/src/prover/smt/solver/muz/dl-mk-slice.ts +340 -0
- package/src/prover/smt/solver/muz/dl-mk-subsumption-checker.ts +163 -0
- package/src/prover/smt/solver/muz/dl-rule-set.ts +273 -0
- package/src/prover/smt/solver/muz/dl-rule-transformer.ts +123 -0
- package/src/prover/smt/solver/muz/dl-rule.ts +496 -0
- package/src/prover/smt/solver/muz/hnf.ts +201 -0
- package/src/prover/smt/solver/muz/horn-subsume-model-converter.ts +176 -0
- package/src/prover/smt/solver/muz/horn-tactic.ts +201 -0
- package/src/prover/smt/solver/muz/rule-properties.ts +337 -0
- package/src/prover/smt/solver/muz/spacer-context.ts +1404 -0
- package/src/prover/smt/solver/muz/spacer-dl-interface.ts +52 -0
- package/src/prover/smt/solver/muz/spacer-generalizers.ts +241 -0
- package/src/prover/smt/solver/muz/spacer-manager.ts +127 -0
- package/src/prover/smt/solver/muz/spacer-pdr.ts +219 -0
- package/src/prover/smt/solver/muz/spacer-prop-solver.ts +333 -0
- package/src/prover/smt/solver/muz/spacer-util.ts +282 -0
- package/src/prover/smt/solver/muz/substitution.ts +203 -0
- package/src/prover/smt/solver/nla2bv-tactic.ts +285 -0
- package/src/prover/smt/solver/nlqsat.ts +484 -0
- package/src/prover/smt/solver/nlsat/algebraic.ts +305 -88
- package/src/prover/smt/solver/nlsat/atoms.ts +52 -35
- package/src/prover/smt/solver/nlsat/evaluator.ts +0 -1
- package/src/prover/smt/solver/nlsat/explain.ts +424 -211
- package/src/prover/smt/solver/nlsat/interval-set.ts +1 -2
- package/src/prover/smt/solver/nlsat/levelwise.ts +460 -241
- package/src/prover/smt/solver/nlsat/mpbq.ts +45 -1
- package/src/prover/smt/solver/nlsat/polynomial.ts +2366 -683
- package/src/prover/smt/solver/nlsat/solver.ts +282 -69
- package/src/prover/smt/solver/nlsat/transcendental-eval.ts +310 -0
- package/src/prover/smt/solver/nlsat/transcendentals.ts +391 -0
- package/src/prover/smt/solver/nlsat/types.ts +0 -2
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +8 -7
- package/src/prover/smt/solver/nlsat/upolynomial.ts +41 -20
- package/src/prover/smt/solver/nlsat-tactic.ts +82 -0
- package/src/prover/smt/solver/nnf.ts +105 -23
- package/src/prover/smt/solver/normalize-bounds.ts +53 -0
- package/src/prover/smt/solver/occf.ts +97 -0
- package/src/prover/smt/solver/opt-context.ts +792 -0
- package/src/prover/smt/solver/opt-nlsat.ts +386 -0
- package/src/prover/smt/solver/opt-pareto.ts +282 -0
- package/src/prover/smt/solver/opt-preprocess.ts +101 -0
- package/src/prover/smt/solver/opt-solver.ts +311 -0
- package/src/prover/smt/solver/opt-value.ts +55 -0
- package/src/prover/smt/solver/optsmt.ts +692 -0
- package/src/prover/smt/solver/parallel-tactic.ts +299 -0
- package/src/prover/smt/solver/pattern-inference.ts +19 -11
- package/src/prover/smt/solver/pb-rewriter.ts +281 -0
- package/src/prover/smt/solver/pb2bv-tactic.ts +540 -0
- package/src/prover/smt/solver/poly-rewriter.ts +202 -57
- package/src/prover/smt/solver/probes.ts +511 -0
- package/src/prover/smt/solver/propagate-values.ts +37 -21
- package/src/prover/smt/solver/proto-model.ts +650 -17
- package/src/prover/smt/solver/pull-quant.ts +28 -12
- package/src/prover/smt/solver/purify-arith.ts +632 -0
- package/src/prover/smt/solver/qe-arith-plugin.ts +1096 -0
- package/src/prover/smt/solver/qe-lite-der.ts +2 -3
- package/src/prover/smt/solver/qe-lite-fm.ts +3 -4
- package/src/prover/smt/solver/qe-lite.ts +37 -17
- package/src/prover/smt/solver/qe-mbp.ts +270 -0
- package/src/prover/smt/solver/qe.ts +1499 -0
- package/src/prover/smt/solver/qel.ts +25 -0
- package/src/prover/smt/solver/qi-queue.ts +0 -1
- package/src/prover/smt/solver/qsat.ts +814 -0
- package/src/prover/smt/solver/quant-hoist.ts +196 -0
- package/src/prover/smt/solver/quant-tactics.ts +16 -56
- package/src/prover/smt/solver/quantifier-analyzer.ts +9 -10
- package/src/prover/smt/solver/quantifier-manager.ts +25 -24
- package/src/prover/smt/solver/quasi-macros.ts +243 -0
- package/src/prover/smt/solver/random-gen.ts +0 -1
- package/src/prover/smt/solver/rational.ts +45 -1
- package/src/prover/smt/solver/recfun-decl-plugin.ts +262 -0
- package/src/prover/smt/solver/recfun-rewriter.ts +107 -0
- package/src/prover/smt/solver/reduce-args.ts +225 -0
- package/src/prover/smt/solver/reduce-bv-size.ts +119 -0
- package/src/prover/smt/solver/ref-vector.ts +0 -1
- package/src/prover/smt/solver/relevancy.ts +1 -2
- package/src/prover/smt/solver/rewriter-tpl.ts +77 -10
- package/src/prover/smt/solver/rewriter.ts +475 -36
- package/src/prover/smt/solver/rlimit.ts +38 -2
- package/src/prover/smt/solver/sat/asymm-branch.ts +325 -0
- package/src/prover/smt/solver/sat/big.ts +177 -0
- package/src/prover/smt/solver/sat/clause-use-list.ts +71 -0
- package/src/prover/smt/solver/sat/clause.ts +203 -0
- package/src/prover/smt/solver/sat/cleaner.ts +94 -0
- package/src/prover/smt/solver/sat/config.ts +122 -0
- package/src/prover/smt/solver/sat/consequences.ts +203 -0
- package/src/prover/smt/solver/sat/elim-eqs.ts +142 -0
- package/src/prover/smt/solver/sat/goal2sat.ts +526 -0
- package/src/prover/smt/solver/sat/inc-sat-solver.ts +378 -0
- package/src/prover/smt/solver/sat/model-converter.ts +136 -0
- package/src/prover/smt/solver/sat/pb-constraint.ts +261 -0
- package/src/prover/smt/solver/sat/pb-solver.ts +1577 -0
- package/src/prover/smt/solver/sat/probing.ts +170 -0
- package/src/prover/smt/solver/sat/sat-tactic.ts +44 -0
- package/src/prover/smt/solver/sat/sat2goal.ts +165 -0
- package/src/prover/smt/solver/sat/scc.ts +142 -0
- package/src/prover/smt/solver/sat/simplifier.ts +1618 -0
- package/src/prover/smt/solver/sat/solver.ts +2105 -0
- package/src/prover/smt/solver/sat/var-queue.ts +117 -0
- package/src/prover/smt/solver/sat/watch-list.ts +140 -0
- package/src/prover/smt/solver/search-tree.ts +284 -0
- package/src/prover/smt/solver/seq-axioms.ts +995 -0
- package/src/prover/smt/solver/seq-decl-plugin.ts +819 -0
- package/src/prover/smt/solver/seq-derive.ts +1298 -0
- package/src/prover/smt/solver/seq-eq-approx.ts +236 -0
- package/src/prover/smt/solver/seq-eq-solver.ts +439 -0
- package/src/prover/smt/solver/seq-factory.ts +89 -0
- package/src/prover/smt/solver/seq-monadic.ts +730 -0
- package/src/prover/smt/solver/seq-range-predicate.ts +235 -0
- package/src/prover/smt/solver/seq-re-rewriter.ts +1171 -0
- package/src/prover/smt/solver/seq-re-util.ts +758 -0
- package/src/prover/smt/solver/seq-regex-bisim.ts +144 -0
- package/src/prover/smt/solver/seq-regex-live.ts +200 -0
- package/src/prover/smt/solver/seq-rewriter.ts +2404 -0
- package/src/prover/smt/solver/seq-skolem.ts +294 -0
- package/src/prover/smt/solver/seq-subset.ts +165 -0
- package/src/prover/smt/solver/seq-view-witness.ts +353 -0
- package/src/prover/smt/solver/smt-consequences.ts +297 -0
- package/src/prover/smt/solver/smt-kernel.ts +90 -0
- package/src/prover/smt/solver/smt-logics.ts +66 -0
- package/src/prover/smt/solver/smt-setup.ts +544 -0
- package/src/prover/smt/solver/smt2-printer.ts +765 -0
- package/src/prover/smt/solver/smtlib-parser.ts +3228 -327
- package/src/prover/smt/solver/smtlib-script.ts +1843 -0
- package/src/prover/smt/solver/solve-eqs.ts +923 -0
- package/src/prover/smt/solver/solver.ts +113 -22
- package/src/prover/smt/solver/static-features.ts +314 -0
- package/src/prover/smt/solver/sticky-generations.ts +0 -1
- package/src/prover/smt/solver/tactic.ts +2012 -0
- package/src/prover/smt/solver/term-enumeration.ts +205 -0
- package/src/prover/smt/solver/theory-array.ts +1240 -0
- package/src/prover/smt/solver/theory-bv.ts +1200 -0
- package/src/prover/smt/solver/theory-char.ts +355 -0
- package/src/prover/smt/solver/theory-datatype.ts +598 -0
- package/src/prover/smt/solver/theory-finite-set.ts +30 -0
- package/src/prover/smt/solver/theory-fpa.ts +389 -0
- package/src/prover/smt/solver/theory-lra-axioms.ts +53 -2
- package/src/prover/smt/solver/theory-lra-bounds.ts +31 -5
- package/src/prover/smt/solver/theory-lra-final-check.ts +56 -71
- package/src/prover/smt/solver/theory-lra-internalize.ts +89 -11
- package/src/prover/smt/solver/theory-lra-model.ts +20 -35
- package/src/prover/smt/solver/theory-lra-propagate.ts +24 -28
- package/src/prover/smt/solver/theory-lra-state.ts +6 -22
- package/src/prover/smt/solver/theory-lra.ts +188 -2
- package/src/prover/smt/solver/theory-pb.ts +933 -0
- package/src/prover/smt/solver/theory-polymorphism.ts +58 -0
- package/src/prover/smt/solver/theory-recfun.ts +307 -0
- package/src/prover/smt/solver/theory-seq-regex.ts +867 -0
- package/src/prover/smt/solver/theory-seq-solve.ts +1373 -0
- package/src/prover/smt/solver/theory-seq-state.ts +852 -0
- package/src/prover/smt/solver/theory-seq.ts +961 -0
- package/src/prover/smt/solver/theory.ts +189 -0
- package/src/prover/smt/solver/tseitin-cnf.ts +485 -0
- package/src/prover/smt/solver/var-subst.ts +36 -14
- package/src/prover/smt/table.ts +3 -2
- package/src/prover/smt/types.ts +146 -0
- package/src/prover/tlapm/cache.ts +37 -16
- package/src/prover/tlapm-library.ts +3208 -0
- package/src/prover/verdict.ts +2 -0
- package/src/prover/zenon/decide.ts +10 -7
- package/src/prover/zenon/encode.ts +0 -2
- package/src/prover/zenon/eqrel.ts +0 -2
- package/src/prover/zenon/equality-rules.ts +24 -2
- package/src/prover/zenon/expr.ts +21 -2
- package/src/prover/zenon/index-table.ts +7 -4
- package/src/prover/zenon/isar-case.ts +1 -3
- package/src/prover/zenon/isar.ts +2 -4
- package/src/prover/zenon/llproof.ts +0 -2
- package/src/prover/zenon/mltoll.ts +0 -2
- package/src/prover/zenon/node.ts +20 -5
- package/src/prover/zenon/parse.ts +6 -2
- package/src/prover/zenon/phrase.ts +1 -3
- package/src/prover/zenon/proof.ts +0 -2
- package/src/prover/zenon/propositional-rules.ts +0 -2
- package/src/prover/zenon/rules.ts +2 -3
- package/src/prover/zenon/search.ts +7 -5
- package/src/prover/zenon/tla/functions.ts +0 -2
- package/src/prover/zenon/tla/llproof.ts +0 -2
- package/src/prover/zenon/tla/records.ts +0 -2
- package/src/prover/zenon/tla/rewrites.ts +0 -2
- package/src/prover/zenon/tla/sets.ts +7 -8
- package/src/prover/zenon/tla/terms.ts +0 -2
- package/src/prover/zenon/tla/tla.ts +0 -2
- package/src/resolve.ts +625 -189
- package/src/runtime.ts +7 -1
- package/src/sany/builtins.ts +10 -10
- package/src/sany/generation.ts +2 -13
- package/src/sany/generator-definitions.ts +3 -1
- package/src/sany/generator-expressions.ts +36 -30
- package/src/sany/generator-proofs.ts +5 -3
- package/src/sany/generator.ts +2 -1
- package/src/sany/levels.ts +0 -2
- package/src/sany/lexer.ts +3 -3
- package/src/sany/linter.ts +0 -2
- package/src/sany/modules.ts +4 -2
- package/src/sany/nodes.ts +1 -1
- package/src/sany/selectors.ts +11 -6
- package/src/sany/xml.ts +2 -3
- package/src/search.ts +209 -56
- package/src/simulate.ts +3 -0
- package/src/spec-description.ts +2 -2
- package/src/standard-definitions.ts +4 -0
- package/src/state-graph.ts +0 -2
- package/src/subexpressions.ts +265 -94
- package/src/successors.ts +2 -1
- package/src/symmetry.ts +3 -3
- package/src/tableau.ts +2 -2
- package/src/tlc/fingerprint.ts +81 -9
- package/src/tlc/jar-data.ts +10 -0
- package/src/tlc/messages.ts +3 -3
- package/src/tlc/order.ts +14 -3
- package/src/tlc/summary.ts +29 -14
- package/src/tlc/tlc-operators.ts +3 -1
- package/src/tlc/tlcext-operators.ts +61 -16
- package/src/tlc/trace-spec.ts +5 -5
- package/src/typed-tier.ts +6541 -0
- package/src/typescript/types.ts +2 -2
- package/src/values.ts +46 -27
- package/src/prover/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,5 +1,3 @@
|
|
|
1
|
-
// A port of tlapm's obligation generation (Proof.Gen and Module.Gen).
|
|
2
|
-
|
|
3
1
|
import { TlapmBugError, TlaProofError } from "../errors";
|
|
4
2
|
import { isEqualExpr } from "./equality";
|
|
5
3
|
import {
|
|
@@ -13,6 +11,7 @@ import {
|
|
|
13
11
|
getTrue,
|
|
14
12
|
isBuiltinApply,
|
|
15
13
|
mapAccumulate,
|
|
14
|
+
type Defn,
|
|
16
15
|
type Expr,
|
|
17
16
|
type Hyp,
|
|
18
17
|
type Locus,
|
|
@@ -45,7 +44,7 @@ const getAssumedFacts = (offset: number, sequent: Sequent) =>
|
|
|
45
44
|
: [],
|
|
46
45
|
);
|
|
47
46
|
|
|
48
|
-
const getStepDefinition = (step: Step, body: Expr, time: Time): Hyp => {
|
|
47
|
+
export const getStepDefinition = (step: Step, body: Expr, time: Time): Hyp => {
|
|
49
48
|
if (!step.step) throw new TlapmBugError();
|
|
50
49
|
return getDefinitionHyp(
|
|
51
50
|
{ kind: "Operator", name: getStepName(step.step), body, location: step.location },
|
|
@@ -56,6 +55,11 @@ const getStepDefinition = (step: Step, body: Expr, time: Time): Hyp => {
|
|
|
56
55
|
);
|
|
57
56
|
};
|
|
58
57
|
|
|
58
|
+
export const getDefineHyp = (definition: Defn): Hyp => ({
|
|
59
|
+
...getLocalDefn(definition),
|
|
60
|
+
location: definition.location,
|
|
61
|
+
});
|
|
62
|
+
|
|
59
63
|
export const proveAssertion = (context: Hyp[], sequent: Sequent, step: Step, time: Time) => {
|
|
60
64
|
const visibility: Visibility = isAnonymous(step.step) ? "Visible" : "Hidden";
|
|
61
65
|
const hyps = sequent.context.map((hyp): Hyp =>
|
|
@@ -101,10 +105,10 @@ const getFactTime = (context: Hyp[], fact: Expr, time: Time): Time => {
|
|
|
101
105
|
if (hyp?.kind === "Fact") return hyp.time;
|
|
102
106
|
return hyp?.kind === "Defn" && typeof hyp.whereDefined === "object"
|
|
103
107
|
? hyp.whereDefined.time
|
|
104
|
-
:
|
|
108
|
+
: time;
|
|
105
109
|
};
|
|
106
110
|
|
|
107
|
-
const setDefinition = (visibility: Visibility, context: Hyp[], def: UseDef): Hyp[] => {
|
|
111
|
+
export const setDefinition = (visibility: Visibility, context: Hyp[], def: UseDef): Hyp[] => {
|
|
108
112
|
if (def.kind !== "Dx") throw new TlaProofError(`Unknown definition ${def.name}`);
|
|
109
113
|
const index = context.length - def.index;
|
|
110
114
|
const hyp = context[index];
|
|
@@ -119,7 +123,7 @@ const isDomainMatch = (fact: Expr, domain: Expr) =>
|
|
|
119
123
|
fact.args[0].index === 0 &&
|
|
120
124
|
isEqualExpr(domain, fact.args[1]);
|
|
121
125
|
|
|
122
|
-
const setExpression = (
|
|
126
|
+
export const setExpression = (
|
|
123
127
|
onWarning: Warn,
|
|
124
128
|
visibility: Visibility,
|
|
125
129
|
fact: Expr,
|
|
@@ -156,9 +160,15 @@ export interface LineRange {
|
|
|
156
160
|
|
|
157
161
|
const obligate = (
|
|
158
162
|
sequent: Sequent,
|
|
159
|
-
from: { location?: Locus; method?: OldMethod },
|
|
163
|
+
from: { location?: Locus; method?: OldMethod; isEnabledAxiomsSound?: boolean },
|
|
160
164
|
kind: ObligationKind,
|
|
161
|
-
): Obligation => ({
|
|
165
|
+
): Obligation => ({
|
|
166
|
+
sequent,
|
|
167
|
+
location: from.location,
|
|
168
|
+
kind,
|
|
169
|
+
method: from.method,
|
|
170
|
+
isEnabledAxiomsSound: from.isEnabledAxiomsSound,
|
|
171
|
+
});
|
|
162
172
|
|
|
163
173
|
interface ProofSummary {
|
|
164
174
|
total: number;
|
|
@@ -302,13 +312,7 @@ export const createGenerator = (inputFiles: Set<string>, lines: LineRange, onWar
|
|
|
302
312
|
case "Define":
|
|
303
313
|
return {
|
|
304
314
|
sequent: {
|
|
305
|
-
context: [
|
|
306
|
-
...sequent.context,
|
|
307
|
-
...step.definitions.map((definition): Hyp => ({
|
|
308
|
-
...getLocalDefn(definition),
|
|
309
|
-
location: definition.location,
|
|
310
|
-
})),
|
|
311
|
-
],
|
|
315
|
+
context: [...sequent.context, ...step.definitions.map(getDefineHyp)],
|
|
312
316
|
active: shiftExpr(step.definitions.length, sequent.active),
|
|
313
317
|
},
|
|
314
318
|
step,
|
|
@@ -391,10 +395,11 @@ export const createGenerator = (inputFiles: Set<string>, lines: LineRange, onWar
|
|
|
391
395
|
item.steps.forEach(visitStep);
|
|
392
396
|
return;
|
|
393
397
|
}
|
|
394
|
-
if (item.obligations) obligations.push(...item.obligations);
|
|
398
|
+
if (item.obligations && !item.isSuppressed) obligations.push(...item.obligations);
|
|
395
399
|
};
|
|
396
400
|
const visitStep = (step: Step) => {
|
|
397
|
-
if (step.kind === "Use" && step.obligations
|
|
401
|
+
if (step.kind === "Use" && step.obligations && !step.isSuppressed)
|
|
402
|
+
obligations.push(...step.obligations);
|
|
398
403
|
if ("proof" in step) visitProof(step.proof);
|
|
399
404
|
};
|
|
400
405
|
visitProof(proof);
|
package/src/obligations/index.ts
CHANGED
|
@@ -3,8 +3,10 @@ import { createAnonymizer } from "./anonymize";
|
|
|
3
3
|
import {
|
|
4
4
|
getAtPrefix,
|
|
5
5
|
getErrorNote,
|
|
6
|
+
getErrorSetting,
|
|
6
7
|
getLocusPosition,
|
|
7
8
|
getLocusPrefix,
|
|
9
|
+
warnError,
|
|
8
10
|
type Locus,
|
|
9
11
|
type Warn,
|
|
10
12
|
type Sequent,
|
|
@@ -17,8 +19,8 @@ import {
|
|
|
17
19
|
} from "./generate";
|
|
18
20
|
import { compareNames, flatten, getDependencies, STANDARD_MODULES, type Mule } from "./module";
|
|
19
21
|
import { expandInstance, normalize, type Pipeline } from "./normalize";
|
|
20
|
-
import { formatObligation } from "./printer";
|
|
21
|
-
import type
|
|
22
|
+
import { formatObligation, type PrinterOptions } from "./printer";
|
|
23
|
+
import { getUnique, type Counter, type ObligationKind } from "./proof";
|
|
22
24
|
import type { OldMethod } from "./pragma";
|
|
23
25
|
import { createSimplifier } from "./simplify";
|
|
24
26
|
import { createModuleConverter } from "./source";
|
|
@@ -39,6 +41,7 @@ export interface PrintedObligation {
|
|
|
39
41
|
kind: ObligationKind;
|
|
40
42
|
sequent: Sequent;
|
|
41
43
|
method?: OldMethod;
|
|
44
|
+
isEnabledAxiomsSound?: boolean;
|
|
42
45
|
}
|
|
43
46
|
|
|
44
47
|
export interface ModuleObligations {
|
|
@@ -53,6 +56,7 @@ export const WHOLE_MODULE: LineRange = { start: 0, end: Infinity };
|
|
|
53
56
|
interface ObligationOptions {
|
|
54
57
|
lines?: LineRange;
|
|
55
58
|
onWarning?: Warn;
|
|
59
|
+
printing?: PrinterOptions;
|
|
56
60
|
}
|
|
57
61
|
|
|
58
62
|
const MODULE_HEADER = /-{4,} *MODULE/;
|
|
@@ -63,7 +67,7 @@ const formatLocus = (locus: Locus | undefined) =>
|
|
|
63
67
|
locus ? `${locus.startLine}:${locus.startColumn}:${locus.endLine}:${locus.endColumn}` : "";
|
|
64
68
|
|
|
65
69
|
const findTab = (source: string) => {
|
|
66
|
-
const tokens = tokenize(source);
|
|
70
|
+
const tokens = tokenize(source, true);
|
|
67
71
|
const lines = source.split("\n");
|
|
68
72
|
const endLine = tokens.at(-1)?.line ?? lines.length;
|
|
69
73
|
const moduleEnd =
|
|
@@ -127,11 +131,36 @@ const loadMule = (
|
|
|
127
131
|
): Mule => {
|
|
128
132
|
if (!MODULE_HEADER.test(input.source)) throw new TlaProofError("No tokens in file");
|
|
129
133
|
const parsed = parseSource(input.source);
|
|
134
|
+
const proofFailure = Array.isArray(parsed) ? parsed[0].proof : undefined;
|
|
135
|
+
if (Array.isArray(parsed) && proofFailure) {
|
|
136
|
+
const locus = {
|
|
137
|
+
file: input.file,
|
|
138
|
+
startLine: parsed[0].line,
|
|
139
|
+
startColumn: parsed[0].column,
|
|
140
|
+
endLine: proofFailure.stop.line,
|
|
141
|
+
endColumn: proofFailure.stop.column,
|
|
142
|
+
};
|
|
143
|
+
onWarning(getErrorNote(locus, proofFailure.printed));
|
|
144
|
+
onWarning(getErrorSetting(locus, parsed[0].reason));
|
|
145
|
+
throw new TlaProofError(parsed[0].reason, { failure: proofFailure.exception });
|
|
146
|
+
}
|
|
130
147
|
if (Array.isArray(parsed)) {
|
|
131
148
|
parsed.forEach((failure) => {
|
|
132
149
|
const text = `File ${JSON.stringify(input.file)}, line ${failure.line}, character ${failure.column}\n${failure.reason}`;
|
|
133
150
|
onWarning({ text, channel: "stderr" });
|
|
134
151
|
onWarning({ text: `${text}\n`, channel: "toolboxOnly" });
|
|
152
|
+
onWarning(
|
|
153
|
+
getErrorSetting(
|
|
154
|
+
{
|
|
155
|
+
file: input.file,
|
|
156
|
+
startLine: failure.line,
|
|
157
|
+
startColumn: failure.column,
|
|
158
|
+
endLine: failure.line,
|
|
159
|
+
endColumn: failure.column + 1,
|
|
160
|
+
},
|
|
161
|
+
`${failure.reason}\n`,
|
|
162
|
+
),
|
|
163
|
+
);
|
|
135
164
|
});
|
|
136
165
|
const message = `Could not parse ${JSON.stringify(input.file)} successfully.`;
|
|
137
166
|
onWarning({ text: `${errorPrefix}Error: ${message}`, channel: "stderr" });
|
|
@@ -150,7 +179,7 @@ const loadMule = (
|
|
|
150
179
|
|
|
151
180
|
const schedule = (modules: Map<string, Mule>) => {
|
|
152
181
|
const dependencies = new Map(
|
|
153
|
-
[...modules].map((
|
|
182
|
+
[...modules].map((entry) => [entry[0], getDependencies(entry[1]).dependencies]),
|
|
154
183
|
);
|
|
155
184
|
const seen = new Set<string>();
|
|
156
185
|
const order: Mule[] = [];
|
|
@@ -262,7 +291,7 @@ export const getObligations = (
|
|
|
262
291
|
}
|
|
263
292
|
const missing = [...requested.keys()].filter((name) => !found.has(name)).sort(compareNames);
|
|
264
293
|
missing.forEach((name) =>
|
|
265
|
-
onWarning
|
|
294
|
+
warnError(onWarning, requested.get(name), `Unknown module ${JSON.stringify(name)}`),
|
|
266
295
|
);
|
|
267
296
|
if (missing.length > 0)
|
|
268
297
|
throw new TlaProofError(`Unknown module ${JSON.stringify(missing[0])}`, {
|
|
@@ -270,7 +299,7 @@ export const getObligations = (
|
|
|
270
299
|
});
|
|
271
300
|
const pipeline: Pipeline = {
|
|
272
301
|
anonymizer: createAnonymizer(
|
|
273
|
-
counter
|
|
302
|
+
() => `_a${getUnique(counter)}`,
|
|
274
303
|
(scope, definition) => expandInstance(pipeline, scope, definition),
|
|
275
304
|
onWarning,
|
|
276
305
|
),
|
|
@@ -299,7 +328,7 @@ export const getObligations = (
|
|
|
299
328
|
const text =
|
|
300
329
|
obligation.kind.kind === "Error"
|
|
301
330
|
? obligation.kind.message
|
|
302
|
-
: `${formatObligation(obligation.sequent)}\n`;
|
|
331
|
+
: `${formatObligation(obligation.sequent, options.printing)}\n`;
|
|
303
332
|
return [
|
|
304
333
|
{
|
|
305
334
|
id: index + 1,
|
|
@@ -309,6 +338,7 @@ export const getObligations = (
|
|
|
309
338
|
kind: obligation.kind,
|
|
310
339
|
sequent: obligation.sequent,
|
|
311
340
|
method: obligation.method,
|
|
341
|
+
isEnabledAxiomsSound: obligation.isEnabledAxiomsSound,
|
|
312
342
|
},
|
|
313
343
|
];
|
|
314
344
|
});
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// A port of tlapm's Expr.Levels.
|
|
2
|
-
|
|
3
1
|
import { TlaProofError, TlapmBugError } from "../errors";
|
|
4
2
|
import {
|
|
5
3
|
adjoin,
|
|
@@ -15,6 +13,7 @@ import {
|
|
|
15
13
|
type Bound,
|
|
16
14
|
type Builtin,
|
|
17
15
|
type Expr,
|
|
16
|
+
type Hyp,
|
|
18
17
|
type Level,
|
|
19
18
|
type Scope,
|
|
20
19
|
} from "./expression";
|
|
@@ -160,9 +159,12 @@ const getBoundsLevel = (scope: Scope | undefined, bounds: Bound[], body: Expr) =
|
|
|
160
159
|
]);
|
|
161
160
|
};
|
|
162
161
|
|
|
163
|
-
const applyOperator = (operator: LevelInfo, args: LevelInfo[]): LevelInfo => {
|
|
162
|
+
const applyOperator = (operator: LevelInfo, args: LevelInfo[], from: Expr): LevelInfo => {
|
|
164
163
|
if (operator.weights.length !== args.length) {
|
|
165
|
-
throw new TlaProofError("Invalid number of arguments"
|
|
164
|
+
throw new TlaProofError("Invalid number of arguments", {
|
|
165
|
+
failure: "Expr.Levels: ARITY",
|
|
166
|
+
locus: from.location,
|
|
167
|
+
});
|
|
166
168
|
}
|
|
167
169
|
const weighted = args.filter((_arg, index) => operator.weights[index]);
|
|
168
170
|
return {
|
|
@@ -172,6 +174,14 @@ const applyOperator = (operator: LevelInfo, args: LevelInfo[]): LevelInfo => {
|
|
|
172
174
|
};
|
|
173
175
|
};
|
|
174
176
|
|
|
177
|
+
export const getContextLevel = (scope: Scope | undefined, hyps: Hyp[]) => {
|
|
178
|
+
const [inner, levels] = mapAccumulate(scope, hyps, (current, hyp) => {
|
|
179
|
+
const next = adjoin(current, hyp);
|
|
180
|
+
return [next, getHypLevel(next).level];
|
|
181
|
+
});
|
|
182
|
+
return { scope: inner, level: Math.max(0, ...levels) };
|
|
183
|
+
};
|
|
184
|
+
|
|
175
185
|
export const getLevelInfo = (scope: Scope | undefined, expression: Expr): LevelInfo => {
|
|
176
186
|
const recurse = (inner: Expr) => getLevelInfo(scope, inner);
|
|
177
187
|
switch (expression.kind) {
|
|
@@ -207,7 +217,11 @@ export const getLevelInfo = (scope: Scope | undefined, expression: Expr): LevelI
|
|
|
207
217
|
return recurse({ ...expression, operator: operator.args[0] });
|
|
208
218
|
}
|
|
209
219
|
if (operator.kind === "Opaque") {
|
|
210
|
-
return applyOperator(
|
|
220
|
+
return applyOperator(
|
|
221
|
+
getInfo(0, expression.args.length),
|
|
222
|
+
expression.args.map(recurse),
|
|
223
|
+
expression,
|
|
224
|
+
);
|
|
211
225
|
}
|
|
212
226
|
if (operator.kind === "Internal" && expression.args.length === 1) {
|
|
213
227
|
const arg = expression.args[0];
|
|
@@ -236,14 +250,13 @@ export const getLevelInfo = (scope: Scope | undefined, expression: Expr): LevelI
|
|
|
236
250
|
expression.args.forEach(recurse);
|
|
237
251
|
return getInfo(3, 2);
|
|
238
252
|
}
|
|
239
|
-
return applyOperator(recurse(operator), expression.args.map(recurse));
|
|
253
|
+
return applyOperator(recurse(operator), expression.args.map(recurse), expression);
|
|
240
254
|
}
|
|
241
255
|
case "Sequent": {
|
|
242
|
-
const
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
|
|
246
|
-
return getInfo(Math.max(0, ...levels, getLevelInfo(inner, expression.sequent.active).level));
|
|
256
|
+
const context = getContextLevel(scope, expression.sequent.context);
|
|
257
|
+
return getInfo(
|
|
258
|
+
Math.max(context.level, getLevelInfo(context.scope, expression.sequent.active).level),
|
|
259
|
+
);
|
|
247
260
|
}
|
|
248
261
|
case "With":
|
|
249
262
|
case "Dot":
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// A port of tlapm's Module.Standard, Module.Flatten, Module.Dep and Module.Subst.
|
|
2
|
-
|
|
3
1
|
import { TlaProofError, TlapmBugError } from "../errors";
|
|
4
2
|
import {
|
|
5
3
|
at,
|
|
@@ -387,7 +385,7 @@ const substituteUnit = (
|
|
|
387
385
|
instance: {
|
|
388
386
|
...unit.instance,
|
|
389
387
|
substitutions: unit.instance.substitutions.map((entry) => ({
|
|
390
|
-
|
|
388
|
+
...entry,
|
|
391
389
|
expression: substituteExpr(substitution, entry.expression),
|
|
392
390
|
})),
|
|
393
391
|
},
|
|
@@ -1,8 +1,7 @@
|
|
|
1
|
-
// A port of tlapm's Module.Elab.
|
|
2
|
-
|
|
3
1
|
import { TlaProofError, TlapmBugError } from "../errors";
|
|
4
2
|
import { lambdify } from "./action";
|
|
5
3
|
import type { Anonymizer } from "./anonymize";
|
|
4
|
+
import { checkEnabledAxioms } from "./enabled-axioms";
|
|
6
5
|
import { isEqualHyp } from "./equality";
|
|
7
6
|
import {
|
|
8
7
|
adjoinAll,
|
|
@@ -323,9 +322,13 @@ const instantiate = (
|
|
|
323
322
|
const parameters = getParameters(module);
|
|
324
323
|
for (const substitution of instance.substitutions) {
|
|
325
324
|
if (!parameters.has(substitution.name)) {
|
|
326
|
-
|
|
327
|
-
|
|
328
|
-
|
|
325
|
+
pipeline.onWarning({
|
|
326
|
+
text: `${getLocusPrefix(substitution.location)}Parameter ${substitution.name} occurs in the statement \`INSTANCE ${instance.module} WITH\`, and is not declared in the module ${instance.module}\n`,
|
|
327
|
+
channel: "toolbox",
|
|
328
|
+
});
|
|
329
|
+
throw new TlaProofError("Module.Elab.instance_substitutes_declared_identifiers", {
|
|
330
|
+
failure: "Module.Elab.instance_substitutes_declared_identifiers",
|
|
331
|
+
});
|
|
329
332
|
}
|
|
330
333
|
}
|
|
331
334
|
const instanceScope = adjoinAll(
|
|
@@ -338,17 +341,17 @@ const instantiate = (
|
|
|
338
341
|
for (const name of [...parameters].sort(compareNames)) {
|
|
339
342
|
if (substitutes.has(name)) continue;
|
|
340
343
|
if (!findNamed(instanceScope, name)) {
|
|
341
|
-
|
|
342
|
-
|
|
343
|
-
|
|
344
|
+
const message = `Required parameter ${name} for module ${instance.module} could not be inferred.`;
|
|
345
|
+
pipeline.onWarning({
|
|
346
|
+
text: `${getLocusPrefix(instance.instanceLocation)}${message}\n`,
|
|
347
|
+
channel: "toolbox",
|
|
348
|
+
});
|
|
349
|
+
throw new TlaProofError(message, { failure: "Module.Elab.complete_with_statement_params" });
|
|
344
350
|
}
|
|
345
351
|
substitutes.set(name, at({ kind: "Opaque", name }, { location }));
|
|
346
352
|
}
|
|
347
353
|
const anonymized = new Map(
|
|
348
|
-
[...substitutes].map(([
|
|
349
|
-
name,
|
|
350
|
-
pipeline.anonymizer.expr(instanceScope, expression),
|
|
351
|
-
]),
|
|
354
|
+
[...substitutes].map((entry) => [entry[0], pipeline.anonymizer.expr(instanceScope, entry[1])]),
|
|
352
355
|
);
|
|
353
356
|
const body = substituteUnits(
|
|
354
357
|
shift((instanceScope?.size ?? 0) - (module.depth ?? 0)),
|
|
@@ -510,12 +513,17 @@ export const normalize = (
|
|
|
510
513
|
binding.sequent.context,
|
|
511
514
|
);
|
|
512
515
|
const anonymized = pipeline.anonymizer.proof(proofScope, proof);
|
|
516
|
+
const proofContext = getScopeHyps(proofScope);
|
|
513
517
|
const simplified = module.isImportant
|
|
514
|
-
?
|
|
515
|
-
|
|
516
|
-
|
|
517
|
-
|
|
518
|
-
|
|
518
|
+
? checkEnabledAxioms(
|
|
519
|
+
proofContext,
|
|
520
|
+
pipeline.simplify(
|
|
521
|
+
proofContext,
|
|
522
|
+
binding.sequent.active,
|
|
523
|
+
anonymized,
|
|
524
|
+
getScopeTime(binding.sequent.context, "Always"),
|
|
525
|
+
),
|
|
526
|
+
pipeline.onWarning,
|
|
519
527
|
)
|
|
520
528
|
: anonymized;
|
|
521
529
|
emit({ ...unit, name, sequent, proof: simplified });
|
|
@@ -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
|
|
|
@@ -422,26 +430,26 @@ const createPrinter = (hyps: Hyp[] = []) => {
|
|
|
422
430
|
);
|
|
423
431
|
case "Choose": {
|
|
424
432
|
const domainDoc = expression.domain && printExpr(expression.domain);
|
|
425
|
-
return withNames(context, [expression.name], (
|
|
433
|
+
return withNames(context, [expression.name], (names) =>
|
|
426
434
|
createBig(
|
|
427
435
|
domainDoc
|
|
428
436
|
? format(
|
|
429
437
|
"@[<b2>CHOOSE @[<b2>%s \\in@ %a@] :@ %a@]",
|
|
430
|
-
|
|
438
|
+
names[0],
|
|
431
439
|
domainDoc,
|
|
432
440
|
printExpr(expression.body),
|
|
433
441
|
)
|
|
434
|
-
: format("@[<b2>CHOOSE %s :@ %a@]",
|
|
442
|
+
: format("@[<b2>CHOOSE %s :@ %a@]", names[0], printExpr(expression.body)),
|
|
435
443
|
),
|
|
436
444
|
);
|
|
437
445
|
}
|
|
438
446
|
case "SetSt": {
|
|
439
447
|
const domainDoc = printExpr(expression.domain);
|
|
440
|
-
return withNames(context, [expression.name], (
|
|
448
|
+
return withNames(context, [expression.name], (names) =>
|
|
441
449
|
createAtom(
|
|
442
450
|
format(
|
|
443
451
|
"@[<b3>{@[<b2>%s \\in@ %a@] :@ %a}@]",
|
|
444
|
-
|
|
452
|
+
names[0],
|
|
445
453
|
domainDoc,
|
|
446
454
|
printExpr(expression.body),
|
|
447
455
|
),
|
|
@@ -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;
|