tla-ts 0.0.9 → 0.0.10-dev.63a6693bd
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +29 -1
- package/dist/compile.cjs +23 -0
- package/dist/compile.js +23 -0
- package/dist/deciders.cjs +29 -29
- package/dist/deciders.js +42 -42
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +106 -10
- package/dist/index.d.ts +106 -10
- package/dist/index.js +1 -1
- package/dist/parallel-worker.cjs +1 -1
- package/dist/parallel-worker.js +1 -1
- package/dist/prove-worker.cjs +1 -1
- package/dist/prove-worker.js +1 -1
- package/dist/prove.cjs +117 -37
- package/dist/prove.js +116 -36
- package/dist/run.cjs +143 -31
- package/dist/run.js +143 -31
- package/dist/tlapm.cjs +2 -2
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +129 -104
- package/dist/transfer.js +129 -104
- package/dist/worker.cjs +7 -7
- package/dist/worker.js +7 -7
- package/package.json +3 -1
- package/src/ast.ts +48 -62
- package/src/bags.ts +99 -102
- package/src/builtins.ts +28 -75
- package/src/bundled-modules.ts +1 -8
- package/src/check-failure.ts +116 -0
- package/src/check-trace.ts +282 -0
- package/src/check.ts +599 -754
- package/src/cli/options.ts +12 -32
- package/src/cli/run.ts +0 -2
- package/src/cli/runtime-invariants.ts +136 -0
- package/src/cli/shared.ts +19 -12
- package/src/cli/tlapm.ts +14 -25
- package/src/cli/tlc-arguments.ts +652 -0
- package/src/cli/tlc-output.ts +687 -0
- package/src/cli/tlc-usage.ts +361 -0
- package/src/cli/tlc.ts +309 -658
- package/src/cli/typescript.ts +23 -0
- package/src/cli/xml-exporter.ts +27 -49
- package/src/cli.ts +0 -1
- package/src/codegen.ts +196 -74
- package/src/config.ts +140 -109
- package/src/coverage.ts +830 -0
- package/src/dependencies.ts +14 -53
- package/src/dfid.ts +618 -0
- package/src/environment-config.ts +315 -0
- package/src/environment.ts +169 -335
- package/src/errors.ts +71 -55
- package/src/evaluate.ts +598 -340
- package/src/exit-codes.ts +37 -3
- package/src/fingerprints.ts +75 -11
- package/src/index.ts +3 -0
- package/src/instances.ts +126 -21
- package/src/java-hash.ts +7 -0
- package/src/java-overrides.ts +4 -19
- package/src/json-reader.ts +455 -0
- package/src/json.ts +252 -139
- package/src/levels.ts +46 -58
- package/src/lexer.ts +80 -100
- package/src/liveness-checker.ts +103 -153
- package/src/liveness.ts +150 -109
- package/src/obligations/action.ts +8 -39
- package/src/obligations/anonymize.ts +88 -82
- package/src/obligations/equality.ts +1 -1
- package/src/obligations/expression.ts +20 -21
- package/src/obligations/format.ts +1 -9
- package/src/obligations/generate.ts +46 -49
- package/src/obligations/index.ts +2 -13
- package/src/obligations/levels.ts +4 -8
- package/src/obligations/module.ts +28 -53
- package/src/obligations/normalize.ts +7 -25
- package/src/obligations/operators.ts +1 -2
- package/src/obligations/pragma.ts +1 -10
- package/src/obligations/printer.ts +47 -46
- package/src/obligations/proof.ts +1 -5
- package/src/obligations/regroup.ts +1 -4
- package/src/obligations/simplify.ts +42 -58
- package/src/obligations/source.ts +48 -78
- package/src/obligations/subexpression.ts +5 -11
- package/src/obligations/substitution.ts +1 -3
- package/src/obligations/temporal.ts +13 -19
- package/src/obligations/tuples.ts +3 -9
- package/src/parallel-worker.ts +30 -60
- package/src/parallel.ts +57 -71
- package/src/parser.ts +584 -316
- package/src/pcal/ast.ts +53 -86
- package/src/pcal/parse.ts +144 -219
- package/src/pcal/tokenize.ts +91 -131
- package/src/pcal/translate.ts +83 -130
- package/src/pcal/validate.ts +48 -68
- package/src/pretty-print.ts +7 -8
- package/src/prover/decide-pool.ts +8 -13
- package/src/prover/deciders.ts +3 -7
- package/src/prover/first-order.ts +0 -11
- package/src/prover/isabelle/decide.ts +0 -6
- package/src/prover/isabelle/encode.ts +11 -23
- package/src/prover/isabelle/isar/inner-syntax.ts +114 -115
- package/src/prover/isabelle/isar/method.ts +29 -53
- package/src/prover/isabelle/isar/proof.ts +1 -10
- package/src/prover/isabelle/isar/statement.ts +1 -6
- package/src/prover/isabelle/isar/theory.ts +26 -36
- package/src/prover/isabelle/isar/type-check.ts +17 -31
- package/src/prover/isabelle/provers/blast/blast.ts +17 -104
- package/src/prover/isabelle/provers/blast/branch.ts +1 -32
- package/src/prover/isabelle/provers/blast/prove.ts +1 -35
- package/src/prover/isabelle/provers/blast/rules.ts +6 -44
- package/src/prover/isabelle/provers/blast/state.ts +2 -28
- package/src/prover/isabelle/provers/blast/term.ts +9 -36
- package/src/prover/isabelle/provers/clasimp.ts +1 -13
- package/src/prover/isabelle/provers/classical.ts +14 -42
- package/src/prover/isabelle/provers/hypsubst.ts +28 -51
- package/src/prover/isabelle/pure/bicompose.ts +25 -38
- package/src/prover/isabelle/pure/consts.ts +1 -7
- package/src/prover/isabelle/pure/conv.ts +3 -17
- package/src/prover/isabelle/pure/drule.ts +33 -42
- package/src/prover/isabelle/pure/envir.ts +3 -52
- package/src/prover/isabelle/pure/goal.ts +1 -7
- package/src/prover/isabelle/pure/interrupt.ts +0 -5
- package/src/prover/isabelle/pure/list.ts +0 -3
- package/src/prover/isabelle/pure/logic.ts +2 -15
- package/src/prover/isabelle/pure/name.ts +2 -9
- package/src/prover/isabelle/pure/net.ts +3 -59
- package/src/prover/isabelle/pure/object-logic.ts +3 -10
- package/src/prover/isabelle/pure/pattern.ts +2 -19
- package/src/prover/isabelle/pure/raw-simplifier.ts +17 -62
- package/src/prover/isabelle/pure/rewriter.ts +31 -67
- package/src/prover/isabelle/pure/search.ts +3 -10
- package/src/prover/isabelle/pure/seq.ts +1 -10
- package/src/prover/isabelle/pure/simplifier.ts +4 -12
- package/src/prover/isabelle/pure/table.ts +3 -32
- package/src/prover/isabelle/pure/tactic.ts +12 -22
- package/src/prover/isabelle/pure/tactical.ts +48 -47
- package/src/prover/isabelle/pure/term-ord.ts +2 -6
- package/src/prover/isabelle/pure/term.ts +2 -43
- package/src/prover/isabelle/pure/thm.ts +27 -47
- package/src/prover/isabelle/pure/type.ts +2 -15
- package/src/prover/isabelle/pure/unify.ts +20 -30
- package/src/prover/isabelle/pure/variable.ts +3 -7
- package/src/prover/isabelle/tla/classical-setup.ts +17 -24
- package/src/prover/isabelle/tla/context.ts +15 -18
- package/src/prover/isabelle/tla/logic.ts +14 -32
- package/src/prover/isabelle/tla/simpdata.ts +46 -43
- package/src/prover/isabelle/tools/intuitionistic.ts +1 -10
- package/src/prover/ocaml.ts +0 -6
- package/src/prover/prep/action.ts +14 -54
- package/src/prover/prep/enabled-axioms.ts +12 -19
- package/src/prover/prep/fingerprint.ts +2 -21
- package/src/prover/prep/level-comparison.ts +8 -12
- package/src/prover/prep/md5.ts +0 -2
- package/src/prover/prep/methods.ts +33 -39
- package/src/prover/prep/normalize.ts +4 -28
- package/src/prover/prove-worker.ts +0 -2
- package/src/prover/prove.ts +87 -100
- package/src/prover/ptl/decide.ts +7 -12
- package/src/prover/ptl/encode.ts +14 -36
- package/src/prover/ptl/sat.ts +24 -32
- package/src/prover/ptl/tableau.ts +12 -26
- package/src/prover/smt/axioms.ts +0 -7
- package/src/prover/smt/context.ts +20 -28
- package/src/prover/smt/data.ts +433 -424
- package/src/prover/smt/encode.ts +43 -52
- package/src/prover/smt/extensionality.ts +0 -10
- package/src/prover/smt/flatten.ts +3 -22
- package/src/prover/smt/format.ts +5 -10
- package/src/prover/smt/instances.ts +0 -10
- package/src/prover/smt/rewrite.ts +663 -667
- package/src/prover/smt/solver/act-cache.ts +0 -15
- package/src/prover/smt/solver/arith-rewriter.ts +3 -48
- package/src/prover/smt/solver/array.ts +1 -3
- package/src/prover/smt/solver/asserted-formulas.ts +1 -43
- package/src/prover/smt/solver/ast-lt.ts +1 -11
- package/src/prover/smt/solver/ast-util.ts +1 -6
- package/src/prover/smt/solver/ast.ts +1 -165
- package/src/prover/smt/solver/auf-solver.ts +8 -44
- package/src/prover/smt/solver/case-split-queue.ts +1 -9
- package/src/prover/smt/solver/cg-table.ts +1 -18
- package/src/prover/smt/solver/clause.ts +1 -27
- package/src/prover/smt/solver/conflict-resolution.ts +0 -9
- package/src/prover/smt/solver/context.ts +7 -64
- package/src/prover/smt/solver/ctx-simplify.ts +14 -41
- package/src/prover/smt/solver/der.ts +2 -21
- package/src/prover/smt/solver/dyn-ack.ts +1 -11
- package/src/prover/smt/solver/e-matching.ts +4 -35
- package/src/prover/smt/solver/enode.ts +1 -21
- package/src/prover/smt/solver/expr-ref.ts +1 -5
- package/src/prover/smt/solver/expr-safe-replace.ts +1 -6
- package/src/prover/smt/solver/fingerprints.ts +1 -12
- package/src/prover/smt/solver/flat-literals.ts +1 -9
- package/src/prover/smt/solver/goal.ts +2 -14
- package/src/prover/smt/solver/hash.ts +0 -8
- package/src/prover/smt/solver/hashtable.ts +1 -12
- package/src/prover/smt/solver/internalizer.ts +7 -100
- package/src/prover/smt/solver/lbool.ts +1 -2
- package/src/prover/smt/solver/literal.ts +0 -3
- package/src/prover/smt/solver/lp/bound-propagator.ts +8 -26
- package/src/prover/smt/solver/lp/constraints.ts +2 -8
- package/src/prover/smt/solver/lp/containers.ts +12 -30
- package/src/prover/smt/solver/lp/core-solver.ts +10 -31
- package/src/prover/smt/solver/lp/cross-nested.ts +6 -20
- package/src/prover/smt/solver/lp/dep-intervals.ts +7 -22
- package/src/prover/smt/solver/lp/dependency.ts +1 -4
- package/src/prover/smt/solver/lp/dioph-eq.ts +9 -102
- package/src/prover/smt/solver/lp/explanation.ts +1 -6
- package/src/prover/smt/solver/lp/gomory.ts +9 -22
- package/src/prover/smt/solver/lp/hnf-cutter.ts +17 -23
- package/src/prover/smt/solver/lp/hnf.ts +11 -26
- package/src/prover/smt/solver/lp/int-cube.ts +15 -36
- package/src/prover/smt/solver/lp/int-solver.ts +4 -34
- package/src/prover/smt/solver/lp/lar-solver.ts +32 -81
- package/src/prover/smt/solver/lp/lar-term.ts +1 -5
- package/src/prover/smt/solver/lp/lp-settings.ts +1 -14
- package/src/prover/smt/solver/lp/maximize-term.ts +20 -45
- package/src/prover/smt/solver/lp/nex-creator.ts +5 -28
- package/src/prover/smt/solver/lp/nex.ts +1 -6
- package/src/prover/smt/solver/lp/nla-backoff.ts +1 -4
- package/src/prover/smt/solver/lp/nla-basics.ts +5 -30
- package/src/prover/smt/solver/lp/nla-core.ts +36 -135
- package/src/prover/smt/solver/lp/nla-divisions.ts +32 -42
- package/src/prover/smt/solver/lp/nla-emonics.ts +4 -21
- package/src/prover/smt/solver/lp/nla-factorization.ts +1 -4
- package/src/prover/smt/solver/lp/nla-grobner.ts +15 -69
- package/src/prover/smt/solver/lp/nla-horner.ts +3 -11
- package/src/prover/smt/solver/lp/nla-intervals.ts +2 -12
- package/src/prover/smt/solver/lp/nla-monomial-bounds.ts +16 -41
- package/src/prover/smt/solver/lp/nla-monotone.ts +2 -6
- package/src/prover/smt/solver/lp/nla-order.ts +2 -13
- package/src/prover/smt/solver/lp/nla-patcher.ts +4 -7
- package/src/prover/smt/solver/lp/nla-tangents.ts +1 -9
- package/src/prover/smt/solver/lp/nla-throttle.ts +1 -6
- package/src/prover/smt/solver/lp/nla-types.ts +1 -11
- package/src/prover/smt/solver/lp/nla-var-eqs.ts +4 -25
- package/src/prover/smt/solver/lp/nra-solver.ts +5 -52
- package/src/prover/smt/solver/lp/numeric-pair.ts +1 -4
- package/src/prover/smt/solver/lp/pdd-interval.ts +1 -3
- package/src/prover/smt/solver/lp/pdd-simplifier.ts +2 -14
- package/src/prover/smt/solver/lp/pdd-solver.ts +4 -33
- package/src/prover/smt/solver/lp/pdd.ts +7 -70
- package/src/prover/smt/solver/lp/random-updater.ts +1 -8
- package/src/prover/smt/solver/lp/static-matrix.ts +9 -19
- package/src/prover/smt/solver/lp/union-find.ts +1 -6
- package/src/prover/smt/solver/mam-compiler.ts +18 -58
- package/src/prover/smt/solver/mam-interpreter.ts +1 -21
- package/src/prover/smt/solver/maximize-ac-sharing.ts +2 -17
- package/src/prover/smt/solver/model-checker.ts +3 -37
- package/src/prover/smt/solver/model-evaluator.ts +3 -29
- package/src/prover/smt/solver/model-finder.ts +15 -32
- package/src/prover/smt/solver/model-generator.ts +1 -12
- package/src/prover/smt/solver/model-macro-solver.ts +23 -88
- package/src/prover/smt/solver/nlsat/algebraic.ts +63 -159
- package/src/prover/smt/solver/nlsat/atoms.ts +25 -23
- package/src/prover/smt/solver/nlsat/evaluator.ts +17 -22
- package/src/prover/smt/solver/nlsat/explain.ts +10 -69
- package/src/prover/smt/solver/nlsat/interval-set.ts +9 -50
- package/src/prover/smt/solver/nlsat/levelwise.ts +49 -135
- package/src/prover/smt/solver/nlsat/mpbq.ts +3 -14
- package/src/prover/smt/solver/nlsat/polynomial.ts +29 -159
- package/src/prover/smt/solver/nlsat/solver.ts +18 -90
- package/src/prover/smt/solver/nlsat/types.ts +1 -8
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +2 -45
- package/src/prover/smt/solver/nlsat/upolynomial.ts +11 -92
- package/src/prover/smt/solver/nnf.ts +3 -38
- package/src/prover/smt/solver/pattern-inference.ts +2 -15
- package/src/prover/smt/solver/poly-rewriter.ts +3 -23
- package/src/prover/smt/solver/propagate-values.ts +1 -10
- package/src/prover/smt/solver/proto-model.ts +3 -52
- package/src/prover/smt/solver/pull-quant.ts +1 -12
- package/src/prover/smt/solver/qe-lite-der.ts +1 -29
- package/src/prover/smt/solver/qe-lite-fm.ts +2 -25
- package/src/prover/smt/solver/qe-lite.ts +3 -33
- package/src/prover/smt/solver/qi-queue.ts +1 -16
- package/src/prover/smt/solver/quant-tactics.ts +5 -22
- package/src/prover/smt/solver/quantifier-analyzer.ts +27 -47
- package/src/prover/smt/solver/quantifier-manager.ts +2 -13
- package/src/prover/smt/solver/random-gen.ts +1 -2
- package/src/prover/smt/solver/rational.ts +1 -8
- package/src/prover/smt/solver/ref-vector.ts +1 -6
- package/src/prover/smt/solver/relevancy.ts +2 -15
- package/src/prover/smt/solver/rewriter-tpl.ts +3 -147
- package/src/prover/smt/solver/rewriter.ts +3 -85
- package/src/prover/smt/solver/rlimit.ts +2 -20
- package/src/prover/smt/solver/smtlib-parser.ts +80 -131
- package/src/prover/smt/solver/solver.ts +23 -34
- package/src/prover/smt/solver/sort.ts +1 -5
- package/src/prover/smt/solver/sticky-generations.ts +0 -5
- package/src/prover/smt/solver/theory-lra-axioms.ts +3 -24
- package/src/prover/smt/solver/theory-lra-bounds.ts +1 -7
- package/src/prover/smt/solver/theory-lra-final-check.ts +4 -22
- package/src/prover/smt/solver/theory-lra-internalize.ts +6 -43
- package/src/prover/smt/solver/theory-lra-model.ts +4 -19
- package/src/prover/smt/solver/theory-lra-propagate.ts +1 -15
- package/src/prover/smt/solver/theory-lra-state.ts +3 -8
- package/src/prover/smt/solver/theory-lra.ts +1 -8
- package/src/prover/smt/solver/var-subst.ts +2 -26
- package/src/prover/smt/table.ts +0 -8
- package/src/prover/tlapm/cache.ts +45 -40
- package/src/prover/tlapm/ocaml-marshal.ts +19 -21
- package/src/prover/tlapm/tlapm.ts +21 -20
- package/src/prover/verdict.ts +7 -2
- package/src/prover/zenon/check/check.ts +1 -11
- package/src/prover/zenon/check/definitions.ts +5 -15
- package/src/prover/zenon/check/equality.ts +0 -8
- package/src/prover/zenon/check/functions.ts +0 -4
- package/src/prover/zenon/check/keys.ts +0 -7
- package/src/prover/zenon/check/propositional.ts +0 -3
- package/src/prover/zenon/check/records.ts +1 -6
- package/src/prover/zenon/check/relations.ts +2 -14
- package/src/prover/zenon/check/rewrites.ts +2 -21
- package/src/prover/zenon/check/sets.ts +40 -61
- package/src/prover/zenon/check/terms.ts +1 -19
- package/src/prover/zenon/check/tla.ts +0 -6
- package/src/prover/zenon/decide.ts +0 -12
- package/src/prover/zenon/encode.ts +1 -8
- package/src/prover/zenon/eqrel.ts +2 -13
- package/src/prover/zenon/equality-rules.ts +0 -4
- package/src/prover/zenon/expr.ts +8 -26
- package/src/prover/zenon/index-table.ts +26 -57
- package/src/prover/zenon/isar-case.ts +9 -19
- package/src/prover/zenon/isar.ts +36 -64
- package/src/prover/zenon/limits.ts +0 -4
- package/src/prover/zenon/llproof.ts +2 -20
- package/src/prover/zenon/mltoll.ts +66 -104
- package/src/prover/zenon/node.ts +1 -11
- package/src/prover/zenon/ocaml.ts +1 -17
- package/src/prover/zenon/parse.ts +4 -12
- package/src/prover/zenon/phrase.ts +1 -11
- package/src/prover/zenon/proof.ts +0 -9
- package/src/prover/zenon/propositional-rules.ts +0 -5
- package/src/prover/zenon/rules.ts +2 -6
- package/src/prover/zenon/search.ts +5 -31
- package/src/prover/zenon/tla/functions.ts +59 -31
- package/src/prover/zenon/tla/llproof.ts +67 -76
- package/src/prover/zenon/tla/records.ts +57 -33
- package/src/prover/zenon/tla/rewrites.ts +12 -19
- package/src/prover/zenon/tla/sets.ts +83 -53
- package/src/prover/zenon/tla/terms.ts +0 -6
- package/src/prover/zenon/tla/tla.ts +66 -64
- package/src/randomization.ts +81 -35
- package/src/resolve.ts +67 -184
- package/src/runtime.ts +22 -22
- package/src/sany/builtins.ts +2 -5
- package/src/sany/generation.ts +394 -0
- package/src/sany/generator-def-entries.ts +210 -0
- package/src/sany/generator-definitions.ts +686 -0
- package/src/sany/generator-expressions.ts +1100 -0
- package/src/sany/generator-proofs.ts +662 -0
- package/src/sany/generator.ts +191 -2764
- package/src/sany/levels.ts +6 -34
- package/src/sany/lexer.ts +58 -77
- package/src/sany/linter.ts +1 -9
- package/src/sany/modules.ts +1 -5
- package/src/sany/nodes.ts +5 -43
- package/src/sany/parse-error.ts +39 -117
- package/src/sany/report.ts +32 -69
- package/src/sany/selectors.ts +49 -76
- package/src/sany/source.ts +1 -17
- package/src/sany/xml.ts +35 -117
- package/src/search.ts +541 -163
- package/src/simulate.ts +709 -0
- package/src/spec-description.ts +192 -100
- package/src/standard-definitions.ts +0 -4
- package/src/standard-modules.ts +264 -95
- package/src/state-graph.ts +52 -31
- package/src/subexpressions.ts +69 -52
- package/src/substitution-levels.ts +7 -7
- package/src/successors.ts +266 -99
- package/src/symmetry.ts +33 -25
- package/src/tableau.ts +27 -24
- package/src/tlc/fingerprint.ts +183 -67
- package/src/tlc/jar-data.ts +112 -6
- package/src/tlc/messages.ts +125 -54
- package/src/tlc/order.ts +39 -69
- package/src/tlc/random.ts +37 -49
- package/src/tlc/replay.ts +553 -228
- package/src/tlc/summary.ts +36 -47
- package/src/tlc/tlc-operators.ts +78 -44
- package/src/tlc/tlcext-operators.ts +139 -122
- package/src/tlc/trace-spec.ts +249 -0
- package/src/tlc/value-stream.ts +139 -0
- package/src/tlc/version.ts +1 -4
- package/src/transfer.ts +22 -25
- package/src/typescript/actions.ts +479 -0
- package/src/typescript/collections.ts +614 -0
- package/src/typescript/compile.ts +63 -0
- package/src/typescript/context.ts +94 -0
- package/src/typescript/emit.ts +121 -0
- package/src/typescript/expressions.ts +496 -0
- package/src/typescript/formula.ts +154 -0
- package/src/typescript/functions.ts +284 -0
- package/src/typescript/model.ts +162 -0
- package/src/typescript/names.ts +114 -0
- package/src/typescript/program.ts +48 -0
- package/src/typescript/properties.ts +139 -0
- package/src/typescript/scope.ts +112 -0
- package/src/typescript/steps.ts +167 -0
- package/src/typescript/types.ts +171 -0
- package/src/values.ts +832 -484
- package/src/worker.ts +7 -8
package/src/pcal/validate.ts
CHANGED
|
@@ -11,7 +11,6 @@ import { createPcalCharReader } from "./tokenize";
|
|
|
11
11
|
import { translatePcalAlgorithm } from "./translate";
|
|
12
12
|
import type { TlcVersion } from "../tlc/version";
|
|
13
13
|
|
|
14
|
-
// Validator.ValidationResult.
|
|
15
14
|
type PcalValidationResult =
|
|
16
15
|
| "NO_PLUSCAL_EXISTS"
|
|
17
16
|
| "NO_TRANSLATION_EXISTS"
|
|
@@ -24,20 +23,16 @@ type PcalValidationResult =
|
|
|
24
23
|
// Java's \s, which unlike JavaScript's matches no Unicode spaces.
|
|
25
24
|
const SPACE = "[ \\t\\n\\x0B\\f\\r]";
|
|
26
25
|
|
|
27
|
-
// Validator.CHECKSUM_PATTERN, whose (?i) groups become character classes.
|
|
28
26
|
const CHECKSUM_PATTERN = new RegExp(
|
|
29
27
|
`\\\\\\* BEGIN TRANSLATION${SPACE}+\\(${SPACE}*([cC][hH]([eE][cC])?[kK][sS][uU][mM]\\([pP]([lL][uU][sS])?[cC][aA][lL]\\))${SPACE}*(=${SPACE}*"(?<pcal>[0-9A-Fa-f]*)"|\\\\in${SPACE}*STRING)${SPACE}*\\/\\\\${SPACE}*([cC][hH]([eE][cC])?[kK][sS][uU][mM]\\([tT][lL][aA]\\+?\\))${SPACE}*(=${SPACE}*"(?<tla>[0-9A-Fa-f]*)"|\\\\in${SPACE}*STRING)${SPACE}*\\)`,
|
|
30
28
|
);
|
|
31
29
|
|
|
32
|
-
// Validator.checksum: CRC32 of the string's bytes, in Long.toHexString's unpadded lowercase hex.
|
|
33
|
-
// Only a spec with PlusCal needs node:zlib, so it loads then rather than at startup.
|
|
34
30
|
const getChecksum = (text: string) =>
|
|
35
31
|
process.getBuiltinModule("node:zlib").crc32(Buffer.from(text, "utf8")).toString(16);
|
|
36
32
|
|
|
37
33
|
const reportUnrecoverableError = (session: PcalSession, message: string) =>
|
|
38
34
|
session.log(`\nUnrecoverable error:\n -- ${message}.\n`);
|
|
39
35
|
|
|
40
|
-
// PcalDebug.reportError: an UnrecoverablePositionedException names its statement's position.
|
|
41
36
|
const reportPcalError = (session: PcalSession, error: PcalError) =>
|
|
42
37
|
reportUnrecoverableError(
|
|
43
38
|
session,
|
|
@@ -46,7 +41,6 @@ const reportPcalError = (session: PcalSession, error: PcalError) =>
|
|
|
46
41
|
: `${error.message}\n at ${getPcalLocation(error.node)}`,
|
|
47
42
|
);
|
|
48
43
|
|
|
49
|
-
// trans.removeTabs: tabs reach the next multiple of 8, and every line gets a trailing space.
|
|
50
44
|
const removeTabs = (lines: string[]) =>
|
|
51
45
|
lines.map(
|
|
52
46
|
(line) =>
|
|
@@ -57,7 +51,6 @@ const removeTabs = (lines: string[]) =>
|
|
|
57
51
|
)} `,
|
|
58
52
|
);
|
|
59
53
|
|
|
60
|
-
// trans.findTokenPair: the first line from start with first followed by second after spaces.
|
|
61
54
|
const findTokenPair = (lines: string[], start: number, first: string, second: string) => {
|
|
62
55
|
for (let index = Math.max(start, 0); index < lines.length; index++) {
|
|
63
56
|
const line = lines[index];
|
|
@@ -75,8 +68,6 @@ interface PcalSearchLocation {
|
|
|
75
68
|
column: number;
|
|
76
69
|
}
|
|
77
70
|
|
|
78
|
-
// ParseAlgorithm.GotoNextNonSpace: moves the location to the next character that isn't a space,
|
|
79
|
-
// returning its line, or "" past the last line.
|
|
80
71
|
const gotoNextNonSpace = (lines: string[], location: PcalSearchLocation) => {
|
|
81
72
|
while (location.line < lines.length) {
|
|
82
73
|
const line = lines[location.line];
|
|
@@ -88,8 +79,6 @@ const gotoNextNonSpace = (lines: string[], location: PcalSearchLocation) => {
|
|
|
88
79
|
return "";
|
|
89
80
|
};
|
|
90
81
|
|
|
91
|
-
// ParseAlgorithm.NextSpaceCol and NextDelimiterCol: the first delimiter from column on, or the
|
|
92
|
-
// end of the line.
|
|
93
82
|
const getNextDelimiter = (line: string, column: number, delimiters: string) => {
|
|
94
83
|
const index = Array.from(line.slice(column)).findIndex((char) => delimiters.includes(char));
|
|
95
84
|
return index === -1 ? line.length : column + line.slice(column, column + index).length;
|
|
@@ -97,8 +86,6 @@ const getNextDelimiter = (line: string, column: number, delimiters: string) => {
|
|
|
97
86
|
|
|
98
87
|
const isIdChar = (char: string) => /^[\p{L}\p{Nd}_]$/u.test(char);
|
|
99
88
|
|
|
100
|
-
// ParseAlgorithm.FindToken: moves the location past the next occurrence of token that starts a
|
|
101
|
-
// word and isn't followed by a letter or "_".
|
|
102
89
|
const findToken = (lines: string[], location: PcalSearchLocation, token: string) => {
|
|
103
90
|
while (location.line < lines.length) {
|
|
104
91
|
const line = gotoNextNonSpace(lines, location);
|
|
@@ -114,19 +101,17 @@ const findToken = (lines: string[], location: PcalSearchLocation, token: string)
|
|
|
114
101
|
return false;
|
|
115
102
|
};
|
|
116
103
|
|
|
117
|
-
// trans.CommandLineError.
|
|
118
104
|
const reportCommandLineError = (session: PcalSession, message: string) =>
|
|
119
105
|
reportUnrecoverableError(session, `Command-line error: ${message}`);
|
|
120
106
|
|
|
121
|
-
// trans.parseAndProcessArguments for the options of a "PlusCal options" statement, which set the
|
|
122
|
-
// translator's options for the rest of SANY's run.
|
|
123
107
|
const processOptionArguments = (session: PcalSession, args: string[]) => {
|
|
124
108
|
const params = session.params;
|
|
125
|
-
|
|
109
|
+
let isFirstFairness = true;
|
|
110
|
+
let isExplicitNof = false;
|
|
126
111
|
const setFairness = (option: string) => {
|
|
127
|
-
if (
|
|
112
|
+
if (isFirstFairness) {
|
|
128
113
|
params.fairnessOption = "";
|
|
129
|
-
|
|
114
|
+
isFirstFairness = false;
|
|
130
115
|
}
|
|
131
116
|
if (params.fairnessOption !== "") {
|
|
132
117
|
reportCommandLineError(session, "Can only have one of -wf, -sf, -wfNext, and -nof options");
|
|
@@ -180,7 +165,7 @@ const processOptionArguments = (session: PcalSession, args: string[]) => {
|
|
|
180
165
|
case "-nof":
|
|
181
166
|
case "nof":
|
|
182
167
|
if (!setFairness(option.replace(/^-/, ""))) return;
|
|
183
|
-
if (option.endsWith("nof"))
|
|
168
|
+
if (option.endsWith("nof")) isExplicitNof = true;
|
|
184
169
|
continue;
|
|
185
170
|
case "-label":
|
|
186
171
|
case "label":
|
|
@@ -208,7 +193,6 @@ const processOptionArguments = (session: PcalSession, args: string[]) => {
|
|
|
208
193
|
reportCommandLineError(session, "Version number must follow `-version' option");
|
|
209
194
|
return;
|
|
210
195
|
}
|
|
211
|
-
// PcalParams.ProcessVersion.
|
|
212
196
|
const version = getPcalVersionNumber(argument);
|
|
213
197
|
if (version < 0 || version > PCAL_VERSION_WEIGHT) {
|
|
214
198
|
reportUnrecoverableError(
|
|
@@ -225,7 +209,6 @@ const processOptionArguments = (session: PcalSession, args: string[]) => {
|
|
|
225
209
|
continue;
|
|
226
210
|
}
|
|
227
211
|
case "-lineWidth":
|
|
228
|
-
// PcalTLAGen's line width only shapes the translation's text.
|
|
229
212
|
if (!/^[+-]?\d+$/.test(argument ?? "") || Number(argument) < 60) {
|
|
230
213
|
reportCommandLineError(
|
|
231
214
|
session,
|
|
@@ -243,12 +226,11 @@ const processOptionArguments = (session: PcalSession, args: string[]) => {
|
|
|
243
226
|
return;
|
|
244
227
|
}
|
|
245
228
|
}
|
|
246
|
-
if (params.checkTermination && params.fairnessOption === "" && !
|
|
229
|
+
if (params.checkTermination && params.fairnessOption === "" && !isExplicitNof) {
|
|
247
230
|
params.fairnessOption = "wf";
|
|
248
231
|
}
|
|
249
232
|
};
|
|
250
233
|
|
|
251
|
-
// ParseAlgorithm.ProcessOptions: the location is just past "PlusCal".
|
|
252
234
|
const processOptions = (session: PcalSession, lines: string[], location: PcalSearchLocation) => {
|
|
253
235
|
gotoNextNonSpace(lines, location);
|
|
254
236
|
location.column += "options".length;
|
|
@@ -277,60 +259,57 @@ const processOptions = (session: PcalSession, lines: string[], location: PcalSea
|
|
|
277
259
|
processOptionArguments(session, args);
|
|
278
260
|
};
|
|
279
261
|
|
|
280
|
-
// ParseAlgorithm.uncomment: blanks out the comment delimiters and nested comments from the
|
|
281
|
-
// algorithm's start to the "*)" that ends the comment it is in, dropping the rest of that line,
|
|
282
|
-
// and returns the error it throws for a line that ends in a string.
|
|
283
262
|
const uncomment = (lines: string[], startLine: number, startColumn: number) => {
|
|
284
|
-
|
|
285
|
-
|
|
263
|
+
let depth = 0;
|
|
264
|
+
let isDone = false;
|
|
265
|
+
let isInString = false;
|
|
266
|
+
for (let index = startLine; !isDone && index < lines.length; index++) {
|
|
286
267
|
const line = lines[index];
|
|
287
268
|
const start = index === startLine ? startColumn : 0;
|
|
288
269
|
const output = [line.slice(0, start)];
|
|
289
|
-
|
|
290
|
-
for (let column = start; !
|
|
270
|
+
isInString = false;
|
|
271
|
+
for (let column = start; !isDone && column < line.length; column++) {
|
|
291
272
|
const char = line[column];
|
|
292
273
|
const pair = line.slice(column, column + 2);
|
|
293
|
-
if (pair === "(*" && !
|
|
294
|
-
|
|
274
|
+
if (pair === "(*" && !isInString) {
|
|
275
|
+
depth += 1;
|
|
295
276
|
output.push(" ");
|
|
296
277
|
column += 1;
|
|
297
278
|
continue;
|
|
298
279
|
}
|
|
299
|
-
if (pair === "*)" && !
|
|
280
|
+
if (pair === "*)" && !isInString && depth === 0) {
|
|
300
281
|
output.push(pair);
|
|
301
|
-
|
|
282
|
+
isDone = true;
|
|
302
283
|
continue;
|
|
303
284
|
}
|
|
304
|
-
if (pair === "*)" && !
|
|
305
|
-
|
|
285
|
+
if (pair === "*)" && !isInString) {
|
|
286
|
+
depth -= 1;
|
|
306
287
|
output.push(" ");
|
|
307
288
|
column += 1;
|
|
308
289
|
continue;
|
|
309
290
|
}
|
|
310
|
-
if (
|
|
291
|
+
if (depth > 0) {
|
|
311
292
|
output.push(" ");
|
|
312
293
|
continue;
|
|
313
294
|
}
|
|
314
|
-
if (
|
|
295
|
+
if (isInString && char === "\\" && pair.length === 2) {
|
|
315
296
|
output.push(pair);
|
|
316
297
|
column += 1;
|
|
317
298
|
continue;
|
|
318
299
|
}
|
|
319
|
-
if (!
|
|
300
|
+
if (!isInString && pair === "\\*") {
|
|
320
301
|
output.push(" ");
|
|
321
302
|
break;
|
|
322
303
|
}
|
|
323
|
-
if (char === '"')
|
|
304
|
+
if (char === '"') isInString = !isInString;
|
|
324
305
|
output.push(char);
|
|
325
306
|
}
|
|
326
|
-
if (
|
|
307
|
+
if (isInString) return new PcalError(`Unterminated string in line ${index + 1}`);
|
|
327
308
|
lines[index] = output.join("");
|
|
328
309
|
}
|
|
329
310
|
return undefined;
|
|
330
311
|
};
|
|
331
312
|
|
|
332
|
-
// Vector.get on an index out of its range, whose message names the vector's capacity: the 10 it
|
|
333
|
-
// starts with, doubled as it grows.
|
|
334
313
|
const throwIndexOutOfBounds = (index: number, size: number): never => {
|
|
335
314
|
const capacity = 10 * 2 ** Math.max(0, Math.ceil(Math.log2(size / 10)));
|
|
336
315
|
throw new PcalRuntimeError(
|
|
@@ -338,8 +317,6 @@ const throwIndexOutOfBounds = (index: number, size: number): never => {
|
|
|
338
317
|
);
|
|
339
318
|
};
|
|
340
319
|
|
|
341
|
-
// Validator.validate: checks the PlusCal algorithm of the module whose lines are given, from its
|
|
342
|
-
// first to its last, against the checksums its translation records.
|
|
343
320
|
export const validatePcalModule = (
|
|
344
321
|
session: PcalSession,
|
|
345
322
|
specificationText: string[],
|
|
@@ -359,23 +336,22 @@ export const validatePcalModule = (
|
|
|
359
336
|
break;
|
|
360
337
|
}
|
|
361
338
|
}
|
|
362
|
-
|
|
363
|
-
|
|
364
|
-
|
|
365
|
-
|
|
366
|
-
|
|
339
|
+
let beginLine = 0;
|
|
340
|
+
let beginColumn = -1;
|
|
341
|
+
let isFair = false;
|
|
342
|
+
for (; beginLine < lines.length; beginLine++) {
|
|
343
|
+
const line = lines[beginLine];
|
|
344
|
+
// TLAConstants.MODULE_CLOSING_REGEX never matches: removeTabs adds a trailing space.
|
|
367
345
|
if (/^=+$/.test(line)) break;
|
|
368
346
|
const algorithmColumn = line.indexOf("--algorithm");
|
|
369
347
|
const fairColumn = line.indexOf("--fair");
|
|
370
348
|
if (algorithmColumn !== -1) {
|
|
371
|
-
|
|
372
|
-
begin.isFound = true;
|
|
349
|
+
beginColumn = algorithmColumn + "--algorithm".length;
|
|
373
350
|
break;
|
|
374
351
|
}
|
|
375
352
|
if (fairColumn !== -1) {
|
|
376
|
-
|
|
377
|
-
|
|
378
|
-
begin.isFair = true;
|
|
353
|
+
beginColumn = fairColumn + "--fair".length;
|
|
354
|
+
isFair = true;
|
|
379
355
|
break;
|
|
380
356
|
}
|
|
381
357
|
}
|
|
@@ -385,26 +361,31 @@ export const validatePcalModule = (
|
|
|
385
361
|
const endTranslationLine = findTokenPair(lines, translationLine + 1, "END", "TRANSLATION");
|
|
386
362
|
if (endTranslationLine === -1) results.add("NO_TRANSLATION_EXISTS");
|
|
387
363
|
if (translationLine === -1 && endTranslationLine === -1) return results;
|
|
388
|
-
if (
|
|
364
|
+
if (beginColumn === -1) {
|
|
389
365
|
results.add("NO_PLUSCAL_EXISTS");
|
|
390
366
|
return results;
|
|
391
367
|
}
|
|
392
|
-
const uncommentError = uncomment(lines,
|
|
368
|
+
const uncommentError = uncomment(lines, beginLine, beginColumn);
|
|
393
369
|
if (uncommentError !== undefined) {
|
|
394
370
|
reportPcalError(session, uncommentError);
|
|
395
371
|
return new Set(["ERROR_ENCOUNTERED"]);
|
|
396
372
|
}
|
|
397
|
-
|
|
373
|
+
let ast: PcalAlgorithm | undefined;
|
|
398
374
|
// HACK: Validator reports the exceptions of ParseAlgorithm.getAlgorithm and PCalTLAGenerator
|
|
399
375
|
// and goes on to compare the checksums.
|
|
400
376
|
try {
|
|
401
377
|
const result = parsePcalAlgorithm(
|
|
402
378
|
session,
|
|
403
|
-
createPcalCharReader(lines,
|
|
404
|
-
|
|
379
|
+
createPcalCharReader(lines, beginLine, beginColumn),
|
|
380
|
+
isFair,
|
|
381
|
+
);
|
|
382
|
+
ast = result.ast;
|
|
383
|
+
translatePcalAlgorithm(
|
|
384
|
+
result.ast,
|
|
385
|
+
result.shouldOmitPC,
|
|
386
|
+
result.hasDefaultInitialization,
|
|
387
|
+
session.log,
|
|
405
388
|
);
|
|
406
|
-
parsed.ast = result.ast;
|
|
407
|
-
translatePcalAlgorithm(result.ast, result.omitPC, result.hasDefaultInitialization, session.log);
|
|
408
389
|
} catch (error) {
|
|
409
390
|
if (!(error instanceof PcalError)) throw error;
|
|
410
391
|
reportPcalError(session, error);
|
|
@@ -416,14 +397,13 @@ export const validatePcalModule = (
|
|
|
416
397
|
return results;
|
|
417
398
|
}
|
|
418
399
|
const pcalChecksum = match.groups?.pcal;
|
|
419
|
-
// The Java checksums the string "fair" for a --fair algorithm, unlike TLC 1.7.4's
|
|
420
|
-
// parse leaves an AST whose text, Object.toString's class name and hash code, matches no checksum.
|
|
400
|
+
// The Java checksums the string "fair" for a --fair algorithm, unlike TLC 1.7.4's.
|
|
421
401
|
const algorithmText =
|
|
422
|
-
|
|
402
|
+
isFair && version !== "1.7.4"
|
|
423
403
|
? "fair"
|
|
424
|
-
:
|
|
404
|
+
: ast === undefined
|
|
425
405
|
? undefined
|
|
426
|
-
: formatPcalNode(
|
|
406
|
+
: formatPcalNode(ast, session.params.inputVersionNumber, version);
|
|
427
407
|
if (
|
|
428
408
|
pcalChecksum !== undefined &&
|
|
429
409
|
(algorithmText === undefined || pcalChecksum !== getChecksum(algorithmText))
|
package/src/pretty-print.ts
CHANGED
|
@@ -1,5 +1,4 @@
|
|
|
1
|
-
// A port of TLC's tlc2.pprint package
|
|
2
|
-
// lines of at most 80 columns. TLC prints the original text whenever the parse fails.
|
|
1
|
+
// A port of TLC's tlc2.pprint package. TLC prints the original text whenever the parse fails.
|
|
3
2
|
|
|
4
3
|
import { skipWhile } from "./lexer";
|
|
5
4
|
|
|
@@ -79,9 +78,9 @@ const parsePrinted = (text: string) => {
|
|
|
79
78
|
separator: string,
|
|
80
79
|
) => {
|
|
81
80
|
const node: PrintedNode = { kind, first, last: first, children: [] };
|
|
82
|
-
|
|
83
|
-
while (position
|
|
84
|
-
const item = parseItem(position
|
|
81
|
+
let position = skipWhitespace(start);
|
|
82
|
+
while (position !== undefined && text[position] !== close) {
|
|
83
|
+
const item = parseItem(position);
|
|
85
84
|
if (!item) return undefined;
|
|
86
85
|
node.children.push(item);
|
|
87
86
|
const afterItem = skipWhitespace(item.last + 1);
|
|
@@ -89,10 +88,10 @@ const parsePrinted = (text: string) => {
|
|
|
89
88
|
const afterSeparator = text.startsWith(separator, afterItem)
|
|
90
89
|
? afterItem + separator.length
|
|
91
90
|
: afterItem;
|
|
92
|
-
position
|
|
91
|
+
position = skipWhitespace(afterSeparator);
|
|
93
92
|
}
|
|
94
|
-
if (position
|
|
95
|
-
node.last = position
|
|
93
|
+
if (position === undefined) return undefined;
|
|
94
|
+
node.last = position;
|
|
96
95
|
return node;
|
|
97
96
|
};
|
|
98
97
|
|
|
@@ -1,17 +1,13 @@
|
|
|
1
|
-
// Worker threads that decide the obligations prove sends them, the earliest obligation first.
|
|
2
|
-
|
|
3
1
|
import { TlaProverError } from "../errors";
|
|
4
2
|
import { spawnWorker, type WorkerHandle } from "../worker";
|
|
5
|
-
import type { DecideOptions, Decision } from "./verdict";
|
|
3
|
+
import type { Backend, DecideOptions, Decision } from "./verdict";
|
|
6
4
|
|
|
7
5
|
export interface DecideRequest {
|
|
8
|
-
prover:
|
|
6
|
+
prover: Backend;
|
|
9
7
|
text: string;
|
|
10
8
|
timeLimitMs: number;
|
|
11
9
|
}
|
|
12
10
|
|
|
13
|
-
// A backend's decision, or the message of the TlaProverError it threw, which prove turns into a
|
|
14
|
-
// result.
|
|
15
11
|
export type DecideResponse = Decision | { error: string };
|
|
16
12
|
|
|
17
13
|
interface PendingDecision {
|
|
@@ -23,12 +19,11 @@ interface PendingDecision {
|
|
|
23
19
|
|
|
24
20
|
export interface DecidePool {
|
|
25
21
|
decide: (
|
|
26
|
-
prover:
|
|
22
|
+
prover: Backend,
|
|
27
23
|
text: string,
|
|
28
24
|
options: DecideOptions,
|
|
29
25
|
priority: number,
|
|
30
26
|
) => Promise<Decision>;
|
|
31
|
-
// Rejects every decision not yet made with reason, and stops the workers.
|
|
32
27
|
terminate: (reason: unknown) => void;
|
|
33
28
|
}
|
|
34
29
|
|
|
@@ -37,7 +32,7 @@ export const createDecidePool = async (workerCount: number): Promise<DecidePool>
|
|
|
37
32
|
const queue: PendingDecision[] = [];
|
|
38
33
|
const running = new Map<number, PendingDecision>();
|
|
39
34
|
const idle: number[] = [];
|
|
40
|
-
|
|
35
|
+
let failure: { reason: unknown } | undefined;
|
|
41
36
|
const dispatch = () => {
|
|
42
37
|
while (idle.length > 0 && queue.length > 0) {
|
|
43
38
|
const earliest = queue.reduce(
|
|
@@ -60,15 +55,15 @@ export const createDecidePool = async (workerCount: number): Promise<DecidePool>
|
|
|
60
55
|
dispatch();
|
|
61
56
|
};
|
|
62
57
|
const terminate = (reason: unknown) => {
|
|
63
|
-
if (
|
|
64
|
-
|
|
58
|
+
if (failure) return;
|
|
59
|
+
failure = { reason };
|
|
65
60
|
[...queue.splice(0), ...running.values()].forEach((decision) => decision.reject(reason));
|
|
66
61
|
running.clear();
|
|
67
62
|
workers.forEach((worker) => worker.terminate());
|
|
68
63
|
};
|
|
69
64
|
workers.push(
|
|
70
65
|
...(await Promise.all(
|
|
71
|
-
Array.from({ length: workerCount }, (
|
|
66
|
+
Array.from({ length: workerCount }, (_value, index) =>
|
|
72
67
|
spawnWorker(
|
|
73
68
|
new URL("./prove-worker.js", import.meta.url),
|
|
74
69
|
(message) => onResponse(index, message),
|
|
@@ -81,7 +76,7 @@ export const createDecidePool = async (workerCount: number): Promise<DecidePool>
|
|
|
81
76
|
return {
|
|
82
77
|
decide: (prover, text, options, priority) =>
|
|
83
78
|
new Promise((resolve, reject) => {
|
|
84
|
-
if (
|
|
79
|
+
if (failure) return reject(failure.reason);
|
|
85
80
|
queue.push({
|
|
86
81
|
request: { prover, text, timeLimitMs: options.timeLimitMs },
|
|
87
82
|
priority,
|
package/src/prover/deciders.ts
CHANGED
|
@@ -1,14 +1,10 @@
|
|
|
1
|
-
// How each of tla-ts's backends decides the text tlapm would send its prover, by the prover of the
|
|
2
|
-
// method that selects it.
|
|
3
|
-
|
|
4
1
|
import { SmtParseError, TlaProverError } from "../errors";
|
|
5
2
|
import { decideIsabelle } from "./isabelle/decide";
|
|
6
3
|
import { decidePtl } from "./ptl/decide";
|
|
7
4
|
import { decideSmt } from "./smt/solver/solver";
|
|
8
|
-
import type { DecideOptions, Decision, Verdict } from "./verdict";
|
|
5
|
+
import type { Backend, DecideOptions, Decision, Verdict } from "./verdict";
|
|
9
6
|
import { decideZenon } from "./zenon/decide";
|
|
10
7
|
|
|
11
|
-
// Z3 rejects malformed input with an error, and tlapm counts that as a failure.
|
|
12
8
|
const decideZ3 = (text: string, options: DecideOptions) => {
|
|
13
9
|
try {
|
|
14
10
|
return decideSmt(text, options);
|
|
@@ -18,7 +14,7 @@ const decideZ3 = (text: string, options: DecideOptions) => {
|
|
|
18
14
|
}
|
|
19
15
|
};
|
|
20
16
|
|
|
21
|
-
|
|
17
|
+
const DECIDERS: Record<Backend, (text: string, options: DecideOptions) => Verdict> = {
|
|
22
18
|
smt: decideZ3,
|
|
23
19
|
z3: decideZ3,
|
|
24
20
|
zenon: (text, options) => decideZenon(text, options).verdict,
|
|
@@ -26,7 +22,7 @@ export const DECIDERS: Record<string, (text: string, options: DecideOptions) =>
|
|
|
26
22
|
ls4: decidePtl,
|
|
27
23
|
};
|
|
28
24
|
|
|
29
|
-
export const decide = (prover:
|
|
25
|
+
export const decide = (prover: Backend, text: string, options: DecideOptions): Decision => {
|
|
30
26
|
const start = performance.now();
|
|
31
27
|
const verdict = DECIDERS[prover](text, options);
|
|
32
28
|
return { verdict, timeUsedMs: performance.now() - start };
|
|
@@ -1,6 +1,3 @@
|
|
|
1
|
-
// What backend/zenon.ml and backend/isabelle.ml share in printing an obligation that Backend.Prep
|
|
2
|
-
// has shipped.
|
|
3
|
-
|
|
4
1
|
import { TlapmBugError, TlaProverError, TlaUnsupportedError } from "../errors";
|
|
5
2
|
import { popNames, type Context } from "../obligations/printer";
|
|
6
3
|
import { shiftExpr } from "../obligations/substitution";
|
|
@@ -35,7 +32,6 @@ const CHARACTER_NAMES: Record<string, string> = {
|
|
|
35
32
|
"~": "tild_",
|
|
36
33
|
};
|
|
37
34
|
|
|
38
|
-
// isabelle_tlaplus_keys, then Isabelle_keywords.v, then other_keys.
|
|
39
35
|
const FORBIDDEN = new Set(
|
|
40
36
|
[
|
|
41
37
|
"All Append Bijections Case CaseArm CaseOther Char Choice EnumFuncSet Ex Fcn FuncSet INTER Id",
|
|
@@ -90,7 +86,6 @@ const getCharacterName = (character: string) => {
|
|
|
90
86
|
return name;
|
|
91
87
|
};
|
|
92
88
|
|
|
93
|
-
// Tla_parser.pickle: renames an identifier that some backend would reject.
|
|
94
89
|
export const pickle = (name: string) => {
|
|
95
90
|
const characters = [...name];
|
|
96
91
|
const isPlain =
|
|
@@ -102,7 +97,6 @@ export const pickle = (name: string) => {
|
|
|
102
97
|
return `a_${characters.map((character) => getCharacterName(character) ?? character).join("")}a`;
|
|
103
98
|
};
|
|
104
99
|
|
|
105
|
-
// The temporal operators neither backend has a counterpart for, by the name tlapm reports.
|
|
106
100
|
const TEMPORAL_OPERATORS: Partial<Record<Builtin, [string, number]>> = {
|
|
107
101
|
Leadsto: ["Leadsto", 2],
|
|
108
102
|
ENABLED: ["ENABLED", 1],
|
|
@@ -113,7 +107,6 @@ const TEMPORAL_OPERATORS: Partial<Record<Builtin, [string, number]>> = {
|
|
|
113
107
|
Diamond: ["<>", 1],
|
|
114
108
|
};
|
|
115
109
|
|
|
116
|
-
// Why a backend can't print an application of builtin, which it reports as where.
|
|
117
110
|
export const getUnprintableError = (builtin: Builtin, arity: number, where: string) => {
|
|
118
111
|
const isFrontend = builtin === "Prime" || builtin === "StrongPrime" || builtin === "UNCHANGED";
|
|
119
112
|
if (isFrontend && arity === 1) return new TlapmBugError();
|
|
@@ -128,8 +121,6 @@ interface SplitQuantifier {
|
|
|
128
121
|
inner: Expr;
|
|
129
122
|
}
|
|
130
123
|
|
|
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
124
|
export const splitFirstBound = (
|
|
134
125
|
quantifier: "Forall" | "Exists",
|
|
135
126
|
bounds: Bound[],
|
|
@@ -161,8 +152,6 @@ export const splitFirstBound = (
|
|
|
161
152
|
};
|
|
162
153
|
};
|
|
163
154
|
|
|
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
155
|
export const printFact = <Printed>(context: Context, print: () => Printed) => {
|
|
167
156
|
const depth = context.stack.length;
|
|
168
157
|
try {
|
|
@@ -1,6 +1,3 @@
|
|
|
1
|
-
// Decides a theory tlapm writes for Isabelle, as tlapm's Isabelle backend runs it: use_thy on the
|
|
2
|
-
// heap of Isabelle/TLA+ succeeds or fails.
|
|
3
|
-
|
|
4
1
|
import { isStackOverflow, TlaIsabelleError } from "../../errors";
|
|
5
2
|
import type { DecideOptions, Verdict } from "../verdict";
|
|
6
3
|
import { parseProofText, terminalProof } from "./isar/method";
|
|
@@ -28,7 +25,6 @@ export const decideIsabelle = (text: string, options: DecideOptions): Exclude<Ve
|
|
|
28
25
|
initGoal(statement),
|
|
29
26
|
),
|
|
30
27
|
);
|
|
31
|
-
// Proof.conclude_goal: the theorem must be the statement, from its assumptions only.
|
|
32
28
|
return result !== undefined &&
|
|
33
29
|
result.tpairs.length === 0 &&
|
|
34
30
|
aconv(result.prop, protect(statement.conclusion)) &&
|
|
@@ -36,8 +32,6 @@ export const decideIsabelle = (text: string, options: DecideOptions): Exclude<Ve
|
|
|
36
32
|
? "unsat"
|
|
37
33
|
: "unknown";
|
|
38
34
|
} catch (error) {
|
|
39
|
-
// Poly/ML grows its stack instead, until Isabelle runs out of memory, which tlapm counts as a
|
|
40
|
-
// failure.
|
|
41
35
|
if (error instanceof TlaIsabelleError || isStackOverflow(error)) return "unknown";
|
|
42
36
|
throw error;
|
|
43
37
|
}
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
// Ported from tlapm's src/backend/isabelle.ml (BSD licensed, see LICENSE-tlapm).
|
|
2
|
-
// An obligation as the Isabelle/TLA+ theory tlapm writes for Isabelle to prove with a tactic.
|
|
3
2
|
|
|
4
3
|
import { TlapmBugError, TlaProverError, TlaUnsupportedError } from "../../errors";
|
|
5
4
|
import { createContext, getBoundName, popNames, pushName } from "../../obligations/printer";
|
|
@@ -79,7 +78,6 @@ const NONFIX: Partial<Record<Builtin, [string, number]>> = {
|
|
|
79
78
|
ToString: ["ToString", 1],
|
|
80
79
|
};
|
|
81
80
|
|
|
82
|
-
// thy_header's tdoms_table: the operators the theory declares, with their arities.
|
|
83
81
|
const DECLARED: [string, number][] = [
|
|
84
82
|
["Real", 0],
|
|
85
83
|
["/", 2],
|
|
@@ -105,7 +103,6 @@ const getSuccessors = (integer: string) => {
|
|
|
105
103
|
return `${"succ[".repeat(count)}0${"]".repeat(count)}`;
|
|
106
104
|
};
|
|
107
105
|
|
|
108
|
-
// thy_header.
|
|
109
106
|
const getTheoryHeader = (name: string, isVerbose: boolean) => [
|
|
110
107
|
"(* automatically generated -- do not edit manually *)",
|
|
111
108
|
`theory ${name} imports Constant Zenon begin`,
|
|
@@ -113,23 +110,20 @@ const getTheoryHeader = (name: string, isVerbose: boolean) => [
|
|
|
113
110
|
HEADER,
|
|
114
111
|
];
|
|
115
112
|
|
|
116
|
-
// pp_print_expr on an obligation after Backend.Prep has shipped it.
|
|
117
113
|
const printLemma = (sequent: Sequent) => {
|
|
118
114
|
const context = createContext();
|
|
119
115
|
const adjoin = (name: string) => pushName(context, pickle(name));
|
|
120
116
|
const bump = () => pushName(context, "");
|
|
121
117
|
|
|
122
|
-
// A binder's name binds in what prints inside it.
|
|
123
118
|
const withBound = (name: string, print: (bound: string) => string) => {
|
|
124
119
|
const printed = print(adjoin(name));
|
|
125
120
|
popNames(context, 1);
|
|
126
121
|
return printed;
|
|
127
122
|
};
|
|
128
123
|
|
|
129
|
-
// pp_print_expr: every expression, apart from the obligation's sequent, prints in parentheses.
|
|
130
124
|
const printExpr = (expression: Expr) => `(${formatExpr(expression)})`;
|
|
131
|
-
const
|
|
132
|
-
const
|
|
125
|
+
const printDelimited = (args: Expr[]) => args.map(printExpr).join(", ");
|
|
126
|
+
const printNonfix = (name: string, args: Expr[]) => `(${name} (${printDelimited(args)}))`;
|
|
133
127
|
|
|
134
128
|
const printInternal = (builtin: Builtin, args: Expr[]): string => {
|
|
135
129
|
const atom = ATOMS[builtin];
|
|
@@ -140,9 +134,8 @@ const printLemma = (sequent: Sequent) => {
|
|
|
140
134
|
if (binary !== undefined && args.length === 2)
|
|
141
135
|
return `(${printExpr(args[0])} ${binary} ${printExpr(args[1])})`;
|
|
142
136
|
const operator = NONFIX[builtin];
|
|
143
|
-
if (operator && operator[1] === args.length) return
|
|
137
|
+
if (operator && operator[1] === args.length) return printNonfix(operator[0], args);
|
|
144
138
|
if (builtin === "Unprimable" && args.length === 1) return printExpr(args[0]);
|
|
145
|
-
// tlapm prints an irregular expression as the hash of its TLA+ text, but never makes one.
|
|
146
139
|
if (builtin === "Irregular" && args.length === 1) throw new TlaUnsupportedError("Irregular");
|
|
147
140
|
throw getUnprintableError(builtin, args.length, "Backend.Isabelle.pp_apply");
|
|
148
141
|
};
|
|
@@ -152,11 +145,11 @@ const printLemma = (sequent: Sequent) => {
|
|
|
152
145
|
case "Ix": {
|
|
153
146
|
const name = getBoundName(context, operator.index);
|
|
154
147
|
if (operator.index <= 0 || name === undefined) throw new TlapmBugError();
|
|
155
|
-
return args.length === 0 ? name :
|
|
148
|
+
return args.length === 0 ? name : printNonfix(name, args);
|
|
156
149
|
}
|
|
157
150
|
case "Opaque": {
|
|
158
151
|
const name = pickle(operator.name);
|
|
159
|
-
return args.length === 0 ? `(${name} :: c)` : `(${name} (${
|
|
152
|
+
return args.length === 0 ? `(${name} :: c)` : `(${name} (${printDelimited(args)}) :: c)`;
|
|
160
153
|
}
|
|
161
154
|
case "Internal":
|
|
162
155
|
return printInternal(operator.builtin, args);
|
|
@@ -186,7 +179,6 @@ const printLemma = (sequent: Sequent) => {
|
|
|
186
179
|
);
|
|
187
180
|
};
|
|
188
181
|
|
|
189
|
-
// pp_print_sequent_inner: a sequent inside an expression, as a meta-level implication.
|
|
190
182
|
const printNestedSequent = (sequent: Sequent): string => {
|
|
191
183
|
if (sequent.context.length === 0) return printExpr(sequent.active);
|
|
192
184
|
const hyp = sequent.context[0];
|
|
@@ -279,7 +271,7 @@ const printLemma = (sequent: Sequent) => {
|
|
|
279
271
|
);
|
|
280
272
|
}
|
|
281
273
|
case "SetEnum":
|
|
282
|
-
return `{${
|
|
274
|
+
return `{${printDelimited(expression.elements)}}`;
|
|
283
275
|
case "Fcn": {
|
|
284
276
|
const bound = expression.bounds[0];
|
|
285
277
|
if (expression.bounds.length !== 1)
|
|
@@ -296,7 +288,7 @@ const printLemma = (sequent: Sequent) => {
|
|
|
296
288
|
const printedFunction = printExpr(expression.function);
|
|
297
289
|
return expression.args.length === 1
|
|
298
290
|
? `fapply (${printedFunction}, ${printExpr(expression.args[0])})`
|
|
299
|
-
: `fapply (${printedFunction}, <<${
|
|
291
|
+
: `fapply (${printedFunction}, <<${printDelimited(expression.args)}>>)`;
|
|
300
292
|
}
|
|
301
293
|
case "Arrow":
|
|
302
294
|
return `[${printExpr(expression.domain)} \\<rightarrow> ${printExpr(expression.range)}]`;
|
|
@@ -318,11 +310,11 @@ const printLemma = (sequent: Sequent) => {
|
|
|
318
310
|
case "Dot":
|
|
319
311
|
return `fapply (${printExpr(expression.expression)}, (''${expression.field}''))`;
|
|
320
312
|
case "Tuple":
|
|
321
|
-
return `<<${
|
|
313
|
+
return `<<${printDelimited(expression.elements)}>>`;
|
|
322
314
|
case "Product":
|
|
323
315
|
return expression.factors.length === 2
|
|
324
316
|
? `(${printExpr(expression.factors[0])} \\<times> ${printExpr(expression.factors[1])})`
|
|
325
|
-
: `Product(\\<langle>${
|
|
317
|
+
: `Product(\\<langle>${printDelimited(expression.factors)}\\<rangle>)`;
|
|
326
318
|
case "Sub":
|
|
327
319
|
case "Tsub": {
|
|
328
320
|
const suffix = expression.kind === "Sub" ? "sub" : "tsub";
|
|
@@ -332,8 +324,8 @@ const printLemma = (sequent: Sequent) => {
|
|
|
332
324
|
case "Fair":
|
|
333
325
|
return `${cook(expression.fairness === "Weak" ? "a'wf" : "a'sf")}(${printExpr(expression.subscript)},${printExpr(expression.action)})`;
|
|
334
326
|
case "Case": {
|
|
335
|
-
const conditions =
|
|
336
|
-
const bodies =
|
|
327
|
+
const conditions = printDelimited(expression.arms.map((arm) => arm.condition));
|
|
328
|
+
const bodies = printDelimited(expression.arms.map((arm) => arm.body));
|
|
337
329
|
return expression.other
|
|
338
330
|
? `CaseOther(<<${conditions}>>,<<${bodies}>>,${printExpr(expression.other)})`
|
|
339
331
|
: `Case(<<${conditions}>>,<<${bodies}>>)`;
|
|
@@ -348,8 +340,6 @@ const printLemma = (sequent: Sequent) => {
|
|
|
348
340
|
}
|
|
349
341
|
};
|
|
350
342
|
|
|
351
|
-
// pp_print_sequent_outer: the obligation's sequent as the lines of a lemma's fixes, assumes and
|
|
352
|
-
// shows. A pragma's definition ends it with an empty line in place of the goal.
|
|
353
343
|
const printSequent = (sequent: Sequent) => {
|
|
354
344
|
const lines: string[] = [];
|
|
355
345
|
for (const hyp of sequent.context) {
|
|
@@ -405,7 +395,6 @@ const printLemma = (sequent: Sequent) => {
|
|
|
405
395
|
}
|
|
406
396
|
};
|
|
407
397
|
|
|
408
|
-
// thy_temp: the theory tlapm writes for Isabelle to prove obligation id.
|
|
409
398
|
export const encodeIsabelle = (id: number, sequent: Sequent, tactic: string): string => {
|
|
410
399
|
const lemma = printLemma(sequent);
|
|
411
400
|
return [
|
|
@@ -427,7 +416,6 @@ interface IsabelleProof {
|
|
|
427
416
|
tactic: string;
|
|
428
417
|
}
|
|
429
418
|
|
|
430
|
-
// Isabelle.thy_init, thy_write and thy_close.
|
|
431
419
|
export const encodeIsabelleTheory = (name: string, proofs: IsabelleProof[]) =>
|
|
432
420
|
[
|
|
433
421
|
...getTheoryHeader(name, true),
|