tla-ts 0.0.9 → 0.0.10-dev.09e53c2a6
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 +57 -53
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +109 -10
- package/dist/index.d.ts +109 -10
- 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 +146 -31
- package/dist/run.js +146 -31
- package/dist/tlapm.cjs +2 -2
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +132 -104
- package/dist/transfer.js +132 -104
- package/dist/worker.cjs +6 -6
- package/dist/worker.js +6 -6
- package/package.json +3 -1
- package/src/ast.ts +45 -59
- package/src/bags.ts +99 -102
- package/src/builtins.ts +28 -75
- package/src/bundled-modules.ts +1 -8
- package/src/check-failure.ts +116 -0
- package/src/check-trace.ts +282 -0
- package/src/check.ts +797 -782
- package/src/cli/options.ts +12 -32
- package/src/cli/run.ts +0 -2
- package/src/cli/runtime-invariants.ts +136 -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 +687 -0
- package/src/cli/tlc-usage.ts +360 -0
- package/src/cli/tlc.ts +323 -658
- 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 +196 -74
- package/src/config.ts +140 -109
- package/src/coverage.ts +830 -0
- package/src/dependencies.ts +36 -54
- package/src/dfid.ts +618 -0
- package/src/environment-config.ts +315 -0
- package/src/environment.ts +178 -339
- package/src/errors.ts +100 -57
- package/src/evaluate.ts +598 -340
- package/src/exit-codes.ts +38 -3
- package/src/fingerprints.ts +75 -11
- package/src/index.ts +3 -0
- package/src/instances.ts +126 -21
- package/src/java-hash.ts +7 -0
- package/src/java-overrides.ts +4 -19
- package/src/json-reader.ts +455 -0
- package/src/json.ts +252 -139
- package/src/levels.ts +46 -58
- package/src/lexer.ts +83 -101
- package/src/liveness-checker.ts +590 -311
- package/src/liveness.ts +180 -124
- 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 +38 -19
- package/src/obligations/levels.ts +27 -18
- package/src/obligations/module.ts +28 -55
- package/src/obligations/normalize.ts +30 -37
- package/src/obligations/operators.ts +0 -3
- package/src/obligations/pragma.ts +52 -24
- package/src/obligations/printer.ts +89 -58
- 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 +119 -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 +30 -60
- package/src/parallel.ts +59 -73
- package/src/parser.ts +1082 -399
- 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 +224 -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 +0 -14
- package/src/prover/isabelle/provers/classical.ts +58 -61
- package/src/prover/isabelle/provers/hypsubst.ts +27 -52
- 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 +31 -74
- 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 +1 -44
- 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 +0 -2
- 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 +1026 -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 +615 -53
- package/src/prover/smt/solver/arith-terms.ts +121 -0
- package/src/prover/smt/solver/array-decl-plugin.ts +175 -0
- package/src/prover/smt/solver/array-rewriter.ts +309 -0
- package/src/prover/smt/solver/array.ts +1 -3
- package/src/prover/smt/solver/asserted-formulas.ts +87 -58
- package/src/prover/smt/solver/ast-lt.ts +166 -22
- package/src/prover/smt/solver/ast-util.ts +160 -7
- package/src/prover/smt/solver/ast.ts +1424 -180
- package/src/prover/smt/solver/auf-solver.ts +7 -44
- package/src/prover/smt/solver/bit-blast-tactic.ts +582 -0
- package/src/prover/smt/solver/bit-blaster.ts +871 -0
- package/src/prover/smt/solver/bound-manager.ts +196 -0
- package/src/prover/smt/solver/bound-simplifier.ts +600 -0
- package/src/prover/smt/solver/bv-bound-chk.ts +492 -0
- package/src/prover/smt/solver/bv-decl-plugin.ts +338 -0
- package/src/prover/smt/solver/bv-divrem-bounds.ts +95 -0
- package/src/prover/smt/solver/bv-rewriter.ts +1901 -0
- package/src/prover/smt/solver/bv1-blast.ts +214 -0
- package/src/prover/smt/solver/bv2fpa-converter.ts +174 -0
- package/src/prover/smt/solver/bv2int-rewriter.ts +544 -0
- package/src/prover/smt/solver/bv2real-rewriter.ts +533 -0
- package/src/prover/smt/solver/card2bv.ts +110 -0
- package/src/prover/smt/solver/case-split-queue.ts +0 -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 +278 -0
- package/src/prover/smt/solver/conflict-resolution.ts +78 -11
- package/src/prover/smt/solver/context.ts +519 -175
- package/src/prover/smt/solver/ctx-simplify.ts +33 -50
- package/src/prover/smt/solver/ctx-solver-simplify.ts +122 -0
- package/src/prover/smt/solver/datatype-decl-plugin.ts +572 -0
- package/src/prover/smt/solver/datatype-rewriter.ts +82 -0
- package/src/prover/smt/solver/demodulator.ts +786 -0
- package/src/prover/smt/solver/dependent-expr-state.ts +81 -0
- package/src/prover/smt/solver/der.ts +39 -30
- package/src/prover/smt/solver/diff-neq.ts +206 -0
- package/src/prover/smt/solver/distribute-forall.ts +57 -0
- package/src/prover/smt/solver/dom-simplify.ts +511 -0
- package/src/prover/smt/solver/dt2bv-tactic.ts +260 -0
- package/src/prover/smt/solver/dyn-ack.ts +0 -11
- package/src/prover/smt/solver/e-matching.ts +9 -41
- package/src/prover/smt/solver/elim-small-bv-tactic.ts +129 -0
- package/src/prover/smt/solver/elim-uncnstr.ts +545 -0
- package/src/prover/smt/solver/enode.ts +100 -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 +907 -0
- package/src/prover/smt/solver/euf/euf-solver.ts +1205 -0
- package/src/prover/smt/solver/euf/fpa-solver.ts +317 -0
- package/src/prover/smt/solver/euf/mam.ts +1050 -0
- package/src/prover/smt/solver/euf/q-ematch.ts +830 -0
- package/src/prover/smt/solver/euf/q-mbi.ts +587 -0
- package/src/prover/smt/solver/euf/q-model-fixer.ts +296 -0
- package/src/prover/smt/solver/euf/q-solver.ts +361 -0
- package/src/prover/smt/solver/euf/th-solver.ts +335 -0
- package/src/prover/smt/solver/euf/th-solvers.ts +30 -0
- package/src/prover/smt/solver/expr-ref.ts +0 -5
- package/src/prover/smt/solver/expr-safe-replace.ts +26 -7
- package/src/prover/smt/solver/expr2polynomial.ts +146 -0
- package/src/prover/smt/solver/factor.ts +141 -0
- package/src/prover/smt/solver/fd-solver.ts +265 -0
- package/src/prover/smt/solver/fingerprints.ts +15 -26
- package/src/prover/smt/solver/fix-dl-var.ts +148 -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 +640 -0
- package/src/prover/smt/solver/fpa2bv-converter.ts +2249 -0
- package/src/prover/smt/solver/fpa2bv-rewriter.ts +348 -0
- package/src/prover/smt/solver/fpa2bv-tactic.ts +73 -0
- package/src/prover/smt/solver/goal.ts +176 -28
- package/src/prover/smt/solver/goal2nlsat.ts +189 -0
- package/src/prover/smt/solver/guard-set.ts +219 -0
- package/src/prover/smt/solver/hash.ts +0 -9
- package/src/prover/smt/solver/hashtable.ts +26 -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 +112 -132
- 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 +345 -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 +11 -30
- package/src/prover/smt/solver/lp/core-solver.ts +23 -29
- package/src/prover/smt/solver/lp/cross-nested.ts +5 -20
- 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 +69 -82
- package/src/prover/smt/solver/lp/lar-term.ts +0 -5
- package/src/prover/smt/solver/lp/lp-settings.ts +0 -14
- package/src/prover/smt/solver/lp/maximize-term.ts +76 -52
- package/src/prover/smt/solver/lp/nex-creator.ts +4 -28
- package/src/prover/smt/solver/lp/nex.ts +0 -6
- 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 +91 -135
- 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 +22 -72
- 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 +123 -112
- package/src/prover/smt/solver/lp/numeric-pair.ts +0 -4
- package/src/prover/smt/solver/lp/pdd-interval.ts +0 -3
- package/src/prover/smt/solver/lp/pdd-simplifier.ts +1 -14
- package/src/prover/smt/solver/lp/pdd-solver.ts +2 -33
- package/src/prover/smt/solver/lp/pdd.ts +7 -70
- 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 +309 -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 +105 -0
- package/src/prover/smt/solver/maxsmt.ts +92 -0
- package/src/prover/smt/solver/mbp/mbp-arith.ts +467 -0
- package/src/prover/smt/solver/mbp/mbp-basic-tg.ts +101 -0
- package/src/prover/smt/solver/mbp/mbp-plugin.ts +287 -0
- package/src/prover/smt/solver/mbp/mbp-qel.ts +48 -0
- package/src/prover/smt/solver/mbp/mbp-solve-plugin.ts +271 -0
- package/src/prover/smt/solver/mbp/mbp-term-graph.ts +606 -0
- package/src/prover/smt/solver/model-based-opt.ts +844 -0
- package/src/prover/smt/solver/model-checker.ts +19 -62
- package/src/prover/smt/solver/model-evaluator.ts +190 -40
- package/src/prover/smt/solver/model-finder.ts +14 -32
- package/src/prover/smt/solver/model-generator.ts +56 -40
- 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 +711 -0
- package/src/prover/smt/solver/mus.ts +51 -0
- package/src/prover/smt/solver/muz/dl-context.ts +404 -0
- package/src/prover/smt/solver/muz/dl-mk-bit-blast.ts +97 -0
- package/src/prover/smt/solver/muz/dl-mk-coi-filter.ts +167 -0
- package/src/prover/smt/solver/muz/dl-mk-elim-term-ite.ts +125 -0
- package/src/prover/smt/solver/muz/dl-mk-interp-tail-simplifier.ts +299 -0
- package/src/prover/smt/solver/muz/dl-mk-rule-inliner.ts +455 -0
- package/src/prover/smt/solver/muz/dl-mk-slice.ts +340 -0
- package/src/prover/smt/solver/muz/dl-mk-subsumption-checker.ts +163 -0
- package/src/prover/smt/solver/muz/dl-rule-set.ts +273 -0
- package/src/prover/smt/solver/muz/dl-rule-transformer.ts +123 -0
- package/src/prover/smt/solver/muz/dl-rule.ts +496 -0
- package/src/prover/smt/solver/muz/hnf.ts +201 -0
- package/src/prover/smt/solver/muz/horn-subsume-model-converter.ts +176 -0
- package/src/prover/smt/solver/muz/horn-tactic.ts +201 -0
- package/src/prover/smt/solver/muz/rule-properties.ts +337 -0
- package/src/prover/smt/solver/muz/spacer-context.ts +1406 -0
- package/src/prover/smt/solver/muz/spacer-dl-interface.ts +52 -0
- package/src/prover/smt/solver/muz/spacer-generalizers.ts +241 -0
- package/src/prover/smt/solver/muz/spacer-manager.ts +127 -0
- package/src/prover/smt/solver/muz/spacer-pdr.ts +218 -0
- package/src/prover/smt/solver/muz/spacer-prop-solver.ts +333 -0
- package/src/prover/smt/solver/muz/spacer-util.ts +282 -0
- package/src/prover/smt/solver/muz/substitution.ts +203 -0
- package/src/prover/smt/solver/nla2bv-tactic.ts +285 -0
- package/src/prover/smt/solver/nlqsat.ts +484 -0
- package/src/prover/smt/solver/nlsat/algebraic.ts +177 -160
- package/src/prover/smt/solver/nlsat/atoms.ts +24 -24
- package/src/prover/smt/solver/nlsat/evaluator.ts +16 -22
- package/src/prover/smt/solver/nlsat/explain.ts +65 -69
- package/src/prover/smt/solver/nlsat/interval-set.ts +9 -51
- package/src/prover/smt/solver/nlsat/levelwise.ts +48 -135
- package/src/prover/smt/solver/nlsat/mpbq.ts +47 -14
- package/src/prover/smt/solver/nlsat/polynomial.ts +29 -161
- package/src/prover/smt/solver/nlsat/solver.ts +241 -110
- package/src/prover/smt/solver/nlsat/transcendental-eval.ts +310 -0
- package/src/prover/smt/solver/nlsat/transcendentals.ts +367 -0
- package/src/prover/smt/solver/nlsat/types.ts +0 -9
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +1 -47
- package/src/prover/smt/solver/nlsat/upolynomial.ts +10 -93
- package/src/prover/smt/solver/nlsat-tactic.ts +82 -0
- package/src/prover/smt/solver/nnf.ts +107 -60
- package/src/prover/smt/solver/normalize-bounds.ts +53 -0
- package/src/prover/smt/solver/occf.ts +97 -0
- package/src/prover/smt/solver/opt-context.ts +787 -0
- package/src/prover/smt/solver/opt-nlsat.ts +375 -0
- package/src/prover/smt/solver/opt-pareto.ts +282 -0
- package/src/prover/smt/solver/opt-preprocess.ts +101 -0
- package/src/prover/smt/solver/opt-solver.ts +308 -0
- package/src/prover/smt/solver/opt-value.ts +55 -0
- package/src/prover/smt/solver/optsmt.ts +692 -0
- package/src/prover/smt/solver/parallel-tactic.ts +299 -0
- package/src/prover/smt/solver/pattern-inference.ts +21 -26
- package/src/prover/smt/solver/pb-rewriter.ts +284 -0
- package/src/prover/smt/solver/pb2bv-tactic.ts +540 -0
- package/src/prover/smt/solver/poly-rewriter.ts +204 -79
- package/src/prover/smt/solver/probes.ts +512 -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/qe-arith-plugin.ts +1098 -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 +39 -49
- package/src/prover/smt/solver/qe-mbp.ts +270 -0
- package/src/prover/smt/solver/qe.ts +1498 -0
- package/src/prover/smt/solver/qel.ts +25 -0
- package/src/prover/smt/solver/qi-queue.ts +0 -16
- package/src/prover/smt/solver/qsat.ts +814 -0
- package/src/prover/smt/solver/quant-hoist.ts +196 -0
- package/src/prover/smt/solver/quant-tactics.ts +17 -74
- package/src/prover/smt/solver/quantifier-analyzer.ts +26 -47
- package/src/prover/smt/solver/quantifier-manager.ts +8 -23
- 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 +261 -0
- package/src/prover/smt/solver/recfun-rewriter.ts +107 -0
- package/src/prover/smt/solver/reduce-args.ts +225 -0
- package/src/prover/smt/solver/reduce-bv-size.ts +119 -0
- package/src/prover/smt/solver/ref-vector.ts +0 -6
- package/src/prover/smt/solver/relevancy.ts +2 -16
- package/src/prover/smt/solver/rewriter-tpl.ts +52 -129
- package/src/prover/smt/solver/rewriter.ts +477 -120
- package/src/prover/smt/solver/rlimit.ts +39 -21
- package/src/prover/smt/solver/sat/asymm-branch.ts +325 -0
- package/src/prover/smt/solver/sat/big.ts +177 -0
- package/src/prover/smt/solver/sat/clause-use-list.ts +71 -0
- package/src/prover/smt/solver/sat/clause.ts +203 -0
- package/src/prover/smt/solver/sat/cleaner.ts +94 -0
- package/src/prover/smt/solver/sat/config.ts +122 -0
- package/src/prover/smt/solver/sat/consequences.ts +203 -0
- package/src/prover/smt/solver/sat/elim-eqs.ts +142 -0
- package/src/prover/smt/solver/sat/goal2sat.ts +526 -0
- package/src/prover/smt/solver/sat/inc-sat-solver.ts +378 -0
- package/src/prover/smt/solver/sat/model-converter.ts +136 -0
- package/src/prover/smt/solver/sat/pb-constraint.ts +261 -0
- package/src/prover/smt/solver/sat/pb-solver.ts +1577 -0
- package/src/prover/smt/solver/sat/probing.ts +170 -0
- package/src/prover/smt/solver/sat/sat-tactic.ts +43 -0
- package/src/prover/smt/solver/sat/sat2goal.ts +165 -0
- package/src/prover/smt/solver/sat/scc.ts +142 -0
- package/src/prover/smt/solver/sat/simplifier.ts +1618 -0
- package/src/prover/smt/solver/sat/solver.ts +2127 -0
- package/src/prover/smt/solver/sat/var-queue.ts +117 -0
- package/src/prover/smt/solver/sat/watch-list.ts +140 -0
- package/src/prover/smt/solver/search-tree.ts +284 -0
- package/src/prover/smt/solver/seq-axioms.ts +1010 -0
- package/src/prover/smt/solver/seq-decl-plugin.ts +819 -0
- package/src/prover/smt/solver/seq-derive.ts +1301 -0
- package/src/prover/smt/solver/seq-eq-approx.ts +236 -0
- package/src/prover/smt/solver/seq-eq-solver.ts +439 -0
- package/src/prover/smt/solver/seq-factory.ts +89 -0
- package/src/prover/smt/solver/seq-monadic.ts +728 -0
- package/src/prover/smt/solver/seq-range-predicate.ts +235 -0
- package/src/prover/smt/solver/seq-re-rewriter.ts +1170 -0
- package/src/prover/smt/solver/seq-re-util.ts +758 -0
- package/src/prover/smt/solver/seq-regex-bisim.ts +144 -0
- package/src/prover/smt/solver/seq-regex-live.ts +200 -0
- package/src/prover/smt/solver/seq-rewriter.ts +2402 -0
- package/src/prover/smt/solver/seq-skolem.ts +317 -0
- package/src/prover/smt/solver/seq-subset.ts +165 -0
- package/src/prover/smt/solver/seq-view-witness.ts +353 -0
- package/src/prover/smt/solver/smt-consequences.ts +297 -0
- package/src/prover/smt/solver/smt-kernel.ts +83 -0
- package/src/prover/smt/solver/smt-logics.ts +66 -0
- package/src/prover/smt/solver/smt-setup.ts +496 -0
- package/src/prover/smt/solver/smt2-printer.ts +765 -0
- package/src/prover/smt/solver/smtlib-parser.ts +3140 -365
- package/src/prover/smt/solver/smtlib-script.ts +1631 -0
- package/src/prover/smt/solver/solve-eqs.ts +929 -0
- package/src/prover/smt/solver/solver.ts +119 -39
- 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 +1986 -0
- package/src/prover/smt/solver/term-enumeration.ts +205 -0
- package/src/prover/smt/solver/theory-array.ts +1240 -0
- package/src/prover/smt/solver/theory-bv.ts +1200 -0
- package/src/prover/smt/solver/theory-char.ts +355 -0
- package/src/prover/smt/solver/theory-datatype.ts +598 -0
- package/src/prover/smt/solver/theory-finite-set.ts +30 -0
- package/src/prover/smt/solver/theory-fpa.ts +389 -0
- package/src/prover/smt/solver/theory-lra-axioms.ts +55 -25
- package/src/prover/smt/solver/theory-lra-bounds.ts +31 -11
- package/src/prover/smt/solver/theory-lra-final-check.ts +59 -91
- package/src/prover/smt/solver/theory-lra-internalize.ts +94 -53
- package/src/prover/smt/solver/theory-lra-model.ts +23 -53
- package/src/prover/smt/solver/theory-lra-propagate.ts +24 -40
- package/src/prover/smt/solver/theory-lra-state.ts +6 -27
- package/src/prover/smt/solver/theory-lra.ts +188 -8
- package/src/prover/smt/solver/theory-pb.ts +934 -0
- package/src/prover/smt/solver/theory-polymorphism.ts +58 -0
- package/src/prover/smt/solver/theory-recfun.ts +307 -0
- package/src/prover/smt/solver/theory-seq-regex.ts +867 -0
- package/src/prover/smt/solver/theory-seq-solve.ts +1373 -0
- package/src/prover/smt/solver/theory-seq-state.ts +871 -0
- package/src/prover/smt/solver/theory-seq.ts +961 -0
- package/src/prover/smt/solver/theory.ts +189 -0
- package/src/prover/smt/solver/tseitin-cnf.ts +485 -0
- package/src/prover/smt/solver/var-subst.ts +37 -39
- package/src/prover/smt/table.ts +3 -10
- package/src/prover/smt/types.ts +146 -0
- package/src/prover/tlapm/cache.ts +67 -41
- 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 +0 -6
- package/src/prover/zenon/expr.ts +8 -28
- package/src/prover/zenon/index-table.ts +26 -59
- package/src/prover/zenon/isar-case.ts +8 -20
- package/src/prover/zenon/isar.ts +35 -65
- 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 +1 -13
- package/src/prover/zenon/proof.ts +0 -11
- package/src/prover/zenon/propositional-rules.ts +0 -7
- package/src/prover/zenon/rules.ts +2 -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 +67 -185
- package/src/runtime.ts +26 -22
- package/src/sany/builtins.ts +2 -5
- package/src/sany/generation.ts +394 -0
- package/src/sany/generator-def-entries.ts +210 -0
- package/src/sany/generator-definitions.ts +686 -0
- package/src/sany/generator-expressions.ts +1100 -0
- package/src/sany/generator-proofs.ts +662 -0
- package/src/sany/generator.ts +191 -2764
- package/src/sany/levels.ts +5 -35
- package/src/sany/lexer.ts +58 -77
- package/src/sany/linter.ts +0 -10
- package/src/sany/modules.ts +1 -5
- package/src/sany/nodes.ts +5 -43
- package/src/sany/parse-error.ts +39 -117
- package/src/sany/report.ts +32 -69
- package/src/sany/selectors.ts +49 -76
- package/src/sany/source.ts +1 -17
- package/src/sany/xml.ts +35 -117
- package/src/search.ts +671 -169
- package/src/simulate.ts +712 -0
- package/src/spec-description.ts +192 -100
- package/src/standard-definitions.ts +4 -4
- package/src/standard-modules.ts +264 -95
- package/src/state-graph.ts +52 -33
- package/src/subexpressions.ts +69 -52
- package/src/substitution-levels.ts +7 -7
- package/src/successors.ts +267 -100
- package/src/symmetry.ts +35 -27
- package/src/tableau.ts +29 -26
- package/src/tlc/fingerprint.ts +267 -79
- package/src/tlc/jar-data.ts +112 -6
- package/src/tlc/messages.ts +125 -54
- package/src/tlc/order.ts +39 -69
- package/src/tlc/random.ts +37 -49
- package/src/tlc/replay.ts +553 -228
- package/src/tlc/summary.ts +64 -60
- package/src/tlc/tlc-operators.ts +78 -44
- package/src/tlc/tlcext-operators.ts +171 -122
- package/src/tlc/trace-spec.ts +249 -0
- package/src/tlc/value-stream.ts +139 -0
- package/src/tlc/version.ts +1 -4
- package/src/transfer.ts +22 -25
- package/src/typed-tier.ts +6535 -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 +832 -484
- 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,10 +1,8 @@
|
|
|
1
|
-
// tlapm's module units, with the standard modules, flattening EXTENDS (Module.Flatten), the
|
|
2
|
-
// modules a module depends on (Module.Dep), and substitution in units (Module.Subst).
|
|
3
|
-
|
|
4
1
|
import { TlaProofError, TlapmBugError } from "../errors";
|
|
5
2
|
import {
|
|
6
3
|
at,
|
|
7
4
|
exprifySequent,
|
|
5
|
+
getDefinitionHyp,
|
|
8
6
|
getFact,
|
|
9
7
|
getFresh,
|
|
10
8
|
mapAccumulate,
|
|
@@ -54,8 +52,6 @@ type ModuleUnitCore =
|
|
|
54
52
|
| { kind: "Mutate"; mode: "Use" | "Hide"; usable: Usable }
|
|
55
53
|
| { kind: "Anoninst"; instance: InstanceDefinition; isLocal: boolean };
|
|
56
54
|
|
|
57
|
-
// depth is the size of the context the module was normalized in, which instantiation shifts
|
|
58
|
-
// its body by.
|
|
59
55
|
export interface Mule {
|
|
60
56
|
name: string;
|
|
61
57
|
extendees: string[];
|
|
@@ -156,7 +152,6 @@ const getStandardModule = (name: string, body: ModuleUnit[]): Mule => ({
|
|
|
156
152
|
isStandard: true,
|
|
157
153
|
});
|
|
158
154
|
|
|
159
|
-
// Module.Standard.initctx, apart from $TLAPM, whose Builtins! names no module of the corpora uses.
|
|
160
155
|
export const STANDARD_MODULES = new Map(
|
|
161
156
|
[
|
|
162
157
|
getStandardModule("Naturals", NATURALS),
|
|
@@ -176,31 +171,26 @@ export const getUnitHyps = (unit: ModuleUnit): Hyp[] => {
|
|
|
176
171
|
location,
|
|
177
172
|
}));
|
|
178
173
|
case "Recursives":
|
|
179
|
-
return unit.declarations.map((declaration) =>
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
174
|
+
return unit.declarations.map((declaration) =>
|
|
175
|
+
getDefinitionHyp(
|
|
176
|
+
{ kind: "Recursive", name: declaration.name, shape: declaration.shape, location },
|
|
177
|
+
"User",
|
|
178
|
+
"Hidden",
|
|
179
|
+
false,
|
|
185
180
|
location,
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
visibility: "Hidden",
|
|
189
|
-
isLocal: false,
|
|
190
|
-
location,
|
|
191
|
-
}));
|
|
181
|
+
),
|
|
182
|
+
);
|
|
192
183
|
case "Variables":
|
|
193
184
|
return unit.names.map((name) => ({ kind: "Flex", name, location }));
|
|
194
185
|
case "Definition":
|
|
195
186
|
return [
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
isLocal: unit.isLocal,
|
|
187
|
+
getDefinitionHyp(
|
|
188
|
+
unit.definition,
|
|
189
|
+
unit.whereDefined,
|
|
190
|
+
unit.visibility,
|
|
191
|
+
unit.isLocal,
|
|
202
192
|
location,
|
|
203
|
-
|
|
193
|
+
),
|
|
204
194
|
];
|
|
205
195
|
case "Axiom":
|
|
206
196
|
case "Theorem": {
|
|
@@ -240,19 +230,16 @@ export const getHypSize = (unit: ModuleUnit) =>
|
|
|
240
230
|
: getUnitHyps(unit).length;
|
|
241
231
|
|
|
242
232
|
const getNamedFact = (name: string, expression: Expr, location: Locus | undefined): Hyp[] => [
|
|
243
|
-
|
|
244
|
-
kind: "
|
|
245
|
-
|
|
246
|
-
|
|
247
|
-
|
|
248
|
-
isLocal: false,
|
|
233
|
+
getDefinitionHyp(
|
|
234
|
+
{ kind: "Operator", name, body: expression, location },
|
|
235
|
+
"User",
|
|
236
|
+
"Visible",
|
|
237
|
+
false,
|
|
249
238
|
location,
|
|
250
|
-
|
|
239
|
+
),
|
|
251
240
|
getFact({ kind: "Ix", index: 1, location }, "Hidden", "Always", location),
|
|
252
241
|
];
|
|
253
242
|
|
|
254
|
-
// Module.Flatten.exports: what an extending module sees, with local definitions inlined like
|
|
255
|
-
// builtins and proofs omitted.
|
|
256
243
|
const getExports = (module: Mule): ModuleUnit[] =>
|
|
257
244
|
module.body.flatMap((unit): ModuleUnit[] => {
|
|
258
245
|
switch (unit.kind) {
|
|
@@ -271,7 +258,6 @@ const getExports = (module: Mule): ModuleUnit[] =>
|
|
|
271
258
|
}
|
|
272
259
|
});
|
|
273
260
|
|
|
274
|
-
// tlapm recurses on a module that extends itself until the stack overflows.
|
|
275
261
|
export const flatten = (
|
|
276
262
|
modules: Map<string, Mule>,
|
|
277
263
|
module: Mule,
|
|
@@ -295,8 +281,6 @@ export const flatten = (
|
|
|
295
281
|
};
|
|
296
282
|
};
|
|
297
283
|
|
|
298
|
-
// Module.Dep.external_deps: the modules a module extends or instantiates, including those of its
|
|
299
|
-
// submodules.
|
|
300
284
|
export const getDependencies = (module: Mule) => {
|
|
301
285
|
const dependencies = new Map<string, Locus | undefined>();
|
|
302
286
|
const addDependency = (name: string, location: Locus | undefined) => {
|
|
@@ -308,7 +292,6 @@ export const getDependencies = (module: Mule) => {
|
|
|
308
292
|
);
|
|
309
293
|
const locals = new Set<string>();
|
|
310
294
|
const submodules = new Map<string, Mule>();
|
|
311
|
-
// Every INSTANCE definition inside a value, such as one in a LET.
|
|
312
295
|
const addInstances = (value: unknown) => {
|
|
313
296
|
if (typeof value !== "object" || value === null) return;
|
|
314
297
|
if ("instance" in value && isInstanceDefinition(value.instance)) {
|
|
@@ -316,7 +299,6 @@ export const getDependencies = (module: Mule) => {
|
|
|
316
299
|
}
|
|
317
300
|
Object.values(value).forEach(addInstances);
|
|
318
301
|
};
|
|
319
|
-
// Leaves out the proofs of theorems.
|
|
320
302
|
const visit = (unit: ModuleUnit) => {
|
|
321
303
|
if (unit.kind !== "Submod") {
|
|
322
304
|
addInstances(unit.kind === "Theorem" ? unit.sequent : unit);
|
|
@@ -357,8 +339,6 @@ const substituteUsable = (substitution: Substitution, usable: Usable): Usable =>
|
|
|
357
339
|
}),
|
|
358
340
|
});
|
|
359
341
|
|
|
360
|
-
// Module.Subst.app_modunit. Instantiated theorems carry omitted proofs, which a substitution leaves
|
|
361
|
-
// alone.
|
|
362
342
|
const substituteUnit = (
|
|
363
343
|
substitution: Substitution,
|
|
364
344
|
unit: ModuleUnit,
|
|
@@ -405,7 +385,7 @@ const substituteUnit = (
|
|
|
405
385
|
instance: {
|
|
406
386
|
...unit.instance,
|
|
407
387
|
substitutions: unit.instance.substitutions.map((entry) => ({
|
|
408
|
-
|
|
388
|
+
...entry,
|
|
409
389
|
expression: substituteExpr(substitution, entry.expression),
|
|
410
390
|
})),
|
|
411
391
|
},
|
|
@@ -417,7 +397,6 @@ const substituteUnit = (
|
|
|
417
397
|
export const substituteUnits = (substitution: Substitution, units: ModuleUnit[]) =>
|
|
418
398
|
mapAccumulate(substitution, units, substituteUnit)[1];
|
|
419
399
|
|
|
420
|
-
// A named theorem binds its name as a proof definition, which its statement shifts past.
|
|
421
400
|
export const bindTheoremName = (
|
|
422
401
|
name: string | undefined,
|
|
423
402
|
sequent: Sequent,
|
|
@@ -427,19 +406,13 @@ export const bindTheoremName = (
|
|
|
427
406
|
? { hyps: [], sequent }
|
|
428
407
|
: {
|
|
429
408
|
hyps: [
|
|
430
|
-
|
|
431
|
-
kind: "
|
|
432
|
-
|
|
433
|
-
|
|
434
|
-
|
|
435
|
-
body: at(exprifySequent(sequent), { location }),
|
|
436
|
-
location,
|
|
437
|
-
},
|
|
438
|
-
whereDefined: { kind: "Proof", time: "Always" },
|
|
439
|
-
visibility: "Visible",
|
|
440
|
-
isLocal: false,
|
|
409
|
+
getDefinitionHyp(
|
|
410
|
+
{ kind: "Operator", name, body: at(exprifySequent(sequent), { location }), location },
|
|
411
|
+
{ kind: "Proof", time: "Always" },
|
|
412
|
+
"Visible",
|
|
413
|
+
false,
|
|
441
414
|
location,
|
|
442
|
-
|
|
415
|
+
),
|
|
443
416
|
],
|
|
444
417
|
sequent: substituteSequent(shift(1), sequent),
|
|
445
418
|
};
|
|
@@ -1,9 +1,7 @@
|
|
|
1
|
-
// A port of tlapm's Module.Elab: normalization anonymizes a module unit by unit and expands each
|
|
2
|
-
// instance into the units of the module it instantiates.
|
|
3
|
-
|
|
4
1
|
import { TlaProofError, TlapmBugError } from "../errors";
|
|
5
2
|
import { lambdify } from "./action";
|
|
6
3
|
import type { Anonymizer } from "./anonymize";
|
|
4
|
+
import { checkEnabledAxioms } from "./enabled-axioms";
|
|
7
5
|
import { isEqualHyp } from "./equality";
|
|
8
6
|
import {
|
|
9
7
|
adjoinAll,
|
|
@@ -16,6 +14,7 @@ import {
|
|
|
16
14
|
getLocationText,
|
|
17
15
|
getLocusPrefix,
|
|
18
16
|
getScopeHyps,
|
|
17
|
+
getTrue,
|
|
19
18
|
mapAccumulate,
|
|
20
19
|
type Defn,
|
|
21
20
|
type Expr,
|
|
@@ -48,8 +47,6 @@ import {
|
|
|
48
47
|
} from "./substitution";
|
|
49
48
|
import { getScopeTime } from "./temporal";
|
|
50
49
|
|
|
51
|
-
// latestModules is the module context of the latest anonymization of an axiom, theorem or USE,
|
|
52
|
-
// which tlapm's anonymizer keeps using for the instances inside later definitions.
|
|
53
50
|
export interface Pipeline {
|
|
54
51
|
anonymizer: Anonymizer;
|
|
55
52
|
simplify: ReturnType<typeof createSimplifier>;
|
|
@@ -77,7 +74,7 @@ const lambdifyTheorem = (
|
|
|
77
74
|
const message = `${error.failure}\nCould not instantiate the theorem ${name === undefined ? "" : `named: ${name}, `}at: ${getLocationText(location)}`;
|
|
78
75
|
pipeline.onWarning({ text: `${getAtPrefix(location)}[ERROR]${message}`, channel: "stdout" });
|
|
79
76
|
pipeline.onWarning({ text: message, channel: "toolboxOnly" });
|
|
80
|
-
return { context: [], active:
|
|
77
|
+
return { context: [], active: getTrue(sequent.active) };
|
|
81
78
|
}
|
|
82
79
|
};
|
|
83
80
|
|
|
@@ -92,9 +89,6 @@ const lambdifyUnit = (pipeline: Pipeline, scope: Scope | undefined, unit: Module
|
|
|
92
89
|
return { ...unit, definition: { ...definition, body } };
|
|
93
90
|
};
|
|
94
91
|
|
|
95
|
-
// lambdify_enabled_cdot: the ENABLED and \cdot of each definition and theorem statement bind
|
|
96
|
-
// their variables before instantiation substitutes for them. A theorem that cannot be lambdified
|
|
97
|
-
// states TRUE.
|
|
98
92
|
const lambdifyUnits = (
|
|
99
93
|
pipeline: Pipeline,
|
|
100
94
|
scope: Scope | undefined,
|
|
@@ -109,7 +103,6 @@ const lambdifyUnits = (
|
|
|
109
103
|
return [adjoinAll(current, getUnitHyps(lambdified)), lambdified];
|
|
110
104
|
});
|
|
111
105
|
|
|
112
|
-
// apply_subst: each parameter declaration of the instancee gives way to its substitute.
|
|
113
106
|
const applyParameters = (units: ModuleUnit[], substitutes: Map<string, Expr>) => {
|
|
114
107
|
const body: ModuleUnit[] = [];
|
|
115
108
|
let size = 0;
|
|
@@ -142,8 +135,6 @@ const applyParameters = (units: ModuleUnit[], substitutes: Map<string, Expr>) =>
|
|
|
142
135
|
return body;
|
|
143
136
|
};
|
|
144
137
|
|
|
145
|
-
// resub_for: references to the instancee's own units become applications to the instance
|
|
146
|
-
// arguments, which the definitions now bind themselves.
|
|
147
138
|
const getLocalSubstitution = (
|
|
148
139
|
count: number,
|
|
149
140
|
argumentCount: number,
|
|
@@ -171,8 +162,6 @@ const addParameters = (expression: Expr, args: string[]): Expr => {
|
|
|
171
162
|
: at({ kind: "Lambda", params, body: expression }, expression);
|
|
172
163
|
};
|
|
173
164
|
|
|
174
|
-
// localize: names the instancee's units under the instance name, salting its local definitions, and
|
|
175
|
-
// abstracts each over the instance arguments.
|
|
176
165
|
const localize = (
|
|
177
166
|
pipeline: Pipeline,
|
|
178
167
|
units: ModuleUnit[],
|
|
@@ -195,7 +184,7 @@ const localize = (
|
|
|
195
184
|
while (rest.length > 0) {
|
|
196
185
|
const [unit, ...tail] = rest;
|
|
197
186
|
rest = tail;
|
|
198
|
-
const
|
|
187
|
+
const localizeExpr = (expression: Expr) =>
|
|
199
188
|
addParameters(
|
|
200
189
|
substituteExpr(getLocalSubstitution(size, argumentCount, location), expression),
|
|
201
190
|
instance.args,
|
|
@@ -214,7 +203,7 @@ const localize = (
|
|
|
214
203
|
definition: {
|
|
215
204
|
...definition,
|
|
216
205
|
name: getLocalizedName(name),
|
|
217
|
-
body:
|
|
206
|
+
body: localizeExpr(definition.body),
|
|
218
207
|
},
|
|
219
208
|
whereDefined: unit.isLocal ? "Builtin" : unit.whereDefined,
|
|
220
209
|
isLocal: unit.isLocal || isLocal,
|
|
@@ -229,7 +218,7 @@ const localize = (
|
|
|
229
218
|
const axiom: ModuleUnit = {
|
|
230
219
|
...unit,
|
|
231
220
|
name: unit.name === undefined ? undefined : getLocalizedName(unit.name),
|
|
232
|
-
expression:
|
|
221
|
+
expression: localizeExpr(unit.expression),
|
|
233
222
|
};
|
|
234
223
|
body.push(axiom);
|
|
235
224
|
size += getHypSize(axiom);
|
|
@@ -239,7 +228,7 @@ const localize = (
|
|
|
239
228
|
complain(
|
|
240
229
|
`${getAtPrefix(location)}Warning: Instancing produces parametric theorems.\nSuch theorems will be forcibly hidden and cannot be cited.\n(This warning appears at-most once per INSTANCE declaration.)`,
|
|
241
230
|
);
|
|
242
|
-
const expression =
|
|
231
|
+
const expression = localizeExpr(at(exprifySequent(unit.sequent), unit));
|
|
243
232
|
body.push({
|
|
244
233
|
...unit,
|
|
245
234
|
name: unit.name === undefined ? undefined : getLocalizedName(unit.name),
|
|
@@ -264,8 +253,6 @@ const localize = (
|
|
|
264
253
|
return body;
|
|
265
254
|
};
|
|
266
255
|
|
|
267
|
-
// localize_axioms: an axiom becomes a hypothesis of each theorem after it, and a named one also a
|
|
268
|
-
// definition.
|
|
269
256
|
const localizeAxioms = (units: ModuleUnit[]) => {
|
|
270
257
|
const body: ModuleUnit[] = [];
|
|
271
258
|
let rest = units;
|
|
@@ -321,7 +308,6 @@ const getParameters = (module: Mule) =>
|
|
|
321
308
|
),
|
|
322
309
|
);
|
|
323
310
|
|
|
324
|
-
// Module.Elab.instantiate: the units of an instantiated module, in the context of the instance.
|
|
325
311
|
const instantiate = (
|
|
326
312
|
pipeline: Pipeline,
|
|
327
313
|
modules: Map<string, Mule>,
|
|
@@ -336,9 +322,13 @@ const instantiate = (
|
|
|
336
322
|
const parameters = getParameters(module);
|
|
337
323
|
for (const substitution of instance.substitutions) {
|
|
338
324
|
if (!parameters.has(substitution.name)) {
|
|
339
|
-
|
|
340
|
-
|
|
341
|
-
|
|
325
|
+
pipeline.onWarning({
|
|
326
|
+
text: `${getLocusPrefix(substitution.location)}Parameter ${substitution.name} occurs in the statement \`INSTANCE ${instance.module} WITH\`, and is not declared in the module ${instance.module}\n`,
|
|
327
|
+
channel: "toolbox",
|
|
328
|
+
});
|
|
329
|
+
throw new TlaProofError("Module.Elab.instance_substitutes_declared_identifiers", {
|
|
330
|
+
failure: "Module.Elab.instance_substitutes_declared_identifiers",
|
|
331
|
+
});
|
|
342
332
|
}
|
|
343
333
|
}
|
|
344
334
|
const instanceScope = adjoinAll(
|
|
@@ -351,9 +341,12 @@ const instantiate = (
|
|
|
351
341
|
for (const name of [...parameters].sort(compareNames)) {
|
|
352
342
|
if (substitutes.has(name)) continue;
|
|
353
343
|
if (!findNamed(instanceScope, name)) {
|
|
354
|
-
|
|
355
|
-
|
|
356
|
-
|
|
344
|
+
const message = `Required parameter ${name} for module ${instance.module} could not be inferred.`;
|
|
345
|
+
pipeline.onWarning({
|
|
346
|
+
text: `${getLocusPrefix(instance.instanceLocation)}${message}\n`,
|
|
347
|
+
channel: "toolbox",
|
|
348
|
+
});
|
|
349
|
+
throw new TlaProofError(message, { failure: "Module.Elab.complete_with_statement_params" });
|
|
357
350
|
}
|
|
358
351
|
substitutes.set(name, at({ kind: "Opaque", name }, { location }));
|
|
359
352
|
}
|
|
@@ -387,7 +380,6 @@ const instantiate = (
|
|
|
387
380
|
);
|
|
388
381
|
};
|
|
389
382
|
|
|
390
|
-
// make_defs: the definitions among the units an INSTANCE inside a LET or DEFINE stands for.
|
|
391
383
|
export const expandInstance = (
|
|
392
384
|
pipeline: Pipeline,
|
|
393
385
|
scope: Scope | undefined,
|
|
@@ -426,9 +418,6 @@ export const expandInstance = (
|
|
|
426
418
|
return definitions;
|
|
427
419
|
};
|
|
428
420
|
|
|
429
|
-
// Module.Elab.normalize: anonymizes each unit in the context of the ones before it, expands
|
|
430
|
-
// instances, merges repeated definitions, and simplifies the proofs of important modules. The
|
|
431
|
-
// result also joins the modules that later instances can name.
|
|
432
421
|
export const normalize = (
|
|
433
422
|
pipeline: Pipeline,
|
|
434
423
|
modules: Map<string, Mule>,
|
|
@@ -443,7 +432,6 @@ export const normalize = (
|
|
|
443
432
|
};
|
|
444
433
|
const isRedundant = (name: string | undefined) =>
|
|
445
434
|
name !== undefined && findNamed(current, name) !== undefined;
|
|
446
|
-
// Instantiated units arrive anonymized.
|
|
447
435
|
const queue = module.body.map((unit) => ({ unit, isAnonymized: false }));
|
|
448
436
|
for (let index = 0; index < queue.length; index++) {
|
|
449
437
|
const unit = queue[index].unit;
|
|
@@ -528,12 +516,17 @@ export const normalize = (
|
|
|
528
516
|
binding.sequent.context,
|
|
529
517
|
);
|
|
530
518
|
const anonymized = pipeline.anonymizer.proof(proofScope, proof);
|
|
519
|
+
const proofContext = getScopeHyps(proofScope);
|
|
531
520
|
const simplified = module.isImportant
|
|
532
|
-
?
|
|
533
|
-
|
|
534
|
-
|
|
535
|
-
|
|
536
|
-
|
|
521
|
+
? checkEnabledAxioms(
|
|
522
|
+
proofContext,
|
|
523
|
+
pipeline.simplify(
|
|
524
|
+
proofContext,
|
|
525
|
+
binding.sequent.active,
|
|
526
|
+
anonymized,
|
|
527
|
+
getScopeTime(binding.sequent.context, "Always"),
|
|
528
|
+
),
|
|
529
|
+
pipeline.onWarning,
|
|
537
530
|
)
|
|
538
531
|
: anonymized;
|
|
539
532
|
emit({ ...unit, name, sequent, proof: simplified });
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// tlapm's Optable: each operator's precedence range and fixity, by every spelling it has.
|
|
2
|
-
|
|
3
1
|
import type { Builtin } from "./expression";
|
|
4
2
|
|
|
5
3
|
export type Fixity = "Nonfix" | "Prefix" | "Postfix" | "InfixLeft" | "InfixNon" | "InfixRight";
|
|
@@ -113,7 +111,6 @@ const OPERATORS: [string, number, number, Fixity, string[]][] = [
|
|
|
113
111
|
["\\propto", 5, 5, "InfixNon", []],
|
|
114
112
|
];
|
|
115
113
|
|
|
116
|
-
// OCaml's Hashtbl.find returns the most recent binding, so later aliases win over earlier names.
|
|
117
114
|
const OPERATOR_TABLE = new Map<string, Operator>();
|
|
118
115
|
for (const [name, low, high, fixity, aliases] of OPERATORS) {
|
|
119
116
|
const operator = { name, low, high, fixity };
|
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
// tlapm's method pragmas: the new (*{ by (prover:"zenon"; timeout:@) }*) after a definition, which
|
|
2
|
-
// E_parser.read_new_method reads
|
|
2
|
+
// E_parser.read_new_method reads, and the old (*{ by (zenon) }*) of Method_prs.
|
|
3
|
+
|
|
4
|
+
import type { Locus } from "./expression";
|
|
3
5
|
|
|
4
6
|
type PragmaValue =
|
|
5
7
|
| { kind: "Default" }
|
|
@@ -9,6 +11,7 @@ type PragmaValue =
|
|
|
9
11
|
export interface PragmaSetting {
|
|
10
12
|
hint: string;
|
|
11
13
|
value: PragmaValue;
|
|
14
|
+
location: Locus;
|
|
12
15
|
}
|
|
13
16
|
|
|
14
17
|
interface Position {
|
|
@@ -16,11 +19,12 @@ interface Position {
|
|
|
16
19
|
column: number;
|
|
17
20
|
}
|
|
18
21
|
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
22
|
+
interface Token {
|
|
23
|
+
kind: "Ident" | "String" | "Number" | "Punct";
|
|
24
|
+
text: string;
|
|
25
|
+
start: Position;
|
|
26
|
+
length: number;
|
|
27
|
+
}
|
|
24
28
|
|
|
25
29
|
const PUNCTUATION = ["(", ")", ";", ":", "@", ","];
|
|
26
30
|
|
|
@@ -37,7 +41,6 @@ const skipBlanks = (lines: string[], position: Position) => {
|
|
|
37
41
|
}
|
|
38
42
|
};
|
|
39
43
|
|
|
40
|
-
// Where the pragma after start opens, past blanks and line ends.
|
|
41
44
|
export const findPragma = (lines: string[], start: Position) => {
|
|
42
45
|
const position = { ...start };
|
|
43
46
|
skipBlanks(lines, position);
|
|
@@ -58,18 +61,18 @@ const tokenizePragma = (lines: string[], start: Position) => {
|
|
|
58
61
|
/^"(\\.|[^"\\])*"/.exec(rest);
|
|
59
62
|
if (match) {
|
|
60
63
|
const text = match[0];
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
);
|
|
64
|
+
const isString = text.startsWith('"');
|
|
65
|
+
tokens.push({
|
|
66
|
+
kind: isString ? "String" : /^\d/.test(text) ? "Number" : "Ident",
|
|
67
|
+
text: isString ? JSON.parse(text) : text,
|
|
68
|
+
start: { ...position },
|
|
69
|
+
length: text.length,
|
|
70
|
+
});
|
|
68
71
|
position.column += text.length;
|
|
69
72
|
continue;
|
|
70
73
|
}
|
|
71
74
|
if (!PUNCTUATION.includes(rest[0])) return undefined;
|
|
72
|
-
tokens.push({ kind: "Punct", text: rest[0] });
|
|
75
|
+
tokens.push({ kind: "Punct", text: rest[0], start: { ...position }, length: 1 });
|
|
73
76
|
position.column++;
|
|
74
77
|
}
|
|
75
78
|
return undefined;
|
|
@@ -84,7 +87,6 @@ const getValue = (token: Token | undefined): PragmaValue | undefined => {
|
|
|
84
87
|
return isPunct(token, "@") ? { kind: "Default" } : undefined;
|
|
85
88
|
};
|
|
86
89
|
|
|
87
|
-
// The methods of Method_prs's old pragma syntax, by the name Method.prover_meth_of_tac gives them.
|
|
88
90
|
const OLD_METHODS = new Map([
|
|
89
91
|
["smt", "smt"],
|
|
90
92
|
["cvc3", "cvc4"],
|
|
@@ -113,16 +115,12 @@ const OLD_METHODS = new Map([
|
|
|
113
115
|
["trivial", "trivial"],
|
|
114
116
|
]);
|
|
115
117
|
|
|
116
|
-
// An old-style method, with the tactic an isabelle method takes and the timeout in seconds an
|
|
117
|
-
// isabelle or zenon method may take.
|
|
118
118
|
export interface OldMethod {
|
|
119
119
|
name: string;
|
|
120
120
|
tactic?: string;
|
|
121
121
|
timeout?: number;
|
|
122
122
|
}
|
|
123
123
|
|
|
124
|
-
// Method_prs.read_method: the (*{ by (zenon) }*) after a BY, OBVIOUS, proof step, theorem, or
|
|
125
|
-
// axiom, which names one method, isabelle with a tactic, or zenon with a timeout and a fallback.
|
|
126
124
|
export const readOldMethod = (lines: string[], start: Position) => {
|
|
127
125
|
const tokens = tokenizePragma(lines, start);
|
|
128
126
|
if (!tokens) return undefined;
|
|
@@ -162,9 +160,8 @@ export const readOldMethod = (lines: string[], start: Position) => {
|
|
|
162
160
|
return index === tokens.length ? method : undefined;
|
|
163
161
|
};
|
|
164
162
|
|
|
165
|
-
//
|
|
166
|
-
|
|
167
|
-
export const readNewMethod = (lines: string[], start: Position) => {
|
|
163
|
+
// A value is a string, a number, or @ for the argument the definition is applied to.
|
|
164
|
+
export const readNewMethod = (lines: string[], start: Position, file: string) => {
|
|
168
165
|
const tokens = tokenizePragma(lines, start);
|
|
169
166
|
if (!tokens) return undefined;
|
|
170
167
|
let index = 0;
|
|
@@ -183,7 +180,17 @@ export const readNewMethod = (lines: string[], start: Position) => {
|
|
|
183
180
|
index++;
|
|
184
181
|
const value = getValue(tokens[index++]);
|
|
185
182
|
if (!value) return undefined;
|
|
186
|
-
settings.push({
|
|
183
|
+
settings.push({
|
|
184
|
+
hint: hint.text,
|
|
185
|
+
value,
|
|
186
|
+
location: {
|
|
187
|
+
file,
|
|
188
|
+
startLine: hint.start.line + 1,
|
|
189
|
+
startColumn: hint.start.column + 1,
|
|
190
|
+
endLine: hint.start.line + 1,
|
|
191
|
+
endColumn: hint.start.column + 1 + hint.length,
|
|
192
|
+
},
|
|
193
|
+
});
|
|
187
194
|
if (isPunct(tokens[index], ")")) break;
|
|
188
195
|
if (!isPunct(tokens[index], ";")) return undefined;
|
|
189
196
|
index++;
|
|
@@ -193,3 +200,24 @@ export const readNewMethod = (lines: string[], start: Position) => {
|
|
|
193
200
|
}
|
|
194
201
|
return groups;
|
|
195
202
|
};
|
|
203
|
+
|
|
204
|
+
export const findSuppressPragma = (lines: string[], keyword: Position) => {
|
|
205
|
+
const close = { ...keyword };
|
|
206
|
+
while (lines[close.line].slice(0, close.column).trimEnd() === "") {
|
|
207
|
+
if (close.line === 0) return undefined;
|
|
208
|
+
close.line--;
|
|
209
|
+
close.column = lines[close.line].length;
|
|
210
|
+
}
|
|
211
|
+
if (!lines[close.line].slice(0, close.column).trimEnd().endsWith("}*)")) return undefined;
|
|
212
|
+
for (let line = close.line; line >= 0; line--) {
|
|
213
|
+
const open = lines[line].lastIndexOf("(*{", line === close.line ? close.column : undefined);
|
|
214
|
+
if (open === -1) continue;
|
|
215
|
+
const tokens = tokenizePragma(lines, { line, column: open });
|
|
216
|
+
const isSuppress =
|
|
217
|
+
tokens?.length === 1 &&
|
|
218
|
+
tokens[0].kind === "Ident" &&
|
|
219
|
+
(tokens[0].text === "_" || tokens[0].text === "suppress");
|
|
220
|
+
return isSuppress ? { line, column: open } : undefined;
|
|
221
|
+
}
|
|
222
|
+
return undefined;
|
|
223
|
+
};
|