tla-ts 0.0.9 → 0.0.10-dev.28c823e4b
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 +28 -28
- package/dist/deciders.js +43 -43
- 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 +116 -36
- 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 +4 -23
- package/src/bags.ts +99 -102
- package/src/builtins.ts +40 -78
- package/src/bundled-modules.ts +1 -8
- package/src/check.ts +599 -388
- package/src/cli/options.ts +11 -6
- package/src/cli/run.ts +0 -2
- package/src/cli/runtime-invariants.ts +136 -0
- package/src/cli/shared.ts +18 -11
- package/src/cli/tlapm.ts +0 -12
- package/src/cli/tlc-arguments.ts +640 -0
- package/src/cli/tlc-usage.ts +361 -0
- package/src/cli/tlc.ts +538 -220
- package/src/cli/typescript.ts +23 -0
- package/src/cli/xml-exporter.ts +4 -16
- package/src/cli.ts +0 -1
- package/src/codegen.ts +191 -64
- package/src/config.ts +140 -109
- package/src/coverage.ts +837 -0
- package/src/dependencies.ts +6 -40
- package/src/dfid.ts +618 -0
- package/src/environment.ts +240 -118
- package/src/errors.ts +70 -55
- package/src/evaluate.ts +596 -339
- package/src/exit-codes.ts +37 -3
- package/src/fingerprints.ts +10 -10
- package/src/index.ts +3 -0
- package/src/instances.ts +79 -11
- package/src/java-overrides.ts +4 -19
- package/src/json-reader.ts +455 -0
- package/src/json.ts +255 -139
- package/src/levels.ts +8 -17
- package/src/lexer.ts +80 -100
- package/src/liveness-checker.ts +82 -119
- package/src/liveness.ts +112 -64
- package/src/obligations/action.ts +4 -28
- package/src/obligations/anonymize.ts +84 -80
- package/src/obligations/equality.ts +1 -1
- package/src/obligations/expression.ts +2 -19
- package/src/obligations/format.ts +1 -9
- package/src/obligations/generate.ts +1 -11
- package/src/obligations/index.ts +0 -11
- package/src/obligations/levels.ts +4 -8
- package/src/obligations/module.ts +1 -15
- package/src/obligations/normalize.ts +5 -24
- 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 +3 -14
- package/src/obligations/source.ts +1 -21
- package/src/obligations/subexpression.ts +5 -11
- package/src/obligations/substitution.ts +1 -3
- package/src/obligations/temporal.ts +8 -14
- package/src/obligations/tuples.ts +3 -9
- package/src/parallel-worker.ts +29 -39
- package/src/parallel.ts +53 -44
- package/src/parser.ts +565 -282
- 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 +5 -10
- package/src/prover/deciders.ts +0 -4
- 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 +108 -114
- package/src/prover/isabelle/isar/method.ts +25 -38
- 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 +15 -26
- package/src/prover/isabelle/isar/type-check.ts +11 -25
- package/src/prover/isabelle/provers/blast/blast.ts +10 -41
- 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 +11 -25
- package/src/prover/isabelle/pure/bicompose.ts +16 -13
- package/src/prover/isabelle/pure/consts.ts +1 -7
- package/src/prover/isabelle/pure/conv.ts +1 -9
- package/src/prover/isabelle/pure/drule.ts +24 -40
- 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 +1 -14
- 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 +13 -49
- package/src/prover/isabelle/pure/rewriter.ts +26 -58
- 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 +1 -31
- package/src/prover/isabelle/pure/tactic.ts +12 -22
- package/src/prover/isabelle/pure/tactical.ts +6 -12
- 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 +13 -36
- 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 +9 -19
- package/src/prover/isabelle/tla/context.ts +8 -16
- package/src/prover/isabelle/tla/logic.ts +4 -11
- package/src/prover/isabelle/tla/simpdata.ts +46 -34
- package/src/prover/isabelle/tools/intuitionistic.ts +1 -10
- package/src/prover/ocaml.ts +0 -6
- package/src/prover/prep/action.ts +4 -36
- package/src/prover/prep/enabled-axioms.ts +12 -19
- package/src/prover/prep/fingerprint.ts +0 -16
- package/src/prover/prep/level-comparison.ts +8 -12
- package/src/prover/prep/md5.ts +0 -2
- package/src/prover/prep/methods.ts +9 -36
- package/src/prover/prep/normalize.ts +4 -28
- package/src/prover/prove-worker.ts +0 -2
- package/src/prover/prove.ts +0 -36
- 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 +19 -26
- package/src/prover/smt/data.ts +51 -54
- package/src/prover/smt/encode.ts +14 -35
- 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 +66 -101
- 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 -143
- package/src/prover/smt/solver/auf-solver.ts +6 -39
- 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 +4 -61
- 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 +3 -34
- 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 +0 -5
- 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 +6 -98
- 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 +12 -98
- 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 +35 -130
- 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 +14 -56
- 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 +2 -36
- package/src/prover/smt/solver/model-evaluator.ts +3 -29
- package/src/prover/smt/solver/model-finder.ts +3 -15
- package/src/prover/smt/solver/model-generator.ts +1 -12
- package/src/prover/smt/solver/model-macro-solver.ts +12 -69
- package/src/prover/smt/solver/nlsat/algebraic.ts +55 -151
- package/src/prover/smt/solver/nlsat/atoms.ts +5 -19
- package/src/prover/smt/solver/nlsat/evaluator.ts +17 -22
- package/src/prover/smt/solver/nlsat/explain.ts +3 -47
- package/src/prover/smt/solver/nlsat/interval-set.ts +9 -50
- package/src/prover/smt/solver/nlsat/levelwise.ts +48 -129
- package/src/prover/smt/solver/nlsat/mpbq.ts +3 -14
- package/src/prover/smt/solver/nlsat/polynomial.ts +17 -156
- package/src/prover/smt/solver/nlsat/solver.ts +7 -67
- package/src/prover/smt/solver/nlsat/types.ts +1 -8
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +1 -44
- 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 -48
- 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 +17 -37
- package/src/prover/smt/solver/quantifier-manager.ts +1 -8
- 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 +2 -37
- 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 +0 -5
- package/src/prover/smt/solver/theory-lra-final-check.ts +4 -22
- package/src/prover/smt/solver/theory-lra-internalize.ts +1 -27
- 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 +20 -25
- package/src/prover/tlapm/ocaml-marshal.ts +19 -21
- package/src/prover/tlapm/tlapm.ts +12 -17
- package/src/prover/verdict.ts +0 -2
- package/src/prover/zenon/check/check.ts +0 -9
- 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 +0 -5
- package/src/prover/zenon/check/relations.ts +0 -13
- package/src/prover/zenon/check/rewrites.ts +0 -6
- package/src/prover/zenon/check/sets.ts +0 -3
- package/src/prover/zenon/check/terms.ts +0 -17
- 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 +0 -13
- package/src/prover/zenon/equality-rules.ts +0 -4
- package/src/prover/zenon/expr.ts +1 -26
- package/src/prover/zenon/index-table.ts +17 -38
- package/src/prover/zenon/isar-case.ts +9 -19
- package/src/prover/zenon/isar.ts +1 -29
- package/src/prover/zenon/limits.ts +0 -4
- package/src/prover/zenon/llproof.ts +0 -9
- package/src/prover/zenon/mltoll.ts +54 -76
- package/src/prover/zenon/node.ts +1 -11
- package/src/prover/zenon/ocaml.ts +1 -17
- package/src/prover/zenon/parse.ts +2 -7
- 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 +1 -17
- package/src/prover/zenon/tla/functions.ts +57 -29
- package/src/prover/zenon/tla/llproof.ts +63 -70
- package/src/prover/zenon/tla/records.ts +56 -27
- package/src/prover/zenon/tla/rewrites.ts +12 -19
- package/src/prover/zenon/tla/sets.ts +68 -39
- package/src/prover/zenon/tla/terms.ts +0 -6
- package/src/prover/zenon/tla/tla.ts +59 -58
- package/src/randomization.ts +81 -35
- package/src/resolve.ts +12 -112
- package/src/runtime.ts +22 -22
- package/src/sany/builtins.ts +2 -5
- package/src/sany/generator.ts +149 -252
- package/src/sany/levels.ts +6 -34
- package/src/sany/lexer.ts +41 -61
- package/src/sany/linter.ts +1 -9
- package/src/sany/modules.ts +1 -5
- package/src/sany/nodes.ts +0 -31
- package/src/sany/parse-error.ts +39 -117
- package/src/sany/report.ts +29 -63
- package/src/sany/selectors.ts +15 -39
- package/src/sany/source.ts +1 -17
- package/src/sany/xml.ts +13 -63
- package/src/search.ts +495 -155
- package/src/simulate.ts +685 -0
- package/src/spec-description.ts +176 -69
- package/src/standard-definitions.ts +0 -4
- package/src/standard-modules.ts +254 -69
- package/src/state-graph.ts +50 -24
- package/src/subexpressions.ts +69 -52
- package/src/substitution-levels.ts +2 -3
- package/src/successors.ts +263 -94
- 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 +110 -44
- package/src/tlc/order.ts +37 -60
- package/src/tlc/random.ts +33 -45
- package/src/tlc/replay.ts +549 -217
- package/src/tlc/summary.ts +36 -47
- package/src/tlc/tlc-operators.ts +76 -41
- package/src/tlc/tlcext-operators.ts +139 -122
- package/src/tlc/trace-spec.ts +269 -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 +481 -0
- package/src/typescript/collections.ts +600 -0
- package/src/typescript/compile.ts +65 -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 +152 -0
- package/src/typescript/functions.ts +284 -0
- package/src/typescript/model.ts +163 -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 +165 -0
- package/src/typescript/types.ts +171 -0
- package/src/values.ts +780 -337
- package/src/worker.ts +7 -8
|
@@ -1,11 +1,8 @@
|
|
|
1
1
|
// Ported from Zenon's ext_tla.ml, as shipped in tlapm. Copyright 2008 INRIA, see LICENSE.
|
|
2
|
-
//
|
|
3
|
-
// The rules for tuples and records.
|
|
4
2
|
|
|
5
3
|
import { compareExprs, isApp, type Expr } from "../expr";
|
|
6
4
|
import { stableSort } from "../ocaml";
|
|
7
|
-
import
|
|
8
|
-
import { makeRule, type Rule } from "../proof";
|
|
5
|
+
import { makeRule } from "../proof";
|
|
9
6
|
import {
|
|
10
7
|
domain,
|
|
11
8
|
equal,
|
|
@@ -25,7 +22,6 @@ const getStringName = (expression: Expr) =>
|
|
|
25
22
|
? expression.args[0].symbol
|
|
26
23
|
: undefined;
|
|
27
24
|
|
|
28
|
-
// Zenon's check_record_labels on sorted fields: false for Invalid_record, a repeated label.
|
|
29
25
|
const hasDistinctLabels = (pairs: [Expr, Expr][]) => {
|
|
30
26
|
for (let index = 0; index + 1 < pairs.length; index++) {
|
|
31
27
|
const left = pairs[index][0];
|
|
@@ -56,10 +52,8 @@ export const getTupleNodes = (literal: Literal): Item[] | undefined => {
|
|
|
56
52
|
const isNegated = literal.isNegated;
|
|
57
53
|
const atom = literal.atom;
|
|
58
54
|
const relation = literal.relation;
|
|
59
|
-
const node = (priority: Priority, rule: Rule, branches: Expr[][]) =>
|
|
60
|
-
makeExtensionNode(literal, priority, rule, branches);
|
|
61
55
|
if (isNegated && isApp(atom, "TLA.isASeq", 1) && isApp(atom.args[0], "TLA.tuple"))
|
|
62
|
-
return
|
|
56
|
+
return makeExtensionNode(literal, "prop", makeRule("tuple_notisaseq", [formula]), []);
|
|
63
57
|
if (relation === undefined) return undefined;
|
|
64
58
|
const left = relation.args[0];
|
|
65
59
|
const right = relation.args[1];
|
|
@@ -67,11 +61,21 @@ export const getTupleNodes = (literal: Literal): Item[] | undefined => {
|
|
|
67
61
|
const isMembership = relation.symbol === "TLA.in";
|
|
68
62
|
if (!isNegated && isEquality && isApp(left, "TLA.tuple") && isApp(right, "TLA.tuple")) {
|
|
69
63
|
if (left.args.length !== right.args.length)
|
|
70
|
-
return
|
|
64
|
+
return makeExtensionNode(
|
|
65
|
+
literal,
|
|
66
|
+
"prop",
|
|
67
|
+
makeRule("tuple_eq_mismatch", [formula, formula]),
|
|
68
|
+
[],
|
|
69
|
+
);
|
|
71
70
|
const equalities = left.args.map((inner, position) =>
|
|
72
71
|
equal(exprs, inner, right.args[position]),
|
|
73
72
|
);
|
|
74
|
-
return
|
|
73
|
+
return makeExtensionNode(
|
|
74
|
+
literal,
|
|
75
|
+
"prop",
|
|
76
|
+
makeRule("tuple_eq_match", [formula, ...equalities]),
|
|
77
|
+
[equalities],
|
|
78
|
+
);
|
|
75
79
|
}
|
|
76
80
|
if (isMembership && isApp(right, "TLA.Product", 1) && isApp(right.args[0], "TLA.tuple")) {
|
|
77
81
|
const element = left;
|
|
@@ -80,16 +84,24 @@ export const getTupleNodes = (literal: Literal): Item[] | undefined => {
|
|
|
80
84
|
const components = tuple.args.map((inner, position) =>
|
|
81
85
|
member(exprs, fapply(exprs, element, makeNatural(exprs, position + 1)), inner),
|
|
82
86
|
);
|
|
83
|
-
const
|
|
84
|
-
const
|
|
87
|
+
const sequenceFormula = exprs.eapp("TLA.isASeq", [element]);
|
|
88
|
+
const lengthFormula = equal(
|
|
85
89
|
exprs,
|
|
86
90
|
exprs.eapp("TLA.Len", [element]),
|
|
87
91
|
makeNatural(exprs, tuple.args.length),
|
|
88
92
|
);
|
|
89
|
-
return
|
|
93
|
+
return makeExtensionNode(
|
|
94
|
+
literal,
|
|
90
95
|
"prop",
|
|
91
|
-
makeRule("in_product", [
|
|
92
|
-
|
|
96
|
+
makeRule("in_product", [
|
|
97
|
+
formula,
|
|
98
|
+
element,
|
|
99
|
+
tuple,
|
|
100
|
+
sequenceFormula,
|
|
101
|
+
lengthFormula,
|
|
102
|
+
...components,
|
|
103
|
+
]),
|
|
104
|
+
[[sequenceFormula, lengthFormula, ...components]],
|
|
93
105
|
);
|
|
94
106
|
}
|
|
95
107
|
if (
|
|
@@ -108,7 +120,8 @@ export const getTupleNodes = (literal: Literal): Item[] | undefined => {
|
|
|
108
120
|
),
|
|
109
121
|
...components,
|
|
110
122
|
];
|
|
111
|
-
return
|
|
123
|
+
return makeExtensionNode(
|
|
124
|
+
literal,
|
|
112
125
|
"prop",
|
|
113
126
|
makeRule("notin_product", [formula, element, tuple, ...formulas]),
|
|
114
127
|
getBranches(formulas),
|
|
@@ -123,10 +136,8 @@ export const getRecordNodes = (literal: Literal): Item[] | undefined => {
|
|
|
123
136
|
const isNegated = literal.isNegated;
|
|
124
137
|
const atom = literal.atom;
|
|
125
138
|
const relation = literal.relation;
|
|
126
|
-
const node = (priority: Priority, rule: Rule, branches: Expr[][]) =>
|
|
127
|
-
makeExtensionNode(literal, priority, rule, branches);
|
|
128
139
|
if (isNegated && isApp(atom, "TLA.isAFcn", 1) && isApp(atom.args[0], "TLA.record"))
|
|
129
|
-
return
|
|
140
|
+
return makeExtensionNode(literal, "prop", makeRule("record_notisafcn", [formula]), []);
|
|
130
141
|
if (relation === undefined) return undefined;
|
|
131
142
|
const left = relation.args[0];
|
|
132
143
|
const right = relation.args[1];
|
|
@@ -140,14 +151,27 @@ export const getRecordNodes = (literal: Literal): Item[] | undefined => {
|
|
|
140
151
|
leftFields.length === rightFields.length &&
|
|
141
152
|
leftFields.every((field, position) => field[0] === rightFields[position][0]);
|
|
142
153
|
if (!isMatch)
|
|
143
|
-
return isNegated
|
|
154
|
+
return isNegated
|
|
155
|
+
? []
|
|
156
|
+
: makeExtensionNode(
|
|
157
|
+
literal,
|
|
158
|
+
"prop",
|
|
159
|
+
makeRule("record_eq_mismatch", [formula, formula]),
|
|
160
|
+
[],
|
|
161
|
+
);
|
|
144
162
|
const equalities = leftFields.map((field, position) =>
|
|
145
163
|
equal(exprs, field[1], rightFields[position][1]),
|
|
146
164
|
);
|
|
147
165
|
if (!isNegated)
|
|
148
|
-
return
|
|
166
|
+
return makeExtensionNode(
|
|
167
|
+
literal,
|
|
168
|
+
"prop",
|
|
169
|
+
makeRule("record_eq_match", [formula, ...equalities]),
|
|
170
|
+
[equalities],
|
|
171
|
+
);
|
|
149
172
|
const inequalities = equalities.map((inner) => exprs.enot(inner));
|
|
150
|
-
return
|
|
173
|
+
return makeExtensionNode(
|
|
174
|
+
literal,
|
|
151
175
|
"prop",
|
|
152
176
|
makeRule("record_neq_match", [formula, ...inequalities]),
|
|
153
177
|
getBranches(inequalities),
|
|
@@ -171,7 +195,8 @@ export const getRecordNodes = (literal: Literal): Item[] | undefined => {
|
|
|
171
195
|
),
|
|
172
196
|
...pairs.map((pair) => exprs.enot(equal(exprs, fapply(exprs, other, pair[0]), pair[1]))),
|
|
173
197
|
];
|
|
174
|
-
return
|
|
198
|
+
return makeExtensionNode(
|
|
199
|
+
literal,
|
|
175
200
|
"prop",
|
|
176
201
|
makeRule(record === right ? "neq_record" : "record_neq", [
|
|
177
202
|
formula,
|
|
@@ -194,9 +219,12 @@ export const getRecordNodes = (literal: Literal): Item[] | undefined => {
|
|
|
194
219
|
equal(exprs, domain(exprs, left), labels),
|
|
195
220
|
...pairs.map((pair) => member(exprs, fapply(exprs, left, pair[0]), pair[1])),
|
|
196
221
|
];
|
|
197
|
-
return
|
|
198
|
-
|
|
199
|
-
|
|
222
|
+
return makeExtensionNode(
|
|
223
|
+
literal,
|
|
224
|
+
"prop",
|
|
225
|
+
makeRule("in_recordset", [formula, left, right, ...formulas]),
|
|
226
|
+
[formulas],
|
|
227
|
+
);
|
|
200
228
|
}
|
|
201
229
|
if (isApp(left, "TLA.record")) {
|
|
202
230
|
const leftLabels = getSortedLabels(left.args);
|
|
@@ -215,7 +243,8 @@ export const getRecordNodes = (literal: Literal): Item[] | undefined => {
|
|
|
215
243
|
exprs.enot(equal(exprs, domain(exprs, left), labels)),
|
|
216
244
|
...pairs.map((pair) => exprs.enot(member(exprs, fapply(exprs, left, pair[0]), pair[1]))),
|
|
217
245
|
];
|
|
218
|
-
return
|
|
246
|
+
return makeExtensionNode(
|
|
247
|
+
literal,
|
|
219
248
|
"prop",
|
|
220
249
|
makeRule("notin_recordset", [formula, left, right, ...formulas]),
|
|
221
250
|
getBranches(formulas),
|
|
@@ -1,7 +1,4 @@
|
|
|
1
1
|
// Ported from Zenon's ext_tla.ml, as shipped in tlapm. Copyright 2008 INRIA, see LICENSE.
|
|
2
|
-
//
|
|
3
|
-
// Rewriting a subterm: unfolding a definition, evaluating a function application, IF, CASE or a
|
|
4
|
-
// formula used as a term, or replacing the subterm with an equal one from the branch.
|
|
5
2
|
|
|
6
3
|
import { TlaZenonError } from "../../../errors";
|
|
7
4
|
import {
|
|
@@ -29,8 +26,7 @@ import {
|
|
|
29
26
|
type TlaContext,
|
|
30
27
|
} from "./terms";
|
|
31
28
|
|
|
32
|
-
|
|
33
|
-
const parseInteger = (text: string) =>
|
|
29
|
+
const parseOcamlInteger = (text: string) =>
|
|
34
30
|
/^[-+]?(0[xX][0-9a-fA-F_]+|0[oO][0-7_]+|0[bB][01_]+|0[uU][0-9_]+|[0-9][0-9_]*)$/.test(text)
|
|
35
31
|
? Number(text.replace(/_/g, "").replace(/^([-+]?)0[uU]/, "$1"))
|
|
36
32
|
: undefined;
|
|
@@ -43,7 +39,7 @@ const getNaturalConstant = (expression: Expr): number | undefined => {
|
|
|
43
39
|
current = current.args[1];
|
|
44
40
|
}
|
|
45
41
|
if (current.kind !== "var") return undefined;
|
|
46
|
-
const value =
|
|
42
|
+
const value = parseOcamlInteger(current.symbol);
|
|
47
43
|
return value === undefined ? undefined : accumulator + value;
|
|
48
44
|
};
|
|
49
45
|
|
|
@@ -100,20 +96,19 @@ const getRewrites = (
|
|
|
100
96
|
const lambda = exprs.elam(hole, "", frame);
|
|
101
97
|
const fill = (inner: Expr) => exprs.substitute([[hole, inner]], frame);
|
|
102
98
|
const makeBoolCase = (getRule: (prefix: [Expr, Expr, Expr, Expr, Expr, Expr]) => Rule) => {
|
|
103
|
-
const
|
|
99
|
+
const trueEquality = equal(exprs, term, TRUE);
|
|
104
100
|
const whenTrue = fill(TRUE);
|
|
105
|
-
const
|
|
101
|
+
const falseEquality = equal(exprs, term, FALSE);
|
|
106
102
|
const whenFalse = fill(FALSE);
|
|
107
103
|
return make(
|
|
108
|
-
getRule([fill(term),
|
|
104
|
+
getRule([fill(term), trueEquality, whenTrue, falseEquality, whenFalse, lambda]),
|
|
109
105
|
[],
|
|
110
106
|
[
|
|
111
|
-
[
|
|
112
|
-
[
|
|
107
|
+
[trueEquality, whenTrue],
|
|
108
|
+
[falseEquality, whenFalse],
|
|
113
109
|
],
|
|
114
110
|
);
|
|
115
111
|
};
|
|
116
|
-
// Rewrites the term with the equalities on the branch whose other side has one of these heads.
|
|
117
112
|
const makeEqualityRewrites = (wrapped: Expr, heads: string[], subterm: Expr) => {
|
|
118
113
|
const hasGoodHead = (other: Expr) =>
|
|
119
114
|
(other.kind === "app" || other.kind === "var") &&
|
|
@@ -199,19 +194,19 @@ const getRewrites = (
|
|
|
199
194
|
const point = fcn.args[1];
|
|
200
195
|
const value = fcn.args[2];
|
|
201
196
|
const inDomain = member(exprs, argument, domain(exprs, base));
|
|
202
|
-
const
|
|
197
|
+
const pointEquality = equal(exprs, point, argument);
|
|
203
198
|
const changed = fill(value);
|
|
204
|
-
const
|
|
199
|
+
const pointInequality = exprs.enot(equal(exprs, point, argument));
|
|
205
200
|
const unchanged = fill(fapply(exprs, base, argument));
|
|
206
201
|
const outside = exprs.enot(inDomain);
|
|
207
202
|
return make(
|
|
208
203
|
makeRule("fapplyexcept", [
|
|
209
204
|
fill(term),
|
|
210
205
|
inDomain,
|
|
211
|
-
|
|
206
|
+
pointEquality,
|
|
212
207
|
changed,
|
|
213
208
|
inDomain,
|
|
214
|
-
|
|
209
|
+
pointInequality,
|
|
215
210
|
unchanged,
|
|
216
211
|
outside,
|
|
217
212
|
lambda,
|
|
@@ -221,7 +216,7 @@ const getRewrites = (
|
|
|
221
216
|
argument,
|
|
222
217
|
]),
|
|
223
218
|
[],
|
|
224
|
-
[[inDomain,
|
|
219
|
+
[[inDomain, pointEquality, changed], [inDomain, pointInequality, unchanged], [outside]],
|
|
225
220
|
);
|
|
226
221
|
}
|
|
227
222
|
if (isApp(fcn, "TLA.tuple") && isInOneTo(argument, fcn.args.length)) {
|
|
@@ -394,8 +389,6 @@ const hasExistential = (exprs: Expressions, index: Index, choice: BinderExpr) =>
|
|
|
394
389
|
return index.isMember(exprs.eex(choice.args[0], choice.symbol, body));
|
|
395
390
|
};
|
|
396
391
|
|
|
397
|
-
// Zenon's find_rewrites: the rewrites of the outermost subterm that has some, looking through
|
|
398
|
-
// applications and negations.
|
|
399
392
|
const findRewrites = (
|
|
400
393
|
context: TlaContext,
|
|
401
394
|
isInTerm: boolean,
|
|
@@ -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,
|
|
@@ -33,20 +30,17 @@ export const getMembershipNodes = (literal: Literal): Item[] | undefined => {
|
|
|
33
30
|
const formula = literal.formula;
|
|
34
31
|
const isNegated = literal.isNegated;
|
|
35
32
|
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
33
|
if (relation?.symbol === "TLA.in") {
|
|
41
34
|
const element = relation.args[0];
|
|
42
35
|
const set = relation.args[1];
|
|
43
36
|
if (!isNegated && isVariable(set, "TLA.emptyset"))
|
|
44
|
-
return
|
|
37
|
+
return makeExtensionNode(literal, "prop", makeRule("in_emptyset", [formula, element]), []);
|
|
45
38
|
if (isApp(set, "TLA.upair", 2)) {
|
|
46
39
|
const first = equal(exprs, element, set.args[0]);
|
|
47
40
|
const second = equal(exprs, element, set.args[1]);
|
|
48
41
|
return isNegated
|
|
49
|
-
?
|
|
42
|
+
? makeExtensionNode(
|
|
43
|
+
literal,
|
|
50
44
|
"prop",
|
|
51
45
|
makeRule("notin_upair", [
|
|
52
46
|
formula,
|
|
@@ -58,7 +52,8 @@ export const getMembershipNodes = (literal: Literal): Item[] | undefined => {
|
|
|
58
52
|
]),
|
|
59
53
|
[[exprs.enot(first), exprs.enot(second)]],
|
|
60
54
|
)
|
|
61
|
-
:
|
|
55
|
+
: makeExtensionNode(
|
|
56
|
+
literal,
|
|
62
57
|
"prop",
|
|
63
58
|
makeRule("in_upair", [formula, first, second, element, set.args[0], set.args[1]]),
|
|
64
59
|
[[first], [second]],
|
|
@@ -72,35 +67,54 @@ export const getMembershipNodes = (literal: Literal): Item[] | undefined => {
|
|
|
72
67
|
const formulas = isEmptyRest
|
|
73
68
|
? equalities
|
|
74
69
|
: [...equalities, member(exprs, element, decomposed[1])];
|
|
75
|
-
return
|
|
70
|
+
return makeExtensionNode(
|
|
71
|
+
literal,
|
|
72
|
+
"prop",
|
|
73
|
+
makeRule("in_addElt", [formula, element, set]),
|
|
74
|
+
getBranches(formulas),
|
|
75
|
+
);
|
|
76
76
|
}
|
|
77
77
|
const inequalities = decomposed[0].map((inner) => exprs.enot(equal(exprs, element, inner)));
|
|
78
78
|
const formulas = isEmptyRest
|
|
79
79
|
? inequalities
|
|
80
80
|
: [exprs.enot(member(exprs, element, decomposed[1])), ...inequalities];
|
|
81
|
-
return
|
|
81
|
+
return makeExtensionNode(literal, "prop", makeRule("notin_addElt", [formula, element, set]), [
|
|
82
|
+
formulas,
|
|
83
|
+
]);
|
|
82
84
|
}
|
|
83
85
|
if (isApp(set, "TLA.set"))
|
|
84
86
|
return isNegated
|
|
85
|
-
?
|
|
87
|
+
? makeExtensionNode(literal, "prop", makeRule("notin_set", [formula, element, set]), [
|
|
86
88
|
set.args.map((inner) => exprs.enot(equal(exprs, element, inner))),
|
|
87
89
|
])
|
|
88
|
-
:
|
|
90
|
+
: makeExtensionNode(
|
|
91
|
+
literal,
|
|
89
92
|
"prop",
|
|
90
93
|
makeRule("in_set", [formula, element, set]),
|
|
91
94
|
getBranches(set.args.map((inner) => equal(exprs, element, inner))),
|
|
92
95
|
);
|
|
93
96
|
if (isNegated && set.kind === "meta")
|
|
94
|
-
return
|
|
97
|
+
return makeInstanceNode(
|
|
98
|
+
literal,
|
|
99
|
+
{ instance: set.args[0] },
|
|
100
|
+
set.args[0],
|
|
101
|
+
exprs.eapp("TLA.set", [element]),
|
|
102
|
+
);
|
|
95
103
|
if (isApp(set, "TLA.SUBSET", 1)) {
|
|
96
104
|
const subset = exprs.eapp("TLA.subseteq", [element, set.args[0]]);
|
|
97
105
|
return isNegated
|
|
98
|
-
?
|
|
106
|
+
? makeExtensionNode(
|
|
107
|
+
literal,
|
|
99
108
|
"prop",
|
|
100
109
|
makeRule("notin_SUBSET", [formula, exprs.enot(subset), element, set.args[0]]),
|
|
101
110
|
[[exprs.enot(subset)]],
|
|
102
111
|
)
|
|
103
|
-
:
|
|
112
|
+
: makeExtensionNode(
|
|
113
|
+
literal,
|
|
114
|
+
"prop",
|
|
115
|
+
makeRule("in_SUBSET", [formula, subset, element, set.args[0]]),
|
|
116
|
+
[[subset]],
|
|
117
|
+
);
|
|
104
118
|
}
|
|
105
119
|
if (isApp(set, "TLA.UNION", 1)) {
|
|
106
120
|
const bound = exprs.newVar();
|
|
@@ -110,12 +124,18 @@ export const getMembershipNodes = (literal: Literal): Item[] | undefined => {
|
|
|
110
124
|
exprs.eand(member(exprs, bound, set.args[0]), member(exprs, element, bound)),
|
|
111
125
|
);
|
|
112
126
|
return isNegated
|
|
113
|
-
?
|
|
127
|
+
? makeExtensionNode(
|
|
128
|
+
literal,
|
|
114
129
|
"arity",
|
|
115
130
|
makeRule("notin_UNION", [formula, exprs.enot(exists), element, set.args[0]]),
|
|
116
131
|
[[exprs.enot(exists)]],
|
|
117
132
|
)
|
|
118
|
-
:
|
|
133
|
+
: makeExtensionNode(
|
|
134
|
+
literal,
|
|
135
|
+
"prop",
|
|
136
|
+
makeRule("in_UNION", [formula, exists, element, set.args[0]]),
|
|
137
|
+
[[exists]],
|
|
138
|
+
);
|
|
119
139
|
}
|
|
120
140
|
const binarySetRules: Record<
|
|
121
141
|
string,
|
|
@@ -138,7 +158,8 @@ export const getMembershipNodes = (literal: Literal): Item[] | undefined => {
|
|
|
138
158
|
const second = isMinus !== isNegated ? exprs.enot(secondPositive) : secondPositive;
|
|
139
159
|
const firstLiteral = isNegated ? exprs.enot(first) : first;
|
|
140
160
|
const isSplit = isNegated ? binarySetRule[3] : binarySetRule[2];
|
|
141
|
-
return
|
|
161
|
+
return makeExtensionNode(
|
|
162
|
+
literal,
|
|
142
163
|
"prop",
|
|
143
164
|
makeRule(isNegated ? binarySetRule[1] : binarySetRule[0], [
|
|
144
165
|
formula,
|
|
@@ -156,7 +177,8 @@ export const getMembershipNodes = (literal: Literal): Item[] | undefined => {
|
|
|
156
177
|
const inBase = member(exprs, element, set.args[0]);
|
|
157
178
|
const holds = exprs.substitute([[predicate.args[0], element]], predicate.args[1]);
|
|
158
179
|
return isNegated
|
|
159
|
-
?
|
|
180
|
+
? makeExtensionNode(
|
|
181
|
+
literal,
|
|
160
182
|
"prop",
|
|
161
183
|
makeRule("notin_subsetof", [
|
|
162
184
|
formula,
|
|
@@ -168,7 +190,8 @@ export const getMembershipNodes = (literal: Literal): Item[] | undefined => {
|
|
|
168
190
|
]),
|
|
169
191
|
[[exprs.enot(inBase)], [exprs.enot(holds)]],
|
|
170
192
|
)
|
|
171
|
-
:
|
|
193
|
+
: makeExtensionNode(
|
|
194
|
+
literal,
|
|
172
195
|
"prop",
|
|
173
196
|
makeRule("in_subsetof", [formula, inBase, holds, element, set.args[0], predicate]),
|
|
174
197
|
[[inBase, holds]],
|
|
@@ -186,7 +209,8 @@ export const getMembershipNodes = (literal: Literal): Item[] | undefined => {
|
|
|
186
209
|
),
|
|
187
210
|
);
|
|
188
211
|
const result = isNegated ? exprs.enot(exists) : exists;
|
|
189
|
-
return
|
|
212
|
+
return makeExtensionNode(
|
|
213
|
+
literal,
|
|
190
214
|
{ instance: result },
|
|
191
215
|
makeRule(isNegated ? "notin_setofall" : "in_setofall", [
|
|
192
216
|
formula,
|
|
@@ -207,20 +231,22 @@ export const getSetEqualityNodes = (literal: Literal): Item[] | undefined => {
|
|
|
207
231
|
const formula = literal.formula;
|
|
208
232
|
const isNegated = literal.isNegated;
|
|
209
233
|
const relation = literal.relation;
|
|
210
|
-
const node = (priority: Priority, rule: Rule, branches: Expr[][]) =>
|
|
211
|
-
makeExtensionNode(literal, priority, rule, branches);
|
|
212
234
|
if (relation?.symbol !== "=") return undefined;
|
|
213
235
|
const left = relation.args[0];
|
|
214
236
|
const right = relation.args[1];
|
|
215
237
|
if (!isNegated && isVariable(right, "TLA.emptyset")) {
|
|
216
238
|
const bound = exprs.newVar();
|
|
217
239
|
const empty = exprs.eall(bound, "", exprs.enot(member(exprs, bound, left)));
|
|
218
|
-
return
|
|
240
|
+
return makeExtensionNode(literal, "arity", makeRule("setequalempty", [formula, empty, left]), [
|
|
241
|
+
[empty],
|
|
242
|
+
]);
|
|
219
243
|
}
|
|
220
244
|
if (!isNegated && isVariable(left, "TLA.emptyset")) {
|
|
221
245
|
const bound = exprs.newVar();
|
|
222
246
|
const empty = exprs.eall(bound, "", exprs.enot(member(exprs, bound, right)));
|
|
223
|
-
return
|
|
247
|
+
return makeExtensionNode(literal, "arity", makeRule("setemptyequal", [formula, empty, right]), [
|
|
248
|
+
[empty],
|
|
249
|
+
]);
|
|
224
250
|
}
|
|
225
251
|
if (isConstructor(SET_CONSTRUCTORS, left) || isConstructor(SET_CONSTRUCTORS, right)) {
|
|
226
252
|
const bound = exprs.newVar();
|
|
@@ -230,7 +256,8 @@ export const getSetEqualityNodes = (literal: Literal): Item[] | undefined => {
|
|
|
230
256
|
exprs.eequiv(member(exprs, bound, left), member(exprs, bound, right)),
|
|
231
257
|
);
|
|
232
258
|
const result = isNegated ? exprs.enot(extensional) : extensional;
|
|
233
|
-
return
|
|
259
|
+
return makeExtensionNode(
|
|
260
|
+
literal,
|
|
234
261
|
{ instance: result },
|
|
235
262
|
makeRule(isNegated ? "notsetequal" : "setequal", [formula, result, left, right]),
|
|
236
263
|
[[result]],
|
|
@@ -239,13 +266,10 @@ export const getSetEqualityNodes = (literal: Literal): Item[] | undefined => {
|
|
|
239
266
|
return undefined;
|
|
240
267
|
};
|
|
241
268
|
|
|
242
|
-
// A metavariable in a set, against the disequalities of that set.
|
|
243
269
|
export const getMetaMembershipNodes = (literal: Literal): Item[] | undefined => {
|
|
244
270
|
const exprs = literal.context.exprs;
|
|
245
271
|
const index = literal.context.index;
|
|
246
272
|
const relation = literal.relation;
|
|
247
|
-
const node = (priority: Priority, rule: Rule, branches: Expr[][]) =>
|
|
248
|
-
makeExtensionNode(literal, priority, rule, branches);
|
|
249
273
|
if (relation?.symbol === "TLA.in" && relation.args[0].kind === "meta") {
|
|
250
274
|
const bound = exprs.newVar();
|
|
251
275
|
return index.findDisequalities(relation.args[1]).flatMap((disequality) => {
|
|
@@ -257,7 +281,8 @@ export const getMetaMembershipNodes = (literal: Literal): Item[] | undefined =>
|
|
|
257
281
|
exprs.eequiv(member(exprs, bound, sides[0]), member(exprs, bound, sides[1])),
|
|
258
282
|
),
|
|
259
283
|
);
|
|
260
|
-
return
|
|
284
|
+
return makeExtensionNode(
|
|
285
|
+
literal,
|
|
261
286
|
{ instance: different },
|
|
262
287
|
makeRule("notsetequal", [disequality, different, sides[0], sides[1]]),
|
|
263
288
|
[[different]],
|
|
@@ -272,8 +297,6 @@ export const getSubsetNodes = (literal: Literal): Item[] | undefined => {
|
|
|
272
297
|
const formula = literal.formula;
|
|
273
298
|
const isNegated = literal.isNegated;
|
|
274
299
|
const relation = literal.relation;
|
|
275
|
-
const node = (priority: Priority, rule: Rule, branches: Expr[][]) =>
|
|
276
|
-
makeExtensionNode(literal, priority, rule, branches);
|
|
277
300
|
if (relation?.symbol === "TLA.subseteq") {
|
|
278
301
|
const left = relation.args[0];
|
|
279
302
|
const right = relation.args[1];
|
|
@@ -281,23 +304,29 @@ export const getSubsetNodes = (literal: Literal): Item[] | undefined => {
|
|
|
281
304
|
const first = exprs.eapp("TLA.subseteq", [left.args[0], right]);
|
|
282
305
|
const second = exprs.eapp("TLA.subseteq", [left.args[1], right]);
|
|
283
306
|
return isNegated
|
|
284
|
-
?
|
|
307
|
+
? makeExtensionNode(
|
|
308
|
+
literal,
|
|
285
309
|
"arity",
|
|
286
310
|
makeRule("not_cup_subseteq", [formula, exprs.enot(first), exprs.enot(second)]),
|
|
287
311
|
[[exprs.enot(first)], [exprs.enot(second)]],
|
|
288
312
|
)
|
|
289
|
-
:
|
|
313
|
+
: makeExtensionNode(literal, "arity", makeRule("cup_subseteq", [formula, first, second]), [
|
|
314
|
+
[first, second],
|
|
315
|
+
]);
|
|
290
316
|
}
|
|
291
317
|
if (isApp(right, "TLA.cap", 2)) {
|
|
292
318
|
// Zenon builds the same subset twice here, from the second set.
|
|
293
319
|
const subset = exprs.eapp("TLA.subseteq", [left, right.args[1]]);
|
|
294
320
|
return isNegated
|
|
295
|
-
?
|
|
321
|
+
? makeExtensionNode(
|
|
322
|
+
literal,
|
|
296
323
|
"arity",
|
|
297
324
|
makeRule("not_subseteq_cap", [formula, exprs.enot(subset), exprs.enot(subset)]),
|
|
298
325
|
[[exprs.enot(subset)], [exprs.enot(subset)]],
|
|
299
326
|
)
|
|
300
|
-
:
|
|
327
|
+
: makeExtensionNode(literal, "arity", makeRule("subseteq_cap", [formula, subset, subset]), [
|
|
328
|
+
[subset, subset],
|
|
329
|
+
]);
|
|
301
330
|
}
|
|
302
331
|
}
|
|
303
332
|
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;
|