tla-ts 0.0.4-dev.702eb98 → 0.0.4-dev.7714e32
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 +32 -6
- package/dist/cli.cjs +1 -1
- package/dist/cli.js +1 -1
- package/dist/deciders.cjs +27 -27
- package/dist/deciders.js +34 -34
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +12 -14
- package/dist/index.d.ts +12 -14
- 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 +516 -25
- package/dist/prove.js +518 -27
- package/dist/run.cjs +45 -0
- package/dist/run.js +45 -0
- package/dist/tlapm.cjs +2 -2
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +76 -86
- package/dist/transfer.js +73 -83
- package/dist/worker.cjs +6 -6
- package/dist/worker.js +6 -6
- package/package.json +1 -1
- package/src/ast.ts +2 -2
- package/src/bags.ts +22 -23
- package/src/builtins.ts +16 -8
- package/src/check.ts +131 -1154
- package/src/{cli-options.ts → cli/options.ts} +54 -9
- package/src/cli/run.ts +63 -0
- package/src/cli/shared.ts +106 -0
- package/src/cli/tlapm.ts +374 -0
- package/src/{run-cli.ts → cli/tlc.ts} +112 -761
- package/src/cli/xml-exporter.ts +221 -0
- package/src/cli.ts +1 -1
- package/src/codegen.ts +17 -15
- package/src/config.ts +5 -5
- package/src/dependencies.ts +4 -6
- package/src/environment.ts +55 -60
- package/src/errors.ts +12 -36
- package/src/evaluate.ts +81 -101
- package/src/exit-codes.ts +1 -1
- package/src/fingerprints.ts +3 -3
- package/src/index.ts +2 -2
- package/src/instances.ts +56 -46
- package/src/java-overrides.ts +79 -41
- package/src/json.ts +31 -36
- package/src/levels.ts +10 -13
- package/src/{live-check.ts → liveness-checker.ts} +169 -142
- package/src/liveness.ts +38 -34
- package/src/obligations/action.ts +58 -105
- package/src/obligations/{anon.ts → anonymize.ts} +44 -52
- package/src/obligations/equality.ts +260 -0
- package/src/obligations/expression.ts +42 -530
- package/src/obligations/format.ts +7 -8
- package/src/obligations/generate.ts +93 -783
- package/src/obligations/index.ts +23 -23
- package/src/obligations/levels.ts +38 -44
- package/src/obligations/module.ts +106 -729
- package/src/obligations/normalize.ts +554 -0
- package/src/obligations/operators.ts +176 -0
- package/src/obligations/pragma.ts +35 -29
- package/src/obligations/printer.ts +98 -209
- package/src/obligations/proof.ts +0 -1
- package/src/obligations/regroup.ts +100 -0
- package/src/obligations/simplify.ts +668 -0
- package/src/obligations/source.ts +92 -192
- package/src/obligations/{deref.ts → subexpression.ts} +82 -113
- package/src/obligations/substitution.ts +261 -0
- package/src/obligations/temporal.ts +32 -30
- package/src/obligations/tuples.ts +37 -53
- package/src/parallel-worker.ts +37 -33
- package/src/parallel.ts +30 -24
- package/src/parser.ts +67 -74
- package/src/{pcal-ast.ts → pcal/ast.ts} +2 -17
- package/src/{pcal-parse.ts → pcal/parse.ts} +28 -64
- package/src/{pcal-tokenize.ts → pcal/tokenize.ts} +10 -39
- package/src/{pcal-translate.ts → pcal/translate.ts} +30 -109
- package/src/{pcal-validate.ts → pcal/validate.ts} +10 -20
- package/src/{prove → prover}/decide-pool.ts +14 -19
- package/src/{prove → prover}/deciders.ts +7 -1
- package/src/{obligations/pickle.ts → prover/first-order.ts} +79 -4
- package/src/{prove → prover}/isabelle/decide.ts +3 -6
- package/src/{prove → prover}/isabelle/encode.ts +106 -138
- package/src/{prove → prover}/isabelle/isar/inner-syntax.ts +1 -1
- package/src/{prove → prover}/isabelle/isar/method.ts +3 -3
- package/src/{prove → prover}/isabelle/isar/type-check.ts +1 -1
- package/src/{prove → prover}/isabelle/provers/blast/blast.ts +1 -1
- package/src/{prove → prover}/isabelle/provers/blast/branch.ts +1 -1
- package/src/{prove → prover}/isabelle/provers/blast/term.ts +3 -4
- package/src/{prove → prover}/isabelle/provers/clasimp.ts +1 -1
- package/src/{prove → prover}/isabelle/provers/classical.ts +3 -3
- package/src/{prove → prover}/isabelle/provers/hypsubst.ts +1 -9
- package/src/{prove → prover}/isabelle/pure/conv.ts +1 -1
- package/src/{prove → prover}/isabelle/pure/drule.ts +2 -2
- package/src/{prove → prover}/isabelle/pure/envir.ts +3 -35
- package/src/{prove → prover}/isabelle/pure/logic.ts +4 -76
- package/src/{prove → prover}/isabelle/pure/name.ts +1 -13
- package/src/{prove → prover}/isabelle/pure/net.ts +2 -49
- package/src/{prove → prover}/isabelle/pure/pattern.ts +3 -22
- package/src/{prove → prover}/isabelle/pure/raw-simplifier.ts +3 -18
- package/src/{prove → prover}/isabelle/pure/seq.ts +0 -23
- package/src/{prove → prover}/isabelle/pure/simplifier.ts +2 -8
- package/src/{prove → prover}/isabelle/pure/table.ts +1 -8
- package/src/{prove → prover}/isabelle/pure/tactic.ts +5 -113
- package/src/{prove → prover}/isabelle/pure/tactical.ts +1 -84
- package/src/{prove → prover}/isabelle/pure/term-ord.ts +1 -55
- package/src/{prove → prover}/isabelle/pure/term.ts +8 -128
- package/src/{prove → prover}/isabelle/pure/thm.ts +4 -27
- package/src/{prove → prover}/isabelle/pure/type.ts +0 -12
- package/src/{prove → prover}/isabelle/pure/unify.ts +1 -1
- package/src/{prove → prover}/isabelle/tla/classical-setup.ts +1 -1
- package/src/{prove → prover}/ocaml.ts +1 -1
- package/src/{prove → prover}/prep/action.ts +54 -66
- package/src/{prove → prover}/prep/enabled-axioms.ts +2 -2
- package/src/{prove → prover}/prep/fingerprint.ts +3 -3
- package/src/{prove → prover}/prep/level-comparison.ts +15 -38
- package/src/{prove → prover}/prep/md5.ts +2 -9
- package/src/{prove/prep/pragma.ts → prover/prep/methods.ts} +4 -4
- package/src/prover/prep/normalize.ts +309 -0
- package/src/{prove → prover}/prove-worker.ts +4 -11
- package/src/prover/prove.ts +492 -0
- package/src/{prove → prover}/ptl/encode.ts +19 -31
- package/src/{prove → prover}/smt/axioms.ts +78 -79
- package/src/{prove → prover}/smt/data.ts +16 -45
- package/src/{prove → prover}/smt/encode.ts +134 -28
- package/src/{prove → prover}/smt/extensionality.ts +14 -12
- package/src/{prove → prover}/smt/flatten.ts +3 -18
- package/src/{prove → prover}/smt/format.ts +14 -3
- package/src/{prove → prover}/smt/instances.ts +4 -5
- package/src/{prove → prover}/smt/rewrite.ts +41 -59
- package/src/{prove → prover}/smt/solver/ast-util.ts +0 -56
- package/src/{prove → prover}/smt/solver/case-split-queue.ts +1 -1
- package/src/{prove → prover}/smt/solver/enode.ts +1 -1
- package/src/{prove → prover}/smt/solver/lp/dep-intervals.ts +0 -14
- package/src/{prove → prover}/smt/solver/model-macro-solver.ts +1 -1
- package/src/{prove → prover}/smt/solver/nlsat/algebraic.ts +3 -3
- package/src/{prove → prover}/smt/solver/nlsat/atoms.ts +1 -1
- package/src/{prove → prover}/smt/solver/nlsat/explain.ts +1 -1
- package/src/{prove → prover}/smt/solver/nlsat/interval-set.ts +1 -1
- package/src/{prove → prover}/smt/solver/nlsat/levelwise.ts +4 -7
- package/src/{prove → prover}/smt/solver/nlsat/polynomial.ts +4 -4
- package/src/{prove → prover}/smt/solver/nlsat/upolynomial.ts +2 -2
- package/src/{prove → prover}/smt/solver/pattern-inference.ts +1 -1
- package/src/{prove → prover}/smt/solver/relevancy.ts +2 -2
- package/src/{prove → prover}/smt/solver/rewriter.ts +1 -1
- package/src/{prove → prover}/smt/solver/solver.ts +2 -2
- package/src/prover/tlapm/cache.ts +236 -0
- package/src/prover/tlapm/ocaml-marshal.ts +166 -0
- package/src/{prove → prover}/tlapm/tlapm.ts +1 -2
- package/src/prover/verdict.ts +13 -0
- package/src/{prove → prover}/zenon/decide.ts +5 -11
- package/src/{prove → prover}/zenon/encode.ts +40 -106
- package/src/{prove → prover}/zenon/eqrel.ts +1 -1
- package/src/{prove → prover}/zenon/equality-rules.ts +1 -1
- package/src/{prove → prover}/zenon/expr.ts +2 -2
- package/src/{prove → prover}/zenon/index-table.ts +1 -1
- package/src/{prove → prover}/zenon/isar.ts +1 -1
- package/src/{prove → prover}/zenon/llproof.ts +1 -1
- package/src/{prove → prover}/zenon/mltoll.ts +1 -1
- package/src/{prove → prover}/zenon/node.ts +1 -1
- package/src/{prove → prover}/zenon/search.ts +1 -1
- package/src/{prove → prover}/zenon/tla/terms.ts +1 -20
- package/src/{prove → prover}/zenon/tla/tla.ts +1 -1
- package/src/randomization.ts +19 -24
- package/src/resolve.ts +15 -22
- package/src/runtime.ts +8 -8
- package/src/{sany-builtins.ts → sany/builtins.ts} +1 -1
- package/src/{sany-generator.ts → sany/generator.ts} +38 -55
- package/src/{sany-levels.ts → sany/levels.ts} +45 -48
- package/src/{sany-lexer.ts → sany/lexer.ts} +2 -3
- package/src/{sany-linter.ts → sany/linter.ts} +1 -1
- package/src/{sany-modules.ts → sany/modules.ts} +2 -2
- package/src/{sany-nodes.ts → sany/nodes.ts} +2 -2
- package/src/{sany-parse-error.ts → sany/parse-error.ts} +2 -2
- package/src/{sany-report.ts → sany/report.ts} +16 -17
- package/src/{sany-selectors.ts → sany/selectors.ts} +3 -5
- package/src/{sany-source.ts → sany/source.ts} +6 -7
- package/src/{sany-xml.ts → sany/xml.ts} +5 -6
- package/src/search.ts +969 -0
- package/src/spec-description.ts +26 -20
- package/src/{standard-levels.ts → standard-definitions.ts} +118 -2
- package/src/standard-modules.ts +16 -20
- package/src/state-graph.ts +9 -8
- package/src/substitution-levels.ts +2 -2
- package/src/successors.ts +16 -19
- package/src/symmetry.ts +1 -1
- package/src/tableau.ts +6 -7
- package/src/tlc/fingerprint.ts +214 -0
- package/src/{tlc-messages.ts → tlc/messages.ts} +119 -7
- package/src/{tlc-order.ts → tlc/order.ts} +7 -7
- package/src/{tlc-random.ts → tlc/random.ts} +3 -213
- package/src/{tlc-replay.ts → tlc/replay.ts} +40 -36
- package/src/{tlc-module.ts → tlc/tlc-operators.ts} +9 -9
- package/src/{tlc-ext.ts → tlc/tlcext-operators.ts} +30 -25
- package/src/transfer.ts +32 -32
- package/src/values.ts +72 -67
- package/src/worker.ts +1 -4
- package/dist/run-cli.cjs +0 -38
- package/dist/run-cli.js +0 -38
- package/src/canonical.ts +0 -40
- package/src/obligations/ctx.ts +0 -64
- package/src/prove/prep/defs.ts +0 -27
- package/src/prove/prep/elab.ts +0 -156
- package/src/prove/prep/enabled.ts +0 -43
- package/src/prove/prep/flatten.ts +0 -70
- package/src/prove/prep/trivial.ts +0 -22
- package/src/prove/prove.ts +0 -417
- package/src/prove/smt/axiomatize.ts +0 -69
- package/src/prove/smt/simplify.ts +0 -57
- package/src/prove/verdict.ts +0 -13
- package/src/standard-ranges.ts +0 -116
- package/src/value-sources.ts +0 -29
- /package/src/{prove → prover}/isabelle/LICENSE +0 -0
- /package/src/{prove → prover}/isabelle/LICENSE-tlapm +0 -0
- /package/src/{prove → prover}/isabelle/isar/proof.ts +0 -0
- /package/src/{prove → prover}/isabelle/isar/statement.ts +0 -0
- /package/src/{prove → prover}/isabelle/isar/theory.ts +0 -0
- /package/src/{prove → prover}/isabelle/provers/blast/prove.ts +0 -0
- /package/src/{prove → prover}/isabelle/provers/blast/rules.ts +0 -0
- /package/src/{prove → prover}/isabelle/provers/blast/state.ts +0 -0
- /package/src/{prove → prover}/isabelle/pure/bicompose.ts +0 -0
- /package/src/{prove → prover}/isabelle/pure/consts.ts +0 -0
- /package/src/{prove → prover}/isabelle/pure/goal.ts +0 -0
- /package/src/{prove → prover}/isabelle/pure/interrupt.ts +0 -0
- /package/src/{prove → prover}/isabelle/pure/list.ts +0 -0
- /package/src/{prove → prover}/isabelle/pure/object-logic.ts +0 -0
- /package/src/{prove → prover}/isabelle/pure/rewriter.ts +0 -0
- /package/src/{prove → prover}/isabelle/pure/search.ts +0 -0
- /package/src/{prove → prover}/isabelle/pure/variable.ts +0 -0
- /package/src/{prove → prover}/isabelle/tla/context.ts +0 -0
- /package/src/{prove → prover}/isabelle/tla/logic-data.ts +0 -0
- /package/src/{prove → prover}/isabelle/tla/logic.ts +0 -0
- /package/src/{prove → prover}/isabelle/tla/simpdata.ts +0 -0
- /package/src/{prove → prover}/isabelle/tools/intuitionistic.ts +0 -0
- /package/src/{prove → prover}/ptl/decide.ts +0 -0
- /package/src/{prove → prover}/ptl/sat.ts +0 -0
- /package/src/{prove → prover}/ptl/tableau.ts +0 -0
- /package/src/{prove → prover}/smt/context.ts +0 -0
- /package/src/{prove → prover}/smt/solver/act-cache.ts +0 -0
- /package/src/{prove → prover}/smt/solver/arith-rewriter.ts +0 -0
- /package/src/{prove → prover}/smt/solver/array.ts +0 -0
- /package/src/{prove → prover}/smt/solver/asserted-formulas.ts +0 -0
- /package/src/{prove → prover}/smt/solver/ast-lt.ts +0 -0
- /package/src/{prove → prover}/smt/solver/ast.ts +0 -0
- /package/src/{prove → prover}/smt/solver/auf-solver.ts +0 -0
- /package/src/{prove → prover}/smt/solver/cg-table.ts +0 -0
- /package/src/{prove → prover}/smt/solver/clause.ts +0 -0
- /package/src/{prove → prover}/smt/solver/conflict-resolution.ts +0 -0
- /package/src/{prove → prover}/smt/solver/context.ts +0 -0
- /package/src/{prove → prover}/smt/solver/ctx-simplify.ts +0 -0
- /package/src/{prove → prover}/smt/solver/der.ts +0 -0
- /package/src/{prove → prover}/smt/solver/dyn-ack.ts +0 -0
- /package/src/{prove → prover}/smt/solver/e-matching.ts +0 -0
- /package/src/{prove → prover}/smt/solver/expr-ref.ts +0 -0
- /package/src/{prove → prover}/smt/solver/expr-safe-replace.ts +0 -0
- /package/src/{prove → prover}/smt/solver/fingerprints.ts +0 -0
- /package/src/{prove → prover}/smt/solver/flat-literals.ts +0 -0
- /package/src/{prove → prover}/smt/solver/goal.ts +0 -0
- /package/src/{prove → prover}/smt/solver/hash.ts +0 -0
- /package/src/{prove → prover}/smt/solver/hashtable.ts +0 -0
- /package/src/{prove → prover}/smt/solver/internalizer.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lbool.ts +0 -0
- /package/src/{prove → prover}/smt/solver/literal.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/bound-propagator.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/constraints.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/containers.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/core-solver.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/cross-nested.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/dependency.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/dioph-eq.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/explanation.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/gomory.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/hnf-cutter.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/hnf.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/int-cube.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/int-solver.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/lar-solver.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/lar-term.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/lp-settings.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/maximize-term.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/nex-creator.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/nex.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/nla-backoff.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/nla-basics.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/nla-core.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/nla-divisions.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/nla-emonics.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/nla-factorization.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/nla-grobner.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/nla-horner.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/nla-intervals.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/nla-monomial-bounds.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/nla-monotone.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/nla-order.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/nla-patcher.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/nla-tangents.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/nla-throttle.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/nla-types.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/nla-var-eqs.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/nra-solver.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/numeric-pair.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/pdd-interval.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/pdd-simplifier.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/pdd-solver.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/pdd.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/random-updater.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/static-matrix.ts +0 -0
- /package/src/{prove → prover}/smt/solver/lp/union-find.ts +0 -0
- /package/src/{prove → prover}/smt/solver/mam-compiler.ts +0 -0
- /package/src/{prove → prover}/smt/solver/mam-interpreter.ts +0 -0
- /package/src/{prove → prover}/smt/solver/maximize-ac-sharing.ts +0 -0
- /package/src/{prove → prover}/smt/solver/model-checker.ts +0 -0
- /package/src/{prove → prover}/smt/solver/model-evaluator.ts +0 -0
- /package/src/{prove → prover}/smt/solver/model-finder.ts +0 -0
- /package/src/{prove → prover}/smt/solver/model-generator.ts +0 -0
- /package/src/{prove → prover}/smt/solver/nlsat/evaluator.ts +0 -0
- /package/src/{prove → prover}/smt/solver/nlsat/mpbq.ts +0 -0
- /package/src/{prove → prover}/smt/solver/nlsat/solver.ts +0 -0
- /package/src/{prove → prover}/smt/solver/nlsat/types.ts +0 -0
- /package/src/{prove → prover}/smt/solver/nlsat/upolynomial-factorization.ts +0 -0
- /package/src/{prove → prover}/smt/solver/nnf.ts +0 -0
- /package/src/{prove → prover}/smt/solver/poly-rewriter.ts +0 -0
- /package/src/{prove → prover}/smt/solver/propagate-values.ts +0 -0
- /package/src/{prove → prover}/smt/solver/proto-model.ts +0 -0
- /package/src/{prove → prover}/smt/solver/pull-quant.ts +0 -0
- /package/src/{prove → prover}/smt/solver/qe-lite-der.ts +0 -0
- /package/src/{prove → prover}/smt/solver/qe-lite-fm.ts +0 -0
- /package/src/{prove → prover}/smt/solver/qe-lite.ts +0 -0
- /package/src/{prove → prover}/smt/solver/qi-queue.ts +0 -0
- /package/src/{prove → prover}/smt/solver/quant-tactics.ts +0 -0
- /package/src/{prove → prover}/smt/solver/quantifier-analyzer.ts +0 -0
- /package/src/{prove → prover}/smt/solver/quantifier-manager.ts +0 -0
- /package/src/{prove → prover}/smt/solver/random-gen.ts +0 -0
- /package/src/{prove → prover}/smt/solver/rational.ts +0 -0
- /package/src/{prove → prover}/smt/solver/ref-vector.ts +0 -0
- /package/src/{prove → prover}/smt/solver/rewriter-tpl.ts +0 -0
- /package/src/{prove → prover}/smt/solver/rlimit.ts +0 -0
- /package/src/{prove → prover}/smt/solver/smtlib-parser.ts +0 -0
- /package/src/{prove → prover}/smt/solver/sort.ts +0 -0
- /package/src/{prove → prover}/smt/solver/sticky-generations.ts +0 -0
- /package/src/{prove → prover}/smt/solver/theory-lra-axioms.ts +0 -0
- /package/src/{prove → prover}/smt/solver/theory-lra-bounds.ts +0 -0
- /package/src/{prove → prover}/smt/solver/theory-lra-final-check.ts +0 -0
- /package/src/{prove → prover}/smt/solver/theory-lra-internalize.ts +0 -0
- /package/src/{prove → prover}/smt/solver/theory-lra-model.ts +0 -0
- /package/src/{prove → prover}/smt/solver/theory-lra-propagate.ts +0 -0
- /package/src/{prove → prover}/smt/solver/theory-lra-state.ts +0 -0
- /package/src/{prove → prover}/smt/solver/theory-lra.ts +0 -0
- /package/src/{prove → prover}/smt/solver/var-subst.ts +0 -0
- /package/src/{prove → prover}/smt/solver/z3-license.txt +0 -0
- /package/src/{prove → prover}/smt/table.ts +0 -0
- /package/src/{prove → prover}/tlaps-module.ts +0 -0
- /package/src/{prove → prover}/zenon/LICENSE +0 -0
- /package/src/{prove → prover}/zenon/check/check.ts +0 -0
- /package/src/{prove → prover}/zenon/check/definitions.ts +0 -0
- /package/src/{prove → prover}/zenon/check/equality.ts +0 -0
- /package/src/{prove → prover}/zenon/check/functions.ts +0 -0
- /package/src/{prove → prover}/zenon/check/keys.ts +0 -0
- /package/src/{prove → prover}/zenon/check/propositional.ts +0 -0
- /package/src/{prove → prover}/zenon/check/records.ts +0 -0
- /package/src/{prove → prover}/zenon/check/relations.ts +0 -0
- /package/src/{prove → prover}/zenon/check/rewrites.ts +0 -0
- /package/src/{prove → prover}/zenon/check/sets.ts +0 -0
- /package/src/{prove → prover}/zenon/check/terms.ts +0 -0
- /package/src/{prove → prover}/zenon/check/tla.ts +0 -0
- /package/src/{prove → prover}/zenon/isar-case.ts +0 -0
- /package/src/{prove → prover}/zenon/limits.ts +0 -0
- /package/src/{prove → prover}/zenon/ocaml.ts +0 -0
- /package/src/{prove → prover}/zenon/parse.ts +0 -0
- /package/src/{prove → prover}/zenon/phrase.ts +0 -0
- /package/src/{prove → prover}/zenon/proof.ts +0 -0
- /package/src/{prove → prover}/zenon/propositional-rules.ts +0 -0
- /package/src/{prove → prover}/zenon/rules.ts +0 -0
- /package/src/{prove → prover}/zenon/tla/functions.ts +0 -0
- /package/src/{prove → prover}/zenon/tla/llproof.ts +0 -0
- /package/src/{prove → prover}/zenon/tla/records.ts +0 -0
- /package/src/{prove → prover}/zenon/tla/rewrites.ts +0 -0
- /package/src/{prove → prover}/zenon/tla/sets.ts +0 -0
- /package/src/{tlc-modules.ts → tlc/jar-data.ts} +0 -0
- /package/src/{tlc-summary.ts → tlc/summary.ts} +0 -0
- /package/src/{tlc-version.ts → tlc/version.ts} +0 -0
|
@@ -90,18 +90,6 @@ export const matchTypes = (pattern: Typ, object: Typ, tyenv: TyEnv): TyEnv | und
|
|
|
90
90
|
return object.kind === "TFree" && object.name === pattern.name ? tyenv : undefined;
|
|
91
91
|
};
|
|
92
92
|
|
|
93
|
-
// Type.could_unify
|
|
94
|
-
export const couldUnifyTypes = (left: Typ, right: Typ): boolean => {
|
|
95
|
-
if (left.kind === "TVar" || right.kind === "TVar") return true;
|
|
96
|
-
if (left.kind === "Type" && right.kind === "Type")
|
|
97
|
-
return (
|
|
98
|
-
left.name === right.name &&
|
|
99
|
-
left.args.length === right.args.length &&
|
|
100
|
-
left.args.every((arg, index) => couldUnifyTypes(arg, right.args[index]))
|
|
101
|
-
);
|
|
102
|
-
return left.kind === "TFree" && right.kind === "TFree" && left.name === right.name;
|
|
103
|
-
};
|
|
104
|
-
|
|
105
93
|
// Envir.norm_type: instantiates the assigned type variables, chasing chains.
|
|
106
94
|
export const normType = (tyenv: TyEnv, type: Typ): Typ => {
|
|
107
95
|
if (type.kind === "TFree") return type;
|
|
@@ -653,7 +653,7 @@ const addFfpair = (dpair: Dpair, envir: Envir, tpairs: readonly Tpair[]): [Envir
|
|
|
653
653
|
: cleanFfpair({ binders: dpair.binders, left, right }, envir, tpairs);
|
|
654
654
|
};
|
|
655
655
|
|
|
656
|
-
|
|
656
|
+
interface Unifier {
|
|
657
657
|
readonly envir: Envir;
|
|
658
658
|
readonly tpairs: readonly Tpair[];
|
|
659
659
|
}
|
|
@@ -37,7 +37,7 @@ const destBinary = (name: string, term: Term): [Term, Term] => {
|
|
|
37
37
|
throw new TlaIsabelleError("TERM", `dest ${name}`);
|
|
38
38
|
};
|
|
39
39
|
|
|
40
|
-
|
|
40
|
+
const destTrueprop = (term: Term): Term => {
|
|
41
41
|
if (
|
|
42
42
|
term.kind === "App" &&
|
|
43
43
|
term.fun.kind === "Const" &&
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
// The parts of OCaml's standard library whose exact order steers what tlapm prints.
|
|
2
2
|
|
|
3
|
-
|
|
3
|
+
type OcamlValue = number | string | OcamlValue[];
|
|
4
4
|
|
|
5
5
|
// String.compare: byte by byte, on the UTF-8 bytes. Code units order the same way for the ASCII
|
|
6
6
|
// names tlapm compares.
|
|
@@ -3,14 +3,18 @@
|
|
|
3
3
|
// down to the variables (Symbol_commute), and what remains modal becomes opaque (Coalesce).
|
|
4
4
|
|
|
5
5
|
import { TlapmBugError } from "../../errors";
|
|
6
|
-
import { rewriteUnchanged } from "../../obligations/
|
|
6
|
+
import { rewriteUnchanged } from "../../obligations/temporal";
|
|
7
7
|
import {
|
|
8
8
|
adjoin,
|
|
9
|
+
adjoinAll,
|
|
9
10
|
applyBuiltin,
|
|
10
11
|
at,
|
|
11
12
|
createContextMap,
|
|
12
13
|
getBoundedFresh,
|
|
14
|
+
getBoundFresh,
|
|
13
15
|
getFresh,
|
|
16
|
+
getLocalDefn,
|
|
17
|
+
getParamFresh,
|
|
14
18
|
getScopeAt,
|
|
15
19
|
getScopeHyps,
|
|
16
20
|
mapAccumulate,
|
|
@@ -29,7 +33,7 @@ import { getLevelInfo } from "../../obligations/levels";
|
|
|
29
33
|
import { printExpression } from "../../obligations/printer";
|
|
30
34
|
import { getMd5 } from "./md5";
|
|
31
35
|
|
|
32
|
-
type
|
|
36
|
+
type Rewrite = (scope: Scope | undefined, expression: Expr) => Expr;
|
|
33
37
|
|
|
34
38
|
const getHyp = (scope: Scope | undefined, index: number) => {
|
|
35
39
|
const hyp = getScopeAt(scope, index - 1)?.hyp;
|
|
@@ -47,7 +51,7 @@ const isBuiltin = (expression: Expr, builtins: Builtin[]) =>
|
|
|
47
51
|
|
|
48
52
|
// Visit.map over a sequent: each hypothesis maps in the scope before it, hidden ones too if hyps
|
|
49
53
|
// is "all". The context maps by the obligation's own hypotheses, from which it derives.
|
|
50
|
-
const createSequentMap = (map:
|
|
54
|
+
const createSequentMap = (map: Rewrite, hyps: "visible" | "all") => {
|
|
51
55
|
const mapContext = createContextMap<Scope | undefined>(undefined, (scope, hyp) => {
|
|
52
56
|
const mapped = mapHyp(hyp, (inner) => map(scope, inner), hyps);
|
|
53
57
|
return [adjoin(scope, mapped), mapped];
|
|
@@ -59,7 +63,7 @@ const createSequentMap = (map: Map, hyps: "visible" | "all") => {
|
|
|
59
63
|
};
|
|
60
64
|
|
|
61
65
|
// Expr.Tla_norm.expand_action, then expand_unchanged.
|
|
62
|
-
const expandAction:
|
|
66
|
+
const expandAction: Rewrite = (scope, expression) => {
|
|
63
67
|
if (expression.kind === "Sub" || expression.kind === "Tsub") {
|
|
64
68
|
const action = expandAction(scope, expression.action);
|
|
65
69
|
const subscript = expandAction(scope, expression.subscript);
|
|
@@ -74,18 +78,18 @@ const expandAction: Map = (scope, expression) => {
|
|
|
74
78
|
return mapScoped(scope, expression, expandAction, adjoin, "all");
|
|
75
79
|
};
|
|
76
80
|
|
|
77
|
-
const expandUnchanged:
|
|
81
|
+
const expandUnchanged: Rewrite = (scope, expression) =>
|
|
78
82
|
expression.kind === "Apply" &&
|
|
79
83
|
isBuiltin(expression, ["UNCHANGED"]) &&
|
|
80
84
|
expression.args.length === 1
|
|
81
85
|
? rewriteUnchanged(expression.args[0])
|
|
82
86
|
: mapScoped(scope, expression, expandUnchanged, adjoin, "all");
|
|
83
87
|
|
|
84
|
-
const
|
|
88
|
+
const applyModal = (builtin: Builtin, expression: Expr) =>
|
|
85
89
|
applyBuiltin(builtin, [expression], expression);
|
|
86
90
|
|
|
87
91
|
// prime_commuter: a prime distributes down to the declarations that are not constant.
|
|
88
|
-
const commutePrime:
|
|
92
|
+
const commutePrime: Rewrite = (scope, expression) => {
|
|
89
93
|
if (expression.kind === "Ix") {
|
|
90
94
|
const hyp = getHyp(scope, expression.index);
|
|
91
95
|
if (hyp.kind === "Fresh" && hyp.level === "Constant") return expression;
|
|
@@ -95,7 +99,7 @@ const commutePrime: Map = (scope, expression) => {
|
|
|
95
99
|
getLevel(getScopeAt(scope, expression.index), hyp.definition.body) === 0
|
|
96
100
|
)
|
|
97
101
|
return expression;
|
|
98
|
-
return
|
|
102
|
+
return applyModal("Prime", expression);
|
|
99
103
|
}
|
|
100
104
|
if (
|
|
101
105
|
isBuiltin(expression, ["ENABLED"]) ||
|
|
@@ -103,7 +107,7 @@ const commutePrime: Map = (scope, expression) => {
|
|
|
103
107
|
expression.kind === "Sequent" ||
|
|
104
108
|
expression.kind === "Let"
|
|
105
109
|
)
|
|
106
|
-
return
|
|
110
|
+
return applyModal("Prime", expression);
|
|
107
111
|
if (
|
|
108
112
|
isBuiltin(expression, [
|
|
109
113
|
"UNCHANGED",
|
|
@@ -125,10 +129,10 @@ const commutePrime: Map = (scope, expression) => {
|
|
|
125
129
|
|
|
126
130
|
// box_commuter and dia_commuter: [] distributes over /\ and \A, and <> over \/ and \E, and both
|
|
127
131
|
// vanish on a constant.
|
|
128
|
-
const getModalCommuter = (builtin: "BoxTrue" | "Diamond"):
|
|
132
|
+
const getModalCommuter = (builtin: "BoxTrue" | "Diamond"): Rewrite => {
|
|
129
133
|
const connective: Builtin = builtin === "BoxTrue" ? "Conj" : "Disj";
|
|
130
134
|
const quantifier = builtin === "BoxTrue" ? "Forall" : "Exists";
|
|
131
|
-
const commute:
|
|
135
|
+
const commute: Rewrite = (scope, expression) => {
|
|
132
136
|
if (getLevel(scope, expression) === 0) return expression;
|
|
133
137
|
const isDistributed =
|
|
134
138
|
isBuiltin(expression, [connective]) ||
|
|
@@ -136,19 +140,19 @@ const getModalCommuter = (builtin: "BoxTrue" | "Diamond"): Map => {
|
|
|
136
140
|
expression.quantifier === quantifier);
|
|
137
141
|
return isDistributed
|
|
138
142
|
? mapScoped(scope, expression, commute, adjoin)
|
|
139
|
-
:
|
|
143
|
+
: applyModal(builtin, expression);
|
|
140
144
|
};
|
|
141
145
|
return commute;
|
|
142
146
|
};
|
|
143
147
|
|
|
144
|
-
const COMMUTERS: Partial<Record<Builtin,
|
|
148
|
+
const COMMUTERS: Partial<Record<Builtin, Rewrite>> = {
|
|
145
149
|
Prime: commutePrime,
|
|
146
150
|
BoxTrue: getModalCommuter("BoxTrue"),
|
|
147
151
|
Diamond: getModalCommuter("Diamond"),
|
|
148
152
|
};
|
|
149
153
|
|
|
150
154
|
// symbol_commute: each prime, [] and <> commutes down its operand.
|
|
151
|
-
const commuteSymbols:
|
|
155
|
+
const commuteSymbols: Rewrite = (scope, expression) => {
|
|
152
156
|
if (expression.kind === "Apply" && expression.operator.kind === "Internal") {
|
|
153
157
|
const commuter = COMMUTERS[expression.operator.builtin];
|
|
154
158
|
if (commuter) {
|
|
@@ -159,9 +163,9 @@ const commuteSymbols: Map = (scope, expression) => {
|
|
|
159
163
|
return mapScoped(scope, expression, commuteSymbols, adjoin, "all");
|
|
160
164
|
};
|
|
161
165
|
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
const
|
|
166
|
+
// The prefix rename_with_loc gives a declaration of each level, and a definition by the number of
|
|
167
|
+
// its body's level.
|
|
168
|
+
export const LEVEL_PREFIXES: Record<Level, string> = {
|
|
165
169
|
Constant: "CONSTANT",
|
|
166
170
|
State: "STATE",
|
|
167
171
|
Action: "ACTION",
|
|
@@ -169,6 +173,8 @@ const FRESH_KINDS: Record<Level, string> = {
|
|
|
169
173
|
Unknown: "Unknown",
|
|
170
174
|
};
|
|
171
175
|
|
|
176
|
+
export const LEVEL_NUMBER_PREFIXES = ["CONSTANT", "STATE", "ACTION", "TEMPORAL"];
|
|
177
|
+
|
|
172
178
|
const getRenamed = (kind: string, name: string) => `${kind}_${name}_`;
|
|
173
179
|
|
|
174
180
|
interface RenameState {
|
|
@@ -185,7 +191,7 @@ const renameDefn = (scope: Scope | undefined, definition: Defn, level?: number):
|
|
|
185
191
|
: definition;
|
|
186
192
|
}
|
|
187
193
|
const body = rename(scope, definition.body);
|
|
188
|
-
const kind =
|
|
194
|
+
const kind = LEVEL_NUMBER_PREFIXES[level ?? getLevel(scope, body)];
|
|
189
195
|
if (kind === undefined) throw new TlapmBugError();
|
|
190
196
|
return { ...definition, name: getRenamed(kind, definition.name), body };
|
|
191
197
|
};
|
|
@@ -195,7 +201,7 @@ const renameHyp = (scope: Scope | undefined, hyp: Hyp, level?: number): Hyp => {
|
|
|
195
201
|
case "Fresh":
|
|
196
202
|
return {
|
|
197
203
|
...hyp,
|
|
198
|
-
name: getRenamed(
|
|
204
|
+
name: getRenamed(LEVEL_PREFIXES[hyp.level], hyp.name),
|
|
199
205
|
domain: hyp.domain && rename(scope, hyp.domain),
|
|
200
206
|
};
|
|
201
207
|
case "Flex":
|
|
@@ -256,23 +262,20 @@ const renameSequent = (scope: Scope | undefined, sequent: Sequent): Sequent => {
|
|
|
256
262
|
return { context, active: rename(inner, sequent.active) };
|
|
257
263
|
};
|
|
258
264
|
|
|
259
|
-
const rename:
|
|
265
|
+
const rename: Rewrite = (scope, expression) => {
|
|
260
266
|
switch (expression.kind) {
|
|
261
267
|
case "Lambda": {
|
|
262
268
|
const params = expression.params.map((param) => ({
|
|
263
269
|
...param,
|
|
264
270
|
name: getRenamed("Unknown", param.name),
|
|
265
271
|
}));
|
|
266
|
-
const inner = params.
|
|
267
|
-
(current, param) => adjoin(current, getFresh(param.name, "Unknown", param.shape)),
|
|
268
|
-
scope,
|
|
269
|
-
);
|
|
272
|
+
const inner = adjoinAll(scope, params.map(getParamFresh));
|
|
270
273
|
return { ...expression, params, body: rename(inner, expression.body) };
|
|
271
274
|
}
|
|
272
275
|
case "Tquant": {
|
|
273
|
-
const inner =
|
|
274
|
-
(current, name) => adjoin(current, { kind: "Flex", name: getRenamed("VARIABLE", name) }),
|
|
276
|
+
const inner = adjoinAll(
|
|
275
277
|
scope,
|
|
278
|
+
expression.names.map((name) => ({ kind: "Flex", name: getRenamed("VARIABLE", name) })),
|
|
276
279
|
);
|
|
277
280
|
return { ...expression, body: rename(inner, expression.body) };
|
|
278
281
|
}
|
|
@@ -293,16 +296,13 @@ const rename: Map = (scope, expression) => {
|
|
|
293
296
|
case "SetOf": {
|
|
294
297
|
const bounds = expression.bounds.map((bound) => ({
|
|
295
298
|
...bound,
|
|
296
|
-
name: getRenamed(
|
|
299
|
+
name: getRenamed(LEVEL_PREFIXES[bound.level], bound.name),
|
|
297
300
|
domain:
|
|
298
301
|
bound.domain.kind === "Domain"
|
|
299
302
|
? { kind: "Domain" as const, expression: rename(scope, bound.domain.expression) }
|
|
300
303
|
: bound.domain,
|
|
301
304
|
}));
|
|
302
|
-
const inner = bounds.
|
|
303
|
-
(current, bound) => adjoin(current, getFresh(bound.name, bound.level)),
|
|
304
|
-
scope,
|
|
305
|
-
);
|
|
305
|
+
const inner = adjoinAll(scope, bounds.map(getBoundFresh));
|
|
306
306
|
return expression.kind === "SetOf"
|
|
307
307
|
? { ...expression, bounds, element: rename(inner, expression.element) }
|
|
308
308
|
: { ...expression, bounds, body: rename(inner, expression.body) };
|
|
@@ -313,14 +313,7 @@ const rename: Map = (scope, expression) => {
|
|
|
313
313
|
expression.definitions,
|
|
314
314
|
(current, definition) => {
|
|
315
315
|
const renamed = renameDefn(current, definition);
|
|
316
|
-
|
|
317
|
-
kind: "Defn",
|
|
318
|
-
definition: renamed,
|
|
319
|
-
whereDefined: "User",
|
|
320
|
-
visibility: "Visible",
|
|
321
|
-
isLocal: true,
|
|
322
|
-
};
|
|
323
|
-
return [adjoin(current, hyp), renamed];
|
|
316
|
+
return [adjoin(current, getLocalDefn(renamed)), renamed];
|
|
324
317
|
},
|
|
325
318
|
);
|
|
326
319
|
return { ...expression, definitions, body: rename(inner, expression.body) };
|
|
@@ -341,10 +334,7 @@ const getSubstitutiveArgs = (scope: Scope | undefined, definition: Defn): boolea
|
|
|
341
334
|
if (cached) return cached;
|
|
342
335
|
const body = definition.kind === "Operator" ? definition.body : undefined;
|
|
343
336
|
if (body?.kind !== "Lambda") return [];
|
|
344
|
-
const inner = body.params.
|
|
345
|
-
(current, param) => adjoin(current, getFresh(param.name, "Unknown", param.shape)),
|
|
346
|
-
scope,
|
|
347
|
-
);
|
|
337
|
+
const inner = adjoinAll(scope, body.params.map(getParamFresh));
|
|
348
338
|
const result = body.params.map((_param, index) =>
|
|
349
339
|
isSubstitutive(inner, body.body, index + 1, true),
|
|
350
340
|
);
|
|
@@ -352,6 +342,18 @@ const getSubstitutiveArgs = (scope: Scope | undefined, definition: Defn): boolea
|
|
|
352
342
|
return result;
|
|
353
343
|
};
|
|
354
344
|
|
|
345
|
+
const UNARY_MODALS: Builtin[] = [
|
|
346
|
+
"Prime",
|
|
347
|
+
"StrongPrime",
|
|
348
|
+
"BoxTrue",
|
|
349
|
+
"BoxFalse",
|
|
350
|
+
"Diamond",
|
|
351
|
+
"ENABLED",
|
|
352
|
+
"UNCHANGED",
|
|
353
|
+
];
|
|
354
|
+
|
|
355
|
+
const BINARY_MODALS: Builtin[] = ["Leadsto", "Actplus", "Cdot"];
|
|
356
|
+
|
|
355
357
|
// compute_substitutivity_array: whether the parameter at index occurs only where scope holds.
|
|
356
358
|
const isSubstitutive = (
|
|
357
359
|
scope: Scope | undefined,
|
|
@@ -362,19 +364,9 @@ const isSubstitutive = (
|
|
|
362
364
|
if (expression.kind === "Ix") return isInScope || expression.index !== index;
|
|
363
365
|
if (expression.kind === "Apply" && expression.operator.kind === "Internal") {
|
|
364
366
|
const builtin = expression.operator.builtin;
|
|
365
|
-
const isUnary = [
|
|
366
|
-
"Prime",
|
|
367
|
-
"StrongPrime",
|
|
368
|
-
"BoxTrue",
|
|
369
|
-
"BoxFalse",
|
|
370
|
-
"Diamond",
|
|
371
|
-
"ENABLED",
|
|
372
|
-
"UNCHANGED",
|
|
373
|
-
];
|
|
374
|
-
const isBinary = ["Leadsto", "Actplus", "Cdot"];
|
|
375
367
|
if (
|
|
376
|
-
(
|
|
377
|
-
(
|
|
368
|
+
(UNARY_MODALS.includes(builtin) && expression.args.length === 1) ||
|
|
369
|
+
(BINARY_MODALS.includes(builtin) && expression.args.length === 2)
|
|
378
370
|
) {
|
|
379
371
|
return expression.args.every((arg) => isSubstitutive(scope, arg, index, false));
|
|
380
372
|
}
|
|
@@ -396,31 +388,27 @@ const isSubstitutive = (
|
|
|
396
388
|
});
|
|
397
389
|
}
|
|
398
390
|
}
|
|
399
|
-
|
|
391
|
+
const found = { isSubstitutive: true };
|
|
400
392
|
mapScoped(
|
|
401
393
|
{ scope, index },
|
|
402
394
|
expression,
|
|
403
395
|
(state, inner) => {
|
|
404
|
-
|
|
405
|
-
isSubstitutiveHere = false;
|
|
406
|
-
}
|
|
396
|
+
found.isSubstitutive &&= isSubstitutive(state.scope, inner, state.index, isInScope);
|
|
407
397
|
return inner;
|
|
408
398
|
},
|
|
409
399
|
(state, hyp) => ({ scope: adjoin(state.scope, hyp), index: state.index + 1 }),
|
|
410
400
|
"all",
|
|
411
401
|
);
|
|
412
|
-
return
|
|
402
|
+
return found.isSubstitutive;
|
|
413
403
|
};
|
|
414
404
|
|
|
415
405
|
// Coalesce.crypthash: h and the first five hexadecimal digits of the MD5 of the expression as
|
|
416
406
|
// tlapm prints it.
|
|
417
|
-
const getHashName = (
|
|
418
|
-
|
|
419
|
-
return `h${getMd5(text).slice(0, 5)}`;
|
|
420
|
-
};
|
|
407
|
+
export const getHashName = (hyps: Hyp[], expression: Expr) =>
|
|
408
|
+
`h${getMd5(renderDoc(printExpression(hyps, expression))).slice(0, 5)}`;
|
|
421
409
|
|
|
422
410
|
const coalesce = (scope: Scope | undefined, expression: Expr): Expr =>
|
|
423
|
-
at({ kind: "Opaque", name: getHashName(scope, expression) }, expression);
|
|
411
|
+
at({ kind: "Opaque", name: getHashName(getScopeHyps(scope), expression) }, expression);
|
|
424
412
|
|
|
425
413
|
// coalesce_operator: an operator applied to arguments that are not all substitutive is opaque,
|
|
426
414
|
// hiding the arguments that are constant or substitutive.
|
|
@@ -457,7 +445,7 @@ const MODAL_BUILTINS: Builtin[] = [
|
|
|
457
445
|
// modal expression an opaque name. tlapm means to apply that name to the expression's free
|
|
458
446
|
// variables, but compute_vars collects them into an instance variable and returns its own empty
|
|
459
447
|
// set, so the name always stands alone.
|
|
460
|
-
const coalesceModal:
|
|
448
|
+
const coalesceModal: Rewrite = (scope, expression) => {
|
|
461
449
|
if (expression.kind !== "Apply") return mapScoped(scope, expression, coalesceModal, adjoin);
|
|
462
450
|
const operator = expression.operator;
|
|
463
451
|
const [arg] = expression.args;
|
|
@@ -2,13 +2,13 @@
|
|
|
2
2
|
// from facts of the form the rule needs.
|
|
3
3
|
|
|
4
4
|
import { TlapmBugError, TlaProverError } from "../../errors";
|
|
5
|
+
import { shiftExpr } from "../../obligations/substitution";
|
|
6
|
+
import { isEqualExpr } from "../../obligations/equality";
|
|
5
7
|
import {
|
|
6
8
|
adjoin,
|
|
7
9
|
adjoinAll,
|
|
8
10
|
getScopeAt,
|
|
9
|
-
isEqualExpr,
|
|
10
11
|
mapScoped,
|
|
11
|
-
shiftExpr,
|
|
12
12
|
type Builtin,
|
|
13
13
|
type Expr,
|
|
14
14
|
type Scope,
|
|
@@ -150,7 +150,7 @@ const getFreshLabel = (hyp: Extract<Hyp, { kind: "Fresh" }>) =>
|
|
|
150
150
|
// fp_sequent's text for an obligation, before its digest.
|
|
151
151
|
const getFingerprintText = (sequent: Sequent) => {
|
|
152
152
|
const stack: Entry[] = [];
|
|
153
|
-
const
|
|
153
|
+
const getEntry = (index: number) => {
|
|
154
154
|
const entry = stack[stack.length - index];
|
|
155
155
|
if (!entry) throw new TlapmBugError();
|
|
156
156
|
return entry;
|
|
@@ -197,7 +197,7 @@ const getFingerprintText = (sequent: Sequent) => {
|
|
|
197
197
|
entries.map((entry) => `${getVariableNumber(entry)}.`).join("");
|
|
198
198
|
switch (expression.kind) {
|
|
199
199
|
case "Ix": {
|
|
200
|
-
const entry =
|
|
200
|
+
const entry = getEntry(expression.index);
|
|
201
201
|
entry.isUsed = true;
|
|
202
202
|
const ident = entry.ident;
|
|
203
203
|
switch (ident.kind) {
|
|
@@ -234,7 +234,7 @@ const getFingerprintText = (sequent: Sequent) => {
|
|
|
234
234
|
return printSequent(expression.sequent);
|
|
235
235
|
case "Apply": {
|
|
236
236
|
const operator = expression.operator;
|
|
237
|
-
if (operator.kind === "Ix" &&
|
|
237
|
+
if (operator.kind === "Ix" && getEntry(operator.index).ident.kind === "Pragma") return "";
|
|
238
238
|
return `$OpApp(${print(operator)};${printList(expression.args)})`;
|
|
239
239
|
}
|
|
240
240
|
case "With":
|
|
@@ -7,7 +7,10 @@ import {
|
|
|
7
7
|
adjoin,
|
|
8
8
|
adjoinAll,
|
|
9
9
|
getBoundedFresh,
|
|
10
|
+
getBoundFresh,
|
|
10
11
|
getFresh,
|
|
12
|
+
getLocalDefn,
|
|
13
|
+
getParamFresh,
|
|
11
14
|
getScopeAt,
|
|
12
15
|
getScopeHyps,
|
|
13
16
|
type Bound,
|
|
@@ -64,31 +67,18 @@ const getDeclaration = (scope: Scope | undefined, index: number): Declaration =>
|
|
|
64
67
|
};
|
|
65
68
|
|
|
66
69
|
const bindBounds = (scope: Scope | undefined, bounds: Bound[]) =>
|
|
67
|
-
|
|
70
|
+
adjoinAll(scope, bounds.map(getBoundFresh));
|
|
68
71
|
|
|
69
72
|
const bindParams = (scope: Scope | undefined, params: Param[]) =>
|
|
70
|
-
params.
|
|
71
|
-
(current, param) => adjoin(current, getFresh(param.name, "Unknown", param.shape)),
|
|
72
|
-
scope,
|
|
73
|
-
);
|
|
73
|
+
adjoinAll(scope, params.map(getParamFresh));
|
|
74
74
|
|
|
75
75
|
const bindDefinitions = (scope: Scope | undefined, definitions: Defn[]) =>
|
|
76
|
-
definitions.
|
|
77
|
-
(current, definition) =>
|
|
78
|
-
adjoin(current, {
|
|
79
|
-
kind: "Defn",
|
|
80
|
-
definition,
|
|
81
|
-
whereDefined: "User",
|
|
82
|
-
visibility: "Visible",
|
|
83
|
-
isLocal: true,
|
|
84
|
-
}),
|
|
85
|
-
scope,
|
|
86
|
-
);
|
|
76
|
+
adjoinAll(scope, definitions.map(getLocalDefn));
|
|
87
77
|
|
|
88
78
|
const bindFlexible = (scope: Scope | undefined, names: string[]) =>
|
|
89
|
-
|
|
90
|
-
(current, name) => adjoin(current, { kind: "Flex", name }),
|
|
79
|
+
adjoinAll(
|
|
91
80
|
scope,
|
|
81
|
+
names.map((name) => ({ kind: "Flex", name })),
|
|
92
82
|
);
|
|
93
83
|
|
|
94
84
|
// level_comparison#compare: the expressions match up to a renaming that maps each name one way,
|
|
@@ -140,7 +130,10 @@ const compare = (
|
|
|
140
130
|
const leftArgs = left.instance.args;
|
|
141
131
|
const rightArgs = right.instance.args;
|
|
142
132
|
const bindArgs = (scope: Scope | undefined, args: string[]) =>
|
|
143
|
-
|
|
133
|
+
adjoinAll(
|
|
134
|
+
scope,
|
|
135
|
+
args.map((name) => getFresh(name, "Unknown")),
|
|
136
|
+
);
|
|
144
137
|
const getFields = (definition: typeof left.instance) =>
|
|
145
138
|
getSortedFields(
|
|
146
139
|
definition.substitutions.map((entry) => ({ name: entry.name, value: entry.expression })),
|
|
@@ -384,9 +377,8 @@ const compare = (
|
|
|
384
377
|
)
|
|
385
378
|
);
|
|
386
379
|
case "Choose":
|
|
387
|
-
return right.kind === "Choose" && isSameBinder(leftScope, rightScope, left, right);
|
|
388
380
|
case "SetSt":
|
|
389
|
-
return right.kind ===
|
|
381
|
+
return right.kind === left.kind && isSameBinder(leftScope, rightScope, left, right);
|
|
390
382
|
case "SetOf":
|
|
391
383
|
return (
|
|
392
384
|
right.kind === "SetOf" &&
|
|
@@ -427,18 +419,9 @@ const compare = (
|
|
|
427
419
|
case "Product":
|
|
428
420
|
return right.kind === "Product" && recurseList(left.factors, right.factors);
|
|
429
421
|
case "Rect":
|
|
430
|
-
return (
|
|
431
|
-
right.kind === "Rect" &&
|
|
432
|
-
isSameFields(
|
|
433
|
-
leftScope,
|
|
434
|
-
rightScope,
|
|
435
|
-
getSortedFields(left.fields),
|
|
436
|
-
getSortedFields(right.fields),
|
|
437
|
-
)
|
|
438
|
-
);
|
|
439
422
|
case "Record":
|
|
440
423
|
return (
|
|
441
|
-
right.kind ===
|
|
424
|
+
right.kind === left.kind &&
|
|
442
425
|
isSameFields(
|
|
443
426
|
leftScope,
|
|
444
427
|
rightScope,
|
|
@@ -472,15 +455,9 @@ const compare = (
|
|
|
472
455
|
left.field === right.field
|
|
473
456
|
);
|
|
474
457
|
case "Sub":
|
|
475
|
-
return (
|
|
476
|
-
right.kind === "Sub" &&
|
|
477
|
-
left.modal === right.modal &&
|
|
478
|
-
recurse(left.action, right.action) &&
|
|
479
|
-
recurse(left.subscript, right.subscript)
|
|
480
|
-
);
|
|
481
458
|
case "Tsub":
|
|
482
459
|
return (
|
|
483
|
-
right.kind ===
|
|
460
|
+
right.kind === left.kind &&
|
|
484
461
|
left.modal === right.modal &&
|
|
485
462
|
recurse(left.action, right.action) &&
|
|
486
463
|
recurse(left.subscript, right.subscript)
|
|
@@ -22,7 +22,7 @@ export const getMd5 = (text: string): string => {
|
|
|
22
22
|
const words = Array.from({ length: 16 }, (_value, index) =>
|
|
23
23
|
view.getUint32(offset + index * 4, true),
|
|
24
24
|
);
|
|
25
|
-
const
|
|
25
|
+
const mixedState = Array.from({ length: 64 }).reduce<number[]>(
|
|
26
26
|
([innerA, innerB, innerC, innerD], _value, index) => {
|
|
27
27
|
const round = Math.floor(index / 16);
|
|
28
28
|
const mixed =
|
|
@@ -51,14 +51,7 @@ export const getMd5 = (text: string): string => {
|
|
|
51
51
|
},
|
|
52
52
|
state,
|
|
53
53
|
);
|
|
54
|
-
state.splice(
|
|
55
|
-
0,
|
|
56
|
-
4,
|
|
57
|
-
(state[0] + a) | 0,
|
|
58
|
-
(state[1] + b) | 0,
|
|
59
|
-
(state[2] + c) | 0,
|
|
60
|
-
(state[3] + d) | 0,
|
|
61
|
-
);
|
|
54
|
+
state.splice(0, 4, ...state.map((word, index) => (word + mixedState[index]) | 0));
|
|
62
55
|
}
|
|
63
56
|
return state
|
|
64
57
|
.flatMap((word) => [word, word >>> 8, word >>> 16, word >>> 24])
|
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
// obligation.
|
|
5
5
|
|
|
6
6
|
import { TlapmBugError, TlaProverError } from "../../errors";
|
|
7
|
-
import type { Expr,
|
|
7
|
+
import type { Expr, Locus, Sequent } from "../../obligations/expression";
|
|
8
8
|
import type { OldMethod, PragmaSetting } from "../../obligations/pragma";
|
|
9
9
|
|
|
10
10
|
// A method, named after the Method.t constructor tlapm reports it by. A Z3 resource budget turns
|
|
@@ -17,7 +17,7 @@ export interface Method {
|
|
|
17
17
|
}
|
|
18
18
|
|
|
19
19
|
// The methods that rewrite an obligation in Prep.expand_enabled_cdot instead of proving it.
|
|
20
|
-
|
|
20
|
+
const FRONTENDS = new Set([
|
|
21
21
|
"expandenabled",
|
|
22
22
|
"expandcdot",
|
|
23
23
|
"autouse",
|
|
@@ -37,7 +37,7 @@ const RLIMIT_BASE = 3_000_000;
|
|
|
37
37
|
const MAX_RLIMIT = 0xffff_ffff;
|
|
38
38
|
|
|
39
39
|
// Params.default_method: what tlapm tries when a step cites no prover.
|
|
40
|
-
|
|
40
|
+
const DEFAULT_METHODS: Method[] = [
|
|
41
41
|
{ prover: "smt", timeLimitMs: SMT_SECONDS * 1000 },
|
|
42
42
|
{ prover: "zenon", timeLimitMs: ZENON_SECONDS * 1000 },
|
|
43
43
|
{ prover: "isabelle", timeLimitMs: ISABELLE_SECONDS * 1000, tactic: "auto" },
|
|
@@ -166,7 +166,7 @@ const getCitedMethods = (sequent: Sequent) => {
|
|
|
166
166
|
methods: [],
|
|
167
167
|
useLocation: null,
|
|
168
168
|
};
|
|
169
|
-
sequent.context.forEach((hyp
|
|
169
|
+
sequent.context.forEach((hyp, index) => {
|
|
170
170
|
const expression = hyp.kind === "Fact" && hyp.visibility === "Visible" && hyp.expression;
|
|
171
171
|
if (expression && expression.kind === "With") {
|
|
172
172
|
state.methods.push(getOldMethod(expression.method));
|