tla-ts 0.0.9 → 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 +30 -1
- package/dist/compile.cjs +23 -0
- package/dist/compile.js +23 -0
- package/dist/deciders.cjs +41 -37
- package/dist/deciders.js +48 -44
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +122 -12
- package/dist/index.d.ts +122 -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 +3 -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 +1156 -888
- 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 +330 -659
- package/src/cli/typescript.ts +23 -0
- 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 +263 -370
- package/src/errors.ts +107 -57
- package/src/evaluate.ts +898 -369
- package/src/exit-codes.ts +63 -13
- package/src/fingerprints.ts +75 -11
- package/src/index.ts +3 -0
- package/src/instances.ts +137 -22
- 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 -322
- package/src/liveness.ts +230 -133
- 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 +36 -60
- package/src/parallel.ts +64 -73
- 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 +135 -40
- 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 +299 -108
- 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 +479 -0
- package/src/typescript/collections.ts +614 -0
- package/src/typescript/compile.ts +63 -0
- package/src/typescript/context.ts +94 -0
- package/src/typescript/emit.ts +121 -0
- package/src/typescript/expressions.ts +496 -0
- package/src/typescript/formula.ts +154 -0
- package/src/typescript/functions.ts +284 -0
- package/src/typescript/model.ts +162 -0
- package/src/typescript/names.ts +114 -0
- package/src/typescript/program.ts +48 -0
- package/src/typescript/properties.ts +139 -0
- package/src/typescript/scope.ts +112 -0
- package/src/typescript/steps.ts +167 -0
- package/src/typescript/types.ts +171 -0
- package/src/values.ts +945 -526
- 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,8 +1,7 @@
|
|
|
1
|
-
// The Isabelle/TLA+ object logic that tlapm ships, decoded from logic-data.ts: its constants, the
|
|
2
|
-
// theorems its theories prove, and the order of the simpset and the classical rule nets.
|
|
3
|
-
|
|
4
1
|
import { axiomThm, type Thm } from "../pure/thm";
|
|
5
2
|
import type { ClassicalRule } from "../provers/classical";
|
|
3
|
+
import type { TaggedRule } from "../pure/tactic";
|
|
4
|
+
import type { ContextRule } from "../tools/intuitionistic";
|
|
6
5
|
import {
|
|
7
6
|
mkAbs,
|
|
8
7
|
mkApp,
|
|
@@ -13,9 +12,12 @@ import {
|
|
|
13
12
|
mkTVar,
|
|
14
13
|
mkType,
|
|
15
14
|
mkVar,
|
|
15
|
+
type Term,
|
|
16
|
+
type Typ,
|
|
16
17
|
} from "../pure/term";
|
|
17
18
|
import { typargsOf, type TypargPosition } from "../pure/consts";
|
|
18
|
-
import type {
|
|
19
|
+
import type { NamedCasesRule } from "../isar/induct";
|
|
20
|
+
import type { Tags } from "../isar/rule-cases";
|
|
19
21
|
import { LOGIC_DATA } from "./logic-data";
|
|
20
22
|
|
|
21
23
|
type TypeNode = [0, number, ...number[]] | [1, number] | [2, number, number];
|
|
@@ -26,10 +28,10 @@ type TermNode =
|
|
|
26
28
|
| [3, number]
|
|
27
29
|
| [4, number, number, number]
|
|
28
30
|
| [5, number, number];
|
|
29
|
-
// A rule of a claset or of the context rules, by theorem id, with its insertion tag.
|
|
30
31
|
type NetItem = [number, 0 | 1, number];
|
|
31
32
|
type ExtraNetItem = [number, number, 0 | 1, number];
|
|
32
33
|
type RawRule = [number, number, number[], number, number[]];
|
|
34
|
+
type RawCasesRule = [string, number, [string, string][]];
|
|
33
35
|
|
|
34
36
|
interface LogicJson {
|
|
35
37
|
strings: string[];
|
|
@@ -55,26 +57,21 @@ interface LogicJson {
|
|
|
55
57
|
dup: [NetItem[], NetItem[]];
|
|
56
58
|
extra: [ExtraNetItem[], ExtraNetItem[]];
|
|
57
59
|
};
|
|
58
|
-
contextRules: {
|
|
60
|
+
contextRules: {
|
|
61
|
+
bang: [ExtraNetItem[], ExtraNetItem[]];
|
|
62
|
+
plain: [ExtraNetItem[], ExtraNetItem[]];
|
|
63
|
+
query: [number[], number[]];
|
|
64
|
+
};
|
|
65
|
+
factTags: [string, number, [string, string][]][];
|
|
66
|
+
casesRules: { type: RawCasesRule[]; pred: RawCasesRule[] };
|
|
59
67
|
}
|
|
60
68
|
|
|
61
69
|
export interface ConstInfo {
|
|
62
70
|
readonly type: Typ;
|
|
63
71
|
readonly typargs: readonly TypargPosition[];
|
|
64
|
-
// The right-hand side of an abbreviation, which parsing unfolds.
|
|
65
72
|
readonly abbreviation: Term | undefined;
|
|
66
73
|
}
|
|
67
74
|
|
|
68
|
-
export interface LogicNetItem {
|
|
69
|
-
readonly tag: number;
|
|
70
|
-
readonly isElim: boolean;
|
|
71
|
-
readonly rule: Thm;
|
|
72
|
-
}
|
|
73
|
-
|
|
74
|
-
export interface LogicExtraNetItem extends LogicNetItem {
|
|
75
|
-
readonly weight: number;
|
|
76
|
-
}
|
|
77
|
-
|
|
78
75
|
export interface LogicNetPair<Item> {
|
|
79
76
|
readonly intro: readonly Item[];
|
|
80
77
|
readonly elim: readonly Item[];
|
|
@@ -82,11 +79,9 @@ export interface LogicNetPair<Item> {
|
|
|
82
79
|
|
|
83
80
|
export interface TlaLogic {
|
|
84
81
|
readonly consts: ReadonlyMap<string, ConstInfo>;
|
|
85
|
-
// The constant each unqualified name stands for.
|
|
86
82
|
readonly constNames: ReadonlyMap<string, string>;
|
|
87
83
|
readonly facts: ReadonlyMap<string, readonly Thm[]>;
|
|
88
84
|
readonly factNames: ReadonlyMap<string, string>;
|
|
89
|
-
// The simpset's rewrite rules, in the order of Net.entries.
|
|
90
85
|
readonly simps: readonly Thm[];
|
|
91
86
|
readonly congs: readonly {
|
|
92
87
|
readonly isConst: boolean;
|
|
@@ -100,14 +95,23 @@ export interface TlaLogic {
|
|
|
100
95
|
readonly safeEs: readonly ClassicalRule[];
|
|
101
96
|
readonly unsafeIs: readonly ClassicalRule[];
|
|
102
97
|
readonly unsafeEs: readonly ClassicalRule[];
|
|
103
|
-
readonly safe0: LogicNetPair<
|
|
104
|
-
readonly safep: LogicNetPair<
|
|
105
|
-
readonly unsafe: LogicNetPair<
|
|
106
|
-
readonly dup: LogicNetPair<
|
|
98
|
+
readonly safe0: LogicNetPair<TaggedRule>;
|
|
99
|
+
readonly safep: LogicNetPair<TaggedRule>;
|
|
100
|
+
readonly unsafe: LogicNetPair<TaggedRule>;
|
|
101
|
+
readonly dup: LogicNetPair<TaggedRule>;
|
|
102
|
+
readonly extra: LogicNetPair<ContextRule>;
|
|
107
103
|
};
|
|
108
104
|
readonly contextRules: {
|
|
109
|
-
readonly bang: LogicNetPair<
|
|
110
|
-
readonly plain: LogicNetPair<
|
|
105
|
+
readonly bang: LogicNetPair<ContextRule>;
|
|
106
|
+
readonly plain: LogicNetPair<ContextRule>;
|
|
107
|
+
readonly query: LogicNetPair<ContextRule>;
|
|
108
|
+
};
|
|
109
|
+
// The Rule_Cases tags of the facts that have them, by name and position.
|
|
110
|
+
readonly factTags: ReadonlyMap<string, ReadonlyMap<number, Tags>>;
|
|
111
|
+
// Induct's cases rules for types and for predicates or sets, newest first.
|
|
112
|
+
readonly casesRules: {
|
|
113
|
+
readonly type: readonly NamedCasesRule[];
|
|
114
|
+
readonly pred: readonly NamedCasesRule[];
|
|
111
115
|
};
|
|
112
116
|
}
|
|
113
117
|
|
|
@@ -155,15 +159,13 @@ const parseLogic = (): TlaLogic => {
|
|
|
155
159
|
dup: thms[raw[3]],
|
|
156
160
|
dupSwapped: raw[4].map((id) => thms[id]),
|
|
157
161
|
});
|
|
158
|
-
const toItems = (pair: [NetItem[], NetItem[]]): LogicNetPair<
|
|
162
|
+
const toItems = (pair: [NetItem[], NetItem[]]): LogicNetPair<TaggedRule> => {
|
|
159
163
|
const [intro, elim] = pair.map((side) =>
|
|
160
164
|
side.map((item) => ({ tag: item[0], isElim: item[1] === 1, rule: thms[item[2]] })),
|
|
161
165
|
);
|
|
162
166
|
return { intro, elim };
|
|
163
167
|
};
|
|
164
|
-
const toExtraItems = (
|
|
165
|
-
pair: [ExtraNetItem[], ExtraNetItem[]],
|
|
166
|
-
): LogicNetPair<LogicExtraNetItem> => {
|
|
168
|
+
const toExtraItems = (pair: [ExtraNetItem[], ExtraNetItem[]]): LogicNetPair<ContextRule> => {
|
|
167
169
|
const [intro, elim] = pair.map((side) =>
|
|
168
170
|
side.map((item) => ({
|
|
169
171
|
weight: item[0],
|
|
@@ -174,6 +176,19 @@ const parseLogic = (): TlaLogic => {
|
|
|
174
176
|
);
|
|
175
177
|
return { intro, elim };
|
|
176
178
|
};
|
|
179
|
+
// Isabelle hides the weights of the rules declared with "?", so their order stands in for their
|
|
180
|
+
// tags, which is all their unweighted retrieval reads.
|
|
181
|
+
const toOrderedItems = (pair: [number[], number[]]): LogicNetPair<ContextRule> => {
|
|
182
|
+
const [intro, elim] = pair.map((side, isElim) =>
|
|
183
|
+
side.map((id, tag) => ({ weight: 0, tag, isElim: isElim === 1, rule: thms[id] })),
|
|
184
|
+
);
|
|
185
|
+
return { intro, elim };
|
|
186
|
+
};
|
|
187
|
+
const toCasesRules = (rules: RawCasesRule[]) =>
|
|
188
|
+
rules.map((entry) => ({ name: entry[0], rule: { rule: thms[entry[1]], tags: entry[2] } }));
|
|
189
|
+
const factTags = new Map<string, Map<number, Tags>>();
|
|
190
|
+
for (const entry of data.factTags)
|
|
191
|
+
factTags.set(entry[0], new Map([...(factTags.get(entry[0]) ?? []), [entry[1], entry[2]]]));
|
|
177
192
|
return {
|
|
178
193
|
consts: new Map(
|
|
179
194
|
data.consts.map((entry) => [
|
|
@@ -201,15 +216,21 @@ const parseLogic = (): TlaLogic => {
|
|
|
201
216
|
safep: toItems(data.claset.safep),
|
|
202
217
|
unsafe: toItems(data.claset.unsafe),
|
|
203
218
|
dup: toItems(data.claset.dup),
|
|
219
|
+
extra: toExtraItems(data.claset.extra),
|
|
204
220
|
},
|
|
205
221
|
contextRules: {
|
|
206
222
|
bang: toExtraItems(data.contextRules.bang),
|
|
207
223
|
plain: toExtraItems(data.contextRules.plain),
|
|
224
|
+
query: toOrderedItems(data.contextRules.query),
|
|
225
|
+
},
|
|
226
|
+
factTags,
|
|
227
|
+
casesRules: {
|
|
228
|
+
type: toCasesRules(data.casesRules.type),
|
|
229
|
+
pred: toCasesRules(data.casesRules.pred),
|
|
208
230
|
},
|
|
209
231
|
};
|
|
210
232
|
};
|
|
211
233
|
|
|
212
|
-
|
|
234
|
+
let loadedLogic: TlaLogic | undefined;
|
|
213
235
|
|
|
214
|
-
|
|
215
|
-
export const loadLogic = (): TlaLogic => (loaded.logic ??= parseLogic());
|
|
236
|
+
export const loadLogic = (): TlaLogic => (loadedLogic ??= parseLogic());
|
|
@@ -1,11 +1,3 @@
|
|
|
1
|
-
// The simplifier as Isabelle/TLA+ sets it up in simplifier_setup.ML and PredicateLogic.thy (BSD
|
|
2
|
-
// licensed, see LICENSE): how theorems become rewrite rules, the solvers, the neq simproc, and the
|
|
3
|
-
// simpset of the reference heap.
|
|
4
|
-
//
|
|
5
|
-
// The heap's only looper, "split PredicateLogic.cond", is left out: its rule splitCond has the
|
|
6
|
-
// premise isBool(Q(x)), so Splitter.split_tac never composes it with a goal and the looper always
|
|
7
|
-
// fails.
|
|
8
|
-
|
|
9
1
|
import { TlaIsabelleError } from "../../../errors";
|
|
10
2
|
import { genAll, reflexiveThm } from "../pure/drule";
|
|
11
3
|
import { emptyNet, insertTermNet, type Net } from "../pure/net";
|
|
@@ -38,7 +30,7 @@ import {
|
|
|
38
30
|
type GoalTactic,
|
|
39
31
|
} from "../pure/tactical";
|
|
40
32
|
import { aconv, eqTerm, headOf, type Term } from "../pure/term";
|
|
41
|
-
import { conclOf, rs, type Thm } from "../pure/thm";
|
|
33
|
+
import { catchThm, conclOf, rs, type Thm } from "../pure/thm";
|
|
42
34
|
import { trade } from "../pure/variable";
|
|
43
35
|
import { getFact } from "./classical-setup";
|
|
44
36
|
import type { TlaLogic } from "./logic";
|
|
@@ -48,21 +40,13 @@ const isConstApp = (name: string, arity: number, term: Term): boolean =>
|
|
|
48
40
|
? term.kind === "Const" && term.name === name
|
|
49
41
|
: term.kind === "App" && isConstApp(name, arity - 1, term.fun);
|
|
50
42
|
|
|
51
|
-
const
|
|
52
|
-
|
|
53
|
-
return derive();
|
|
54
|
-
} catch (error) {
|
|
55
|
-
if (error instanceof TlaIsabelleError && error.exception === "THM") return undefined;
|
|
56
|
-
throw error;
|
|
57
|
-
}
|
|
58
|
-
};
|
|
43
|
+
const getPredicateFact = (logic: TlaLogic, name: string) =>
|
|
44
|
+
getFact(logic, `PredicateLogic.${name}`);
|
|
59
45
|
|
|
60
46
|
const getRewriting = (logic: TlaLogic) => {
|
|
61
|
-
const
|
|
62
|
-
const
|
|
63
|
-
const
|
|
64
|
-
const neqToEqFalse = rs(fact("neq_conv_eq_False"), eqReflection);
|
|
65
|
-
// Simpdata.mk_eq
|
|
47
|
+
const eqReflection = getPredicateFact(logic, "eq_reflection");
|
|
48
|
+
const eqTrueI = getPredicateFact(logic, "eqTrueI");
|
|
49
|
+
const neqToEqFalse = rs(getPredicateFact(logic, "neq_conv_eq_False"), eqReflection);
|
|
66
50
|
const mkEq = (thm: Thm): Thm => {
|
|
67
51
|
const conclusion = conclOf(thm);
|
|
68
52
|
const concl = conclusion.kind === "App" ? conclusion : undefined;
|
|
@@ -78,22 +62,36 @@ const getRewriting = (logic: TlaLogic) => {
|
|
|
78
62
|
return rs(thm, neqToEqFalse);
|
|
79
63
|
return rs(rs(thm, eqTrueI), eqReflection);
|
|
80
64
|
};
|
|
81
|
-
// The final Simpdata.mksimps_pairs: the rules that split a premise by its outermost operator,
|
|
82
|
-
// and whether to simplify what they give.
|
|
83
65
|
const pairs = new Map<string, { rules: Thm[]; isSimplified: boolean }>([
|
|
84
|
-
[
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
[
|
|
66
|
+
[
|
|
67
|
+
"PredicateLogic.not",
|
|
68
|
+
{ rules: [getPredicateFact(logic, "boolifyFalseI")], isSimplified: true },
|
|
69
|
+
],
|
|
70
|
+
[
|
|
71
|
+
"PredicateLogic.iff",
|
|
72
|
+
{ rules: [getPredicateFact(logic, "iffThenBoolifyEqual")], isSimplified: true },
|
|
73
|
+
],
|
|
74
|
+
["PredicateLogic.imp", { rules: [getPredicateFact(logic, "mp")], isSimplified: false }],
|
|
75
|
+
[
|
|
76
|
+
"PredicateLogic.conj",
|
|
77
|
+
{
|
|
78
|
+
rules: [getPredicateFact(logic, "conjD1"), getPredicateFact(logic, "conjD2")],
|
|
79
|
+
isSimplified: false,
|
|
80
|
+
},
|
|
81
|
+
],
|
|
82
|
+
["PredicateLogic.All", { rules: [getPredicateFact(logic, "spec")], isSimplified: false }],
|
|
89
83
|
["PredicateLogic.TRUE", { rules: [], isSimplified: false }],
|
|
90
84
|
["PredicateLogic.FALSE", { rules: [], isSimplified: false }],
|
|
91
85
|
[
|
|
92
86
|
"PredicateLogic.cond",
|
|
93
|
-
{
|
|
87
|
+
{
|
|
88
|
+
rules: [
|
|
89
|
+
rs(getPredicateFact(logic, "if_bool_equiv_conj"), getPredicateFact(logic, "iffD1")),
|
|
90
|
+
],
|
|
91
|
+
isSimplified: false,
|
|
92
|
+
},
|
|
94
93
|
],
|
|
95
94
|
]);
|
|
96
|
-
// Simpdata.mk_atomize
|
|
97
95
|
const atoms = (context: SimpContext, thm: Thm): Thm[] => {
|
|
98
96
|
const concl = conclOf(thm);
|
|
99
97
|
if (!(concl.kind === "App" && isConstApp("PredicateLogic.Trueprop", 1, concl))) return [thm];
|
|
@@ -120,17 +118,19 @@ const getRewriting = (logic: TlaLogic) => {
|
|
|
120
118
|
};
|
|
121
119
|
|
|
122
120
|
const getSolvers = (logic: TlaLogic): { unsafe: Solver; safe: Solver } => {
|
|
123
|
-
const fact = (name: string) => getFact(logic, `PredicateLogic.${name}`);
|
|
124
121
|
const solutions = [
|
|
125
122
|
reflexiveThm,
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
123
|
+
getPredicateFact(logic, "trueI"),
|
|
124
|
+
getPredicateFact(logic, "refl"),
|
|
125
|
+
getPredicateFact(logic, "iff_refl"),
|
|
126
|
+
getPredicateFact(logic, "notFalseI"),
|
|
127
|
+
];
|
|
128
|
+
const contradictions = [
|
|
129
|
+
getPredicateFact(logic, "falseE"),
|
|
130
|
+
getPredicateFact(logic, "not_refl_False"),
|
|
130
131
|
];
|
|
131
|
-
const
|
|
132
|
-
const
|
|
133
|
-
const simpImpliesI = fact("simp_impliesI");
|
|
132
|
+
const conjI = getPredicateFact(logic, "conjI");
|
|
133
|
+
const simpImpliesI = getPredicateFact(logic, "simp_impliesI");
|
|
134
134
|
const introSimpImplies =
|
|
135
135
|
(context: SimpContext): GoalTactic =>
|
|
136
136
|
(index) =>
|
|
@@ -167,12 +167,13 @@ const getSolvers = (logic: TlaLogic): { unsafe: Solver; safe: Solver } => {
|
|
|
167
167
|
};
|
|
168
168
|
};
|
|
169
169
|
|
|
170
|
-
// PredicateLogic.thy's neq simproc: rewrites x = y to FALSE given y ~= x or (y = x) = FALSE.
|
|
171
170
|
const getNeqProc = (logic: TlaLogic) => {
|
|
172
|
-
const
|
|
173
|
-
const
|
|
174
|
-
|
|
175
|
-
|
|
171
|
+
const eqReflection = getPredicateFact(logic, "eq_reflection");
|
|
172
|
+
const neqToEqFalse = rs(
|
|
173
|
+
rs(getPredicateFact(logic, "not_sym"), getPredicateFact(logic, "neq_conv_eq_False")),
|
|
174
|
+
eqReflection,
|
|
175
|
+
);
|
|
176
|
+
const symEqLeft = rs(getPredicateFact(logic, "symEqLeft"), eqReflection);
|
|
176
177
|
const isNeq = (eq: Term, lhs: Term, rhs: Term, thm: Thm) => {
|
|
177
178
|
const prop = thm.prop;
|
|
178
179
|
if (prop.kind !== "App" || prop.arg.kind !== "App") return false;
|
|
@@ -1,13 +1,6 @@
|
|
|
1
|
-
// Ported from Isabelle2025's Tools/intuitionistic.ML and the rule order of
|
|
2
|
-
// Pure/Isar/context_rules.ML. Copyright (c) 1986-2025 University of Cambridge, Technische
|
|
3
|
-
// Universitaet Muenchen, and contributors, see LICENSE.
|
|
4
|
-
//
|
|
5
|
-
// iprover: intuitionistic proof search with the context rules, the rules declared intro, elim and
|
|
6
|
-
// dest. Isabelle/TLA+ declares no context rule wrappers, so Swrap and wrap leave tactics as they
|
|
7
|
-
// are.
|
|
8
|
-
|
|
9
1
|
import { remdupsRl } from "../pure/drule";
|
|
10
2
|
import { selectGoal } from "../pure/goal";
|
|
3
|
+
import { unifyTermNet } from "../pure/net";
|
|
11
4
|
import { deepen } from "../pure/search";
|
|
12
5
|
import { stripAssumsConcl, stripAssumsHyp } from "../pure/logic";
|
|
13
6
|
import type { Limits } from "../pure/interrupt";
|
|
@@ -42,7 +35,6 @@ export interface ContextRule {
|
|
|
42
35
|
|
|
43
36
|
export interface IntuitionisticContext {
|
|
44
37
|
readonly limits: Limits;
|
|
45
|
-
// Context_Rules.netpair_bang and Context_Rules.netpair.
|
|
46
38
|
readonly safeRules: NetPair<ContextRule>;
|
|
47
39
|
readonly rules: NetPair<ContextRule>;
|
|
48
40
|
}
|
|
@@ -52,21 +44,37 @@ interface Visited {
|
|
|
52
44
|
readonly concl: Term;
|
|
53
45
|
}
|
|
54
46
|
|
|
55
|
-
//
|
|
56
|
-
const
|
|
47
|
+
// orderlist_no_weight sorts by tag alone.
|
|
48
|
+
const orderContextRules = (rules: readonly ContextRule[], isWeighted: boolean) => {
|
|
57
49
|
const sorted = [...rules].sort(
|
|
58
|
-
(left, right) => left.weight - right.weight || left.tag - right.tag,
|
|
50
|
+
(left, right) => (isWeighted ? left.weight - right.weight : 0) || left.tag - right.tag,
|
|
51
|
+
);
|
|
52
|
+
return sorted.filter(
|
|
53
|
+
(rule, index) =>
|
|
54
|
+
index + 1 >= sorted.length ||
|
|
55
|
+
sorted[index + 1].weight !== rule.weight ||
|
|
56
|
+
sorted[index + 1].tag !== rule.tag,
|
|
59
57
|
);
|
|
60
|
-
return sorted
|
|
61
|
-
.filter(
|
|
62
|
-
(rule, index) =>
|
|
63
|
-
index + 1 >= sorted.length ||
|
|
64
|
-
sorted[index + 1].weight !== rule.weight ||
|
|
65
|
-
sorted[index + 1].tag !== rule.tag,
|
|
66
|
-
)
|
|
67
|
-
.map((rule) => ({ isElim: rule.isElim, rule: rule.rule }));
|
|
68
58
|
};
|
|
69
59
|
|
|
60
|
+
const orderRules = (rules: ContextRule[]): BiresRule[] =>
|
|
61
|
+
orderContextRules(rules, true).map((rule) => ({ isElim: rule.isElim, rule: rule.rule }));
|
|
62
|
+
|
|
63
|
+
// Context_Rules.find_rules_netpair: the elimination rules for the first fact, then the
|
|
64
|
+
// introduction rules for the goal.
|
|
65
|
+
export const findRulesNetpair = (
|
|
66
|
+
isWeighted: boolean,
|
|
67
|
+
facts: readonly Thm[],
|
|
68
|
+
goal: Term,
|
|
69
|
+
netpair: NetPair<ContextRule>,
|
|
70
|
+
): Thm[] =>
|
|
71
|
+
[
|
|
72
|
+
...(facts.length === 0
|
|
73
|
+
? []
|
|
74
|
+
: orderContextRules(unifyTermNet(netpair.elim, stripAssumsConcl(facts[0].prop)), isWeighted)),
|
|
75
|
+
...orderContextRules(unifyTermNet(netpair.intro, stripAssumsConcl(goal)), isWeighted),
|
|
76
|
+
].map((rule) => rule.rule);
|
|
77
|
+
|
|
70
78
|
const countDistinct = (terms: readonly Term[]) =>
|
|
71
79
|
terms.reduce<Term[]>(
|
|
72
80
|
(result, term) => (result.some((other) => aconv(other, term)) ? result : [...result, term]),
|
|
@@ -127,6 +135,5 @@ const intproverTac = (
|
|
|
127
135
|
)(index);
|
|
128
136
|
});
|
|
129
137
|
|
|
130
|
-
// Intuitionistic.prover_tac with the default depth limit.
|
|
131
138
|
export const proverTac = (context: IntuitionisticContext): GoalTactic =>
|
|
132
139
|
selectGoal(deepen(2, 20, (limit) => intproverTac(context, [], 0, limit), 4)(1));
|
package/src/prover/ocaml.ts
CHANGED
|
@@ -1,16 +1,13 @@
|
|
|
1
|
-
//
|
|
1
|
+
// A bigint is an OCaml int beyond what a number holds exactly.
|
|
2
|
+
type OcamlValue = number | bigint | string | OcamlValue[];
|
|
2
3
|
|
|
3
|
-
type OcamlValue = number | string | OcamlValue[];
|
|
4
|
-
|
|
5
|
-
// String.compare: byte by byte, on the UTF-8 bytes. Code units order the same way for the ASCII
|
|
6
|
-
// names tlapm compares.
|
|
7
4
|
export const compareStrings = (left: string, right: string) =>
|
|
8
5
|
left < right ? -1 : left > right ? 1 : 0;
|
|
9
6
|
|
|
10
|
-
// Stdlib.compare on ints, strings, and lists, where a list is smaller than any longer list it
|
|
11
|
-
// starts.
|
|
12
7
|
export const compareValues = (left: OcamlValue, right: OcamlValue): number => {
|
|
13
8
|
if (typeof left === "number" && typeof right === "number") return left - right;
|
|
9
|
+
if (typeof left === "bigint" && typeof right === "bigint")
|
|
10
|
+
return left < right ? -1 : left > right ? 1 : 0;
|
|
14
11
|
if (typeof left === "string" && typeof right === "string") return compareStrings(left, right);
|
|
15
12
|
if (!Array.isArray(left) || !Array.isArray(right)) return 0;
|
|
16
13
|
const index = left.findIndex(
|
|
@@ -1,7 +1,3 @@
|
|
|
1
|
-
// A port of tlapm's action frontend (Action.process_obligation), which makes an obligation first
|
|
2
|
-
// order for the backends: [A]_v, <<A>>_v and UNCHANGED become primes (Expr.Tla_norm), primes move
|
|
3
|
-
// down to the variables (Symbol_commute), and what remains modal becomes opaque (Coalesce).
|
|
4
|
-
|
|
5
1
|
import { TlapmBugError } from "../../errors";
|
|
6
2
|
import { rewriteUnchanged } from "../../obligations/temporal";
|
|
7
3
|
import {
|
|
@@ -44,13 +40,14 @@ const getHyp = (scope: Scope | undefined, index: number) => {
|
|
|
44
40
|
const getLevel = (scope: Scope | undefined, expression: Expr) =>
|
|
45
41
|
getLevelInfo(scope, expression).level;
|
|
46
42
|
|
|
47
|
-
const isBuiltin = (
|
|
43
|
+
const isBuiltin = (
|
|
44
|
+
expression: Expr,
|
|
45
|
+
builtins: Builtin[],
|
|
46
|
+
): expression is Extract<Expr, { kind: "Apply" }> =>
|
|
48
47
|
expression.kind === "Apply" &&
|
|
49
48
|
expression.operator.kind === "Internal" &&
|
|
50
49
|
builtins.includes(expression.operator.builtin);
|
|
51
50
|
|
|
52
|
-
// Visit.map over a sequent: each hypothesis maps in the scope before it, hidden ones too if hyps
|
|
53
|
-
// is "all". The context maps by the obligation's own hypotheses, from which it derives.
|
|
54
51
|
const createSequentMap = (map: Rewrite, hyps: "visible" | "all") => {
|
|
55
52
|
const mapContext = createContextMap<Scope | undefined>(undefined, (scope, hyp) => {
|
|
56
53
|
const mapped = mapHyp(hyp, (inner) => map(scope, inner), hyps);
|
|
@@ -62,7 +59,6 @@ const createSequentMap = (map: Rewrite, hyps: "visible" | "all") => {
|
|
|
62
59
|
};
|
|
63
60
|
};
|
|
64
61
|
|
|
65
|
-
// Expr.Tla_norm.expand_action, then expand_unchanged.
|
|
66
62
|
const expandAction: Rewrite = (scope, expression) => {
|
|
67
63
|
if (expression.kind === "Sub" || expression.kind === "Tsub") {
|
|
68
64
|
const action = expandAction(scope, expression.action);
|
|
@@ -79,16 +75,13 @@ const expandAction: Rewrite = (scope, expression) => {
|
|
|
79
75
|
};
|
|
80
76
|
|
|
81
77
|
const expandUnchanged: Rewrite = (scope, expression) =>
|
|
82
|
-
expression
|
|
83
|
-
isBuiltin(expression, ["UNCHANGED"]) &&
|
|
84
|
-
expression.args.length === 1
|
|
78
|
+
isBuiltin(expression, ["UNCHANGED"]) && expression.args.length === 1
|
|
85
79
|
? rewriteUnchanged(expression.args[0])
|
|
86
80
|
: mapScoped(scope, expression, expandUnchanged, adjoin, "all");
|
|
87
81
|
|
|
88
82
|
const applyModal = (builtin: Builtin, expression: Expr) =>
|
|
89
83
|
applyBuiltin(builtin, [expression], expression);
|
|
90
84
|
|
|
91
|
-
// prime_commuter: a prime distributes down to the declarations that are not constant.
|
|
92
85
|
const commutePrime: Rewrite = (scope, expression) => {
|
|
93
86
|
if (expression.kind === "Ix") {
|
|
94
87
|
const hyp = getHyp(scope, expression.index);
|
|
@@ -127,8 +120,6 @@ const commutePrime: Rewrite = (scope, expression) => {
|
|
|
127
120
|
return mapScoped(scope, expression, commutePrime, adjoin);
|
|
128
121
|
};
|
|
129
122
|
|
|
130
|
-
// box_commuter and dia_commuter: [] distributes over /\ and \A, and <> over \/ and \E, and both
|
|
131
|
-
// vanish on a constant.
|
|
132
123
|
const getModalCommuter = (builtin: "BoxTrue" | "Diamond"): Rewrite => {
|
|
133
124
|
const connective: Builtin = builtin === "BoxTrue" ? "Conj" : "Disj";
|
|
134
125
|
const quantifier = builtin === "BoxTrue" ? "Forall" : "Exists";
|
|
@@ -151,7 +142,6 @@ const COMMUTERS: Partial<Record<Builtin, Rewrite>> = {
|
|
|
151
142
|
Diamond: getModalCommuter("Diamond"),
|
|
152
143
|
};
|
|
153
144
|
|
|
154
|
-
// symbol_commute: each prime, [] and <> commutes down its operand.
|
|
155
145
|
const commuteSymbols: Rewrite = (scope, expression) => {
|
|
156
146
|
if (expression.kind === "Apply" && expression.operator.kind === "Internal") {
|
|
157
147
|
const commuter = COMMUTERS[expression.operator.builtin];
|
|
@@ -163,8 +153,6 @@ const commuteSymbols: Rewrite = (scope, expression) => {
|
|
|
163
153
|
return mapScoped(scope, expression, commuteSymbols, adjoin, "all");
|
|
164
154
|
};
|
|
165
155
|
|
|
166
|
-
// The prefix rename_with_loc gives a declaration of each level, and a definition by the number of
|
|
167
|
-
// its body's level.
|
|
168
156
|
export const LEVEL_PREFIXES: Record<Level, string> = {
|
|
169
157
|
Constant: "CONSTANT",
|
|
170
158
|
State: "STATE",
|
|
@@ -182,8 +170,6 @@ interface RenameState {
|
|
|
182
170
|
original: Scope | undefined;
|
|
183
171
|
}
|
|
184
172
|
|
|
185
|
-
// rename_with_loc: each declaration's name tells its level, as in CONSTANT_x_ or VARIABLE_x_. A
|
|
186
|
-
// definition's level is the one its body had before the commuters ran, unless given.
|
|
187
173
|
const renameDefn = (scope: Scope | undefined, definition: Defn, level?: number): Defn => {
|
|
188
174
|
if (definition.kind !== "Operator") {
|
|
189
175
|
return definition.kind === "Bpragma"
|
|
@@ -213,30 +199,20 @@ const renameHyp = (scope: Scope | undefined, hyp: Hyp, level?: number): Hyp => {
|
|
|
213
199
|
}
|
|
214
200
|
};
|
|
215
201
|
|
|
216
|
-
// tlapm reads levels from properties that Expr.Levels computes before the frontend rewrites
|
|
217
|
-
// anything, and each node it builds takes the properties of a node it replaces: UNCHANGED's
|
|
218
|
-
// equalities those of the tuple or its only element, and a commuted prime, [] or <> those of its
|
|
219
|
-
// operand. A definition's name tells the level its body's top node ends up with.
|
|
220
202
|
const getOriginalLevel = (scope: Scope | undefined, hyp: Hyp) => {
|
|
221
203
|
if (hyp.kind !== "Defn" || hyp.definition.kind !== "Operator") return undefined;
|
|
222
204
|
const getNodeLevel = (expression: Expr) => {
|
|
223
|
-
if (!isBuiltin(expression, ["UNCHANGED"])
|
|
224
|
-
return getLevel(scope, expression);
|
|
225
|
-
}
|
|
205
|
+
if (!isBuiltin(expression, ["UNCHANGED"])) return getLevel(scope, expression);
|
|
226
206
|
const flatten = (inner: Expr): Expr[] =>
|
|
227
207
|
inner.kind === "Tuple" ? inner.elements.flatMap(flatten) : [inner];
|
|
228
208
|
const items = flatten(expression.args[0]);
|
|
229
209
|
return getLevel(scope, items.length === 1 ? items[0] : expression.args[0]);
|
|
230
210
|
};
|
|
231
211
|
const body = hyp.definition.body;
|
|
232
|
-
const isCommuted =
|
|
233
|
-
|
|
234
|
-
body.kind === "Apply" &&
|
|
235
|
-
body.args.length === 1;
|
|
236
|
-
return getNodeLevel(isCommuted && body.kind === "Apply" ? body.args[0] : body);
|
|
212
|
+
const isCommuted = isBuiltin(body, ["Prime", "BoxTrue", "Diamond"]) && body.args.length === 1;
|
|
213
|
+
return getNodeLevel(isCommuted ? body.args[0] : body);
|
|
237
214
|
};
|
|
238
215
|
|
|
239
|
-
// renameSequent on the obligation, with the levels of its definitions from before commuting.
|
|
240
216
|
const renameContext = createContextMap<RenameState>(
|
|
241
217
|
{ scope: undefined, original: undefined },
|
|
242
218
|
(current, hyp, original) => {
|
|
@@ -325,8 +301,6 @@ const rename: Rewrite = (scope, expression) => {
|
|
|
325
301
|
}
|
|
326
302
|
};
|
|
327
303
|
|
|
328
|
-
// E_substitutive.make_array: for each parameter of an operator, counting from the last, whether
|
|
329
|
-
// the body uses it only outside primes and the other modal operators.
|
|
330
304
|
const substitutiveArgs = new WeakMap<Defn, boolean[]>();
|
|
331
305
|
|
|
332
306
|
const getSubstitutiveArgs = (scope: Scope | undefined, definition: Defn): boolean[] => {
|
|
@@ -354,7 +328,6 @@ const UNARY_MODALS: Builtin[] = [
|
|
|
354
328
|
|
|
355
329
|
const BINARY_MODALS: Builtin[] = ["Leadsto", "Actplus", "Cdot"];
|
|
356
330
|
|
|
357
|
-
// compute_substitutivity_array: whether the parameter at index occurs only where scope holds.
|
|
358
331
|
const isSubstitutive = (
|
|
359
332
|
scope: Scope | undefined,
|
|
360
333
|
expression: Expr,
|
|
@@ -388,30 +361,26 @@ const isSubstitutive = (
|
|
|
388
361
|
});
|
|
389
362
|
}
|
|
390
363
|
}
|
|
391
|
-
|
|
364
|
+
let isEverySubstitutive = true;
|
|
392
365
|
mapScoped(
|
|
393
366
|
{ scope, index },
|
|
394
367
|
expression,
|
|
395
368
|
(state, inner) => {
|
|
396
|
-
|
|
369
|
+
isEverySubstitutive &&= isSubstitutive(state.scope, inner, state.index, isInScope);
|
|
397
370
|
return inner;
|
|
398
371
|
},
|
|
399
372
|
(state, hyp) => ({ scope: adjoin(state.scope, hyp), index: state.index + 1 }),
|
|
400
373
|
"all",
|
|
401
374
|
);
|
|
402
|
-
return
|
|
375
|
+
return isEverySubstitutive;
|
|
403
376
|
};
|
|
404
377
|
|
|
405
|
-
// Coalesce.crypthash: h and the first five hexadecimal digits of the MD5 of the expression as
|
|
406
|
-
// tlapm prints it.
|
|
407
378
|
export const getHashName = (hyps: Hyp[], expression: Expr) =>
|
|
408
379
|
`h${getMd5(renderDoc(printExpression(hyps, expression))).slice(0, 5)}`;
|
|
409
380
|
|
|
410
381
|
const coalesce = (scope: Scope | undefined, expression: Expr): Expr =>
|
|
411
382
|
at({ kind: "Opaque", name: getHashName(getScopeHyps(scope), expression) }, expression);
|
|
412
383
|
|
|
413
|
-
// coalesce_operator: an operator applied to arguments that are not all substitutive is opaque,
|
|
414
|
-
// hiding the arguments that are constant or substitutive.
|
|
415
384
|
const coalesceOperator = (
|
|
416
385
|
scope: Scope | undefined,
|
|
417
386
|
name: string,
|
|
@@ -441,19 +410,12 @@ const MODAL_BUILTINS: Builtin[] = [
|
|
|
441
410
|
"UNCHANGED",
|
|
442
411
|
];
|
|
443
412
|
|
|
444
|
-
// coalesce_modal_visitor: a primed declaration becomes the opaque name#prime, and every other
|
|
445
|
-
// modal expression an opaque name. tlapm means to apply that name to the expression's free
|
|
446
|
-
// variables, but compute_vars collects them into an instance variable and returns its own empty
|
|
447
|
-
// set, so the name always stands alone.
|
|
448
413
|
const coalesceModal: Rewrite = (scope, expression) => {
|
|
449
414
|
if (expression.kind !== "Apply") return mapScoped(scope, expression, coalesceModal, adjoin);
|
|
450
415
|
const operator = expression.operator;
|
|
451
|
-
const
|
|
452
|
-
|
|
453
|
-
|
|
454
|
-
expression.args.length === 1 &&
|
|
455
|
-
arg.kind === "Ix"
|
|
456
|
-
) {
|
|
416
|
+
const args = expression.args;
|
|
417
|
+
const arg = args[0];
|
|
418
|
+
if (isBuiltin(expression, ["Prime", "StrongPrime"]) && args.length === 1 && arg.kind === "Ix") {
|
|
457
419
|
const hyp = getHyp(scope, arg.index);
|
|
458
420
|
if (hyp.kind === "Fresh" || hyp.kind === "Flex") {
|
|
459
421
|
return at({ kind: "Opaque", name: `${hyp.name}#prime` }, expression);
|
|
@@ -464,34 +426,37 @@ const coalesceModal: Rewrite = (scope, expression) => {
|
|
|
464
426
|
const hypScope = getScopeAt(scope, operator.index - 1);
|
|
465
427
|
const hyp = hypScope?.hyp;
|
|
466
428
|
if (!hyp) throw new TlapmBugError();
|
|
467
|
-
const
|
|
429
|
+
const applyCoalesced = (applied: Expr) =>
|
|
430
|
+
at(
|
|
431
|
+
{ kind: "Apply", operator: applied, args: args.map((inner) => coalesceModal(scope, inner)) },
|
|
432
|
+
expression,
|
|
433
|
+
);
|
|
468
434
|
if (hyp.kind === "Defn" && hyp.definition.kind === "Operator") {
|
|
469
435
|
const substitutive = getSubstitutiveArgs(hypScope.rest, hyp.definition);
|
|
470
436
|
const isKept = args.every(
|
|
471
437
|
(inner, position) => getLevel(scope, inner) === 0 || substitutive[args.length - position - 1],
|
|
472
438
|
);
|
|
473
439
|
if (isKept) return mapScoped(scope, expression, coalesceModal, adjoin);
|
|
474
|
-
|
|
475
|
-
|
|
476
|
-
{ kind: "Apply", operator: opaque, args: args.map((inner) => coalesceModal(scope, inner)) },
|
|
477
|
-
expression,
|
|
440
|
+
return applyCoalesced(
|
|
441
|
+
coalesceOperator(scope, hyp.definition.name, substitutive, operator, args),
|
|
478
442
|
);
|
|
479
443
|
}
|
|
480
444
|
if (hyp.kind === "Flex") return mapScoped(scope, expression, coalesceModal, adjoin);
|
|
481
445
|
if (hyp.kind === "Fresh") {
|
|
482
|
-
if (hyp.level === "Constant")
|
|
483
|
-
|
|
484
|
-
|
|
485
|
-
|
|
486
|
-
|
|
487
|
-
|
|
488
|
-
|
|
489
|
-
|
|
446
|
+
if (hyp.level === "Constant") return applyCoalesced(operator);
|
|
447
|
+
return applyCoalesced(
|
|
448
|
+
coalesceOperator(
|
|
449
|
+
scope,
|
|
450
|
+
hyp.name,
|
|
451
|
+
args.map(() => false),
|
|
452
|
+
operator,
|
|
453
|
+
args,
|
|
454
|
+
),
|
|
455
|
+
);
|
|
490
456
|
}
|
|
491
457
|
throw new TlapmBugError();
|
|
492
458
|
};
|
|
493
459
|
|
|
494
|
-
// process_eob, on an obligation's sequent.
|
|
495
460
|
const expandActionSequent = createSequentMap(expandAction, "all");
|
|
496
461
|
|
|
497
462
|
const expandUnchangedSequent = createSequentMap(expandUnchanged, "all");
|
|
@@ -501,6 +466,8 @@ const commuteSequent = createSequentMap(commuteSymbols, "all");
|
|
|
501
466
|
const coalesceSequent = createSequentMap(coalesceModal, "visible");
|
|
502
467
|
|
|
503
468
|
export const processObligation = (sequent: Sequent): Sequent => {
|
|
469
|
+
// Levels.compute_level, whose levels the passes below read on demand: only its errors matter.
|
|
470
|
+
getLevelInfo(undefined, { kind: "Sequent", sequent });
|
|
504
471
|
const keys = sequent.context;
|
|
505
472
|
const expanded = expandUnchangedSequent(keys, expandActionSequent(keys, sequent));
|
|
506
473
|
const commuted = commuteSequent(keys, expanded);
|