tla-ts 0.0.9-dev.8298a52 → 0.0.10-dev.06b481ee0
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 +8 -0
- 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 +121 -12
- package/dist/index.d.ts +121 -12
- 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 +2746 -410
- package/dist/prove.js +2745 -409
- package/dist/run.cjs +144 -31
- package/dist/run.js +144 -31
- package/dist/tlapm.cjs +2 -2
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +134 -104
- package/dist/transfer.js +134 -104
- package/dist/worker.cjs +7 -7
- package/dist/worker.js +7 -7
- package/package.json +1 -1
- package/src/ast.ts +56 -60
- package/src/bags.ts +128 -110
- package/src/builtins.ts +31 -77
- package/src/bundled-modules.ts +1 -8
- package/src/check-failure.ts +118 -0
- package/src/check-trace.ts +320 -0
- package/src/check.ts +1155 -900
- package/src/cli/options.ts +12 -32
- package/src/cli/run.ts +0 -2
- package/src/cli/runtime-invariants.ts +100 -0
- package/src/cli/shared.ts +19 -12
- package/src/cli/tlapm.ts +433 -82
- package/src/cli/tlc-arguments.ts +652 -0
- package/src/cli/tlc-output.ts +701 -0
- package/src/cli/tlc-usage.ts +360 -0
- package/src/cli/tlc.ts +318 -656
- package/src/cli/typescript.ts +0 -3
- package/src/cli/xml-exporter.ts +27 -49
- package/src/cli.ts +0 -1
- package/src/codegen.ts +217 -82
- package/src/config.ts +140 -109
- package/src/coverage.ts +1019 -0
- package/src/dependencies.ts +101 -66
- package/src/dfid.ts +683 -0
- package/src/environment-config.ts +315 -0
- package/src/environment.ts +260 -371
- package/src/errors.ts +93 -58
- package/src/evaluate.ts +848 -374
- package/src/exit-codes.ts +63 -13
- package/src/fingerprints.ts +75 -11
- package/src/index.ts +3 -0
- package/src/instances.ts +97 -43
- package/src/java-hash.ts +21 -0
- package/src/java-overrides.ts +6 -21
- package/src/json-reader.ts +455 -0
- package/src/json.ts +252 -139
- package/src/levels.ts +231 -154
- package/src/lexer.ts +83 -101
- package/src/liveness-checker.ts +743 -325
- package/src/liveness.ts +224 -131
- package/src/obligations/action.ts +17 -44
- package/src/obligations/anonymize.ts +120 -95
- package/src/obligations/enabled-axioms.ts +218 -0
- package/src/obligations/equality.ts +1 -3
- package/src/obligations/expression.ts +37 -26
- package/src/obligations/format.ts +0 -10
- package/src/obligations/generate.ts +66 -64
- package/src/obligations/index.ts +39 -20
- package/src/obligations/levels.ts +27 -18
- package/src/obligations/module.ts +28 -55
- package/src/obligations/normalize.ts +31 -41
- package/src/obligations/operators.ts +0 -3
- package/src/obligations/pragma.ts +52 -24
- package/src/obligations/printer.ts +94 -63
- package/src/obligations/proof.ts +3 -6
- package/src/obligations/regroup.ts +0 -5
- package/src/obligations/simplify.ts +57 -63
- package/src/obligations/source.ts +121 -95
- package/src/obligations/subexpression.ts +49 -28
- package/src/obligations/substitution.ts +1 -5
- package/src/obligations/temporal.ts +12 -20
- package/src/obligations/tuples.ts +2 -10
- package/src/parallel-worker.ts +34 -57
- package/src/parallel.ts +62 -72
- package/src/parser.ts +1184 -531
- package/src/pcal/ast.ts +53 -86
- package/src/pcal/parse.ts +144 -219
- package/src/pcal/tokenize.ts +91 -131
- package/src/pcal/translate.ts +83 -130
- package/src/pcal/validate.ts +48 -68
- package/src/pretty-print.ts +7 -8
- package/src/prover/decide-pool.ts +8 -13
- package/src/prover/deciders.ts +12 -13
- package/src/prover/first-order.ts +0 -11
- package/src/prover/isabelle/decide.ts +3 -31
- package/src/prover/isabelle/encode.ts +82 -64
- 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 +262 -117
- package/src/prover/isabelle/isar/method.ts +510 -226
- package/src/prover/isabelle/isar/proof.ts +570 -23
- package/src/prover/isabelle/isar/rule-cases.ts +226 -0
- package/src/prover/isabelle/isar/theory.ts +488 -88
- package/src/prover/isabelle/isar/toplevel.ts +331 -0
- package/src/prover/isabelle/isar/type-check.ts +99 -38
- package/src/prover/isabelle/provers/blast/blast.ts +16 -105
- package/src/prover/isabelle/provers/blast/branch.ts +0 -33
- package/src/prover/isabelle/provers/blast/prove.ts +0 -36
- package/src/prover/isabelle/provers/blast/rules.ts +5 -45
- package/src/prover/isabelle/provers/blast/state.ts +1 -29
- package/src/prover/isabelle/provers/blast/term.ts +8 -37
- package/src/prover/isabelle/provers/clasimp.ts +1 -15
- package/src/prover/isabelle/provers/classical.ts +58 -61
- package/src/prover/isabelle/provers/hypsubst.ts +29 -54
- package/src/prover/isabelle/pure/bicompose.ts +24 -39
- package/src/prover/isabelle/pure/consts.ts +0 -8
- package/src/prover/isabelle/pure/conv.ts +2 -18
- package/src/prover/isabelle/pure/drule.ts +95 -45
- package/src/prover/isabelle/pure/envir.ts +2 -53
- package/src/prover/isabelle/pure/goal.ts +1 -9
- package/src/prover/isabelle/pure/interrupt.ts +0 -5
- package/src/prover/isabelle/pure/list.ts +0 -3
- package/src/prover/isabelle/pure/logic.ts +1 -16
- package/src/prover/isabelle/pure/name.ts +1 -10
- package/src/prover/isabelle/pure/net.ts +2 -60
- package/src/prover/isabelle/pure/object-logic.ts +15 -16
- package/src/prover/isabelle/pure/pattern.ts +1 -20
- package/src/prover/isabelle/pure/raw-simplifier.ts +16 -63
- package/src/prover/isabelle/pure/rewriter.ts +34 -77
- package/src/prover/isabelle/pure/search.ts +2 -11
- package/src/prover/isabelle/pure/seq.ts +0 -11
- package/src/prover/isabelle/pure/simplifier.ts +27 -16
- package/src/prover/isabelle/pure/table.ts +2 -33
- package/src/prover/isabelle/pure/tactic.ts +11 -23
- package/src/prover/isabelle/pure/tactical.ts +47 -48
- package/src/prover/isabelle/pure/term-ord.ts +1 -7
- package/src/prover/isabelle/pure/term.ts +4 -47
- package/src/prover/isabelle/pure/thm.ts +26 -48
- package/src/prover/isabelle/pure/type.ts +1 -16
- package/src/prover/isabelle/pure/unify.ts +19 -31
- package/src/prover/isabelle/pure/variable.ts +2 -8
- package/src/prover/isabelle/tla/classical-setup.ts +17 -25
- package/src/prover/isabelle/tla/context.ts +65 -26
- package/src/prover/isabelle/tla/logic-data.ts +1 -1
- package/src/prover/isabelle/tla/logic.ts +53 -32
- package/src/prover/isabelle/tla/simpdata.ts +45 -44
- package/src/prover/isabelle/tools/intuitionistic.ts +28 -21
- package/src/prover/ocaml.ts +4 -7
- package/src/prover/prep/action.ts +33 -66
- package/src/prover/prep/enabled-axioms.ts +22 -20
- package/src/prover/prep/fingerprint.ts +2 -21
- package/src/prover/prep/level-comparison.ts +8 -12
- package/src/prover/prep/md5.ts +26 -31
- package/src/prover/prep/methods.ts +189 -86
- package/src/prover/prep/normalize.ts +42 -37
- package/src/prover/prove-worker.ts +0 -2
- package/src/prover/prove.ts +398 -133
- package/src/prover/ptl/decide.ts +96 -56
- package/src/prover/ptl/encode.ts +15 -38
- package/src/prover/ptl/sat.ts +24 -32
- package/src/prover/ptl/tableau.ts +40 -28
- package/src/prover/smt/arithmetic.ts +310 -0
- package/src/prover/smt/axioms.ts +12 -15
- package/src/prover/smt/context.ts +60 -32
- package/src/prover/smt/data.ts +517 -401
- package/src/prover/smt/encode.ts +155 -85
- package/src/prover/smt/extensionality.ts +5 -13
- package/src/prover/smt/flatten.ts +7 -28
- package/src/prover/smt/format.ts +33 -14
- package/src/prover/smt/instances.ts +7 -11
- package/src/prover/smt/layout.ts +91 -0
- package/src/prover/smt/rewrite.ts +1021 -658
- 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 -16
- 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 +626 -56
- 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 +319 -0
- package/src/prover/smt/solver/array.ts +1 -3
- package/src/prover/smt/solver/asserted-formulas.ts +241 -99
- package/src/prover/smt/solver/ast-lt.ts +165 -21
- package/src/prover/smt/solver/ast-util.ts +160 -7
- package/src/prover/smt/solver/ast.ts +1480 -184
- package/src/prover/smt/solver/auf-solver.ts +30 -56
- package/src/prover/smt/solver/bit-blast-tactic.ts +608 -0
- package/src/prover/smt/solver/bit-blaster.ts +871 -0
- package/src/prover/smt/solver/blast-term-ite.ts +47 -0
- package/src/prover/smt/solver/bound-manager.ts +196 -0
- package/src/prover/smt/solver/bound-simplifier.ts +598 -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 +127 -0
- package/src/prover/smt/solver/case-split-queue.ts +0 -10
- package/src/prover/smt/solver/cg-table.ts +39 -42
- package/src/prover/smt/solver/check-logic.ts +330 -0
- package/src/prover/smt/solver/clause.ts +0 -27
- package/src/prover/smt/solver/cofactor-elim-term-ite.ts +293 -0
- package/src/prover/smt/solver/conflict-resolution.ts +78 -11
- package/src/prover/smt/solver/context.ts +600 -187
- package/src/prover/smt/solver/ctx-simplify.ts +34 -52
- package/src/prover/smt/solver/ctx-solver-simplify.ts +122 -0
- package/src/prover/smt/solver/datatype-decl-plugin.ts +580 -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 +93 -0
- package/src/prover/smt/solver/der.ts +39 -30
- 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 +296 -0
- package/src/prover/smt/solver/dyn-ack.ts +0 -11
- package/src/prover/smt/solver/e-matching.ts +9 -41
- package/src/prover/smt/solver/elim-bounds.ts +89 -0
- package/src/prover/smt/solver/elim-small-bv-tactic.ts +129 -0
- package/src/prover/smt/solver/elim-term-ite-tactic.ts +48 -0
- package/src/prover/smt/solver/elim-uncnstr.ts +542 -0
- package/src/prover/smt/solver/enode.ts +100 -23
- 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 -5
- package/src/prover/smt/solver/expr-safe-replace.ts +26 -7
- 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 +734 -0
- package/src/prover/smt/solver/fingerprints.ts +15 -26
- package/src/prover/smt/solver/fix-dl-var.ts +147 -0
- package/src/prover/smt/solver/flat-literals.ts +0 -9
- 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 +179 -28
- 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 -9
- package/src/prover/smt/solver/hashtable.ts +30 -23
- 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 +113 -133
- package/src/prover/smt/solver/lackr.ts +381 -0
- package/src/prover/smt/solver/lbool.ts +0 -2
- 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 -4
- package/src/prover/smt/solver/logic-tactics.ts +355 -0
- package/src/prover/smt/solver/lp/bound-propagator.ts +7 -26
- package/src/prover/smt/solver/lp/constraints.ts +1 -8
- package/src/prover/smt/solver/lp/containers.ts +18 -31
- package/src/prover/smt/solver/lp/core-solver.ts +35 -37
- package/src/prover/smt/solver/lp/cross-nested.ts +4 -21
- package/src/prover/smt/solver/lp/dep-intervals.ts +6 -24
- package/src/prover/smt/solver/lp/dependency.ts +0 -5
- package/src/prover/smt/solver/lp/dioph-eq.ts +8 -103
- package/src/prover/smt/solver/lp/explanation.ts +0 -6
- package/src/prover/smt/solver/lp/gomory.ts +8 -22
- package/src/prover/smt/solver/lp/hnf-cutter.ts +16 -23
- package/src/prover/smt/solver/lp/hnf.ts +10 -28
- package/src/prover/smt/solver/lp/int-cube.ts +17 -39
- package/src/prover/smt/solver/lp/int-solver.ts +3 -35
- package/src/prover/smt/solver/lp/lar-solver.ts +70 -83
- package/src/prover/smt/solver/lp/lar-term.ts +0 -5
- package/src/prover/smt/solver/lp/lp-settings.ts +6 -16
- package/src/prover/smt/solver/lp/maximize-term.ts +76 -52
- package/src/prover/smt/solver/lp/nex-creator.ts +7 -30
- package/src/prover/smt/solver/lp/nex.ts +2 -7
- package/src/prover/smt/solver/lp/nla-backoff.ts +0 -5
- package/src/prover/smt/solver/lp/nla-basics.ts +48 -30
- package/src/prover/smt/solver/lp/nla-core.ts +92 -136
- package/src/prover/smt/solver/lp/nla-divisions.ts +31 -43
- package/src/prover/smt/solver/lp/nla-emonics.ts +3 -21
- package/src/prover/smt/solver/lp/nla-factorization.ts +0 -4
- package/src/prover/smt/solver/lp/nla-grobner.ts +177 -149
- package/src/prover/smt/solver/lp/nla-horner.ts +2 -12
- package/src/prover/smt/solver/lp/nla-intervals.ts +1 -12
- package/src/prover/smt/solver/lp/nla-monomial-bounds.ts +15 -42
- package/src/prover/smt/solver/lp/nla-monotone.ts +1 -6
- package/src/prover/smt/solver/lp/nla-order.ts +0 -13
- package/src/prover/smt/solver/lp/nla-patcher.ts +3 -7
- package/src/prover/smt/solver/lp/nla-powers.ts +220 -0
- package/src/prover/smt/solver/lp/nla-tangents.ts +0 -10
- package/src/prover/smt/solver/lp/nla-throttle.ts +0 -6
- package/src/prover/smt/solver/lp/nla-transcendentals.ts +324 -0
- package/src/prover/smt/solver/lp/nla-types.ts +0 -12
- package/src/prover/smt/solver/lp/nla-var-eqs.ts +4 -26
- package/src/prover/smt/solver/lp/nra-solver.ts +164 -147
- package/src/prover/smt/solver/lp/numeric-pair.ts +0 -4
- package/src/prover/smt/solver/lp/pdd-interval.ts +6 -5
- package/src/prover/smt/solver/lp/pdd-simplifier.ts +61 -34
- package/src/prover/smt/solver/lp/pdd-solver.ts +74 -72
- package/src/prover/smt/solver/lp/pdd.ts +730 -358
- package/src/prover/smt/solver/lp/random-updater.ts +0 -9
- package/src/prover/smt/solver/lp/static-matrix.ts +8 -19
- package/src/prover/smt/solver/lp/union-find.ts +5 -5
- package/src/prover/smt/solver/macro-finder.ts +530 -0
- package/src/prover/smt/solver/mam-compiler.ts +129 -139
- package/src/prover/smt/solver/mam-interpreter.ts +0 -21
- 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 +310 -0
- package/src/prover/smt/solver/maximize-ac-sharing.ts +8 -21
- package/src/prover/smt/solver/maxlex.ts +115 -0
- package/src/prover/smt/solver/maxsmt-base.ts +106 -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 +20 -63
- package/src/prover/smt/solver/model-evaluator.ts +192 -40
- package/src/prover/smt/solver/model-finder.ts +14 -32
- package/src/prover/smt/solver/model-generator.ts +104 -46
- package/src/prover/smt/solver/model-macro-solver.ts +60 -114
- 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 +382 -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 +495 -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 +214 -0
- package/src/prover/smt/solver/muz/rule-properties.ts +359 -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 +357 -236
- package/src/prover/smt/solver/nlsat/atoms.ts +73 -54
- package/src/prover/smt/solver/nlsat/evaluator.ts +16 -22
- package/src/prover/smt/solver/nlsat/explain.ts +429 -275
- package/src/prover/smt/solver/nlsat/interval-set.ts +9 -51
- package/src/prover/smt/solver/nlsat/levelwise.ts +477 -344
- package/src/prover/smt/solver/nlsat/mpbq.ts +47 -14
- package/src/prover/smt/solver/nlsat/polynomial.ts +2385 -832
- package/src/prover/smt/solver/nlsat/solver.ts +297 -156
- 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 -9
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +9 -51
- package/src/prover/smt/solver/nlsat/upolynomial.ts +49 -109
- package/src/prover/smt/solver/nlsat-tactic.ts +82 -0
- package/src/prover/smt/solver/nnf.ts +112 -61
- 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 +801 -0
- package/src/prover/smt/solver/opt-nlsat.ts +386 -0
- package/src/prover/smt/solver/opt-pareto.ts +301 -0
- package/src/prover/smt/solver/opt-preprocess.ts +101 -0
- package/src/prover/smt/solver/opt-solver.ts +312 -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 +21 -26
- 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 +261 -79
- package/src/prover/smt/solver/probes.ts +577 -0
- package/src/prover/smt/solver/propagate-values.ts +37 -30
- package/src/prover/smt/solver/proto-model.ts +650 -66
- package/src/prover/smt/solver/pull-quant.ts +28 -23
- package/src/prover/smt/solver/purify-arith.ts +632 -0
- package/src/prover/smt/solver/push-app-ite.ts +37 -0
- package/src/prover/smt/solver/qe-arith-plugin.ts +1096 -0
- package/src/prover/smt/solver/qe-lite-der.ts +2 -31
- package/src/prover/smt/solver/qe-lite-fm.ts +4 -28
- package/src/prover/smt/solver/qe-lite.ts +41 -51
- 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 -16
- package/src/prover/smt/solver/qsat.ts +829 -0
- package/src/prover/smt/solver/quant-hoist.ts +196 -0
- package/src/prover/smt/solver/quant-tactics.ts +17 -74
- package/src/prover/smt/solver/quantifier-analyzer.ts +26 -47
- package/src/prover/smt/solver/quantifier-manager.ts +22 -32
- package/src/prover/smt/solver/quasi-macros.ts +243 -0
- package/src/prover/smt/solver/random-gen.ts +0 -2
- package/src/prover/smt/solver/rational.ts +45 -8
- 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 -6
- package/src/prover/smt/solver/relevancy.ts +2 -16
- package/src/prover/smt/solver/rewriter-tpl.ts +59 -135
- package/src/prover/smt/solver/rewriter.ts +507 -144
- package/src/prover/smt/solver/rlimit.ts +46 -24
- 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 +579 -0
- package/src/prover/smt/solver/sat/inc-sat-solver.ts +464 -0
- package/src/prover/smt/solver/sat/model-converter.ts +136 -0
- package/src/prover/smt/solver/sat/pb-constraint.ts +268 -0
- package/src/prover/smt/solver/sat/pb-solver.ts +1596 -0
- package/src/prover/smt/solver/sat/probing.ts +170 -0
- package/src/prover/smt/solver/sat/sat-tactic.ts +53 -0
- package/src/prover/smt/solver/sat/sat2goal.ts +189 -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 +2107 -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 +124 -0
- package/src/prover/smt/solver/smt-logics.ts +66 -0
- package/src/prover/smt/solver/smt-setup.ts +589 -0
- package/src/prover/smt/solver/smt2-printer.ts +765 -0
- package/src/prover/smt/solver/smtlib-parser.ts +3546 -406
- package/src/prover/smt/solver/smtlib-script.ts +2134 -0
- package/src/prover/smt/solver/solve-eqs.ts +928 -0
- package/src/prover/smt/solver/solver.ts +129 -38
- package/src/prover/smt/solver/sort.ts +1 -5
- package/src/prover/smt/solver/static-features.ts +314 -0
- package/src/prover/smt/solver/sticky-generations.ts +0 -6
- package/src/prover/smt/solver/tactic.ts +2141 -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 +1210 -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 +55 -25
- package/src/prover/smt/solver/theory-lra-bounds.ts +31 -11
- package/src/prover/smt/solver/theory-lra-final-check.ts +60 -91
- package/src/prover/smt/solver/theory-lra-internalize.ts +96 -53
- package/src/prover/smt/solver/theory-lra-model.ts +23 -53
- package/src/prover/smt/solver/theory-lra-propagate.ts +34 -42
- package/src/prover/smt/solver/theory-lra-state.ts +7 -28
- package/src/prover/smt/solver/theory-lra.ts +189 -9
- package/src/prover/smt/solver/theory-pb.ts +951 -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-without-terms.ts +24 -0
- package/src/prover/smt/solver/theory.ts +189 -0
- package/src/prover/smt/solver/tseitin-cnf.ts +486 -0
- package/src/prover/smt/solver/var-subst.ts +37 -39
- package/src/prover/smt/table.ts +3 -10
- package/src/prover/smt/types.ts +146 -0
- package/src/prover/tlapm/cache.ts +74 -48
- package/src/prover/tlapm/ocaml-marshal.ts +19 -21
- package/src/prover/tlapm/tlapm.ts +21 -20
- package/src/prover/tlapm-library.ts +3208 -0
- package/src/prover/verdict.ts +9 -2
- package/src/prover/zenon/check/check.ts +1 -11
- package/src/prover/zenon/check/definitions.ts +5 -15
- package/src/prover/zenon/check/equality.ts +0 -8
- package/src/prover/zenon/check/functions.ts +0 -4
- package/src/prover/zenon/check/keys.ts +0 -7
- package/src/prover/zenon/check/propositional.ts +0 -3
- package/src/prover/zenon/check/records.ts +1 -6
- package/src/prover/zenon/check/relations.ts +2 -14
- package/src/prover/zenon/check/rewrites.ts +2 -21
- package/src/prover/zenon/check/sets.ts +40 -61
- package/src/prover/zenon/check/terms.ts +1 -19
- package/src/prover/zenon/check/tla.ts +0 -6
- package/src/prover/zenon/decide.ts +10 -19
- package/src/prover/zenon/encode.ts +0 -9
- package/src/prover/zenon/eqrel.ts +2 -15
- package/src/prover/zenon/equality-rules.ts +24 -6
- package/src/prover/zenon/expr.ts +29 -28
- package/src/prover/zenon/index-table.ts +33 -61
- package/src/prover/zenon/isar-case.ts +9 -21
- package/src/prover/zenon/isar.ts +37 -67
- package/src/prover/zenon/limits.ts +0 -4
- package/src/prover/zenon/llproof.ts +2 -22
- package/src/prover/zenon/mltoll.ts +66 -106
- package/src/prover/zenon/node.ts +20 -15
- package/src/prover/zenon/ocaml.ts +1 -17
- package/src/prover/zenon/parse.ts +9 -13
- package/src/prover/zenon/phrase.ts +2 -14
- package/src/prover/zenon/proof.ts +0 -11
- package/src/prover/zenon/propositional-rules.ts +0 -7
- package/src/prover/zenon/rules.ts +3 -8
- package/src/prover/zenon/search.ts +11 -35
- package/src/prover/zenon/tla/functions.ts +59 -33
- package/src/prover/zenon/tla/llproof.ts +67 -78
- package/src/prover/zenon/tla/records.ts +57 -35
- package/src/prover/zenon/tla/rewrites.ts +12 -21
- package/src/prover/zenon/tla/sets.ts +88 -59
- package/src/prover/zenon/tla/terms.ts +0 -8
- package/src/prover/zenon/tla/tla.ts +66 -66
- package/src/randomization.ts +81 -35
- package/src/resolve.ts +1132 -430
- package/src/runtime.ts +33 -23
- package/src/sany/builtins.ts +11 -14
- package/src/sany/generation.ts +383 -0
- package/src/sany/generator-def-entries.ts +210 -0
- package/src/sany/generator-definitions.ts +688 -0
- package/src/sany/generator-expressions.ts +1108 -0
- package/src/sany/generator-proofs.ts +665 -0
- package/src/sany/generator.ts +192 -2764
- package/src/sany/levels.ts +5 -35
- package/src/sany/lexer.ts +61 -80
- package/src/sany/linter.ts +0 -10
- package/src/sany/modules.ts +5 -7
- package/src/sany/nodes.ts +6 -44
- package/src/sany/parse-error.ts +39 -117
- package/src/sany/report.ts +32 -69
- package/src/sany/selectors.ts +60 -82
- package/src/sany/source.ts +1 -17
- package/src/sany/xml.ts +37 -120
- package/src/search.ts +913 -227
- package/src/simulate.ts +765 -0
- package/src/spec-description.ts +198 -104
- package/src/standard-definitions.ts +4 -4
- package/src/standard-modules.ts +302 -99
- package/src/state-graph.ts +52 -33
- package/src/subexpressions.ts +578 -166
- package/src/substitution-levels.ts +7 -7
- package/src/successors.ts +296 -105
- package/src/symmetry.ts +37 -28
- package/src/tableau.ts +29 -26
- package/src/tlc/fingerprint.ts +267 -79
- package/src/tlc/jar-data.ts +122 -6
- package/src/tlc/messages.ts +127 -56
- package/src/tlc/order.ts +53 -72
- package/src/tlc/random.ts +38 -49
- package/src/tlc/replay.ts +579 -230
- package/src/tlc/summary.ts +64 -60
- package/src/tlc/tlc-operators.ts +83 -47
- package/src/tlc/tlcext-operators.ts +205 -127
- package/src/tlc/trace-spec.ts +235 -0
- package/src/tlc/value-stream.ts +139 -0
- package/src/tlc/version.ts +1 -4
- package/src/trace-liveness.ts +529 -0
- package/src/transfer.ts +22 -25
- package/src/typed-tier.ts +6556 -0
- package/src/typescript/actions.ts +10 -25
- package/src/typescript/collections.ts +34 -35
- package/src/typescript/compile.ts +1 -8
- package/src/typescript/context.ts +0 -12
- package/src/typescript/emit.ts +0 -1
- package/src/typescript/expressions.ts +0 -12
- package/src/typescript/formula.ts +9 -15
- package/src/typescript/functions.ts +6 -17
- package/src/typescript/model.ts +14 -16
- package/src/typescript/names.ts +0 -2
- package/src/typescript/program.ts +0 -3
- package/src/typescript/properties.ts +6 -8
- package/src/typescript/scope.ts +0 -5
- package/src/typescript/steps.ts +20 -28
- package/src/typescript/types.ts +3 -10
- package/src/values.ts +917 -522
- package/src/worker.ts +7 -8
- package/src/prover/isabelle/isar/statement.ts +0 -57
- 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,6 +1,3 @@
|
|
|
1
|
-
// A port of tlapm's obligation printer: E_fmt with Fmtutil's minimal parenthesization, and the
|
|
2
|
-
// identifier renaming in Ctx.
|
|
3
|
-
|
|
4
1
|
import { TlaProofError } from "../errors";
|
|
5
2
|
import {
|
|
6
3
|
getHypName,
|
|
@@ -16,8 +13,6 @@ import {
|
|
|
16
13
|
import { format, formatDelimited, renderDoc, text, type Doc } from "./format";
|
|
17
14
|
import { getStandardForm, lookupOperator } from "./operators";
|
|
18
15
|
|
|
19
|
-
// Ctx, which names each binder apart from the names in scope by adding a salt, as a mutable stack:
|
|
20
|
-
// printers bind and unbind names in strict nesting order.
|
|
21
16
|
interface Ident {
|
|
22
17
|
rep: string;
|
|
23
18
|
salt: number;
|
|
@@ -38,7 +33,6 @@ export const createContext = (): Context => ({
|
|
|
38
33
|
defined: new Map(),
|
|
39
34
|
});
|
|
40
35
|
|
|
41
|
-
// The name of the binder index places in, counting from 1 for the innermost.
|
|
42
36
|
export const getBoundName = (context: Context, index: number) => {
|
|
43
37
|
const ident = context.stack[context.stack.length - index];
|
|
44
38
|
return ident && getIdentName(ident);
|
|
@@ -139,9 +133,9 @@ const printMinimal = (expression: Minimal): Doc => {
|
|
|
139
133
|
}
|
|
140
134
|
};
|
|
141
135
|
|
|
142
|
-
const
|
|
136
|
+
const createAtom = (doc: Doc): Minimal => ({ kind: "Atm", doc });
|
|
143
137
|
|
|
144
|
-
const
|
|
138
|
+
const createBig = (doc: Doc): Minimal => ({ kind: "Big", doc });
|
|
145
139
|
|
|
146
140
|
const isWith = (expression: Expr): boolean => {
|
|
147
141
|
if (expression.kind === "Lambda") return isWith(expression.body);
|
|
@@ -149,11 +143,21 @@ const isWith = (expression: Expr): boolean => {
|
|
|
149
143
|
return expression.kind === "With";
|
|
150
144
|
};
|
|
151
145
|
|
|
152
|
-
|
|
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;
|
|
153
154
|
if (hyp.kind === "Defn") {
|
|
154
155
|
const definition = hyp.definition;
|
|
155
156
|
const hasWith = definition.kind === "Operator" && isWith(definition.body);
|
|
156
|
-
return
|
|
157
|
+
return (
|
|
158
|
+
!options.isShowingAllDefinitions &&
|
|
159
|
+
(hyp.visibility === "Hidden" || hasWith || hyp.whereDefined !== "User")
|
|
160
|
+
);
|
|
157
161
|
}
|
|
158
162
|
if (hyp.kind === "Fact") return hyp.visibility === "Hidden" || isWith(hyp.expression);
|
|
159
163
|
return false;
|
|
@@ -180,8 +184,7 @@ const LEVEL_NAMES = {
|
|
|
180
184
|
Unknown: "UNKNOWN",
|
|
181
185
|
};
|
|
182
186
|
|
|
183
|
-
|
|
184
|
-
const createPrinter = (hyps: Hyp[] = []) => {
|
|
187
|
+
const createPrinter = (hyps: Hyp[] = [], options: PrinterOptions = {}) => {
|
|
185
188
|
const context = createContext();
|
|
186
189
|
const printExpr = (expression: Expr): Doc => printMinimal(formatExpr(expression));
|
|
187
190
|
|
|
@@ -197,8 +200,6 @@ const createPrinter = (hyps: Hyp[] = []) => {
|
|
|
197
200
|
),
|
|
198
201
|
);
|
|
199
202
|
|
|
200
|
-
// fmt_bounds: names bind left to right, domains print in the enclosing context, and dittos
|
|
201
|
-
// share the previous domain.
|
|
202
203
|
const formatBounds = <Result>(bounds: Bound[], body: (boundsDoc: Doc) => Result): Result => {
|
|
203
204
|
const domains = bounds.map((bound) =>
|
|
204
205
|
bound.domain.kind === "Domain" ? printExpr(bound.domain.expression) : undefined,
|
|
@@ -274,15 +275,15 @@ const createPrinter = (hyps: Hyp[] = []) => {
|
|
|
274
275
|
skeleton: {
|
|
275
276
|
kind: "Infix",
|
|
276
277
|
assoc: "Left",
|
|
277
|
-
left:
|
|
278
|
-
right:
|
|
278
|
+
left: createBig(printLambda(operator.params, operator.body)),
|
|
279
|
+
right: createAtom(format("(%a)", formatDelimited(args, printExpr))),
|
|
279
280
|
},
|
|
280
281
|
};
|
|
281
282
|
}
|
|
282
283
|
if (operator.kind === "Bang") {
|
|
283
284
|
return args.length === 0
|
|
284
285
|
? formatExpr(operator)
|
|
285
|
-
:
|
|
286
|
+
: createAtom(
|
|
286
287
|
format("@[<b2>%a@[<b1>(%a)@]@]", printExpr(operator), formatDelimited(args, printExpr)),
|
|
287
288
|
);
|
|
288
289
|
}
|
|
@@ -291,7 +292,7 @@ const createPrinter = (hyps: Hyp[] = []) => {
|
|
|
291
292
|
return formatExpr(args[0]);
|
|
292
293
|
}
|
|
293
294
|
if (operator.builtin === "Irregular") {
|
|
294
|
-
return
|
|
295
|
+
return createAtom(format("@[<h>@<1>%s%a@<1>%s@]", "<[", printExpr(args[0]), "]>"));
|
|
295
296
|
}
|
|
296
297
|
}
|
|
297
298
|
const form = (() => {
|
|
@@ -316,9 +317,11 @@ const createPrinter = (hyps: Hyp[] = []) => {
|
|
|
316
317
|
high: form.high,
|
|
317
318
|
skeleton,
|
|
318
319
|
});
|
|
319
|
-
if (args.length === 0) return
|
|
320
|
+
if (args.length === 0) return createAtom(text(form.name));
|
|
320
321
|
if (form.fixity === "Nonfix") {
|
|
321
|
-
return
|
|
322
|
+
return createAtom(
|
|
323
|
+
format("@[<b2>%s@[<b1>(%a)@]@]", form.name, formatDelimited(args, printExpr)),
|
|
324
|
+
);
|
|
322
325
|
}
|
|
323
326
|
if (form.fixity === "Prefix" && args.length === 1) {
|
|
324
327
|
return getOperation(
|
|
@@ -352,17 +355,17 @@ const createPrinter = (hyps: Hyp[] = []) => {
|
|
|
352
355
|
case "Internal":
|
|
353
356
|
return formatApply(expression, []);
|
|
354
357
|
case "Lambda":
|
|
355
|
-
return
|
|
358
|
+
return createBig(printLambda(expression.params, expression.body));
|
|
356
359
|
case "Bang":
|
|
357
|
-
return
|
|
360
|
+
return createAtom([printExpr(expression.expression), printSelectors(expression.selectors)]);
|
|
358
361
|
case "Apply":
|
|
359
362
|
return formatApply(expression.operator, expression.args);
|
|
360
363
|
case "Sequent":
|
|
361
|
-
return
|
|
364
|
+
return createBig(printSequent(expression.sequent));
|
|
362
365
|
case "With":
|
|
363
366
|
return formatExpr(expression.expression);
|
|
364
367
|
case "If":
|
|
365
|
-
return
|
|
368
|
+
return createBig(
|
|
366
369
|
format(
|
|
367
370
|
"@[<hv2>@[<b2>IF@ %a@]@ @[<b2>THEN %a@]@ @[<b2>ELSE %a@]@]",
|
|
368
371
|
printExpr(expression.condition),
|
|
@@ -372,13 +375,13 @@ const createPrinter = (hyps: Hyp[] = []) => {
|
|
|
372
375
|
);
|
|
373
376
|
case "List": {
|
|
374
377
|
if (expression.bullet === "Refs" && expression.items.length === 0) {
|
|
375
|
-
return
|
|
378
|
+
return createAtom(format("TRUE"));
|
|
376
379
|
}
|
|
377
380
|
if (expression.bullet === "Refs" && expression.items.length === 1) {
|
|
378
381
|
return formatExpr(expression.items[0]);
|
|
379
382
|
}
|
|
380
383
|
const bullet = expression.bullet === "Or" ? "\\/" : "/\\";
|
|
381
|
-
return
|
|
384
|
+
return createBig(
|
|
382
385
|
format(
|
|
383
386
|
"@[<v0>%a@]",
|
|
384
387
|
formatDelimited(
|
|
@@ -397,11 +400,15 @@ const createPrinter = (hyps: Hyp[] = []) => {
|
|
|
397
400
|
);
|
|
398
401
|
const bodyDoc = printExpr(expression.body);
|
|
399
402
|
popNames(context, expression.definitions.length);
|
|
400
|
-
return
|
|
403
|
+
return createBig([
|
|
404
|
+
format("@[<hv0>LET @[<v0>"),
|
|
405
|
+
definitionsDoc,
|
|
406
|
+
format("@]@\nIN %a@]", bodyDoc),
|
|
407
|
+
]);
|
|
401
408
|
}
|
|
402
409
|
case "Quant":
|
|
403
410
|
return formatBounds(expression.bounds, (boundsDoc) =>
|
|
404
|
-
|
|
411
|
+
createBig(
|
|
405
412
|
format(
|
|
406
413
|
"@[<b3>%s @[<b0>%a@] :@ %a@]",
|
|
407
414
|
expression.quantifier === "Forall" ? "\\A" : "\\E",
|
|
@@ -412,7 +419,7 @@ const createPrinter = (hyps: Hyp[] = []) => {
|
|
|
412
419
|
);
|
|
413
420
|
case "Tquant":
|
|
414
421
|
return withNames(context, expression.names, (names) =>
|
|
415
|
-
|
|
422
|
+
createBig(
|
|
416
423
|
format(
|
|
417
424
|
"@[<b4>%s @[<b0>%a@] : %a@]",
|
|
418
425
|
expression.quantifier === "Forall" ? "\\AA" : "\\EE",
|
|
@@ -423,26 +430,26 @@ const createPrinter = (hyps: Hyp[] = []) => {
|
|
|
423
430
|
);
|
|
424
431
|
case "Choose": {
|
|
425
432
|
const domainDoc = expression.domain && printExpr(expression.domain);
|
|
426
|
-
return withNames(context, [expression.name], (
|
|
427
|
-
|
|
433
|
+
return withNames(context, [expression.name], (names) =>
|
|
434
|
+
createBig(
|
|
428
435
|
domainDoc
|
|
429
436
|
? format(
|
|
430
437
|
"@[<b2>CHOOSE @[<b2>%s \\in@ %a@] :@ %a@]",
|
|
431
|
-
|
|
438
|
+
names[0],
|
|
432
439
|
domainDoc,
|
|
433
440
|
printExpr(expression.body),
|
|
434
441
|
)
|
|
435
|
-
: format("@[<b2>CHOOSE %s :@ %a@]",
|
|
442
|
+
: format("@[<b2>CHOOSE %s :@ %a@]", names[0], printExpr(expression.body)),
|
|
436
443
|
),
|
|
437
444
|
);
|
|
438
445
|
}
|
|
439
446
|
case "SetSt": {
|
|
440
447
|
const domainDoc = printExpr(expression.domain);
|
|
441
|
-
return withNames(context, [expression.name], (
|
|
442
|
-
|
|
448
|
+
return withNames(context, [expression.name], (names) =>
|
|
449
|
+
createAtom(
|
|
443
450
|
format(
|
|
444
451
|
"@[<b3>{@[<b2>%s \\in@ %a@] :@ %a}@]",
|
|
445
|
-
|
|
452
|
+
names[0],
|
|
446
453
|
domainDoc,
|
|
447
454
|
printExpr(expression.body),
|
|
448
455
|
),
|
|
@@ -451,22 +458,24 @@ const createPrinter = (hyps: Hyp[] = []) => {
|
|
|
451
458
|
}
|
|
452
459
|
case "SetOf":
|
|
453
460
|
return formatBounds(expression.bounds, (boundsDoc) =>
|
|
454
|
-
|
|
461
|
+
createAtom(format("@[<b3>{%a :@ %a}@]", printExpr(expression.element), boundsDoc)),
|
|
455
462
|
);
|
|
456
463
|
case "SetEnum":
|
|
457
|
-
return
|
|
464
|
+
return createAtom(
|
|
465
|
+
format("@[<h>{@[<b0>%a@]}@]", formatDelimited(expression.elements, printExpr)),
|
|
466
|
+
);
|
|
458
467
|
case "Arrow":
|
|
459
|
-
return
|
|
468
|
+
return createAtom(
|
|
460
469
|
format("@[<b3>[%a ->@ %a]@]", printExpr(expression.domain), printExpr(expression.range)),
|
|
461
470
|
);
|
|
462
471
|
case "Fcn":
|
|
463
472
|
return formatBounds(expression.bounds, (boundsDoc) =>
|
|
464
|
-
|
|
473
|
+
createAtom(format("@[<b3>[%a |->@ %a]@]", boundsDoc, printExpr(expression.body))),
|
|
465
474
|
);
|
|
466
475
|
case "FcnApp": {
|
|
467
476
|
const target = formatExpr(expression.function);
|
|
468
477
|
const isAtom = target.kind === "Atm";
|
|
469
|
-
return
|
|
478
|
+
return createAtom(
|
|
470
479
|
format(
|
|
471
480
|
"@[<h>%s%a%s@[<b1>[%a]@]@]",
|
|
472
481
|
isAtom ? "" : "(",
|
|
@@ -495,11 +504,13 @@ const createPrinter = (hyps: Hyp[] = []) => {
|
|
|
495
504
|
};
|
|
496
505
|
}
|
|
497
506
|
case "Tuple":
|
|
498
|
-
return
|
|
507
|
+
return createAtom(
|
|
508
|
+
format("@[<b2><<%a>>@]", formatDelimited(expression.elements, printExpr)),
|
|
509
|
+
);
|
|
499
510
|
case "Rect":
|
|
500
511
|
case "Record": {
|
|
501
512
|
const separator = expression.kind === "Rect" ? ":" : "|->";
|
|
502
|
-
return
|
|
513
|
+
return createAtom(
|
|
503
514
|
format(
|
|
504
515
|
"@[<b1>[%a]@]",
|
|
505
516
|
formatDelimited(expression.fields, (field) =>
|
|
@@ -509,7 +520,7 @@ const createPrinter = (hyps: Hyp[] = []) => {
|
|
|
509
520
|
);
|
|
510
521
|
}
|
|
511
522
|
case "Except":
|
|
512
|
-
return
|
|
523
|
+
return createAtom(
|
|
513
524
|
format(
|
|
514
525
|
"@[<b3>[%a EXCEPT@ @[<v0>%a@]]@]",
|
|
515
526
|
printExpr(expression.function),
|
|
@@ -537,14 +548,14 @@ const createPrinter = (hyps: Hyp[] = []) => {
|
|
|
537
548
|
kind: "Infix",
|
|
538
549
|
assoc: "Left",
|
|
539
550
|
left: formatExpr(expression.expression),
|
|
540
|
-
right:
|
|
551
|
+
right: createAtom(text(expression.field)),
|
|
541
552
|
},
|
|
542
553
|
};
|
|
543
554
|
case "Sub":
|
|
544
555
|
case "Tsub": {
|
|
545
556
|
const isBox = expression.modal === "Box";
|
|
546
557
|
const open = expression.kind === "Sub" ? (isBox ? "[" : "<<") : isBox ? "[][" : "<><<";
|
|
547
|
-
return
|
|
558
|
+
return createAtom(
|
|
548
559
|
format(
|
|
549
560
|
"@[<h>%s@[<b2>%a@]%s%a@]",
|
|
550
561
|
open,
|
|
@@ -555,7 +566,7 @@ const createPrinter = (hyps: Hyp[] = []) => {
|
|
|
555
566
|
);
|
|
556
567
|
}
|
|
557
568
|
case "Fair":
|
|
558
|
-
return
|
|
569
|
+
return createBig(
|
|
559
570
|
format(
|
|
560
571
|
"@[<h>%s_%a (%a)@]",
|
|
561
572
|
expression.fairness === "Weak" ? "WF" : "SF",
|
|
@@ -564,7 +575,7 @@ const createPrinter = (hyps: Hyp[] = []) => {
|
|
|
564
575
|
),
|
|
565
576
|
);
|
|
566
577
|
case "Case":
|
|
567
|
-
return
|
|
578
|
+
return createBig(
|
|
568
579
|
format(
|
|
569
580
|
"@[<v2>CASE %a%a@]",
|
|
570
581
|
formatDelimited(
|
|
@@ -578,9 +589,9 @@ const createPrinter = (hyps: Hyp[] = []) => {
|
|
|
578
589
|
),
|
|
579
590
|
);
|
|
580
591
|
case "String":
|
|
581
|
-
return
|
|
592
|
+
return createAtom(format('"%s"', expression.value));
|
|
582
593
|
case "Num":
|
|
583
|
-
return
|
|
594
|
+
return createAtom(
|
|
584
595
|
text(
|
|
585
596
|
expression.fraction === ""
|
|
586
597
|
? expression.integer
|
|
@@ -588,7 +599,7 @@ const createPrinter = (hyps: Hyp[] = []) => {
|
|
|
588
599
|
),
|
|
589
600
|
);
|
|
590
601
|
case "At":
|
|
591
|
-
return
|
|
602
|
+
return createAtom(text("@"));
|
|
592
603
|
case "Parens": {
|
|
593
604
|
const form = expression.form;
|
|
594
605
|
if (form.kind === "Syntax") return formatExpr(expression.expression);
|
|
@@ -603,7 +614,7 @@ const createPrinter = (hyps: Hyp[] = []) => {
|
|
|
603
614
|
const inner = formatExpr(expression.expression);
|
|
604
615
|
if (names.length === 0) {
|
|
605
616
|
const pattern = inner.kind === "Op" ? "%s::(%a)" : "%s::%a";
|
|
606
|
-
return
|
|
617
|
+
return createAtom(format(pattern, form.label, printMinimal(inner)));
|
|
607
618
|
}
|
|
608
619
|
const namesDoc = formatDelimited(names, text);
|
|
609
620
|
const pattern =
|
|
@@ -612,12 +623,11 @@ const createPrinter = (hyps: Hyp[] = []) => {
|
|
|
612
623
|
: inner.kind === "Big"
|
|
613
624
|
? "%s(%a)::(%a)"
|
|
614
625
|
: "(%s(%a):: %a)";
|
|
615
|
-
return
|
|
626
|
+
return createAtom(format(pattern, form.label, namesDoc, printMinimal(inner)));
|
|
616
627
|
}
|
|
617
628
|
}
|
|
618
629
|
};
|
|
619
630
|
|
|
620
|
-
// pp_print_defn: returns the definition's document and binds its name for what follows.
|
|
621
631
|
const printDefinition = (definition: Defn): Doc => {
|
|
622
632
|
switch (definition.kind) {
|
|
623
633
|
case "Operator":
|
|
@@ -671,7 +681,6 @@ const createPrinter = (hyps: Hyp[] = []) => {
|
|
|
671
681
|
}
|
|
672
682
|
};
|
|
673
683
|
|
|
674
|
-
// pp_print_hyp: prints the hypothesis in the context before it, then binds it.
|
|
675
684
|
const printHyp = (hyp: Hyp): Doc => {
|
|
676
685
|
switch (hyp.kind) {
|
|
677
686
|
case "Fresh": {
|
|
@@ -685,10 +694,24 @@ const createPrinter = (hyps: Hyp[] = []) => {
|
|
|
685
694
|
}
|
|
686
695
|
case "Flex":
|
|
687
696
|
return format("NEW VARIABLE %s", pushName(context, hyp.name));
|
|
688
|
-
case "Defn":
|
|
689
|
-
|
|
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
|
+
}
|
|
690
709
|
case "Fact": {
|
|
691
|
-
const doc = format(
|
|
710
|
+
const doc = format(
|
|
711
|
+
"@[<h>%a %s@]",
|
|
712
|
+
printExpr(hyp.expression),
|
|
713
|
+
options.isTemporal && hyp.time === "Now" ? "(* non-[] *)" : "",
|
|
714
|
+
);
|
|
692
715
|
pushName(context, "");
|
|
693
716
|
return doc;
|
|
694
717
|
}
|
|
@@ -699,8 +722,15 @@ const createPrinter = (hyps: Hyp[] = []) => {
|
|
|
699
722
|
if (sequent.context.length === 0) return printExpr(sequent.active);
|
|
700
723
|
const hypDocs: Doc[] = [];
|
|
701
724
|
for (const hyp of sequent.context) {
|
|
702
|
-
if (isElided(hyp
|
|
703
|
-
|
|
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
|
+
]);
|
|
704
734
|
}
|
|
705
735
|
const activeDoc = printExpr(sequent.active);
|
|
706
736
|
popNames(context, sequent.context.length);
|
|
@@ -718,7 +748,8 @@ const createPrinter = (hyps: Hyp[] = []) => {
|
|
|
718
748
|
export const printExpression = (hyps: Hyp[], expression: Expr) =>
|
|
719
749
|
createPrinter(hyps).printExpr(expression);
|
|
720
750
|
|
|
721
|
-
export const printSequent = (sequent: Sequent) =>
|
|
751
|
+
export const printSequent = (sequent: Sequent, options: PrinterOptions = {}) =>
|
|
752
|
+
createPrinter([], options).printSequent(sequent);
|
|
722
753
|
|
|
723
|
-
export const formatObligation = (sequent: Sequent) =>
|
|
724
|
-
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
|
-
// 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
|
|
|
@@ -24,21 +22,22 @@ export type ObligationKind =
|
|
|
24
22
|
| { kind: "Error"; message: string }
|
|
25
23
|
| { kind: "Omitted"; omission: Omission };
|
|
26
24
|
|
|
27
|
-
// method is the one an old-style pragma names, which keeps find_meth from choosing.
|
|
28
25
|
export interface Obligation {
|
|
29
26
|
sequent: Sequent;
|
|
30
27
|
location: Locus | undefined;
|
|
31
28
|
kind: ObligationKind;
|
|
32
29
|
method?: OldMethod;
|
|
30
|
+
isEnabledAxiomsSound?: boolean;
|
|
33
31
|
}
|
|
34
32
|
|
|
35
|
-
// useLocation is where a USE step comes from, so find_meth can tell apart the facts of each BY.
|
|
36
33
|
interface ProofProps {
|
|
37
34
|
location?: Locus;
|
|
38
35
|
step?: StepNumber;
|
|
39
36
|
obligations?: Obligation[];
|
|
40
37
|
method?: OldMethod;
|
|
41
38
|
useLocation?: Locus;
|
|
39
|
+
isSuppressed?: boolean;
|
|
40
|
+
isEnabledAxiomsSound?: boolean;
|
|
42
41
|
}
|
|
43
42
|
|
|
44
43
|
export type Proof = ProofCore & ProofProps;
|
|
@@ -72,8 +71,6 @@ type StepCore =
|
|
|
72
71
|
export const getStepName = (step: StepNumber) =>
|
|
73
72
|
step.kind === "Named" ? `<${step.level}>${step.label}` : `<${step.level}>`;
|
|
74
73
|
|
|
75
|
-
// Std.unique: one counter for the whole run, shared by the parser, anonymization, and
|
|
76
|
-
// simplification, so anonymous step names match tlapm's.
|
|
77
74
|
export interface Counter {
|
|
78
75
|
value: number;
|
|
79
76
|
}
|
|
@@ -1,7 +1,3 @@
|
|
|
1
|
-
// Pco.resolve: tlapm's parser lets an operator take in every later infix operator that is not
|
|
2
|
-
// entirely below it, so SUBSET S \ T is SUBSET (S \ T) to tlapm though SANY reads (SUBSET S) \ T.
|
|
3
|
-
// This regroups an infix application the way tlapm does.
|
|
4
|
-
|
|
5
1
|
import type { Expression, SourceLocation } from "../ast";
|
|
6
2
|
import { lookupOperator, type Operator } from "./operators";
|
|
7
3
|
|
|
@@ -33,7 +29,6 @@ const withEnd = (expression: Expression, end: SourceLocation | undefined): Expre
|
|
|
33
29
|
: expression;
|
|
34
30
|
};
|
|
35
31
|
|
|
36
|
-
// The operator an expression leaves open on tlapm's parse stack, with the operand after it.
|
|
37
32
|
const getOpenOperator = (expression: Expression) => {
|
|
38
33
|
if (expression.kind === "Apply") {
|
|
39
34
|
const operator = lookupOperator(expression.operator);
|