tla-ts 0.0.9 → 0.0.10-dev.09e53c2a6
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 +30 -1
- package/dist/compile.cjs +23 -0
- package/dist/compile.js +23 -0
- package/dist/deciders.cjs +41 -37
- package/dist/deciders.js +57 -53
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +109 -10
- package/dist/index.d.ts +109 -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 +2746 -410
- package/dist/prove.js +2745 -409
- package/dist/run.cjs +146 -31
- package/dist/run.js +146 -31
- package/dist/tlapm.cjs +2 -2
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +132 -104
- package/dist/transfer.js +132 -104
- package/dist/worker.cjs +6 -6
- package/dist/worker.js +6 -6
- package/package.json +3 -1
- package/src/ast.ts +45 -59
- 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 +797 -782
- 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 +433 -82
- package/src/cli/tlc-arguments.ts +652 -0
- package/src/cli/tlc-output.ts +687 -0
- package/src/cli/tlc-usage.ts +360 -0
- package/src/cli/tlc.ts +323 -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 +36 -54
- package/src/dfid.ts +618 -0
- package/src/environment-config.ts +315 -0
- package/src/environment.ts +178 -339
- package/src/errors.ts +100 -57
- package/src/evaluate.ts +598 -340
- package/src/exit-codes.ts +38 -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 +83 -101
- package/src/liveness-checker.ts +590 -311
- package/src/liveness.ts +180 -124
- package/src/obligations/action.ts +17 -44
- package/src/obligations/anonymize.ts +120 -95
- package/src/obligations/enabled-axioms.ts +218 -0
- package/src/obligations/equality.ts +1 -3
- package/src/obligations/expression.ts +37 -26
- package/src/obligations/format.ts +0 -10
- package/src/obligations/generate.ts +66 -64
- package/src/obligations/index.ts +38 -19
- package/src/obligations/levels.ts +27 -18
- package/src/obligations/module.ts +28 -55
- package/src/obligations/normalize.ts +30 -37
- package/src/obligations/operators.ts +0 -3
- package/src/obligations/pragma.ts +52 -24
- package/src/obligations/printer.ts +89 -58
- package/src/obligations/proof.ts +3 -6
- package/src/obligations/regroup.ts +0 -5
- package/src/obligations/simplify.ts +57 -63
- package/src/obligations/source.ts +119 -95
- package/src/obligations/subexpression.ts +49 -28
- package/src/obligations/substitution.ts +1 -5
- package/src/obligations/temporal.ts +12 -20
- package/src/obligations/tuples.ts +2 -10
- package/src/parallel-worker.ts +30 -60
- package/src/parallel.ts +59 -73
- package/src/parser.ts +1082 -399
- 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 +12 -13
- package/src/prover/first-order.ts +0 -11
- package/src/prover/isabelle/decide.ts +3 -31
- package/src/prover/isabelle/encode.ts +82 -64
- package/src/prover/isabelle/isar/attrib.ts +250 -0
- package/src/prover/isabelle/isar/context.ts +335 -0
- package/src/prover/isabelle/isar/induct.ts +382 -0
- package/src/prover/isabelle/isar/inner-syntax.ts +262 -117
- package/src/prover/isabelle/isar/method.ts +510 -226
- package/src/prover/isabelle/isar/proof.ts +570 -23
- package/src/prover/isabelle/isar/rule-cases.ts +224 -0
- package/src/prover/isabelle/isar/theory.ts +488 -88
- package/src/prover/isabelle/isar/toplevel.ts +331 -0
- package/src/prover/isabelle/isar/type-check.ts +99 -38
- package/src/prover/isabelle/provers/blast/blast.ts +16 -105
- package/src/prover/isabelle/provers/blast/branch.ts +0 -33
- package/src/prover/isabelle/provers/blast/prove.ts +0 -36
- package/src/prover/isabelle/provers/blast/rules.ts +5 -45
- package/src/prover/isabelle/provers/blast/state.ts +1 -29
- package/src/prover/isabelle/provers/blast/term.ts +8 -37
- package/src/prover/isabelle/provers/clasimp.ts +0 -14
- package/src/prover/isabelle/provers/classical.ts +58 -61
- package/src/prover/isabelle/provers/hypsubst.ts +27 -52
- package/src/prover/isabelle/pure/bicompose.ts +24 -39
- package/src/prover/isabelle/pure/consts.ts +0 -8
- package/src/prover/isabelle/pure/conv.ts +2 -18
- package/src/prover/isabelle/pure/drule.ts +95 -45
- package/src/prover/isabelle/pure/envir.ts +2 -53
- package/src/prover/isabelle/pure/goal.ts +1 -9
- package/src/prover/isabelle/pure/interrupt.ts +0 -5
- package/src/prover/isabelle/pure/list.ts +0 -3
- package/src/prover/isabelle/pure/logic.ts +1 -16
- package/src/prover/isabelle/pure/name.ts +1 -10
- package/src/prover/isabelle/pure/net.ts +2 -60
- package/src/prover/isabelle/pure/object-logic.ts +15 -16
- package/src/prover/isabelle/pure/pattern.ts +1 -20
- package/src/prover/isabelle/pure/raw-simplifier.ts +16 -63
- package/src/prover/isabelle/pure/rewriter.ts +31 -74
- package/src/prover/isabelle/pure/search.ts +2 -11
- package/src/prover/isabelle/pure/seq.ts +0 -11
- package/src/prover/isabelle/pure/simplifier.ts +27 -16
- package/src/prover/isabelle/pure/table.ts +2 -33
- package/src/prover/isabelle/pure/tactic.ts +11 -23
- package/src/prover/isabelle/pure/tactical.ts +47 -48
- package/src/prover/isabelle/pure/term-ord.ts +1 -7
- package/src/prover/isabelle/pure/term.ts +1 -44
- package/src/prover/isabelle/pure/thm.ts +26 -48
- package/src/prover/isabelle/pure/type.ts +1 -16
- package/src/prover/isabelle/pure/unify.ts +19 -31
- package/src/prover/isabelle/pure/variable.ts +2 -8
- package/src/prover/isabelle/tla/classical-setup.ts +17 -25
- package/src/prover/isabelle/tla/context.ts +65 -26
- package/src/prover/isabelle/tla/logic-data.ts +1 -1
- package/src/prover/isabelle/tla/logic.ts +53 -32
- package/src/prover/isabelle/tla/simpdata.ts +45 -44
- package/src/prover/isabelle/tools/intuitionistic.ts +28 -21
- package/src/prover/ocaml.ts +4 -7
- package/src/prover/prep/action.ts +33 -66
- package/src/prover/prep/enabled-axioms.ts +22 -20
- 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 +189 -86
- package/src/prover/prep/normalize.ts +42 -37
- package/src/prover/prove-worker.ts +0 -2
- package/src/prover/prove.ts +398 -133
- package/src/prover/ptl/decide.ts +96 -56
- package/src/prover/ptl/encode.ts +15 -38
- package/src/prover/ptl/sat.ts +24 -32
- package/src/prover/ptl/tableau.ts +40 -28
- package/src/prover/smt/arithmetic.ts +310 -0
- package/src/prover/smt/axioms.ts +12 -15
- package/src/prover/smt/context.ts +60 -32
- package/src/prover/smt/data.ts +517 -401
- package/src/prover/smt/encode.ts +155 -85
- package/src/prover/smt/extensionality.ts +5 -13
- package/src/prover/smt/flatten.ts +7 -28
- package/src/prover/smt/format.ts +33 -14
- package/src/prover/smt/instances.ts +7 -11
- package/src/prover/smt/layout.ts +91 -0
- package/src/prover/smt/rewrite.ts +1026 -658
- package/src/prover/smt/simplify.ts +441 -0
- package/src/prover/smt/solver/ackermannize-bv-tactic.ts +61 -0
- package/src/prover/smt/solver/ackr-helper.ts +179 -0
- package/src/prover/smt/solver/ackr-model-converter.ts +105 -0
- package/src/prover/smt/solver/act-cache.ts +0 -16
- package/src/prover/smt/solver/add-bounds-tactic.ts +59 -0
- package/src/prover/smt/solver/aig-tactic.ts +52 -0
- package/src/prover/smt/solver/aig.ts +889 -0
- package/src/prover/smt/solver/arith-rewriter.ts +615 -53
- package/src/prover/smt/solver/arith-terms.ts +121 -0
- package/src/prover/smt/solver/array-decl-plugin.ts +175 -0
- package/src/prover/smt/solver/array-rewriter.ts +309 -0
- package/src/prover/smt/solver/array.ts +1 -3
- package/src/prover/smt/solver/asserted-formulas.ts +87 -58
- package/src/prover/smt/solver/ast-lt.ts +166 -22
- package/src/prover/smt/solver/ast-util.ts +160 -7
- package/src/prover/smt/solver/ast.ts +1424 -180
- package/src/prover/smt/solver/auf-solver.ts +7 -44
- package/src/prover/smt/solver/bit-blast-tactic.ts +582 -0
- package/src/prover/smt/solver/bit-blaster.ts +871 -0
- package/src/prover/smt/solver/bound-manager.ts +196 -0
- package/src/prover/smt/solver/bound-simplifier.ts +600 -0
- package/src/prover/smt/solver/bv-bound-chk.ts +492 -0
- package/src/prover/smt/solver/bv-decl-plugin.ts +338 -0
- package/src/prover/smt/solver/bv-divrem-bounds.ts +95 -0
- package/src/prover/smt/solver/bv-rewriter.ts +1901 -0
- package/src/prover/smt/solver/bv1-blast.ts +214 -0
- package/src/prover/smt/solver/bv2fpa-converter.ts +174 -0
- package/src/prover/smt/solver/bv2int-rewriter.ts +544 -0
- package/src/prover/smt/solver/bv2real-rewriter.ts +533 -0
- package/src/prover/smt/solver/card2bv.ts +110 -0
- package/src/prover/smt/solver/case-split-queue.ts +0 -10
- package/src/prover/smt/solver/cg-table.ts +39 -42
- package/src/prover/smt/solver/check-logic.ts +330 -0
- package/src/prover/smt/solver/clause.ts +0 -27
- package/src/prover/smt/solver/cofactor-elim-term-ite.ts +278 -0
- package/src/prover/smt/solver/conflict-resolution.ts +78 -11
- package/src/prover/smt/solver/context.ts +519 -175
- package/src/prover/smt/solver/ctx-simplify.ts +33 -50
- package/src/prover/smt/solver/ctx-solver-simplify.ts +122 -0
- package/src/prover/smt/solver/datatype-decl-plugin.ts +572 -0
- package/src/prover/smt/solver/datatype-rewriter.ts +82 -0
- package/src/prover/smt/solver/demodulator.ts +786 -0
- package/src/prover/smt/solver/dependent-expr-state.ts +81 -0
- package/src/prover/smt/solver/der.ts +39 -30
- package/src/prover/smt/solver/diff-neq.ts +206 -0
- package/src/prover/smt/solver/distribute-forall.ts +57 -0
- package/src/prover/smt/solver/dom-simplify.ts +511 -0
- package/src/prover/smt/solver/dt2bv-tactic.ts +260 -0
- package/src/prover/smt/solver/dyn-ack.ts +0 -11
- package/src/prover/smt/solver/e-matching.ts +9 -41
- package/src/prover/smt/solver/elim-small-bv-tactic.ts +129 -0
- package/src/prover/smt/solver/elim-uncnstr.ts +545 -0
- package/src/prover/smt/solver/enode.ts +100 -23
- package/src/prover/smt/solver/eq2bv-tactic.ts +218 -0
- package/src/prover/smt/solver/euf/arith-axioms.ts +403 -0
- package/src/prover/smt/solver/euf/arith-internalize.ts +653 -0
- package/src/prover/smt/solver/euf/arith-solver.ts +889 -0
- package/src/prover/smt/solver/euf/array-axioms.ts +527 -0
- package/src/prover/smt/solver/euf/array-internalize.ts +428 -0
- package/src/prover/smt/solver/euf/array-solver.ts +306 -0
- package/src/prover/smt/solver/euf/bv-ackerman.ts +162 -0
- package/src/prover/smt/solver/euf/bv-internalize.ts +748 -0
- package/src/prover/smt/solver/euf/bv-solver.ts +449 -0
- package/src/prover/smt/solver/euf/dt-solver.ts +618 -0
- package/src/prover/smt/solver/euf/egraph.ts +907 -0
- package/src/prover/smt/solver/euf/euf-solver.ts +1205 -0
- package/src/prover/smt/solver/euf/fpa-solver.ts +317 -0
- package/src/prover/smt/solver/euf/mam.ts +1050 -0
- package/src/prover/smt/solver/euf/q-ematch.ts +830 -0
- package/src/prover/smt/solver/euf/q-mbi.ts +587 -0
- package/src/prover/smt/solver/euf/q-model-fixer.ts +296 -0
- package/src/prover/smt/solver/euf/q-solver.ts +361 -0
- package/src/prover/smt/solver/euf/th-solver.ts +335 -0
- package/src/prover/smt/solver/euf/th-solvers.ts +30 -0
- package/src/prover/smt/solver/expr-ref.ts +0 -5
- package/src/prover/smt/solver/expr-safe-replace.ts +26 -7
- package/src/prover/smt/solver/expr2polynomial.ts +146 -0
- package/src/prover/smt/solver/factor.ts +141 -0
- package/src/prover/smt/solver/fd-solver.ts +265 -0
- package/src/prover/smt/solver/fingerprints.ts +15 -26
- package/src/prover/smt/solver/fix-dl-var.ts +148 -0
- package/src/prover/smt/solver/flat-literals.ts +0 -9
- package/src/prover/smt/solver/fm-tactic.ts +884 -0
- package/src/prover/smt/solver/fpa-decl-plugin.ts +618 -0
- package/src/prover/smt/solver/fpa-rewriter.ts +640 -0
- package/src/prover/smt/solver/fpa2bv-converter.ts +2249 -0
- package/src/prover/smt/solver/fpa2bv-rewriter.ts +348 -0
- package/src/prover/smt/solver/fpa2bv-tactic.ts +73 -0
- package/src/prover/smt/solver/goal.ts +176 -28
- package/src/prover/smt/solver/goal2nlsat.ts +189 -0
- package/src/prover/smt/solver/guard-set.ts +219 -0
- package/src/prover/smt/solver/hash.ts +0 -9
- package/src/prover/smt/solver/hashtable.ts +26 -23
- package/src/prover/smt/solver/inf-eps.ts +63 -0
- package/src/prover/smt/solver/inj-axiom.ts +101 -0
- package/src/prover/smt/solver/internalizer.ts +112 -132
- package/src/prover/smt/solver/lackr.ts +381 -0
- package/src/prover/smt/solver/lbool.ts +0 -2
- package/src/prover/smt/solver/lia2card.ts +268 -0
- package/src/prover/smt/solver/lia2pb.ts +154 -0
- package/src/prover/smt/solver/literal.ts +0 -4
- package/src/prover/smt/solver/logic-tactics.ts +345 -0
- package/src/prover/smt/solver/lp/bound-propagator.ts +7 -26
- package/src/prover/smt/solver/lp/constraints.ts +1 -8
- package/src/prover/smt/solver/lp/containers.ts +11 -30
- package/src/prover/smt/solver/lp/core-solver.ts +23 -29
- package/src/prover/smt/solver/lp/cross-nested.ts +5 -20
- package/src/prover/smt/solver/lp/dep-intervals.ts +6 -24
- package/src/prover/smt/solver/lp/dependency.ts +0 -5
- package/src/prover/smt/solver/lp/dioph-eq.ts +8 -103
- package/src/prover/smt/solver/lp/explanation.ts +0 -6
- package/src/prover/smt/solver/lp/gomory.ts +8 -22
- package/src/prover/smt/solver/lp/hnf-cutter.ts +16 -23
- package/src/prover/smt/solver/lp/hnf.ts +10 -28
- package/src/prover/smt/solver/lp/int-cube.ts +17 -39
- package/src/prover/smt/solver/lp/int-solver.ts +3 -35
- package/src/prover/smt/solver/lp/lar-solver.ts +69 -82
- package/src/prover/smt/solver/lp/lar-term.ts +0 -5
- package/src/prover/smt/solver/lp/lp-settings.ts +0 -14
- package/src/prover/smt/solver/lp/maximize-term.ts +76 -52
- package/src/prover/smt/solver/lp/nex-creator.ts +4 -28
- package/src/prover/smt/solver/lp/nex.ts +0 -6
- package/src/prover/smt/solver/lp/nla-backoff.ts +0 -5
- package/src/prover/smt/solver/lp/nla-basics.ts +48 -30
- package/src/prover/smt/solver/lp/nla-core.ts +91 -135
- package/src/prover/smt/solver/lp/nla-divisions.ts +31 -43
- package/src/prover/smt/solver/lp/nla-emonics.ts +3 -21
- package/src/prover/smt/solver/lp/nla-factorization.ts +0 -4
- package/src/prover/smt/solver/lp/nla-grobner.ts +22 -72
- package/src/prover/smt/solver/lp/nla-horner.ts +2 -12
- package/src/prover/smt/solver/lp/nla-intervals.ts +1 -12
- package/src/prover/smt/solver/lp/nla-monomial-bounds.ts +15 -42
- package/src/prover/smt/solver/lp/nla-monotone.ts +1 -6
- package/src/prover/smt/solver/lp/nla-order.ts +0 -13
- package/src/prover/smt/solver/lp/nla-patcher.ts +3 -7
- package/src/prover/smt/solver/lp/nla-powers.ts +220 -0
- package/src/prover/smt/solver/lp/nla-tangents.ts +0 -10
- package/src/prover/smt/solver/lp/nla-throttle.ts +0 -6
- package/src/prover/smt/solver/lp/nla-transcendentals.ts +324 -0
- package/src/prover/smt/solver/lp/nla-types.ts +0 -12
- package/src/prover/smt/solver/lp/nla-var-eqs.ts +4 -26
- package/src/prover/smt/solver/lp/nra-solver.ts +123 -112
- package/src/prover/smt/solver/lp/numeric-pair.ts +0 -4
- package/src/prover/smt/solver/lp/pdd-interval.ts +0 -3
- package/src/prover/smt/solver/lp/pdd-simplifier.ts +1 -14
- package/src/prover/smt/solver/lp/pdd-solver.ts +2 -33
- package/src/prover/smt/solver/lp/pdd.ts +7 -70
- package/src/prover/smt/solver/lp/random-updater.ts +0 -9
- package/src/prover/smt/solver/lp/static-matrix.ts +8 -19
- package/src/prover/smt/solver/lp/union-find.ts +5 -5
- package/src/prover/smt/solver/macro-finder.ts +530 -0
- package/src/prover/smt/solver/mam-compiler.ts +129 -139
- package/src/prover/smt/solver/mam-interpreter.ts +0 -21
- package/src/prover/smt/solver/max-bv-sharing-tactic.ts +17 -0
- package/src/prover/smt/solver/max-cliques.ts +105 -0
- package/src/prover/smt/solver/maxcore.ts +309 -0
- package/src/prover/smt/solver/maximize-ac-sharing.ts +8 -21
- package/src/prover/smt/solver/maxlex.ts +115 -0
- package/src/prover/smt/solver/maxsmt-base.ts +105 -0
- package/src/prover/smt/solver/maxsmt.ts +92 -0
- package/src/prover/smt/solver/mbp/mbp-arith.ts +467 -0
- package/src/prover/smt/solver/mbp/mbp-basic-tg.ts +101 -0
- package/src/prover/smt/solver/mbp/mbp-plugin.ts +287 -0
- package/src/prover/smt/solver/mbp/mbp-qel.ts +48 -0
- package/src/prover/smt/solver/mbp/mbp-solve-plugin.ts +271 -0
- package/src/prover/smt/solver/mbp/mbp-term-graph.ts +606 -0
- package/src/prover/smt/solver/model-based-opt.ts +844 -0
- package/src/prover/smt/solver/model-checker.ts +19 -62
- package/src/prover/smt/solver/model-evaluator.ts +190 -40
- package/src/prover/smt/solver/model-finder.ts +14 -32
- package/src/prover/smt/solver/model-generator.ts +56 -40
- package/src/prover/smt/solver/model-macro-solver.ts +60 -114
- package/src/prover/smt/solver/model-printer.ts +214 -0
- package/src/prover/smt/solver/mpf.ts +711 -0
- package/src/prover/smt/solver/mus.ts +51 -0
- package/src/prover/smt/solver/muz/dl-context.ts +404 -0
- package/src/prover/smt/solver/muz/dl-mk-bit-blast.ts +97 -0
- package/src/prover/smt/solver/muz/dl-mk-coi-filter.ts +167 -0
- package/src/prover/smt/solver/muz/dl-mk-elim-term-ite.ts +125 -0
- package/src/prover/smt/solver/muz/dl-mk-interp-tail-simplifier.ts +299 -0
- package/src/prover/smt/solver/muz/dl-mk-rule-inliner.ts +455 -0
- package/src/prover/smt/solver/muz/dl-mk-slice.ts +340 -0
- package/src/prover/smt/solver/muz/dl-mk-subsumption-checker.ts +163 -0
- package/src/prover/smt/solver/muz/dl-rule-set.ts +273 -0
- package/src/prover/smt/solver/muz/dl-rule-transformer.ts +123 -0
- package/src/prover/smt/solver/muz/dl-rule.ts +496 -0
- package/src/prover/smt/solver/muz/hnf.ts +201 -0
- package/src/prover/smt/solver/muz/horn-subsume-model-converter.ts +176 -0
- package/src/prover/smt/solver/muz/horn-tactic.ts +201 -0
- package/src/prover/smt/solver/muz/rule-properties.ts +337 -0
- package/src/prover/smt/solver/muz/spacer-context.ts +1406 -0
- package/src/prover/smt/solver/muz/spacer-dl-interface.ts +52 -0
- package/src/prover/smt/solver/muz/spacer-generalizers.ts +241 -0
- package/src/prover/smt/solver/muz/spacer-manager.ts +127 -0
- package/src/prover/smt/solver/muz/spacer-pdr.ts +218 -0
- package/src/prover/smt/solver/muz/spacer-prop-solver.ts +333 -0
- package/src/prover/smt/solver/muz/spacer-util.ts +282 -0
- package/src/prover/smt/solver/muz/substitution.ts +203 -0
- package/src/prover/smt/solver/nla2bv-tactic.ts +285 -0
- package/src/prover/smt/solver/nlqsat.ts +484 -0
- package/src/prover/smt/solver/nlsat/algebraic.ts +177 -160
- package/src/prover/smt/solver/nlsat/atoms.ts +24 -24
- package/src/prover/smt/solver/nlsat/evaluator.ts +16 -22
- package/src/prover/smt/solver/nlsat/explain.ts +65 -69
- package/src/prover/smt/solver/nlsat/interval-set.ts +9 -51
- package/src/prover/smt/solver/nlsat/levelwise.ts +48 -135
- package/src/prover/smt/solver/nlsat/mpbq.ts +47 -14
- package/src/prover/smt/solver/nlsat/polynomial.ts +29 -161
- package/src/prover/smt/solver/nlsat/solver.ts +241 -110
- package/src/prover/smt/solver/nlsat/transcendental-eval.ts +310 -0
- package/src/prover/smt/solver/nlsat/transcendentals.ts +367 -0
- package/src/prover/smt/solver/nlsat/types.ts +0 -9
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +1 -47
- package/src/prover/smt/solver/nlsat/upolynomial.ts +10 -93
- package/src/prover/smt/solver/nlsat-tactic.ts +82 -0
- package/src/prover/smt/solver/nnf.ts +107 -60
- package/src/prover/smt/solver/normalize-bounds.ts +53 -0
- package/src/prover/smt/solver/occf.ts +97 -0
- package/src/prover/smt/solver/opt-context.ts +787 -0
- package/src/prover/smt/solver/opt-nlsat.ts +375 -0
- package/src/prover/smt/solver/opt-pareto.ts +282 -0
- package/src/prover/smt/solver/opt-preprocess.ts +101 -0
- package/src/prover/smt/solver/opt-solver.ts +308 -0
- package/src/prover/smt/solver/opt-value.ts +55 -0
- package/src/prover/smt/solver/optsmt.ts +692 -0
- package/src/prover/smt/solver/parallel-tactic.ts +299 -0
- package/src/prover/smt/solver/pattern-inference.ts +21 -26
- package/src/prover/smt/solver/pb-rewriter.ts +284 -0
- package/src/prover/smt/solver/pb2bv-tactic.ts +540 -0
- package/src/prover/smt/solver/poly-rewriter.ts +204 -79
- package/src/prover/smt/solver/probes.ts +512 -0
- package/src/prover/smt/solver/propagate-values.ts +37 -30
- package/src/prover/smt/solver/proto-model.ts +650 -66
- package/src/prover/smt/solver/pull-quant.ts +28 -23
- package/src/prover/smt/solver/purify-arith.ts +632 -0
- package/src/prover/smt/solver/qe-arith-plugin.ts +1098 -0
- package/src/prover/smt/solver/qe-lite-der.ts +2 -31
- package/src/prover/smt/solver/qe-lite-fm.ts +4 -28
- package/src/prover/smt/solver/qe-lite.ts +39 -49
- package/src/prover/smt/solver/qe-mbp.ts +270 -0
- package/src/prover/smt/solver/qe.ts +1498 -0
- package/src/prover/smt/solver/qel.ts +25 -0
- package/src/prover/smt/solver/qi-queue.ts +0 -16
- package/src/prover/smt/solver/qsat.ts +814 -0
- package/src/prover/smt/solver/quant-hoist.ts +196 -0
- package/src/prover/smt/solver/quant-tactics.ts +17 -74
- package/src/prover/smt/solver/quantifier-analyzer.ts +26 -47
- package/src/prover/smt/solver/quantifier-manager.ts +8 -23
- package/src/prover/smt/solver/quasi-macros.ts +243 -0
- package/src/prover/smt/solver/random-gen.ts +0 -2
- package/src/prover/smt/solver/rational.ts +45 -8
- package/src/prover/smt/solver/recfun-decl-plugin.ts +261 -0
- package/src/prover/smt/solver/recfun-rewriter.ts +107 -0
- package/src/prover/smt/solver/reduce-args.ts +225 -0
- package/src/prover/smt/solver/reduce-bv-size.ts +119 -0
- package/src/prover/smt/solver/ref-vector.ts +0 -6
- package/src/prover/smt/solver/relevancy.ts +2 -16
- package/src/prover/smt/solver/rewriter-tpl.ts +52 -129
- package/src/prover/smt/solver/rewriter.ts +477 -120
- package/src/prover/smt/solver/rlimit.ts +39 -21
- package/src/prover/smt/solver/sat/asymm-branch.ts +325 -0
- package/src/prover/smt/solver/sat/big.ts +177 -0
- package/src/prover/smt/solver/sat/clause-use-list.ts +71 -0
- package/src/prover/smt/solver/sat/clause.ts +203 -0
- package/src/prover/smt/solver/sat/cleaner.ts +94 -0
- package/src/prover/smt/solver/sat/config.ts +122 -0
- package/src/prover/smt/solver/sat/consequences.ts +203 -0
- package/src/prover/smt/solver/sat/elim-eqs.ts +142 -0
- package/src/prover/smt/solver/sat/goal2sat.ts +526 -0
- package/src/prover/smt/solver/sat/inc-sat-solver.ts +378 -0
- package/src/prover/smt/solver/sat/model-converter.ts +136 -0
- package/src/prover/smt/solver/sat/pb-constraint.ts +261 -0
- package/src/prover/smt/solver/sat/pb-solver.ts +1577 -0
- package/src/prover/smt/solver/sat/probing.ts +170 -0
- package/src/prover/smt/solver/sat/sat-tactic.ts +43 -0
- package/src/prover/smt/solver/sat/sat2goal.ts +165 -0
- package/src/prover/smt/solver/sat/scc.ts +142 -0
- package/src/prover/smt/solver/sat/simplifier.ts +1618 -0
- package/src/prover/smt/solver/sat/solver.ts +2127 -0
- package/src/prover/smt/solver/sat/var-queue.ts +117 -0
- package/src/prover/smt/solver/sat/watch-list.ts +140 -0
- package/src/prover/smt/solver/search-tree.ts +284 -0
- package/src/prover/smt/solver/seq-axioms.ts +1010 -0
- package/src/prover/smt/solver/seq-decl-plugin.ts +819 -0
- package/src/prover/smt/solver/seq-derive.ts +1301 -0
- package/src/prover/smt/solver/seq-eq-approx.ts +236 -0
- package/src/prover/smt/solver/seq-eq-solver.ts +439 -0
- package/src/prover/smt/solver/seq-factory.ts +89 -0
- package/src/prover/smt/solver/seq-monadic.ts +728 -0
- package/src/prover/smt/solver/seq-range-predicate.ts +235 -0
- package/src/prover/smt/solver/seq-re-rewriter.ts +1170 -0
- package/src/prover/smt/solver/seq-re-util.ts +758 -0
- package/src/prover/smt/solver/seq-regex-bisim.ts +144 -0
- package/src/prover/smt/solver/seq-regex-live.ts +200 -0
- package/src/prover/smt/solver/seq-rewriter.ts +2402 -0
- package/src/prover/smt/solver/seq-skolem.ts +317 -0
- package/src/prover/smt/solver/seq-subset.ts +165 -0
- package/src/prover/smt/solver/seq-view-witness.ts +353 -0
- package/src/prover/smt/solver/smt-consequences.ts +297 -0
- package/src/prover/smt/solver/smt-kernel.ts +83 -0
- package/src/prover/smt/solver/smt-logics.ts +66 -0
- package/src/prover/smt/solver/smt-setup.ts +496 -0
- package/src/prover/smt/solver/smt2-printer.ts +765 -0
- package/src/prover/smt/solver/smtlib-parser.ts +3140 -365
- package/src/prover/smt/solver/smtlib-script.ts +1631 -0
- package/src/prover/smt/solver/solve-eqs.ts +929 -0
- package/src/prover/smt/solver/solver.ts +119 -39
- package/src/prover/smt/solver/sort.ts +1 -5
- package/src/prover/smt/solver/static-features.ts +314 -0
- package/src/prover/smt/solver/sticky-generations.ts +0 -6
- package/src/prover/smt/solver/tactic.ts +1986 -0
- package/src/prover/smt/solver/term-enumeration.ts +205 -0
- package/src/prover/smt/solver/theory-array.ts +1240 -0
- package/src/prover/smt/solver/theory-bv.ts +1200 -0
- package/src/prover/smt/solver/theory-char.ts +355 -0
- package/src/prover/smt/solver/theory-datatype.ts +598 -0
- package/src/prover/smt/solver/theory-finite-set.ts +30 -0
- package/src/prover/smt/solver/theory-fpa.ts +389 -0
- package/src/prover/smt/solver/theory-lra-axioms.ts +55 -25
- package/src/prover/smt/solver/theory-lra-bounds.ts +31 -11
- package/src/prover/smt/solver/theory-lra-final-check.ts +59 -91
- package/src/prover/smt/solver/theory-lra-internalize.ts +94 -53
- package/src/prover/smt/solver/theory-lra-model.ts +23 -53
- package/src/prover/smt/solver/theory-lra-propagate.ts +24 -40
- package/src/prover/smt/solver/theory-lra-state.ts +6 -27
- package/src/prover/smt/solver/theory-lra.ts +188 -8
- package/src/prover/smt/solver/theory-pb.ts +934 -0
- package/src/prover/smt/solver/theory-polymorphism.ts +58 -0
- package/src/prover/smt/solver/theory-recfun.ts +307 -0
- package/src/prover/smt/solver/theory-seq-regex.ts +867 -0
- package/src/prover/smt/solver/theory-seq-solve.ts +1373 -0
- package/src/prover/smt/solver/theory-seq-state.ts +871 -0
- package/src/prover/smt/solver/theory-seq.ts +961 -0
- package/src/prover/smt/solver/theory.ts +189 -0
- package/src/prover/smt/solver/tseitin-cnf.ts +485 -0
- package/src/prover/smt/solver/var-subst.ts +37 -39
- package/src/prover/smt/table.ts +3 -10
- package/src/prover/smt/types.ts +146 -0
- package/src/prover/tlapm/cache.ts +67 -41
- package/src/prover/tlapm/ocaml-marshal.ts +19 -21
- package/src/prover/tlapm/tlapm.ts +21 -20
- package/src/prover/tlapm-library.ts +3208 -0
- package/src/prover/verdict.ts +9 -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 +10 -19
- package/src/prover/zenon/encode.ts +0 -9
- package/src/prover/zenon/eqrel.ts +2 -15
- package/src/prover/zenon/equality-rules.ts +0 -6
- package/src/prover/zenon/expr.ts +8 -28
- package/src/prover/zenon/index-table.ts +26 -59
- package/src/prover/zenon/isar-case.ts +8 -20
- package/src/prover/zenon/isar.ts +35 -65
- package/src/prover/zenon/limits.ts +0 -4
- package/src/prover/zenon/llproof.ts +2 -22
- package/src/prover/zenon/mltoll.ts +66 -106
- package/src/prover/zenon/node.ts +20 -15
- package/src/prover/zenon/ocaml.ts +1 -17
- package/src/prover/zenon/parse.ts +9 -13
- package/src/prover/zenon/phrase.ts +1 -13
- package/src/prover/zenon/proof.ts +0 -11
- package/src/prover/zenon/propositional-rules.ts +0 -7
- package/src/prover/zenon/rules.ts +2 -8
- package/src/prover/zenon/search.ts +11 -35
- package/src/prover/zenon/tla/functions.ts +59 -33
- package/src/prover/zenon/tla/llproof.ts +67 -78
- package/src/prover/zenon/tla/records.ts +57 -35
- package/src/prover/zenon/tla/rewrites.ts +12 -21
- package/src/prover/zenon/tla/sets.ts +88 -59
- package/src/prover/zenon/tla/terms.ts +0 -8
- package/src/prover/zenon/tla/tla.ts +66 -66
- package/src/randomization.ts +81 -35
- package/src/resolve.ts +67 -185
- package/src/runtime.ts +26 -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 +5 -35
- package/src/sany/lexer.ts +58 -77
- package/src/sany/linter.ts +0 -10
- 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 +671 -169
- package/src/simulate.ts +712 -0
- package/src/spec-description.ts +192 -100
- package/src/standard-definitions.ts +4 -4
- package/src/standard-modules.ts +264 -95
- package/src/state-graph.ts +52 -33
- package/src/subexpressions.ts +69 -52
- package/src/substitution-levels.ts +7 -7
- package/src/successors.ts +267 -100
- package/src/symmetry.ts +35 -27
- package/src/tableau.ts +29 -26
- package/src/tlc/fingerprint.ts +267 -79
- 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 +64 -60
- package/src/tlc/tlc-operators.ts +78 -44
- package/src/tlc/tlcext-operators.ts +171 -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/typed-tier.ts +6535 -0
- 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/prover/isabelle/isar/statement.ts +0 -57
- package/src/prover/smt/solver/z3-license.txt +0 -10
- package/src/prover/tlaps-module.ts +0 -510
- package/src/prover/zenon/LICENSE +0 -32
|
@@ -1,6 +1,3 @@
|
|
|
1
|
-
// Converts the tla-ts AST into tlapm's parse trees: expressions name operators opaquely until
|
|
2
|
-
// anonymization resolves them, and proof steps get tlapm's levels and anonymous step numbers.
|
|
3
|
-
|
|
4
1
|
import type {
|
|
5
2
|
AssumeProve,
|
|
6
3
|
Definition,
|
|
@@ -19,6 +16,7 @@ import { TlaProofError, TlaUnsupportedError } from "../errors";
|
|
|
19
16
|
import {
|
|
20
17
|
at,
|
|
21
18
|
getFact,
|
|
19
|
+
mapChildren,
|
|
22
20
|
type Bound,
|
|
23
21
|
type Builtin,
|
|
24
22
|
type Defn,
|
|
@@ -30,7 +28,7 @@ import {
|
|
|
30
28
|
type Sequent,
|
|
31
29
|
} from "./expression";
|
|
32
30
|
import type { ModuleUnit, Mule } from "./module";
|
|
33
|
-
import { findPragma, readNewMethod, readOldMethod } from "./pragma";
|
|
31
|
+
import { findPragma, findSuppressPragma, readNewMethod, readOldMethod } from "./pragma";
|
|
34
32
|
import {
|
|
35
33
|
expandChoose,
|
|
36
34
|
expandFcn,
|
|
@@ -51,36 +49,38 @@ import {
|
|
|
51
49
|
type Usable,
|
|
52
50
|
} from "./proof";
|
|
53
51
|
|
|
54
|
-
const BUILTINS
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
52
|
+
const BUILTINS = new Map<string, Builtin>(
|
|
53
|
+
Object.entries({
|
|
54
|
+
"=>": "Implies",
|
|
55
|
+
"<=>": "Equiv",
|
|
56
|
+
"/\\": "Conj",
|
|
57
|
+
"\\/": "Disj",
|
|
58
|
+
"~": "Neg",
|
|
59
|
+
"=": "Eq",
|
|
60
|
+
"#": "Neq",
|
|
61
|
+
SUBSET: "SUBSET",
|
|
62
|
+
UNION: "UNION",
|
|
63
|
+
DOMAIN: "DOMAIN",
|
|
64
|
+
"\\subseteq": "Subseteq",
|
|
65
|
+
"\\in": "Mem",
|
|
66
|
+
"\\notin": "Notmem",
|
|
67
|
+
"\\": "Setminus",
|
|
68
|
+
"\\cap": "Cap",
|
|
69
|
+
"\\cup": "Cup",
|
|
70
|
+
"'": "Prime",
|
|
71
|
+
"~>": "Leadsto",
|
|
72
|
+
ENABLED: "ENABLED",
|
|
73
|
+
UNCHANGED: "UNCHANGED",
|
|
74
|
+
"\\cdot": "Cdot",
|
|
75
|
+
"-+->": "Actplus",
|
|
76
|
+
"[]": "BoxTrue",
|
|
77
|
+
"<>": "Diamond",
|
|
78
|
+
TRUE: "TRUE",
|
|
79
|
+
FALSE: "FALSE",
|
|
80
|
+
BOOLEAN: "BOOLEAN",
|
|
81
|
+
STRING: "STRING",
|
|
82
|
+
}),
|
|
83
|
+
);
|
|
84
84
|
|
|
85
85
|
const getCanonicalName = (name: string) => lookupOperator(name).name;
|
|
86
86
|
|
|
@@ -104,11 +104,12 @@ const mergeLoci = (left: Locus | undefined, right: Locus | undefined): Locus | u
|
|
|
104
104
|
};
|
|
105
105
|
|
|
106
106
|
const TUPLY_FAILURE = "use instead the class`E_visit.iter_concrete`";
|
|
107
|
+
const STEP_TUPLY_FAILURE = "use instead the class `P_visit.map_concrete`";
|
|
107
108
|
|
|
108
109
|
const isDitto = (bounds: QuantifierExpression["bounds"], index: number) =>
|
|
109
110
|
index > 0 && bounds[index - 1].set === bounds[index].set;
|
|
110
111
|
|
|
111
|
-
export const
|
|
112
|
+
export const createModuleConverter = (
|
|
112
113
|
file: string,
|
|
113
114
|
text: string,
|
|
114
115
|
counter: Counter,
|
|
@@ -137,14 +138,17 @@ export const createSource = (
|
|
|
137
138
|
const getMethod = (range: SourceRange | undefined) =>
|
|
138
139
|
range && readOldMethod(lines, { line: range.end.line - 1, column: range.end.column });
|
|
139
140
|
|
|
140
|
-
|
|
141
|
+
const getSuppressPragma = (keyword: SourceRange) =>
|
|
142
|
+
findSuppressPragma(lines, { line: keyword.start.line - 1, column: keyword.start.column - 1 });
|
|
143
|
+
|
|
144
|
+
const isSuppressed = (keyword: SourceRange) => getSuppressPragma(keyword) !== undefined;
|
|
145
|
+
|
|
141
146
|
const withMethod = (range: SourceRange) => {
|
|
142
147
|
const method = getMethod(range);
|
|
143
148
|
const location = getRangeLocus(range);
|
|
144
149
|
return method ? { location: withPragma(location), method } : { location };
|
|
145
150
|
};
|
|
146
151
|
|
|
147
|
-
// Module.Parser's with_meth, which wraps the expression a method follows.
|
|
148
152
|
const withExpressionMethod = (expression: Expr, range: SourceRange | undefined): Expr => {
|
|
149
153
|
const method = getMethod(range);
|
|
150
154
|
return method ? at({ kind: "With", expression, method }, expression) : expression;
|
|
@@ -163,13 +167,12 @@ export const createSource = (
|
|
|
163
167
|
|
|
164
168
|
const convertOperator = (name: string, location: Locus | undefined): Expr => {
|
|
165
169
|
const canonical = getCanonicalName(name);
|
|
166
|
-
const builtin = BUILTINS
|
|
170
|
+
const builtin = BUILTINS.get(canonical);
|
|
167
171
|
return at(builtin ? { kind: "Internal", builtin } : { kind: "Opaque", name: canonical }, {
|
|
168
172
|
location,
|
|
169
173
|
});
|
|
170
174
|
};
|
|
171
175
|
|
|
172
|
-
// A name with ! selects through instances, which anonymization resolves by joining the names.
|
|
173
176
|
const convertName = (
|
|
174
177
|
name: string,
|
|
175
178
|
args: Expr[],
|
|
@@ -180,7 +183,7 @@ export const createSource = (
|
|
|
180
183
|
const operator = at({ kind: "Opaque", name }, { location });
|
|
181
184
|
return at({ kind: "Bang", expression: operator, selectors: [] }, { location });
|
|
182
185
|
}
|
|
183
|
-
const builtin = BUILTINS
|
|
186
|
+
const builtin = BUILTINS.get(name);
|
|
184
187
|
if (builtin && args.length === 0) return at({ kind: "Internal", builtin }, { location });
|
|
185
188
|
const names = name.split("!");
|
|
186
189
|
if (names.length === 1) {
|
|
@@ -215,12 +218,14 @@ export const createSource = (
|
|
|
215
218
|
bounds.map((bound, index) => {
|
|
216
219
|
if (bound.pattern.kind === "Tuple")
|
|
217
220
|
throw new TlaProofError("Unexpected tuple declaration", { failure: TUPLY_FAILURE });
|
|
221
|
+
const range = bound.pattern.ranges?.[0];
|
|
218
222
|
return {
|
|
219
223
|
name: bound.pattern.name,
|
|
220
224
|
level: "Constant",
|
|
221
225
|
domain: isDitto(bounds, index)
|
|
222
226
|
? { kind: "Ditto" }
|
|
223
227
|
: { kind: "Domain", expression: convertExpression(bound.set, isExcept) },
|
|
228
|
+
...(range && { location: getRangeLocus(range) }),
|
|
224
229
|
};
|
|
225
230
|
});
|
|
226
231
|
|
|
@@ -239,6 +244,13 @@ export const createSource = (
|
|
|
239
244
|
};
|
|
240
245
|
});
|
|
241
246
|
|
|
247
|
+
// P_visit.map fails on the tuples a TAKE or PICK declares before the expression visitors do.
|
|
248
|
+
const convertStepBounds = (body: { names: string[]; bounds: QuantifierExpression["bounds"] }) => {
|
|
249
|
+
if (body.bounds.some((bound) => bound.pattern.kind === "Tuple"))
|
|
250
|
+
throw new TlaProofError("Unexpected tuple declaration", { failure: STEP_TUPLY_FAILURE });
|
|
251
|
+
return body.names.length > 0 ? getUnbounded(body.names) : convertBounds(body.bounds, false);
|
|
252
|
+
};
|
|
253
|
+
|
|
242
254
|
const expandTuples = (expanded: Expr, location: Locus) => {
|
|
243
255
|
if (!isExpandingTuples)
|
|
244
256
|
throw new TlaProofError("Unexpected tuple declaration", { failure: TUPLY_FAILURE });
|
|
@@ -251,8 +263,6 @@ export const createSource = (
|
|
|
251
263
|
const convertExpression = (expression: Expression, isExcept: boolean): Expr => {
|
|
252
264
|
const location = getLocus(expression.location);
|
|
253
265
|
const recurse = (inner: Expression) => convertExpression(inner, isExcept);
|
|
254
|
-
// tlapm locates an operator application by its operator and operands, and a parenthesized
|
|
255
|
-
// operand by what is inside the parentheses.
|
|
256
266
|
const getOperatorLocus = (args: Expr[], fixity: Fixity) => {
|
|
257
267
|
if (args.length === 2) return mergeLoci(args[0].location, args[1].location);
|
|
258
268
|
if (args.length !== 1 || !args[0].location) return location;
|
|
@@ -286,8 +296,6 @@ export const createSource = (
|
|
|
286
296
|
return at({ kind: "Num", integer, fraction }, { location });
|
|
287
297
|
}
|
|
288
298
|
case "String": {
|
|
289
|
-
// tlapm's lexer keeps a string's escapes as written. The location ends at the closing
|
|
290
|
-
// quote.
|
|
291
299
|
const written = /"((?:[^"\\]|\\.)*)"$/.exec(
|
|
292
300
|
(lines[location.endLine - 1] ?? "").slice(0, location.endColumn - 1),
|
|
293
301
|
);
|
|
@@ -303,9 +311,18 @@ export const createSource = (
|
|
|
303
311
|
const args = expression.args.map(recurse);
|
|
304
312
|
const operator = lookupOperator(expression.operator);
|
|
305
313
|
if (operator.fixity !== "Nonfix") {
|
|
314
|
+
const operatorLocus = getPointLocus(expression.location, 1);
|
|
315
|
+
const first = args[0]?.location;
|
|
316
|
+
const isNonfix =
|
|
317
|
+
args.length === 2 &&
|
|
318
|
+
first !== undefined &&
|
|
319
|
+
(operatorLocus.startLine < first.startLine ||
|
|
320
|
+
(operatorLocus.startLine === first.startLine &&
|
|
321
|
+
operatorLocus.startColumn < first.startColumn));
|
|
322
|
+
const operands = getOperatorLocus(args, operator.fixity);
|
|
306
323
|
return at(
|
|
307
324
|
{ kind: "Apply", operator: convertOperator(expression.operator, undefined), args },
|
|
308
|
-
{ location:
|
|
325
|
+
{ location: isNonfix ? mergeLoci(operatorLocus, operands) : operands },
|
|
309
326
|
);
|
|
310
327
|
}
|
|
311
328
|
return convertName(expression.operator, args, location, expression.argumentCounts);
|
|
@@ -474,8 +491,7 @@ export const createSource = (
|
|
|
474
491
|
{ location },
|
|
475
492
|
);
|
|
476
493
|
case "Tuple":
|
|
477
|
-
// tlapm's tuple parser
|
|
478
|
-
// of the closing >>.
|
|
494
|
+
// tlapm's tuple parser keeps only the location of the closing >>.
|
|
479
495
|
return at(
|
|
480
496
|
{ kind: "Tuple", elements: expression.elements.map(recurse) },
|
|
481
497
|
{
|
|
@@ -563,22 +579,14 @@ export const createSource = (
|
|
|
563
579
|
case "Always":
|
|
564
580
|
case "Eventually": {
|
|
565
581
|
const inner = expression.expression;
|
|
566
|
-
if (
|
|
567
|
-
|
|
568
|
-
|
|
569
|
-
|
|
570
|
-
modal: "Box",
|
|
571
|
-
action: recurse(inner.action),
|
|
572
|
-
subscript: recurse(inner.subscript),
|
|
573
|
-
},
|
|
574
|
-
{ location },
|
|
575
|
-
);
|
|
576
|
-
}
|
|
577
|
-
if (expression.kind === "Eventually" && inner.kind === "AngleAction") {
|
|
582
|
+
if (
|
|
583
|
+
(expression.kind === "Always" && inner.kind === "BoxAction") ||
|
|
584
|
+
(expression.kind === "Eventually" && inner.kind === "AngleAction")
|
|
585
|
+
) {
|
|
578
586
|
return at(
|
|
579
587
|
{
|
|
580
588
|
kind: "Tsub",
|
|
581
|
-
modal: "Dia",
|
|
589
|
+
modal: expression.kind === "Always" ? "Box" : "Dia",
|
|
582
590
|
action: recurse(inner.action),
|
|
583
591
|
subscript: recurse(inner.subscript),
|
|
584
592
|
},
|
|
@@ -599,22 +607,39 @@ export const createSource = (
|
|
|
599
607
|
{ location },
|
|
600
608
|
);
|
|
601
609
|
case "WeakFairness":
|
|
602
|
-
case "StrongFairness":
|
|
610
|
+
case "StrongFairness": {
|
|
611
|
+
// tlapm lexes WF_vars as WF_ and vars, both located at the whole word.
|
|
612
|
+
const isGlued = /\w/.test(lines[location.startLine - 1]?.[location.startColumn + 2] ?? "");
|
|
613
|
+
const moveGluedStart = (inner: Expr): Expr =>
|
|
614
|
+
isGlued &&
|
|
615
|
+
inner.location?.startLine === location.startLine &&
|
|
616
|
+
inner.location.startColumn === location.startColumn + 3
|
|
617
|
+
? mapChildren(
|
|
618
|
+
{ ...inner, location: { ...inner.location, startColumn: location.startColumn } },
|
|
619
|
+
moveGluedStart,
|
|
620
|
+
)
|
|
621
|
+
: inner;
|
|
603
622
|
return at(
|
|
604
623
|
{
|
|
605
624
|
kind: "Fair",
|
|
606
625
|
fairness: expression.kind === "WeakFairness" ? "Weak" : "Strong",
|
|
607
|
-
subscript: recurse(expression.subscript),
|
|
626
|
+
subscript: moveGluedStart(recurse(expression.subscript)),
|
|
608
627
|
action: recurse(expression.action),
|
|
609
628
|
},
|
|
610
629
|
{ location },
|
|
611
630
|
);
|
|
631
|
+
}
|
|
612
632
|
case "Label":
|
|
613
633
|
return at(
|
|
614
634
|
{
|
|
615
635
|
kind: "Parens",
|
|
616
636
|
expression: recurse(expression.body),
|
|
617
|
-
form: {
|
|
637
|
+
form: {
|
|
638
|
+
kind: "Nlabel",
|
|
639
|
+
label: expression.name,
|
|
640
|
+
names: expression.params,
|
|
641
|
+
location: expression.head && getRangeLocus(expression.head),
|
|
642
|
+
},
|
|
618
643
|
},
|
|
619
644
|
{ location },
|
|
620
645
|
);
|
|
@@ -659,11 +684,13 @@ export const createSource = (
|
|
|
659
684
|
|
|
660
685
|
const convertInstance = (instance: Instance): InstanceDefinition => ({
|
|
661
686
|
location: getRangeLocus(instance.definitionRange ?? instance.instanceRange),
|
|
687
|
+
instanceLocation: getRangeLocus(instance.instanceRange),
|
|
662
688
|
args: instance.params.map((param) => param.name),
|
|
663
689
|
module: instance.module,
|
|
664
690
|
substitutions: instance.substitutions.map((substitution) => ({
|
|
665
691
|
name: getCanonicalName(substitution.name),
|
|
666
692
|
expression: convertExpression(substitution.expression, false),
|
|
693
|
+
location: getRangeLocus(substitution.nameRange),
|
|
667
694
|
})),
|
|
668
695
|
});
|
|
669
696
|
|
|
@@ -678,26 +705,21 @@ export const createSource = (
|
|
|
678
705
|
location,
|
|
679
706
|
};
|
|
680
707
|
}
|
|
681
|
-
// A prefix minus is the operator -.
|
|
682
708
|
const name =
|
|
683
709
|
definition.kind === "Operator" && definition.params.length === 1 && definition.name === "-"
|
|
684
710
|
? "-."
|
|
685
711
|
: getCanonicalName(definition.name);
|
|
686
712
|
const body = convertExpression(definition.body, isExcept);
|
|
687
|
-
if (definition.kind === "Function" && hasTuple(definition.bounds)) {
|
|
688
|
-
return {
|
|
689
|
-
kind: "Operator",
|
|
690
|
-
name,
|
|
691
|
-
body: expandTuples(expandFcn(getTuplyBounds(definition.bounds, isExcept), body), location),
|
|
692
|
-
location,
|
|
693
|
-
};
|
|
694
|
-
}
|
|
695
713
|
if (definition.kind === "Function") {
|
|
696
|
-
const bounds = convertBounds(definition.bounds, isExcept);
|
|
697
714
|
return {
|
|
698
715
|
kind: "Operator",
|
|
699
716
|
name,
|
|
700
|
-
body:
|
|
717
|
+
body: hasTuple(definition.bounds)
|
|
718
|
+
? expandTuples(expandFcn(getTuplyBounds(definition.bounds, isExcept), body), location)
|
|
719
|
+
: at(
|
|
720
|
+
{ kind: "Fcn", bounds: convertBounds(definition.bounds, isExcept), body },
|
|
721
|
+
{ location },
|
|
722
|
+
),
|
|
701
723
|
location,
|
|
702
724
|
};
|
|
703
725
|
}
|
|
@@ -719,7 +741,7 @@ export const createSource = (
|
|
|
719
741
|
{ location },
|
|
720
742
|
);
|
|
721
743
|
const end = definition.location.range?.end;
|
|
722
|
-
const methods = end && readNewMethod(lines, { line: end.line - 1, column: end.column });
|
|
744
|
+
const methods = end && readNewMethod(lines, { line: end.line - 1, column: end.column }, file);
|
|
723
745
|
return methods
|
|
724
746
|
? { kind: "Bpragma", name, body: operatorBody, methods, location }
|
|
725
747
|
: { kind: "Operator", name, body: operatorBody, location };
|
|
@@ -739,7 +761,6 @@ export const createSource = (
|
|
|
739
761
|
};
|
|
740
762
|
};
|
|
741
763
|
|
|
742
|
-
// Anonymization judges the time of each assumption once it resolves the names in it.
|
|
743
764
|
const convertSequent = (statement: Expression | AssumeProve): Sequent => {
|
|
744
765
|
if (statement.kind !== "AssumeProve")
|
|
745
766
|
return { context: [], active: convertExpression(statement, false) };
|
|
@@ -759,7 +780,6 @@ export const createSource = (
|
|
|
759
780
|
};
|
|
760
781
|
};
|
|
761
782
|
|
|
762
|
-
// A labeled hypothesis is an Xlabel without parameters, not an Nlabel like a labeled expression.
|
|
763
783
|
const convertFactLabel = (expression: Expression): Expr => {
|
|
764
784
|
if (expression.kind !== "Label" || expression.params.length > 0)
|
|
765
785
|
return convertExpression(expression, false);
|
|
@@ -804,7 +824,6 @@ export const createSource = (
|
|
|
804
824
|
? { kind: "Named", level, label: token[2], isAnonymous: false }
|
|
805
825
|
: { kind: "Unnamed", level, id: getUnique(counter) };
|
|
806
826
|
|
|
807
|
-
// to_proof: a missing proof is implicitly omitted where the enclosing step is.
|
|
808
827
|
const convertProof = (
|
|
809
828
|
proof: ProofStep["proof"],
|
|
810
829
|
level: number,
|
|
@@ -813,7 +832,11 @@ export const createSource = (
|
|
|
813
832
|
if (!proof) return { kind: "Omitted", omission: "Implicit", location: enclosing };
|
|
814
833
|
switch (proof.kind) {
|
|
815
834
|
case "Obvious":
|
|
816
|
-
return {
|
|
835
|
+
return {
|
|
836
|
+
kind: "Obvious",
|
|
837
|
+
...withMethod(proof.keyword),
|
|
838
|
+
isSuppressed: isSuppressed(proof.keyword),
|
|
839
|
+
};
|
|
817
840
|
case "Omitted":
|
|
818
841
|
return {
|
|
819
842
|
kind: "Omitted",
|
|
@@ -828,14 +851,12 @@ export const createSource = (
|
|
|
828
851
|
location: getRangeLocus(proof.keyword),
|
|
829
852
|
step: { kind: "Unnamed", level, id: 0 },
|
|
830
853
|
method: getMethod(proof.location.range),
|
|
854
|
+
isSuppressed: isSuppressed(proof.keyword),
|
|
831
855
|
};
|
|
832
856
|
case "Steps": {
|
|
833
|
-
// A <*> first step takes the enclosing level only after PROOF, and the top level
|
|
834
|
-
// always counts as PROOF.
|
|
835
857
|
const tokens = proof.steps.map((step) => STEP_PATTERN.exec(step.token));
|
|
836
858
|
const first = tokens[0];
|
|
837
859
|
const stepLevel = first && first[1] !== "*" && first[1] !== "+" ? Number(first[1]) : level;
|
|
838
|
-
// The parser ends the steps at the first QED.
|
|
839
860
|
const steps = proof.steps
|
|
840
861
|
.slice(0, -1)
|
|
841
862
|
.map((step, index) =>
|
|
@@ -855,8 +876,6 @@ export const createSource = (
|
|
|
855
876
|
}
|
|
856
877
|
};
|
|
857
878
|
|
|
858
|
-
// tlapm locates a USE or HIDE by its keywords and DEF clause, since its parser drops the
|
|
859
|
-
// facts' location.
|
|
860
879
|
const getUseLocus = (use: UseOrHide) =>
|
|
861
880
|
mergeLoci(
|
|
862
881
|
getRangeLocus(use.keyword),
|
|
@@ -874,6 +893,7 @@ export const createSource = (
|
|
|
874
893
|
...converted,
|
|
875
894
|
...withMethod(step.head),
|
|
876
895
|
step: number,
|
|
896
|
+
isSuppressed: isSuppressed(step.statement),
|
|
877
897
|
});
|
|
878
898
|
switch (body.kind) {
|
|
879
899
|
case "Use":
|
|
@@ -891,6 +911,7 @@ export const createSource = (
|
|
|
891
911
|
location,
|
|
892
912
|
step: number,
|
|
893
913
|
method: getMethod(body.location.range),
|
|
914
|
+
isSuppressed: isSuppressed(body.keyword),
|
|
894
915
|
}
|
|
895
916
|
: { kind: "Hide", usable, location, step: number };
|
|
896
917
|
}
|
|
@@ -909,19 +930,14 @@ export const createSource = (
|
|
|
909
930
|
expression: convertExpression(body.expression, false),
|
|
910
931
|
});
|
|
911
932
|
case "Take":
|
|
912
|
-
return withStepMethod({
|
|
913
|
-
kind: "Take",
|
|
914
|
-
bounds:
|
|
915
|
-
body.names.length > 0 ? getUnbounded(body.names) : convertBounds(body.bounds, false),
|
|
916
|
-
});
|
|
933
|
+
return withStepMethod({ kind: "Take", bounds: convertStepBounds(body) });
|
|
917
934
|
case "Witness":
|
|
918
935
|
return withStepMethod({
|
|
919
936
|
kind: "Witness",
|
|
920
937
|
expressions: body.expressions.map((expression) => convertExpression(expression, false)),
|
|
921
938
|
});
|
|
922
939
|
case "Pick": {
|
|
923
|
-
const bounds =
|
|
924
|
-
body.names.length > 0 ? getUnbounded(body.names) : convertBounds(body.bounds, false);
|
|
940
|
+
const bounds = convertStepBounds(body);
|
|
925
941
|
const expression = convertExpression(body.body, false);
|
|
926
942
|
return withProof((proof) => ({ kind: "Pick", bounds, expression, proof }));
|
|
927
943
|
}
|
|
@@ -958,7 +974,9 @@ export const createSource = (
|
|
|
958
974
|
name: getCanonicalName(declaration.name),
|
|
959
975
|
shape: declaration.arity,
|
|
960
976
|
})),
|
|
961
|
-
location: getLocus(
|
|
977
|
+
location: getLocus(
|
|
978
|
+
unit.kind === "Constants" ? unit.declarations[0].location : unit.location,
|
|
979
|
+
),
|
|
962
980
|
};
|
|
963
981
|
case "Variables":
|
|
964
982
|
return {
|
|
@@ -1025,18 +1043,24 @@ export const createSource = (
|
|
|
1025
1043
|
location,
|
|
1026
1044
|
};
|
|
1027
1045
|
}
|
|
1028
|
-
case "Use":
|
|
1046
|
+
case "Use": {
|
|
1047
|
+
// A module unit's locus takes in the suppress pragma that tlapm reads as its first tokens.
|
|
1048
|
+
const pragma = getSuppressPragma(unit.use.keyword);
|
|
1029
1049
|
return {
|
|
1030
1050
|
kind: "Mutate",
|
|
1031
1051
|
mode: unit.use.kind,
|
|
1032
1052
|
usable: convertUsable(unit.use),
|
|
1033
|
-
location:
|
|
1053
|
+
location: mergeLoci(
|
|
1054
|
+
pragma && getPointLocus({ line: pragma.line + 1, column: pragma.column + 1 }, 0),
|
|
1055
|
+
getUseLocus(unit.use),
|
|
1056
|
+
),
|
|
1034
1057
|
};
|
|
1058
|
+
}
|
|
1035
1059
|
case "Module":
|
|
1036
1060
|
return { kind: "Submod", module: { ...convertModule(unit.module), isImportant: true } };
|
|
1037
1061
|
}
|
|
1038
1062
|
}),
|
|
1039
1063
|
});
|
|
1040
1064
|
|
|
1041
|
-
return
|
|
1065
|
+
return convertModule;
|
|
1042
1066
|
};
|