tla-ts 0.0.9 → 0.0.10-dev.094b9b512
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 +40 -37
- package/dist/deciders.js +47 -44
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +106 -10
- package/dist/index.d.ts +106 -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 +2658 -410
- package/dist/prove.js +2657 -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 +129 -104
- package/dist/transfer.js +129 -104
- package/dist/worker.cjs +6 -6
- package/dist/worker.js +6 -6
- package/package.json +3 -1
- package/src/ast.ts +48 -62
- 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 +599 -754
- 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 +208 -54
- package/src/cli/tlc-arguments.ts +652 -0
- package/src/cli/tlc-output.ts +687 -0
- package/src/cli/tlc-usage.ts +361 -0
- package/src/cli/tlc.ts +309 -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 +14 -53
- package/src/dfid.ts +618 -0
- package/src/environment-config.ts +315 -0
- package/src/environment.ts +169 -335
- package/src/errors.ts +100 -57
- package/src/evaluate.ts +598 -340
- package/src/exit-codes.ts +37 -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 +103 -153
- package/src/liveness.ts +150 -109
- package/src/obligations/action.ts +18 -43
- package/src/obligations/anonymize.ts +119 -90
- package/src/obligations/enabled-axioms.ts +218 -0
- package/src/obligations/equality.ts +2 -2
- package/src/obligations/expression.ts +38 -25
- package/src/obligations/format.ts +1 -9
- package/src/obligations/generate.ts +67 -63
- package/src/obligations/index.ts +38 -20
- package/src/obligations/levels.ts +28 -17
- package/src/obligations/module.ts +29 -54
- package/src/obligations/normalize.ts +31 -36
- package/src/obligations/operators.ts +1 -2
- package/src/obligations/pragma.ts +53 -25
- package/src/obligations/printer.ts +90 -57
- package/src/obligations/proof.ts +4 -5
- package/src/obligations/regroup.ts +1 -4
- package/src/obligations/simplify.ts +58 -62
- package/src/obligations/source.ts +119 -95
- package/src/obligations/subexpression.ts +51 -27
- package/src/obligations/substitution.ts +2 -4
- package/src/obligations/temporal.ts +13 -19
- package/src/obligations/tuples.ts +3 -9
- package/src/parallel-worker.ts +30 -60
- package/src/parallel.ts +57 -71
- package/src/parser.ts +961 -387
- 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 +19 -13
- package/src/prover/first-order.ts +0 -11
- package/src/prover/isabelle/decide.ts +3 -31
- package/src/prover/isabelle/encode.ts +82 -62
- package/src/prover/isabelle/isar/attrib.ts +219 -0
- package/src/prover/isabelle/isar/context.ts +336 -0
- package/src/prover/isabelle/isar/induct.ts +392 -0
- package/src/prover/isabelle/isar/inner-syntax.ts +262 -117
- package/src/prover/isabelle/isar/method.ts +513 -225
- package/src/prover/isabelle/isar/proof.ts +569 -23
- package/src/prover/isabelle/isar/rule-cases.ts +234 -0
- package/src/prover/isabelle/isar/theory.ts +490 -89
- package/src/prover/isabelle/isar/toplevel.ts +341 -0
- package/src/prover/isabelle/isar/type-check.ts +100 -37
- package/src/prover/isabelle/provers/blast/blast.ts +17 -104
- package/src/prover/isabelle/provers/blast/branch.ts +1 -32
- package/src/prover/isabelle/provers/blast/prove.ts +1 -35
- package/src/prover/isabelle/provers/blast/rules.ts +6 -44
- package/src/prover/isabelle/provers/blast/state.ts +2 -28
- package/src/prover/isabelle/provers/blast/term.ts +9 -36
- package/src/prover/isabelle/provers/clasimp.ts +1 -13
- package/src/prover/isabelle/provers/classical.ts +59 -60
- package/src/prover/isabelle/provers/hypsubst.ts +28 -51
- package/src/prover/isabelle/pure/bicompose.ts +25 -38
- package/src/prover/isabelle/pure/consts.ts +1 -7
- package/src/prover/isabelle/pure/conv.ts +3 -17
- package/src/prover/isabelle/pure/drule.ts +96 -44
- package/src/prover/isabelle/pure/envir.ts +3 -52
- package/src/prover/isabelle/pure/goal.ts +2 -8
- 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 +2 -15
- package/src/prover/isabelle/pure/name.ts +2 -9
- package/src/prover/isabelle/pure/net.ts +3 -59
- package/src/prover/isabelle/pure/object-logic.ts +16 -15
- package/src/prover/isabelle/pure/pattern.ts +2 -19
- package/src/prover/isabelle/pure/raw-simplifier.ts +17 -62
- package/src/prover/isabelle/pure/rewriter.ts +32 -73
- package/src/prover/isabelle/pure/search.ts +3 -10
- package/src/prover/isabelle/pure/seq.ts +1 -10
- package/src/prover/isabelle/pure/simplifier.ts +28 -15
- package/src/prover/isabelle/pure/table.ts +3 -32
- package/src/prover/isabelle/pure/tactic.ts +12 -22
- package/src/prover/isabelle/pure/tactical.ts +48 -47
- package/src/prover/isabelle/pure/term-ord.ts +2 -6
- package/src/prover/isabelle/pure/term.ts +2 -43
- package/src/prover/isabelle/pure/thm.ts +27 -47
- package/src/prover/isabelle/pure/type.ts +2 -15
- package/src/prover/isabelle/pure/unify.ts +20 -30
- package/src/prover/isabelle/pure/variable.ts +3 -7
- package/src/prover/isabelle/tla/classical-setup.ts +18 -24
- 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 +46 -43
- package/src/prover/isabelle/tools/intuitionistic.ts +29 -20
- package/src/prover/ocaml.ts +0 -6
- package/src/prover/prep/action.ts +32 -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 +137 -83
- package/src/prover/prep/normalize.ts +38 -36
- package/src/prover/prove-worker.ts +0 -2
- package/src/prover/prove.ts +371 -132
- package/src/prover/ptl/decide.ts +104 -44
- 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 +61 -29
- package/src/prover/smt/data.ts +497 -387
- package/src/prover/smt/encode.ts +156 -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 +1025 -658
- package/src/prover/smt/simplify.ts +441 -0
- package/src/prover/smt/solver/ackermannize-bv-tactic.ts +63 -0
- package/src/prover/smt/solver/ackr-helper.ts +182 -0
- package/src/prover/smt/solver/ackr-model-converter.ts +112 -0
- package/src/prover/smt/solver/act-cache.ts +0 -15
- package/src/prover/smt/solver/add-bounds-tactic.ts +60 -0
- package/src/prover/smt/solver/aig-tactic.ts +43 -0
- package/src/prover/smt/solver/aig.ts +890 -0
- package/src/prover/smt/solver/arith-rewriter.ts +613 -48
- package/src/prover/smt/solver/arith-terms.ts +123 -0
- package/src/prover/smt/solver/array-decl-plugin.ts +176 -0
- package/src/prover/smt/solver/array-rewriter.ts +312 -0
- package/src/prover/smt/solver/array.ts +1 -3
- package/src/prover/smt/solver/asserted-formulas.ts +87 -57
- package/src/prover/smt/solver/ast-lt.ts +166 -21
- package/src/prover/smt/solver/ast-util.ts +161 -7
- package/src/prover/smt/solver/ast.ts +1466 -178
- package/src/prover/smt/solver/auf-solver.ts +8 -44
- package/src/prover/smt/solver/bit-blast-tactic.ts +591 -0
- package/src/prover/smt/solver/bit-blaster.ts +874 -0
- package/src/prover/smt/solver/bound-manager.ts +186 -0
- package/src/prover/smt/solver/bound-simplifier.ts +602 -0
- package/src/prover/smt/solver/bv-bound-chk.ts +500 -0
- package/src/prover/smt/solver/bv-decl-plugin.ts +339 -0
- package/src/prover/smt/solver/bv-divrem-bounds.ts +97 -0
- package/src/prover/smt/solver/bv-rewriter.ts +1905 -0
- package/src/prover/smt/solver/bv1-blast.ts +224 -0
- package/src/prover/smt/solver/bv2fpa-converter.ts +175 -0
- package/src/prover/smt/solver/bv2int-rewriter.ts +545 -0
- package/src/prover/smt/solver/bv2real-rewriter.ts +534 -0
- package/src/prover/smt/solver/card2bv.ts +112 -0
- package/src/prover/smt/solver/case-split-queue.ts +1 -9
- package/src/prover/smt/solver/cg-table.ts +28 -34
- package/src/prover/smt/solver/check-logic.ts +326 -0
- package/src/prover/smt/solver/clause.ts +1 -27
- package/src/prover/smt/solver/cofactor-elim-term-ite.ts +280 -0
- package/src/prover/smt/solver/conflict-resolution.ts +79 -12
- package/src/prover/smt/solver/context.ts +510 -175
- package/src/prover/smt/solver/ctx-simplify.ts +34 -50
- package/src/prover/smt/solver/ctx-solver-simplify.ts +124 -0
- package/src/prover/smt/solver/datatype-decl-plugin.ts +575 -0
- package/src/prover/smt/solver/datatype-rewriter.ts +83 -0
- package/src/prover/smt/solver/demodulator.ts +789 -0
- package/src/prover/smt/solver/dependent-expr-state.ts +68 -0
- package/src/prover/smt/solver/der.ts +40 -30
- package/src/prover/smt/solver/diff-neq.ts +207 -0
- package/src/prover/smt/solver/distribute-forall.ts +67 -0
- package/src/prover/smt/solver/dom-simplify.ts +513 -0
- package/src/prover/smt/solver/dt2bv-tactic.ts +267 -0
- package/src/prover/smt/solver/dyn-ack.ts +1 -11
- package/src/prover/smt/solver/e-matching.ts +4 -35
- package/src/prover/smt/solver/elim-small-bv-tactic.ts +130 -0
- package/src/prover/smt/solver/elim-uncnstr.ts +558 -0
- package/src/prover/smt/solver/enode.ts +93 -22
- package/src/prover/smt/solver/eq2bv-tactic.ts +219 -0
- package/src/prover/smt/solver/euf/arith-axioms.ts +404 -0
- package/src/prover/smt/solver/euf/arith-internalize.ts +659 -0
- package/src/prover/smt/solver/euf/arith-solver.ts +895 -0
- package/src/prover/smt/solver/euf/array-axioms.ts +528 -0
- package/src/prover/smt/solver/euf/array-internalize.ts +419 -0
- package/src/prover/smt/solver/euf/array-solver.ts +308 -0
- package/src/prover/smt/solver/euf/bv-ackerman.ts +164 -0
- package/src/prover/smt/solver/euf/bv-internalize.ts +750 -0
- package/src/prover/smt/solver/euf/bv-solver.ts +451 -0
- package/src/prover/smt/solver/euf/dt-solver.ts +620 -0
- package/src/prover/smt/solver/euf/egraph.ts +885 -0
- package/src/prover/smt/solver/euf/euf-solver.ts +1203 -0
- package/src/prover/smt/solver/euf/fpa-solver.ts +333 -0
- package/src/prover/smt/solver/euf/mam.ts +1094 -0
- package/src/prover/smt/solver/euf/q-ematch.ts +900 -0
- package/src/prover/smt/solver/euf/q-mbi.ts +587 -0
- package/src/prover/smt/solver/euf/q-model-fixer.ts +299 -0
- package/src/prover/smt/solver/euf/q-solver.ts +361 -0
- package/src/prover/smt/solver/euf/th-solver.ts +343 -0
- package/src/prover/smt/solver/euf/th-solvers.ts +31 -0
- package/src/prover/smt/solver/expr-ref.ts +1 -5
- package/src/prover/smt/solver/expr-safe-replace.ts +26 -6
- package/src/prover/smt/solver/expr2polynomial.ts +147 -0
- package/src/prover/smt/solver/factor.ts +152 -0
- package/src/prover/smt/solver/fd-solver.ts +269 -0
- package/src/prover/smt/solver/fingerprints.ts +16 -26
- package/src/prover/smt/solver/fix-dl-var.ts +149 -0
- package/src/prover/smt/solver/flat-literals.ts +1 -9
- package/src/prover/smt/solver/fm-tactic.ts +873 -0
- package/src/prover/smt/solver/fpa-decl-plugin.ts +619 -0
- package/src/prover/smt/solver/fpa-rewriter.ts +641 -0
- package/src/prover/smt/solver/fpa2bv-converter.ts +2246 -0
- package/src/prover/smt/solver/fpa2bv-rewriter.ts +349 -0
- package/src/prover/smt/solver/fpa2bv-tactic.ts +75 -0
- package/src/prover/smt/solver/goal.ts +177 -28
- package/src/prover/smt/solver/goal2nlsat.ts +191 -0
- package/src/prover/smt/solver/guard-set.ts +220 -0
- package/src/prover/smt/solver/hash.ts +0 -8
- package/src/prover/smt/solver/hashtable.ts +27 -23
- package/src/prover/smt/solver/inf-eps.ts +64 -0
- package/src/prover/smt/solver/inj-axiom.ts +102 -0
- package/src/prover/smt/solver/internalizer.ts +72 -130
- package/src/prover/smt/solver/lackr.ts +383 -0
- package/src/prover/smt/solver/lbool.ts +1 -2
- package/src/prover/smt/solver/lia2card.ts +269 -0
- package/src/prover/smt/solver/lia2pb.ts +141 -0
- package/src/prover/smt/solver/literal.ts +0 -3
- package/src/prover/smt/solver/logic-tactics.ts +349 -0
- package/src/prover/smt/solver/lp/bound-propagator.ts +8 -26
- package/src/prover/smt/solver/lp/constraints.ts +2 -8
- package/src/prover/smt/solver/lp/containers.ts +12 -30
- package/src/prover/smt/solver/lp/core-solver.ts +24 -27
- package/src/prover/smt/solver/lp/cross-nested.ts +6 -20
- package/src/prover/smt/solver/lp/dep-intervals.ts +7 -22
- package/src/prover/smt/solver/lp/dependency.ts +1 -4
- package/src/prover/smt/solver/lp/dioph-eq.ts +9 -102
- package/src/prover/smt/solver/lp/explanation.ts +1 -6
- package/src/prover/smt/solver/lp/gomory.ts +9 -22
- package/src/prover/smt/solver/lp/hnf-cutter.ts +17 -23
- package/src/prover/smt/solver/lp/hnf.ts +11 -26
- package/src/prover/smt/solver/lp/int-cube.ts +18 -39
- package/src/prover/smt/solver/lp/int-solver.ts +4 -34
- package/src/prover/smt/solver/lp/lar-solver.ts +70 -82
- package/src/prover/smt/solver/lp/lar-term.ts +1 -5
- package/src/prover/smt/solver/lp/lp-settings.ts +1 -14
- package/src/prover/smt/solver/lp/maximize-term.ts +79 -52
- package/src/prover/smt/solver/lp/nex-creator.ts +5 -28
- package/src/prover/smt/solver/lp/nex.ts +1 -6
- package/src/prover/smt/solver/lp/nla-backoff.ts +1 -4
- package/src/prover/smt/solver/lp/nla-basics.ts +5 -30
- package/src/prover/smt/solver/lp/nla-core.ts +69 -132
- package/src/prover/smt/solver/lp/nla-divisions.ts +32 -42
- package/src/prover/smt/solver/lp/nla-emonics.ts +4 -21
- package/src/prover/smt/solver/lp/nla-factorization.ts +1 -4
- package/src/prover/smt/solver/lp/nla-grobner.ts +24 -72
- package/src/prover/smt/solver/lp/nla-horner.ts +3 -11
- package/src/prover/smt/solver/lp/nla-intervals.ts +2 -12
- package/src/prover/smt/solver/lp/nla-monomial-bounds.ts +16 -41
- package/src/prover/smt/solver/lp/nla-monotone.ts +2 -6
- package/src/prover/smt/solver/lp/nla-order.ts +2 -13
- package/src/prover/smt/solver/lp/nla-patcher.ts +4 -7
- package/src/prover/smt/solver/lp/nla-powers.ts +184 -0
- package/src/prover/smt/solver/lp/nla-tangents.ts +1 -9
- package/src/prover/smt/solver/lp/nla-throttle.ts +1 -6
- package/src/prover/smt/solver/lp/nla-transcendentals.ts +293 -0
- package/src/prover/smt/solver/lp/nla-types.ts +1 -11
- package/src/prover/smt/solver/lp/nla-var-eqs.ts +4 -25
- package/src/prover/smt/solver/lp/nra-solver.ts +30 -54
- package/src/prover/smt/solver/lp/numeric-pair.ts +1 -4
- package/src/prover/smt/solver/lp/pdd-interval.ts +1 -3
- package/src/prover/smt/solver/lp/pdd-simplifier.ts +2 -14
- package/src/prover/smt/solver/lp/pdd-solver.ts +4 -33
- package/src/prover/smt/solver/lp/pdd.ts +7 -70
- package/src/prover/smt/solver/lp/random-updater.ts +1 -8
- package/src/prover/smt/solver/lp/static-matrix.ts +9 -19
- package/src/prover/smt/solver/lp/union-find.ts +6 -5
- package/src/prover/smt/solver/macro-finder.ts +533 -0
- package/src/prover/smt/solver/mam-compiler.ts +117 -126
- package/src/prover/smt/solver/mam-interpreter.ts +1 -21
- package/src/prover/smt/solver/max-bv-sharing-tactic.ts +29 -0
- package/src/prover/smt/solver/max-cliques.ts +107 -0
- package/src/prover/smt/solver/maxcore.ts +318 -0
- package/src/prover/smt/solver/maximize-ac-sharing.ts +9 -20
- package/src/prover/smt/solver/maxlex.ts +123 -0
- package/src/prover/smt/solver/maxsmt-base.ts +99 -0
- package/src/prover/smt/solver/maxsmt.ts +93 -0
- package/src/prover/smt/solver/mbp/mbp-arith.ts +477 -0
- package/src/prover/smt/solver/mbp/mbp-basic-tg.ts +102 -0
- package/src/prover/smt/solver/mbp/mbp-plugin.ts +280 -0
- package/src/prover/smt/solver/mbp/mbp-qel.ts +49 -0
- package/src/prover/smt/solver/mbp/mbp-solve-plugin.ts +280 -0
- package/src/prover/smt/solver/mbp/mbp-term-graph.ts +624 -0
- package/src/prover/smt/solver/model-based-opt.ts +845 -0
- package/src/prover/smt/solver/model-checker.ts +20 -62
- package/src/prover/smt/solver/model-evaluator.ts +186 -39
- package/src/prover/smt/solver/model-finder.ts +15 -32
- package/src/prover/smt/solver/model-generator.ts +57 -40
- package/src/prover/smt/solver/model-macro-solver.ts +58 -111
- package/src/prover/smt/solver/model-printer.ts +215 -0
- package/src/prover/smt/solver/mpf.ts +712 -0
- package/src/prover/smt/solver/mus.ts +52 -0
- package/src/prover/smt/solver/muz/dl-context.ts +362 -0
- package/src/prover/smt/solver/muz/dl-mk-bit-blast.ts +98 -0
- package/src/prover/smt/solver/muz/dl-mk-coi-filter.ts +121 -0
- package/src/prover/smt/solver/muz/dl-mk-elim-term-ite.ts +121 -0
- package/src/prover/smt/solver/muz/dl-mk-interp-tail-simplifier.ts +305 -0
- package/src/prover/smt/solver/muz/dl-mk-rule-inliner.ts +427 -0
- package/src/prover/smt/solver/muz/dl-mk-slice.ts +278 -0
- package/src/prover/smt/solver/muz/dl-mk-subsumption-checker.ts +158 -0
- package/src/prover/smt/solver/muz/dl-rule-set.ts +303 -0
- package/src/prover/smt/solver/muz/dl-rule-transformer.ts +127 -0
- package/src/prover/smt/solver/muz/dl-rule.ts +460 -0
- package/src/prover/smt/solver/muz/hnf.ts +201 -0
- package/src/prover/smt/solver/muz/horn-tactic.ts +192 -0
- package/src/prover/smt/solver/muz/rule-properties.ts +179 -0
- package/src/prover/smt/solver/muz/spacer-context.ts +1395 -0
- package/src/prover/smt/solver/muz/spacer-dl-interface.ts +41 -0
- package/src/prover/smt/solver/muz/spacer-generalizers.ts +244 -0
- package/src/prover/smt/solver/muz/spacer-manager.ts +133 -0
- package/src/prover/smt/solver/muz/spacer-pdr.ts +219 -0
- package/src/prover/smt/solver/muz/spacer-prop-solver.ts +344 -0
- package/src/prover/smt/solver/muz/spacer-util.ts +309 -0
- package/src/prover/smt/solver/muz/substitution.ts +154 -0
- package/src/prover/smt/solver/nla2bv-tactic.ts +286 -0
- package/src/prover/smt/solver/nlqsat.ts +484 -0
- package/src/prover/smt/solver/nlsat/algebraic.ts +179 -159
- package/src/prover/smt/solver/nlsat/atoms.ts +25 -23
- package/src/prover/smt/solver/nlsat/evaluator.ts +17 -22
- package/src/prover/smt/solver/nlsat/explain.ts +61 -69
- package/src/prover/smt/solver/nlsat/interval-set.ts +10 -51
- package/src/prover/smt/solver/nlsat/levelwise.ts +49 -135
- package/src/prover/smt/solver/nlsat/mpbq.ts +48 -14
- package/src/prover/smt/solver/nlsat/polynomial.ts +30 -160
- package/src/prover/smt/solver/nlsat/solver.ts +227 -99
- package/src/prover/smt/solver/nlsat/transcendental-eval.ts +311 -0
- package/src/prover/smt/solver/nlsat/transcendentals.ts +369 -0
- package/src/prover/smt/solver/nlsat/types.ts +1 -8
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +2 -45
- package/src/prover/smt/solver/nlsat/upolynomial.ts +11 -92
- package/src/prover/smt/solver/nlsat-tactic.ts +83 -0
- package/src/prover/smt/solver/nnf.ts +108 -60
- package/src/prover/smt/solver/normalize-bounds.ts +54 -0
- package/src/prover/smt/solver/occf.ts +98 -0
- package/src/prover/smt/solver/opt-context.ts +787 -0
- package/src/prover/smt/solver/opt-nlsat.ts +366 -0
- package/src/prover/smt/solver/opt-pareto.ts +284 -0
- package/src/prover/smt/solver/opt-preprocess.ts +102 -0
- package/src/prover/smt/solver/opt-solver.ts +300 -0
- package/src/prover/smt/solver/opt-value.ts +56 -0
- package/src/prover/smt/solver/optsmt.ts +691 -0
- package/src/prover/smt/solver/parallel-tactic.ts +301 -0
- package/src/prover/smt/solver/pattern-inference.ts +19 -23
- package/src/prover/smt/solver/pb-rewriter.ts +296 -0
- package/src/prover/smt/solver/pb2bv-tactic.ts +542 -0
- package/src/prover/smt/solver/poly-rewriter.ts +203 -77
- package/src/prover/smt/solver/probes.ts +514 -0
- package/src/prover/smt/solver/propagate-values.ts +34 -30
- package/src/prover/smt/solver/proto-model.ts +648 -63
- package/src/prover/smt/solver/pull-quant.ts +29 -23
- package/src/prover/smt/solver/purify-arith.ts +598 -0
- package/src/prover/smt/solver/qe-arith-plugin.ts +1099 -0
- package/src/prover/smt/solver/qe-lite-der.ts +3 -31
- package/src/prover/smt/solver/qe-lite-fm.ts +5 -28
- package/src/prover/smt/solver/qe-lite.ts +40 -49
- package/src/prover/smt/solver/qe-mbp.ts +281 -0
- package/src/prover/smt/solver/qe.ts +1508 -0
- package/src/prover/smt/solver/qel.ts +26 -0
- package/src/prover/smt/solver/qi-queue.ts +1 -16
- package/src/prover/smt/solver/qsat.ts +840 -0
- package/src/prover/smt/solver/quant-hoist.ts +195 -0
- package/src/prover/smt/solver/quant-tactics.ts +18 -74
- package/src/prover/smt/solver/quantifier-analyzer.ts +27 -47
- package/src/prover/smt/solver/quantifier-manager.ts +9 -23
- package/src/prover/smt/solver/quasi-macros.ts +254 -0
- package/src/prover/smt/solver/random-gen.ts +1 -2
- package/src/prover/smt/solver/rational.ts +29 -8
- package/src/prover/smt/solver/recfun-decl-plugin.ts +248 -0
- package/src/prover/smt/solver/recfun-rewriter.ts +108 -0
- package/src/prover/smt/solver/reduce-args.ts +226 -0
- package/src/prover/smt/solver/reduce-bv-size.ts +120 -0
- package/src/prover/smt/solver/ref-vector.ts +1 -6
- package/src/prover/smt/solver/relevancy.ts +3 -16
- package/src/prover/smt/solver/rewriter-tpl.ts +49 -129
- package/src/prover/smt/solver/rewriter.ts +478 -120
- package/src/prover/smt/solver/rlimit.ts +27 -21
- package/src/prover/smt/solver/sat/asymm-branch.ts +314 -0
- package/src/prover/smt/solver/sat/big.ts +178 -0
- package/src/prover/smt/solver/sat/clause-use-list.ts +79 -0
- package/src/prover/smt/solver/sat/clause.ts +221 -0
- package/src/prover/smt/solver/sat/cleaner.ts +96 -0
- package/src/prover/smt/solver/sat/config.ts +125 -0
- package/src/prover/smt/solver/sat/consequences.ts +204 -0
- package/src/prover/smt/solver/sat/elim-eqs.ts +144 -0
- package/src/prover/smt/solver/sat/goal2sat.ts +528 -0
- package/src/prover/smt/solver/sat/inc-sat-solver.ts +388 -0
- package/src/prover/smt/solver/sat/model-converter.ts +156 -0
- package/src/prover/smt/solver/sat/pb-constraint.ts +264 -0
- package/src/prover/smt/solver/sat/pb-solver.ts +1553 -0
- package/src/prover/smt/solver/sat/probing.ts +169 -0
- package/src/prover/smt/solver/sat/sat-tactic.ts +44 -0
- package/src/prover/smt/solver/sat/sat2goal.ts +171 -0
- package/src/prover/smt/solver/sat/scc.ts +143 -0
- package/src/prover/smt/solver/sat/simplifier.ts +1662 -0
- package/src/prover/smt/solver/sat/solver.ts +2128 -0
- package/src/prover/smt/solver/sat/var-queue.ts +119 -0
- package/src/prover/smt/solver/sat/watch-list.ts +136 -0
- package/src/prover/smt/solver/search-tree.ts +285 -0
- package/src/prover/smt/solver/seq-axioms.ts +1013 -0
- package/src/prover/smt/solver/seq-decl-plugin.ts +823 -0
- package/src/prover/smt/solver/seq-derive.ts +1303 -0
- package/src/prover/smt/solver/seq-eq-approx.ts +238 -0
- package/src/prover/smt/solver/seq-eq-solver.ts +440 -0
- package/src/prover/smt/solver/seq-factory.ts +91 -0
- package/src/prover/smt/solver/seq-monadic.ts +730 -0
- package/src/prover/smt/solver/seq-range-predicate.ts +225 -0
- package/src/prover/smt/solver/seq-re-rewriter.ts +1296 -0
- package/src/prover/smt/solver/seq-re-util.ts +777 -0
- package/src/prover/smt/solver/seq-regex-bisim.ts +145 -0
- package/src/prover/smt/solver/seq-regex-live.ts +202 -0
- package/src/prover/smt/solver/seq-regex-witness.ts +100 -0
- package/src/prover/smt/solver/seq-rewriter.ts +2407 -0
- package/src/prover/smt/solver/seq-skolem.ts +318 -0
- package/src/prover/smt/solver/seq-subset.ts +166 -0
- package/src/prover/smt/solver/seq-view-witness.ts +355 -0
- package/src/prover/smt/solver/smt-consequences.ts +299 -0
- package/src/prover/smt/solver/smt-kernel.ts +85 -0
- package/src/prover/smt/solver/smt-logics.ts +67 -0
- package/src/prover/smt/solver/smt-setup.ts +492 -0
- package/src/prover/smt/solver/smt2-printer.ts +767 -0
- package/src/prover/smt/solver/smtlib-parser.ts +2423 -270
- package/src/prover/smt/solver/smtlib-script.ts +1493 -0
- package/src/prover/smt/solver/solve-eqs.ts +931 -0
- package/src/prover/smt/solver/solver.ts +120 -39
- package/src/prover/smt/solver/sort.ts +1 -5
- package/src/prover/smt/solver/static-features.ts +319 -0
- package/src/prover/smt/solver/sticky-generations.ts +0 -5
- package/src/prover/smt/solver/tactic.ts +1936 -0
- package/src/prover/smt/solver/term-enumeration.ts +206 -0
- package/src/prover/smt/solver/theory-array.ts +1275 -0
- package/src/prover/smt/solver/theory-bv.ts +1239 -0
- package/src/prover/smt/solver/theory-char.ts +356 -0
- package/src/prover/smt/solver/theory-datatype.ts +599 -0
- package/src/prover/smt/solver/theory-finite-set.ts +30 -0
- package/src/prover/smt/solver/theory-fpa.ts +422 -0
- package/src/prover/smt/solver/theory-lra-axioms.ts +56 -25
- package/src/prover/smt/solver/theory-lra-bounds.ts +31 -10
- package/src/prover/smt/solver/theory-lra-final-check.ts +60 -91
- package/src/prover/smt/solver/theory-lra-internalize.ts +87 -53
- package/src/prover/smt/solver/theory-lra-model.ts +24 -53
- package/src/prover/smt/solver/theory-lra-propagate.ts +25 -40
- package/src/prover/smt/solver/theory-lra-state.ts +7 -27
- package/src/prover/smt/solver/theory-lra.ts +194 -8
- package/src/prover/smt/solver/theory-pb.ts +932 -0
- package/src/prover/smt/solver/theory-polymorphism.ts +59 -0
- package/src/prover/smt/solver/theory-recfun.ts +308 -0
- package/src/prover/smt/solver/theory-seq-regex.ts +871 -0
- package/src/prover/smt/solver/theory-seq-solve.ts +1375 -0
- package/src/prover/smt/solver/theory-seq-state.ts +880 -0
- package/src/prover/smt/solver/theory-seq.ts +984 -0
- package/src/prover/smt/solver/theory.ts +175 -0
- package/src/prover/smt/solver/tseitin-cnf.ts +487 -0
- package/src/prover/smt/solver/var-subst.ts +33 -35
- package/src/prover/smt/table.ts +1 -9
- 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 -15
- package/src/prover/zenon/encode.ts +1 -8
- package/src/prover/zenon/eqrel.ts +2 -13
- package/src/prover/zenon/equality-rules.ts +0 -4
- package/src/prover/zenon/expr.ts +8 -26
- package/src/prover/zenon/index-table.ts +26 -57
- package/src/prover/zenon/isar-case.ts +9 -19
- package/src/prover/zenon/isar.ts +36 -64
- package/src/prover/zenon/limits.ts +0 -4
- package/src/prover/zenon/llproof.ts +2 -20
- package/src/prover/zenon/mltoll.ts +66 -104
- package/src/prover/zenon/node.ts +20 -14
- package/src/prover/zenon/ocaml.ts +1 -17
- package/src/prover/zenon/parse.ts +10 -12
- package/src/prover/zenon/phrase.ts +1 -11
- package/src/prover/zenon/proof.ts +0 -9
- package/src/prover/zenon/propositional-rules.ts +0 -5
- package/src/prover/zenon/rules.ts +2 -6
- package/src/prover/zenon/search.ts +11 -33
- package/src/prover/zenon/tla/functions.ts +59 -31
- package/src/prover/zenon/tla/llproof.ts +67 -76
- package/src/prover/zenon/tla/records.ts +57 -33
- package/src/prover/zenon/tla/rewrites.ts +12 -19
- package/src/prover/zenon/tla/sets.ts +88 -57
- package/src/prover/zenon/tla/terms.ts +0 -6
- package/src/prover/zenon/tla/tla.ts +66 -64
- package/src/randomization.ts +81 -35
- package/src/resolve.ts +67 -184
- package/src/runtime.ts +22 -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 +6 -34
- package/src/sany/lexer.ts +58 -77
- package/src/sany/linter.ts +1 -9
- 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 +541 -163
- package/src/simulate.ts +709 -0
- package/src/spec-description.ts +192 -100
- package/src/standard-definitions.ts +0 -4
- package/src/standard-modules.ts +264 -95
- package/src/state-graph.ts +52 -31
- package/src/subexpressions.ts +69 -52
- package/src/substitution-levels.ts +7 -7
- package/src/successors.ts +266 -99
- package/src/symmetry.ts +33 -25
- package/src/tableau.ts +27 -24
- package/src/tlc/fingerprint.ts +183 -67
- 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 +36 -47
- package/src/tlc/tlc-operators.ts +78 -44
- package/src/tlc/tlcext-operators.ts +139 -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/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/tlaps-module.ts +0 -510
|
@@ -1,26 +1,30 @@
|
|
|
1
|
-
// A port of tlapm's anonymization (Expr.Anon, Elab.desugar and Proof.Anon)
|
|
2
|
-
// indices into the context, builtin definitions are inlined, and anonymous steps get names.
|
|
1
|
+
// A port of tlapm's anonymization (Expr.Anon, Elab.desugar and Proof.Anon).
|
|
3
2
|
|
|
4
3
|
import { TlapmBugError, TlaProofError } from "../errors";
|
|
5
4
|
import { consSubstitution, normalizeApply, shift, shiftExpr, substituteExpr } from "./substitution";
|
|
6
5
|
import { isEqualExpr } from "./equality";
|
|
7
6
|
import {
|
|
7
|
+
AT_NOWHERE,
|
|
8
8
|
adjoin,
|
|
9
9
|
adjoinAll,
|
|
10
10
|
applyBuiltin,
|
|
11
11
|
at,
|
|
12
12
|
exprifySequent,
|
|
13
13
|
findNamed,
|
|
14
|
+
getScopeHyps,
|
|
14
15
|
getBoundFresh,
|
|
15
16
|
getErrorNote,
|
|
17
|
+
getErrorSetting,
|
|
16
18
|
getFresh,
|
|
17
19
|
getLocalDefn,
|
|
18
20
|
getLocusPrefix,
|
|
19
21
|
getScopeAt,
|
|
22
|
+
getTrue,
|
|
20
23
|
mapAccumulate,
|
|
21
24
|
mapBoundDomains,
|
|
22
25
|
mapScoped,
|
|
23
26
|
mapSelectorArgs,
|
|
27
|
+
warnError,
|
|
24
28
|
type Bound,
|
|
25
29
|
type Defn,
|
|
26
30
|
type ExceptPoint,
|
|
@@ -34,6 +38,8 @@ import {
|
|
|
34
38
|
type Sequent,
|
|
35
39
|
type WhereDefined,
|
|
36
40
|
} from "./expression";
|
|
41
|
+
import { renderDoc } from "./format";
|
|
42
|
+
import { printExpression } from "./printer";
|
|
37
43
|
import { resolveSubexpression } from "./subexpression";
|
|
38
44
|
import { getTime } from "./temporal";
|
|
39
45
|
import {
|
|
@@ -49,7 +55,7 @@ import {
|
|
|
49
55
|
|
|
50
56
|
const DUMMY_FACT: Hyp = {
|
|
51
57
|
kind: "Fact",
|
|
52
|
-
expression:
|
|
58
|
+
expression: AT_NOWHERE,
|
|
53
59
|
visibility: "Visible",
|
|
54
60
|
time: "Always",
|
|
55
61
|
};
|
|
@@ -65,7 +71,6 @@ const ANON_SELECTOR_FAILURES = {
|
|
|
65
71
|
|
|
66
72
|
const BAD_EXPRESSION: Expr = { kind: "Opaque", name: "$badexp" };
|
|
67
73
|
|
|
68
|
-
// Util.set_locus: the node keeps its properties and takes the location of from.
|
|
69
74
|
const withLocus = (expression: Expr, from: Expr) =>
|
|
70
75
|
from.location ? { ...expression, location: from.location } : expression;
|
|
71
76
|
|
|
@@ -82,20 +87,19 @@ export const createAnonymizer = (
|
|
|
82
87
|
) => Defn[],
|
|
83
88
|
onWarning: Warn,
|
|
84
89
|
) => {
|
|
85
|
-
// Elab.desugar's current_at: the value @ stands for inside an EXCEPT, and the context size there.
|
|
86
90
|
let currentAt: { expression: Expr; size: number } | undefined;
|
|
87
91
|
|
|
88
92
|
const getContext = (scope: Scope | undefined): AnonContext => ({ warnedSteps: [], scope });
|
|
89
93
|
|
|
90
94
|
const getSize = (context: AnonContext) => context.scope?.size ?? 0;
|
|
91
95
|
|
|
92
|
-
const
|
|
96
|
+
const anonymizeExpr = (context: AnonContext, expression: Expr): Expr => {
|
|
93
97
|
if (expression.kind === "At" && expression.isExcept) {
|
|
94
98
|
if (!currentAt) return expression;
|
|
95
99
|
return shiftExpr(getSize(context) - currentAt.size, currentAt.expression);
|
|
96
100
|
}
|
|
97
|
-
if (expression.kind !== "Except") return
|
|
98
|
-
const base =
|
|
101
|
+
if (expression.kind !== "Except") return anonymizeCore(context, expression);
|
|
102
|
+
const base = anonymizeExpr(context, expression.function);
|
|
99
103
|
return expression.specs.reduce((result, spec) => {
|
|
100
104
|
const [path, trail] = mapAccumulate(
|
|
101
105
|
result,
|
|
@@ -104,7 +108,7 @@ export const createAnonymizer = (
|
|
|
104
108
|
if (point.kind === "Dot") {
|
|
105
109
|
return [at({ kind: "Dot", expression: current, field: point.field }, current), point];
|
|
106
110
|
}
|
|
107
|
-
const key =
|
|
111
|
+
const key = anonymizeExpr(context, point.expression);
|
|
108
112
|
return [
|
|
109
113
|
at({ kind: "FcnApp", function: current, args: [key] }, current),
|
|
110
114
|
{ kind: "Apply", expression: key },
|
|
@@ -113,25 +117,25 @@ export const createAnonymizer = (
|
|
|
113
117
|
);
|
|
114
118
|
const saved = currentAt;
|
|
115
119
|
currentAt = { expression: path, size: getSize(context) };
|
|
116
|
-
const value =
|
|
120
|
+
const value = anonymizeExpr(context, spec.value);
|
|
117
121
|
currentAt = saved;
|
|
118
122
|
return at({ kind: "Except", function: result, specs: [{ trail, value }] }, expression);
|
|
119
123
|
}, base);
|
|
120
124
|
};
|
|
121
125
|
|
|
122
|
-
const
|
|
126
|
+
const createAnonApply = (index: number, args: Expr[], from: Expr): Expr => {
|
|
123
127
|
const indexed = at({ kind: "Ix", index }, from);
|
|
124
128
|
return args.length === 0 ? indexed : at({ kind: "Apply", operator: indexed, args }, from);
|
|
125
129
|
};
|
|
126
130
|
|
|
127
|
-
const
|
|
131
|
+
const createStandardForm = (
|
|
128
132
|
index: number,
|
|
129
133
|
whereDefined: WhereDefined,
|
|
130
134
|
body: Expr,
|
|
131
135
|
args: Expr[],
|
|
132
136
|
from: Expr,
|
|
133
137
|
): Expr => {
|
|
134
|
-
if (whereDefined !== "Builtin") return
|
|
138
|
+
if (whereDefined !== "Builtin") return createAnonApply(index, args, from);
|
|
135
139
|
const shifted = shiftExpr(index, body);
|
|
136
140
|
return at(args.length === 0 ? shifted : normalizeApply(shifted, args), from);
|
|
137
141
|
};
|
|
@@ -140,7 +144,7 @@ export const createAnonymizer = (
|
|
|
140
144
|
const found = findNamed(context.scope, name);
|
|
141
145
|
if (!found) {
|
|
142
146
|
const message = `Operator "${name}" not found`;
|
|
143
|
-
onWarning
|
|
147
|
+
warnError(onWarning, from.location, message);
|
|
144
148
|
throw new TlaProofError(message, { failure: "Expr.Anon: 4" });
|
|
145
149
|
}
|
|
146
150
|
const index = found.depth + 1;
|
|
@@ -149,17 +153,22 @@ export const createAnonymizer = (
|
|
|
149
153
|
case "Defn": {
|
|
150
154
|
const definition = hyp.definition;
|
|
151
155
|
if (definition.kind === "Operator") {
|
|
152
|
-
return
|
|
156
|
+
return createStandardForm(index, hyp.whereDefined, definition.body, args, from);
|
|
153
157
|
}
|
|
154
|
-
if (definition.kind === "Recursive")
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
});
|
|
158
|
-
|
|
158
|
+
if (definition.kind === "Recursive") {
|
|
159
|
+
const message = "Recursive operators not supported by TLAPS";
|
|
160
|
+
onWarning(getErrorSetting(hyp.location, message));
|
|
161
|
+
throw new TlaProofError(message, { failure: "Expr.Anon: Recursive" });
|
|
162
|
+
}
|
|
163
|
+
return createAnonApply(index, args, from);
|
|
159
164
|
}
|
|
160
165
|
case "Fresh":
|
|
161
|
-
return
|
|
166
|
+
return createAnonApply(index, args, from);
|
|
162
167
|
case "Flex":
|
|
168
|
+
if (args.length > 0)
|
|
169
|
+
throw new TlapmBugError(
|
|
170
|
+
'File "src/expr/e_anon.ml", line 224, characters 24-30: Assertion failed',
|
|
171
|
+
);
|
|
163
172
|
return at({ kind: "Ix", index }, from);
|
|
164
173
|
case "Fact":
|
|
165
174
|
throw new TlapmBugError(
|
|
@@ -168,7 +177,6 @@ export const createAnonymizer = (
|
|
|
168
177
|
}
|
|
169
178
|
};
|
|
170
179
|
|
|
171
|
-
// Expr.Anon's check: a prefix that names nothing joins the next label, as in an instance path.
|
|
172
180
|
const resolveBang = (
|
|
173
181
|
context: AnonContext,
|
|
174
182
|
prefix: string,
|
|
@@ -181,7 +189,7 @@ export const createAnonymizer = (
|
|
|
181
189
|
if (!found) {
|
|
182
190
|
const [selector, ...rest] = selectors;
|
|
183
191
|
if (selector?.kind === "Label") {
|
|
184
|
-
const labelArgs = selector.args.map((arg) =>
|
|
192
|
+
const labelArgs = selector.args.map((arg) => anonymizeExpr(context, arg));
|
|
185
193
|
return resolveBang(
|
|
186
194
|
context,
|
|
187
195
|
`${prefix}!${selector.label}`,
|
|
@@ -193,6 +201,7 @@ export const createAnonymizer = (
|
|
|
193
201
|
}
|
|
194
202
|
const message = `Operator "${prefix}" not found`;
|
|
195
203
|
if (selector) onWarning(getErrorNote(from.location, message));
|
|
204
|
+
onWarning(getErrorSetting(from.location, message));
|
|
196
205
|
throw new TlaProofError(message, {
|
|
197
206
|
failure: `Expr.Anon: ${selector ? ANON_SELECTOR_FAILURES[selector.kind] : "1EMPTY"}`,
|
|
198
207
|
});
|
|
@@ -202,31 +211,39 @@ export const createAnonymizer = (
|
|
|
202
211
|
hyp.kind !== "Defn" ||
|
|
203
212
|
(hyp.definition.kind !== "Operator" && hyp.definition.kind !== "Bpragma")
|
|
204
213
|
) {
|
|
205
|
-
|
|
214
|
+
onWarning(
|
|
215
|
+
getErrorNote(
|
|
216
|
+
from.location,
|
|
217
|
+
`invalid subexpression reference in: ${renderDoc(printExpression([], from))}`,
|
|
218
|
+
),
|
|
219
|
+
);
|
|
220
|
+
onWarning(getErrorSetting(from.location, "invalid subexpression reference"));
|
|
221
|
+
throw new TlaProofError("invalid subexpression reference", { failure: "Expr.Anon: 3" });
|
|
206
222
|
}
|
|
207
223
|
const index = found.depth + 1;
|
|
208
224
|
if (selectors.length === 0 && isInstance) {
|
|
209
225
|
return args.length === 0
|
|
210
226
|
? at({ kind: "Ix", index }, from)
|
|
211
|
-
:
|
|
227
|
+
: createStandardForm(index, hyp.whereDefined, hyp.definition.body, args, from);
|
|
212
228
|
}
|
|
213
229
|
const body = withLocus(shiftExpr(index, hyp.definition.body), from);
|
|
214
|
-
|
|
230
|
+
const hyps = getScopeHyps(context.scope);
|
|
231
|
+
return withLocus(resolveSubexpression(onWarning, hyps, body, args, selectors), from);
|
|
215
232
|
};
|
|
216
233
|
|
|
217
|
-
const
|
|
234
|
+
const anonymizeCore = (context: AnonContext, expression: Expr): Expr => {
|
|
218
235
|
switch (expression.kind) {
|
|
219
236
|
case "Bang": {
|
|
220
237
|
const inner = expression.expression;
|
|
221
238
|
if (inner.kind === "Apply" && inner.operator.kind === "Opaque") {
|
|
222
239
|
const selectors = expression.selectors.map((selector) =>
|
|
223
|
-
mapSelectorArgs(selector, (arg) =>
|
|
240
|
+
mapSelectorArgs(selector, (arg) => anonymizeExpr(context, arg)),
|
|
224
241
|
);
|
|
225
|
-
const args = inner.args.map((arg) =>
|
|
242
|
+
const args = inner.args.map((arg) => anonymizeExpr(context, arg));
|
|
226
243
|
const bangContext = getContext(context.scope);
|
|
227
244
|
return resolveBang(bangContext, inner.operator.name, args, selectors, false, expression);
|
|
228
245
|
}
|
|
229
|
-
return
|
|
246
|
+
return anonymizeExpr(context, {
|
|
230
247
|
...expression,
|
|
231
248
|
expression: at({ kind: "Apply", operator: inner, args: [] }, inner),
|
|
232
249
|
});
|
|
@@ -239,33 +256,40 @@ export const createAnonymizer = (
|
|
|
239
256
|
text: `${getLocusPrefix(expression.location)}Warning: ${name} does not introduce any assumptions. It does not make sense to use it here.\n`,
|
|
240
257
|
channel: "toolbox",
|
|
241
258
|
});
|
|
242
|
-
return
|
|
259
|
+
return getTrue(expression);
|
|
243
260
|
}
|
|
244
|
-
const args = expression.args.map((arg) =>
|
|
261
|
+
const args = expression.args.map((arg) => anonymizeExpr(context, arg));
|
|
245
262
|
return resolveName(context, name, args, expression);
|
|
246
263
|
}
|
|
247
264
|
case "Opaque":
|
|
248
|
-
return
|
|
265
|
+
return anonymizeExpr(
|
|
266
|
+
context,
|
|
267
|
+
at({ kind: "Apply", operator: expression, args: [] }, expression),
|
|
268
|
+
);
|
|
249
269
|
case "Parens":
|
|
250
|
-
if (expression.form.kind === "Syntax") return
|
|
270
|
+
if (expression.form.kind === "Syntax") return anonymizeExpr(context, expression.expression);
|
|
251
271
|
return {
|
|
252
272
|
...expression,
|
|
253
|
-
expression:
|
|
254
|
-
form:
|
|
273
|
+
expression: anonymizeExpr(context, expression.expression),
|
|
274
|
+
form: anonymizeParenForm(context, expression.form),
|
|
255
275
|
};
|
|
256
276
|
default:
|
|
257
277
|
return visit(context, expression);
|
|
258
278
|
}
|
|
259
279
|
};
|
|
260
280
|
|
|
261
|
-
const
|
|
281
|
+
const anonymizeParenForm = (context: AnonContext, form: ParenForm): ParenForm => {
|
|
262
282
|
if (form.kind !== "Nlabel") return form;
|
|
263
283
|
return {
|
|
264
284
|
kind: "Xlabel",
|
|
265
285
|
label: form.label,
|
|
266
286
|
indices: form.names.map((name) => {
|
|
267
287
|
const found = findNamed(context.scope, name);
|
|
268
|
-
if (!found)
|
|
288
|
+
if (!found) {
|
|
289
|
+
const message = `Identifier "${name}" in label parameters not found`;
|
|
290
|
+
warnError(onWarning, form.location, message);
|
|
291
|
+
throw new TlaProofError(message, { failure: "Expr.Anon" });
|
|
292
|
+
}
|
|
269
293
|
return { name, index: found.depth + 1 };
|
|
270
294
|
}),
|
|
271
295
|
};
|
|
@@ -282,29 +306,30 @@ export const createAnonymizer = (
|
|
|
282
306
|
const adjoinBounds = (context: AnonContext, items: Bound[]) =>
|
|
283
307
|
withScope(context, adjoinAll(context.scope, items.map(getBoundFresh)));
|
|
284
308
|
|
|
285
|
-
const
|
|
286
|
-
const mapped = mapBoundDomains(items, (domain) =>
|
|
309
|
+
const anonymizeBounds = (context: AnonContext, items: Bound[]): [AnonContext, Bound[]] => {
|
|
310
|
+
const mapped = mapBoundDomains(items, (domain) => anonymizeExpr(context, domain));
|
|
287
311
|
return [adjoinBounds(context, mapped), mapped];
|
|
288
312
|
};
|
|
289
313
|
|
|
290
|
-
// Visit.map, apart from the definitions an ASSUME or a LET binds.
|
|
291
314
|
const visit = (context: AnonContext, expression: Expr): Expr => {
|
|
292
315
|
if (expression.kind === "Sequent") {
|
|
293
|
-
return { ...expression, sequent:
|
|
316
|
+
return { ...expression, sequent: anonymizeSequent(context, expression.sequent)[1] };
|
|
294
317
|
}
|
|
295
318
|
if (expression.kind === "Let") {
|
|
296
|
-
const [inner, definitions] =
|
|
297
|
-
return { ...expression, definitions, body:
|
|
319
|
+
const [inner, definitions] = anonymizeDefns(context, expression.definitions);
|
|
320
|
+
return { ...expression, definitions, body: anonymizeExpr(inner, expression.body) };
|
|
298
321
|
}
|
|
299
|
-
return mapScoped(context, expression,
|
|
322
|
+
return mapScoped(context, expression, anonymizeExpr, adjoinContext);
|
|
300
323
|
};
|
|
301
324
|
|
|
302
|
-
|
|
303
|
-
const defn = (context: AnonContext, definition: Defn): Defn => {
|
|
325
|
+
const anonymizeDefn = (context: AnonContext, definition: Defn): Defn => {
|
|
304
326
|
if (definition.kind !== "Operator") return definition;
|
|
305
327
|
const body = definition.body;
|
|
306
|
-
if (body.kind !== "Fcn") return { ...definition, body:
|
|
307
|
-
const inner =
|
|
328
|
+
if (body.kind !== "Fcn") return { ...definition, body: anonymizeExpr(context, body) };
|
|
329
|
+
const inner = anonymizeExpr(
|
|
330
|
+
adjoinContext(context, getFresh(definition.name, "Constant")),
|
|
331
|
+
body,
|
|
332
|
+
);
|
|
308
333
|
const marker: Expr = { kind: "Opaque", name: "%%%" };
|
|
309
334
|
const isRecursive = !isEqualExpr(
|
|
310
335
|
substituteExpr(consSubstitution(marker, shift(1)), inner),
|
|
@@ -318,8 +343,7 @@ export const createAnonymizer = (
|
|
|
318
343
|
};
|
|
319
344
|
};
|
|
320
345
|
|
|
321
|
-
|
|
322
|
-
const defns = (context: AnonContext, definitions: Defn[]): [AnonContext, Defn[]] => {
|
|
346
|
+
const anonymizeDefns = (context: AnonContext, definitions: Defn[]): [AnonContext, Defn[]] => {
|
|
323
347
|
let current = context;
|
|
324
348
|
const queue = [...definitions];
|
|
325
349
|
const mapped: Defn[] = [];
|
|
@@ -329,24 +353,24 @@ export const createAnonymizer = (
|
|
|
329
353
|
queue.splice(index + 1, 0, ...expandInstance(current.scope, definition));
|
|
330
354
|
continue;
|
|
331
355
|
}
|
|
332
|
-
const result =
|
|
356
|
+
const result = anonymizeDefn(current, definition);
|
|
333
357
|
current = adjoinContext(current, { ...getLocalDefn(result), isConstnessUnset: true });
|
|
334
358
|
mapped.push(result);
|
|
335
359
|
}
|
|
336
360
|
return [current, mapped];
|
|
337
361
|
};
|
|
338
362
|
|
|
339
|
-
const
|
|
363
|
+
const anonymizeHyp = (context: AnonContext, item: Hyp): [AnonContext, Hyp] => {
|
|
340
364
|
const mapped = ((): Hyp => {
|
|
341
365
|
switch (item.kind) {
|
|
342
366
|
case "Fresh":
|
|
343
|
-
return item.domain ? { ...item, domain:
|
|
367
|
+
return item.domain ? { ...item, domain: anonymizeExpr(context, item.domain) } : item;
|
|
344
368
|
case "Flex":
|
|
345
369
|
return item;
|
|
346
370
|
case "Defn":
|
|
347
|
-
return { ...item, definition:
|
|
371
|
+
return { ...item, definition: anonymizeDefn(context, item.definition) };
|
|
348
372
|
case "Fact": {
|
|
349
|
-
const expression =
|
|
373
|
+
const expression = anonymizeExpr(context, item.expression);
|
|
350
374
|
return { ...item, expression, time: getTime(context.scope, expression) };
|
|
351
375
|
}
|
|
352
376
|
}
|
|
@@ -354,9 +378,9 @@ export const createAnonymizer = (
|
|
|
354
378
|
return [adjoinContext(context, mapped), mapped];
|
|
355
379
|
};
|
|
356
380
|
|
|
357
|
-
const
|
|
358
|
-
const [inner, hyps] = mapAccumulate(context, item.context,
|
|
359
|
-
return [inner, { context: hyps, active:
|
|
381
|
+
const anonymizeSequent = (context: AnonContext, item: Sequent): [AnonContext, Sequent] => {
|
|
382
|
+
const [inner, hyps] = mapAccumulate(context, item.context, anonymizeHyp);
|
|
383
|
+
return [inner, { context: hyps, active: anonymizeExpr(inner, item.active) }];
|
|
360
384
|
};
|
|
361
385
|
|
|
362
386
|
const pushWarnedStep = (context: AnonContext, step: StepNumber): AnonContext => ({
|
|
@@ -384,7 +408,7 @@ export const createAnonymizer = (
|
|
|
384
408
|
),
|
|
385
409
|
);
|
|
386
410
|
|
|
387
|
-
const
|
|
411
|
+
const getTupleForm = (item: Sequent): ExprCore => {
|
|
388
412
|
const facts = item.context.map((entry, index) => {
|
|
389
413
|
const amount = item.context.length - index + 1;
|
|
390
414
|
if (entry.kind === "Fact") return shiftExpr(amount, entry.expression);
|
|
@@ -403,11 +427,11 @@ export const createAnonymizer = (
|
|
|
403
427
|
const isCitable = (step: Step) =>
|
|
404
428
|
step.kind !== "Use" && step.kind !== "Hide" && step.kind !== "Define";
|
|
405
429
|
|
|
406
|
-
const
|
|
407
|
-
facts: item.facts.map((fact) =>
|
|
430
|
+
const anonymizeUsable = (context: AnonContext, item: Usable): Usable => ({
|
|
431
|
+
facts: item.facts.map((fact) => anonymizeExpr(context, fact)),
|
|
408
432
|
defs: item.defs.flatMap((def): UseDef[] => {
|
|
409
433
|
if (def.kind === "Dx") return [def];
|
|
410
|
-
const resolved =
|
|
434
|
+
const resolved = anonymizeExpr(context, at({ kind: "Opaque", name: def.name }, def));
|
|
411
435
|
if (resolved.kind !== "Ix") {
|
|
412
436
|
onWarning({
|
|
413
437
|
text: `${getLocusPrefix(def.location)}Ignored unexpandable identifier ${JSON.stringify(def.name)} in BY DEF.`,
|
|
@@ -426,24 +450,24 @@ export const createAnonymizer = (
|
|
|
426
450
|
}),
|
|
427
451
|
});
|
|
428
452
|
|
|
429
|
-
const
|
|
453
|
+
const anonymizeProof = (context: AnonContext, item: Proof): Proof => {
|
|
430
454
|
switch (item.kind) {
|
|
431
455
|
case "Steps": {
|
|
432
|
-
const [inner, steps] = mapAccumulate(context, item.steps,
|
|
433
|
-
const qedProof =
|
|
456
|
+
const [inner, steps] = mapAccumulate(context, item.steps, anonymizeStep);
|
|
457
|
+
const qedProof = anonymizeProof(
|
|
434
458
|
item.step ? pushWarnedStep(inner, item.step) : inner,
|
|
435
459
|
item.qed.proof,
|
|
436
460
|
);
|
|
437
461
|
return { ...item, steps, qed: { ...item.qed, proof: qedProof } };
|
|
438
462
|
}
|
|
439
463
|
case "By":
|
|
440
|
-
return { ...item, usable:
|
|
464
|
+
return { ...item, usable: anonymizeUsable(context, item.usable) };
|
|
441
465
|
default:
|
|
442
466
|
return item;
|
|
443
467
|
}
|
|
444
468
|
};
|
|
445
469
|
|
|
446
|
-
const
|
|
470
|
+
const anonymizeStep = (context: AnonContext, original: Step): [AnonContext, Step] => {
|
|
447
471
|
const number: StepNumber | undefined =
|
|
448
472
|
original.step?.kind === "Unnamed" && isCitable(original)
|
|
449
473
|
? {
|
|
@@ -457,24 +481,24 @@ export const createAnonymizer = (
|
|
|
457
481
|
const item: Step = { ...original, step: number };
|
|
458
482
|
switch (item.kind) {
|
|
459
483
|
case "Assert": {
|
|
460
|
-
const [, mapped] =
|
|
484
|
+
const [, mapped] = anonymizeSequent(context, item.sequent);
|
|
461
485
|
const assumptions = mapped.context.reduce(adjoinContext, context);
|
|
462
486
|
const withTuple = bumpContext(
|
|
463
|
-
adjoinStep(bumpContext(assumptions, 1), number, at(
|
|
487
|
+
adjoinStep(bumpContext(assumptions, 1), number, at(getTupleForm(mapped), item), item),
|
|
464
488
|
1,
|
|
465
489
|
);
|
|
466
490
|
const inner = mapped.context.length === 0 ? pushWarnedStep(withTuple, number) : withTuple;
|
|
467
|
-
const result: Step = { ...item, sequent: mapped, proof:
|
|
491
|
+
const result: Step = { ...item, sequent: mapped, proof: anonymizeProof(inner, item.proof) };
|
|
468
492
|
return [
|
|
469
493
|
bumpContext(adjoinStep(context, number, at(exprifySequent(mapped), item), item), 1),
|
|
470
494
|
result,
|
|
471
495
|
];
|
|
472
496
|
}
|
|
473
497
|
case "Pcase": {
|
|
474
|
-
const expression =
|
|
498
|
+
const expression = anonymizeExpr(context, item.expression);
|
|
475
499
|
const tuple = at({ kind: "Tuple", elements: [shiftExpr(2, expression)] }, item);
|
|
476
500
|
const inner = bumpContext(adjoinStep(bumpContext(context, 2), number, tuple, item), 1);
|
|
477
|
-
const result: Step = { ...item, expression, proof:
|
|
501
|
+
const result: Step = { ...item, expression, proof: anonymizeProof(inner, item.proof) };
|
|
478
502
|
const after = adjoinStep(
|
|
479
503
|
context,
|
|
480
504
|
number,
|
|
@@ -484,19 +508,19 @@ export const createAnonymizer = (
|
|
|
484
508
|
return [bumpContext(after, 1), result];
|
|
485
509
|
}
|
|
486
510
|
case "Suffices": {
|
|
487
|
-
const [, mapped] =
|
|
511
|
+
const [, mapped] = anonymizeSequent(context, item.sequent);
|
|
488
512
|
const fact = at({ kind: "Tuple", elements: [at(exprifySequent(mapped), item)] }, item);
|
|
489
513
|
const inner = bumpContext(adjoinStep(context, number, fact, item), 1);
|
|
490
|
-
const result: Step = { ...item, sequent: mapped, proof:
|
|
514
|
+
const result: Step = { ...item, sequent: mapped, proof: anonymizeProof(inner, item.proof) };
|
|
491
515
|
const assumptions = mapped.context.reduce(adjoinContext, context);
|
|
492
|
-
const tuple = at({ kind: "Tuple", elements: [at(
|
|
516
|
+
const tuple = at({ kind: "Tuple", elements: [at(getTupleForm(mapped), item)] }, item);
|
|
493
517
|
return [
|
|
494
518
|
bumpContext(adjoinStep(bumpContext(assumptions, 1), number, tuple, item), 1),
|
|
495
519
|
result,
|
|
496
520
|
];
|
|
497
521
|
}
|
|
498
522
|
case "Have": {
|
|
499
|
-
const expression =
|
|
523
|
+
const expression = anonymizeExpr(context, item.expression);
|
|
500
524
|
const tuple = at({ kind: "Tuple", elements: [shiftExpr(2, expression)] }, item);
|
|
501
525
|
return [
|
|
502
526
|
bumpContext(adjoinStep(bumpContext(context, 2), number, tuple, item), 1),
|
|
@@ -504,7 +528,7 @@ export const createAnonymizer = (
|
|
|
504
528
|
];
|
|
505
529
|
}
|
|
506
530
|
case "Take": {
|
|
507
|
-
const [inner, mapped] =
|
|
531
|
+
const [inner, mapped] = anonymizeBounds(context, item.bounds);
|
|
508
532
|
const universal = at(
|
|
509
533
|
{ kind: "Quant", quantifier: "Forall", bounds: mapped, body: BAD_EXPRESSION },
|
|
510
534
|
item,
|
|
@@ -515,7 +539,9 @@ export const createAnonymizer = (
|
|
|
515
539
|
];
|
|
516
540
|
}
|
|
517
541
|
case "Witness": {
|
|
518
|
-
const expressions = item.expressions.map((expression) =>
|
|
542
|
+
const expressions = item.expressions.map((expression) =>
|
|
543
|
+
anonymizeExpr(context, expression),
|
|
544
|
+
);
|
|
519
545
|
const tuple = at({ kind: "Tuple", elements: expressions }, item);
|
|
520
546
|
return [
|
|
521
547
|
bumpContext(adjoinStep(bumpContext(context, 1), number, tuple, item), 1),
|
|
@@ -523,8 +549,8 @@ export const createAnonymizer = (
|
|
|
523
549
|
];
|
|
524
550
|
}
|
|
525
551
|
case "Pick": {
|
|
526
|
-
const [boundContext, mapped] =
|
|
527
|
-
const expression =
|
|
552
|
+
const [boundContext, mapped] = anonymizeBounds(context, item.bounds);
|
|
553
|
+
const expression = anonymizeExpr(boundContext, item.expression);
|
|
528
554
|
const existential = at(
|
|
529
555
|
{ kind: "Quant", quantifier: "Exists", bounds: mapped, body: expression },
|
|
530
556
|
item,
|
|
@@ -537,7 +563,7 @@ export const createAnonymizer = (
|
|
|
537
563
|
...item,
|
|
538
564
|
bounds: mapped,
|
|
539
565
|
expression,
|
|
540
|
-
proof:
|
|
566
|
+
proof: anonymizeProof(inner, item.proof),
|
|
541
567
|
};
|
|
542
568
|
const declared = adjoinBounds(bumpContext(context, 2), mapped);
|
|
543
569
|
const shifted = shiftExpr(4 + mapped.length, existential);
|
|
@@ -547,13 +573,13 @@ export const createAnonymizer = (
|
|
|
547
573
|
];
|
|
548
574
|
}
|
|
549
575
|
case "Use": {
|
|
550
|
-
const mapped =
|
|
576
|
+
const mapped = anonymizeUsable(context, item.usable);
|
|
551
577
|
return [bumpContext(context, mapped.facts.length), { ...item, usable: mapped }];
|
|
552
578
|
}
|
|
553
579
|
case "Hide":
|
|
554
|
-
return [context, { ...item, usable:
|
|
580
|
+
return [context, { ...item, usable: anonymizeUsable(context, item.usable) }];
|
|
555
581
|
case "Define": {
|
|
556
|
-
const [inner, definitions] =
|
|
582
|
+
const [inner, definitions] = anonymizeDefns(context, item.definitions);
|
|
557
583
|
return [inner, { ...item, definitions }];
|
|
558
584
|
}
|
|
559
585
|
case "Forget":
|
|
@@ -562,11 +588,14 @@ export const createAnonymizer = (
|
|
|
562
588
|
};
|
|
563
589
|
|
|
564
590
|
return {
|
|
565
|
-
expr: (scope: Scope | undefined, expression: Expr) =>
|
|
566
|
-
|
|
567
|
-
|
|
568
|
-
|
|
569
|
-
|
|
591
|
+
expr: (scope: Scope | undefined, expression: Expr) =>
|
|
592
|
+
anonymizeExpr(getContext(scope), expression),
|
|
593
|
+
defn: (scope: Scope | undefined, definition: Defn) =>
|
|
594
|
+
anonymizeDefn(getContext(scope), definition),
|
|
595
|
+
sequent: (scope: Scope | undefined, item: Sequent) =>
|
|
596
|
+
anonymizeSequent(getContext(scope), item)[1],
|
|
597
|
+
usable: (scope: Scope | undefined, item: Usable) => anonymizeUsable(getContext(scope), item),
|
|
598
|
+
proof: (scope: Scope | undefined, item: Proof) => anonymizeProof(getContext(scope), item),
|
|
570
599
|
};
|
|
571
600
|
};
|
|
572
601
|
|