tla-ts 0.0.9 → 0.0.10-dev.06b481ee0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +30 -1
- package/dist/compile.cjs +23 -0
- package/dist/compile.js +23 -0
- package/dist/deciders.cjs +41 -37
- package/dist/deciders.js +48 -44
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +122 -12
- package/dist/index.d.ts +122 -12
- package/dist/index.js +1 -1
- package/dist/parallel-worker.cjs +1 -1
- package/dist/parallel-worker.js +1 -1
- package/dist/prove-worker.cjs +1 -1
- package/dist/prove-worker.js +1 -1
- package/dist/prove.cjs +2746 -410
- package/dist/prove.js +2745 -409
- package/dist/run.cjs +144 -31
- package/dist/run.js +144 -31
- package/dist/tlapm.cjs +2 -2
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +134 -104
- package/dist/transfer.js +134 -104
- package/dist/worker.cjs +7 -7
- package/dist/worker.js +7 -7
- package/package.json +3 -1
- package/src/ast.ts +56 -60
- package/src/bags.ts +128 -110
- package/src/builtins.ts +31 -77
- package/src/bundled-modules.ts +1 -8
- package/src/check-failure.ts +118 -0
- package/src/check-trace.ts +320 -0
- package/src/check.ts +1156 -888
- package/src/cli/options.ts +12 -32
- package/src/cli/run.ts +0 -2
- package/src/cli/runtime-invariants.ts +100 -0
- package/src/cli/shared.ts +19 -12
- package/src/cli/tlapm.ts +433 -82
- package/src/cli/tlc-arguments.ts +652 -0
- package/src/cli/tlc-output.ts +701 -0
- package/src/cli/tlc-usage.ts +360 -0
- package/src/cli/tlc.ts +330 -659
- package/src/cli/typescript.ts +23 -0
- package/src/cli/xml-exporter.ts +27 -49
- package/src/cli.ts +0 -1
- package/src/codegen.ts +217 -82
- package/src/config.ts +140 -109
- package/src/coverage.ts +1019 -0
- package/src/dependencies.ts +101 -66
- package/src/dfid.ts +683 -0
- package/src/environment-config.ts +315 -0
- package/src/environment.ts +263 -370
- package/src/errors.ts +107 -57
- package/src/evaluate.ts +898 -369
- package/src/exit-codes.ts +63 -13
- package/src/fingerprints.ts +75 -11
- package/src/index.ts +3 -0
- package/src/instances.ts +137 -22
- package/src/java-hash.ts +21 -0
- package/src/java-overrides.ts +6 -21
- package/src/json-reader.ts +455 -0
- package/src/json.ts +252 -139
- package/src/levels.ts +231 -154
- package/src/lexer.ts +83 -101
- package/src/liveness-checker.ts +743 -322
- package/src/liveness.ts +230 -133
- package/src/obligations/action.ts +17 -44
- package/src/obligations/anonymize.ts +120 -95
- package/src/obligations/enabled-axioms.ts +218 -0
- package/src/obligations/equality.ts +1 -3
- package/src/obligations/expression.ts +37 -26
- package/src/obligations/format.ts +0 -10
- package/src/obligations/generate.ts +66 -64
- package/src/obligations/index.ts +39 -20
- package/src/obligations/levels.ts +27 -18
- package/src/obligations/module.ts +28 -55
- package/src/obligations/normalize.ts +31 -41
- package/src/obligations/operators.ts +0 -3
- package/src/obligations/pragma.ts +52 -24
- package/src/obligations/printer.ts +94 -63
- package/src/obligations/proof.ts +3 -6
- package/src/obligations/regroup.ts +0 -5
- package/src/obligations/simplify.ts +57 -63
- package/src/obligations/source.ts +121 -95
- package/src/obligations/subexpression.ts +49 -28
- package/src/obligations/substitution.ts +1 -5
- package/src/obligations/temporal.ts +12 -20
- package/src/obligations/tuples.ts +2 -10
- package/src/parallel-worker.ts +36 -60
- package/src/parallel.ts +64 -73
- package/src/parser.ts +1184 -531
- package/src/pcal/ast.ts +53 -86
- package/src/pcal/parse.ts +144 -219
- package/src/pcal/tokenize.ts +91 -131
- package/src/pcal/translate.ts +83 -130
- package/src/pcal/validate.ts +48 -68
- package/src/pretty-print.ts +7 -8
- package/src/prover/decide-pool.ts +8 -13
- package/src/prover/deciders.ts +12 -13
- package/src/prover/first-order.ts +0 -11
- package/src/prover/isabelle/decide.ts +3 -31
- package/src/prover/isabelle/encode.ts +82 -64
- package/src/prover/isabelle/isar/attrib.ts +250 -0
- package/src/prover/isabelle/isar/context.ts +335 -0
- package/src/prover/isabelle/isar/induct.ts +382 -0
- package/src/prover/isabelle/isar/inner-syntax.ts +262 -117
- package/src/prover/isabelle/isar/method.ts +510 -226
- package/src/prover/isabelle/isar/proof.ts +570 -23
- package/src/prover/isabelle/isar/rule-cases.ts +226 -0
- package/src/prover/isabelle/isar/theory.ts +488 -88
- package/src/prover/isabelle/isar/toplevel.ts +331 -0
- package/src/prover/isabelle/isar/type-check.ts +99 -38
- package/src/prover/isabelle/provers/blast/blast.ts +16 -105
- package/src/prover/isabelle/provers/blast/branch.ts +0 -33
- package/src/prover/isabelle/provers/blast/prove.ts +0 -36
- package/src/prover/isabelle/provers/blast/rules.ts +5 -45
- package/src/prover/isabelle/provers/blast/state.ts +1 -29
- package/src/prover/isabelle/provers/blast/term.ts +8 -37
- package/src/prover/isabelle/provers/clasimp.ts +1 -15
- package/src/prover/isabelle/provers/classical.ts +58 -61
- package/src/prover/isabelle/provers/hypsubst.ts +29 -54
- package/src/prover/isabelle/pure/bicompose.ts +24 -39
- package/src/prover/isabelle/pure/consts.ts +0 -8
- package/src/prover/isabelle/pure/conv.ts +2 -18
- package/src/prover/isabelle/pure/drule.ts +95 -45
- package/src/prover/isabelle/pure/envir.ts +2 -53
- package/src/prover/isabelle/pure/goal.ts +1 -9
- package/src/prover/isabelle/pure/interrupt.ts +0 -5
- package/src/prover/isabelle/pure/list.ts +0 -3
- package/src/prover/isabelle/pure/logic.ts +1 -16
- package/src/prover/isabelle/pure/name.ts +1 -10
- package/src/prover/isabelle/pure/net.ts +2 -60
- package/src/prover/isabelle/pure/object-logic.ts +15 -16
- package/src/prover/isabelle/pure/pattern.ts +1 -20
- package/src/prover/isabelle/pure/raw-simplifier.ts +16 -63
- package/src/prover/isabelle/pure/rewriter.ts +34 -77
- package/src/prover/isabelle/pure/search.ts +2 -11
- package/src/prover/isabelle/pure/seq.ts +0 -11
- package/src/prover/isabelle/pure/simplifier.ts +27 -16
- package/src/prover/isabelle/pure/table.ts +2 -33
- package/src/prover/isabelle/pure/tactic.ts +11 -23
- package/src/prover/isabelle/pure/tactical.ts +47 -48
- package/src/prover/isabelle/pure/term-ord.ts +1 -7
- package/src/prover/isabelle/pure/term.ts +4 -47
- package/src/prover/isabelle/pure/thm.ts +26 -48
- package/src/prover/isabelle/pure/type.ts +1 -16
- package/src/prover/isabelle/pure/unify.ts +19 -31
- package/src/prover/isabelle/pure/variable.ts +2 -8
- package/src/prover/isabelle/tla/classical-setup.ts +17 -25
- package/src/prover/isabelle/tla/context.ts +65 -26
- package/src/prover/isabelle/tla/logic-data.ts +1 -1
- package/src/prover/isabelle/tla/logic.ts +53 -32
- package/src/prover/isabelle/tla/simpdata.ts +45 -44
- package/src/prover/isabelle/tools/intuitionistic.ts +28 -21
- package/src/prover/ocaml.ts +4 -7
- package/src/prover/prep/action.ts +33 -66
- package/src/prover/prep/enabled-axioms.ts +22 -20
- package/src/prover/prep/fingerprint.ts +2 -21
- package/src/prover/prep/level-comparison.ts +8 -12
- package/src/prover/prep/md5.ts +26 -31
- package/src/prover/prep/methods.ts +189 -86
- package/src/prover/prep/normalize.ts +42 -37
- package/src/prover/prove-worker.ts +0 -2
- package/src/prover/prove.ts +398 -133
- package/src/prover/ptl/decide.ts +96 -56
- package/src/prover/ptl/encode.ts +15 -38
- package/src/prover/ptl/sat.ts +24 -32
- package/src/prover/ptl/tableau.ts +40 -28
- package/src/prover/smt/arithmetic.ts +310 -0
- package/src/prover/smt/axioms.ts +12 -15
- package/src/prover/smt/context.ts +60 -32
- package/src/prover/smt/data.ts +517 -401
- package/src/prover/smt/encode.ts +155 -85
- package/src/prover/smt/extensionality.ts +5 -13
- package/src/prover/smt/flatten.ts +7 -28
- package/src/prover/smt/format.ts +33 -14
- package/src/prover/smt/instances.ts +7 -11
- package/src/prover/smt/layout.ts +91 -0
- package/src/prover/smt/rewrite.ts +1021 -658
- package/src/prover/smt/simplify.ts +441 -0
- package/src/prover/smt/solver/ackermannize-bv-tactic.ts +61 -0
- package/src/prover/smt/solver/ackr-helper.ts +179 -0
- package/src/prover/smt/solver/ackr-model-converter.ts +105 -0
- package/src/prover/smt/solver/act-cache.ts +0 -16
- package/src/prover/smt/solver/add-bounds-tactic.ts +59 -0
- package/src/prover/smt/solver/aig-tactic.ts +52 -0
- package/src/prover/smt/solver/aig.ts +889 -0
- package/src/prover/smt/solver/arith-rewriter.ts +626 -56
- package/src/prover/smt/solver/arith-terms.ts +121 -0
- package/src/prover/smt/solver/array-decl-plugin.ts +175 -0
- package/src/prover/smt/solver/array-rewriter.ts +319 -0
- package/src/prover/smt/solver/array.ts +1 -3
- package/src/prover/smt/solver/asserted-formulas.ts +241 -99
- package/src/prover/smt/solver/ast-lt.ts +165 -21
- package/src/prover/smt/solver/ast-util.ts +160 -7
- package/src/prover/smt/solver/ast.ts +1480 -184
- package/src/prover/smt/solver/auf-solver.ts +30 -56
- package/src/prover/smt/solver/bit-blast-tactic.ts +608 -0
- package/src/prover/smt/solver/bit-blaster.ts +871 -0
- package/src/prover/smt/solver/blast-term-ite.ts +47 -0
- package/src/prover/smt/solver/bound-manager.ts +196 -0
- package/src/prover/smt/solver/bound-simplifier.ts +598 -0
- package/src/prover/smt/solver/bv-bound-chk.ts +492 -0
- package/src/prover/smt/solver/bv-decl-plugin.ts +341 -0
- package/src/prover/smt/solver/bv-divrem-bounds.ts +95 -0
- package/src/prover/smt/solver/bv-rewriter.ts +1901 -0
- package/src/prover/smt/solver/bv1-blast.ts +214 -0
- package/src/prover/smt/solver/bv2fpa-converter.ts +174 -0
- package/src/prover/smt/solver/bv2int-rewriter.ts +544 -0
- package/src/prover/smt/solver/bv2real-rewriter.ts +533 -0
- package/src/prover/smt/solver/card2bv.ts +127 -0
- package/src/prover/smt/solver/case-split-queue.ts +0 -10
- package/src/prover/smt/solver/cg-table.ts +39 -42
- package/src/prover/smt/solver/check-logic.ts +330 -0
- package/src/prover/smt/solver/clause.ts +0 -27
- package/src/prover/smt/solver/cofactor-elim-term-ite.ts +293 -0
- package/src/prover/smt/solver/conflict-resolution.ts +78 -11
- package/src/prover/smt/solver/context.ts +600 -187
- package/src/prover/smt/solver/ctx-simplify.ts +34 -52
- package/src/prover/smt/solver/ctx-solver-simplify.ts +122 -0
- package/src/prover/smt/solver/datatype-decl-plugin.ts +580 -0
- package/src/prover/smt/solver/datatype-rewriter.ts +82 -0
- package/src/prover/smt/solver/demodulator.ts +786 -0
- package/src/prover/smt/solver/dependent-expr-state.ts +93 -0
- package/src/prover/smt/solver/der.ts +39 -30
- package/src/prover/smt/solver/diff-neq.ts +205 -0
- package/src/prover/smt/solver/distribute-forall.ts +57 -0
- package/src/prover/smt/solver/dom-simplify.ts +511 -0
- package/src/prover/smt/solver/dt2bv-tactic.ts +296 -0
- package/src/prover/smt/solver/dyn-ack.ts +0 -11
- package/src/prover/smt/solver/e-matching.ts +9 -41
- package/src/prover/smt/solver/elim-bounds.ts +89 -0
- package/src/prover/smt/solver/elim-small-bv-tactic.ts +129 -0
- package/src/prover/smt/solver/elim-term-ite-tactic.ts +48 -0
- package/src/prover/smt/solver/elim-uncnstr.ts +542 -0
- package/src/prover/smt/solver/enode.ts +100 -23
- package/src/prover/smt/solver/eq2bv-tactic.ts +218 -0
- package/src/prover/smt/solver/euf/arith-axioms.ts +403 -0
- package/src/prover/smt/solver/euf/arith-internalize.ts +653 -0
- package/src/prover/smt/solver/euf/arith-solver.ts +889 -0
- package/src/prover/smt/solver/euf/array-axioms.ts +527 -0
- package/src/prover/smt/solver/euf/array-internalize.ts +428 -0
- package/src/prover/smt/solver/euf/array-solver.ts +306 -0
- package/src/prover/smt/solver/euf/bv-ackerman.ts +162 -0
- package/src/prover/smt/solver/euf/bv-internalize.ts +748 -0
- package/src/prover/smt/solver/euf/bv-solver.ts +449 -0
- package/src/prover/smt/solver/euf/dt-solver.ts +618 -0
- package/src/prover/smt/solver/euf/egraph.ts +901 -0
- package/src/prover/smt/solver/euf/euf-solver.ts +1204 -0
- package/src/prover/smt/solver/euf/fpa-solver.ts +317 -0
- package/src/prover/smt/solver/euf/mam.ts +1046 -0
- package/src/prover/smt/solver/euf/q-ematch.ts +829 -0
- package/src/prover/smt/solver/euf/q-mbi.ts +587 -0
- package/src/prover/smt/solver/euf/q-model-fixer.ts +296 -0
- package/src/prover/smt/solver/euf/q-solver.ts +361 -0
- package/src/prover/smt/solver/euf/th-solver.ts +328 -0
- package/src/prover/smt/solver/euf/th-solvers.ts +30 -0
- package/src/prover/smt/solver/expr-ref.ts +0 -5
- package/src/prover/smt/solver/expr-safe-replace.ts +26 -7
- package/src/prover/smt/solver/expr2polynomial.ts +271 -0
- package/src/prover/smt/solver/factor.ts +163 -0
- package/src/prover/smt/solver/fd-solver.ts +734 -0
- package/src/prover/smt/solver/fingerprints.ts +15 -26
- package/src/prover/smt/solver/fix-dl-var.ts +147 -0
- package/src/prover/smt/solver/flat-literals.ts +0 -9
- package/src/prover/smt/solver/fm-tactic.ts +884 -0
- package/src/prover/smt/solver/fpa-decl-plugin.ts +618 -0
- package/src/prover/smt/solver/fpa-rewriter.ts +639 -0
- package/src/prover/smt/solver/fpa2bv-converter.ts +2251 -0
- package/src/prover/smt/solver/fpa2bv-rewriter.ts +349 -0
- package/src/prover/smt/solver/fpa2bv-tactic.ts +73 -0
- package/src/prover/smt/solver/goal.ts +179 -28
- package/src/prover/smt/solver/goal2nlsat.ts +216 -0
- package/src/prover/smt/solver/guard-set.ts +219 -0
- package/src/prover/smt/solver/hash.ts +0 -9
- package/src/prover/smt/solver/hashtable.ts +30 -23
- package/src/prover/smt/solver/inf-eps.ts +63 -0
- package/src/prover/smt/solver/inj-axiom.ts +101 -0
- package/src/prover/smt/solver/internalizer.ts +113 -133
- package/src/prover/smt/solver/lackr.ts +381 -0
- package/src/prover/smt/solver/lbool.ts +0 -2
- package/src/prover/smt/solver/lia2card.ts +268 -0
- package/src/prover/smt/solver/lia2pb.ts +154 -0
- package/src/prover/smt/solver/literal.ts +0 -4
- package/src/prover/smt/solver/logic-tactics.ts +355 -0
- package/src/prover/smt/solver/lp/bound-propagator.ts +7 -26
- package/src/prover/smt/solver/lp/constraints.ts +1 -8
- package/src/prover/smt/solver/lp/containers.ts +18 -31
- package/src/prover/smt/solver/lp/core-solver.ts +35 -37
- package/src/prover/smt/solver/lp/cross-nested.ts +4 -21
- package/src/prover/smt/solver/lp/dep-intervals.ts +6 -24
- package/src/prover/smt/solver/lp/dependency.ts +0 -5
- package/src/prover/smt/solver/lp/dioph-eq.ts +8 -103
- package/src/prover/smt/solver/lp/explanation.ts +0 -6
- package/src/prover/smt/solver/lp/gomory.ts +8 -22
- package/src/prover/smt/solver/lp/hnf-cutter.ts +16 -23
- package/src/prover/smt/solver/lp/hnf.ts +10 -28
- package/src/prover/smt/solver/lp/int-cube.ts +17 -39
- package/src/prover/smt/solver/lp/int-solver.ts +3 -35
- package/src/prover/smt/solver/lp/lar-solver.ts +70 -83
- package/src/prover/smt/solver/lp/lar-term.ts +0 -5
- package/src/prover/smt/solver/lp/lp-settings.ts +6 -16
- package/src/prover/smt/solver/lp/maximize-term.ts +76 -52
- package/src/prover/smt/solver/lp/nex-creator.ts +7 -30
- package/src/prover/smt/solver/lp/nex.ts +2 -7
- package/src/prover/smt/solver/lp/nla-backoff.ts +0 -5
- package/src/prover/smt/solver/lp/nla-basics.ts +48 -30
- package/src/prover/smt/solver/lp/nla-core.ts +92 -136
- package/src/prover/smt/solver/lp/nla-divisions.ts +31 -43
- package/src/prover/smt/solver/lp/nla-emonics.ts +3 -21
- package/src/prover/smt/solver/lp/nla-factorization.ts +0 -4
- package/src/prover/smt/solver/lp/nla-grobner.ts +177 -149
- package/src/prover/smt/solver/lp/nla-horner.ts +2 -12
- package/src/prover/smt/solver/lp/nla-intervals.ts +1 -12
- package/src/prover/smt/solver/lp/nla-monomial-bounds.ts +15 -42
- package/src/prover/smt/solver/lp/nla-monotone.ts +1 -6
- package/src/prover/smt/solver/lp/nla-order.ts +0 -13
- package/src/prover/smt/solver/lp/nla-patcher.ts +3 -7
- package/src/prover/smt/solver/lp/nla-powers.ts +220 -0
- package/src/prover/smt/solver/lp/nla-tangents.ts +0 -10
- package/src/prover/smt/solver/lp/nla-throttle.ts +0 -6
- package/src/prover/smt/solver/lp/nla-transcendentals.ts +324 -0
- package/src/prover/smt/solver/lp/nla-types.ts +0 -12
- package/src/prover/smt/solver/lp/nla-var-eqs.ts +4 -26
- package/src/prover/smt/solver/lp/nra-solver.ts +164 -147
- package/src/prover/smt/solver/lp/numeric-pair.ts +0 -4
- package/src/prover/smt/solver/lp/pdd-interval.ts +6 -5
- package/src/prover/smt/solver/lp/pdd-simplifier.ts +61 -34
- package/src/prover/smt/solver/lp/pdd-solver.ts +74 -72
- package/src/prover/smt/solver/lp/pdd.ts +730 -358
- package/src/prover/smt/solver/lp/random-updater.ts +0 -9
- package/src/prover/smt/solver/lp/static-matrix.ts +8 -19
- package/src/prover/smt/solver/lp/union-find.ts +5 -5
- package/src/prover/smt/solver/macro-finder.ts +530 -0
- package/src/prover/smt/solver/mam-compiler.ts +129 -139
- package/src/prover/smt/solver/mam-interpreter.ts +0 -21
- package/src/prover/smt/solver/max-bv-sharing-tactic.ts +17 -0
- package/src/prover/smt/solver/max-cliques.ts +105 -0
- package/src/prover/smt/solver/maxcore.ts +310 -0
- package/src/prover/smt/solver/maximize-ac-sharing.ts +8 -21
- package/src/prover/smt/solver/maxlex.ts +115 -0
- package/src/prover/smt/solver/maxsmt-base.ts +106 -0
- package/src/prover/smt/solver/maxsmt.ts +92 -0
- package/src/prover/smt/solver/mbp/mbp-arith.ts +467 -0
- package/src/prover/smt/solver/mbp/mbp-basic-tg.ts +101 -0
- package/src/prover/smt/solver/mbp/mbp-plugin.ts +287 -0
- package/src/prover/smt/solver/mbp/mbp-qel.ts +48 -0
- package/src/prover/smt/solver/mbp/mbp-solve-plugin.ts +271 -0
- package/src/prover/smt/solver/mbp/mbp-term-graph.ts +606 -0
- package/src/prover/smt/solver/model-based-opt.ts +844 -0
- package/src/prover/smt/solver/model-checker.ts +20 -63
- package/src/prover/smt/solver/model-evaluator.ts +192 -40
- package/src/prover/smt/solver/model-finder.ts +14 -32
- package/src/prover/smt/solver/model-generator.ts +104 -46
- package/src/prover/smt/solver/model-macro-solver.ts +60 -114
- package/src/prover/smt/solver/model-printer.ts +214 -0
- package/src/prover/smt/solver/mpf.ts +709 -0
- package/src/prover/smt/solver/mus.ts +50 -0
- package/src/prover/smt/solver/muz/dl-context.ts +382 -0
- package/src/prover/smt/solver/muz/dl-mk-bit-blast.ts +97 -0
- package/src/prover/smt/solver/muz/dl-mk-coi-filter.ts +167 -0
- package/src/prover/smt/solver/muz/dl-mk-elim-term-ite.ts +125 -0
- package/src/prover/smt/solver/muz/dl-mk-interp-tail-simplifier.ts +299 -0
- package/src/prover/smt/solver/muz/dl-mk-rule-inliner.ts +455 -0
- package/src/prover/smt/solver/muz/dl-mk-slice.ts +340 -0
- package/src/prover/smt/solver/muz/dl-mk-subsumption-checker.ts +163 -0
- package/src/prover/smt/solver/muz/dl-rule-set.ts +273 -0
- package/src/prover/smt/solver/muz/dl-rule-transformer.ts +123 -0
- package/src/prover/smt/solver/muz/dl-rule.ts +495 -0
- package/src/prover/smt/solver/muz/hnf.ts +201 -0
- package/src/prover/smt/solver/muz/horn-subsume-model-converter.ts +176 -0
- package/src/prover/smt/solver/muz/horn-tactic.ts +214 -0
- package/src/prover/smt/solver/muz/rule-properties.ts +359 -0
- package/src/prover/smt/solver/muz/spacer-context.ts +1404 -0
- package/src/prover/smt/solver/muz/spacer-dl-interface.ts +52 -0
- package/src/prover/smt/solver/muz/spacer-generalizers.ts +241 -0
- package/src/prover/smt/solver/muz/spacer-manager.ts +127 -0
- package/src/prover/smt/solver/muz/spacer-pdr.ts +219 -0
- package/src/prover/smt/solver/muz/spacer-prop-solver.ts +333 -0
- package/src/prover/smt/solver/muz/spacer-util.ts +282 -0
- package/src/prover/smt/solver/muz/substitution.ts +203 -0
- package/src/prover/smt/solver/nla2bv-tactic.ts +285 -0
- package/src/prover/smt/solver/nlqsat.ts +484 -0
- package/src/prover/smt/solver/nlsat/algebraic.ts +357 -236
- package/src/prover/smt/solver/nlsat/atoms.ts +73 -54
- package/src/prover/smt/solver/nlsat/evaluator.ts +16 -22
- package/src/prover/smt/solver/nlsat/explain.ts +429 -275
- package/src/prover/smt/solver/nlsat/interval-set.ts +9 -51
- package/src/prover/smt/solver/nlsat/levelwise.ts +477 -344
- package/src/prover/smt/solver/nlsat/mpbq.ts +47 -14
- package/src/prover/smt/solver/nlsat/polynomial.ts +2385 -832
- package/src/prover/smt/solver/nlsat/solver.ts +297 -156
- package/src/prover/smt/solver/nlsat/transcendental-eval.ts +310 -0
- package/src/prover/smt/solver/nlsat/transcendentals.ts +391 -0
- package/src/prover/smt/solver/nlsat/types.ts +0 -9
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +9 -51
- package/src/prover/smt/solver/nlsat/upolynomial.ts +49 -109
- package/src/prover/smt/solver/nlsat-tactic.ts +82 -0
- package/src/prover/smt/solver/nnf.ts +112 -61
- package/src/prover/smt/solver/normalize-bounds.ts +53 -0
- package/src/prover/smt/solver/occf.ts +97 -0
- package/src/prover/smt/solver/opt-context.ts +801 -0
- package/src/prover/smt/solver/opt-nlsat.ts +386 -0
- package/src/prover/smt/solver/opt-pareto.ts +301 -0
- package/src/prover/smt/solver/opt-preprocess.ts +101 -0
- package/src/prover/smt/solver/opt-solver.ts +312 -0
- package/src/prover/smt/solver/opt-value.ts +55 -0
- package/src/prover/smt/solver/optsmt.ts +692 -0
- package/src/prover/smt/solver/parallel-tactic.ts +299 -0
- package/src/prover/smt/solver/pattern-inference.ts +21 -26
- package/src/prover/smt/solver/pb-rewriter.ts +281 -0
- package/src/prover/smt/solver/pb2bv-tactic.ts +540 -0
- package/src/prover/smt/solver/poly-rewriter.ts +261 -79
- package/src/prover/smt/solver/probes.ts +577 -0
- package/src/prover/smt/solver/propagate-values.ts +37 -30
- package/src/prover/smt/solver/proto-model.ts +650 -66
- package/src/prover/smt/solver/pull-quant.ts +28 -23
- package/src/prover/smt/solver/purify-arith.ts +632 -0
- package/src/prover/smt/solver/push-app-ite.ts +37 -0
- package/src/prover/smt/solver/qe-arith-plugin.ts +1096 -0
- package/src/prover/smt/solver/qe-lite-der.ts +2 -31
- package/src/prover/smt/solver/qe-lite-fm.ts +4 -28
- package/src/prover/smt/solver/qe-lite.ts +41 -51
- package/src/prover/smt/solver/qe-mbp.ts +270 -0
- package/src/prover/smt/solver/qe.ts +1499 -0
- package/src/prover/smt/solver/qel.ts +25 -0
- package/src/prover/smt/solver/qi-queue.ts +0 -16
- package/src/prover/smt/solver/qsat.ts +829 -0
- package/src/prover/smt/solver/quant-hoist.ts +196 -0
- package/src/prover/smt/solver/quant-tactics.ts +17 -74
- package/src/prover/smt/solver/quantifier-analyzer.ts +26 -47
- package/src/prover/smt/solver/quantifier-manager.ts +22 -32
- package/src/prover/smt/solver/quasi-macros.ts +243 -0
- package/src/prover/smt/solver/random-gen.ts +0 -2
- package/src/prover/smt/solver/rational.ts +45 -8
- package/src/prover/smt/solver/recfun-decl-plugin.ts +262 -0
- package/src/prover/smt/solver/recfun-rewriter.ts +107 -0
- package/src/prover/smt/solver/reduce-args.ts +225 -0
- package/src/prover/smt/solver/reduce-bv-size.ts +119 -0
- package/src/prover/smt/solver/ref-vector.ts +0 -6
- package/src/prover/smt/solver/relevancy.ts +2 -16
- package/src/prover/smt/solver/rewriter-tpl.ts +59 -135
- package/src/prover/smt/solver/rewriter.ts +507 -144
- package/src/prover/smt/solver/rlimit.ts +46 -24
- package/src/prover/smt/solver/sat/asymm-branch.ts +325 -0
- package/src/prover/smt/solver/sat/big.ts +177 -0
- package/src/prover/smt/solver/sat/clause-use-list.ts +71 -0
- package/src/prover/smt/solver/sat/clause.ts +203 -0
- package/src/prover/smt/solver/sat/cleaner.ts +94 -0
- package/src/prover/smt/solver/sat/config.ts +122 -0
- package/src/prover/smt/solver/sat/consequences.ts +203 -0
- package/src/prover/smt/solver/sat/elim-eqs.ts +142 -0
- package/src/prover/smt/solver/sat/goal2sat.ts +579 -0
- package/src/prover/smt/solver/sat/inc-sat-solver.ts +464 -0
- package/src/prover/smt/solver/sat/model-converter.ts +136 -0
- package/src/prover/smt/solver/sat/pb-constraint.ts +268 -0
- package/src/prover/smt/solver/sat/pb-solver.ts +1596 -0
- package/src/prover/smt/solver/sat/probing.ts +170 -0
- package/src/prover/smt/solver/sat/sat-tactic.ts +53 -0
- package/src/prover/smt/solver/sat/sat2goal.ts +189 -0
- package/src/prover/smt/solver/sat/scc.ts +142 -0
- package/src/prover/smt/solver/sat/simplifier.ts +1618 -0
- package/src/prover/smt/solver/sat/solver.ts +2107 -0
- package/src/prover/smt/solver/sat/var-queue.ts +117 -0
- package/src/prover/smt/solver/sat/watch-list.ts +140 -0
- package/src/prover/smt/solver/search-tree.ts +284 -0
- package/src/prover/smt/solver/seq-axioms.ts +995 -0
- package/src/prover/smt/solver/seq-decl-plugin.ts +819 -0
- package/src/prover/smt/solver/seq-derive.ts +1298 -0
- package/src/prover/smt/solver/seq-eq-approx.ts +236 -0
- package/src/prover/smt/solver/seq-eq-solver.ts +439 -0
- package/src/prover/smt/solver/seq-factory.ts +89 -0
- package/src/prover/smt/solver/seq-monadic.ts +730 -0
- package/src/prover/smt/solver/seq-range-predicate.ts +235 -0
- package/src/prover/smt/solver/seq-re-rewriter.ts +1171 -0
- package/src/prover/smt/solver/seq-re-util.ts +758 -0
- package/src/prover/smt/solver/seq-regex-bisim.ts +144 -0
- package/src/prover/smt/solver/seq-regex-live.ts +200 -0
- package/src/prover/smt/solver/seq-rewriter.ts +2404 -0
- package/src/prover/smt/solver/seq-skolem.ts +294 -0
- package/src/prover/smt/solver/seq-subset.ts +165 -0
- package/src/prover/smt/solver/seq-view-witness.ts +353 -0
- package/src/prover/smt/solver/smt-consequences.ts +297 -0
- package/src/prover/smt/solver/smt-kernel.ts +124 -0
- package/src/prover/smt/solver/smt-logics.ts +66 -0
- package/src/prover/smt/solver/smt-setup.ts +589 -0
- package/src/prover/smt/solver/smt2-printer.ts +765 -0
- package/src/prover/smt/solver/smtlib-parser.ts +3546 -406
- package/src/prover/smt/solver/smtlib-script.ts +2134 -0
- package/src/prover/smt/solver/solve-eqs.ts +928 -0
- package/src/prover/smt/solver/solver.ts +135 -40
- package/src/prover/smt/solver/sort.ts +1 -5
- package/src/prover/smt/solver/static-features.ts +314 -0
- package/src/prover/smt/solver/sticky-generations.ts +0 -6
- package/src/prover/smt/solver/tactic.ts +2141 -0
- package/src/prover/smt/solver/term-enumeration.ts +205 -0
- package/src/prover/smt/solver/theory-array.ts +1240 -0
- package/src/prover/smt/solver/theory-bv.ts +1210 -0
- package/src/prover/smt/solver/theory-char.ts +355 -0
- package/src/prover/smt/solver/theory-datatype.ts +598 -0
- package/src/prover/smt/solver/theory-finite-set.ts +30 -0
- package/src/prover/smt/solver/theory-fpa.ts +389 -0
- package/src/prover/smt/solver/theory-lra-axioms.ts +55 -25
- package/src/prover/smt/solver/theory-lra-bounds.ts +31 -11
- package/src/prover/smt/solver/theory-lra-final-check.ts +60 -91
- package/src/prover/smt/solver/theory-lra-internalize.ts +96 -53
- package/src/prover/smt/solver/theory-lra-model.ts +23 -53
- package/src/prover/smt/solver/theory-lra-propagate.ts +34 -42
- package/src/prover/smt/solver/theory-lra-state.ts +7 -28
- package/src/prover/smt/solver/theory-lra.ts +189 -9
- package/src/prover/smt/solver/theory-pb.ts +951 -0
- package/src/prover/smt/solver/theory-polymorphism.ts +58 -0
- package/src/prover/smt/solver/theory-recfun.ts +307 -0
- package/src/prover/smt/solver/theory-seq-regex.ts +867 -0
- package/src/prover/smt/solver/theory-seq-solve.ts +1373 -0
- package/src/prover/smt/solver/theory-seq-state.ts +852 -0
- package/src/prover/smt/solver/theory-seq.ts +961 -0
- package/src/prover/smt/solver/theory-without-terms.ts +24 -0
- package/src/prover/smt/solver/theory.ts +189 -0
- package/src/prover/smt/solver/tseitin-cnf.ts +486 -0
- package/src/prover/smt/solver/var-subst.ts +37 -39
- package/src/prover/smt/table.ts +3 -10
- package/src/prover/smt/types.ts +146 -0
- package/src/prover/tlapm/cache.ts +74 -48
- package/src/prover/tlapm/ocaml-marshal.ts +19 -21
- package/src/prover/tlapm/tlapm.ts +21 -20
- package/src/prover/tlapm-library.ts +3208 -0
- package/src/prover/verdict.ts +9 -2
- package/src/prover/zenon/check/check.ts +1 -11
- package/src/prover/zenon/check/definitions.ts +5 -15
- package/src/prover/zenon/check/equality.ts +0 -8
- package/src/prover/zenon/check/functions.ts +0 -4
- package/src/prover/zenon/check/keys.ts +0 -7
- package/src/prover/zenon/check/propositional.ts +0 -3
- package/src/prover/zenon/check/records.ts +1 -6
- package/src/prover/zenon/check/relations.ts +2 -14
- package/src/prover/zenon/check/rewrites.ts +2 -21
- package/src/prover/zenon/check/sets.ts +40 -61
- package/src/prover/zenon/check/terms.ts +1 -19
- package/src/prover/zenon/check/tla.ts +0 -6
- package/src/prover/zenon/decide.ts +10 -19
- package/src/prover/zenon/encode.ts +0 -9
- package/src/prover/zenon/eqrel.ts +2 -15
- package/src/prover/zenon/equality-rules.ts +24 -6
- package/src/prover/zenon/expr.ts +29 -28
- package/src/prover/zenon/index-table.ts +33 -61
- package/src/prover/zenon/isar-case.ts +9 -21
- package/src/prover/zenon/isar.ts +37 -67
- package/src/prover/zenon/limits.ts +0 -4
- package/src/prover/zenon/llproof.ts +2 -22
- package/src/prover/zenon/mltoll.ts +66 -106
- package/src/prover/zenon/node.ts +20 -15
- package/src/prover/zenon/ocaml.ts +1 -17
- package/src/prover/zenon/parse.ts +9 -13
- package/src/prover/zenon/phrase.ts +2 -14
- package/src/prover/zenon/proof.ts +0 -11
- package/src/prover/zenon/propositional-rules.ts +0 -7
- package/src/prover/zenon/rules.ts +3 -8
- package/src/prover/zenon/search.ts +11 -35
- package/src/prover/zenon/tla/functions.ts +59 -33
- package/src/prover/zenon/tla/llproof.ts +67 -78
- package/src/prover/zenon/tla/records.ts +57 -35
- package/src/prover/zenon/tla/rewrites.ts +12 -21
- package/src/prover/zenon/tla/sets.ts +88 -59
- package/src/prover/zenon/tla/terms.ts +0 -8
- package/src/prover/zenon/tla/tla.ts +66 -66
- package/src/randomization.ts +81 -35
- package/src/resolve.ts +1132 -430
- package/src/runtime.ts +33 -23
- package/src/sany/builtins.ts +11 -14
- package/src/sany/generation.ts +383 -0
- package/src/sany/generator-def-entries.ts +210 -0
- package/src/sany/generator-definitions.ts +688 -0
- package/src/sany/generator-expressions.ts +1108 -0
- package/src/sany/generator-proofs.ts +665 -0
- package/src/sany/generator.ts +192 -2764
- package/src/sany/levels.ts +5 -35
- package/src/sany/lexer.ts +61 -80
- package/src/sany/linter.ts +0 -10
- package/src/sany/modules.ts +5 -7
- package/src/sany/nodes.ts +6 -44
- package/src/sany/parse-error.ts +39 -117
- package/src/sany/report.ts +32 -69
- package/src/sany/selectors.ts +60 -82
- package/src/sany/source.ts +1 -17
- package/src/sany/xml.ts +37 -120
- package/src/search.ts +913 -227
- package/src/simulate.ts +765 -0
- package/src/spec-description.ts +198 -104
- package/src/standard-definitions.ts +4 -4
- package/src/standard-modules.ts +302 -99
- package/src/state-graph.ts +52 -33
- package/src/subexpressions.ts +578 -166
- package/src/substitution-levels.ts +7 -7
- package/src/successors.ts +299 -108
- package/src/symmetry.ts +37 -28
- package/src/tableau.ts +29 -26
- package/src/tlc/fingerprint.ts +267 -79
- package/src/tlc/jar-data.ts +122 -6
- package/src/tlc/messages.ts +127 -56
- package/src/tlc/order.ts +53 -72
- package/src/tlc/random.ts +38 -49
- package/src/tlc/replay.ts +579 -230
- package/src/tlc/summary.ts +64 -60
- package/src/tlc/tlc-operators.ts +83 -47
- package/src/tlc/tlcext-operators.ts +205 -127
- package/src/tlc/trace-spec.ts +235 -0
- package/src/tlc/value-stream.ts +139 -0
- package/src/tlc/version.ts +1 -4
- package/src/trace-liveness.ts +529 -0
- package/src/transfer.ts +22 -25
- package/src/typed-tier.ts +6556 -0
- package/src/typescript/actions.ts +479 -0
- package/src/typescript/collections.ts +614 -0
- package/src/typescript/compile.ts +63 -0
- package/src/typescript/context.ts +94 -0
- package/src/typescript/emit.ts +121 -0
- package/src/typescript/expressions.ts +496 -0
- package/src/typescript/formula.ts +154 -0
- package/src/typescript/functions.ts +284 -0
- package/src/typescript/model.ts +162 -0
- package/src/typescript/names.ts +114 -0
- package/src/typescript/program.ts +48 -0
- package/src/typescript/properties.ts +139 -0
- package/src/typescript/scope.ts +112 -0
- package/src/typescript/steps.ts +167 -0
- package/src/typescript/types.ts +171 -0
- package/src/values.ts +945 -526
- package/src/worker.ts +7 -8
- package/src/prover/isabelle/isar/statement.ts +0 -57
- package/src/prover/smt/solver/z3-license.txt +0 -10
- package/src/prover/tlaps-module.ts +0 -510
- package/src/prover/zenon/LICENSE +0 -32
|
@@ -1,14 +1,8 @@
|
|
|
1
|
-
// Ported from Zenon's ext_tla.ml, as shipped in tlapm. Copyright 2008 INRIA, see LICENSE.
|
|
2
|
-
//
|
|
3
|
-
// Zenon's to_llproof for the TLA+ extension: each rule becomes an extension rule of the low-level
|
|
4
|
-
// proof, named after the lemma in Zenon.thy that justifies it.
|
|
5
|
-
|
|
6
1
|
import { TlaZenonError } from "../../../errors";
|
|
7
2
|
import { difference, union, type Expr, type Expressions } from "../expr";
|
|
8
|
-
import {
|
|
3
|
+
import type { Lemma, LlProof, LlRule } from "../llproof";
|
|
9
4
|
import type { MlProof, Translated } from "../mltoll";
|
|
10
5
|
|
|
11
|
-
// The lemma's name, the terms it's instantiated with, the conclusions it uses and its branches.
|
|
12
6
|
type LlArgs = [string, Expr[], Expr[], Expr[][]];
|
|
13
7
|
|
|
14
8
|
type Shape = (name: string, args: Expr[]) => LlArgs;
|
|
@@ -72,7 +66,6 @@ const binbeta: Shape = (name, args) => {
|
|
|
72
66
|
return [`zenon_${name}`, rest, [first, second], [[hypothesisA], [hypothesisB]]];
|
|
73
67
|
};
|
|
74
68
|
|
|
75
|
-
// A conclusion, two terms and then the hypotheses, in one branch or one branch each.
|
|
76
69
|
const withTerms =
|
|
77
70
|
(isSplit: boolean): Shape =>
|
|
78
71
|
(name, args) => {
|
|
@@ -86,7 +79,6 @@ const withTerms =
|
|
|
86
79
|
];
|
|
87
80
|
};
|
|
88
81
|
|
|
89
|
-
// A conclusion and then the hypotheses, in one branch or one branch each.
|
|
90
82
|
const withoutTerms =
|
|
91
83
|
(isSplit: boolean): Shape =>
|
|
92
84
|
(name, args) => {
|
|
@@ -107,7 +99,6 @@ const getCaseBranches = (args: Expr[]): Expr[][] =>
|
|
|
107
99
|
: [args]
|
|
108
100
|
: [args.slice(0, 2), ...getCaseBranches(args.slice(2))];
|
|
109
101
|
|
|
110
|
-
// Zenon's to_llargs, by rule name. The rules missing here take one hypothesis.
|
|
111
102
|
const SHAPES: Record<string, Shape> = {
|
|
112
103
|
in_emptyset: (name, args) => [`zenon_${name}`, args.slice(1), args.slice(0, 1), []],
|
|
113
104
|
in_nat_0: close,
|
|
@@ -128,11 +119,7 @@ const SHAPES: Record<string, Shape> = {
|
|
|
128
119
|
if (third === undefined) throw getShapeError(name);
|
|
129
120
|
return [`zenon_${name}`, rest, [conclusion], [[first, second, third]]];
|
|
130
121
|
},
|
|
131
|
-
except_notin_funcset:
|
|
132
|
-
const [conclusion, first, second, ...rest] = args;
|
|
133
|
-
if (second === undefined) throw getShapeError(name);
|
|
134
|
-
return [`zenon_${name}`, rest, [conclusion], [[first], [second]]];
|
|
135
|
-
},
|
|
122
|
+
except_notin_funcset: beta,
|
|
136
123
|
notin_funcset: (name, args) => {
|
|
137
124
|
const [conclusion, first, second, third, ...rest] = args;
|
|
138
125
|
if (third === undefined) throw getShapeError(name);
|
|
@@ -194,14 +181,12 @@ const SHAPES: Record<string, Shape> = {
|
|
|
194
181
|
record_notisafcn: close,
|
|
195
182
|
};
|
|
196
183
|
|
|
197
|
-
// Zenon's Ext_tla.to_llproof, for a rule of the extension and its translated subproofs.
|
|
198
184
|
export const getTlaLlProof = (
|
|
199
185
|
translateExpr: (expression: Expr) => Expr,
|
|
200
186
|
exprs: Expressions,
|
|
201
187
|
proof: MlProof,
|
|
202
188
|
subproofs: Translated[],
|
|
203
189
|
): Translated => {
|
|
204
|
-
const tr = translateExpr;
|
|
205
190
|
const rule = proof.rule;
|
|
206
191
|
const member = (element: Expr, set: Expr) => exprs.eapp("TLA.in", [element, set]);
|
|
207
192
|
const equal = (left: Expr, right: Expr) => exprs.eapp("=", [left, right]);
|
|
@@ -213,18 +198,24 @@ export const getTlaLlProof = (
|
|
|
213
198
|
branches: Expr[][],
|
|
214
199
|
nodeSubproofs: LlProof[],
|
|
215
200
|
): LlProof => ({
|
|
216
|
-
conclusions: conclusions.map(
|
|
201
|
+
conclusions: conclusions.map(translateExpr),
|
|
217
202
|
rule: {
|
|
218
203
|
kind: "extension",
|
|
219
204
|
name,
|
|
220
|
-
args: args.map(
|
|
221
|
-
conclusions: ruleConclusions.map(
|
|
222
|
-
branches: branches.map((branch) => branch.map(
|
|
205
|
+
args: args.map(translateExpr),
|
|
206
|
+
conclusions: ruleConclusions.map(translateExpr),
|
|
207
|
+
branches: branches.map((branch) => branch.map(translateExpr)),
|
|
223
208
|
},
|
|
224
209
|
subproofs: nodeSubproofs,
|
|
225
210
|
});
|
|
226
211
|
|
|
227
|
-
|
|
212
|
+
const splitSet = (set: Expr, isSetOf: boolean) =>
|
|
213
|
+
set.kind === "app" &&
|
|
214
|
+
set.symbol === (isSetOf ? "TLA.set" : "TLA.addElt") &&
|
|
215
|
+
set.args.length >= (isSetOf ? 1 : 2)
|
|
216
|
+
? [set.args[0], isSetOf ? exprs.eapp("TLA.set", set.args.slice(1)) : set.args[1]]
|
|
217
|
+
: undefined;
|
|
218
|
+
|
|
228
219
|
const getMembership = (
|
|
229
220
|
element: Expr,
|
|
230
221
|
set: Expr,
|
|
@@ -240,12 +231,7 @@ export const getTlaLlProof = (
|
|
|
240
231
|
extension(conclusions, "zenon_in_emptyset", [element], [member(element, set)], [], []),
|
|
241
232
|
[],
|
|
242
233
|
];
|
|
243
|
-
const split =
|
|
244
|
-
set.kind === "app" &&
|
|
245
|
-
set.symbol === (isSetOf ? "TLA.set" : "TLA.addElt") &&
|
|
246
|
-
set.args.length >= (isSetOf ? 1 : 2)
|
|
247
|
-
? [set.args[0], isSetOf ? exprs.eapp("TLA.set", set.args.slice(1)) : set.args[1]]
|
|
248
|
-
: undefined;
|
|
234
|
+
const split = splitSet(set, isSetOf);
|
|
249
235
|
const first = remaining[0];
|
|
250
236
|
if (split === undefined || first === undefined) {
|
|
251
237
|
if (!isSetOf && remaining.length === 1) return remaining[0];
|
|
@@ -254,13 +240,13 @@ export const getTlaLlProof = (
|
|
|
254
240
|
const value = split[0];
|
|
255
241
|
const rest = split[1];
|
|
256
242
|
const conclusion = member(element, set);
|
|
257
|
-
const
|
|
258
|
-
const
|
|
243
|
+
const valueEquality = equal(element, value);
|
|
244
|
+
const restMembership = member(element, rest);
|
|
259
245
|
const next = getMembership(
|
|
260
246
|
element,
|
|
261
247
|
rest,
|
|
262
248
|
remaining.slice(1),
|
|
263
|
-
[
|
|
249
|
+
[restMembership, ...conclusions],
|
|
264
250
|
isSetOf,
|
|
265
251
|
);
|
|
266
252
|
const extras = difference(union(first[1], next[1]), conclusions);
|
|
@@ -270,14 +256,13 @@ export const getTlaLlProof = (
|
|
|
270
256
|
"zenon_in_addElt",
|
|
271
257
|
[element, value, rest],
|
|
272
258
|
[conclusion],
|
|
273
|
-
[[
|
|
259
|
+
[[valueEquality], [restMembership]],
|
|
274
260
|
[first[0], next[0]],
|
|
275
261
|
),
|
|
276
262
|
extras,
|
|
277
263
|
];
|
|
278
264
|
};
|
|
279
265
|
|
|
280
|
-
// The non-membership in an enumerated set, one element at a time.
|
|
281
266
|
const getNonMembership = (
|
|
282
267
|
element: Expr,
|
|
283
268
|
set: Expr,
|
|
@@ -285,23 +270,18 @@ export const getTlaLlProof = (
|
|
|
285
270
|
conclusions: Expr[],
|
|
286
271
|
isSetOf: boolean,
|
|
287
272
|
): Translated => {
|
|
288
|
-
const split =
|
|
289
|
-
set.kind === "app" &&
|
|
290
|
-
set.symbol === (isSetOf ? "TLA.set" : "TLA.addElt") &&
|
|
291
|
-
set.args.length >= (isSetOf ? 1 : 2)
|
|
292
|
-
? [set.args[0], isSetOf ? exprs.eapp("TLA.set", set.args.slice(1)) : set.args[1]]
|
|
293
|
-
: undefined;
|
|
273
|
+
const split = splitSet(set, isSetOf);
|
|
294
274
|
if (split === undefined) return sub;
|
|
295
275
|
const value = split[0];
|
|
296
276
|
const rest = split[1];
|
|
297
277
|
const conclusion = exprs.enot(member(element, set));
|
|
298
|
-
const
|
|
299
|
-
const
|
|
278
|
+
const valueInequality = exprs.enot(equal(element, value));
|
|
279
|
+
const restNonMembership = exprs.enot(member(element, rest));
|
|
300
280
|
const next = getNonMembership(
|
|
301
281
|
element,
|
|
302
282
|
rest,
|
|
303
283
|
sub,
|
|
304
|
-
[
|
|
284
|
+
[valueInequality, restNonMembership, ...conclusions],
|
|
305
285
|
isSetOf,
|
|
306
286
|
);
|
|
307
287
|
const extras = difference(next[1], conclusions);
|
|
@@ -311,7 +291,7 @@ export const getTlaLlProof = (
|
|
|
311
291
|
"zenon_notin_addElt",
|
|
312
292
|
[element, value, rest],
|
|
313
293
|
[conclusion],
|
|
314
|
-
[[
|
|
294
|
+
[[valueInequality, restNonMembership]],
|
|
315
295
|
[next[0]],
|
|
316
296
|
),
|
|
317
297
|
extras,
|
|
@@ -367,10 +347,9 @@ export const getTlaLlProof = (
|
|
|
367
347
|
}
|
|
368
348
|
};
|
|
369
349
|
|
|
370
|
-
// Zenon's Ext_tla.postprocess: the lemmas with each $notequiv written as a negated equivalence.
|
|
371
350
|
export const postprocessTla = (exprs: Expressions, lemmas: Lemma[]): Lemma[] => {
|
|
372
351
|
const cache = new Map<Expr, Expr>();
|
|
373
|
-
const
|
|
352
|
+
const postprocess = (expression: Expr): Expr => {
|
|
374
353
|
const cached = cache.get(expression);
|
|
375
354
|
if (cached !== undefined) return cached;
|
|
376
355
|
const result = ((): Expr => {
|
|
@@ -383,35 +362,37 @@ export const postprocessTla = (exprs: Expressions, lemmas: Lemma[]): Lemma[] =>
|
|
|
383
362
|
throw new TlaZenonError("Zenon: a metavariable in a low-level proof");
|
|
384
363
|
case "app": {
|
|
385
364
|
if (expression.symbol !== "$notequiv")
|
|
386
|
-
return exprs.eapp(expression.symbol, expression.args.map(
|
|
365
|
+
return exprs.eapp(expression.symbol, expression.args.map(postprocess));
|
|
387
366
|
if (expression.args.length !== 2)
|
|
388
367
|
throw new TlaZenonError("Zenon: $notequiv without two arguments");
|
|
389
|
-
const right =
|
|
390
|
-
return exprs.enot(exprs.eequiv(
|
|
368
|
+
const right = postprocess(expression.args[1]);
|
|
369
|
+
return exprs.enot(exprs.eequiv(postprocess(expression.args[0]), right));
|
|
391
370
|
}
|
|
392
371
|
case "not":
|
|
393
|
-
return exprs.enot(
|
|
372
|
+
return exprs.enot(postprocess(expression.args[0]));
|
|
394
373
|
case "and":
|
|
395
374
|
case "or":
|
|
396
375
|
case "imply":
|
|
397
376
|
case "equiv": {
|
|
398
|
-
const right =
|
|
399
|
-
return
|
|
377
|
+
const right = postprocess(expression.args[1]);
|
|
378
|
+
return exprs.binary(expression.kind, postprocess(expression.args[0]), right);
|
|
400
379
|
}
|
|
401
380
|
case "all":
|
|
402
|
-
return exprs.eall(expression.args[0], expression.symbol, pp(expression.args[1]));
|
|
403
381
|
case "ex":
|
|
404
|
-
return exprs.eex(expression.args[0], expression.symbol, pp(expression.args[1]));
|
|
405
382
|
case "tau":
|
|
406
|
-
return exprs.etau(expression.args[0], expression.symbol, pp(expression.args[1]));
|
|
407
383
|
case "lam":
|
|
408
|
-
return exprs.
|
|
384
|
+
return exprs.binder(
|
|
385
|
+
expression.kind,
|
|
386
|
+
expression.args[0],
|
|
387
|
+
expression.symbol,
|
|
388
|
+
postprocess(expression.args[1]),
|
|
389
|
+
);
|
|
409
390
|
}
|
|
410
391
|
})();
|
|
411
392
|
cache.set(expression, result);
|
|
412
393
|
return result;
|
|
413
394
|
};
|
|
414
|
-
const
|
|
395
|
+
const postprocessRule = (rule: LlRule): LlRule => {
|
|
415
396
|
switch (rule.kind) {
|
|
416
397
|
case "false":
|
|
417
398
|
case "nottrue":
|
|
@@ -419,62 +400,70 @@ export const postprocessTla = (exprs: Expressions, lemmas: Lemma[]): Lemma[] =>
|
|
|
419
400
|
case "axiom":
|
|
420
401
|
case "cut":
|
|
421
402
|
case "notnot":
|
|
422
|
-
return { kind: rule.kind, formula:
|
|
403
|
+
return { kind: rule.kind, formula: postprocess(rule.formula) };
|
|
423
404
|
case "noteq":
|
|
424
|
-
return { kind: "noteq", term:
|
|
405
|
+
return { kind: "noteq", term: postprocess(rule.term) };
|
|
425
406
|
case "eqsym":
|
|
426
407
|
case "notequal":
|
|
427
|
-
return { kind: rule.kind, left:
|
|
408
|
+
return { kind: rule.kind, left: postprocess(rule.left), right: postprocess(rule.right) };
|
|
428
409
|
case "connect":
|
|
429
410
|
case "notconnect":
|
|
430
411
|
return {
|
|
431
412
|
kind: rule.kind,
|
|
432
413
|
connective: rule.connective,
|
|
433
|
-
left:
|
|
434
|
-
right:
|
|
414
|
+
left: postprocess(rule.left),
|
|
415
|
+
right: postprocess(rule.right),
|
|
435
416
|
};
|
|
436
417
|
case "ex":
|
|
437
418
|
case "all":
|
|
438
419
|
case "notex":
|
|
439
420
|
case "notall":
|
|
440
|
-
return {
|
|
421
|
+
return {
|
|
422
|
+
kind: rule.kind,
|
|
423
|
+
quantified: postprocess(rule.quantified),
|
|
424
|
+
term: postprocess(rule.term),
|
|
425
|
+
};
|
|
441
426
|
case "pnotp":
|
|
442
|
-
return {
|
|
427
|
+
return {
|
|
428
|
+
kind: "pnotp",
|
|
429
|
+
positive: postprocess(rule.positive),
|
|
430
|
+
negative: postprocess(rule.negative),
|
|
431
|
+
};
|
|
443
432
|
case "congruencelr":
|
|
444
433
|
case "congruencerl":
|
|
445
434
|
return {
|
|
446
435
|
kind: rule.kind,
|
|
447
|
-
context:
|
|
448
|
-
left:
|
|
449
|
-
right:
|
|
436
|
+
context: postprocess(rule.context),
|
|
437
|
+
left: postprocess(rule.left),
|
|
438
|
+
right: postprocess(rule.right),
|
|
450
439
|
};
|
|
451
440
|
case "definition":
|
|
452
441
|
return {
|
|
453
442
|
kind: "definition",
|
|
454
443
|
name: rule.name,
|
|
455
|
-
folded:
|
|
456
|
-
unfolded:
|
|
444
|
+
folded: postprocess(rule.folded),
|
|
445
|
+
unfolded: postprocess(rule.unfolded),
|
|
457
446
|
};
|
|
458
447
|
case "extension":
|
|
459
448
|
return {
|
|
460
449
|
kind: "extension",
|
|
461
450
|
name: rule.name,
|
|
462
|
-
args: rule.args.map(
|
|
463
|
-
conclusions: rule.conclusions.map(
|
|
464
|
-
branches: rule.branches.map((branch) => branch.map(
|
|
451
|
+
args: rule.args.map(postprocess),
|
|
452
|
+
conclusions: rule.conclusions.map(postprocess),
|
|
453
|
+
branches: rule.branches.map((branch) => branch.map(postprocess)),
|
|
465
454
|
};
|
|
466
455
|
case "lemma":
|
|
467
|
-
return { kind: "lemma", name: rule.name, args: rule.args.map(
|
|
456
|
+
return { kind: "lemma", name: rule.name, args: rule.args.map(postprocess) };
|
|
468
457
|
}
|
|
469
458
|
};
|
|
470
|
-
const
|
|
471
|
-
conclusions: tree.conclusions.map(
|
|
472
|
-
rule:
|
|
473
|
-
subproofs: tree.subproofs.map(
|
|
459
|
+
const postprocessTree = (tree: LlProof): LlProof => ({
|
|
460
|
+
conclusions: tree.conclusions.map(postprocess),
|
|
461
|
+
rule: postprocessRule(tree.rule),
|
|
462
|
+
subproofs: tree.subproofs.map(postprocessTree),
|
|
474
463
|
});
|
|
475
464
|
return lemmas.map((lemma) => ({
|
|
476
465
|
name: lemma.name,
|
|
477
|
-
params: lemma.params.map((param): [string, Expr] => [param[0],
|
|
478
|
-
proof:
|
|
466
|
+
params: lemma.params.map((param): [string, Expr] => [param[0], postprocess(param[1])]),
|
|
467
|
+
proof: postprocessTree(lemma.proof),
|
|
479
468
|
}));
|
|
480
469
|
};
|
|
@@ -1,11 +1,6 @@
|
|
|
1
|
-
|
|
2
|
-
//
|
|
3
|
-
// The rules for tuples and records.
|
|
4
|
-
|
|
5
|
-
import { compareExprs, isApp, type Expr } from "../expr";
|
|
1
|
+
import { compareExprs, getStringName, isApp, type Expr } from "../expr";
|
|
6
2
|
import { stableSort } from "../ocaml";
|
|
7
|
-
import
|
|
8
|
-
import { makeRule, type Rule } from "../proof";
|
|
3
|
+
import { makeRule } from "../proof";
|
|
9
4
|
import {
|
|
10
5
|
domain,
|
|
11
6
|
equal,
|
|
@@ -20,12 +15,6 @@ import {
|
|
|
20
15
|
type Literal,
|
|
21
16
|
} from "./terms";
|
|
22
17
|
|
|
23
|
-
const getStringName = (expression: Expr) =>
|
|
24
|
-
isApp(expression, "$string", 1) && expression.args[0].kind === "var"
|
|
25
|
-
? expression.args[0].symbol
|
|
26
|
-
: undefined;
|
|
27
|
-
|
|
28
|
-
// Zenon's check_record_labels on sorted fields: false for Invalid_record, a repeated label.
|
|
29
18
|
const hasDistinctLabels = (pairs: [Expr, Expr][]) => {
|
|
30
19
|
for (let index = 0; index + 1 < pairs.length; index++) {
|
|
31
20
|
const left = pairs[index][0];
|
|
@@ -56,10 +45,8 @@ export const getTupleNodes = (literal: Literal): Item[] | undefined => {
|
|
|
56
45
|
const isNegated = literal.isNegated;
|
|
57
46
|
const atom = literal.atom;
|
|
58
47
|
const relation = literal.relation;
|
|
59
|
-
const node = (priority: Priority, rule: Rule, branches: Expr[][]) =>
|
|
60
|
-
makeExtensionNode(literal, priority, rule, branches);
|
|
61
48
|
if (isNegated && isApp(atom, "TLA.isASeq", 1) && isApp(atom.args[0], "TLA.tuple"))
|
|
62
|
-
return
|
|
49
|
+
return makeExtensionNode(literal, "prop", makeRule("tuple_notisaseq", [formula]), []);
|
|
63
50
|
if (relation === undefined) return undefined;
|
|
64
51
|
const left = relation.args[0];
|
|
65
52
|
const right = relation.args[1];
|
|
@@ -67,11 +54,21 @@ export const getTupleNodes = (literal: Literal): Item[] | undefined => {
|
|
|
67
54
|
const isMembership = relation.symbol === "TLA.in";
|
|
68
55
|
if (!isNegated && isEquality && isApp(left, "TLA.tuple") && isApp(right, "TLA.tuple")) {
|
|
69
56
|
if (left.args.length !== right.args.length)
|
|
70
|
-
return
|
|
57
|
+
return makeExtensionNode(
|
|
58
|
+
literal,
|
|
59
|
+
"prop",
|
|
60
|
+
makeRule("tuple_eq_mismatch", [formula, formula]),
|
|
61
|
+
[],
|
|
62
|
+
);
|
|
71
63
|
const equalities = left.args.map((inner, position) =>
|
|
72
64
|
equal(exprs, inner, right.args[position]),
|
|
73
65
|
);
|
|
74
|
-
return
|
|
66
|
+
return makeExtensionNode(
|
|
67
|
+
literal,
|
|
68
|
+
"prop",
|
|
69
|
+
makeRule("tuple_eq_match", [formula, ...equalities]),
|
|
70
|
+
[equalities],
|
|
71
|
+
);
|
|
75
72
|
}
|
|
76
73
|
if (isMembership && isApp(right, "TLA.Product", 1) && isApp(right.args[0], "TLA.tuple")) {
|
|
77
74
|
const element = left;
|
|
@@ -80,16 +77,24 @@ export const getTupleNodes = (literal: Literal): Item[] | undefined => {
|
|
|
80
77
|
const components = tuple.args.map((inner, position) =>
|
|
81
78
|
member(exprs, fapply(exprs, element, makeNatural(exprs, position + 1)), inner),
|
|
82
79
|
);
|
|
83
|
-
const
|
|
84
|
-
const
|
|
80
|
+
const sequenceFormula = exprs.eapp("TLA.isASeq", [element]);
|
|
81
|
+
const lengthFormula = equal(
|
|
85
82
|
exprs,
|
|
86
83
|
exprs.eapp("TLA.Len", [element]),
|
|
87
84
|
makeNatural(exprs, tuple.args.length),
|
|
88
85
|
);
|
|
89
|
-
return
|
|
86
|
+
return makeExtensionNode(
|
|
87
|
+
literal,
|
|
90
88
|
"prop",
|
|
91
|
-
makeRule("in_product", [
|
|
92
|
-
|
|
89
|
+
makeRule("in_product", [
|
|
90
|
+
formula,
|
|
91
|
+
element,
|
|
92
|
+
tuple,
|
|
93
|
+
sequenceFormula,
|
|
94
|
+
lengthFormula,
|
|
95
|
+
...components,
|
|
96
|
+
]),
|
|
97
|
+
[[sequenceFormula, lengthFormula, ...components]],
|
|
93
98
|
);
|
|
94
99
|
}
|
|
95
100
|
if (
|
|
@@ -108,7 +113,8 @@ export const getTupleNodes = (literal: Literal): Item[] | undefined => {
|
|
|
108
113
|
),
|
|
109
114
|
...components,
|
|
110
115
|
];
|
|
111
|
-
return
|
|
116
|
+
return makeExtensionNode(
|
|
117
|
+
literal,
|
|
112
118
|
"prop",
|
|
113
119
|
makeRule("notin_product", [formula, element, tuple, ...formulas]),
|
|
114
120
|
getBranches(formulas),
|
|
@@ -123,10 +129,8 @@ export const getRecordNodes = (literal: Literal): Item[] | undefined => {
|
|
|
123
129
|
const isNegated = literal.isNegated;
|
|
124
130
|
const atom = literal.atom;
|
|
125
131
|
const relation = literal.relation;
|
|
126
|
-
const node = (priority: Priority, rule: Rule, branches: Expr[][]) =>
|
|
127
|
-
makeExtensionNode(literal, priority, rule, branches);
|
|
128
132
|
if (isNegated && isApp(atom, "TLA.isAFcn", 1) && isApp(atom.args[0], "TLA.record"))
|
|
129
|
-
return
|
|
133
|
+
return makeExtensionNode(literal, "prop", makeRule("record_notisafcn", [formula]), []);
|
|
130
134
|
if (relation === undefined) return undefined;
|
|
131
135
|
const left = relation.args[0];
|
|
132
136
|
const right = relation.args[1];
|
|
@@ -140,14 +144,27 @@ export const getRecordNodes = (literal: Literal): Item[] | undefined => {
|
|
|
140
144
|
leftFields.length === rightFields.length &&
|
|
141
145
|
leftFields.every((field, position) => field[0] === rightFields[position][0]);
|
|
142
146
|
if (!isMatch)
|
|
143
|
-
return isNegated
|
|
147
|
+
return isNegated
|
|
148
|
+
? []
|
|
149
|
+
: makeExtensionNode(
|
|
150
|
+
literal,
|
|
151
|
+
"prop",
|
|
152
|
+
makeRule("record_eq_mismatch", [formula, formula]),
|
|
153
|
+
[],
|
|
154
|
+
);
|
|
144
155
|
const equalities = leftFields.map((field, position) =>
|
|
145
156
|
equal(exprs, field[1], rightFields[position][1]),
|
|
146
157
|
);
|
|
147
158
|
if (!isNegated)
|
|
148
|
-
return
|
|
159
|
+
return makeExtensionNode(
|
|
160
|
+
literal,
|
|
161
|
+
"prop",
|
|
162
|
+
makeRule("record_eq_match", [formula, ...equalities]),
|
|
163
|
+
[equalities],
|
|
164
|
+
);
|
|
149
165
|
const inequalities = equalities.map((inner) => exprs.enot(inner));
|
|
150
|
-
return
|
|
166
|
+
return makeExtensionNode(
|
|
167
|
+
literal,
|
|
151
168
|
"prop",
|
|
152
169
|
makeRule("record_neq_match", [formula, ...inequalities]),
|
|
153
170
|
getBranches(inequalities),
|
|
@@ -171,7 +188,8 @@ export const getRecordNodes = (literal: Literal): Item[] | undefined => {
|
|
|
171
188
|
),
|
|
172
189
|
...pairs.map((pair) => exprs.enot(equal(exprs, fapply(exprs, other, pair[0]), pair[1]))),
|
|
173
190
|
];
|
|
174
|
-
return
|
|
191
|
+
return makeExtensionNode(
|
|
192
|
+
literal,
|
|
175
193
|
"prop",
|
|
176
194
|
makeRule(record === right ? "neq_record" : "record_neq", [
|
|
177
195
|
formula,
|
|
@@ -194,9 +212,12 @@ export const getRecordNodes = (literal: Literal): Item[] | undefined => {
|
|
|
194
212
|
equal(exprs, domain(exprs, left), labels),
|
|
195
213
|
...pairs.map((pair) => member(exprs, fapply(exprs, left, pair[0]), pair[1])),
|
|
196
214
|
];
|
|
197
|
-
return
|
|
198
|
-
|
|
199
|
-
|
|
215
|
+
return makeExtensionNode(
|
|
216
|
+
literal,
|
|
217
|
+
"prop",
|
|
218
|
+
makeRule("in_recordset", [formula, left, right, ...formulas]),
|
|
219
|
+
[formulas],
|
|
220
|
+
);
|
|
200
221
|
}
|
|
201
222
|
if (isApp(left, "TLA.record")) {
|
|
202
223
|
const leftLabels = getSortedLabels(left.args);
|
|
@@ -215,7 +236,8 @@ export const getRecordNodes = (literal: Literal): Item[] | undefined => {
|
|
|
215
236
|
exprs.enot(equal(exprs, domain(exprs, left), labels)),
|
|
216
237
|
...pairs.map((pair) => exprs.enot(member(exprs, fapply(exprs, left, pair[0]), pair[1]))),
|
|
217
238
|
];
|
|
218
|
-
return
|
|
239
|
+
return makeExtensionNode(
|
|
240
|
+
literal,
|
|
219
241
|
"prop",
|
|
220
242
|
makeRule("notin_recordset", [formula, left, right, ...formulas]),
|
|
221
243
|
getBranches(formulas),
|
|
@@ -1,8 +1,3 @@
|
|
|
1
|
-
// Ported from Zenon's ext_tla.ml, as shipped in tlapm. Copyright 2008 INRIA, see LICENSE.
|
|
2
|
-
//
|
|
3
|
-
// Rewriting a subterm: unfolding a definition, evaluating a function application, IF, CASE or a
|
|
4
|
-
// formula used as a term, or replacing the subterm with an equal one from the branch.
|
|
5
|
-
|
|
6
1
|
import { TlaZenonError } from "../../../errors";
|
|
7
2
|
import {
|
|
8
3
|
FALSE,
|
|
@@ -29,8 +24,7 @@ import {
|
|
|
29
24
|
type TlaContext,
|
|
30
25
|
} from "./terms";
|
|
31
26
|
|
|
32
|
-
|
|
33
|
-
const parseInteger = (text: string) =>
|
|
27
|
+
const parseOcamlInteger = (text: string) =>
|
|
34
28
|
/^[-+]?(0[xX][0-9a-fA-F_]+|0[oO][0-7_]+|0[bB][01_]+|0[uU][0-9_]+|[0-9][0-9_]*)$/.test(text)
|
|
35
29
|
? Number(text.replace(/_/g, "").replace(/^([-+]?)0[uU]/, "$1"))
|
|
36
30
|
: undefined;
|
|
@@ -43,7 +37,7 @@ const getNaturalConstant = (expression: Expr): number | undefined => {
|
|
|
43
37
|
current = current.args[1];
|
|
44
38
|
}
|
|
45
39
|
if (current.kind !== "var") return undefined;
|
|
46
|
-
const value =
|
|
40
|
+
const value = parseOcamlInteger(current.symbol);
|
|
47
41
|
return value === undefined ? undefined : accumulator + value;
|
|
48
42
|
};
|
|
49
43
|
|
|
@@ -100,20 +94,19 @@ const getRewrites = (
|
|
|
100
94
|
const lambda = exprs.elam(hole, "", frame);
|
|
101
95
|
const fill = (inner: Expr) => exprs.substitute([[hole, inner]], frame);
|
|
102
96
|
const makeBoolCase = (getRule: (prefix: [Expr, Expr, Expr, Expr, Expr, Expr]) => Rule) => {
|
|
103
|
-
const
|
|
97
|
+
const trueEquality = equal(exprs, term, TRUE);
|
|
104
98
|
const whenTrue = fill(TRUE);
|
|
105
|
-
const
|
|
99
|
+
const falseEquality = equal(exprs, term, FALSE);
|
|
106
100
|
const whenFalse = fill(FALSE);
|
|
107
101
|
return make(
|
|
108
|
-
getRule([fill(term),
|
|
102
|
+
getRule([fill(term), trueEquality, whenTrue, falseEquality, whenFalse, lambda]),
|
|
109
103
|
[],
|
|
110
104
|
[
|
|
111
|
-
[
|
|
112
|
-
[
|
|
105
|
+
[trueEquality, whenTrue],
|
|
106
|
+
[falseEquality, whenFalse],
|
|
113
107
|
],
|
|
114
108
|
);
|
|
115
109
|
};
|
|
116
|
-
// Rewrites the term with the equalities on the branch whose other side has one of these heads.
|
|
117
110
|
const makeEqualityRewrites = (wrapped: Expr, heads: string[], subterm: Expr) => {
|
|
118
111
|
const hasGoodHead = (other: Expr) =>
|
|
119
112
|
(other.kind === "app" || other.kind === "var") &&
|
|
@@ -199,19 +192,19 @@ const getRewrites = (
|
|
|
199
192
|
const point = fcn.args[1];
|
|
200
193
|
const value = fcn.args[2];
|
|
201
194
|
const inDomain = member(exprs, argument, domain(exprs, base));
|
|
202
|
-
const
|
|
195
|
+
const pointEquality = equal(exprs, point, argument);
|
|
203
196
|
const changed = fill(value);
|
|
204
|
-
const
|
|
197
|
+
const pointInequality = exprs.enot(equal(exprs, point, argument));
|
|
205
198
|
const unchanged = fill(fapply(exprs, base, argument));
|
|
206
199
|
const outside = exprs.enot(inDomain);
|
|
207
200
|
return make(
|
|
208
201
|
makeRule("fapplyexcept", [
|
|
209
202
|
fill(term),
|
|
210
203
|
inDomain,
|
|
211
|
-
|
|
204
|
+
pointEquality,
|
|
212
205
|
changed,
|
|
213
206
|
inDomain,
|
|
214
|
-
|
|
207
|
+
pointInequality,
|
|
215
208
|
unchanged,
|
|
216
209
|
outside,
|
|
217
210
|
lambda,
|
|
@@ -221,7 +214,7 @@ const getRewrites = (
|
|
|
221
214
|
argument,
|
|
222
215
|
]),
|
|
223
216
|
[],
|
|
224
|
-
[[inDomain,
|
|
217
|
+
[[inDomain, pointEquality, changed], [inDomain, pointInequality, unchanged], [outside]],
|
|
225
218
|
);
|
|
226
219
|
}
|
|
227
220
|
if (isApp(fcn, "TLA.tuple") && isInOneTo(argument, fcn.args.length)) {
|
|
@@ -394,8 +387,6 @@ const hasExistential = (exprs: Expressions, index: Index, choice: BinderExpr) =>
|
|
|
394
387
|
return index.isMember(exprs.eex(choice.args[0], choice.symbol, body));
|
|
395
388
|
};
|
|
396
389
|
|
|
397
|
-
// Zenon's find_rewrites: the rewrites of the outermost subterm that has some, looking through
|
|
398
|
-
// applications and negations.
|
|
399
390
|
const findRewrites = (
|
|
400
391
|
context: TlaContext,
|
|
401
392
|
isInTerm: boolean,
|