tla-ts 0.0.9 → 0.0.10-dev.09e53c2a6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +30 -1
- package/dist/compile.cjs +23 -0
- package/dist/compile.js +23 -0
- package/dist/deciders.cjs +41 -37
- package/dist/deciders.js +57 -53
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +109 -10
- package/dist/index.d.ts +109 -10
- package/dist/index.js +1 -1
- package/dist/parallel-worker.cjs +1 -1
- package/dist/parallel-worker.js +1 -1
- package/dist/prove-worker.cjs +1 -1
- package/dist/prove-worker.js +1 -1
- package/dist/prove.cjs +2746 -410
- package/dist/prove.js +2745 -409
- package/dist/run.cjs +146 -31
- package/dist/run.js +146 -31
- package/dist/tlapm.cjs +2 -2
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +132 -104
- package/dist/transfer.js +132 -104
- package/dist/worker.cjs +6 -6
- package/dist/worker.js +6 -6
- package/package.json +3 -1
- package/src/ast.ts +45 -59
- package/src/bags.ts +99 -102
- package/src/builtins.ts +28 -75
- package/src/bundled-modules.ts +1 -8
- package/src/check-failure.ts +116 -0
- package/src/check-trace.ts +282 -0
- package/src/check.ts +797 -782
- package/src/cli/options.ts +12 -32
- package/src/cli/run.ts +0 -2
- package/src/cli/runtime-invariants.ts +136 -0
- package/src/cli/shared.ts +19 -12
- package/src/cli/tlapm.ts +433 -82
- package/src/cli/tlc-arguments.ts +652 -0
- package/src/cli/tlc-output.ts +687 -0
- package/src/cli/tlc-usage.ts +360 -0
- package/src/cli/tlc.ts +323 -658
- package/src/cli/typescript.ts +23 -0
- package/src/cli/xml-exporter.ts +27 -49
- package/src/cli.ts +0 -1
- package/src/codegen.ts +196 -74
- package/src/config.ts +140 -109
- package/src/coverage.ts +830 -0
- package/src/dependencies.ts +36 -54
- package/src/dfid.ts +618 -0
- package/src/environment-config.ts +315 -0
- package/src/environment.ts +178 -339
- package/src/errors.ts +100 -57
- package/src/evaluate.ts +598 -340
- package/src/exit-codes.ts +38 -3
- package/src/fingerprints.ts +75 -11
- package/src/index.ts +3 -0
- package/src/instances.ts +126 -21
- package/src/java-hash.ts +7 -0
- package/src/java-overrides.ts +4 -19
- package/src/json-reader.ts +455 -0
- package/src/json.ts +252 -139
- package/src/levels.ts +46 -58
- package/src/lexer.ts +83 -101
- package/src/liveness-checker.ts +590 -311
- package/src/liveness.ts +180 -124
- package/src/obligations/action.ts +17 -44
- package/src/obligations/anonymize.ts +120 -95
- package/src/obligations/enabled-axioms.ts +218 -0
- package/src/obligations/equality.ts +1 -3
- package/src/obligations/expression.ts +37 -26
- package/src/obligations/format.ts +0 -10
- package/src/obligations/generate.ts +66 -64
- package/src/obligations/index.ts +38 -19
- package/src/obligations/levels.ts +27 -18
- package/src/obligations/module.ts +28 -55
- package/src/obligations/normalize.ts +30 -37
- package/src/obligations/operators.ts +0 -3
- package/src/obligations/pragma.ts +52 -24
- package/src/obligations/printer.ts +89 -58
- package/src/obligations/proof.ts +3 -6
- package/src/obligations/regroup.ts +0 -5
- package/src/obligations/simplify.ts +57 -63
- package/src/obligations/source.ts +119 -95
- package/src/obligations/subexpression.ts +49 -28
- package/src/obligations/substitution.ts +1 -5
- package/src/obligations/temporal.ts +12 -20
- package/src/obligations/tuples.ts +2 -10
- package/src/parallel-worker.ts +30 -60
- package/src/parallel.ts +59 -73
- package/src/parser.ts +1082 -399
- package/src/pcal/ast.ts +53 -86
- package/src/pcal/parse.ts +144 -219
- package/src/pcal/tokenize.ts +91 -131
- package/src/pcal/translate.ts +83 -130
- package/src/pcal/validate.ts +48 -68
- package/src/pretty-print.ts +7 -8
- package/src/prover/decide-pool.ts +8 -13
- package/src/prover/deciders.ts +12 -13
- package/src/prover/first-order.ts +0 -11
- package/src/prover/isabelle/decide.ts +3 -31
- package/src/prover/isabelle/encode.ts +82 -64
- package/src/prover/isabelle/isar/attrib.ts +250 -0
- package/src/prover/isabelle/isar/context.ts +335 -0
- package/src/prover/isabelle/isar/induct.ts +382 -0
- package/src/prover/isabelle/isar/inner-syntax.ts +262 -117
- package/src/prover/isabelle/isar/method.ts +510 -226
- package/src/prover/isabelle/isar/proof.ts +570 -23
- package/src/prover/isabelle/isar/rule-cases.ts +224 -0
- package/src/prover/isabelle/isar/theory.ts +488 -88
- package/src/prover/isabelle/isar/toplevel.ts +331 -0
- package/src/prover/isabelle/isar/type-check.ts +99 -38
- package/src/prover/isabelle/provers/blast/blast.ts +16 -105
- package/src/prover/isabelle/provers/blast/branch.ts +0 -33
- package/src/prover/isabelle/provers/blast/prove.ts +0 -36
- package/src/prover/isabelle/provers/blast/rules.ts +5 -45
- package/src/prover/isabelle/provers/blast/state.ts +1 -29
- package/src/prover/isabelle/provers/blast/term.ts +8 -37
- package/src/prover/isabelle/provers/clasimp.ts +0 -14
- package/src/prover/isabelle/provers/classical.ts +58 -61
- package/src/prover/isabelle/provers/hypsubst.ts +27 -52
- package/src/prover/isabelle/pure/bicompose.ts +24 -39
- package/src/prover/isabelle/pure/consts.ts +0 -8
- package/src/prover/isabelle/pure/conv.ts +2 -18
- package/src/prover/isabelle/pure/drule.ts +95 -45
- package/src/prover/isabelle/pure/envir.ts +2 -53
- package/src/prover/isabelle/pure/goal.ts +1 -9
- package/src/prover/isabelle/pure/interrupt.ts +0 -5
- package/src/prover/isabelle/pure/list.ts +0 -3
- package/src/prover/isabelle/pure/logic.ts +1 -16
- package/src/prover/isabelle/pure/name.ts +1 -10
- package/src/prover/isabelle/pure/net.ts +2 -60
- package/src/prover/isabelle/pure/object-logic.ts +15 -16
- package/src/prover/isabelle/pure/pattern.ts +1 -20
- package/src/prover/isabelle/pure/raw-simplifier.ts +16 -63
- package/src/prover/isabelle/pure/rewriter.ts +31 -74
- package/src/prover/isabelle/pure/search.ts +2 -11
- package/src/prover/isabelle/pure/seq.ts +0 -11
- package/src/prover/isabelle/pure/simplifier.ts +27 -16
- package/src/prover/isabelle/pure/table.ts +2 -33
- package/src/prover/isabelle/pure/tactic.ts +11 -23
- package/src/prover/isabelle/pure/tactical.ts +47 -48
- package/src/prover/isabelle/pure/term-ord.ts +1 -7
- package/src/prover/isabelle/pure/term.ts +1 -44
- package/src/prover/isabelle/pure/thm.ts +26 -48
- package/src/prover/isabelle/pure/type.ts +1 -16
- package/src/prover/isabelle/pure/unify.ts +19 -31
- package/src/prover/isabelle/pure/variable.ts +2 -8
- package/src/prover/isabelle/tla/classical-setup.ts +17 -25
- package/src/prover/isabelle/tla/context.ts +65 -26
- package/src/prover/isabelle/tla/logic-data.ts +1 -1
- package/src/prover/isabelle/tla/logic.ts +53 -32
- package/src/prover/isabelle/tla/simpdata.ts +45 -44
- package/src/prover/isabelle/tools/intuitionistic.ts +28 -21
- package/src/prover/ocaml.ts +4 -7
- package/src/prover/prep/action.ts +33 -66
- package/src/prover/prep/enabled-axioms.ts +22 -20
- package/src/prover/prep/fingerprint.ts +2 -21
- package/src/prover/prep/level-comparison.ts +8 -12
- package/src/prover/prep/md5.ts +0 -2
- package/src/prover/prep/methods.ts +189 -86
- package/src/prover/prep/normalize.ts +42 -37
- package/src/prover/prove-worker.ts +0 -2
- package/src/prover/prove.ts +398 -133
- package/src/prover/ptl/decide.ts +96 -56
- package/src/prover/ptl/encode.ts +15 -38
- package/src/prover/ptl/sat.ts +24 -32
- package/src/prover/ptl/tableau.ts +40 -28
- package/src/prover/smt/arithmetic.ts +310 -0
- package/src/prover/smt/axioms.ts +12 -15
- package/src/prover/smt/context.ts +60 -32
- package/src/prover/smt/data.ts +517 -401
- package/src/prover/smt/encode.ts +155 -85
- package/src/prover/smt/extensionality.ts +5 -13
- package/src/prover/smt/flatten.ts +7 -28
- package/src/prover/smt/format.ts +33 -14
- package/src/prover/smt/instances.ts +7 -11
- package/src/prover/smt/layout.ts +91 -0
- package/src/prover/smt/rewrite.ts +1026 -658
- package/src/prover/smt/simplify.ts +441 -0
- package/src/prover/smt/solver/ackermannize-bv-tactic.ts +61 -0
- package/src/prover/smt/solver/ackr-helper.ts +179 -0
- package/src/prover/smt/solver/ackr-model-converter.ts +105 -0
- package/src/prover/smt/solver/act-cache.ts +0 -16
- package/src/prover/smt/solver/add-bounds-tactic.ts +59 -0
- package/src/prover/smt/solver/aig-tactic.ts +52 -0
- package/src/prover/smt/solver/aig.ts +889 -0
- package/src/prover/smt/solver/arith-rewriter.ts +615 -53
- package/src/prover/smt/solver/arith-terms.ts +121 -0
- package/src/prover/smt/solver/array-decl-plugin.ts +175 -0
- package/src/prover/smt/solver/array-rewriter.ts +309 -0
- package/src/prover/smt/solver/array.ts +1 -3
- package/src/prover/smt/solver/asserted-formulas.ts +87 -58
- package/src/prover/smt/solver/ast-lt.ts +166 -22
- package/src/prover/smt/solver/ast-util.ts +160 -7
- package/src/prover/smt/solver/ast.ts +1424 -180
- package/src/prover/smt/solver/auf-solver.ts +7 -44
- package/src/prover/smt/solver/bit-blast-tactic.ts +582 -0
- package/src/prover/smt/solver/bit-blaster.ts +871 -0
- package/src/prover/smt/solver/bound-manager.ts +196 -0
- package/src/prover/smt/solver/bound-simplifier.ts +600 -0
- package/src/prover/smt/solver/bv-bound-chk.ts +492 -0
- package/src/prover/smt/solver/bv-decl-plugin.ts +338 -0
- package/src/prover/smt/solver/bv-divrem-bounds.ts +95 -0
- package/src/prover/smt/solver/bv-rewriter.ts +1901 -0
- package/src/prover/smt/solver/bv1-blast.ts +214 -0
- package/src/prover/smt/solver/bv2fpa-converter.ts +174 -0
- package/src/prover/smt/solver/bv2int-rewriter.ts +544 -0
- package/src/prover/smt/solver/bv2real-rewriter.ts +533 -0
- package/src/prover/smt/solver/card2bv.ts +110 -0
- package/src/prover/smt/solver/case-split-queue.ts +0 -10
- package/src/prover/smt/solver/cg-table.ts +39 -42
- package/src/prover/smt/solver/check-logic.ts +330 -0
- package/src/prover/smt/solver/clause.ts +0 -27
- package/src/prover/smt/solver/cofactor-elim-term-ite.ts +278 -0
- package/src/prover/smt/solver/conflict-resolution.ts +78 -11
- package/src/prover/smt/solver/context.ts +519 -175
- package/src/prover/smt/solver/ctx-simplify.ts +33 -50
- package/src/prover/smt/solver/ctx-solver-simplify.ts +122 -0
- package/src/prover/smt/solver/datatype-decl-plugin.ts +572 -0
- package/src/prover/smt/solver/datatype-rewriter.ts +82 -0
- package/src/prover/smt/solver/demodulator.ts +786 -0
- package/src/prover/smt/solver/dependent-expr-state.ts +81 -0
- package/src/prover/smt/solver/der.ts +39 -30
- package/src/prover/smt/solver/diff-neq.ts +206 -0
- package/src/prover/smt/solver/distribute-forall.ts +57 -0
- package/src/prover/smt/solver/dom-simplify.ts +511 -0
- package/src/prover/smt/solver/dt2bv-tactic.ts +260 -0
- package/src/prover/smt/solver/dyn-ack.ts +0 -11
- package/src/prover/smt/solver/e-matching.ts +9 -41
- package/src/prover/smt/solver/elim-small-bv-tactic.ts +129 -0
- package/src/prover/smt/solver/elim-uncnstr.ts +545 -0
- package/src/prover/smt/solver/enode.ts +100 -23
- package/src/prover/smt/solver/eq2bv-tactic.ts +218 -0
- package/src/prover/smt/solver/euf/arith-axioms.ts +403 -0
- package/src/prover/smt/solver/euf/arith-internalize.ts +653 -0
- package/src/prover/smt/solver/euf/arith-solver.ts +889 -0
- package/src/prover/smt/solver/euf/array-axioms.ts +527 -0
- package/src/prover/smt/solver/euf/array-internalize.ts +428 -0
- package/src/prover/smt/solver/euf/array-solver.ts +306 -0
- package/src/prover/smt/solver/euf/bv-ackerman.ts +162 -0
- package/src/prover/smt/solver/euf/bv-internalize.ts +748 -0
- package/src/prover/smt/solver/euf/bv-solver.ts +449 -0
- package/src/prover/smt/solver/euf/dt-solver.ts +618 -0
- package/src/prover/smt/solver/euf/egraph.ts +907 -0
- package/src/prover/smt/solver/euf/euf-solver.ts +1205 -0
- package/src/prover/smt/solver/euf/fpa-solver.ts +317 -0
- package/src/prover/smt/solver/euf/mam.ts +1050 -0
- package/src/prover/smt/solver/euf/q-ematch.ts +830 -0
- package/src/prover/smt/solver/euf/q-mbi.ts +587 -0
- package/src/prover/smt/solver/euf/q-model-fixer.ts +296 -0
- package/src/prover/smt/solver/euf/q-solver.ts +361 -0
- package/src/prover/smt/solver/euf/th-solver.ts +335 -0
- package/src/prover/smt/solver/euf/th-solvers.ts +30 -0
- package/src/prover/smt/solver/expr-ref.ts +0 -5
- package/src/prover/smt/solver/expr-safe-replace.ts +26 -7
- package/src/prover/smt/solver/expr2polynomial.ts +146 -0
- package/src/prover/smt/solver/factor.ts +141 -0
- package/src/prover/smt/solver/fd-solver.ts +265 -0
- package/src/prover/smt/solver/fingerprints.ts +15 -26
- package/src/prover/smt/solver/fix-dl-var.ts +148 -0
- package/src/prover/smt/solver/flat-literals.ts +0 -9
- package/src/prover/smt/solver/fm-tactic.ts +884 -0
- package/src/prover/smt/solver/fpa-decl-plugin.ts +618 -0
- package/src/prover/smt/solver/fpa-rewriter.ts +640 -0
- package/src/prover/smt/solver/fpa2bv-converter.ts +2249 -0
- package/src/prover/smt/solver/fpa2bv-rewriter.ts +348 -0
- package/src/prover/smt/solver/fpa2bv-tactic.ts +73 -0
- package/src/prover/smt/solver/goal.ts +176 -28
- package/src/prover/smt/solver/goal2nlsat.ts +189 -0
- package/src/prover/smt/solver/guard-set.ts +219 -0
- package/src/prover/smt/solver/hash.ts +0 -9
- package/src/prover/smt/solver/hashtable.ts +26 -23
- package/src/prover/smt/solver/inf-eps.ts +63 -0
- package/src/prover/smt/solver/inj-axiom.ts +101 -0
- package/src/prover/smt/solver/internalizer.ts +112 -132
- package/src/prover/smt/solver/lackr.ts +381 -0
- package/src/prover/smt/solver/lbool.ts +0 -2
- package/src/prover/smt/solver/lia2card.ts +268 -0
- package/src/prover/smt/solver/lia2pb.ts +154 -0
- package/src/prover/smt/solver/literal.ts +0 -4
- package/src/prover/smt/solver/logic-tactics.ts +345 -0
- package/src/prover/smt/solver/lp/bound-propagator.ts +7 -26
- package/src/prover/smt/solver/lp/constraints.ts +1 -8
- package/src/prover/smt/solver/lp/containers.ts +11 -30
- package/src/prover/smt/solver/lp/core-solver.ts +23 -29
- package/src/prover/smt/solver/lp/cross-nested.ts +5 -20
- package/src/prover/smt/solver/lp/dep-intervals.ts +6 -24
- package/src/prover/smt/solver/lp/dependency.ts +0 -5
- package/src/prover/smt/solver/lp/dioph-eq.ts +8 -103
- package/src/prover/smt/solver/lp/explanation.ts +0 -6
- package/src/prover/smt/solver/lp/gomory.ts +8 -22
- package/src/prover/smt/solver/lp/hnf-cutter.ts +16 -23
- package/src/prover/smt/solver/lp/hnf.ts +10 -28
- package/src/prover/smt/solver/lp/int-cube.ts +17 -39
- package/src/prover/smt/solver/lp/int-solver.ts +3 -35
- package/src/prover/smt/solver/lp/lar-solver.ts +69 -82
- package/src/prover/smt/solver/lp/lar-term.ts +0 -5
- package/src/prover/smt/solver/lp/lp-settings.ts +0 -14
- package/src/prover/smt/solver/lp/maximize-term.ts +76 -52
- package/src/prover/smt/solver/lp/nex-creator.ts +4 -28
- package/src/prover/smt/solver/lp/nex.ts +0 -6
- package/src/prover/smt/solver/lp/nla-backoff.ts +0 -5
- package/src/prover/smt/solver/lp/nla-basics.ts +48 -30
- package/src/prover/smt/solver/lp/nla-core.ts +91 -135
- package/src/prover/smt/solver/lp/nla-divisions.ts +31 -43
- package/src/prover/smt/solver/lp/nla-emonics.ts +3 -21
- package/src/prover/smt/solver/lp/nla-factorization.ts +0 -4
- package/src/prover/smt/solver/lp/nla-grobner.ts +22 -72
- package/src/prover/smt/solver/lp/nla-horner.ts +2 -12
- package/src/prover/smt/solver/lp/nla-intervals.ts +1 -12
- package/src/prover/smt/solver/lp/nla-monomial-bounds.ts +15 -42
- package/src/prover/smt/solver/lp/nla-monotone.ts +1 -6
- package/src/prover/smt/solver/lp/nla-order.ts +0 -13
- package/src/prover/smt/solver/lp/nla-patcher.ts +3 -7
- package/src/prover/smt/solver/lp/nla-powers.ts +220 -0
- package/src/prover/smt/solver/lp/nla-tangents.ts +0 -10
- package/src/prover/smt/solver/lp/nla-throttle.ts +0 -6
- package/src/prover/smt/solver/lp/nla-transcendentals.ts +324 -0
- package/src/prover/smt/solver/lp/nla-types.ts +0 -12
- package/src/prover/smt/solver/lp/nla-var-eqs.ts +4 -26
- package/src/prover/smt/solver/lp/nra-solver.ts +123 -112
- package/src/prover/smt/solver/lp/numeric-pair.ts +0 -4
- package/src/prover/smt/solver/lp/pdd-interval.ts +0 -3
- package/src/prover/smt/solver/lp/pdd-simplifier.ts +1 -14
- package/src/prover/smt/solver/lp/pdd-solver.ts +2 -33
- package/src/prover/smt/solver/lp/pdd.ts +7 -70
- package/src/prover/smt/solver/lp/random-updater.ts +0 -9
- package/src/prover/smt/solver/lp/static-matrix.ts +8 -19
- package/src/prover/smt/solver/lp/union-find.ts +5 -5
- package/src/prover/smt/solver/macro-finder.ts +530 -0
- package/src/prover/smt/solver/mam-compiler.ts +129 -139
- package/src/prover/smt/solver/mam-interpreter.ts +0 -21
- package/src/prover/smt/solver/max-bv-sharing-tactic.ts +17 -0
- package/src/prover/smt/solver/max-cliques.ts +105 -0
- package/src/prover/smt/solver/maxcore.ts +309 -0
- package/src/prover/smt/solver/maximize-ac-sharing.ts +8 -21
- package/src/prover/smt/solver/maxlex.ts +115 -0
- package/src/prover/smt/solver/maxsmt-base.ts +105 -0
- package/src/prover/smt/solver/maxsmt.ts +92 -0
- package/src/prover/smt/solver/mbp/mbp-arith.ts +467 -0
- package/src/prover/smt/solver/mbp/mbp-basic-tg.ts +101 -0
- package/src/prover/smt/solver/mbp/mbp-plugin.ts +287 -0
- package/src/prover/smt/solver/mbp/mbp-qel.ts +48 -0
- package/src/prover/smt/solver/mbp/mbp-solve-plugin.ts +271 -0
- package/src/prover/smt/solver/mbp/mbp-term-graph.ts +606 -0
- package/src/prover/smt/solver/model-based-opt.ts +844 -0
- package/src/prover/smt/solver/model-checker.ts +19 -62
- package/src/prover/smt/solver/model-evaluator.ts +190 -40
- package/src/prover/smt/solver/model-finder.ts +14 -32
- package/src/prover/smt/solver/model-generator.ts +56 -40
- package/src/prover/smt/solver/model-macro-solver.ts +60 -114
- package/src/prover/smt/solver/model-printer.ts +214 -0
- package/src/prover/smt/solver/mpf.ts +711 -0
- package/src/prover/smt/solver/mus.ts +51 -0
- package/src/prover/smt/solver/muz/dl-context.ts +404 -0
- package/src/prover/smt/solver/muz/dl-mk-bit-blast.ts +97 -0
- package/src/prover/smt/solver/muz/dl-mk-coi-filter.ts +167 -0
- package/src/prover/smt/solver/muz/dl-mk-elim-term-ite.ts +125 -0
- package/src/prover/smt/solver/muz/dl-mk-interp-tail-simplifier.ts +299 -0
- package/src/prover/smt/solver/muz/dl-mk-rule-inliner.ts +455 -0
- package/src/prover/smt/solver/muz/dl-mk-slice.ts +340 -0
- package/src/prover/smt/solver/muz/dl-mk-subsumption-checker.ts +163 -0
- package/src/prover/smt/solver/muz/dl-rule-set.ts +273 -0
- package/src/prover/smt/solver/muz/dl-rule-transformer.ts +123 -0
- package/src/prover/smt/solver/muz/dl-rule.ts +496 -0
- package/src/prover/smt/solver/muz/hnf.ts +201 -0
- package/src/prover/smt/solver/muz/horn-subsume-model-converter.ts +176 -0
- package/src/prover/smt/solver/muz/horn-tactic.ts +201 -0
- package/src/prover/smt/solver/muz/rule-properties.ts +337 -0
- package/src/prover/smt/solver/muz/spacer-context.ts +1406 -0
- package/src/prover/smt/solver/muz/spacer-dl-interface.ts +52 -0
- package/src/prover/smt/solver/muz/spacer-generalizers.ts +241 -0
- package/src/prover/smt/solver/muz/spacer-manager.ts +127 -0
- package/src/prover/smt/solver/muz/spacer-pdr.ts +218 -0
- package/src/prover/smt/solver/muz/spacer-prop-solver.ts +333 -0
- package/src/prover/smt/solver/muz/spacer-util.ts +282 -0
- package/src/prover/smt/solver/muz/substitution.ts +203 -0
- package/src/prover/smt/solver/nla2bv-tactic.ts +285 -0
- package/src/prover/smt/solver/nlqsat.ts +484 -0
- package/src/prover/smt/solver/nlsat/algebraic.ts +177 -160
- package/src/prover/smt/solver/nlsat/atoms.ts +24 -24
- package/src/prover/smt/solver/nlsat/evaluator.ts +16 -22
- package/src/prover/smt/solver/nlsat/explain.ts +65 -69
- package/src/prover/smt/solver/nlsat/interval-set.ts +9 -51
- package/src/prover/smt/solver/nlsat/levelwise.ts +48 -135
- package/src/prover/smt/solver/nlsat/mpbq.ts +47 -14
- package/src/prover/smt/solver/nlsat/polynomial.ts +29 -161
- package/src/prover/smt/solver/nlsat/solver.ts +241 -110
- package/src/prover/smt/solver/nlsat/transcendental-eval.ts +310 -0
- package/src/prover/smt/solver/nlsat/transcendentals.ts +367 -0
- package/src/prover/smt/solver/nlsat/types.ts +0 -9
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +1 -47
- package/src/prover/smt/solver/nlsat/upolynomial.ts +10 -93
- package/src/prover/smt/solver/nlsat-tactic.ts +82 -0
- package/src/prover/smt/solver/nnf.ts +107 -60
- package/src/prover/smt/solver/normalize-bounds.ts +53 -0
- package/src/prover/smt/solver/occf.ts +97 -0
- package/src/prover/smt/solver/opt-context.ts +787 -0
- package/src/prover/smt/solver/opt-nlsat.ts +375 -0
- package/src/prover/smt/solver/opt-pareto.ts +282 -0
- package/src/prover/smt/solver/opt-preprocess.ts +101 -0
- package/src/prover/smt/solver/opt-solver.ts +308 -0
- package/src/prover/smt/solver/opt-value.ts +55 -0
- package/src/prover/smt/solver/optsmt.ts +692 -0
- package/src/prover/smt/solver/parallel-tactic.ts +299 -0
- package/src/prover/smt/solver/pattern-inference.ts +21 -26
- package/src/prover/smt/solver/pb-rewriter.ts +284 -0
- package/src/prover/smt/solver/pb2bv-tactic.ts +540 -0
- package/src/prover/smt/solver/poly-rewriter.ts +204 -79
- package/src/prover/smt/solver/probes.ts +512 -0
- package/src/prover/smt/solver/propagate-values.ts +37 -30
- package/src/prover/smt/solver/proto-model.ts +650 -66
- package/src/prover/smt/solver/pull-quant.ts +28 -23
- package/src/prover/smt/solver/purify-arith.ts +632 -0
- package/src/prover/smt/solver/qe-arith-plugin.ts +1098 -0
- package/src/prover/smt/solver/qe-lite-der.ts +2 -31
- package/src/prover/smt/solver/qe-lite-fm.ts +4 -28
- package/src/prover/smt/solver/qe-lite.ts +39 -49
- package/src/prover/smt/solver/qe-mbp.ts +270 -0
- package/src/prover/smt/solver/qe.ts +1498 -0
- package/src/prover/smt/solver/qel.ts +25 -0
- package/src/prover/smt/solver/qi-queue.ts +0 -16
- package/src/prover/smt/solver/qsat.ts +814 -0
- package/src/prover/smt/solver/quant-hoist.ts +196 -0
- package/src/prover/smt/solver/quant-tactics.ts +17 -74
- package/src/prover/smt/solver/quantifier-analyzer.ts +26 -47
- package/src/prover/smt/solver/quantifier-manager.ts +8 -23
- package/src/prover/smt/solver/quasi-macros.ts +243 -0
- package/src/prover/smt/solver/random-gen.ts +0 -2
- package/src/prover/smt/solver/rational.ts +45 -8
- package/src/prover/smt/solver/recfun-decl-plugin.ts +261 -0
- package/src/prover/smt/solver/recfun-rewriter.ts +107 -0
- package/src/prover/smt/solver/reduce-args.ts +225 -0
- package/src/prover/smt/solver/reduce-bv-size.ts +119 -0
- package/src/prover/smt/solver/ref-vector.ts +0 -6
- package/src/prover/smt/solver/relevancy.ts +2 -16
- package/src/prover/smt/solver/rewriter-tpl.ts +52 -129
- package/src/prover/smt/solver/rewriter.ts +477 -120
- package/src/prover/smt/solver/rlimit.ts +39 -21
- package/src/prover/smt/solver/sat/asymm-branch.ts +325 -0
- package/src/prover/smt/solver/sat/big.ts +177 -0
- package/src/prover/smt/solver/sat/clause-use-list.ts +71 -0
- package/src/prover/smt/solver/sat/clause.ts +203 -0
- package/src/prover/smt/solver/sat/cleaner.ts +94 -0
- package/src/prover/smt/solver/sat/config.ts +122 -0
- package/src/prover/smt/solver/sat/consequences.ts +203 -0
- package/src/prover/smt/solver/sat/elim-eqs.ts +142 -0
- package/src/prover/smt/solver/sat/goal2sat.ts +526 -0
- package/src/prover/smt/solver/sat/inc-sat-solver.ts +378 -0
- package/src/prover/smt/solver/sat/model-converter.ts +136 -0
- package/src/prover/smt/solver/sat/pb-constraint.ts +261 -0
- package/src/prover/smt/solver/sat/pb-solver.ts +1577 -0
- package/src/prover/smt/solver/sat/probing.ts +170 -0
- package/src/prover/smt/solver/sat/sat-tactic.ts +43 -0
- package/src/prover/smt/solver/sat/sat2goal.ts +165 -0
- package/src/prover/smt/solver/sat/scc.ts +142 -0
- package/src/prover/smt/solver/sat/simplifier.ts +1618 -0
- package/src/prover/smt/solver/sat/solver.ts +2127 -0
- package/src/prover/smt/solver/sat/var-queue.ts +117 -0
- package/src/prover/smt/solver/sat/watch-list.ts +140 -0
- package/src/prover/smt/solver/search-tree.ts +284 -0
- package/src/prover/smt/solver/seq-axioms.ts +1010 -0
- package/src/prover/smt/solver/seq-decl-plugin.ts +819 -0
- package/src/prover/smt/solver/seq-derive.ts +1301 -0
- package/src/prover/smt/solver/seq-eq-approx.ts +236 -0
- package/src/prover/smt/solver/seq-eq-solver.ts +439 -0
- package/src/prover/smt/solver/seq-factory.ts +89 -0
- package/src/prover/smt/solver/seq-monadic.ts +728 -0
- package/src/prover/smt/solver/seq-range-predicate.ts +235 -0
- package/src/prover/smt/solver/seq-re-rewriter.ts +1170 -0
- package/src/prover/smt/solver/seq-re-util.ts +758 -0
- package/src/prover/smt/solver/seq-regex-bisim.ts +144 -0
- package/src/prover/smt/solver/seq-regex-live.ts +200 -0
- package/src/prover/smt/solver/seq-rewriter.ts +2402 -0
- package/src/prover/smt/solver/seq-skolem.ts +317 -0
- package/src/prover/smt/solver/seq-subset.ts +165 -0
- package/src/prover/smt/solver/seq-view-witness.ts +353 -0
- package/src/prover/smt/solver/smt-consequences.ts +297 -0
- package/src/prover/smt/solver/smt-kernel.ts +83 -0
- package/src/prover/smt/solver/smt-logics.ts +66 -0
- package/src/prover/smt/solver/smt-setup.ts +496 -0
- package/src/prover/smt/solver/smt2-printer.ts +765 -0
- package/src/prover/smt/solver/smtlib-parser.ts +3140 -365
- package/src/prover/smt/solver/smtlib-script.ts +1631 -0
- package/src/prover/smt/solver/solve-eqs.ts +929 -0
- package/src/prover/smt/solver/solver.ts +119 -39
- package/src/prover/smt/solver/sort.ts +1 -5
- package/src/prover/smt/solver/static-features.ts +314 -0
- package/src/prover/smt/solver/sticky-generations.ts +0 -6
- package/src/prover/smt/solver/tactic.ts +1986 -0
- package/src/prover/smt/solver/term-enumeration.ts +205 -0
- package/src/prover/smt/solver/theory-array.ts +1240 -0
- package/src/prover/smt/solver/theory-bv.ts +1200 -0
- package/src/prover/smt/solver/theory-char.ts +355 -0
- package/src/prover/smt/solver/theory-datatype.ts +598 -0
- package/src/prover/smt/solver/theory-finite-set.ts +30 -0
- package/src/prover/smt/solver/theory-fpa.ts +389 -0
- package/src/prover/smt/solver/theory-lra-axioms.ts +55 -25
- package/src/prover/smt/solver/theory-lra-bounds.ts +31 -11
- package/src/prover/smt/solver/theory-lra-final-check.ts +59 -91
- package/src/prover/smt/solver/theory-lra-internalize.ts +94 -53
- package/src/prover/smt/solver/theory-lra-model.ts +23 -53
- package/src/prover/smt/solver/theory-lra-propagate.ts +24 -40
- package/src/prover/smt/solver/theory-lra-state.ts +6 -27
- package/src/prover/smt/solver/theory-lra.ts +188 -8
- package/src/prover/smt/solver/theory-pb.ts +934 -0
- package/src/prover/smt/solver/theory-polymorphism.ts +58 -0
- package/src/prover/smt/solver/theory-recfun.ts +307 -0
- package/src/prover/smt/solver/theory-seq-regex.ts +867 -0
- package/src/prover/smt/solver/theory-seq-solve.ts +1373 -0
- package/src/prover/smt/solver/theory-seq-state.ts +871 -0
- package/src/prover/smt/solver/theory-seq.ts +961 -0
- package/src/prover/smt/solver/theory.ts +189 -0
- package/src/prover/smt/solver/tseitin-cnf.ts +485 -0
- package/src/prover/smt/solver/var-subst.ts +37 -39
- package/src/prover/smt/table.ts +3 -10
- package/src/prover/smt/types.ts +146 -0
- package/src/prover/tlapm/cache.ts +67 -41
- package/src/prover/tlapm/ocaml-marshal.ts +19 -21
- package/src/prover/tlapm/tlapm.ts +21 -20
- package/src/prover/tlapm-library.ts +3208 -0
- package/src/prover/verdict.ts +9 -2
- package/src/prover/zenon/check/check.ts +1 -11
- package/src/prover/zenon/check/definitions.ts +5 -15
- package/src/prover/zenon/check/equality.ts +0 -8
- package/src/prover/zenon/check/functions.ts +0 -4
- package/src/prover/zenon/check/keys.ts +0 -7
- package/src/prover/zenon/check/propositional.ts +0 -3
- package/src/prover/zenon/check/records.ts +1 -6
- package/src/prover/zenon/check/relations.ts +2 -14
- package/src/prover/zenon/check/rewrites.ts +2 -21
- package/src/prover/zenon/check/sets.ts +40 -61
- package/src/prover/zenon/check/terms.ts +1 -19
- package/src/prover/zenon/check/tla.ts +0 -6
- package/src/prover/zenon/decide.ts +10 -19
- package/src/prover/zenon/encode.ts +0 -9
- package/src/prover/zenon/eqrel.ts +2 -15
- package/src/prover/zenon/equality-rules.ts +0 -6
- package/src/prover/zenon/expr.ts +8 -28
- package/src/prover/zenon/index-table.ts +26 -59
- package/src/prover/zenon/isar-case.ts +8 -20
- package/src/prover/zenon/isar.ts +35 -65
- package/src/prover/zenon/limits.ts +0 -4
- package/src/prover/zenon/llproof.ts +2 -22
- package/src/prover/zenon/mltoll.ts +66 -106
- package/src/prover/zenon/node.ts +20 -15
- package/src/prover/zenon/ocaml.ts +1 -17
- package/src/prover/zenon/parse.ts +9 -13
- package/src/prover/zenon/phrase.ts +1 -13
- package/src/prover/zenon/proof.ts +0 -11
- package/src/prover/zenon/propositional-rules.ts +0 -7
- package/src/prover/zenon/rules.ts +2 -8
- package/src/prover/zenon/search.ts +11 -35
- package/src/prover/zenon/tla/functions.ts +59 -33
- package/src/prover/zenon/tla/llproof.ts +67 -78
- package/src/prover/zenon/tla/records.ts +57 -35
- package/src/prover/zenon/tla/rewrites.ts +12 -21
- package/src/prover/zenon/tla/sets.ts +88 -59
- package/src/prover/zenon/tla/terms.ts +0 -8
- package/src/prover/zenon/tla/tla.ts +66 -66
- package/src/randomization.ts +81 -35
- package/src/resolve.ts +67 -185
- package/src/runtime.ts +26 -22
- package/src/sany/builtins.ts +2 -5
- package/src/sany/generation.ts +394 -0
- package/src/sany/generator-def-entries.ts +210 -0
- package/src/sany/generator-definitions.ts +686 -0
- package/src/sany/generator-expressions.ts +1100 -0
- package/src/sany/generator-proofs.ts +662 -0
- package/src/sany/generator.ts +191 -2764
- package/src/sany/levels.ts +5 -35
- package/src/sany/lexer.ts +58 -77
- package/src/sany/linter.ts +0 -10
- package/src/sany/modules.ts +1 -5
- package/src/sany/nodes.ts +5 -43
- package/src/sany/parse-error.ts +39 -117
- package/src/sany/report.ts +32 -69
- package/src/sany/selectors.ts +49 -76
- package/src/sany/source.ts +1 -17
- package/src/sany/xml.ts +35 -117
- package/src/search.ts +671 -169
- package/src/simulate.ts +712 -0
- package/src/spec-description.ts +192 -100
- package/src/standard-definitions.ts +4 -4
- package/src/standard-modules.ts +264 -95
- package/src/state-graph.ts +52 -33
- package/src/subexpressions.ts +69 -52
- package/src/substitution-levels.ts +7 -7
- package/src/successors.ts +267 -100
- package/src/symmetry.ts +35 -27
- package/src/tableau.ts +29 -26
- package/src/tlc/fingerprint.ts +267 -79
- package/src/tlc/jar-data.ts +112 -6
- package/src/tlc/messages.ts +125 -54
- package/src/tlc/order.ts +39 -69
- package/src/tlc/random.ts +37 -49
- package/src/tlc/replay.ts +553 -228
- package/src/tlc/summary.ts +64 -60
- package/src/tlc/tlc-operators.ts +78 -44
- package/src/tlc/tlcext-operators.ts +171 -122
- package/src/tlc/trace-spec.ts +249 -0
- package/src/tlc/value-stream.ts +139 -0
- package/src/tlc/version.ts +1 -4
- package/src/transfer.ts +22 -25
- package/src/typed-tier.ts +6535 -0
- package/src/typescript/actions.ts +479 -0
- package/src/typescript/collections.ts +614 -0
- package/src/typescript/compile.ts +63 -0
- package/src/typescript/context.ts +94 -0
- package/src/typescript/emit.ts +121 -0
- package/src/typescript/expressions.ts +496 -0
- package/src/typescript/formula.ts +154 -0
- package/src/typescript/functions.ts +284 -0
- package/src/typescript/model.ts +162 -0
- package/src/typescript/names.ts +114 -0
- package/src/typescript/program.ts +48 -0
- package/src/typescript/properties.ts +139 -0
- package/src/typescript/scope.ts +112 -0
- package/src/typescript/steps.ts +167 -0
- package/src/typescript/types.ts +171 -0
- package/src/values.ts +832 -484
- package/src/worker.ts +7 -8
- package/src/prover/isabelle/isar/statement.ts +0 -57
- package/src/prover/smt/solver/z3-license.txt +0 -10
- package/src/prover/tlaps-module.ts +0 -510
- package/src/prover/zenon/LICENSE +0 -32
|
@@ -1,10 +1,5 @@
|
|
|
1
|
-
// Ported from Zenon's ext_tla.ml, as shipped in tlapm. Copyright 2008 INRIA, see LICENSE.
|
|
2
|
-
//
|
|
3
|
-
// The rules for sets: membership in each kind of set, set equality and inclusion.
|
|
4
|
-
|
|
5
1
|
import { isApp, type Expr } from "../expr";
|
|
6
|
-
import
|
|
7
|
-
import { makeRule, type Rule } from "../proof";
|
|
2
|
+
import { makeRule } from "../proof";
|
|
8
3
|
import {
|
|
9
4
|
equal,
|
|
10
5
|
getBranches,
|
|
@@ -28,25 +23,36 @@ const decomposeAdd = (set: Expr): [Expr[], Expr] => {
|
|
|
28
23
|
return [elements, rest];
|
|
29
24
|
};
|
|
30
25
|
|
|
26
|
+
const BINARY_SET_RULES = new Map<
|
|
27
|
+
string,
|
|
28
|
+
[
|
|
29
|
+
"in_cup" | "in_cap" | "in_setminus",
|
|
30
|
+
"notin_cup" | "notin_cap" | "notin_setminus",
|
|
31
|
+
boolean,
|
|
32
|
+
boolean,
|
|
33
|
+
]
|
|
34
|
+
>([
|
|
35
|
+
["TLA.cup", ["in_cup", "notin_cup", true, false]],
|
|
36
|
+
["TLA.cap", ["in_cap", "notin_cap", false, true]],
|
|
37
|
+
["TLA.setminus", ["in_setminus", "notin_setminus", false, true]],
|
|
38
|
+
]);
|
|
39
|
+
|
|
31
40
|
export const getMembershipNodes = (literal: Literal): Item[] | undefined => {
|
|
32
41
|
const exprs = literal.context.exprs;
|
|
33
42
|
const formula = literal.formula;
|
|
34
43
|
const isNegated = literal.isNegated;
|
|
35
44
|
const relation = literal.relation;
|
|
36
|
-
const node = (priority: Priority, rule: Rule, branches: Expr[][]) =>
|
|
37
|
-
makeExtensionNode(literal, priority, rule, branches);
|
|
38
|
-
const instance = (priority: Priority, quantified: Expr, term: Expr) =>
|
|
39
|
-
makeInstanceNode(literal, priority, quantified, term);
|
|
40
45
|
if (relation?.symbol === "TLA.in") {
|
|
41
46
|
const element = relation.args[0];
|
|
42
47
|
const set = relation.args[1];
|
|
43
48
|
if (!isNegated && isVariable(set, "TLA.emptyset"))
|
|
44
|
-
return
|
|
49
|
+
return makeExtensionNode(literal, "prop", makeRule("in_emptyset", [formula, element]), []);
|
|
45
50
|
if (isApp(set, "TLA.upair", 2)) {
|
|
46
51
|
const first = equal(exprs, element, set.args[0]);
|
|
47
52
|
const second = equal(exprs, element, set.args[1]);
|
|
48
53
|
return isNegated
|
|
49
|
-
?
|
|
54
|
+
? makeExtensionNode(
|
|
55
|
+
literal,
|
|
50
56
|
"prop",
|
|
51
57
|
makeRule("notin_upair", [
|
|
52
58
|
formula,
|
|
@@ -58,7 +64,8 @@ export const getMembershipNodes = (literal: Literal): Item[] | undefined => {
|
|
|
58
64
|
]),
|
|
59
65
|
[[exprs.enot(first), exprs.enot(second)]],
|
|
60
66
|
)
|
|
61
|
-
:
|
|
67
|
+
: makeExtensionNode(
|
|
68
|
+
literal,
|
|
62
69
|
"prop",
|
|
63
70
|
makeRule("in_upair", [formula, first, second, element, set.args[0], set.args[1]]),
|
|
64
71
|
[[first], [second]],
|
|
@@ -72,35 +79,54 @@ export const getMembershipNodes = (literal: Literal): Item[] | undefined => {
|
|
|
72
79
|
const formulas = isEmptyRest
|
|
73
80
|
? equalities
|
|
74
81
|
: [...equalities, member(exprs, element, decomposed[1])];
|
|
75
|
-
return
|
|
82
|
+
return makeExtensionNode(
|
|
83
|
+
literal,
|
|
84
|
+
"prop",
|
|
85
|
+
makeRule("in_addElt", [formula, element, set]),
|
|
86
|
+
getBranches(formulas),
|
|
87
|
+
);
|
|
76
88
|
}
|
|
77
89
|
const inequalities = decomposed[0].map((inner) => exprs.enot(equal(exprs, element, inner)));
|
|
78
90
|
const formulas = isEmptyRest
|
|
79
91
|
? inequalities
|
|
80
92
|
: [exprs.enot(member(exprs, element, decomposed[1])), ...inequalities];
|
|
81
|
-
return
|
|
93
|
+
return makeExtensionNode(literal, "prop", makeRule("notin_addElt", [formula, element, set]), [
|
|
94
|
+
formulas,
|
|
95
|
+
]);
|
|
82
96
|
}
|
|
83
97
|
if (isApp(set, "TLA.set"))
|
|
84
98
|
return isNegated
|
|
85
|
-
?
|
|
99
|
+
? makeExtensionNode(literal, "prop", makeRule("notin_set", [formula, element, set]), [
|
|
86
100
|
set.args.map((inner) => exprs.enot(equal(exprs, element, inner))),
|
|
87
101
|
])
|
|
88
|
-
:
|
|
102
|
+
: makeExtensionNode(
|
|
103
|
+
literal,
|
|
89
104
|
"prop",
|
|
90
105
|
makeRule("in_set", [formula, element, set]),
|
|
91
106
|
getBranches(set.args.map((inner) => equal(exprs, element, inner))),
|
|
92
107
|
);
|
|
93
108
|
if (isNegated && set.kind === "meta")
|
|
94
|
-
return
|
|
109
|
+
return makeInstanceNode(
|
|
110
|
+
literal,
|
|
111
|
+
{ instance: set.args[0] },
|
|
112
|
+
set.args[0],
|
|
113
|
+
exprs.eapp("TLA.set", [element]),
|
|
114
|
+
);
|
|
95
115
|
if (isApp(set, "TLA.SUBSET", 1)) {
|
|
96
116
|
const subset = exprs.eapp("TLA.subseteq", [element, set.args[0]]);
|
|
97
117
|
return isNegated
|
|
98
|
-
?
|
|
118
|
+
? makeExtensionNode(
|
|
119
|
+
literal,
|
|
99
120
|
"prop",
|
|
100
121
|
makeRule("notin_SUBSET", [formula, exprs.enot(subset), element, set.args[0]]),
|
|
101
122
|
[[exprs.enot(subset)]],
|
|
102
123
|
)
|
|
103
|
-
:
|
|
124
|
+
: makeExtensionNode(
|
|
125
|
+
literal,
|
|
126
|
+
"prop",
|
|
127
|
+
makeRule("in_SUBSET", [formula, subset, element, set.args[0]]),
|
|
128
|
+
[[subset]],
|
|
129
|
+
);
|
|
104
130
|
}
|
|
105
131
|
if (isApp(set, "TLA.UNION", 1)) {
|
|
106
132
|
const bound = exprs.newVar();
|
|
@@ -110,27 +136,20 @@ export const getMembershipNodes = (literal: Literal): Item[] | undefined => {
|
|
|
110
136
|
exprs.eand(member(exprs, bound, set.args[0]), member(exprs, element, bound)),
|
|
111
137
|
);
|
|
112
138
|
return isNegated
|
|
113
|
-
?
|
|
139
|
+
? makeExtensionNode(
|
|
140
|
+
literal,
|
|
114
141
|
"arity",
|
|
115
142
|
makeRule("notin_UNION", [formula, exprs.enot(exists), element, set.args[0]]),
|
|
116
143
|
[[exprs.enot(exists)]],
|
|
117
144
|
)
|
|
118
|
-
:
|
|
145
|
+
: makeExtensionNode(
|
|
146
|
+
literal,
|
|
147
|
+
"prop",
|
|
148
|
+
makeRule("in_UNION", [formula, exists, element, set.args[0]]),
|
|
149
|
+
[[exists]],
|
|
150
|
+
);
|
|
119
151
|
}
|
|
120
|
-
const
|
|
121
|
-
string,
|
|
122
|
-
[
|
|
123
|
-
"in_cup" | "in_cap" | "in_setminus",
|
|
124
|
-
"notin_cup" | "notin_cap" | "notin_setminus",
|
|
125
|
-
boolean,
|
|
126
|
-
boolean,
|
|
127
|
-
]
|
|
128
|
-
> = {
|
|
129
|
-
"TLA.cup": ["in_cup", "notin_cup", true, false],
|
|
130
|
-
"TLA.cap": ["in_cap", "notin_cap", false, true],
|
|
131
|
-
"TLA.setminus": ["in_setminus", "notin_setminus", false, true],
|
|
132
|
-
};
|
|
133
|
-
const binarySetRule = set.kind === "app" ? binarySetRules[set.symbol] : undefined;
|
|
152
|
+
const binarySetRule = set.kind === "app" ? BINARY_SET_RULES.get(set.symbol) : undefined;
|
|
134
153
|
if (binarySetRule !== undefined && set.args.length === 2) {
|
|
135
154
|
const first = member(exprs, element, set.args[0]);
|
|
136
155
|
const secondPositive = member(exprs, element, set.args[1]);
|
|
@@ -138,7 +157,8 @@ export const getMembershipNodes = (literal: Literal): Item[] | undefined => {
|
|
|
138
157
|
const second = isMinus !== isNegated ? exprs.enot(secondPositive) : secondPositive;
|
|
139
158
|
const firstLiteral = isNegated ? exprs.enot(first) : first;
|
|
140
159
|
const isSplit = isNegated ? binarySetRule[3] : binarySetRule[2];
|
|
141
|
-
return
|
|
160
|
+
return makeExtensionNode(
|
|
161
|
+
literal,
|
|
142
162
|
"prop",
|
|
143
163
|
makeRule(isNegated ? binarySetRule[1] : binarySetRule[0], [
|
|
144
164
|
formula,
|
|
@@ -156,7 +176,8 @@ export const getMembershipNodes = (literal: Literal): Item[] | undefined => {
|
|
|
156
176
|
const inBase = member(exprs, element, set.args[0]);
|
|
157
177
|
const holds = exprs.substitute([[predicate.args[0], element]], predicate.args[1]);
|
|
158
178
|
return isNegated
|
|
159
|
-
?
|
|
179
|
+
? makeExtensionNode(
|
|
180
|
+
literal,
|
|
160
181
|
"prop",
|
|
161
182
|
makeRule("notin_subsetof", [
|
|
162
183
|
formula,
|
|
@@ -168,7 +189,8 @@ export const getMembershipNodes = (literal: Literal): Item[] | undefined => {
|
|
|
168
189
|
]),
|
|
169
190
|
[[exprs.enot(inBase)], [exprs.enot(holds)]],
|
|
170
191
|
)
|
|
171
|
-
:
|
|
192
|
+
: makeExtensionNode(
|
|
193
|
+
literal,
|
|
172
194
|
"prop",
|
|
173
195
|
makeRule("in_subsetof", [formula, inBase, holds, element, set.args[0], predicate]),
|
|
174
196
|
[[inBase, holds]],
|
|
@@ -186,7 +208,8 @@ export const getMembershipNodes = (literal: Literal): Item[] | undefined => {
|
|
|
186
208
|
),
|
|
187
209
|
);
|
|
188
210
|
const result = isNegated ? exprs.enot(exists) : exists;
|
|
189
|
-
return
|
|
211
|
+
return makeExtensionNode(
|
|
212
|
+
literal,
|
|
190
213
|
{ instance: result },
|
|
191
214
|
makeRule(isNegated ? "notin_setofall" : "in_setofall", [
|
|
192
215
|
formula,
|
|
@@ -207,20 +230,22 @@ export const getSetEqualityNodes = (literal: Literal): Item[] | undefined => {
|
|
|
207
230
|
const formula = literal.formula;
|
|
208
231
|
const isNegated = literal.isNegated;
|
|
209
232
|
const relation = literal.relation;
|
|
210
|
-
const node = (priority: Priority, rule: Rule, branches: Expr[][]) =>
|
|
211
|
-
makeExtensionNode(literal, priority, rule, branches);
|
|
212
233
|
if (relation?.symbol !== "=") return undefined;
|
|
213
234
|
const left = relation.args[0];
|
|
214
235
|
const right = relation.args[1];
|
|
215
236
|
if (!isNegated && isVariable(right, "TLA.emptyset")) {
|
|
216
237
|
const bound = exprs.newVar();
|
|
217
238
|
const empty = exprs.eall(bound, "", exprs.enot(member(exprs, bound, left)));
|
|
218
|
-
return
|
|
239
|
+
return makeExtensionNode(literal, "arity", makeRule("setequalempty", [formula, empty, left]), [
|
|
240
|
+
[empty],
|
|
241
|
+
]);
|
|
219
242
|
}
|
|
220
243
|
if (!isNegated && isVariable(left, "TLA.emptyset")) {
|
|
221
244
|
const bound = exprs.newVar();
|
|
222
245
|
const empty = exprs.eall(bound, "", exprs.enot(member(exprs, bound, right)));
|
|
223
|
-
return
|
|
246
|
+
return makeExtensionNode(literal, "arity", makeRule("setemptyequal", [formula, empty, right]), [
|
|
247
|
+
[empty],
|
|
248
|
+
]);
|
|
224
249
|
}
|
|
225
250
|
if (isConstructor(SET_CONSTRUCTORS, left) || isConstructor(SET_CONSTRUCTORS, right)) {
|
|
226
251
|
const bound = exprs.newVar();
|
|
@@ -230,7 +255,8 @@ export const getSetEqualityNodes = (literal: Literal): Item[] | undefined => {
|
|
|
230
255
|
exprs.eequiv(member(exprs, bound, left), member(exprs, bound, right)),
|
|
231
256
|
);
|
|
232
257
|
const result = isNegated ? exprs.enot(extensional) : extensional;
|
|
233
|
-
return
|
|
258
|
+
return makeExtensionNode(
|
|
259
|
+
literal,
|
|
234
260
|
{ instance: result },
|
|
235
261
|
makeRule(isNegated ? "notsetequal" : "setequal", [formula, result, left, right]),
|
|
236
262
|
[[result]],
|
|
@@ -239,13 +265,10 @@ export const getSetEqualityNodes = (literal: Literal): Item[] | undefined => {
|
|
|
239
265
|
return undefined;
|
|
240
266
|
};
|
|
241
267
|
|
|
242
|
-
// A metavariable in a set, against the disequalities of that set.
|
|
243
268
|
export const getMetaMembershipNodes = (literal: Literal): Item[] | undefined => {
|
|
244
269
|
const exprs = literal.context.exprs;
|
|
245
270
|
const index = literal.context.index;
|
|
246
271
|
const relation = literal.relation;
|
|
247
|
-
const node = (priority: Priority, rule: Rule, branches: Expr[][]) =>
|
|
248
|
-
makeExtensionNode(literal, priority, rule, branches);
|
|
249
272
|
if (relation?.symbol === "TLA.in" && relation.args[0].kind === "meta") {
|
|
250
273
|
const bound = exprs.newVar();
|
|
251
274
|
return index.findDisequalities(relation.args[1]).flatMap((disequality) => {
|
|
@@ -257,7 +280,8 @@ export const getMetaMembershipNodes = (literal: Literal): Item[] | undefined =>
|
|
|
257
280
|
exprs.eequiv(member(exprs, bound, sides[0]), member(exprs, bound, sides[1])),
|
|
258
281
|
),
|
|
259
282
|
);
|
|
260
|
-
return
|
|
283
|
+
return makeExtensionNode(
|
|
284
|
+
literal,
|
|
261
285
|
{ instance: different },
|
|
262
286
|
makeRule("notsetequal", [disequality, different, sides[0], sides[1]]),
|
|
263
287
|
[[different]],
|
|
@@ -272,8 +296,6 @@ export const getSubsetNodes = (literal: Literal): Item[] | undefined => {
|
|
|
272
296
|
const formula = literal.formula;
|
|
273
297
|
const isNegated = literal.isNegated;
|
|
274
298
|
const relation = literal.relation;
|
|
275
|
-
const node = (priority: Priority, rule: Rule, branches: Expr[][]) =>
|
|
276
|
-
makeExtensionNode(literal, priority, rule, branches);
|
|
277
299
|
if (relation?.symbol === "TLA.subseteq") {
|
|
278
300
|
const left = relation.args[0];
|
|
279
301
|
const right = relation.args[1];
|
|
@@ -281,23 +303,30 @@ export const getSubsetNodes = (literal: Literal): Item[] | undefined => {
|
|
|
281
303
|
const first = exprs.eapp("TLA.subseteq", [left.args[0], right]);
|
|
282
304
|
const second = exprs.eapp("TLA.subseteq", [left.args[1], right]);
|
|
283
305
|
return isNegated
|
|
284
|
-
?
|
|
306
|
+
? makeExtensionNode(
|
|
307
|
+
literal,
|
|
285
308
|
"arity",
|
|
286
309
|
makeRule("not_cup_subseteq", [formula, exprs.enot(first), exprs.enot(second)]),
|
|
287
310
|
[[exprs.enot(first)], [exprs.enot(second)]],
|
|
288
311
|
)
|
|
289
|
-
:
|
|
312
|
+
: makeExtensionNode(literal, "arity", makeRule("cup_subseteq", [formula, first, second]), [
|
|
313
|
+
[first, second],
|
|
314
|
+
]);
|
|
290
315
|
}
|
|
291
316
|
if (isApp(right, "TLA.cap", 2)) {
|
|
292
|
-
//
|
|
293
|
-
const
|
|
317
|
+
// Deviation from Zenon: ext_tla.ml builds both subsets from the second set, which is unsound.
|
|
318
|
+
const first = exprs.eapp("TLA.subseteq", [left, right.args[0]]);
|
|
319
|
+
const second = exprs.eapp("TLA.subseteq", [left, right.args[1]]);
|
|
294
320
|
return isNegated
|
|
295
|
-
?
|
|
321
|
+
? makeExtensionNode(
|
|
322
|
+
literal,
|
|
296
323
|
"arity",
|
|
297
|
-
makeRule("not_subseteq_cap", [formula, exprs.enot(
|
|
298
|
-
[[exprs.enot(
|
|
324
|
+
makeRule("not_subseteq_cap", [formula, exprs.enot(first), exprs.enot(second)]),
|
|
325
|
+
[[exprs.enot(first)], [exprs.enot(second)]],
|
|
299
326
|
)
|
|
300
|
-
:
|
|
327
|
+
: makeExtensionNode(literal, "arity", makeRule("subseteq_cap", [formula, first, second]), [
|
|
328
|
+
[first, second],
|
|
329
|
+
]);
|
|
301
330
|
}
|
|
302
331
|
}
|
|
303
332
|
return undefined;
|
|
@@ -1,15 +1,9 @@
|
|
|
1
|
-
// Ported from Zenon's ext_tla.ml, as shipped in tlapm. Copyright 2008 INRIA, see LICENSE.
|
|
2
|
-
//
|
|
3
|
-
// What the rules of the TLA+ extension share: the symbols it knows, a literal taken apart, and the
|
|
4
|
-
// nodes it makes.
|
|
5
|
-
|
|
6
1
|
import { TlaZenonError } from "../../../errors";
|
|
7
2
|
import { isApp, isRelation, type Expr, type Expressions, type RelationExpr } from "../expr";
|
|
8
3
|
import type { Index } from "../index-table";
|
|
9
4
|
import type { Node, Priority } from "../node";
|
|
10
5
|
import { makeRule, type Rule } from "../proof";
|
|
11
6
|
|
|
12
|
-
// A node, or Zenon's Stop: the rules after it don't apply to the formula.
|
|
13
7
|
export type Item = Node | "stop";
|
|
14
8
|
|
|
15
9
|
export const SET_CONSTRUCTORS = [
|
|
@@ -88,8 +82,6 @@ export interface TlaContext {
|
|
|
88
82
|
exprs: Expressions;
|
|
89
83
|
}
|
|
90
84
|
|
|
91
|
-
// A formula that the propositional rules look at: a literal, its atom and, when the atom relates
|
|
92
|
-
// two terms, the atom as a relation.
|
|
93
85
|
export interface Literal {
|
|
94
86
|
context: TlaContext;
|
|
95
87
|
formula: Expr;
|
|
@@ -1,8 +1,3 @@
|
|
|
1
|
-
// Ported from Zenon's ext_tla.ml, as shipped in tlapm. Copyright 2008 INRIA, see LICENSE.
|
|
2
|
-
//
|
|
3
|
-
// The TLA+ extension: rules for set theory, functions, records, tuples, CHOOSE, IF and CASE, and
|
|
4
|
-
// rewriting a subterm with an equality on the branch.
|
|
5
|
-
|
|
6
1
|
import {
|
|
7
2
|
FALSE,
|
|
8
3
|
isApp,
|
|
@@ -12,9 +7,9 @@ import {
|
|
|
12
7
|
type NegatedRelationExpr,
|
|
13
8
|
type RelationExpr,
|
|
14
9
|
} from "../expr";
|
|
15
|
-
import type { Node
|
|
10
|
+
import type { Node } from "../node";
|
|
16
11
|
import type { Phrase } from "../parse";
|
|
17
|
-
import { makeRule
|
|
12
|
+
import { makeRule } from "../proof";
|
|
18
13
|
import { getFunctionNodes, getFunctionSetNodes } from "./functions";
|
|
19
14
|
import { getRecordNodes, getTupleNodes } from "./records";
|
|
20
15
|
import { getRewriteNodes } from "./rewrites";
|
|
@@ -50,7 +45,6 @@ const OTHER_SYMBOLS = [
|
|
|
50
45
|
"TLA.box",
|
|
51
46
|
];
|
|
52
47
|
|
|
53
|
-
// The symbols that hypotheses can't define, as Zenon's predef with the tla extension.
|
|
54
48
|
export const PREDEFINED_SYMBOLS = [
|
|
55
49
|
"=",
|
|
56
50
|
...SET_CONSTRUCTORS,
|
|
@@ -58,7 +52,7 @@ export const PREDEFINED_SYMBOLS = [
|
|
|
58
52
|
...OTHER_SYMBOLS,
|
|
59
53
|
];
|
|
60
54
|
|
|
61
|
-
const
|
|
55
|
+
const makeDefinition = (
|
|
62
56
|
exprs: Expressions,
|
|
63
57
|
name: string,
|
|
64
58
|
symbol: string,
|
|
@@ -75,13 +69,12 @@ const definition = (
|
|
|
75
69
|
},
|
|
76
70
|
});
|
|
77
71
|
|
|
78
|
-
// Zenon's built_in_defs. Expressions belong to one run of the prover, so each run builds them.
|
|
79
72
|
export const getBuiltInDefinitions = (exprs: Expressions): Phrase[] => {
|
|
80
73
|
const bound = exprs.evar("x");
|
|
81
|
-
const
|
|
74
|
+
const membership = exprs.eapp("TLA.in", [bound, exprs.evar("S")]);
|
|
82
75
|
const holds = exprs.eapp("P", [bound]);
|
|
83
76
|
return [
|
|
84
|
-
|
|
77
|
+
makeDefinition(
|
|
85
78
|
exprs,
|
|
86
79
|
"subset_def",
|
|
87
80
|
"TLA.subseteq",
|
|
@@ -91,28 +84,28 @@ export const getBuiltInDefinitions = (exprs: Expressions): Phrase[] => {
|
|
|
91
84
|
exprs.elam(bound, "", exprs.eapp("TLA.in", [bound, exprs.evar("B")])),
|
|
92
85
|
]),
|
|
93
86
|
),
|
|
94
|
-
|
|
87
|
+
makeDefinition(
|
|
95
88
|
exprs,
|
|
96
89
|
"bAll_def",
|
|
97
90
|
"TLA.bAll",
|
|
98
91
|
["S", "P"],
|
|
99
|
-
exprs.eall(bound, "", exprs.eimply(
|
|
92
|
+
exprs.eall(bound, "", exprs.eimply(membership, holds)),
|
|
100
93
|
),
|
|
101
|
-
|
|
94
|
+
makeDefinition(
|
|
102
95
|
exprs,
|
|
103
96
|
"bEx_def",
|
|
104
97
|
"TLA.bEx",
|
|
105
98
|
["S", "P"],
|
|
106
|
-
exprs.eex(bound, "", exprs.eand(
|
|
99
|
+
exprs.eex(bound, "", exprs.eand(membership, holds)),
|
|
107
100
|
),
|
|
108
|
-
|
|
101
|
+
makeDefinition(
|
|
109
102
|
exprs,
|
|
110
103
|
"bChoose_def",
|
|
111
104
|
"TLA.bChoice",
|
|
112
105
|
["S", "P"],
|
|
113
|
-
exprs.etau(bound, "", exprs.eand(
|
|
106
|
+
exprs.etau(bound, "", exprs.eand(membership, holds)),
|
|
114
107
|
),
|
|
115
|
-
|
|
108
|
+
makeDefinition(
|
|
116
109
|
exprs,
|
|
117
110
|
"prod_def",
|
|
118
111
|
"TLA.prod",
|
|
@@ -122,7 +115,6 @@ export const getBuiltInDefinitions = (exprs: Expressions): Phrase[] => {
|
|
|
122
115
|
];
|
|
123
116
|
};
|
|
124
117
|
|
|
125
|
-
// The elements of a set given by enumeration, and whether it may hold more.
|
|
126
118
|
const getSetValues = (set: Expr): [Expr[], boolean] => {
|
|
127
119
|
if (isVariable(set, "TLA.emptyset")) return [[], false];
|
|
128
120
|
if (isApp(set, "TLA.upair", 2)) return [set.args, false];
|
|
@@ -145,34 +137,45 @@ const getBooleanNodes = (literal: Literal): Item[] | undefined => {
|
|
|
145
137
|
const isNegated = literal.isNegated;
|
|
146
138
|
const atom = literal.atom;
|
|
147
139
|
const relation = literal.relation;
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
const instance = (priority: Priority, quantified: Expr, term: Expr) =>
|
|
151
|
-
makeInstanceNode(literal, priority, quantified, term);
|
|
152
|
-
if (atom.kind === "meta") return instance("arity", atom.args[0], isNegated ? TRUE : FALSE);
|
|
140
|
+
if (atom.kind === "meta")
|
|
141
|
+
return makeInstanceNode(literal, "arity", atom.args[0], isNegated ? TRUE : FALSE);
|
|
153
142
|
if (relation?.symbol !== "=") return undefined;
|
|
154
143
|
const left = relation.args[0];
|
|
155
144
|
const right = relation.args[1];
|
|
156
145
|
if (right.kind === "true")
|
|
157
146
|
return isNegated
|
|
158
|
-
?
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
147
|
+
? makeExtensionNode(
|
|
148
|
+
literal,
|
|
149
|
+
"prop",
|
|
150
|
+
makeRule("noteq_x_true", [formula, exprs.enot(left), left]),
|
|
151
|
+
[[exprs.enot(left)]],
|
|
152
|
+
)
|
|
153
|
+
: makeExtensionNode(literal, "prop", makeRule("eq_x_true", [formula, left, left]), [[left]]);
|
|
162
154
|
if (left.kind === "true")
|
|
163
155
|
return isNegated
|
|
164
|
-
?
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
156
|
+
? makeExtensionNode(
|
|
157
|
+
literal,
|
|
158
|
+
"prop",
|
|
159
|
+
makeRule("noteq_true_x", [formula, exprs.enot(right), right]),
|
|
160
|
+
[[exprs.enot(right)]],
|
|
161
|
+
)
|
|
162
|
+
: makeExtensionNode(literal, "prop", makeRule("eq_true_x", [formula, right, right]), [
|
|
163
|
+
[right],
|
|
164
|
+
]);
|
|
168
165
|
if (!isNegated && right.kind === "false")
|
|
169
|
-
return
|
|
170
|
-
|
|
171
|
-
|
|
166
|
+
return makeExtensionNode(
|
|
167
|
+
literal,
|
|
168
|
+
"prop",
|
|
169
|
+
makeRule("eq_x_false", [formula, exprs.enot(left), left]),
|
|
170
|
+
[[exprs.enot(left)]],
|
|
171
|
+
);
|
|
172
172
|
if (!isNegated && left.kind === "false")
|
|
173
|
-
return
|
|
174
|
-
|
|
175
|
-
|
|
173
|
+
return makeExtensionNode(
|
|
174
|
+
literal,
|
|
175
|
+
"prop",
|
|
176
|
+
makeRule("eq_false_x", [formula, exprs.enot(right), right]),
|
|
177
|
+
[[exprs.enot(right)]],
|
|
178
|
+
);
|
|
176
179
|
return undefined;
|
|
177
180
|
};
|
|
178
181
|
|
|
@@ -182,8 +185,6 @@ const getChoiceNodes = (literal: Literal): Item[] | undefined => {
|
|
|
182
185
|
const goalness = literal.goalness;
|
|
183
186
|
const isNegated = literal.isNegated;
|
|
184
187
|
const relation = literal.relation;
|
|
185
|
-
const node = (priority: Priority, rule: Rule, branches: Expr[][]) =>
|
|
186
|
-
makeExtensionNode(literal, priority, rule, branches);
|
|
187
188
|
if (relation === undefined) return undefined;
|
|
188
189
|
const left = relation.args[0];
|
|
189
190
|
const right = relation.args[1];
|
|
@@ -200,7 +201,8 @@ const getChoiceNodes = (literal: Literal): Item[] | undefined => {
|
|
|
200
201
|
const leftBody = exprs.substitute([[left.args[0], bound]], left.args[1]);
|
|
201
202
|
const rightBody = exprs.substitute([[right.args[0], bound]], right.args[1]);
|
|
202
203
|
const differ = exprs.eex(bound, left.symbol, exprs.eapp("$notequiv", [leftBody, rightBody]));
|
|
203
|
-
return
|
|
204
|
+
return makeExtensionNode(
|
|
205
|
+
literal,
|
|
204
206
|
{ instance: differ },
|
|
205
207
|
makeRule("choose_diff_choose", [
|
|
206
208
|
formula,
|
|
@@ -212,7 +214,9 @@ const getChoiceNodes = (literal: Literal): Item[] | undefined => {
|
|
|
212
214
|
);
|
|
213
215
|
}
|
|
214
216
|
if (!isNegated && relation.symbol === "$notequiv")
|
|
215
|
-
return
|
|
217
|
+
return makeExtensionNode(literal, "arity", makeRule("notequivdef", []), [
|
|
218
|
+
[exprs.enot(exprs.eequiv(left, right))],
|
|
219
|
+
]);
|
|
216
220
|
const choice = right.kind === "tau" ? right : left.kind === "tau" ? left : undefined;
|
|
217
221
|
if (isNegated && isEquality && choice !== undefined) {
|
|
218
222
|
const term = right.kind === "tau" ? left : right;
|
|
@@ -238,7 +242,6 @@ const getChoiceNodes = (literal: Literal): Item[] | undefined => {
|
|
|
238
242
|
return undefined;
|
|
239
243
|
};
|
|
240
244
|
|
|
241
|
-
// The bounded quantifier over an enumerated set in \A x : x \in S => P or ~\E x : x \in S /\ P.
|
|
242
245
|
const getEnumeratedQuantifier = (formula: Expr) => {
|
|
243
246
|
const isEnumerated = (set: Expr) =>
|
|
244
247
|
isVariable(set, "TLA.emptyset") ||
|
|
@@ -266,14 +269,11 @@ const getEnumeratedQuantifier = (formula: Expr) => {
|
|
|
266
269
|
};
|
|
267
270
|
|
|
268
271
|
const getEnumeratedNodes = (literal: Literal): Item[] | undefined => {
|
|
269
|
-
const
|
|
270
|
-
const instance = (priority: Priority, quantified: Expr, term: Expr) =>
|
|
271
|
-
makeInstanceNode(literal, priority, quantified, term);
|
|
272
|
-
const enumerated = getEnumeratedQuantifier(formula);
|
|
272
|
+
const enumerated = getEnumeratedQuantifier(literal.formula);
|
|
273
273
|
if (enumerated !== undefined) {
|
|
274
274
|
const values = getSetValues(enumerated.set);
|
|
275
275
|
const nodes: Item[] = values[0].flatMap((value) =>
|
|
276
|
-
|
|
276
|
+
makeInstanceNode(literal, "arity", enumerated.quantified, value),
|
|
277
277
|
);
|
|
278
278
|
return values[1] ? nodes : [...nodes, "stop"];
|
|
279
279
|
}
|
|
@@ -285,19 +285,21 @@ const getNaturalNodes = (literal: Literal): Item[] | undefined => {
|
|
|
285
285
|
const formula = literal.formula;
|
|
286
286
|
const isNegated = literal.isNegated;
|
|
287
287
|
const relation = literal.relation;
|
|
288
|
-
const node = (priority: Priority, rule: Rule, branches: Expr[][]) =>
|
|
289
|
-
makeExtensionNode(literal, priority, rule, branches);
|
|
290
|
-
const instance = (priority: Priority, quantified: Expr, term: Expr) =>
|
|
291
|
-
makeInstanceNode(literal, priority, quantified, term);
|
|
292
288
|
if (isNegated && relation?.symbol === "TLA.in" && isVariable(relation.args[1], "arith.N")) {
|
|
293
289
|
const left = relation.args[0];
|
|
294
|
-
if (isVariable(left, "0"))
|
|
290
|
+
if (isVariable(left, "0"))
|
|
291
|
+
return makeExtensionNode(literal, "prop", makeRule("in_nat_0", [formula]), []);
|
|
295
292
|
if (isApp(left, "TLA.fapply", 2) && isVariable(left.args[0], "TLA.Succ")) {
|
|
296
293
|
const previous = exprs.enot(member(exprs, left.args[1], exprs.evar("arith.N")));
|
|
297
|
-
return
|
|
294
|
+
return makeExtensionNode(
|
|
295
|
+
literal,
|
|
296
|
+
"prop",
|
|
297
|
+
makeRule("in_nat_succ", [formula, previous, left.args[1]]),
|
|
298
|
+
[[previous]],
|
|
299
|
+
);
|
|
298
300
|
}
|
|
299
301
|
if (left.kind === "meta")
|
|
300
|
-
return
|
|
302
|
+
return makeInstanceNode(literal, { instance: left.args[0] }, left.args[0], exprs.evar("0"));
|
|
301
303
|
}
|
|
302
304
|
return undefined;
|
|
303
305
|
};
|
|
@@ -326,8 +328,6 @@ const getPropNodes = (context: TlaContext, formula: Expr, goalness: number): Ite
|
|
|
326
328
|
);
|
|
327
329
|
};
|
|
328
330
|
|
|
329
|
-
// Zenon's newnodes_inst_bounded: instantiates \A x \in S : P and ~\E x \in S : P with the terms
|
|
330
|
-
// known to be in S.
|
|
331
331
|
const getBoundedInstances = (context: TlaContext, formula: Expr, goalness: number): Node[] => {
|
|
332
332
|
const exprs = context.exprs;
|
|
333
333
|
const index = context.index;
|
|
@@ -408,14 +408,13 @@ const getBoundedInstances = (context: TlaContext, formula: Expr, goalness: numbe
|
|
|
408
408
|
|
|
409
409
|
const makePropositionEqualityNode = (
|
|
410
410
|
exprs: Expressions,
|
|
411
|
-
|
|
411
|
+
isNegated: boolean,
|
|
412
|
+
isLeft: boolean,
|
|
412
413
|
formula: Expr,
|
|
413
414
|
left: Expr,
|
|
414
415
|
right: Expr,
|
|
415
416
|
goalness: number,
|
|
416
417
|
): Node => {
|
|
417
|
-
const isNegated = name === "np_eq_l" || name === "np_eq_r";
|
|
418
|
-
const isLeft = name === "p_eq_l" || name === "np_eq_l";
|
|
419
418
|
const proposition = isNegated && formula.kind === "not" ? formula.args[0] : formula;
|
|
420
419
|
const equality = equal(exprs, left, right);
|
|
421
420
|
const differ = exprs.enot(equal(exprs, proposition, isLeft ? left : right));
|
|
@@ -424,7 +423,7 @@ const makePropositionEqualityNode = (
|
|
|
424
423
|
return {
|
|
425
424
|
conclusions: [formula, equality],
|
|
426
425
|
rule: makeRule(
|
|
427
|
-
|
|
426
|
+
isNegated ? (isLeft ? "np_eq_l" : "np_eq_r") : isLeft ? "p_eq_l" : "p_eq_r",
|
|
428
427
|
isNegated
|
|
429
428
|
? [formula, equality, differ, rest, proposition, left, right]
|
|
430
429
|
: [formula, equality, differ, other, formula, left, right],
|
|
@@ -444,7 +443,8 @@ const getPropositionEqualityNodes = (context: TlaContext, formula: Expr, goalnes
|
|
|
444
443
|
const make = (isLeft: boolean) => (entry: [RelationExpr, number]) =>
|
|
445
444
|
makePropositionEqualityNode(
|
|
446
445
|
exprs,
|
|
447
|
-
isNegated
|
|
446
|
+
isNegated,
|
|
447
|
+
isLeft,
|
|
448
448
|
formula,
|
|
449
449
|
entry[0].args[0],
|
|
450
450
|
entry[0].args[1],
|
|
@@ -469,7 +469,8 @@ const getEqualityPropositionNodes = (
|
|
|
469
469
|
const make = (isNegated: boolean) => (entry: [Expr, number]) =>
|
|
470
470
|
makePropositionEqualityNode(
|
|
471
471
|
exprs,
|
|
472
|
-
isNegated
|
|
472
|
+
isNegated,
|
|
473
|
+
isLeft,
|
|
473
474
|
entry[0],
|
|
474
475
|
formula.args[0],
|
|
475
476
|
formula.args[1],
|
|
@@ -491,8 +492,7 @@ export const getExtensionNodes = (
|
|
|
491
492
|
formula: Expr,
|
|
492
493
|
goalness: number,
|
|
493
494
|
): ExtensionNodes => {
|
|
494
|
-
// OCaml evaluates the operands of @ right to left, so the last rules run first
|
|
495
|
-
// decides the names of fresh variables.
|
|
495
|
+
// OCaml evaluates the operands of @ right to left, so the last rules run first, which decides the names of fresh variables.
|
|
496
496
|
const bounded = getBoundedInstances(context, formula, goalness);
|
|
497
497
|
const right = getEqualityPropositionNodes(context, formula, false);
|
|
498
498
|
const left = getEqualityPropositionNodes(context, formula, true);
|