tla-ts 0.0.9 → 0.0.10-dev.63a6693bd
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 +29 -1
- package/dist/compile.cjs +23 -0
- package/dist/compile.js +23 -0
- package/dist/deciders.cjs +29 -29
- package/dist/deciders.js +42 -42
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +106 -10
- package/dist/index.d.ts +106 -10
- package/dist/index.js +1 -1
- package/dist/parallel-worker.cjs +1 -1
- package/dist/parallel-worker.js +1 -1
- package/dist/prove-worker.cjs +1 -1
- package/dist/prove-worker.js +1 -1
- package/dist/prove.cjs +117 -37
- package/dist/prove.js +116 -36
- package/dist/run.cjs +143 -31
- package/dist/run.js +143 -31
- package/dist/tlapm.cjs +2 -2
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +129 -104
- package/dist/transfer.js +129 -104
- package/dist/worker.cjs +7 -7
- package/dist/worker.js +7 -7
- package/package.json +3 -1
- package/src/ast.ts +48 -62
- package/src/bags.ts +99 -102
- package/src/builtins.ts +28 -75
- package/src/bundled-modules.ts +1 -8
- package/src/check-failure.ts +116 -0
- package/src/check-trace.ts +282 -0
- package/src/check.ts +599 -754
- package/src/cli/options.ts +12 -32
- package/src/cli/run.ts +0 -2
- package/src/cli/runtime-invariants.ts +136 -0
- package/src/cli/shared.ts +19 -12
- package/src/cli/tlapm.ts +14 -25
- package/src/cli/tlc-arguments.ts +652 -0
- package/src/cli/tlc-output.ts +687 -0
- package/src/cli/tlc-usage.ts +361 -0
- package/src/cli/tlc.ts +309 -658
- package/src/cli/typescript.ts +23 -0
- package/src/cli/xml-exporter.ts +27 -49
- package/src/cli.ts +0 -1
- package/src/codegen.ts +196 -74
- package/src/config.ts +140 -109
- package/src/coverage.ts +830 -0
- package/src/dependencies.ts +14 -53
- package/src/dfid.ts +618 -0
- package/src/environment-config.ts +315 -0
- package/src/environment.ts +169 -335
- package/src/errors.ts +71 -55
- package/src/evaluate.ts +598 -340
- package/src/exit-codes.ts +37 -3
- package/src/fingerprints.ts +75 -11
- package/src/index.ts +3 -0
- package/src/instances.ts +126 -21
- package/src/java-hash.ts +7 -0
- package/src/java-overrides.ts +4 -19
- package/src/json-reader.ts +455 -0
- package/src/json.ts +252 -139
- package/src/levels.ts +46 -58
- package/src/lexer.ts +80 -100
- package/src/liveness-checker.ts +103 -153
- package/src/liveness.ts +150 -109
- package/src/obligations/action.ts +8 -39
- package/src/obligations/anonymize.ts +88 -82
- package/src/obligations/equality.ts +1 -1
- package/src/obligations/expression.ts +20 -21
- package/src/obligations/format.ts +1 -9
- package/src/obligations/generate.ts +46 -49
- package/src/obligations/index.ts +2 -13
- package/src/obligations/levels.ts +4 -8
- package/src/obligations/module.ts +28 -53
- package/src/obligations/normalize.ts +7 -25
- package/src/obligations/operators.ts +1 -2
- package/src/obligations/pragma.ts +1 -10
- package/src/obligations/printer.ts +47 -46
- package/src/obligations/proof.ts +1 -5
- package/src/obligations/regroup.ts +1 -4
- package/src/obligations/simplify.ts +42 -58
- package/src/obligations/source.ts +48 -78
- package/src/obligations/subexpression.ts +5 -11
- package/src/obligations/substitution.ts +1 -3
- package/src/obligations/temporal.ts +13 -19
- package/src/obligations/tuples.ts +3 -9
- package/src/parallel-worker.ts +30 -60
- package/src/parallel.ts +57 -71
- package/src/parser.ts +584 -316
- 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 +3 -7
- package/src/prover/first-order.ts +0 -11
- package/src/prover/isabelle/decide.ts +0 -6
- package/src/prover/isabelle/encode.ts +11 -23
- package/src/prover/isabelle/isar/inner-syntax.ts +114 -115
- package/src/prover/isabelle/isar/method.ts +29 -53
- package/src/prover/isabelle/isar/proof.ts +1 -10
- package/src/prover/isabelle/isar/statement.ts +1 -6
- package/src/prover/isabelle/isar/theory.ts +26 -36
- package/src/prover/isabelle/isar/type-check.ts +17 -31
- package/src/prover/isabelle/provers/blast/blast.ts +17 -104
- package/src/prover/isabelle/provers/blast/branch.ts +1 -32
- package/src/prover/isabelle/provers/blast/prove.ts +1 -35
- package/src/prover/isabelle/provers/blast/rules.ts +6 -44
- package/src/prover/isabelle/provers/blast/state.ts +2 -28
- package/src/prover/isabelle/provers/blast/term.ts +9 -36
- package/src/prover/isabelle/provers/clasimp.ts +1 -13
- package/src/prover/isabelle/provers/classical.ts +14 -42
- package/src/prover/isabelle/provers/hypsubst.ts +28 -51
- package/src/prover/isabelle/pure/bicompose.ts +25 -38
- package/src/prover/isabelle/pure/consts.ts +1 -7
- package/src/prover/isabelle/pure/conv.ts +3 -17
- package/src/prover/isabelle/pure/drule.ts +33 -42
- package/src/prover/isabelle/pure/envir.ts +3 -52
- package/src/prover/isabelle/pure/goal.ts +1 -7
- package/src/prover/isabelle/pure/interrupt.ts +0 -5
- package/src/prover/isabelle/pure/list.ts +0 -3
- package/src/prover/isabelle/pure/logic.ts +2 -15
- package/src/prover/isabelle/pure/name.ts +2 -9
- package/src/prover/isabelle/pure/net.ts +3 -59
- package/src/prover/isabelle/pure/object-logic.ts +3 -10
- package/src/prover/isabelle/pure/pattern.ts +2 -19
- package/src/prover/isabelle/pure/raw-simplifier.ts +17 -62
- package/src/prover/isabelle/pure/rewriter.ts +31 -67
- package/src/prover/isabelle/pure/search.ts +3 -10
- package/src/prover/isabelle/pure/seq.ts +1 -10
- package/src/prover/isabelle/pure/simplifier.ts +4 -12
- package/src/prover/isabelle/pure/table.ts +3 -32
- package/src/prover/isabelle/pure/tactic.ts +12 -22
- package/src/prover/isabelle/pure/tactical.ts +48 -47
- package/src/prover/isabelle/pure/term-ord.ts +2 -6
- package/src/prover/isabelle/pure/term.ts +2 -43
- package/src/prover/isabelle/pure/thm.ts +27 -47
- package/src/prover/isabelle/pure/type.ts +2 -15
- package/src/prover/isabelle/pure/unify.ts +20 -30
- package/src/prover/isabelle/pure/variable.ts +3 -7
- package/src/prover/isabelle/tla/classical-setup.ts +17 -24
- package/src/prover/isabelle/tla/context.ts +15 -18
- package/src/prover/isabelle/tla/logic.ts +14 -32
- package/src/prover/isabelle/tla/simpdata.ts +46 -43
- package/src/prover/isabelle/tools/intuitionistic.ts +1 -10
- package/src/prover/ocaml.ts +0 -6
- package/src/prover/prep/action.ts +14 -54
- package/src/prover/prep/enabled-axioms.ts +12 -19
- 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 +33 -39
- package/src/prover/prep/normalize.ts +4 -28
- package/src/prover/prove-worker.ts +0 -2
- package/src/prover/prove.ts +87 -100
- package/src/prover/ptl/decide.ts +7 -12
- package/src/prover/ptl/encode.ts +14 -36
- package/src/prover/ptl/sat.ts +24 -32
- package/src/prover/ptl/tableau.ts +12 -26
- package/src/prover/smt/axioms.ts +0 -7
- package/src/prover/smt/context.ts +20 -28
- package/src/prover/smt/data.ts +433 -424
- package/src/prover/smt/encode.ts +43 -52
- package/src/prover/smt/extensionality.ts +0 -10
- package/src/prover/smt/flatten.ts +3 -22
- package/src/prover/smt/format.ts +5 -10
- package/src/prover/smt/instances.ts +0 -10
- package/src/prover/smt/rewrite.ts +663 -667
- package/src/prover/smt/solver/act-cache.ts +0 -15
- package/src/prover/smt/solver/arith-rewriter.ts +3 -48
- package/src/prover/smt/solver/array.ts +1 -3
- package/src/prover/smt/solver/asserted-formulas.ts +1 -43
- package/src/prover/smt/solver/ast-lt.ts +1 -11
- package/src/prover/smt/solver/ast-util.ts +1 -6
- package/src/prover/smt/solver/ast.ts +1 -165
- package/src/prover/smt/solver/auf-solver.ts +8 -44
- package/src/prover/smt/solver/case-split-queue.ts +1 -9
- package/src/prover/smt/solver/cg-table.ts +1 -18
- package/src/prover/smt/solver/clause.ts +1 -27
- package/src/prover/smt/solver/conflict-resolution.ts +0 -9
- package/src/prover/smt/solver/context.ts +7 -64
- package/src/prover/smt/solver/ctx-simplify.ts +14 -41
- package/src/prover/smt/solver/der.ts +2 -21
- package/src/prover/smt/solver/dyn-ack.ts +1 -11
- package/src/prover/smt/solver/e-matching.ts +4 -35
- package/src/prover/smt/solver/enode.ts +1 -21
- package/src/prover/smt/solver/expr-ref.ts +1 -5
- package/src/prover/smt/solver/expr-safe-replace.ts +1 -6
- package/src/prover/smt/solver/fingerprints.ts +1 -12
- package/src/prover/smt/solver/flat-literals.ts +1 -9
- package/src/prover/smt/solver/goal.ts +2 -14
- package/src/prover/smt/solver/hash.ts +0 -8
- package/src/prover/smt/solver/hashtable.ts +1 -12
- package/src/prover/smt/solver/internalizer.ts +7 -100
- package/src/prover/smt/solver/lbool.ts +1 -2
- package/src/prover/smt/solver/literal.ts +0 -3
- package/src/prover/smt/solver/lp/bound-propagator.ts +8 -26
- package/src/prover/smt/solver/lp/constraints.ts +2 -8
- package/src/prover/smt/solver/lp/containers.ts +12 -30
- package/src/prover/smt/solver/lp/core-solver.ts +10 -31
- package/src/prover/smt/solver/lp/cross-nested.ts +6 -20
- package/src/prover/smt/solver/lp/dep-intervals.ts +7 -22
- package/src/prover/smt/solver/lp/dependency.ts +1 -4
- package/src/prover/smt/solver/lp/dioph-eq.ts +9 -102
- package/src/prover/smt/solver/lp/explanation.ts +1 -6
- package/src/prover/smt/solver/lp/gomory.ts +9 -22
- package/src/prover/smt/solver/lp/hnf-cutter.ts +17 -23
- package/src/prover/smt/solver/lp/hnf.ts +11 -26
- package/src/prover/smt/solver/lp/int-cube.ts +15 -36
- package/src/prover/smt/solver/lp/int-solver.ts +4 -34
- package/src/prover/smt/solver/lp/lar-solver.ts +32 -81
- package/src/prover/smt/solver/lp/lar-term.ts +1 -5
- package/src/prover/smt/solver/lp/lp-settings.ts +1 -14
- package/src/prover/smt/solver/lp/maximize-term.ts +20 -45
- package/src/prover/smt/solver/lp/nex-creator.ts +5 -28
- package/src/prover/smt/solver/lp/nex.ts +1 -6
- package/src/prover/smt/solver/lp/nla-backoff.ts +1 -4
- package/src/prover/smt/solver/lp/nla-basics.ts +5 -30
- package/src/prover/smt/solver/lp/nla-core.ts +36 -135
- package/src/prover/smt/solver/lp/nla-divisions.ts +32 -42
- package/src/prover/smt/solver/lp/nla-emonics.ts +4 -21
- package/src/prover/smt/solver/lp/nla-factorization.ts +1 -4
- package/src/prover/smt/solver/lp/nla-grobner.ts +15 -69
- package/src/prover/smt/solver/lp/nla-horner.ts +3 -11
- package/src/prover/smt/solver/lp/nla-intervals.ts +2 -12
- package/src/prover/smt/solver/lp/nla-monomial-bounds.ts +16 -41
- package/src/prover/smt/solver/lp/nla-monotone.ts +2 -6
- package/src/prover/smt/solver/lp/nla-order.ts +2 -13
- package/src/prover/smt/solver/lp/nla-patcher.ts +4 -7
- package/src/prover/smt/solver/lp/nla-tangents.ts +1 -9
- package/src/prover/smt/solver/lp/nla-throttle.ts +1 -6
- package/src/prover/smt/solver/lp/nla-types.ts +1 -11
- package/src/prover/smt/solver/lp/nla-var-eqs.ts +4 -25
- package/src/prover/smt/solver/lp/nra-solver.ts +5 -52
- package/src/prover/smt/solver/lp/numeric-pair.ts +1 -4
- package/src/prover/smt/solver/lp/pdd-interval.ts +1 -3
- package/src/prover/smt/solver/lp/pdd-simplifier.ts +2 -14
- package/src/prover/smt/solver/lp/pdd-solver.ts +4 -33
- package/src/prover/smt/solver/lp/pdd.ts +7 -70
- package/src/prover/smt/solver/lp/random-updater.ts +1 -8
- package/src/prover/smt/solver/lp/static-matrix.ts +9 -19
- package/src/prover/smt/solver/lp/union-find.ts +1 -6
- package/src/prover/smt/solver/mam-compiler.ts +18 -58
- package/src/prover/smt/solver/mam-interpreter.ts +1 -21
- package/src/prover/smt/solver/maximize-ac-sharing.ts +2 -17
- package/src/prover/smt/solver/model-checker.ts +3 -37
- package/src/prover/smt/solver/model-evaluator.ts +3 -29
- package/src/prover/smt/solver/model-finder.ts +15 -32
- package/src/prover/smt/solver/model-generator.ts +1 -12
- package/src/prover/smt/solver/model-macro-solver.ts +23 -88
- package/src/prover/smt/solver/nlsat/algebraic.ts +63 -159
- package/src/prover/smt/solver/nlsat/atoms.ts +25 -23
- package/src/prover/smt/solver/nlsat/evaluator.ts +17 -22
- package/src/prover/smt/solver/nlsat/explain.ts +10 -69
- package/src/prover/smt/solver/nlsat/interval-set.ts +9 -50
- package/src/prover/smt/solver/nlsat/levelwise.ts +49 -135
- package/src/prover/smt/solver/nlsat/mpbq.ts +3 -14
- package/src/prover/smt/solver/nlsat/polynomial.ts +29 -159
- package/src/prover/smt/solver/nlsat/solver.ts +18 -90
- package/src/prover/smt/solver/nlsat/types.ts +1 -8
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +2 -45
- package/src/prover/smt/solver/nlsat/upolynomial.ts +11 -92
- package/src/prover/smt/solver/nnf.ts +3 -38
- package/src/prover/smt/solver/pattern-inference.ts +2 -15
- package/src/prover/smt/solver/poly-rewriter.ts +3 -23
- package/src/prover/smt/solver/propagate-values.ts +1 -10
- package/src/prover/smt/solver/proto-model.ts +3 -52
- package/src/prover/smt/solver/pull-quant.ts +1 -12
- package/src/prover/smt/solver/qe-lite-der.ts +1 -29
- package/src/prover/smt/solver/qe-lite-fm.ts +2 -25
- package/src/prover/smt/solver/qe-lite.ts +3 -33
- package/src/prover/smt/solver/qi-queue.ts +1 -16
- package/src/prover/smt/solver/quant-tactics.ts +5 -22
- package/src/prover/smt/solver/quantifier-analyzer.ts +27 -47
- package/src/prover/smt/solver/quantifier-manager.ts +2 -13
- package/src/prover/smt/solver/random-gen.ts +1 -2
- package/src/prover/smt/solver/rational.ts +1 -8
- package/src/prover/smt/solver/ref-vector.ts +1 -6
- package/src/prover/smt/solver/relevancy.ts +2 -15
- package/src/prover/smt/solver/rewriter-tpl.ts +3 -147
- package/src/prover/smt/solver/rewriter.ts +3 -85
- package/src/prover/smt/solver/rlimit.ts +2 -20
- package/src/prover/smt/solver/smtlib-parser.ts +80 -131
- package/src/prover/smt/solver/solver.ts +23 -34
- package/src/prover/smt/solver/sort.ts +1 -5
- package/src/prover/smt/solver/sticky-generations.ts +0 -5
- package/src/prover/smt/solver/theory-lra-axioms.ts +3 -24
- package/src/prover/smt/solver/theory-lra-bounds.ts +1 -7
- package/src/prover/smt/solver/theory-lra-final-check.ts +4 -22
- package/src/prover/smt/solver/theory-lra-internalize.ts +6 -43
- package/src/prover/smt/solver/theory-lra-model.ts +4 -19
- package/src/prover/smt/solver/theory-lra-propagate.ts +1 -15
- package/src/prover/smt/solver/theory-lra-state.ts +3 -8
- package/src/prover/smt/solver/theory-lra.ts +1 -8
- package/src/prover/smt/solver/var-subst.ts +2 -26
- package/src/prover/smt/table.ts +0 -8
- package/src/prover/tlapm/cache.ts +45 -40
- package/src/prover/tlapm/ocaml-marshal.ts +19 -21
- package/src/prover/tlapm/tlapm.ts +21 -20
- package/src/prover/verdict.ts +7 -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 +0 -12
- package/src/prover/zenon/encode.ts +1 -8
- package/src/prover/zenon/eqrel.ts +2 -13
- package/src/prover/zenon/equality-rules.ts +0 -4
- package/src/prover/zenon/expr.ts +8 -26
- package/src/prover/zenon/index-table.ts +26 -57
- package/src/prover/zenon/isar-case.ts +9 -19
- package/src/prover/zenon/isar.ts +36 -64
- package/src/prover/zenon/limits.ts +0 -4
- package/src/prover/zenon/llproof.ts +2 -20
- package/src/prover/zenon/mltoll.ts +66 -104
- package/src/prover/zenon/node.ts +1 -11
- package/src/prover/zenon/ocaml.ts +1 -17
- package/src/prover/zenon/parse.ts +4 -12
- package/src/prover/zenon/phrase.ts +1 -11
- package/src/prover/zenon/proof.ts +0 -9
- package/src/prover/zenon/propositional-rules.ts +0 -5
- package/src/prover/zenon/rules.ts +2 -6
- package/src/prover/zenon/search.ts +5 -31
- package/src/prover/zenon/tla/functions.ts +59 -31
- package/src/prover/zenon/tla/llproof.ts +67 -76
- package/src/prover/zenon/tla/records.ts +57 -33
- package/src/prover/zenon/tla/rewrites.ts +12 -19
- package/src/prover/zenon/tla/sets.ts +83 -53
- package/src/prover/zenon/tla/terms.ts +0 -6
- package/src/prover/zenon/tla/tla.ts +66 -64
- package/src/randomization.ts +81 -35
- package/src/resolve.ts +67 -184
- package/src/runtime.ts +22 -22
- package/src/sany/builtins.ts +2 -5
- package/src/sany/generation.ts +394 -0
- package/src/sany/generator-def-entries.ts +210 -0
- package/src/sany/generator-definitions.ts +686 -0
- package/src/sany/generator-expressions.ts +1100 -0
- package/src/sany/generator-proofs.ts +662 -0
- package/src/sany/generator.ts +191 -2764
- package/src/sany/levels.ts +6 -34
- package/src/sany/lexer.ts +58 -77
- package/src/sany/linter.ts +1 -9
- package/src/sany/modules.ts +1 -5
- package/src/sany/nodes.ts +5 -43
- package/src/sany/parse-error.ts +39 -117
- package/src/sany/report.ts +32 -69
- package/src/sany/selectors.ts +49 -76
- package/src/sany/source.ts +1 -17
- package/src/sany/xml.ts +35 -117
- package/src/search.ts +541 -163
- package/src/simulate.ts +709 -0
- package/src/spec-description.ts +192 -100
- package/src/standard-definitions.ts +0 -4
- package/src/standard-modules.ts +264 -95
- package/src/state-graph.ts +52 -31
- package/src/subexpressions.ts +69 -52
- package/src/substitution-levels.ts +7 -7
- package/src/successors.ts +266 -99
- package/src/symmetry.ts +33 -25
- package/src/tableau.ts +27 -24
- package/src/tlc/fingerprint.ts +183 -67
- package/src/tlc/jar-data.ts +112 -6
- package/src/tlc/messages.ts +125 -54
- package/src/tlc/order.ts +39 -69
- package/src/tlc/random.ts +37 -49
- package/src/tlc/replay.ts +553 -228
- package/src/tlc/summary.ts +36 -47
- package/src/tlc/tlc-operators.ts +78 -44
- package/src/tlc/tlcext-operators.ts +139 -122
- package/src/tlc/trace-spec.ts +249 -0
- package/src/tlc/value-stream.ts +139 -0
- package/src/tlc/version.ts +1 -4
- package/src/transfer.ts +22 -25
- package/src/typescript/actions.ts +479 -0
- package/src/typescript/collections.ts +614 -0
- package/src/typescript/compile.ts +63 -0
- package/src/typescript/context.ts +94 -0
- package/src/typescript/emit.ts +121 -0
- package/src/typescript/expressions.ts +496 -0
- package/src/typescript/formula.ts +154 -0
- package/src/typescript/functions.ts +284 -0
- package/src/typescript/model.ts +162 -0
- package/src/typescript/names.ts +114 -0
- package/src/typescript/program.ts +48 -0
- package/src/typescript/properties.ts +139 -0
- package/src/typescript/scope.ts +112 -0
- package/src/typescript/steps.ts +167 -0
- package/src/typescript/types.ts +171 -0
- package/src/values.ts +832 -484
- package/src/worker.ts +7 -8
|
@@ -1,10 +1,7 @@
|
|
|
1
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
2
|
|
|
5
3
|
import { isApp, type Expr } from "../expr";
|
|
6
|
-
import
|
|
7
|
-
import { makeRule, type Rule } from "../proof";
|
|
4
|
+
import { makeRule } from "../proof";
|
|
8
5
|
import {
|
|
9
6
|
equal,
|
|
10
7
|
getBranches,
|
|
@@ -28,25 +25,36 @@ const decomposeAdd = (set: Expr): [Expr[], Expr] => {
|
|
|
28
25
|
return [elements, rest];
|
|
29
26
|
};
|
|
30
27
|
|
|
28
|
+
const BINARY_SET_RULES = new Map<
|
|
29
|
+
string,
|
|
30
|
+
[
|
|
31
|
+
"in_cup" | "in_cap" | "in_setminus",
|
|
32
|
+
"notin_cup" | "notin_cap" | "notin_setminus",
|
|
33
|
+
boolean,
|
|
34
|
+
boolean,
|
|
35
|
+
]
|
|
36
|
+
>([
|
|
37
|
+
["TLA.cup", ["in_cup", "notin_cup", true, false]],
|
|
38
|
+
["TLA.cap", ["in_cap", "notin_cap", false, true]],
|
|
39
|
+
["TLA.setminus", ["in_setminus", "notin_setminus", false, true]],
|
|
40
|
+
]);
|
|
41
|
+
|
|
31
42
|
export const getMembershipNodes = (literal: Literal): Item[] | undefined => {
|
|
32
43
|
const exprs = literal.context.exprs;
|
|
33
44
|
const formula = literal.formula;
|
|
34
45
|
const isNegated = literal.isNegated;
|
|
35
46
|
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
47
|
if (relation?.symbol === "TLA.in") {
|
|
41
48
|
const element = relation.args[0];
|
|
42
49
|
const set = relation.args[1];
|
|
43
50
|
if (!isNegated && isVariable(set, "TLA.emptyset"))
|
|
44
|
-
return
|
|
51
|
+
return makeExtensionNode(literal, "prop", makeRule("in_emptyset", [formula, element]), []);
|
|
45
52
|
if (isApp(set, "TLA.upair", 2)) {
|
|
46
53
|
const first = equal(exprs, element, set.args[0]);
|
|
47
54
|
const second = equal(exprs, element, set.args[1]);
|
|
48
55
|
return isNegated
|
|
49
|
-
?
|
|
56
|
+
? makeExtensionNode(
|
|
57
|
+
literal,
|
|
50
58
|
"prop",
|
|
51
59
|
makeRule("notin_upair", [
|
|
52
60
|
formula,
|
|
@@ -58,7 +66,8 @@ export const getMembershipNodes = (literal: Literal): Item[] | undefined => {
|
|
|
58
66
|
]),
|
|
59
67
|
[[exprs.enot(first), exprs.enot(second)]],
|
|
60
68
|
)
|
|
61
|
-
:
|
|
69
|
+
: makeExtensionNode(
|
|
70
|
+
literal,
|
|
62
71
|
"prop",
|
|
63
72
|
makeRule("in_upair", [formula, first, second, element, set.args[0], set.args[1]]),
|
|
64
73
|
[[first], [second]],
|
|
@@ -72,35 +81,54 @@ export const getMembershipNodes = (literal: Literal): Item[] | undefined => {
|
|
|
72
81
|
const formulas = isEmptyRest
|
|
73
82
|
? equalities
|
|
74
83
|
: [...equalities, member(exprs, element, decomposed[1])];
|
|
75
|
-
return
|
|
84
|
+
return makeExtensionNode(
|
|
85
|
+
literal,
|
|
86
|
+
"prop",
|
|
87
|
+
makeRule("in_addElt", [formula, element, set]),
|
|
88
|
+
getBranches(formulas),
|
|
89
|
+
);
|
|
76
90
|
}
|
|
77
91
|
const inequalities = decomposed[0].map((inner) => exprs.enot(equal(exprs, element, inner)));
|
|
78
92
|
const formulas = isEmptyRest
|
|
79
93
|
? inequalities
|
|
80
94
|
: [exprs.enot(member(exprs, element, decomposed[1])), ...inequalities];
|
|
81
|
-
return
|
|
95
|
+
return makeExtensionNode(literal, "prop", makeRule("notin_addElt", [formula, element, set]), [
|
|
96
|
+
formulas,
|
|
97
|
+
]);
|
|
82
98
|
}
|
|
83
99
|
if (isApp(set, "TLA.set"))
|
|
84
100
|
return isNegated
|
|
85
|
-
?
|
|
101
|
+
? makeExtensionNode(literal, "prop", makeRule("notin_set", [formula, element, set]), [
|
|
86
102
|
set.args.map((inner) => exprs.enot(equal(exprs, element, inner))),
|
|
87
103
|
])
|
|
88
|
-
:
|
|
104
|
+
: makeExtensionNode(
|
|
105
|
+
literal,
|
|
89
106
|
"prop",
|
|
90
107
|
makeRule("in_set", [formula, element, set]),
|
|
91
108
|
getBranches(set.args.map((inner) => equal(exprs, element, inner))),
|
|
92
109
|
);
|
|
93
110
|
if (isNegated && set.kind === "meta")
|
|
94
|
-
return
|
|
111
|
+
return makeInstanceNode(
|
|
112
|
+
literal,
|
|
113
|
+
{ instance: set.args[0] },
|
|
114
|
+
set.args[0],
|
|
115
|
+
exprs.eapp("TLA.set", [element]),
|
|
116
|
+
);
|
|
95
117
|
if (isApp(set, "TLA.SUBSET", 1)) {
|
|
96
118
|
const subset = exprs.eapp("TLA.subseteq", [element, set.args[0]]);
|
|
97
119
|
return isNegated
|
|
98
|
-
?
|
|
120
|
+
? makeExtensionNode(
|
|
121
|
+
literal,
|
|
99
122
|
"prop",
|
|
100
123
|
makeRule("notin_SUBSET", [formula, exprs.enot(subset), element, set.args[0]]),
|
|
101
124
|
[[exprs.enot(subset)]],
|
|
102
125
|
)
|
|
103
|
-
:
|
|
126
|
+
: makeExtensionNode(
|
|
127
|
+
literal,
|
|
128
|
+
"prop",
|
|
129
|
+
makeRule("in_SUBSET", [formula, subset, element, set.args[0]]),
|
|
130
|
+
[[subset]],
|
|
131
|
+
);
|
|
104
132
|
}
|
|
105
133
|
if (isApp(set, "TLA.UNION", 1)) {
|
|
106
134
|
const bound = exprs.newVar();
|
|
@@ -110,27 +138,20 @@ export const getMembershipNodes = (literal: Literal): Item[] | undefined => {
|
|
|
110
138
|
exprs.eand(member(exprs, bound, set.args[0]), member(exprs, element, bound)),
|
|
111
139
|
);
|
|
112
140
|
return isNegated
|
|
113
|
-
?
|
|
141
|
+
? makeExtensionNode(
|
|
142
|
+
literal,
|
|
114
143
|
"arity",
|
|
115
144
|
makeRule("notin_UNION", [formula, exprs.enot(exists), element, set.args[0]]),
|
|
116
145
|
[[exprs.enot(exists)]],
|
|
117
146
|
)
|
|
118
|
-
:
|
|
147
|
+
: makeExtensionNode(
|
|
148
|
+
literal,
|
|
149
|
+
"prop",
|
|
150
|
+
makeRule("in_UNION", [formula, exists, element, set.args[0]]),
|
|
151
|
+
[[exists]],
|
|
152
|
+
);
|
|
119
153
|
}
|
|
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;
|
|
154
|
+
const binarySetRule = set.kind === "app" ? BINARY_SET_RULES.get(set.symbol) : undefined;
|
|
134
155
|
if (binarySetRule !== undefined && set.args.length === 2) {
|
|
135
156
|
const first = member(exprs, element, set.args[0]);
|
|
136
157
|
const secondPositive = member(exprs, element, set.args[1]);
|
|
@@ -138,7 +159,8 @@ export const getMembershipNodes = (literal: Literal): Item[] | undefined => {
|
|
|
138
159
|
const second = isMinus !== isNegated ? exprs.enot(secondPositive) : secondPositive;
|
|
139
160
|
const firstLiteral = isNegated ? exprs.enot(first) : first;
|
|
140
161
|
const isSplit = isNegated ? binarySetRule[3] : binarySetRule[2];
|
|
141
|
-
return
|
|
162
|
+
return makeExtensionNode(
|
|
163
|
+
literal,
|
|
142
164
|
"prop",
|
|
143
165
|
makeRule(isNegated ? binarySetRule[1] : binarySetRule[0], [
|
|
144
166
|
formula,
|
|
@@ -156,7 +178,8 @@ export const getMembershipNodes = (literal: Literal): Item[] | undefined => {
|
|
|
156
178
|
const inBase = member(exprs, element, set.args[0]);
|
|
157
179
|
const holds = exprs.substitute([[predicate.args[0], element]], predicate.args[1]);
|
|
158
180
|
return isNegated
|
|
159
|
-
?
|
|
181
|
+
? makeExtensionNode(
|
|
182
|
+
literal,
|
|
160
183
|
"prop",
|
|
161
184
|
makeRule("notin_subsetof", [
|
|
162
185
|
formula,
|
|
@@ -168,7 +191,8 @@ export const getMembershipNodes = (literal: Literal): Item[] | undefined => {
|
|
|
168
191
|
]),
|
|
169
192
|
[[exprs.enot(inBase)], [exprs.enot(holds)]],
|
|
170
193
|
)
|
|
171
|
-
:
|
|
194
|
+
: makeExtensionNode(
|
|
195
|
+
literal,
|
|
172
196
|
"prop",
|
|
173
197
|
makeRule("in_subsetof", [formula, inBase, holds, element, set.args[0], predicate]),
|
|
174
198
|
[[inBase, holds]],
|
|
@@ -186,7 +210,8 @@ export const getMembershipNodes = (literal: Literal): Item[] | undefined => {
|
|
|
186
210
|
),
|
|
187
211
|
);
|
|
188
212
|
const result = isNegated ? exprs.enot(exists) : exists;
|
|
189
|
-
return
|
|
213
|
+
return makeExtensionNode(
|
|
214
|
+
literal,
|
|
190
215
|
{ instance: result },
|
|
191
216
|
makeRule(isNegated ? "notin_setofall" : "in_setofall", [
|
|
192
217
|
formula,
|
|
@@ -207,20 +232,22 @@ export const getSetEqualityNodes = (literal: Literal): Item[] | undefined => {
|
|
|
207
232
|
const formula = literal.formula;
|
|
208
233
|
const isNegated = literal.isNegated;
|
|
209
234
|
const relation = literal.relation;
|
|
210
|
-
const node = (priority: Priority, rule: Rule, branches: Expr[][]) =>
|
|
211
|
-
makeExtensionNode(literal, priority, rule, branches);
|
|
212
235
|
if (relation?.symbol !== "=") return undefined;
|
|
213
236
|
const left = relation.args[0];
|
|
214
237
|
const right = relation.args[1];
|
|
215
238
|
if (!isNegated && isVariable(right, "TLA.emptyset")) {
|
|
216
239
|
const bound = exprs.newVar();
|
|
217
240
|
const empty = exprs.eall(bound, "", exprs.enot(member(exprs, bound, left)));
|
|
218
|
-
return
|
|
241
|
+
return makeExtensionNode(literal, "arity", makeRule("setequalempty", [formula, empty, left]), [
|
|
242
|
+
[empty],
|
|
243
|
+
]);
|
|
219
244
|
}
|
|
220
245
|
if (!isNegated && isVariable(left, "TLA.emptyset")) {
|
|
221
246
|
const bound = exprs.newVar();
|
|
222
247
|
const empty = exprs.eall(bound, "", exprs.enot(member(exprs, bound, right)));
|
|
223
|
-
return
|
|
248
|
+
return makeExtensionNode(literal, "arity", makeRule("setemptyequal", [formula, empty, right]), [
|
|
249
|
+
[empty],
|
|
250
|
+
]);
|
|
224
251
|
}
|
|
225
252
|
if (isConstructor(SET_CONSTRUCTORS, left) || isConstructor(SET_CONSTRUCTORS, right)) {
|
|
226
253
|
const bound = exprs.newVar();
|
|
@@ -230,7 +257,8 @@ export const getSetEqualityNodes = (literal: Literal): Item[] | undefined => {
|
|
|
230
257
|
exprs.eequiv(member(exprs, bound, left), member(exprs, bound, right)),
|
|
231
258
|
);
|
|
232
259
|
const result = isNegated ? exprs.enot(extensional) : extensional;
|
|
233
|
-
return
|
|
260
|
+
return makeExtensionNode(
|
|
261
|
+
literal,
|
|
234
262
|
{ instance: result },
|
|
235
263
|
makeRule(isNegated ? "notsetequal" : "setequal", [formula, result, left, right]),
|
|
236
264
|
[[result]],
|
|
@@ -239,13 +267,10 @@ export const getSetEqualityNodes = (literal: Literal): Item[] | undefined => {
|
|
|
239
267
|
return undefined;
|
|
240
268
|
};
|
|
241
269
|
|
|
242
|
-
// A metavariable in a set, against the disequalities of that set.
|
|
243
270
|
export const getMetaMembershipNodes = (literal: Literal): Item[] | undefined => {
|
|
244
271
|
const exprs = literal.context.exprs;
|
|
245
272
|
const index = literal.context.index;
|
|
246
273
|
const relation = literal.relation;
|
|
247
|
-
const node = (priority: Priority, rule: Rule, branches: Expr[][]) =>
|
|
248
|
-
makeExtensionNode(literal, priority, rule, branches);
|
|
249
274
|
if (relation?.symbol === "TLA.in" && relation.args[0].kind === "meta") {
|
|
250
275
|
const bound = exprs.newVar();
|
|
251
276
|
return index.findDisequalities(relation.args[1]).flatMap((disequality) => {
|
|
@@ -257,7 +282,8 @@ export const getMetaMembershipNodes = (literal: Literal): Item[] | undefined =>
|
|
|
257
282
|
exprs.eequiv(member(exprs, bound, sides[0]), member(exprs, bound, sides[1])),
|
|
258
283
|
),
|
|
259
284
|
);
|
|
260
|
-
return
|
|
285
|
+
return makeExtensionNode(
|
|
286
|
+
literal,
|
|
261
287
|
{ instance: different },
|
|
262
288
|
makeRule("notsetequal", [disequality, different, sides[0], sides[1]]),
|
|
263
289
|
[[different]],
|
|
@@ -272,8 +298,6 @@ export const getSubsetNodes = (literal: Literal): Item[] | undefined => {
|
|
|
272
298
|
const formula = literal.formula;
|
|
273
299
|
const isNegated = literal.isNegated;
|
|
274
300
|
const relation = literal.relation;
|
|
275
|
-
const node = (priority: Priority, rule: Rule, branches: Expr[][]) =>
|
|
276
|
-
makeExtensionNode(literal, priority, rule, branches);
|
|
277
301
|
if (relation?.symbol === "TLA.subseteq") {
|
|
278
302
|
const left = relation.args[0];
|
|
279
303
|
const right = relation.args[1];
|
|
@@ -281,23 +305,29 @@ export const getSubsetNodes = (literal: Literal): Item[] | undefined => {
|
|
|
281
305
|
const first = exprs.eapp("TLA.subseteq", [left.args[0], right]);
|
|
282
306
|
const second = exprs.eapp("TLA.subseteq", [left.args[1], right]);
|
|
283
307
|
return isNegated
|
|
284
|
-
?
|
|
308
|
+
? makeExtensionNode(
|
|
309
|
+
literal,
|
|
285
310
|
"arity",
|
|
286
311
|
makeRule("not_cup_subseteq", [formula, exprs.enot(first), exprs.enot(second)]),
|
|
287
312
|
[[exprs.enot(first)], [exprs.enot(second)]],
|
|
288
313
|
)
|
|
289
|
-
:
|
|
314
|
+
: makeExtensionNode(literal, "arity", makeRule("cup_subseteq", [formula, first, second]), [
|
|
315
|
+
[first, second],
|
|
316
|
+
]);
|
|
290
317
|
}
|
|
291
318
|
if (isApp(right, "TLA.cap", 2)) {
|
|
292
319
|
// Zenon builds the same subset twice here, from the second set.
|
|
293
320
|
const subset = exprs.eapp("TLA.subseteq", [left, right.args[1]]);
|
|
294
321
|
return isNegated
|
|
295
|
-
?
|
|
322
|
+
? makeExtensionNode(
|
|
323
|
+
literal,
|
|
296
324
|
"arity",
|
|
297
325
|
makeRule("not_subseteq_cap", [formula, exprs.enot(subset), exprs.enot(subset)]),
|
|
298
326
|
[[exprs.enot(subset)], [exprs.enot(subset)]],
|
|
299
327
|
)
|
|
300
|
-
:
|
|
328
|
+
: makeExtensionNode(literal, "arity", makeRule("subseteq_cap", [formula, subset, subset]), [
|
|
329
|
+
[subset, subset],
|
|
330
|
+
]);
|
|
301
331
|
}
|
|
302
332
|
}
|
|
303
333
|
return undefined;
|
|
@@ -1,7 +1,4 @@
|
|
|
1
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
2
|
|
|
6
3
|
import { TlaZenonError } from "../../../errors";
|
|
7
4
|
import { isApp, isRelation, type Expr, type Expressions, type RelationExpr } from "../expr";
|
|
@@ -9,7 +6,6 @@ import type { Index } from "../index-table";
|
|
|
9
6
|
import type { Node, Priority } from "../node";
|
|
10
7
|
import { makeRule, type Rule } from "../proof";
|
|
11
8
|
|
|
12
|
-
// A node, or Zenon's Stop: the rules after it don't apply to the formula.
|
|
13
9
|
export type Item = Node | "stop";
|
|
14
10
|
|
|
15
11
|
export const SET_CONSTRUCTORS = [
|
|
@@ -88,8 +84,6 @@ export interface TlaContext {
|
|
|
88
84
|
exprs: Expressions;
|
|
89
85
|
}
|
|
90
86
|
|
|
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
87
|
export interface Literal {
|
|
94
88
|
context: TlaContext;
|
|
95
89
|
formula: Expr;
|
|
@@ -1,7 +1,4 @@
|
|
|
1
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
2
|
|
|
6
3
|
import {
|
|
7
4
|
FALSE,
|
|
@@ -12,9 +9,9 @@ import {
|
|
|
12
9
|
type NegatedRelationExpr,
|
|
13
10
|
type RelationExpr,
|
|
14
11
|
} from "../expr";
|
|
15
|
-
import type { Node
|
|
12
|
+
import type { Node } from "../node";
|
|
16
13
|
import type { Phrase } from "../parse";
|
|
17
|
-
import { makeRule
|
|
14
|
+
import { makeRule } from "../proof";
|
|
18
15
|
import { getFunctionNodes, getFunctionSetNodes } from "./functions";
|
|
19
16
|
import { getRecordNodes, getTupleNodes } from "./records";
|
|
20
17
|
import { getRewriteNodes } from "./rewrites";
|
|
@@ -50,7 +47,6 @@ const OTHER_SYMBOLS = [
|
|
|
50
47
|
"TLA.box",
|
|
51
48
|
];
|
|
52
49
|
|
|
53
|
-
// The symbols that hypotheses can't define, as Zenon's predef with the tla extension.
|
|
54
50
|
export const PREDEFINED_SYMBOLS = [
|
|
55
51
|
"=",
|
|
56
52
|
...SET_CONSTRUCTORS,
|
|
@@ -58,7 +54,7 @@ export const PREDEFINED_SYMBOLS = [
|
|
|
58
54
|
...OTHER_SYMBOLS,
|
|
59
55
|
];
|
|
60
56
|
|
|
61
|
-
const
|
|
57
|
+
const makeDefinition = (
|
|
62
58
|
exprs: Expressions,
|
|
63
59
|
name: string,
|
|
64
60
|
symbol: string,
|
|
@@ -75,13 +71,12 @@ const definition = (
|
|
|
75
71
|
},
|
|
76
72
|
});
|
|
77
73
|
|
|
78
|
-
// Zenon's built_in_defs. Expressions belong to one run of the prover, so each run builds them.
|
|
79
74
|
export const getBuiltInDefinitions = (exprs: Expressions): Phrase[] => {
|
|
80
75
|
const bound = exprs.evar("x");
|
|
81
|
-
const
|
|
76
|
+
const membership = exprs.eapp("TLA.in", [bound, exprs.evar("S")]);
|
|
82
77
|
const holds = exprs.eapp("P", [bound]);
|
|
83
78
|
return [
|
|
84
|
-
|
|
79
|
+
makeDefinition(
|
|
85
80
|
exprs,
|
|
86
81
|
"subset_def",
|
|
87
82
|
"TLA.subseteq",
|
|
@@ -91,28 +86,28 @@ export const getBuiltInDefinitions = (exprs: Expressions): Phrase[] => {
|
|
|
91
86
|
exprs.elam(bound, "", exprs.eapp("TLA.in", [bound, exprs.evar("B")])),
|
|
92
87
|
]),
|
|
93
88
|
),
|
|
94
|
-
|
|
89
|
+
makeDefinition(
|
|
95
90
|
exprs,
|
|
96
91
|
"bAll_def",
|
|
97
92
|
"TLA.bAll",
|
|
98
93
|
["S", "P"],
|
|
99
|
-
exprs.eall(bound, "", exprs.eimply(
|
|
94
|
+
exprs.eall(bound, "", exprs.eimply(membership, holds)),
|
|
100
95
|
),
|
|
101
|
-
|
|
96
|
+
makeDefinition(
|
|
102
97
|
exprs,
|
|
103
98
|
"bEx_def",
|
|
104
99
|
"TLA.bEx",
|
|
105
100
|
["S", "P"],
|
|
106
|
-
exprs.eex(bound, "", exprs.eand(
|
|
101
|
+
exprs.eex(bound, "", exprs.eand(membership, holds)),
|
|
107
102
|
),
|
|
108
|
-
|
|
103
|
+
makeDefinition(
|
|
109
104
|
exprs,
|
|
110
105
|
"bChoose_def",
|
|
111
106
|
"TLA.bChoice",
|
|
112
107
|
["S", "P"],
|
|
113
|
-
exprs.etau(bound, "", exprs.eand(
|
|
108
|
+
exprs.etau(bound, "", exprs.eand(membership, holds)),
|
|
114
109
|
),
|
|
115
|
-
|
|
110
|
+
makeDefinition(
|
|
116
111
|
exprs,
|
|
117
112
|
"prod_def",
|
|
118
113
|
"TLA.prod",
|
|
@@ -122,7 +117,6 @@ export const getBuiltInDefinitions = (exprs: Expressions): Phrase[] => {
|
|
|
122
117
|
];
|
|
123
118
|
};
|
|
124
119
|
|
|
125
|
-
// The elements of a set given by enumeration, and whether it may hold more.
|
|
126
120
|
const getSetValues = (set: Expr): [Expr[], boolean] => {
|
|
127
121
|
if (isVariable(set, "TLA.emptyset")) return [[], false];
|
|
128
122
|
if (isApp(set, "TLA.upair", 2)) return [set.args, false];
|
|
@@ -145,34 +139,45 @@ const getBooleanNodes = (literal: Literal): Item[] | undefined => {
|
|
|
145
139
|
const isNegated = literal.isNegated;
|
|
146
140
|
const atom = literal.atom;
|
|
147
141
|
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);
|
|
142
|
+
if (atom.kind === "meta")
|
|
143
|
+
return makeInstanceNode(literal, "arity", atom.args[0], isNegated ? TRUE : FALSE);
|
|
153
144
|
if (relation?.symbol !== "=") return undefined;
|
|
154
145
|
const left = relation.args[0];
|
|
155
146
|
const right = relation.args[1];
|
|
156
147
|
if (right.kind === "true")
|
|
157
148
|
return isNegated
|
|
158
|
-
?
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
149
|
+
? makeExtensionNode(
|
|
150
|
+
literal,
|
|
151
|
+
"prop",
|
|
152
|
+
makeRule("noteq_x_true", [formula, exprs.enot(left), left]),
|
|
153
|
+
[[exprs.enot(left)]],
|
|
154
|
+
)
|
|
155
|
+
: makeExtensionNode(literal, "prop", makeRule("eq_x_true", [formula, left, left]), [[left]]);
|
|
162
156
|
if (left.kind === "true")
|
|
163
157
|
return isNegated
|
|
164
|
-
?
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
158
|
+
? makeExtensionNode(
|
|
159
|
+
literal,
|
|
160
|
+
"prop",
|
|
161
|
+
makeRule("noteq_true_x", [formula, exprs.enot(right), right]),
|
|
162
|
+
[[exprs.enot(right)]],
|
|
163
|
+
)
|
|
164
|
+
: makeExtensionNode(literal, "prop", makeRule("eq_true_x", [formula, right, right]), [
|
|
165
|
+
[right],
|
|
166
|
+
]);
|
|
168
167
|
if (!isNegated && right.kind === "false")
|
|
169
|
-
return
|
|
170
|
-
|
|
171
|
-
|
|
168
|
+
return makeExtensionNode(
|
|
169
|
+
literal,
|
|
170
|
+
"prop",
|
|
171
|
+
makeRule("eq_x_false", [formula, exprs.enot(left), left]),
|
|
172
|
+
[[exprs.enot(left)]],
|
|
173
|
+
);
|
|
172
174
|
if (!isNegated && left.kind === "false")
|
|
173
|
-
return
|
|
174
|
-
|
|
175
|
-
|
|
175
|
+
return makeExtensionNode(
|
|
176
|
+
literal,
|
|
177
|
+
"prop",
|
|
178
|
+
makeRule("eq_false_x", [formula, exprs.enot(right), right]),
|
|
179
|
+
[[exprs.enot(right)]],
|
|
180
|
+
);
|
|
176
181
|
return undefined;
|
|
177
182
|
};
|
|
178
183
|
|
|
@@ -182,8 +187,6 @@ const getChoiceNodes = (literal: Literal): Item[] | undefined => {
|
|
|
182
187
|
const goalness = literal.goalness;
|
|
183
188
|
const isNegated = literal.isNegated;
|
|
184
189
|
const relation = literal.relation;
|
|
185
|
-
const node = (priority: Priority, rule: Rule, branches: Expr[][]) =>
|
|
186
|
-
makeExtensionNode(literal, priority, rule, branches);
|
|
187
190
|
if (relation === undefined) return undefined;
|
|
188
191
|
const left = relation.args[0];
|
|
189
192
|
const right = relation.args[1];
|
|
@@ -200,7 +203,8 @@ const getChoiceNodes = (literal: Literal): Item[] | undefined => {
|
|
|
200
203
|
const leftBody = exprs.substitute([[left.args[0], bound]], left.args[1]);
|
|
201
204
|
const rightBody = exprs.substitute([[right.args[0], bound]], right.args[1]);
|
|
202
205
|
const differ = exprs.eex(bound, left.symbol, exprs.eapp("$notequiv", [leftBody, rightBody]));
|
|
203
|
-
return
|
|
206
|
+
return makeExtensionNode(
|
|
207
|
+
literal,
|
|
204
208
|
{ instance: differ },
|
|
205
209
|
makeRule("choose_diff_choose", [
|
|
206
210
|
formula,
|
|
@@ -212,7 +216,9 @@ const getChoiceNodes = (literal: Literal): Item[] | undefined => {
|
|
|
212
216
|
);
|
|
213
217
|
}
|
|
214
218
|
if (!isNegated && relation.symbol === "$notequiv")
|
|
215
|
-
return
|
|
219
|
+
return makeExtensionNode(literal, "arity", makeRule("notequivdef", []), [
|
|
220
|
+
[exprs.enot(exprs.eequiv(left, right))],
|
|
221
|
+
]);
|
|
216
222
|
const choice = right.kind === "tau" ? right : left.kind === "tau" ? left : undefined;
|
|
217
223
|
if (isNegated && isEquality && choice !== undefined) {
|
|
218
224
|
const term = right.kind === "tau" ? left : right;
|
|
@@ -238,7 +244,6 @@ const getChoiceNodes = (literal: Literal): Item[] | undefined => {
|
|
|
238
244
|
return undefined;
|
|
239
245
|
};
|
|
240
246
|
|
|
241
|
-
// The bounded quantifier over an enumerated set in \A x : x \in S => P or ~\E x : x \in S /\ P.
|
|
242
247
|
const getEnumeratedQuantifier = (formula: Expr) => {
|
|
243
248
|
const isEnumerated = (set: Expr) =>
|
|
244
249
|
isVariable(set, "TLA.emptyset") ||
|
|
@@ -266,14 +271,11 @@ const getEnumeratedQuantifier = (formula: Expr) => {
|
|
|
266
271
|
};
|
|
267
272
|
|
|
268
273
|
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);
|
|
274
|
+
const enumerated = getEnumeratedQuantifier(literal.formula);
|
|
273
275
|
if (enumerated !== undefined) {
|
|
274
276
|
const values = getSetValues(enumerated.set);
|
|
275
277
|
const nodes: Item[] = values[0].flatMap((value) =>
|
|
276
|
-
|
|
278
|
+
makeInstanceNode(literal, "arity", enumerated.quantified, value),
|
|
277
279
|
);
|
|
278
280
|
return values[1] ? nodes : [...nodes, "stop"];
|
|
279
281
|
}
|
|
@@ -285,19 +287,21 @@ const getNaturalNodes = (literal: Literal): Item[] | undefined => {
|
|
|
285
287
|
const formula = literal.formula;
|
|
286
288
|
const isNegated = literal.isNegated;
|
|
287
289
|
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
290
|
if (isNegated && relation?.symbol === "TLA.in" && isVariable(relation.args[1], "arith.N")) {
|
|
293
291
|
const left = relation.args[0];
|
|
294
|
-
if (isVariable(left, "0"))
|
|
292
|
+
if (isVariable(left, "0"))
|
|
293
|
+
return makeExtensionNode(literal, "prop", makeRule("in_nat_0", [formula]), []);
|
|
295
294
|
if (isApp(left, "TLA.fapply", 2) && isVariable(left.args[0], "TLA.Succ")) {
|
|
296
295
|
const previous = exprs.enot(member(exprs, left.args[1], exprs.evar("arith.N")));
|
|
297
|
-
return
|
|
296
|
+
return makeExtensionNode(
|
|
297
|
+
literal,
|
|
298
|
+
"prop",
|
|
299
|
+
makeRule("in_nat_succ", [formula, previous, left.args[1]]),
|
|
300
|
+
[[previous]],
|
|
301
|
+
);
|
|
298
302
|
}
|
|
299
303
|
if (left.kind === "meta")
|
|
300
|
-
return
|
|
304
|
+
return makeInstanceNode(literal, { instance: left.args[0] }, left.args[0], exprs.evar("0"));
|
|
301
305
|
}
|
|
302
306
|
return undefined;
|
|
303
307
|
};
|
|
@@ -326,8 +330,6 @@ const getPropNodes = (context: TlaContext, formula: Expr, goalness: number): Ite
|
|
|
326
330
|
);
|
|
327
331
|
};
|
|
328
332
|
|
|
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
333
|
const getBoundedInstances = (context: TlaContext, formula: Expr, goalness: number): Node[] => {
|
|
332
334
|
const exprs = context.exprs;
|
|
333
335
|
const index = context.index;
|
|
@@ -408,14 +410,13 @@ const getBoundedInstances = (context: TlaContext, formula: Expr, goalness: numbe
|
|
|
408
410
|
|
|
409
411
|
const makePropositionEqualityNode = (
|
|
410
412
|
exprs: Expressions,
|
|
411
|
-
|
|
413
|
+
isNegated: boolean,
|
|
414
|
+
isLeft: boolean,
|
|
412
415
|
formula: Expr,
|
|
413
416
|
left: Expr,
|
|
414
417
|
right: Expr,
|
|
415
418
|
goalness: number,
|
|
416
419
|
): Node => {
|
|
417
|
-
const isNegated = name === "np_eq_l" || name === "np_eq_r";
|
|
418
|
-
const isLeft = name === "p_eq_l" || name === "np_eq_l";
|
|
419
420
|
const proposition = isNegated && formula.kind === "not" ? formula.args[0] : formula;
|
|
420
421
|
const equality = equal(exprs, left, right);
|
|
421
422
|
const differ = exprs.enot(equal(exprs, proposition, isLeft ? left : right));
|
|
@@ -424,7 +425,7 @@ const makePropositionEqualityNode = (
|
|
|
424
425
|
return {
|
|
425
426
|
conclusions: [formula, equality],
|
|
426
427
|
rule: makeRule(
|
|
427
|
-
|
|
428
|
+
isNegated ? (isLeft ? "np_eq_l" : "np_eq_r") : isLeft ? "p_eq_l" : "p_eq_r",
|
|
428
429
|
isNegated
|
|
429
430
|
? [formula, equality, differ, rest, proposition, left, right]
|
|
430
431
|
: [formula, equality, differ, other, formula, left, right],
|
|
@@ -444,7 +445,8 @@ const getPropositionEqualityNodes = (context: TlaContext, formula: Expr, goalnes
|
|
|
444
445
|
const make = (isLeft: boolean) => (entry: [RelationExpr, number]) =>
|
|
445
446
|
makePropositionEqualityNode(
|
|
446
447
|
exprs,
|
|
447
|
-
isNegated
|
|
448
|
+
isNegated,
|
|
449
|
+
isLeft,
|
|
448
450
|
formula,
|
|
449
451
|
entry[0].args[0],
|
|
450
452
|
entry[0].args[1],
|
|
@@ -469,7 +471,8 @@ const getEqualityPropositionNodes = (
|
|
|
469
471
|
const make = (isNegated: boolean) => (entry: [Expr, number]) =>
|
|
470
472
|
makePropositionEqualityNode(
|
|
471
473
|
exprs,
|
|
472
|
-
isNegated
|
|
474
|
+
isNegated,
|
|
475
|
+
isLeft,
|
|
473
476
|
entry[0],
|
|
474
477
|
formula.args[0],
|
|
475
478
|
formula.args[1],
|
|
@@ -491,8 +494,7 @@ export const getExtensionNodes = (
|
|
|
491
494
|
formula: Expr,
|
|
492
495
|
goalness: number,
|
|
493
496
|
): ExtensionNodes => {
|
|
494
|
-
// OCaml evaluates the operands of @ right to left, so the last rules run first
|
|
495
|
-
// decides the names of fresh variables.
|
|
497
|
+
// OCaml evaluates the operands of @ right to left, so the last rules run first, which decides the names of fresh variables.
|
|
496
498
|
const bounded = getBoundedInstances(context, formula, goalness);
|
|
497
499
|
const right = getEqualityPropositionNodes(context, formula, false);
|
|
498
500
|
const left = getEqualityPropositionNodes(context, formula, true);
|