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
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { PcalError, PcalBugError } from "
|
|
1
|
+
import { PcalError, PcalBugError } from "../errors";
|
|
2
2
|
import {
|
|
3
3
|
createNormalizedPcalExpr,
|
|
4
4
|
createPcalBase,
|
|
@@ -29,7 +29,7 @@ import {
|
|
|
29
29
|
type PcalVarDecl,
|
|
30
30
|
type PcalWhen,
|
|
31
31
|
type PcalWhile,
|
|
32
|
-
} from "./
|
|
32
|
+
} from "./ast";
|
|
33
33
|
|
|
34
34
|
// PcalSymTab's symbol types, which index PCAL_SYMBOL_TYPE_NAMES.
|
|
35
35
|
const PCAL_SYMBOL = {
|
|
@@ -66,14 +66,10 @@ interface PcalSymbol {
|
|
|
66
66
|
type: number;
|
|
67
67
|
id: string;
|
|
68
68
|
context: string;
|
|
69
|
-
contextType: string;
|
|
70
|
-
line: number;
|
|
71
|
-
col: number;
|
|
72
69
|
useThis: string;
|
|
73
70
|
}
|
|
74
71
|
|
|
75
|
-
// PcalSymTab.ProcedureEntry
|
|
76
|
-
// statements lacks.
|
|
72
|
+
// PcalSymTab.ProcedureEntry. initialPC is the first label, which a body with no statements lacks.
|
|
77
73
|
interface PcalProcedureEntry {
|
|
78
74
|
name: string;
|
|
79
75
|
params: PcalPVarDecl[];
|
|
@@ -81,18 +77,11 @@ interface PcalProcedureEntry {
|
|
|
81
77
|
initialPC: string | undefined;
|
|
82
78
|
}
|
|
83
79
|
|
|
84
|
-
interface PcalProcessEntry {
|
|
85
|
-
name: string;
|
|
86
|
-
initialPC: string | undefined;
|
|
87
|
-
}
|
|
88
|
-
|
|
89
80
|
interface PcalSymbolTable {
|
|
90
81
|
symbols: PcalSymbol[];
|
|
91
82
|
procedures: PcalProcedureEntry[];
|
|
92
|
-
|
|
93
|
-
disambiguateReport: string[];
|
|
83
|
+
processNames: string[];
|
|
94
84
|
errorReport: string;
|
|
95
|
-
initialPC: string | undefined;
|
|
96
85
|
}
|
|
97
86
|
|
|
98
87
|
// A Return or CallReturn outside a procedure has no from, and PcalSymTab.FindSym never matches a
|
|
@@ -116,20 +105,7 @@ const findProcedureIndex = (table: PcalSymbolTable, name: string) => {
|
|
|
116
105
|
return index === -1 ? table.procedures.length : index;
|
|
117
106
|
};
|
|
118
107
|
|
|
119
|
-
const
|
|
120
|
-
const index = table.processes.findIndex((process) => process.name === name);
|
|
121
|
-
return index === -1 ? table.processes.length : index;
|
|
122
|
-
};
|
|
123
|
-
|
|
124
|
-
const insertSymbol = (
|
|
125
|
-
table: PcalSymbolTable,
|
|
126
|
-
type: number,
|
|
127
|
-
id: string,
|
|
128
|
-
context: string,
|
|
129
|
-
contextType: string,
|
|
130
|
-
line: number,
|
|
131
|
-
col: number,
|
|
132
|
-
) => {
|
|
108
|
+
const insertSymbol = (table: PcalSymbolTable, type: number, id: string, context: string) => {
|
|
133
109
|
const isVariable =
|
|
134
110
|
type === PCAL_SYMBOL.procedureVar ||
|
|
135
111
|
type === PCAL_SYMBOL.processVar ||
|
|
@@ -139,7 +115,7 @@ const insertSymbol = (
|
|
|
139
115
|
findSymbolInContext(table, id, context) !== undefined
|
|
140
116
|
: findSymbol(table, type, id, context) !== undefined;
|
|
141
117
|
if (isDefined) return false;
|
|
142
|
-
table.symbols.push({ type, id, context,
|
|
118
|
+
table.symbols.push({ type, id, context, useThis: id });
|
|
143
119
|
return true;
|
|
144
120
|
};
|
|
145
121
|
|
|
@@ -158,38 +134,22 @@ const createPcalSymbolTable = (ast: PcalAlgorithm) => {
|
|
|
158
134
|
const table: PcalSymbolTable = {
|
|
159
135
|
symbols: [],
|
|
160
136
|
procedures: [],
|
|
161
|
-
|
|
162
|
-
disambiguateReport: [],
|
|
137
|
+
processNames: [],
|
|
163
138
|
errorReport: "",
|
|
164
|
-
initialPC: undefined,
|
|
165
139
|
};
|
|
166
140
|
|
|
167
|
-
const extractLabeledStmt = (
|
|
168
|
-
labeledStmt
|
|
169
|
-
context: string,
|
|
170
|
-
contextType: string,
|
|
171
|
-
) => {
|
|
172
|
-
if (
|
|
173
|
-
!insertSymbol(
|
|
174
|
-
table,
|
|
175
|
-
PCAL_SYMBOL.label,
|
|
176
|
-
labeledStmt.label,
|
|
177
|
-
context,
|
|
178
|
-
contextType,
|
|
179
|
-
labeledStmt.line,
|
|
180
|
-
labeledStmt.col,
|
|
181
|
-
)
|
|
182
|
-
) {
|
|
141
|
+
const extractLabeledStmt = (labeledStmt: PcalLabeledStmt, context: string) => {
|
|
142
|
+
if (!insertSymbol(table, PCAL_SYMBOL.label, labeledStmt.label, context)) {
|
|
183
143
|
table.errorReport += `\nLabel ${labeledStmt.label} redefined at line ${labeledStmt.line}, column ${labeledStmt.col}`;
|
|
184
144
|
}
|
|
185
|
-
labeledStmt.stmts.forEach((stmt) => extractStmt(stmt, context
|
|
145
|
+
labeledStmt.stmts.forEach((stmt) => extractStmt(stmt, context));
|
|
186
146
|
};
|
|
187
147
|
|
|
188
|
-
const extractStmt = (stmt: PcalStmt, context: string
|
|
148
|
+
const extractStmt = (stmt: PcalStmt, context: string): void => {
|
|
189
149
|
const extractStmts = (stmts: PcalStmt[]) =>
|
|
190
|
-
stmts.forEach((innerStmt) => extractStmt(innerStmt, context
|
|
150
|
+
stmts.forEach((innerStmt) => extractStmt(innerStmt, context));
|
|
191
151
|
const extractLabeledStmts = (stmts: PcalLabeledStmt[]) =>
|
|
192
|
-
stmts.forEach((innerStmt) => extractLabeledStmt(innerStmt, context
|
|
152
|
+
stmts.forEach((innerStmt) => extractLabeledStmt(innerStmt, context));
|
|
193
153
|
switch (stmt.kind) {
|
|
194
154
|
case "While":
|
|
195
155
|
extractStmts(stmt.unlabDo);
|
|
@@ -236,10 +196,9 @@ const createPcalSymbolTable = (ast: PcalAlgorithm) => {
|
|
|
236
196
|
const extractVarDecl = (
|
|
237
197
|
decl: PcalVarDecl | PcalPVarDecl,
|
|
238
198
|
context: string,
|
|
239
|
-
contextType = "process",
|
|
240
199
|
type: number = context === "" ? PCAL_SYMBOL.global : PCAL_SYMBOL.processVar,
|
|
241
200
|
) => {
|
|
242
|
-
if (!insertSymbol(table, type, decl.var, context
|
|
201
|
+
if (!insertSymbol(table, type, decl.var, context)) {
|
|
243
202
|
table.errorReport += `\n${PCAL_SYMBOL_TYPE_NAMES[type]} ${decl.var} redefined at line ${decl.line}, column ${decl.col}`;
|
|
244
203
|
}
|
|
245
204
|
};
|
|
@@ -257,70 +216,45 @@ const createPcalSymbolTable = (ast: PcalAlgorithm) => {
|
|
|
257
216
|
initialPC: procedure.body.length === 0 ? undefined : toLabeledStmt(procedure.body[0]).label,
|
|
258
217
|
});
|
|
259
218
|
}
|
|
260
|
-
insertSymbol(
|
|
261
|
-
table,
|
|
262
|
-
PCAL_SYMBOL.procedure,
|
|
263
|
-
procedure.name,
|
|
264
|
-
"",
|
|
265
|
-
"procedure",
|
|
266
|
-
procedure.line,
|
|
267
|
-
procedure.col,
|
|
268
|
-
);
|
|
219
|
+
insertSymbol(table, PCAL_SYMBOL.procedure, procedure.name, "");
|
|
269
220
|
procedure.decls.forEach((decl) =>
|
|
270
|
-
extractVarDecl(decl, procedure.name,
|
|
221
|
+
extractVarDecl(decl, procedure.name, PCAL_SYMBOL.procedureVar),
|
|
271
222
|
);
|
|
272
223
|
procedure.params.forEach((param) =>
|
|
273
|
-
extractVarDecl(param, procedure.name,
|
|
274
|
-
);
|
|
275
|
-
procedure.body.forEach((stmt) =>
|
|
276
|
-
extractLabeledStmt(toLabeledStmt(stmt), procedure.name, "procedure"),
|
|
224
|
+
extractVarDecl(param, procedure.name, PCAL_SYMBOL.parameter),
|
|
277
225
|
);
|
|
226
|
+
procedure.body.forEach((stmt) => extractLabeledStmt(toLabeledStmt(stmt), procedure.name));
|
|
278
227
|
};
|
|
279
228
|
|
|
280
229
|
const extractProcess = (process: PcalProcess) => {
|
|
281
|
-
const isRedefined =
|
|
230
|
+
const isRedefined = table.processNames.includes(process.name);
|
|
282
231
|
if (isRedefined) {
|
|
283
232
|
table.errorReport += `\nProcess ${process.name} redefined at line ${process.line}, column ${process.col}`;
|
|
284
233
|
}
|
|
285
|
-
if (!isRedefined)
|
|
286
|
-
|
|
287
|
-
name: process.name,
|
|
288
|
-
initialPC: process.body.length === 0 ? undefined : toLabeledStmt(process.body[0]).label,
|
|
289
|
-
});
|
|
290
|
-
}
|
|
291
|
-
insertSymbol(
|
|
292
|
-
table,
|
|
293
|
-
PCAL_SYMBOL.process,
|
|
294
|
-
process.name,
|
|
295
|
-
"",
|
|
296
|
-
"process",
|
|
297
|
-
process.line,
|
|
298
|
-
process.col,
|
|
299
|
-
);
|
|
234
|
+
if (!isRedefined) table.processNames.push(process.name);
|
|
235
|
+
insertSymbol(table, PCAL_SYMBOL.process, process.name, "");
|
|
300
236
|
process.decls.forEach((decl) => extractVarDecl(decl, process.name));
|
|
301
|
-
process.body.forEach((stmt) =>
|
|
302
|
-
extractLabeledStmt(toLabeledStmt(stmt), process.name, "process"),
|
|
303
|
-
);
|
|
237
|
+
process.body.forEach((stmt) => extractLabeledStmt(toLabeledStmt(stmt), process.name));
|
|
304
238
|
};
|
|
305
239
|
|
|
306
|
-
insertSymbol(table, PCAL_SYMBOL.global, "pc", ""
|
|
307
|
-
if (ast.prcds.length > 0) insertSymbol(table, PCAL_SYMBOL.global, "stack", ""
|
|
240
|
+
insertSymbol(table, PCAL_SYMBOL.global, "pc", "");
|
|
241
|
+
if (ast.prcds.length > 0) insertSymbol(table, PCAL_SYMBOL.global, "stack", "");
|
|
308
242
|
ast.decls.forEach((decl) => extractVarDecl(decl, ""));
|
|
309
243
|
ast.prcds.forEach(extractProcedure);
|
|
310
244
|
if (ast.kind === "Multiprocess") ast.procs.forEach(extractProcess);
|
|
311
245
|
if (ast.kind === "Uniprocess") {
|
|
312
|
-
|
|
313
|
-
ast.body.forEach((stmt) => extractLabeledStmt(toLabeledStmt(stmt), "", ""));
|
|
246
|
+
ast.body.forEach((stmt) => extractLabeledStmt(toLabeledStmt(stmt), ""));
|
|
314
247
|
}
|
|
315
248
|
if (table.errorReport.length > 0) throw new PcalError(table.errorReport);
|
|
316
249
|
return table;
|
|
317
250
|
};
|
|
318
251
|
|
|
319
252
|
// PcalSymTab.Disambiguate: renames each symbol whose name another symbol already uses, by
|
|
320
|
-
// appending "_", then the letters of its context, then its type.
|
|
253
|
+
// appending "_", then the letters of its context, then its type. Returns whether it renamed any.
|
|
321
254
|
const disambiguatePcalSymbols = (table: PcalSymbolTable) => {
|
|
322
255
|
const isAmbiguous = (id: string) =>
|
|
323
256
|
table.symbols.filter((symbol) => symbol.useThis === id).length > 1;
|
|
257
|
+
const renamed = { isAny: false };
|
|
324
258
|
for (let type = 0; type <= PCAL_SYMBOL_TYPE_COUNT; type += 1) {
|
|
325
259
|
table.symbols.forEach((symbol) => {
|
|
326
260
|
if (symbol.type !== type) return;
|
|
@@ -329,14 +263,10 @@ const disambiguatePcalSymbols = (table: PcalSymbolTable) => {
|
|
|
329
263
|
symbol.useThis +=
|
|
330
264
|
suffixLength === 1 ? "_" : (symbol.context[suffixLength - 2] ?? String(type));
|
|
331
265
|
}
|
|
332
|
-
if (symbol.id
|
|
333
|
-
const context =
|
|
334
|
-
symbol.context.length === 0 ? "" : ` of ${symbol.contextType} ${symbol.context}`;
|
|
335
|
-
table.disambiguateReport.push(
|
|
336
|
-
`\\* ${PCAL_SYMBOL_TYPE_NAMES[symbol.type]} ${symbol.id}${context} at line ${symbol.line} col ${symbol.col} changed to ${symbol.useThis}`,
|
|
337
|
-
);
|
|
266
|
+
if (symbol.id !== symbol.useThis) renamed.isAny = true;
|
|
338
267
|
});
|
|
339
268
|
}
|
|
269
|
+
return renamed.isAny;
|
|
340
270
|
};
|
|
341
271
|
|
|
342
272
|
// PcalSymTab.CheckForDefaultInitValue.
|
|
@@ -490,14 +420,9 @@ const fixPcalIds = (ast: PcalAlgorithm, table: PcalSymbolTable, log: (line: stri
|
|
|
490
420
|
const fixProcess = (process: PcalProcess) => {
|
|
491
421
|
process.decls.forEach((decl) => fixVarDecl(decl, process.name));
|
|
492
422
|
process.body.forEach((stmt) => fixLabeledStmt(toLabeledStmt(stmt), process.name));
|
|
493
|
-
const entry = getElement(table.processes, findProcessIndex(table, process.name));
|
|
494
423
|
fixLabels(process.plusLabels, process.name);
|
|
495
424
|
fixLabels(process.minusLabels, process.name);
|
|
496
|
-
if (entry.initialPC !== undefined) {
|
|
497
|
-
entry.initialPC = useThis(table, PCAL_SYMBOL.label, entry.initialPC, process.name);
|
|
498
|
-
}
|
|
499
425
|
process.name = useThis(table, PCAL_SYMBOL.process, process.name, "");
|
|
500
|
-
entry.name = process.name;
|
|
501
426
|
};
|
|
502
427
|
|
|
503
428
|
// PcalFixIDs.FixMultiprocess: a process calling an unknown procedure stops the fixing of the
|
|
@@ -546,9 +471,6 @@ const fixPcalIds = (ast: PcalAlgorithm, table: PcalSymbolTable, log: (line: stri
|
|
|
546
471
|
ast.prcds.forEach(fixProcedure);
|
|
547
472
|
ast.body.forEach((stmt) => fixLabeledStmt(toLabeledStmt(stmt), ""));
|
|
548
473
|
}
|
|
549
|
-
if (table.initialPC !== undefined) {
|
|
550
|
-
table.initialPC = useThis(table, PCAL_SYMBOL.label, table.initialPC, "");
|
|
551
|
-
}
|
|
552
474
|
};
|
|
553
475
|
|
|
554
476
|
// PcalTranslate's token constructors, which leave the column 0.
|
|
@@ -1222,8 +1144,7 @@ export const translatePcalAlgorithm = (
|
|
|
1222
1144
|
log: (line: string) => void,
|
|
1223
1145
|
) => {
|
|
1224
1146
|
const table = createPcalSymbolTable(ast);
|
|
1225
|
-
disambiguatePcalSymbols(table);
|
|
1226
|
-
if (table.disambiguateReport.length > 0) log("Warning: symbols were renamed.");
|
|
1147
|
+
if (disambiguatePcalSymbols(table)) log("Warning: symbols were renamed.");
|
|
1227
1148
|
fixPcalIds(ast, table, log);
|
|
1228
1149
|
checkPcalTlaGen(explodePcalAlgorithm(ast, table, omitPC), omitPC);
|
|
1229
1150
|
if (hasDefaultInitialization) checkForDefaultInitValue(table);
|
|
@@ -1,15 +1,15 @@
|
|
|
1
|
-
import { PcalError, PcalRuntimeError } from "
|
|
1
|
+
import { PcalError, PcalRuntimeError } from "../errors";
|
|
2
2
|
import {
|
|
3
3
|
formatPcalNode,
|
|
4
4
|
getPcalLocation,
|
|
5
5
|
getPcalVersionNumber,
|
|
6
6
|
PCAL_VERSION_WEIGHT,
|
|
7
7
|
type PcalAlgorithm,
|
|
8
|
-
} from "./
|
|
9
|
-
import { parsePcalAlgorithm, type PcalSession } from "./
|
|
10
|
-
import { createPcalCharReader } from "./
|
|
11
|
-
import { translatePcalAlgorithm } from "./
|
|
12
|
-
import type { TlcVersion } from "
|
|
8
|
+
} from "./ast";
|
|
9
|
+
import { parsePcalAlgorithm, type PcalSession } from "./parse";
|
|
10
|
+
import { createPcalCharReader } from "./tokenize";
|
|
11
|
+
import { translatePcalAlgorithm } from "./translate";
|
|
12
|
+
import type { TlcVersion } from "../tlc/version";
|
|
13
13
|
|
|
14
14
|
// Validator.ValidationResult.
|
|
15
15
|
type PcalValidationResult =
|
|
@@ -159,7 +159,6 @@ const processOptionArguments = (session: PcalSession, args: string[]) => {
|
|
|
159
159
|
);
|
|
160
160
|
return;
|
|
161
161
|
}
|
|
162
|
-
params.specFile = argument;
|
|
163
162
|
index += 1;
|
|
164
163
|
continue;
|
|
165
164
|
}
|
|
@@ -168,14 +167,9 @@ const processOptionArguments = (session: PcalSession, args: string[]) => {
|
|
|
168
167
|
params.checkTermination = true;
|
|
169
168
|
continue;
|
|
170
169
|
case "-noold":
|
|
171
|
-
params.noOld = true;
|
|
172
|
-
continue;
|
|
173
170
|
case "-nocfg":
|
|
174
|
-
params.nocfg = true;
|
|
175
|
-
continue;
|
|
176
171
|
case "-noDoneDisjunct":
|
|
177
172
|
case "noDoneDisjunct":
|
|
178
|
-
params.noDoneDisjunct = true;
|
|
179
173
|
continue;
|
|
180
174
|
case "-wf":
|
|
181
175
|
case "wf":
|
|
@@ -361,7 +355,6 @@ export const validatePcalModule = (
|
|
|
361
355
|
const rest = line.slice(searchLocation.column);
|
|
362
356
|
const idEnd = Array.from(rest).findIndex((char) => !isIdChar(char));
|
|
363
357
|
if (rest.startsWith("options") && (idEnd === -1 ? rest.length : idEnd) === 7) {
|
|
364
|
-
session.params.optionsInFile = true;
|
|
365
358
|
processOptions(session, lines, searchLocation);
|
|
366
359
|
break;
|
|
367
360
|
}
|
|
@@ -405,14 +398,11 @@ export const validatePcalModule = (
|
|
|
405
398
|
// HACK: Validator reports the exceptions of ParseAlgorithm.getAlgorithm and PCalTLAGenerator
|
|
406
399
|
// and goes on to compare the checksums.
|
|
407
400
|
try {
|
|
408
|
-
const
|
|
409
|
-
|
|
410
|
-
begin.line,
|
|
411
|
-
begin.
|
|
412
|
-
specificationText.length,
|
|
413
|
-
0,
|
|
401
|
+
const result = parsePcalAlgorithm(
|
|
402
|
+
session,
|
|
403
|
+
createPcalCharReader(lines, begin.line, begin.column),
|
|
404
|
+
begin.isFair,
|
|
414
405
|
);
|
|
415
|
-
const result = parsePcalAlgorithm(session, reader, begin.isFair);
|
|
416
406
|
parsed.ast = result.ast;
|
|
417
407
|
translatePcalAlgorithm(result.ast, result.omitPC, result.hasDefaultInitialization, session.log);
|
|
418
408
|
} catch (error) {
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
// Worker threads that decide the obligations prove sends them, the earliest obligation first.
|
|
2
2
|
|
|
3
|
-
import { TlaProverError
|
|
3
|
+
import { TlaProverError } from "../errors";
|
|
4
4
|
import { spawnWorker, type WorkerHandle } from "../worker";
|
|
5
|
-
import type { DecideOptions,
|
|
5
|
+
import type { DecideOptions, Decision } from "./verdict";
|
|
6
6
|
|
|
7
7
|
export interface DecideRequest {
|
|
8
8
|
prover: string;
|
|
@@ -10,15 +10,14 @@ export interface DecideRequest {
|
|
|
10
10
|
timeLimitMs: number;
|
|
11
11
|
}
|
|
12
12
|
|
|
13
|
-
// A backend's
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
| { error: { name: "TlaProverError" | "TlaUnsupportedError"; message: string } };
|
|
13
|
+
// A backend's decision, or the message of the TlaProverError it threw, which prove turns into a
|
|
14
|
+
// result.
|
|
15
|
+
export type DecideResponse = Decision | { error: string };
|
|
17
16
|
|
|
18
|
-
interface
|
|
17
|
+
interface PendingDecision {
|
|
19
18
|
request: DecideRequest;
|
|
20
19
|
priority: number;
|
|
21
|
-
resolve: (
|
|
20
|
+
resolve: (decision: Decision) => void;
|
|
22
21
|
reject: (error: unknown) => void;
|
|
23
22
|
}
|
|
24
23
|
|
|
@@ -28,15 +27,15 @@ export interface DecidePool {
|
|
|
28
27
|
text: string,
|
|
29
28
|
options: DecideOptions,
|
|
30
29
|
priority: number,
|
|
31
|
-
) => Promise<
|
|
30
|
+
) => Promise<Decision>;
|
|
32
31
|
// Rejects every decision not yet made with reason, and stops the workers.
|
|
33
32
|
terminate: (reason: unknown) => void;
|
|
34
33
|
}
|
|
35
34
|
|
|
36
|
-
export const createDecidePool = async (
|
|
35
|
+
export const createDecidePool = async (workerCount: number): Promise<DecidePool> => {
|
|
37
36
|
const workers: WorkerHandle[] = [];
|
|
38
|
-
const queue:
|
|
39
|
-
const running = new Map<number,
|
|
37
|
+
const queue: PendingDecision[] = [];
|
|
38
|
+
const running = new Map<number, PendingDecision>();
|
|
40
39
|
const idle: number[] = [];
|
|
41
40
|
const state: { failure: { reason: unknown } | undefined } = { failure: undefined };
|
|
42
41
|
const dispatch = () => {
|
|
@@ -56,12 +55,8 @@ export const createDecidePool = async (count: number): Promise<DecidePool> => {
|
|
|
56
55
|
const decision = running.get(index);
|
|
57
56
|
running.delete(index);
|
|
58
57
|
idle.push(index);
|
|
59
|
-
if ("verdict" in response) decision?.resolve(response
|
|
60
|
-
|
|
61
|
-
const ErrorClass =
|
|
62
|
-
response.error.name === "TlaProverError" ? TlaProverError : TlaUnsupportedError;
|
|
63
|
-
decision?.reject(new ErrorClass(response.error.message));
|
|
64
|
-
}
|
|
58
|
+
if ("verdict" in response) decision?.resolve(response);
|
|
59
|
+
if ("error" in response) decision?.reject(new TlaProverError(response.error));
|
|
65
60
|
dispatch();
|
|
66
61
|
};
|
|
67
62
|
const terminate = (reason: unknown) => {
|
|
@@ -73,7 +68,7 @@ export const createDecidePool = async (count: number): Promise<DecidePool> => {
|
|
|
73
68
|
};
|
|
74
69
|
workers.push(
|
|
75
70
|
...(await Promise.all(
|
|
76
|
-
Array.from({ length:
|
|
71
|
+
Array.from({ length: workerCount }, (_, index) =>
|
|
77
72
|
spawnWorker(
|
|
78
73
|
new URL("./prove-worker.js", import.meta.url),
|
|
79
74
|
(message) => onResponse(index, message),
|
|
@@ -5,7 +5,7 @@ import { SmtParseError, TlaProverError } from "../errors";
|
|
|
5
5
|
import { decideIsabelle } from "./isabelle/decide";
|
|
6
6
|
import { decidePtl } from "./ptl/decide";
|
|
7
7
|
import { decideSmt } from "./smt/solver/solver";
|
|
8
|
-
import type { DecideOptions, Verdict } from "./verdict";
|
|
8
|
+
import type { DecideOptions, Decision, Verdict } from "./verdict";
|
|
9
9
|
import { decideZenon } from "./zenon/decide";
|
|
10
10
|
|
|
11
11
|
// Z3 rejects malformed input with an error, and tlapm counts that as a failure.
|
|
@@ -25,3 +25,9 @@ export const DECIDERS: Record<string, (text: string, options: DecideOptions) =>
|
|
|
25
25
|
isabelle: decideIsabelle,
|
|
26
26
|
ls4: decidePtl,
|
|
27
27
|
};
|
|
28
|
+
|
|
29
|
+
export const decide = (prover: string, text: string, options: DecideOptions): Decision => {
|
|
30
|
+
const start = performance.now();
|
|
31
|
+
const verdict = DECIDERS[prover](text, options);
|
|
32
|
+
return { verdict, timeUsedMs: performance.now() - start };
|
|
33
|
+
};
|
|
@@ -1,8 +1,10 @@
|
|
|
1
|
-
//
|
|
2
|
-
//
|
|
3
|
-
// that a prover reserves becomes a_, the name with each special character spelled out, and a.
|
|
1
|
+
// What backend/zenon.ml and backend/isabelle.ml share in printing an obligation that Backend.Prep
|
|
2
|
+
// has shipped.
|
|
4
3
|
|
|
5
|
-
import { TlapmBugError } from "../errors";
|
|
4
|
+
import { TlapmBugError, TlaProverError, TlaUnsupportedError } from "../errors";
|
|
5
|
+
import { popNames, type Context } from "../obligations/printer";
|
|
6
|
+
import { shiftExpr } from "../obligations/substitution";
|
|
7
|
+
import type { Bound, Builtin, Expr } from "../obligations/expression";
|
|
6
8
|
|
|
7
9
|
const CHARACTER_NAMES: Record<string, string> = {
|
|
8
10
|
"!": "excl_",
|
|
@@ -88,6 +90,7 @@ const getCharacterName = (character: string) => {
|
|
|
88
90
|
return name;
|
|
89
91
|
};
|
|
90
92
|
|
|
93
|
+
// Tla_parser.pickle: renames an identifier that some backend would reject.
|
|
91
94
|
export const pickle = (name: string) => {
|
|
92
95
|
const characters = [...name];
|
|
93
96
|
const isPlain =
|
|
@@ -98,3 +101,75 @@ export const pickle = (name: string) => {
|
|
|
98
101
|
if (isPlain) return name;
|
|
99
102
|
return `a_${characters.map((character) => getCharacterName(character) ?? character).join("")}a`;
|
|
100
103
|
};
|
|
104
|
+
|
|
105
|
+
// The temporal operators neither backend has a counterpart for, by the name tlapm reports.
|
|
106
|
+
const TEMPORAL_OPERATORS: Partial<Record<Builtin, [string, number]>> = {
|
|
107
|
+
Leadsto: ["Leadsto", 2],
|
|
108
|
+
ENABLED: ["ENABLED", 1],
|
|
109
|
+
Cdot: ["\\cdot", 2],
|
|
110
|
+
Actplus: ["-+->", 2],
|
|
111
|
+
BoxTrue: ["[]", 1],
|
|
112
|
+
BoxFalse: ["[]", 1],
|
|
113
|
+
Diamond: ["<>", 1],
|
|
114
|
+
};
|
|
115
|
+
|
|
116
|
+
// Why a backend can't print an application of builtin, which it reports as where.
|
|
117
|
+
export const getUnprintableError = (builtin: Builtin, arity: number, where: string) => {
|
|
118
|
+
const isFrontend = builtin === "Prime" || builtin === "StrongPrime" || builtin === "UNCHANGED";
|
|
119
|
+
if (isFrontend && arity === 1) return new TlapmBugError();
|
|
120
|
+
const temporal = TEMPORAL_OPERATORS[builtin];
|
|
121
|
+
return temporal && temporal[1] === arity
|
|
122
|
+
? new TlaProverError(`Unsupported operator \`${temporal[0]}\`.\n`)
|
|
123
|
+
: new TlaProverError(where);
|
|
124
|
+
};
|
|
125
|
+
|
|
126
|
+
interface SplitQuantifier {
|
|
127
|
+
first: Bound;
|
|
128
|
+
inner: Expr;
|
|
129
|
+
}
|
|
130
|
+
|
|
131
|
+
// A quantifier's first bound binds around a quantifier over the others, which move under it. A
|
|
132
|
+
// ditto after the first bound copies its domain.
|
|
133
|
+
export const splitFirstBound = (
|
|
134
|
+
quantifier: "Forall" | "Exists",
|
|
135
|
+
bounds: Bound[],
|
|
136
|
+
body: Expr,
|
|
137
|
+
): SplitQuantifier => {
|
|
138
|
+
const first = bounds[0];
|
|
139
|
+
const rest = bounds.slice(1);
|
|
140
|
+
const undittoed =
|
|
141
|
+
rest[0]?.domain.kind === "Ditto"
|
|
142
|
+
? [{ ...rest[0], domain: first.domain }, ...rest.slice(1)]
|
|
143
|
+
: rest;
|
|
144
|
+
if (undittoed.length === 0) return { first, inner: body };
|
|
145
|
+
return {
|
|
146
|
+
first,
|
|
147
|
+
inner: {
|
|
148
|
+
kind: "Quant",
|
|
149
|
+
quantifier,
|
|
150
|
+
bounds: undittoed.map((other) =>
|
|
151
|
+
other.domain.kind === "Domain"
|
|
152
|
+
? {
|
|
153
|
+
...other,
|
|
154
|
+
domain: { kind: "Domain", expression: shiftExpr(1, other.domain.expression) },
|
|
155
|
+
}
|
|
156
|
+
: other,
|
|
157
|
+
),
|
|
158
|
+
body,
|
|
159
|
+
location: body.location,
|
|
160
|
+
},
|
|
161
|
+
};
|
|
162
|
+
};
|
|
163
|
+
|
|
164
|
+
// tlapm prints a fact to a formatter that drops its output first, to omit an unsupported one: the
|
|
165
|
+
// fact's print, or the error that omits it once the names it bound are out of scope.
|
|
166
|
+
export const printFact = <Printed>(context: Context, print: () => Printed) => {
|
|
167
|
+
const depth = context.stack.length;
|
|
168
|
+
try {
|
|
169
|
+
return print();
|
|
170
|
+
} catch (error) {
|
|
171
|
+
if (!(error instanceof TlaUnsupportedError)) throw error;
|
|
172
|
+
popNames(context, context.stack.length - depth);
|
|
173
|
+
return error;
|
|
174
|
+
}
|
|
175
|
+
};
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
// Decides a theory tlapm writes for Isabelle, as tlapm's Isabelle backend runs it: use_thy on the
|
|
2
2
|
// heap of Isabelle/TLA+ succeeds or fails.
|
|
3
3
|
|
|
4
|
-
import { TlaIsabelleError } from "../../errors";
|
|
4
|
+
import { isStackOverflow, TlaIsabelleError } from "../../errors";
|
|
5
5
|
import type { DecideOptions, Verdict } from "../verdict";
|
|
6
6
|
import { parseProofText, terminalProof } from "./isar/method";
|
|
7
7
|
import { getFacts, initGoal } from "./isar/proof";
|
|
@@ -13,11 +13,6 @@ import { aconv } from "./pure/term";
|
|
|
13
13
|
import { getProofContext } from "./tla/context";
|
|
14
14
|
import { loadLogic } from "./tla/logic";
|
|
15
15
|
|
|
16
|
-
// V8's error when a recursion runs out of stack. Poly/ML grows its stack instead, until the
|
|
17
|
-
// recursion ends or Isabelle breaks down for lack of memory, which tlapm counts as a failure.
|
|
18
|
-
const isStackOverflow = (error: unknown) =>
|
|
19
|
-
error instanceof RangeError && error.message === "Maximum call stack size exceeded";
|
|
20
|
-
|
|
21
16
|
export const decideIsabelle = (text: string, options: DecideOptions): Exclude<Verdict, "sat"> => {
|
|
22
17
|
const limits = { deadline: Date.now() + options.timeLimitMs, signal: options.signal };
|
|
23
18
|
try {
|
|
@@ -41,6 +36,8 @@ export const decideIsabelle = (text: string, options: DecideOptions): Exclude<Ve
|
|
|
41
36
|
? "unsat"
|
|
42
37
|
: "unknown";
|
|
43
38
|
} catch (error) {
|
|
39
|
+
// Poly/ML grows its stack instead, until Isabelle runs out of memory, which tlapm counts as a
|
|
40
|
+
// failure.
|
|
44
41
|
if (error instanceof TlaIsabelleError || isStackOverflow(error)) return "unknown";
|
|
45
42
|
throw error;
|
|
46
43
|
}
|