tla-ts 0.0.9-dev.8298a52 → 0.0.10-dev.06b481ee0
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 +8 -0
- package/dist/compile.cjs +6 -6
- package/dist/compile.js +10 -10
- package/dist/deciders.cjs +41 -37
- package/dist/deciders.js +57 -53
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +121 -12
- package/dist/index.d.ts +121 -12
- 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 +144 -31
- package/dist/run.js +144 -31
- package/dist/tlapm.cjs +2 -2
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +134 -104
- package/dist/transfer.js +134 -104
- package/dist/worker.cjs +7 -7
- package/dist/worker.js +7 -7
- package/package.json +1 -1
- package/src/ast.ts +56 -60
- package/src/bags.ts +128 -110
- package/src/builtins.ts +31 -77
- package/src/bundled-modules.ts +1 -8
- package/src/check-failure.ts +118 -0
- package/src/check-trace.ts +320 -0
- package/src/check.ts +1155 -900
- package/src/cli/options.ts +12 -32
- package/src/cli/run.ts +0 -2
- package/src/cli/runtime-invariants.ts +100 -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 +701 -0
- package/src/cli/tlc-usage.ts +360 -0
- package/src/cli/tlc.ts +318 -656
- package/src/cli/typescript.ts +0 -3
- package/src/cli/xml-exporter.ts +27 -49
- package/src/cli.ts +0 -1
- package/src/codegen.ts +217 -82
- package/src/config.ts +140 -109
- package/src/coverage.ts +1019 -0
- package/src/dependencies.ts +101 -66
- package/src/dfid.ts +683 -0
- package/src/environment-config.ts +315 -0
- package/src/environment.ts +260 -371
- package/src/errors.ts +93 -58
- package/src/evaluate.ts +848 -374
- package/src/exit-codes.ts +63 -13
- package/src/fingerprints.ts +75 -11
- package/src/index.ts +3 -0
- package/src/instances.ts +97 -43
- package/src/java-hash.ts +21 -0
- package/src/java-overrides.ts +6 -21
- package/src/json-reader.ts +455 -0
- package/src/json.ts +252 -139
- package/src/levels.ts +231 -154
- package/src/lexer.ts +83 -101
- package/src/liveness-checker.ts +743 -325
- package/src/liveness.ts +224 -131
- 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 +39 -20
- package/src/obligations/levels.ts +27 -18
- package/src/obligations/module.ts +28 -55
- package/src/obligations/normalize.ts +31 -41
- package/src/obligations/operators.ts +0 -3
- package/src/obligations/pragma.ts +52 -24
- package/src/obligations/printer.ts +94 -63
- 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 +121 -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 +34 -57
- package/src/parallel.ts +62 -72
- package/src/parser.ts +1184 -531
- 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 +226 -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 +1 -15
- package/src/prover/isabelle/provers/classical.ts +58 -61
- package/src/prover/isabelle/provers/hypsubst.ts +29 -54
- 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 +34 -77
- 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 +4 -47
- 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 +26 -31
- 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 +1021 -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 +626 -56
- 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 +319 -0
- package/src/prover/smt/solver/array.ts +1 -3
- package/src/prover/smt/solver/asserted-formulas.ts +241 -99
- package/src/prover/smt/solver/ast-lt.ts +165 -21
- package/src/prover/smt/solver/ast-util.ts +160 -7
- package/src/prover/smt/solver/ast.ts +1480 -184
- package/src/prover/smt/solver/auf-solver.ts +30 -56
- package/src/prover/smt/solver/bit-blast-tactic.ts +608 -0
- package/src/prover/smt/solver/bit-blaster.ts +871 -0
- package/src/prover/smt/solver/blast-term-ite.ts +47 -0
- package/src/prover/smt/solver/bound-manager.ts +196 -0
- package/src/prover/smt/solver/bound-simplifier.ts +598 -0
- package/src/prover/smt/solver/bv-bound-chk.ts +492 -0
- package/src/prover/smt/solver/bv-decl-plugin.ts +341 -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 +127 -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 +293 -0
- package/src/prover/smt/solver/conflict-resolution.ts +78 -11
- package/src/prover/smt/solver/context.ts +600 -187
- package/src/prover/smt/solver/ctx-simplify.ts +34 -52
- package/src/prover/smt/solver/ctx-solver-simplify.ts +122 -0
- package/src/prover/smt/solver/datatype-decl-plugin.ts +580 -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 +93 -0
- package/src/prover/smt/solver/der.ts +39 -30
- package/src/prover/smt/solver/diff-neq.ts +205 -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 +296 -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-bounds.ts +89 -0
- package/src/prover/smt/solver/elim-small-bv-tactic.ts +129 -0
- package/src/prover/smt/solver/elim-term-ite-tactic.ts +48 -0
- package/src/prover/smt/solver/elim-uncnstr.ts +542 -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 +901 -0
- package/src/prover/smt/solver/euf/euf-solver.ts +1204 -0
- package/src/prover/smt/solver/euf/fpa-solver.ts +317 -0
- package/src/prover/smt/solver/euf/mam.ts +1046 -0
- package/src/prover/smt/solver/euf/q-ematch.ts +829 -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 +328 -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 +271 -0
- package/src/prover/smt/solver/factor.ts +163 -0
- package/src/prover/smt/solver/fd-solver.ts +734 -0
- package/src/prover/smt/solver/fingerprints.ts +15 -26
- package/src/prover/smt/solver/fix-dl-var.ts +147 -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 +639 -0
- package/src/prover/smt/solver/fpa2bv-converter.ts +2251 -0
- package/src/prover/smt/solver/fpa2bv-rewriter.ts +349 -0
- package/src/prover/smt/solver/fpa2bv-tactic.ts +73 -0
- package/src/prover/smt/solver/goal.ts +179 -28
- package/src/prover/smt/solver/goal2nlsat.ts +216 -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 +30 -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 +113 -133
- 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 +355 -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 +18 -31
- package/src/prover/smt/solver/lp/core-solver.ts +35 -37
- package/src/prover/smt/solver/lp/cross-nested.ts +4 -21
- 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 +70 -83
- package/src/prover/smt/solver/lp/lar-term.ts +0 -5
- package/src/prover/smt/solver/lp/lp-settings.ts +6 -16
- package/src/prover/smt/solver/lp/maximize-term.ts +76 -52
- package/src/prover/smt/solver/lp/nex-creator.ts +7 -30
- package/src/prover/smt/solver/lp/nex.ts +2 -7
- 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 +92 -136
- 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 +177 -149
- 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 +164 -147
- package/src/prover/smt/solver/lp/numeric-pair.ts +0 -4
- package/src/prover/smt/solver/lp/pdd-interval.ts +6 -5
- package/src/prover/smt/solver/lp/pdd-simplifier.ts +61 -34
- package/src/prover/smt/solver/lp/pdd-solver.ts +74 -72
- package/src/prover/smt/solver/lp/pdd.ts +730 -358
- 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 +310 -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 +106 -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 +20 -63
- package/src/prover/smt/solver/model-evaluator.ts +192 -40
- package/src/prover/smt/solver/model-finder.ts +14 -32
- package/src/prover/smt/solver/model-generator.ts +104 -46
- 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 +709 -0
- package/src/prover/smt/solver/mus.ts +50 -0
- package/src/prover/smt/solver/muz/dl-context.ts +382 -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 +495 -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 +214 -0
- package/src/prover/smt/solver/muz/rule-properties.ts +359 -0
- package/src/prover/smt/solver/muz/spacer-context.ts +1404 -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 +219 -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 +357 -236
- package/src/prover/smt/solver/nlsat/atoms.ts +73 -54
- package/src/prover/smt/solver/nlsat/evaluator.ts +16 -22
- package/src/prover/smt/solver/nlsat/explain.ts +429 -275
- package/src/prover/smt/solver/nlsat/interval-set.ts +9 -51
- package/src/prover/smt/solver/nlsat/levelwise.ts +477 -344
- package/src/prover/smt/solver/nlsat/mpbq.ts +47 -14
- package/src/prover/smt/solver/nlsat/polynomial.ts +2385 -832
- package/src/prover/smt/solver/nlsat/solver.ts +297 -156
- package/src/prover/smt/solver/nlsat/transcendental-eval.ts +310 -0
- package/src/prover/smt/solver/nlsat/transcendentals.ts +391 -0
- package/src/prover/smt/solver/nlsat/types.ts +0 -9
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +9 -51
- package/src/prover/smt/solver/nlsat/upolynomial.ts +49 -109
- package/src/prover/smt/solver/nlsat-tactic.ts +82 -0
- package/src/prover/smt/solver/nnf.ts +112 -61
- 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 +801 -0
- package/src/prover/smt/solver/opt-nlsat.ts +386 -0
- package/src/prover/smt/solver/opt-pareto.ts +301 -0
- package/src/prover/smt/solver/opt-preprocess.ts +101 -0
- package/src/prover/smt/solver/opt-solver.ts +312 -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 +281 -0
- package/src/prover/smt/solver/pb2bv-tactic.ts +540 -0
- package/src/prover/smt/solver/poly-rewriter.ts +261 -79
- package/src/prover/smt/solver/probes.ts +577 -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/push-app-ite.ts +37 -0
- package/src/prover/smt/solver/qe-arith-plugin.ts +1096 -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 +41 -51
- package/src/prover/smt/solver/qe-mbp.ts +270 -0
- package/src/prover/smt/solver/qe.ts +1499 -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 +829 -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 +22 -32
- 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 +262 -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 +59 -135
- package/src/prover/smt/solver/rewriter.ts +507 -144
- package/src/prover/smt/solver/rlimit.ts +46 -24
- 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 +579 -0
- package/src/prover/smt/solver/sat/inc-sat-solver.ts +464 -0
- package/src/prover/smt/solver/sat/model-converter.ts +136 -0
- package/src/prover/smt/solver/sat/pb-constraint.ts +268 -0
- package/src/prover/smt/solver/sat/pb-solver.ts +1596 -0
- package/src/prover/smt/solver/sat/probing.ts +170 -0
- package/src/prover/smt/solver/sat/sat-tactic.ts +53 -0
- package/src/prover/smt/solver/sat/sat2goal.ts +189 -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 +2107 -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 +995 -0
- package/src/prover/smt/solver/seq-decl-plugin.ts +819 -0
- package/src/prover/smt/solver/seq-derive.ts +1298 -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 +730 -0
- package/src/prover/smt/solver/seq-range-predicate.ts +235 -0
- package/src/prover/smt/solver/seq-re-rewriter.ts +1171 -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 +2404 -0
- package/src/prover/smt/solver/seq-skolem.ts +294 -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 +124 -0
- package/src/prover/smt/solver/smt-logics.ts +66 -0
- package/src/prover/smt/solver/smt-setup.ts +589 -0
- package/src/prover/smt/solver/smt2-printer.ts +765 -0
- package/src/prover/smt/solver/smtlib-parser.ts +3546 -406
- package/src/prover/smt/solver/smtlib-script.ts +2134 -0
- package/src/prover/smt/solver/solve-eqs.ts +928 -0
- package/src/prover/smt/solver/solver.ts +129 -38
- 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 +2141 -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 +1210 -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 +60 -91
- package/src/prover/smt/solver/theory-lra-internalize.ts +96 -53
- package/src/prover/smt/solver/theory-lra-model.ts +23 -53
- package/src/prover/smt/solver/theory-lra-propagate.ts +34 -42
- package/src/prover/smt/solver/theory-lra-state.ts +7 -28
- package/src/prover/smt/solver/theory-lra.ts +189 -9
- package/src/prover/smt/solver/theory-pb.ts +951 -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 +852 -0
- package/src/prover/smt/solver/theory-seq.ts +961 -0
- package/src/prover/smt/solver/theory-without-terms.ts +24 -0
- package/src/prover/smt/solver/theory.ts +189 -0
- package/src/prover/smt/solver/tseitin-cnf.ts +486 -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 +74 -48
- 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 +24 -6
- package/src/prover/zenon/expr.ts +29 -28
- package/src/prover/zenon/index-table.ts +33 -61
- package/src/prover/zenon/isar-case.ts +9 -21
- package/src/prover/zenon/isar.ts +37 -67
- 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 +2 -14
- package/src/prover/zenon/proof.ts +0 -11
- package/src/prover/zenon/propositional-rules.ts +0 -7
- package/src/prover/zenon/rules.ts +3 -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 +1132 -430
- package/src/runtime.ts +33 -23
- package/src/sany/builtins.ts +11 -14
- package/src/sany/generation.ts +383 -0
- package/src/sany/generator-def-entries.ts +210 -0
- package/src/sany/generator-definitions.ts +688 -0
- package/src/sany/generator-expressions.ts +1108 -0
- package/src/sany/generator-proofs.ts +665 -0
- package/src/sany/generator.ts +192 -2764
- package/src/sany/levels.ts +5 -35
- package/src/sany/lexer.ts +61 -80
- package/src/sany/linter.ts +0 -10
- package/src/sany/modules.ts +5 -7
- package/src/sany/nodes.ts +6 -44
- package/src/sany/parse-error.ts +39 -117
- package/src/sany/report.ts +32 -69
- package/src/sany/selectors.ts +60 -82
- package/src/sany/source.ts +1 -17
- package/src/sany/xml.ts +37 -120
- package/src/search.ts +913 -227
- package/src/simulate.ts +765 -0
- package/src/spec-description.ts +198 -104
- package/src/standard-definitions.ts +4 -4
- package/src/standard-modules.ts +302 -99
- package/src/state-graph.ts +52 -33
- package/src/subexpressions.ts +578 -166
- package/src/substitution-levels.ts +7 -7
- package/src/successors.ts +296 -105
- package/src/symmetry.ts +37 -28
- package/src/tableau.ts +29 -26
- package/src/tlc/fingerprint.ts +267 -79
- package/src/tlc/jar-data.ts +122 -6
- package/src/tlc/messages.ts +127 -56
- package/src/tlc/order.ts +53 -72
- package/src/tlc/random.ts +38 -49
- package/src/tlc/replay.ts +579 -230
- package/src/tlc/summary.ts +64 -60
- package/src/tlc/tlc-operators.ts +83 -47
- package/src/tlc/tlcext-operators.ts +205 -127
- package/src/tlc/trace-spec.ts +235 -0
- package/src/tlc/value-stream.ts +139 -0
- package/src/tlc/version.ts +1 -4
- package/src/trace-liveness.ts +529 -0
- package/src/transfer.ts +22 -25
- package/src/typed-tier.ts +6556 -0
- package/src/typescript/actions.ts +10 -25
- package/src/typescript/collections.ts +34 -35
- package/src/typescript/compile.ts +1 -8
- package/src/typescript/context.ts +0 -12
- package/src/typescript/emit.ts +0 -1
- package/src/typescript/expressions.ts +0 -12
- package/src/typescript/formula.ts +9 -15
- package/src/typescript/functions.ts +6 -17
- package/src/typescript/model.ts +14 -16
- package/src/typescript/names.ts +0 -2
- package/src/typescript/program.ts +0 -3
- package/src/typescript/properties.ts +6 -8
- package/src/typescript/scope.ts +0 -5
- package/src/typescript/steps.ts +20 -28
- package/src/typescript/types.ts +3 -10
- package/src/values.ts +917 -522
- 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
package/src/sany/selectors.ts
CHANGED
|
@@ -4,6 +4,7 @@ import {
|
|
|
4
4
|
CONSTANT_DECL_KIND,
|
|
5
5
|
getContextSymbol,
|
|
6
6
|
getSymbolArity,
|
|
7
|
+
isAbsent,
|
|
7
8
|
type AssumeProveNode,
|
|
8
9
|
type Context,
|
|
9
10
|
type ExprNode,
|
|
@@ -21,18 +22,12 @@ import {
|
|
|
21
22
|
type ThmOrAssumpDefNode,
|
|
22
23
|
} from "./nodes";
|
|
23
24
|
|
|
24
|
-
// A port of SANY's Generator.selectorToNode, which turns a name such as Op(a)!lab(b)!:!2 into the
|
|
25
|
-
// semantic node it names, following the Subexpression algorithm of SANY's Subexpression.tla.
|
|
26
|
-
|
|
27
|
-
// An operand selector !i is the number i, and the other selectors are named after SANY's NameSel,
|
|
28
|
-
// NullSel, GGSel, LLSel, ColonSel and AtSel.
|
|
29
25
|
type SelectorOp = number | "Name" | "Null" | ">>" | "<<" | ":" | "@";
|
|
30
26
|
|
|
31
27
|
export interface SelectorItem {
|
|
32
28
|
op: SelectorOp;
|
|
33
29
|
name: string;
|
|
34
30
|
args: Expression[] | undefined;
|
|
35
|
-
// Where SANY locates the selector and its parenthesized arguments, when known.
|
|
36
31
|
location?: SanyLocation;
|
|
37
32
|
argsLocation?: SanyLocation;
|
|
38
33
|
}
|
|
@@ -62,10 +57,7 @@ interface SelectorGenerator {
|
|
|
62
57
|
createLambda: (params: FormalParamNode[], body: ExprNode, location: SanyLocation) => OpDefNode;
|
|
63
58
|
copySubstIn: (prefix: SubstInNode, body: ExprNode) => SubstInNode;
|
|
64
59
|
getBuiltin: (name: string) => OpDefNode;
|
|
65
|
-
// Errors.addMessage for an error SANY recovers from, and the null node SANY returns after one.
|
|
66
60
|
addError: (location: SanyLocation, text: string) => OpApplNode;
|
|
67
|
-
// Generator.illegalLabelRef and illegalAPPosRef: whether the node being generated lies outside
|
|
68
|
-
// the scope of a declaration that a label or a clause of an ASSUME/PROVE lies in.
|
|
69
61
|
isOutOfLabelScope: (label: LabelNode) => boolean;
|
|
70
62
|
isOutOfClauseScope: (assumeProve: AssumeProveNode, position: number) => boolean;
|
|
71
63
|
}
|
|
@@ -80,8 +72,8 @@ const PROOF_STEP_OPERATORS = new Map([
|
|
|
80
72
|
["$Suffices", "SUFFICES"],
|
|
81
73
|
]);
|
|
82
74
|
|
|
83
|
-
|
|
84
|
-
|
|
75
|
+
const getNameParts = (name: string): string[] => {
|
|
76
|
+
if (name.length > 3 && name.endsWith("!!!")) return [...getNameParts(name.slice(0, -3)), "!!"];
|
|
85
77
|
const parts = name.split("!");
|
|
86
78
|
return parts.some((part) => part.length === 0) ? [name] : parts;
|
|
87
79
|
};
|
|
@@ -94,11 +86,11 @@ export const getSelectorItems = (expression: Expression): SelectorItem[] | undef
|
|
|
94
86
|
const parts = getNameParts(expression.operator);
|
|
95
87
|
const counts =
|
|
96
88
|
expression.argumentCounts ??
|
|
97
|
-
parts.map((
|
|
98
|
-
|
|
89
|
+
parts.map((_part, index) => (index === parts.length - 1 ? expression.args.length : 0));
|
|
90
|
+
let cursor = 0;
|
|
99
91
|
return parts.map((name, index) => {
|
|
100
|
-
const args = expression.args.slice(cursor
|
|
101
|
-
cursor
|
|
92
|
+
const args = expression.args.slice(cursor, cursor + counts[index]);
|
|
93
|
+
cursor += counts[index];
|
|
102
94
|
return { op: "Name", name, args: args.length > 0 ? args : undefined };
|
|
103
95
|
});
|
|
104
96
|
}
|
|
@@ -125,29 +117,23 @@ export const getSelectorItems = (expression: Expression): SelectorItem[] | undef
|
|
|
125
117
|
return undefined;
|
|
126
118
|
};
|
|
127
119
|
|
|
128
|
-
// A selector SANY parses as a GeneralId rather than an OpApplication: one whose last part is not a
|
|
129
|
-
// name with arguments.
|
|
130
120
|
export const isGeneralId = (items: SelectorItem[]) => {
|
|
131
121
|
const last = items[items.length - 1];
|
|
132
122
|
return last.op !== "Name" || last.args === undefined;
|
|
133
123
|
};
|
|
134
124
|
|
|
135
|
-
// SANY's selectorItemToString, which names an operand selector after the argument it selects.
|
|
136
125
|
const getSelectorItemName = (item: SelectorItem) =>
|
|
137
126
|
typeof item.op === "number" ? `argument selector ${item.name}` : item.name;
|
|
138
127
|
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
if (
|
|
143
|
-
if (op === "<<") return arity > 0 ? 1 : -1;
|
|
144
|
-
if (op === ">>") return arity === 2 ? 2 : -1;
|
|
128
|
+
const getArgNumber = (selector: SelectorOp, arity: number) => {
|
|
129
|
+
if (typeof selector === "number") return selector > 0 && selector <= arity ? selector : -1;
|
|
130
|
+
if (selector === "<<") return arity > 0 ? 1 : -1;
|
|
131
|
+
if (selector === ">>") return arity === 2 ? 2 : -1;
|
|
145
132
|
return -1;
|
|
146
133
|
};
|
|
147
134
|
|
|
148
135
|
type Mode = "FindingOpName" | "FollowingLabels" | "FindingSubExpr";
|
|
149
136
|
|
|
150
|
-
// The state of Generator.selectorToNode as it walks the items.
|
|
151
137
|
interface SelectorWalk {
|
|
152
138
|
name: string | undefined;
|
|
153
139
|
nameLocation: SanyLocation | undefined;
|
|
@@ -176,13 +162,9 @@ const isSymbol = (node: LevelNode | SymbolNode): node is SymbolNode =>
|
|
|
176
162
|
const getQuantifierSymbols = (node: OpApplNode) =>
|
|
177
163
|
(node.bounded?.length ?? 0) > 0 ? (node.bounded ?? []).flat() : (node.unbounded ?? []);
|
|
178
164
|
|
|
179
|
-
// Generator.extendedBy: a name's location grown to the end of its next part.
|
|
180
165
|
const extendLocation = (name: SanyLocation | undefined, part: SanyLocation): SanyLocation =>
|
|
181
166
|
name === undefined ? part : { ...name, endLine: part.endLine, endColumn: part.endColumn };
|
|
182
167
|
|
|
183
|
-
// selectorToNode: with expectedArity 0 the expression a selector names, with a positive one the
|
|
184
|
-
// operator argument, and with -1 the definition a DEF clause names. A fact can also be an
|
|
185
|
-
// ASSUME/PROVE, a NEW clause or a module instance.
|
|
186
168
|
export const createSelectorResolver =
|
|
187
169
|
(generator: SelectorGenerator) =>
|
|
188
170
|
(
|
|
@@ -195,7 +177,6 @@ export const createSelectorResolver =
|
|
|
195
177
|
const substInPrefix: SubstInNode[] = [];
|
|
196
178
|
const params: FormalParamNode[] = [];
|
|
197
179
|
const allArgs: ExprOrOpArgNode[] = [];
|
|
198
|
-
const getItemLocation = (itemIndex: number) => items[itemIndex].location ?? location;
|
|
199
180
|
const walk: SelectorWalk = {
|
|
200
181
|
name: undefined,
|
|
201
182
|
nameLocation: undefined,
|
|
@@ -208,6 +189,7 @@ export const createSelectorResolver =
|
|
|
208
189
|
definitionArgs: [],
|
|
209
190
|
isInSuffices: false,
|
|
210
191
|
};
|
|
192
|
+
const getItemLocation = () => items[walk.index].location ?? location;
|
|
211
193
|
const getArgs = (item: SelectorItem) => item.args ?? [];
|
|
212
194
|
|
|
213
195
|
while (walk.index < items.length) {
|
|
@@ -217,7 +199,7 @@ export const createSelectorResolver =
|
|
|
217
199
|
item.args !== undefined
|
|
218
200
|
) {
|
|
219
201
|
return generator.addError(
|
|
220
|
-
getItemLocation(
|
|
202
|
+
getItemLocation(),
|
|
221
203
|
`Selector \`${item.name}' should not have argument(s).`,
|
|
222
204
|
);
|
|
223
205
|
}
|
|
@@ -236,7 +218,7 @@ export const createSelectorResolver =
|
|
|
236
218
|
: undefined;
|
|
237
219
|
if (walk.name === undefined && current.op !== "Name") {
|
|
238
220
|
return generator.addError(
|
|
239
|
-
getItemLocation(
|
|
221
|
+
getItemLocation(),
|
|
240
222
|
`Need name or step number here, not \`${current.name}'.`,
|
|
241
223
|
);
|
|
242
224
|
}
|
|
@@ -249,19 +231,17 @@ export const createSelectorResolver =
|
|
|
249
231
|
if (symbol === undefined) {
|
|
250
232
|
if (newName !== undefined) {
|
|
251
233
|
walk.name = newName;
|
|
252
|
-
walk.nameLocation = extendLocation(walk.nameLocation, getItemLocation(
|
|
234
|
+
walk.nameLocation = extendLocation(walk.nameLocation, getItemLocation());
|
|
253
235
|
}
|
|
254
236
|
collectedArgs.push(...getArgs(current));
|
|
255
237
|
walk.index++;
|
|
256
238
|
}
|
|
257
239
|
}
|
|
258
|
-
// TLC 1.7.4's SANY names only the last item of a selector it can't resolve, as
|
|
259
|
-
// selectorItemToString does, which fails on an argument selector that isn't a number.
|
|
260
240
|
if (symbol === undefined && generator.version === "1.7.4") {
|
|
261
|
-
const
|
|
241
|
+
const lastIndex = items.length - 1;
|
|
262
242
|
return generator.addError(
|
|
263
|
-
|
|
264
|
-
`Unknown operator: \`${getSelectorItemName(items[
|
|
243
|
+
items[lastIndex].location ?? location,
|
|
244
|
+
`Unknown operator: \`${getSelectorItemName(items[lastIndex])}'.`,
|
|
265
245
|
);
|
|
266
246
|
}
|
|
267
247
|
if (symbol === undefined) {
|
|
@@ -272,16 +252,16 @@ export const createSelectorResolver =
|
|
|
272
252
|
}
|
|
273
253
|
if (symbol.kind === "Module") {
|
|
274
254
|
return generator.addError(
|
|
275
|
-
getItemLocation(
|
|
255
|
+
getItemLocation(),
|
|
276
256
|
`Module name (${items[walk.index].name}) not allowed here.`,
|
|
277
257
|
);
|
|
278
258
|
}
|
|
279
259
|
walk.node = symbol;
|
|
280
|
-
walk.nameLocation = extendLocation(walk.nameLocation, getItemLocation(
|
|
260
|
+
walk.nameLocation = extendLocation(walk.nameLocation, getItemLocation());
|
|
281
261
|
walk.name = newName;
|
|
282
262
|
if (isDeclarationLike(symbol) && items.length !== 1) {
|
|
283
263
|
return generator.addError(
|
|
284
|
-
getItemLocation(
|
|
264
|
+
getItemLocation(),
|
|
285
265
|
`Cannot take subexpression of \`${walk.name}'.`,
|
|
286
266
|
);
|
|
287
267
|
}
|
|
@@ -300,7 +280,7 @@ export const createSelectorResolver =
|
|
|
300
280
|
symbol,
|
|
301
281
|
argumentIndex + walk.definitionArityFound,
|
|
302
282
|
argument,
|
|
303
|
-
getItemLocation(
|
|
283
|
+
getItemLocation(),
|
|
304
284
|
),
|
|
305
285
|
),
|
|
306
286
|
);
|
|
@@ -309,7 +289,7 @@ export const createSelectorResolver =
|
|
|
309
289
|
if (symbol.kind === "OpDef" && symbol.defKind === "ModuleInstance") {
|
|
310
290
|
if (walk.index === items.length - 1 && !(isDef || isFact)) {
|
|
311
291
|
return generator.addError(
|
|
312
|
-
getItemLocation(
|
|
292
|
+
getItemLocation(),
|
|
313
293
|
`Operator name ${walk.name} is incomplete.`,
|
|
314
294
|
);
|
|
315
295
|
}
|
|
@@ -326,7 +306,7 @@ export const createSelectorResolver =
|
|
|
326
306
|
items.length !== 1
|
|
327
307
|
) {
|
|
328
308
|
return generator.addError(
|
|
329
|
-
getItemLocation(
|
|
309
|
+
getItemLocation(),
|
|
330
310
|
`Subexpression of \`${walk.name}' used inside the operator's definition.`,
|
|
331
311
|
);
|
|
332
312
|
}
|
|
@@ -361,21 +341,18 @@ export const createSelectorResolver =
|
|
|
361
341
|
? owner.labels.get(item.name)
|
|
362
342
|
: undefined;
|
|
363
343
|
if (label === undefined)
|
|
364
|
-
return generator.addError(
|
|
365
|
-
getItemLocation(walk.index),
|
|
366
|
-
`Cannot find label \`${item.name}'.`,
|
|
367
|
-
);
|
|
344
|
+
return generator.addError(getItemLocation(), `Cannot find label \`${item.name}'.`);
|
|
368
345
|
walk.node = label;
|
|
369
346
|
if (generator.isOutOfLabelScope(label)) {
|
|
370
347
|
return generator.addError(
|
|
371
|
-
getItemLocation(
|
|
348
|
+
getItemLocation(),
|
|
372
349
|
`Accessing subexpression labeled \`${item.name}' of ASSUME/PROVE clause within the scope of a declaration\n from outside that declaration's scope.`,
|
|
373
350
|
);
|
|
374
351
|
}
|
|
375
352
|
if (expectedArity === 0) {
|
|
376
353
|
if (label.params.length !== getArgs(item).length) {
|
|
377
354
|
return generator.addError(
|
|
378
|
-
getItemLocation(
|
|
355
|
+
getItemLocation(),
|
|
379
356
|
`Label \`${item.name}' used with wrong number of arguments.`,
|
|
380
357
|
);
|
|
381
358
|
}
|
|
@@ -392,7 +369,7 @@ export const createSelectorResolver =
|
|
|
392
369
|
const node = walk.node;
|
|
393
370
|
const addNonexistentError = () =>
|
|
394
371
|
generator.addError(
|
|
395
|
-
getItemLocation(
|
|
372
|
+
getItemLocation(),
|
|
396
373
|
`Nonexistent operand specified by \`${getSelectorItemName(item)}'.`,
|
|
397
374
|
);
|
|
398
375
|
if (item.op === ":") {
|
|
@@ -402,19 +379,19 @@ export const createSelectorResolver =
|
|
|
402
379
|
(walk.index < items.length - 1 && items[walk.index + 1].op === "Name"));
|
|
403
380
|
if (!isAllowed) {
|
|
404
381
|
return generator.addError(
|
|
405
|
-
getItemLocation(
|
|
382
|
+
getItemLocation(),
|
|
406
383
|
"`!:' can be used only after a name and either at the end after an\noperator name or before an operator name.",
|
|
407
384
|
);
|
|
408
385
|
}
|
|
409
|
-
} else if (node === undefined) {
|
|
386
|
+
} else if (node === undefined || isAbsent(node)) {
|
|
410
387
|
return generator.addError(
|
|
411
|
-
getItemLocation(
|
|
388
|
+
getItemLocation(),
|
|
412
389
|
"Subexpression selection failed, probably due to an error in the selected expression.",
|
|
413
390
|
);
|
|
414
391
|
} else if (node.kind === "LetIn") {
|
|
415
392
|
if (getArgNumber(item.op, 1) !== 1)
|
|
416
393
|
return generator.addError(
|
|
417
|
-
getItemLocation(
|
|
394
|
+
getItemLocation(),
|
|
418
395
|
"A LET/IN expression has only one operand.",
|
|
419
396
|
);
|
|
420
397
|
walk.node = node.body;
|
|
@@ -427,7 +404,7 @@ export const createSelectorResolver =
|
|
|
427
404
|
(operator.kind === "OpDef" && operator.defKind === "UserDefined");
|
|
428
405
|
const addNotPairError = () =>
|
|
429
406
|
generator.addError(
|
|
430
|
-
getItemLocation(
|
|
407
|
+
getItemLocation(),
|
|
431
408
|
"Internal error: Expecting $Pair and didn't find it.",
|
|
432
409
|
);
|
|
433
410
|
const isPair = (pair: ExprOrOpArgNode | undefined): pair is OpApplNode =>
|
|
@@ -437,7 +414,11 @@ export const createSelectorResolver =
|
|
|
437
414
|
const number = getArgNumber(item.op, operator.arity);
|
|
438
415
|
if (number === -1) return addNonexistentError();
|
|
439
416
|
walk.node = operands[number - 1];
|
|
440
|
-
} else if (
|
|
417
|
+
} else if (
|
|
418
|
+
operator.kind === "OpDef" &&
|
|
419
|
+
operator.defKind === "BuiltIn" &&
|
|
420
|
+
node.nullKind !== "null"
|
|
421
|
+
) {
|
|
441
422
|
if (operator.name === "$RcdConstructor" || operator.name === "$SetOfRcds") {
|
|
442
423
|
if (operandNumber === -1) return addNonexistentError();
|
|
443
424
|
const pair = operands[operandNumber - 1];
|
|
@@ -446,7 +427,7 @@ export const createSelectorResolver =
|
|
|
446
427
|
} else if (operator.name === "$Case") {
|
|
447
428
|
if (walk.index === items.length - 1) {
|
|
448
429
|
return generator.addError(
|
|
449
|
-
getItemLocation(
|
|
430
|
+
getItemLocation(),
|
|
450
431
|
"Subexpression of CASE must have form !i!j.",
|
|
451
432
|
);
|
|
452
433
|
}
|
|
@@ -457,20 +438,20 @@ export const createSelectorResolver =
|
|
|
457
438
|
const number = getArgNumber(items[walk.index].op, 2);
|
|
458
439
|
if (number === -1) {
|
|
459
440
|
return generator.addError(
|
|
460
|
-
getItemLocation(
|
|
441
|
+
getItemLocation(),
|
|
461
442
|
"Second selector for CASE subexpression must specify one of two operands.",
|
|
462
443
|
);
|
|
463
444
|
}
|
|
464
445
|
walk.node = pair.operands[number - 1];
|
|
465
|
-
if (walk.node === undefined)
|
|
446
|
+
if (walk.node === undefined || isAbsent(walk.node))
|
|
466
447
|
return generator.addError(
|
|
467
|
-
getItemLocation(
|
|
448
|
+
getItemLocation(),
|
|
468
449
|
"Selecting OTHER in a CASE statement.",
|
|
469
450
|
);
|
|
470
451
|
} else if (operator.name === "$Except") {
|
|
471
452
|
if (operandNumber > 1) {
|
|
472
453
|
return generator.addError(
|
|
473
|
-
getItemLocation(
|
|
454
|
+
getItemLocation(),
|
|
474
455
|
"Selecting subexpression of an EXCEPT not yet implemented.",
|
|
475
456
|
);
|
|
476
457
|
}
|
|
@@ -485,7 +466,7 @@ export const createSelectorResolver =
|
|
|
485
466
|
if (item.op === "Null") {
|
|
486
467
|
if (getArgs(item).length !== symbols.length) {
|
|
487
468
|
return generator.addError(
|
|
488
|
-
getItemLocation(
|
|
469
|
+
getItemLocation(),
|
|
489
470
|
`Selector with ${getArgs(item).length} argument(s) used for quantifier with ${symbols.length} bound identifier(s).`,
|
|
490
471
|
);
|
|
491
472
|
}
|
|
@@ -499,15 +480,15 @@ export const createSelectorResolver =
|
|
|
499
480
|
}
|
|
500
481
|
} else {
|
|
501
482
|
return generator.addError(
|
|
502
|
-
getItemLocation(
|
|
503
|
-
`Choosing operand \`${item
|
|
483
|
+
getItemLocation(),
|
|
484
|
+
`Choosing operand \`${getSelectorItemName(item)}' of subexpression with no operands.`,
|
|
504
485
|
);
|
|
505
486
|
}
|
|
506
487
|
} else if (node.kind === "AssumeProve") {
|
|
507
488
|
if (node.isSuffices && !walk.isInSuffices) {
|
|
508
489
|
if (getArgNumber(item.op, 1) !== 1) {
|
|
509
490
|
return generator.addError(
|
|
510
|
-
getItemLocation(
|
|
491
|
+
getItemLocation(),
|
|
511
492
|
"Accessing non-existent subexpression of a SUFFICES",
|
|
512
493
|
);
|
|
513
494
|
}
|
|
@@ -518,7 +499,7 @@ export const createSelectorResolver =
|
|
|
518
499
|
if (number === -1) return addNonexistentError();
|
|
519
500
|
if (generator.isOutOfClauseScope(node, number)) {
|
|
520
501
|
return generator.addError(
|
|
521
|
-
getItemLocation(
|
|
502
|
+
getItemLocation(),
|
|
522
503
|
"Accessing ASSUME/PROVE clause within the scope of a declaration\n from outside that declaration's scope.",
|
|
523
504
|
);
|
|
524
505
|
}
|
|
@@ -526,7 +507,7 @@ export const createSelectorResolver =
|
|
|
526
507
|
walk.node = node.assumptions[number - 1];
|
|
527
508
|
if (walk.node.kind === "NewSymb" && walk.index !== items.length - 1) {
|
|
528
509
|
return generator.addError(
|
|
529
|
-
getItemLocation(
|
|
510
|
+
getItemLocation(),
|
|
530
511
|
"Selected a subexpression of a NEW clause of an ASSUME.",
|
|
531
512
|
);
|
|
532
513
|
}
|
|
@@ -536,20 +517,20 @@ export const createSelectorResolver =
|
|
|
536
517
|
const lambda = node.op;
|
|
537
518
|
if (lambda.kind !== "OpDef" || lambda.name !== "LAMBDA") {
|
|
538
519
|
return generator.addError(
|
|
539
|
-
getItemLocation(
|
|
520
|
+
getItemLocation(),
|
|
540
521
|
"Trying to select subexpression of an operator argument.",
|
|
541
522
|
);
|
|
542
523
|
}
|
|
543
524
|
if (item.op !== "Null" && item.op !== "@") {
|
|
544
525
|
return generator.addError(
|
|
545
|
-
getItemLocation(
|
|
526
|
+
getItemLocation(),
|
|
546
527
|
`Cannot use !${item.name} to select subexpression of a LAMBDA.`,
|
|
547
528
|
);
|
|
548
529
|
}
|
|
549
530
|
if (item.op === "Null") {
|
|
550
531
|
if (lambda.arity !== getArgs(item).length) {
|
|
551
532
|
return generator.addError(
|
|
552
|
-
getItemLocation(
|
|
533
|
+
getItemLocation(),
|
|
553
534
|
`Selector with ${getArgs(item).length} arguments used for LAMBDA expression taking ${lambda.arity} arguments.`,
|
|
554
535
|
);
|
|
555
536
|
}
|
|
@@ -562,14 +543,14 @@ export const createSelectorResolver =
|
|
|
562
543
|
walk.index--;
|
|
563
544
|
} else {
|
|
564
545
|
return generator.addError(
|
|
565
|
-
getItemLocation(
|
|
546
|
+
getItemLocation(),
|
|
566
547
|
"Selecting subexpression of expression that has none.",
|
|
567
548
|
);
|
|
568
549
|
}
|
|
569
|
-
if (walk.node === undefined)
|
|
550
|
+
if (walk.node === undefined || isAbsent(walk.node))
|
|
570
551
|
return generator.addError(
|
|
571
|
-
getItemLocation(
|
|
572
|
-
`An unexpected null node specified by '${item
|
|
552
|
+
getItemLocation(),
|
|
553
|
+
`An unexpected null node specified by '${getSelectorItemName(item)}'.\nThis is probably due to a previous error.`,
|
|
573
554
|
);
|
|
574
555
|
if (walk.index !== items.length - 1) {
|
|
575
556
|
const next = items[walk.index + 1];
|
|
@@ -577,7 +558,7 @@ export const createSelectorResolver =
|
|
|
577
558
|
while (walk.node?.kind === "Label") walk.node = walk.node.body;
|
|
578
559
|
if (walk.node?.kind !== "LetIn") {
|
|
579
560
|
return generator.addError(
|
|
580
|
-
getItemLocation(
|
|
561
|
+
getItemLocation(),
|
|
581
562
|
"A name selector here must be from a LET clause.",
|
|
582
563
|
);
|
|
583
564
|
}
|
|
@@ -585,7 +566,7 @@ export const createSelectorResolver =
|
|
|
585
566
|
walk.mode = "FindingOpName";
|
|
586
567
|
} else if (next.op === ":") {
|
|
587
568
|
return generator.addError(
|
|
588
|
-
getItemLocation(
|
|
569
|
+
getItemLocation(),
|
|
589
570
|
"!: should not follow an operand selector.",
|
|
590
571
|
);
|
|
591
572
|
}
|
|
@@ -674,7 +655,7 @@ export const createSelectorResolver =
|
|
|
674
655
|
if (params.length + substInPrefix.length > 0) {
|
|
675
656
|
const operator = current.op;
|
|
676
657
|
params.push(
|
|
677
|
-
...Array.from({ length: getSymbolArity(operator) }, (
|
|
658
|
+
...Array.from({ length: getSymbolArity(operator) }, (_element, paramIndex) =>
|
|
678
659
|
generator.createFormalParam(`NewParam${paramIndex}`, 0, undefined),
|
|
679
660
|
),
|
|
680
661
|
);
|
|
@@ -682,10 +663,7 @@ export const createSelectorResolver =
|
|
|
682
663
|
}
|
|
683
664
|
}
|
|
684
665
|
if (!isFact) {
|
|
685
|
-
|
|
686
|
-
(current.kind === "ThmOrAssumpDef" && current.body.kind === "AssumeProve") ||
|
|
687
|
-
(current.kind === "Label" && current.isAssumeProve);
|
|
688
|
-
if (isAssumeProve)
|
|
666
|
+
if (current.kind === "ThmOrAssumpDef" && current.body.kind === "AssumeProve")
|
|
689
667
|
return generator.addError(location, "ASSUME/PROVE used where an expression is required.");
|
|
690
668
|
if (current.kind === "ThmOrAssumpDef" && current.body.kind === "OpAppl") {
|
|
691
669
|
const step = PROOF_STEP_OPERATORS.get(current.body.operator.name);
|
package/src/sany/source.ts
CHANGED
|
@@ -5,8 +5,6 @@ import { getTabStop } from "./lexer";
|
|
|
5
5
|
import { getSanyParseError } from "./parse-error";
|
|
6
6
|
import type { SanyLocation } from "./nodes";
|
|
7
7
|
|
|
8
|
-
// The tokens of one file, to find the locations SANY gives to names, brackets and parentheses that
|
|
9
|
-
// the syntax tree of tla-ts leaves out, and the comments SANY attaches to definitions.
|
|
10
8
|
export interface SourceFile {
|
|
11
9
|
name: string;
|
|
12
10
|
source: string;
|
|
@@ -48,7 +46,6 @@ export const isToken = (file: SourceFile, index: number, text: string) =>
|
|
|
48
46
|
file.tokens[index].text === text &&
|
|
49
47
|
file.tokens[index].kind !== "String";
|
|
50
48
|
|
|
51
|
-
// The number of tokens, in source order, before a position, or at or before it when isAtCounted.
|
|
52
49
|
const countTokensBefore = (file: SourceFile, position: SourceLocation, isAtCounted: boolean) => {
|
|
53
50
|
let low = 0;
|
|
54
51
|
let high = file.tokens.length;
|
|
@@ -65,12 +62,10 @@ const countTokensBefore = (file: SourceFile, position: SourceLocation, isAtCount
|
|
|
65
62
|
return low;
|
|
66
63
|
};
|
|
67
64
|
|
|
68
|
-
// The index of the first token at or after a position.
|
|
69
65
|
export const getTokenIndex = (file: SourceFile, position: SourceLocation) =>
|
|
70
66
|
file.tokenIndexes.get(getPositionKey(position.line, position.column)) ??
|
|
71
67
|
Math.min(countTokensBefore(file, position, false), file.tokens.length - 1);
|
|
72
68
|
|
|
73
|
-
// The index of the last token at or before a position.
|
|
74
69
|
const getEndTokenIndex = (file: SourceFile, position: SourceLocation) =>
|
|
75
70
|
Math.max(countTokensBefore(file, position, true) - 1, 0);
|
|
76
71
|
|
|
@@ -99,8 +94,6 @@ export const getRangeSpan = (file: SourceFile, range: SourceRange): TokenSpan =>
|
|
|
99
94
|
end: getEndTokenIndex(file, range.end),
|
|
100
95
|
});
|
|
101
96
|
|
|
102
|
-
// The tokens of an expression. Some nodes, such as a tuple in a subscript, have no range, so their
|
|
103
|
-
// span runs from their first token to the bracket that closes it.
|
|
104
97
|
export const getExpressionSpan = (file: SourceFile, expression: Expression): TokenSpan => {
|
|
105
98
|
const range = expression.location.range;
|
|
106
99
|
if (range) return getRangeSpan(file, range);
|
|
@@ -108,8 +101,6 @@ export const getExpressionSpan = (file: SourceFile, expression: Expression): Tok
|
|
|
108
101
|
return { start, end: getMatchingIndex(file, start) };
|
|
109
102
|
};
|
|
110
103
|
|
|
111
|
-
// The span with the parentheses around it, as SANY locates a parenthesized operand by its
|
|
112
|
-
// parentheses.
|
|
113
104
|
export const getParenthesizedSpan = (file: SourceFile, span: TokenSpan): TokenSpan => {
|
|
114
105
|
const start = span.start - 1;
|
|
115
106
|
const end = span.end + 1;
|
|
@@ -123,8 +114,6 @@ export const getParenthesizedSpan = (file: SourceFile, span: TokenSpan): TokenSp
|
|
|
123
114
|
return span;
|
|
124
115
|
};
|
|
125
116
|
|
|
126
|
-
// SANY's parser keeps the parentheses around an argument of an operator, which the span of the
|
|
127
|
-
// argument's expression leaves out. Those of the operator's own arguments follow its name.
|
|
128
117
|
export const getArgumentSpan = (file: SourceFile, span: TokenSpan): TokenSpan => {
|
|
129
118
|
const start = span.start - 1;
|
|
130
119
|
const end = span.end + 1;
|
|
@@ -157,14 +146,12 @@ const getOffset = (file: SourceFile, line: number, column: number) => {
|
|
|
157
146
|
return offset;
|
|
158
147
|
};
|
|
159
148
|
|
|
160
|
-
// The token as the source spells it, where the token's text is the name of the operator.
|
|
161
149
|
export const getTokenSource = (file: SourceFile, index: number) => {
|
|
162
150
|
const token = file.tokens[index];
|
|
163
151
|
const start = getOffset(file, token.line, token.column);
|
|
164
152
|
return file.source.slice(start, getOffset(file, token.line, token.endColumn) + 1);
|
|
165
153
|
};
|
|
166
154
|
|
|
167
|
-
// SANY lexes []ASSUME and []PROVE as single tokens.
|
|
168
155
|
export const isBoxToken = (file: SourceFile, index: number) => {
|
|
169
156
|
const box = file.tokens[index];
|
|
170
157
|
const next = file.tokens[index + 1];
|
|
@@ -179,8 +166,7 @@ export const isBoxToken = (file: SourceFile, index: number) => {
|
|
|
179
166
|
};
|
|
180
167
|
|
|
181
168
|
// HACK: the tla-ts parser has no []ASSUME or []PROVE, so it parses the source with each such []
|
|
182
|
-
// blanked out, which keeps every other token where it was.
|
|
183
|
-
// ASSUME/PROVE, which unboxing hides.
|
|
169
|
+
// blanked out, which keeps every other token where it was.
|
|
184
170
|
export const getUnboxedSource = (source: string) => {
|
|
185
171
|
const file = createSourceFile("", source);
|
|
186
172
|
const unboxed = file.tokens.reduce((text, token, index) => {
|
|
@@ -194,7 +180,6 @@ export const getUnboxedSource = (source: string) => {
|
|
|
194
180
|
return unboxed;
|
|
195
181
|
};
|
|
196
182
|
|
|
197
|
-
// The comments between a token and the one before it, which SANY's parser attaches to the token.
|
|
198
183
|
export const getPreComments = (file: SourceFile, index: number) => {
|
|
199
184
|
const previous = file.tokens[index - 1];
|
|
200
185
|
const token = file.tokens[index];
|
|
@@ -209,7 +194,6 @@ export const getPreComments = (file: SourceFile, index: number) => {
|
|
|
209
194
|
comments.push(gap.slice(offset, end));
|
|
210
195
|
offset = end;
|
|
211
196
|
} else if (gap.startsWith("(*", offset)) {
|
|
212
|
-
// SANY's lexer ends a comment token at each (* and *) nested in a block comment.
|
|
213
197
|
let depth = 1;
|
|
214
198
|
let segmentStart = offset;
|
|
215
199
|
let end = offset + 2;
|