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/levels.ts
CHANGED
|
@@ -1,9 +1,11 @@
|
|
|
1
1
|
import {
|
|
2
2
|
getChildren,
|
|
3
3
|
type AssumeProve,
|
|
4
|
+
type Bound,
|
|
4
5
|
type Definition,
|
|
5
6
|
type Expression,
|
|
6
7
|
type Module,
|
|
8
|
+
type NewSymbol,
|
|
7
9
|
type OperatorParam,
|
|
8
10
|
type Proof,
|
|
9
11
|
type ProofStep,
|
|
@@ -16,8 +18,9 @@ import {
|
|
|
16
18
|
TlaSyntaxError,
|
|
17
19
|
type SanyError,
|
|
18
20
|
} from "./errors";
|
|
19
|
-
import {
|
|
21
|
+
import { forEachChild } from "./instances";
|
|
20
22
|
import { collectSemanticErrors, getBoundNames, getPatternNames } from "./resolve";
|
|
23
|
+
import { resolveSynonym } from "./tlc/jar-data";
|
|
21
24
|
import { STANDARD_LEVELS } from "./standard-definitions";
|
|
22
25
|
|
|
23
26
|
interface LevelData {
|
|
@@ -46,7 +49,7 @@ interface LevelContext {
|
|
|
46
49
|
}
|
|
47
50
|
|
|
48
51
|
type ScopeEntry =
|
|
49
|
-
| { kind: "Formal"; arity: number }
|
|
52
|
+
| { kind: "Formal"; arity: number; level: number }
|
|
50
53
|
| { kind: "Let"; definition: Definition; scope: Scope };
|
|
51
54
|
|
|
52
55
|
export type Scope = Map<string, ScopeEntry>;
|
|
@@ -55,18 +58,24 @@ type Resolved =
|
|
|
55
58
|
| { kind: "Declared"; name: string; level: number; arity: number }
|
|
56
59
|
| { kind: "Defined"; levels: OperatorLevels };
|
|
57
60
|
|
|
58
|
-
|
|
59
|
-
data: LevelData
|
|
60
|
-
|
|
61
|
-
declared
|
|
62
|
-
}
|
|
61
|
+
type Operand =
|
|
62
|
+
| { kind: "Value"; data: LevelData }
|
|
63
|
+
| { kind: "Operator"; data: OperatorLevels }
|
|
64
|
+
| { kind: "Declared"; data: LevelData; declared: OperatorParam };
|
|
63
65
|
|
|
64
|
-
// The levels of tla2sany.semantic.LevelConstants.
|
|
65
66
|
export const CONSTANT_LEVEL = 0;
|
|
66
67
|
export const VARIABLE_LEVEL = 1;
|
|
67
68
|
export const ACTION_LEVEL = 2;
|
|
68
69
|
export const TEMPORAL_LEVEL = 3;
|
|
69
70
|
|
|
71
|
+
const NEW_SYMBOL_LEVELS = {
|
|
72
|
+
Constant: CONSTANT_LEVEL,
|
|
73
|
+
Variable: VARIABLE_LEVEL,
|
|
74
|
+
State: VARIABLE_LEVEL,
|
|
75
|
+
Action: ACTION_LEVEL,
|
|
76
|
+
Temporal: TEMPORAL_LEVEL,
|
|
77
|
+
} satisfies Record<NewSymbol["level"], number>;
|
|
78
|
+
|
|
70
79
|
const SEPARATOR = "\u0000";
|
|
71
80
|
|
|
72
81
|
export const getArgumentKey = (operator: string, index: number) =>
|
|
@@ -97,6 +106,12 @@ export const putConstraint = (constraints: Map<string, number>, name: string, le
|
|
|
97
106
|
export const putArgConstraint = (constraints: Map<string, number>, key: string, level: number) =>
|
|
98
107
|
constraints.set(key, Math.max(level, constraints.get(key) ?? 0));
|
|
99
108
|
|
|
109
|
+
const mergeConstraints = (data: LevelData, part: LevelData) => {
|
|
110
|
+
part.constraints.forEach((value, key) => putConstraint(data.constraints, key, value));
|
|
111
|
+
part.argConstraints.forEach((value, key) => putArgConstraint(data.argConstraints, key, value));
|
|
112
|
+
part.argParams.forEach((key) => data.argParams.add(key));
|
|
113
|
+
};
|
|
114
|
+
|
|
100
115
|
const createSignature = (
|
|
101
116
|
name: string,
|
|
102
117
|
level: number,
|
|
@@ -150,27 +165,50 @@ const CORE_SIGNATURES = new Map(
|
|
|
150
165
|
["BOOLEAN", 0, [], []],
|
|
151
166
|
["STRING", 0, [], []],
|
|
152
167
|
] as const
|
|
153
|
-
).map((
|
|
154
|
-
|
|
168
|
+
).map((signature): [string, OperatorLevels] => [
|
|
169
|
+
signature[0],
|
|
155
170
|
{
|
|
156
|
-
...createSignature(
|
|
157
|
-
nonLeibniz: new Set(
|
|
171
|
+
...createSignature(signature[0], signature[1], [...signature[2]], [...signature[3]]),
|
|
172
|
+
nonLeibniz: new Set(signature[1] > 1 ? [0, 1] : []),
|
|
158
173
|
},
|
|
159
174
|
]),
|
|
160
175
|
);
|
|
161
176
|
|
|
162
|
-
const SET_LEVELS = createSignature("$Set", 0, [2], [1]);
|
|
163
|
-
const JUNCTION_LEVELS = createSignature("$Junction", 0, [3], [1]);
|
|
164
|
-
const CHOOSE_LEVELS = createSignature("$Choose", 0, [2], [1]);
|
|
165
|
-
const FUNCTION_LEVELS = createSignature("$Function", 0, [3], [1]);
|
|
166
|
-
const APPLY_LEVELS = createSignature("$FcnApply", 0, [2, 2], [1, 1]);
|
|
167
|
-
const SELECT_LEVELS = createSignature("$RcdSelect", 0, [2, 0], [1, 1]);
|
|
168
177
|
const PRIME_LEVELS = createSignature("'", 2, [1], [0]);
|
|
178
|
+
const UNCHANGED_LEVELS = createSignature("UNCHANGED", 2, [1], [0]);
|
|
169
179
|
const ENABLED_LEVELS = createSignature("ENABLED", 1, [2], [0]);
|
|
170
|
-
const
|
|
171
|
-
const
|
|
172
|
-
const
|
|
173
|
-
const
|
|
180
|
+
const ALWAYS_LEVELS = createSignature("[]", 3, [3], [0]);
|
|
181
|
+
const EVENTUALLY_LEVELS = createSignature("<>", 3, [3], [0]);
|
|
182
|
+
const AND_LEVELS = createSignature("$ConjList", 0, [3], [1]);
|
|
183
|
+
const OR_LEVELS = createSignature("$DisjList", 0, [3], [1]);
|
|
184
|
+
const IF_LEVELS = createSignature("$IfThenElse", 0, [3], [1]);
|
|
185
|
+
const CASE_LEVELS = createSignature("$Case", 0, [3], [1]);
|
|
186
|
+
const FORALL_LEVELS = createSignature("$BoundedForall", 0, [3], [1]);
|
|
187
|
+
const EXISTS_LEVELS = createSignature("$BoundedExists", 0, [3], [1]);
|
|
188
|
+
const UNBOUNDED_FORALL_LEVELS = createSignature("$UnboundedForall", 0, [3], [1]);
|
|
189
|
+
const UNBOUNDED_EXISTS_LEVELS = createSignature("$UnboundedExists", 0, [3], [1]);
|
|
190
|
+
const TEMPORAL_FORALL_LEVELS = createSignature("$TemporalForall", 3, [3], [0]);
|
|
191
|
+
const TEMPORAL_EXISTS_LEVELS = createSignature("$TemporalExists", 3, [3], [0]);
|
|
192
|
+
const BOUNDED_CHOOSE_LEVELS = createSignature("$BoundedChoose", 0, [2], [1]);
|
|
193
|
+
const UNBOUNDED_CHOOSE_LEVELS = createSignature("$UnboundedChoose", 0, [2], [1]);
|
|
194
|
+
const SET_ENUMERATE_LEVELS = createSignature("$SetEnumerate", 0, [2], [1]);
|
|
195
|
+
const TUPLE_LEVELS = createSignature("$Tuple", 0, [2], [1]);
|
|
196
|
+
const SET_OF_FCNS_LEVELS = createSignature("$SetOfFcns", 0, [2], [1]);
|
|
197
|
+
const CARTESIAN_PROD_LEVELS = createSignature("$CartesianProd", 0, [2], [1]);
|
|
198
|
+
const SUBSET_OF_LEVELS = createSignature("$SubsetOf", 0, [2], [1]);
|
|
199
|
+
const SET_OF_ALL_LEVELS = createSignature("$SetOfAll", 0, [2], [1]);
|
|
200
|
+
const FCN_CONSTRUCTOR_LEVELS = createSignature("$FcnConstructor", 0, [3], [1]);
|
|
201
|
+
const RCD_CONSTRUCTOR_LEVELS = createSignature("$RcdConstructor", 0, [3], [1]);
|
|
202
|
+
const SET_OF_RCDS_LEVELS = createSignature("$SetOfRcds", 0, [2], [1]);
|
|
203
|
+
const EXCEPT_LEVELS = createSignature("$Except", 0, [2], [1]);
|
|
204
|
+
const PAIR_LEVELS = createSignature("$Pair", 0, [3], [1]);
|
|
205
|
+
const SEQ_LEVELS = createSignature("$Seq", 0, [2], [1]);
|
|
206
|
+
const APPLY_LEVELS = createSignature("$FcnApply", 0, [2, 2], [1, 1]);
|
|
207
|
+
const SELECT_LEVELS = createSignature("$RcdSelect", 0, [2, 0], [1, 1]);
|
|
208
|
+
const SQUARE_ACT_LEVELS = createSignature("$SquareAct", 2, [2, 1], [0, 0]);
|
|
209
|
+
const ANGLE_ACT_LEVELS = createSignature("$AngleAct", 2, [2, 1], [0, 0]);
|
|
210
|
+
const WF_LEVELS = createSignature("$WF", 3, [1, 2], [0, 0]);
|
|
211
|
+
const SF_LEVELS = createSignature("$SF", 3, [1, 2], [0, 0]);
|
|
174
212
|
|
|
175
213
|
const bindFormals = (scope: Scope, formals: OperatorParam[]) =>
|
|
176
214
|
formals.length === 0
|
|
@@ -179,13 +217,12 @@ const bindFormals = (scope: Scope, formals: OperatorParam[]) =>
|
|
|
179
217
|
...scope,
|
|
180
218
|
...formals.map((formal): [string, ScopeEntry] => [
|
|
181
219
|
formal.name,
|
|
182
|
-
{ kind: "Formal", arity: formal.arity },
|
|
220
|
+
{ kind: "Formal", arity: formal.arity, level: CONSTANT_LEVEL },
|
|
183
221
|
]),
|
|
184
222
|
]);
|
|
185
223
|
|
|
186
224
|
const toFormals = (names: string[]) => names.map((name) => ({ name, arity: 0 }));
|
|
187
225
|
|
|
188
|
-
// SANY reports a level error at the range of the expression it rejects.
|
|
189
226
|
const createLevelError = (message: string, expression: Expression) =>
|
|
190
227
|
expression.location.range
|
|
191
228
|
? createSemanticError(`${message}.`, expression.location.range)
|
|
@@ -195,18 +232,17 @@ const createLevelError = (message: string, expression: Expression) =>
|
|
|
195
232
|
|
|
196
233
|
const LOGICAL_OPERATORS = new Set(["/\\", "\\/", "=>", "<=>"]);
|
|
197
234
|
|
|
198
|
-
// SANY's OpApplNode.levelCheck rejects raw actions inside temporal formulas, but not inside a LET
|
|
199
|
-
// or a label.
|
|
200
235
|
const isOperatorApplication = (expression: Expression) =>
|
|
201
236
|
expression.kind !== "Let" && expression.kind !== "Label";
|
|
202
237
|
|
|
203
238
|
export const createLevelAnalyzer = (context: LevelContext) => {
|
|
204
239
|
const definitionLevels = new Map<Definition, OperatorLevels>();
|
|
240
|
+
const selectionLevels = new Map<Expression, LevelData>();
|
|
205
241
|
|
|
206
242
|
const resolve = (name: string, scope: Scope): Resolved => {
|
|
207
243
|
const entry = scope.get(name);
|
|
208
244
|
if (entry?.kind === "Formal") {
|
|
209
|
-
return { kind: "Declared", name, level:
|
|
245
|
+
return { kind: "Declared", name, level: entry.level, arity: entry.arity };
|
|
210
246
|
}
|
|
211
247
|
if (entry?.kind === "Let") {
|
|
212
248
|
return { kind: "Defined", levels: analyzeDefinition(entry.definition, entry.scope) };
|
|
@@ -216,7 +252,6 @@ export const createLevelAnalyzer = (context: LevelContext) => {
|
|
|
216
252
|
const definition = context.getDefinition(name);
|
|
217
253
|
if (definition) {
|
|
218
254
|
const levels = analyzeDefinition(definition, new Map());
|
|
219
|
-
// SANY names a definition of an instance by its qualified name, as in I!Foo.
|
|
220
255
|
const qualifiedName = context.getQualifiedName?.(name);
|
|
221
256
|
return {
|
|
222
257
|
kind: "Defined",
|
|
@@ -236,12 +271,8 @@ export const createLevelAnalyzer = (context: LevelContext) => {
|
|
|
236
271
|
data.params.add(param);
|
|
237
272
|
data.argParams.add(getArgumentParamKey(name, index, param));
|
|
238
273
|
});
|
|
239
|
-
operand.data.constraints.forEach((value, key) => putConstraint(data.constraints, key, value));
|
|
240
274
|
putArgConstraint(data.argConstraints, getArgumentKey(name, index), operand.data.level);
|
|
241
|
-
operand.data
|
|
242
|
-
putArgConstraint(data.argConstraints, key, value),
|
|
243
|
-
);
|
|
244
|
-
operand.data.argParams.forEach((key) => data.argParams.add(key));
|
|
275
|
+
mergeConstraints(data, operand.data);
|
|
245
276
|
});
|
|
246
277
|
return data;
|
|
247
278
|
};
|
|
@@ -254,18 +285,13 @@ export const createLevelAnalyzer = (context: LevelContext) => {
|
|
|
254
285
|
) => {
|
|
255
286
|
const isBound = (name: string) => bound.includes(name);
|
|
256
287
|
operands.forEach((operand, index) => {
|
|
257
|
-
if (operand.
|
|
288
|
+
if (operand.kind !== "Value") return;
|
|
258
289
|
if (operand.data.level > getMaxLevel(operator, index)) {
|
|
259
290
|
throw new TlaSyntaxError(
|
|
260
|
-
`Level error in applying operator ${operator.name}:\nThe level of argument ${index + 1} exceeds the maximum level allowed by the operator`,
|
|
291
|
+
`Level error in applying operator ${resolveSynonym(operator.name)}:\nThe level of argument ${index + 1} exceeds the maximum level allowed by the operator`,
|
|
261
292
|
);
|
|
262
293
|
}
|
|
263
294
|
});
|
|
264
|
-
if (ranges.some((range) => range.level > ACTION_LEVEL)) {
|
|
265
|
-
throw new TlaSyntaxError(
|
|
266
|
-
`Level error in applying operator ${operator.name}:\nThe level of the range for a bounded variable exceeds the maximum level allowed by the operator`,
|
|
267
|
-
);
|
|
268
|
-
}
|
|
269
295
|
const getOperand = (formal: string) => {
|
|
270
296
|
const index = operator.formals.findIndex((param) => param.name === formal);
|
|
271
297
|
return index === -1 ? undefined : operands[index];
|
|
@@ -276,7 +302,7 @@ export const createLevelAnalyzer = (context: LevelContext) => {
|
|
|
276
302
|
Math.max(
|
|
277
303
|
operator.level,
|
|
278
304
|
...operands
|
|
279
|
-
.filter((
|
|
305
|
+
.filter((_operand, index) => getWeight(operator, index) === 1)
|
|
280
306
|
.map((operand) => operand.data.level),
|
|
281
307
|
...ranges.map((range) => range.level),
|
|
282
308
|
),
|
|
@@ -305,10 +331,10 @@ export const createLevelAnalyzer = (context: LevelContext) => {
|
|
|
305
331
|
}),
|
|
306
332
|
);
|
|
307
333
|
operands.forEach((operand, operandIndex) => {
|
|
308
|
-
|
|
309
|
-
|
|
334
|
+
if (operand.kind !== "Operator") return;
|
|
335
|
+
const argument = operand.data;
|
|
310
336
|
operands.forEach((other, otherIndex) =>
|
|
311
|
-
argument.formals.forEach((
|
|
337
|
+
argument.formals.forEach((_formal, argumentIndex) => {
|
|
312
338
|
if (!hasCondition(operandIndex, otherIndex, argumentIndex)) return;
|
|
313
339
|
other.data.params.forEach((param) =>
|
|
314
340
|
putConstraint(data.constraints, param, getMaxLevel(argument, argumentIndex)),
|
|
@@ -318,9 +344,13 @@ export const createLevelAnalyzer = (context: LevelContext) => {
|
|
|
318
344
|
});
|
|
319
345
|
operator.argParams.forEach((key) => {
|
|
320
346
|
const parameter = parseArgumentParamKey(key);
|
|
321
|
-
const argument = getOperand(parameter.operator)
|
|
322
|
-
if (argument) {
|
|
323
|
-
putConstraint(
|
|
347
|
+
const argument = getOperand(parameter.operator);
|
|
348
|
+
if (argument?.kind === "Operator") {
|
|
349
|
+
putConstraint(
|
|
350
|
+
data.constraints,
|
|
351
|
+
parameter.param,
|
|
352
|
+
getMaxLevel(argument.data, parameter.index),
|
|
353
|
+
);
|
|
324
354
|
}
|
|
325
355
|
});
|
|
326
356
|
|
|
@@ -333,9 +363,9 @@ export const createLevelAnalyzer = (context: LevelContext) => {
|
|
|
333
363
|
constraints.forEach((value, key) => putArgConstraint(data.argConstraints, key, value)),
|
|
334
364
|
);
|
|
335
365
|
operands.forEach((operand, operandIndex) => {
|
|
366
|
+
if (operand.kind !== "Declared") return;
|
|
336
367
|
const declared = operand.declared;
|
|
337
|
-
|
|
338
|
-
Array.from({ length: declared.arity }, (_, argumentIndex) =>
|
|
368
|
+
Array.from({ length: declared.arity }, (_value, argumentIndex) =>
|
|
339
369
|
putArgConstraint(
|
|
340
370
|
data.argConstraints,
|
|
341
371
|
getArgumentKey(declared.name, argumentIndex),
|
|
@@ -343,7 +373,7 @@ export const createLevelAnalyzer = (context: LevelContext) => {
|
|
|
343
373
|
),
|
|
344
374
|
);
|
|
345
375
|
operands.forEach((other, otherIndex) =>
|
|
346
|
-
Array.from({ length: declared.arity }, (
|
|
376
|
+
Array.from({ length: declared.arity }, (_value, argumentIndex) => {
|
|
347
377
|
if (hasCondition(operandIndex, otherIndex, argumentIndex)) {
|
|
348
378
|
putArgConstraint(
|
|
349
379
|
data.argConstraints,
|
|
@@ -386,17 +416,17 @@ export const createLevelAnalyzer = (context: LevelContext) => {
|
|
|
386
416
|
);
|
|
387
417
|
return;
|
|
388
418
|
}
|
|
389
|
-
if (argument.
|
|
419
|
+
if (argument.kind === "Declared") {
|
|
390
420
|
data.argParams.add(
|
|
391
421
|
getArgumentParamKey(argument.declared.name, parameter.index, parameter.param),
|
|
392
422
|
);
|
|
393
423
|
}
|
|
394
424
|
});
|
|
395
425
|
operands.forEach((operand, operandIndex) => {
|
|
426
|
+
if (operand.kind !== "Declared") return;
|
|
396
427
|
const declared = operand.declared;
|
|
397
|
-
if (!declared) return;
|
|
398
428
|
operands.forEach((other, otherIndex) =>
|
|
399
|
-
Array.from({ length: declared.arity }, (
|
|
429
|
+
Array.from({ length: declared.arity }, (_value, argumentIndex) => {
|
|
400
430
|
if (!hasCondition(operandIndex, otherIndex, argumentIndex)) return;
|
|
401
431
|
other.data.params.forEach((param) =>
|
|
402
432
|
data.argParams.add(getArgumentParamKey(declared.name, argumentIndex, param)),
|
|
@@ -415,7 +445,7 @@ export const createLevelAnalyzer = (context: LevelContext) => {
|
|
|
415
445
|
expression.body,
|
|
416
446
|
scope,
|
|
417
447
|
);
|
|
418
|
-
return {
|
|
448
|
+
return { kind: "Operator", data: operator };
|
|
419
449
|
}
|
|
420
450
|
const name =
|
|
421
451
|
expression.kind === "OperatorReference"
|
|
@@ -429,15 +459,16 @@ export const createLevelAnalyzer = (context: LevelContext) => {
|
|
|
429
459
|
resolved.kind === "Defined" &&
|
|
430
460
|
(resolved.levels.formals.length > 0 || expression.kind === "OperatorReference")
|
|
431
461
|
) {
|
|
432
|
-
return {
|
|
462
|
+
return { kind: "Operator", data: resolved.levels };
|
|
433
463
|
}
|
|
434
464
|
if (resolved.kind === "Declared" && resolved.arity > 0) {
|
|
435
465
|
const data = createData();
|
|
436
466
|
data.params.add(name);
|
|
437
|
-
return { data, declared: { name, arity: resolved.arity } };
|
|
467
|
+
return { kind: "Declared", data, declared: { name, arity: resolved.arity } };
|
|
438
468
|
}
|
|
469
|
+
if (expression.kind === "OperatorReference") return { kind: "Value", data: createData() };
|
|
439
470
|
}
|
|
440
|
-
return { data: analyze(expression, scope) };
|
|
471
|
+
return { kind: "Value", data: analyze(expression, scope) };
|
|
441
472
|
};
|
|
442
473
|
|
|
443
474
|
const toOperands = (expressions: Expression[], scope: Scope) =>
|
|
@@ -447,16 +478,20 @@ export const createLevelAnalyzer = (context: LevelContext) => {
|
|
|
447
478
|
operator: OperatorLevels,
|
|
448
479
|
expressions: Expression[],
|
|
449
480
|
scope: Scope,
|
|
450
|
-
|
|
451
|
-
bound
|
|
481
|
+
bounds: Bound[] = [],
|
|
482
|
+
bound = getBoundNames(bounds),
|
|
452
483
|
) => {
|
|
453
|
-
const
|
|
454
|
-
|
|
455
|
-
|
|
456
|
-
|
|
457
|
-
|
|
458
|
-
|
|
459
|
-
|
|
484
|
+
const operands = toOperands(expressions, bindFormals(scope, toFormals(bound)));
|
|
485
|
+
const ranges = bounds.map((range) => analyze(range.set, scope));
|
|
486
|
+
const data = applyDefined(operator, operands, ranges, bound);
|
|
487
|
+
const pattern = bounds[ranges.findIndex((range) => range.level > ACTION_LEVEL)]?.pattern;
|
|
488
|
+
if (pattern) {
|
|
489
|
+
const range = pattern.ranges?.[0];
|
|
490
|
+
throw new TlaSyntaxError(
|
|
491
|
+
`Level error in applying operator ${operator.name}:\nThe level of the range for the bounded variable ${range ? formatRange(range) : getPatternNames(pattern)[0]} \nexceeds the maximum level allowed by the operator`,
|
|
492
|
+
);
|
|
493
|
+
}
|
|
494
|
+
return data;
|
|
460
495
|
};
|
|
461
496
|
|
|
462
497
|
const applyResolved = (resolved: Resolved, operands: Operand[]) =>
|
|
@@ -464,11 +499,11 @@ export const createLevelAnalyzer = (context: LevelContext) => {
|
|
|
464
499
|
? applyDeclared(resolved.name, resolved.level, operands)
|
|
465
500
|
: applyDefined(resolved.levels, operands);
|
|
466
501
|
|
|
467
|
-
const checkJunction = (operands: Operand[], expression: Expression) => {
|
|
502
|
+
const checkJunction = (operands: Operand[], expression: Expression, name: string) => {
|
|
468
503
|
const levels = operands.map((operand) => operand.data.level);
|
|
469
504
|
if (levels.includes(ACTION_LEVEL) && levels.includes(TEMPORAL_LEVEL)) {
|
|
470
505
|
throw createLevelError(
|
|
471
|
-
|
|
506
|
+
`${name} has both temporal formula and action as arguments`,
|
|
472
507
|
expression,
|
|
473
508
|
);
|
|
474
509
|
}
|
|
@@ -482,7 +517,9 @@ export const createLevelAnalyzer = (context: LevelContext) => {
|
|
|
482
517
|
expression,
|
|
483
518
|
);
|
|
484
519
|
}
|
|
485
|
-
if (LOGICAL_OPERATORS.has(expression.operator))
|
|
520
|
+
if (LOGICAL_OPERATORS.has(expression.operator)) {
|
|
521
|
+
checkJunction(operands, expression, resolveSynonym(expression.operator));
|
|
522
|
+
}
|
|
486
523
|
};
|
|
487
524
|
|
|
488
525
|
const checkTemporal = (
|
|
@@ -513,18 +550,12 @@ export const createLevelAnalyzer = (context: LevelContext) => {
|
|
|
513
550
|
argConstraints: new Map(body.argConstraints),
|
|
514
551
|
argParams: new Set(body.argParams),
|
|
515
552
|
};
|
|
516
|
-
expression.definitions.forEach((definition) =>
|
|
517
|
-
|
|
518
|
-
|
|
519
|
-
levels.argConstraints.forEach((value, key) =>
|
|
520
|
-
putArgConstraint(data.argConstraints, key, value),
|
|
521
|
-
);
|
|
522
|
-
levels.argParams.forEach((key) => data.argParams.add(key));
|
|
523
|
-
});
|
|
553
|
+
expression.definitions.forEach((definition) =>
|
|
554
|
+
mergeConstraints(data, analyzeDefinition(definition, inner)),
|
|
555
|
+
);
|
|
524
556
|
return data;
|
|
525
557
|
};
|
|
526
558
|
|
|
527
|
-
// SANY reports a level error of an operator's arguments at the application.
|
|
528
559
|
const analyze = (expression: Expression, scope: Scope): LevelData => {
|
|
529
560
|
try {
|
|
530
561
|
return analyzeNode(expression, scope);
|
|
@@ -554,29 +585,41 @@ export const createLevelAnalyzer = (context: LevelContext) => {
|
|
|
554
585
|
case "And":
|
|
555
586
|
case "Or": {
|
|
556
587
|
const operands = toOperands(expression.operands, scope);
|
|
557
|
-
|
|
558
|
-
|
|
588
|
+
const isAnd = expression.kind === "And";
|
|
589
|
+
checkJunction(
|
|
590
|
+
operands,
|
|
591
|
+
expression,
|
|
592
|
+
expression.isBulleted
|
|
593
|
+
? `${isAnd ? "Conjunction" : "Disjunction"} list`
|
|
594
|
+
: isAnd
|
|
595
|
+
? "\\land"
|
|
596
|
+
: "\\lor",
|
|
597
|
+
);
|
|
598
|
+
return applyDefined(isAnd ? AND_LEVELS : OR_LEVELS, operands);
|
|
559
599
|
}
|
|
560
600
|
case "Prime":
|
|
561
|
-
case "Unchanged":
|
|
562
601
|
return applyBuiltin(PRIME_LEVELS, [expression.expression], scope);
|
|
602
|
+
case "Unchanged":
|
|
603
|
+
return applyBuiltin(UNCHANGED_LEVELS, [expression.expression], scope);
|
|
563
604
|
case "Enabled":
|
|
564
605
|
return applyBuiltin(ENABLED_LEVELS, [expression.expression], scope);
|
|
565
606
|
case "Always":
|
|
566
607
|
case "Eventually": {
|
|
567
608
|
const operand = toOperand(expression.expression, scope);
|
|
568
609
|
checkTemporal(expression, operand.data.level);
|
|
569
|
-
return applyDefined(
|
|
610
|
+
return applyDefined(expression.kind === "Always" ? ALWAYS_LEVELS : EVENTUALLY_LEVELS, [
|
|
611
|
+
operand,
|
|
612
|
+
]);
|
|
570
613
|
}
|
|
571
614
|
case "If":
|
|
572
615
|
return applyBuiltin(
|
|
573
|
-
|
|
616
|
+
IF_LEVELS,
|
|
574
617
|
[expression.condition, expression.consequent, expression.alternative],
|
|
575
618
|
scope,
|
|
576
619
|
);
|
|
577
620
|
case "Case":
|
|
578
621
|
return applyBuiltin(
|
|
579
|
-
|
|
622
|
+
CASE_LEVELS,
|
|
580
623
|
[
|
|
581
624
|
...expression.arms.flatMap((arm) => [arm.condition, arm.body]),
|
|
582
625
|
...(expression.other ? [expression.other] : []),
|
|
@@ -588,11 +631,10 @@ export const createLevelAnalyzer = (context: LevelContext) => {
|
|
|
588
631
|
case "Forall":
|
|
589
632
|
case "Exists": {
|
|
590
633
|
const data = applyBuiltin(
|
|
591
|
-
|
|
634
|
+
expression.kind === "Forall" ? FORALL_LEVELS : EXISTS_LEVELS,
|
|
592
635
|
[expression.body],
|
|
593
636
|
scope,
|
|
594
|
-
expression.bounds
|
|
595
|
-
getBoundNames(expression.bounds),
|
|
637
|
+
expression.bounds,
|
|
596
638
|
);
|
|
597
639
|
const actionBound =
|
|
598
640
|
data.level === TEMPORAL_LEVEL
|
|
@@ -608,7 +650,13 @@ export const createLevelAnalyzer = (context: LevelContext) => {
|
|
|
608
650
|
}
|
|
609
651
|
case "UnboundedQuantifier":
|
|
610
652
|
return applyBuiltin(
|
|
611
|
-
expression.isTemporal
|
|
653
|
+
expression.isTemporal
|
|
654
|
+
? expression.quantifier === "Forall"
|
|
655
|
+
? TEMPORAL_FORALL_LEVELS
|
|
656
|
+
: TEMPORAL_EXISTS_LEVELS
|
|
657
|
+
: expression.quantifier === "Forall"
|
|
658
|
+
? UNBOUNDED_FORALL_LEVELS
|
|
659
|
+
: UNBOUNDED_EXISTS_LEVELS,
|
|
612
660
|
[expression.body],
|
|
613
661
|
scope,
|
|
614
662
|
[],
|
|
@@ -616,96 +664,99 @@ export const createLevelAnalyzer = (context: LevelContext) => {
|
|
|
616
664
|
);
|
|
617
665
|
case "Choose":
|
|
618
666
|
return applyBuiltin(
|
|
619
|
-
|
|
667
|
+
expression.set ? BOUNDED_CHOOSE_LEVELS : UNBOUNDED_CHOOSE_LEVELS,
|
|
620
668
|
[expression.body],
|
|
621
669
|
scope,
|
|
622
|
-
expression.set ? [expression.set] : [],
|
|
670
|
+
expression.set ? [{ pattern: expression.pattern, set: expression.set }] : [],
|
|
623
671
|
getPatternNames(expression.pattern),
|
|
624
672
|
);
|
|
625
673
|
case "SetEnumeration":
|
|
674
|
+
return applyBuiltin(SET_ENUMERATE_LEVELS, expression.elements, scope);
|
|
626
675
|
case "Tuple":
|
|
676
|
+
return applyBuiltin(TUPLE_LEVELS, expression.elements, scope);
|
|
627
677
|
case "FunctionSet":
|
|
678
|
+
return applyBuiltin(SET_OF_FCNS_LEVELS, [expression.domain, expression.range], scope);
|
|
628
679
|
case "Product":
|
|
629
|
-
return applyBuiltin(
|
|
630
|
-
SET_LEVELS,
|
|
631
|
-
expression.kind === "FunctionSet"
|
|
632
|
-
? [expression.domain, expression.range]
|
|
633
|
-
: expression.kind === "Product"
|
|
634
|
-
? expression.factors
|
|
635
|
-
: expression.elements,
|
|
636
|
-
scope,
|
|
637
|
-
);
|
|
680
|
+
return applyBuiltin(CARTESIAN_PROD_LEVELS, expression.factors, scope);
|
|
638
681
|
case "SetFilter":
|
|
639
|
-
return applyBuiltin(
|
|
640
|
-
SET_LEVELS,
|
|
641
|
-
[expression.predicate],
|
|
642
|
-
scope,
|
|
643
|
-
[expression.bound.set],
|
|
644
|
-
getPatternNames(expression.bound.pattern),
|
|
645
|
-
);
|
|
682
|
+
return applyBuiltin(SUBSET_OF_LEVELS, [expression.predicate], scope, [expression.bound]);
|
|
646
683
|
case "SetMap":
|
|
647
|
-
return applyBuiltin(
|
|
648
|
-
SET_LEVELS,
|
|
649
|
-
[expression.expression],
|
|
650
|
-
scope,
|
|
651
|
-
expression.bounds.map((bound) => bound.set),
|
|
652
|
-
getBoundNames(expression.bounds),
|
|
653
|
-
);
|
|
684
|
+
return applyBuiltin(SET_OF_ALL_LEVELS, [expression.expression], scope, expression.bounds);
|
|
654
685
|
case "FunctionConstruction":
|
|
655
|
-
return applyBuiltin(
|
|
656
|
-
FUNCTION_LEVELS,
|
|
657
|
-
[expression.body],
|
|
658
|
-
scope,
|
|
659
|
-
expression.bounds.map((bound) => bound.set),
|
|
660
|
-
getBoundNames(expression.bounds),
|
|
661
|
-
);
|
|
686
|
+
return applyBuiltin(FCN_CONSTRUCTOR_LEVELS, [expression.body], scope, expression.bounds);
|
|
662
687
|
case "Record":
|
|
663
688
|
return applyBuiltin(
|
|
664
|
-
|
|
689
|
+
RCD_CONSTRUCTOR_LEVELS,
|
|
665
690
|
expression.fields.map((field) => field.value),
|
|
666
691
|
scope,
|
|
667
692
|
);
|
|
668
693
|
case "RecordSet":
|
|
669
694
|
return applyBuiltin(
|
|
670
|
-
|
|
695
|
+
SET_OF_RCDS_LEVELS,
|
|
671
696
|
expression.fields.map((field) => field.value),
|
|
672
697
|
scope,
|
|
673
698
|
);
|
|
674
699
|
case "Except":
|
|
675
|
-
return
|
|
676
|
-
|
|
677
|
-
|
|
678
|
-
|
|
679
|
-
|
|
680
|
-
|
|
681
|
-
|
|
700
|
+
return applyDefined(EXCEPT_LEVELS, [
|
|
701
|
+
toOperand(expression.function, scope),
|
|
702
|
+
...expression.updates.map((update): Operand => ({
|
|
703
|
+
kind: "Value",
|
|
704
|
+
data: applyDefined(PAIR_LEVELS, [
|
|
705
|
+
{
|
|
706
|
+
kind: "Value",
|
|
707
|
+
data: applyDefined(
|
|
708
|
+
SEQ_LEVELS,
|
|
709
|
+
update.path.map((step): Operand =>
|
|
710
|
+
step.kind === "Field"
|
|
711
|
+
? { kind: "Value", data: createData() }
|
|
712
|
+
: step.args.length === 1
|
|
713
|
+
? toOperand(step.args[0], scope)
|
|
714
|
+
: { kind: "Value", data: applyBuiltin(TUPLE_LEVELS, step.args, scope) },
|
|
715
|
+
),
|
|
716
|
+
),
|
|
717
|
+
},
|
|
718
|
+
toOperand(update.value, scope),
|
|
682
719
|
]),
|
|
683
|
-
|
|
684
|
-
|
|
685
|
-
);
|
|
720
|
+
})),
|
|
721
|
+
]);
|
|
686
722
|
case "FunctionApplication":
|
|
687
723
|
return applyDefined(APPLY_LEVELS, [
|
|
688
724
|
toOperand(expression.function, scope),
|
|
689
725
|
expression.args.length === 1
|
|
690
726
|
? toOperand(expression.args[0], scope)
|
|
691
|
-
: { data: applyBuiltin(
|
|
727
|
+
: { kind: "Value", data: applyBuiltin(TUPLE_LEVELS, expression.args, scope) },
|
|
692
728
|
]);
|
|
693
|
-
// SANY's semantic checker rejects the expression without computing its level.
|
|
694
729
|
case "Bracket":
|
|
695
730
|
return createData();
|
|
696
731
|
case "FieldAccess":
|
|
697
732
|
return applyDefined(SELECT_LEVELS, [
|
|
698
733
|
toOperand(expression.record, scope),
|
|
699
|
-
{ data: createData() },
|
|
734
|
+
{ kind: "Value", data: createData() },
|
|
700
735
|
]);
|
|
701
736
|
case "BoxAction":
|
|
702
737
|
case "AngleAction":
|
|
703
|
-
return applyBuiltin(
|
|
738
|
+
return applyBuiltin(
|
|
739
|
+
expression.kind === "BoxAction" ? SQUARE_ACT_LEVELS : ANGLE_ACT_LEVELS,
|
|
740
|
+
[expression.action, expression.subscript],
|
|
741
|
+
scope,
|
|
742
|
+
);
|
|
704
743
|
case "WeakFairness":
|
|
705
744
|
case "StrongFairness":
|
|
706
|
-
return applyBuiltin(
|
|
745
|
+
return applyBuiltin(
|
|
746
|
+
expression.kind === "WeakFairness" ? WF_LEVELS : SF_LEVELS,
|
|
747
|
+
[expression.subscript, expression.action],
|
|
748
|
+
scope,
|
|
749
|
+
);
|
|
707
750
|
case "Label":
|
|
708
751
|
return analyze(expression.body, scope);
|
|
752
|
+
case "Selection": {
|
|
753
|
+
const selected = expression.expression;
|
|
754
|
+
const known = selectionLevels.get(selected);
|
|
755
|
+
if (known) return known;
|
|
756
|
+
const data = analyze(selected, scope);
|
|
757
|
+
selectionLevels.set(selected, data);
|
|
758
|
+
return data;
|
|
759
|
+
}
|
|
709
760
|
case "Subexpression":
|
|
710
761
|
return createData();
|
|
711
762
|
}
|
|
@@ -737,9 +788,9 @@ export const createLevelAnalyzer = (context: LevelContext) => {
|
|
|
737
788
|
case "Apply":
|
|
738
789
|
visitOperator(expression.operator, expression.args);
|
|
739
790
|
return names;
|
|
740
|
-
// SANY's LetInNode and OpArgNode don't carry the non-Leibniz parameters of their bodies.
|
|
741
791
|
case "Lambda":
|
|
742
792
|
case "Let":
|
|
793
|
+
case "Selection":
|
|
743
794
|
return names;
|
|
744
795
|
case "Prime":
|
|
745
796
|
case "Unchanged":
|
|
@@ -760,10 +811,9 @@ export const createLevelAnalyzer = (context: LevelContext) => {
|
|
|
760
811
|
);
|
|
761
812
|
return names;
|
|
762
813
|
default:
|
|
763
|
-
|
|
764
|
-
visit(child, isNonLeibniz, bindFormals(scope, toFormals(bound)))
|
|
765
|
-
|
|
766
|
-
});
|
|
814
|
+
forEachChild(expression, (child, bound) =>
|
|
815
|
+
visit(child, isNonLeibniz, bindFormals(scope, toFormals(bound))),
|
|
816
|
+
);
|
|
767
817
|
return names;
|
|
768
818
|
}
|
|
769
819
|
};
|
|
@@ -777,7 +827,10 @@ export const createLevelAnalyzer = (context: LevelContext) => {
|
|
|
777
827
|
const inner = bindFormals(scope, formals);
|
|
778
828
|
const data = analyze(body, inner);
|
|
779
829
|
const isFormal = (param: string) => formals.some((formal) => formal.name === param);
|
|
780
|
-
const nonLeibnizNames = getNonLeibnizNames(
|
|
830
|
+
const nonLeibnizNames = getNonLeibnizNames(
|
|
831
|
+
body.kind === "Selection" ? body.expression : body,
|
|
832
|
+
inner,
|
|
833
|
+
);
|
|
781
834
|
const levels: OperatorLevels = {
|
|
782
835
|
...createData(data.level),
|
|
783
836
|
name,
|
|
@@ -792,13 +845,13 @@ export const createLevelAnalyzer = (context: LevelContext) => {
|
|
|
792
845
|
minMaxLevels: formals.map((formal) =>
|
|
793
846
|
Array.from(
|
|
794
847
|
{ length: formal.arity },
|
|
795
|
-
(
|
|
848
|
+
(_value, index) => data.argConstraints.get(getArgumentKey(formal.name, index)) ?? 0,
|
|
796
849
|
),
|
|
797
850
|
),
|
|
798
851
|
conditions: new Set(
|
|
799
852
|
formals.flatMap((operator, operatorIndex) =>
|
|
800
853
|
formals.flatMap((param, paramIndex) =>
|
|
801
|
-
Array.from({ length: operator.arity }, (
|
|
854
|
+
Array.from({ length: operator.arity }, (_value, argumentIndex) => argumentIndex)
|
|
802
855
|
.filter((argumentIndex) =>
|
|
803
856
|
data.argParams.has(getArgumentParamKey(operator.name, argumentIndex, param.name)),
|
|
804
857
|
)
|
|
@@ -858,17 +911,29 @@ export const analyzeAssumeProve = (
|
|
|
858
911
|
assumeProve: AssumeProve,
|
|
859
912
|
scope: Scope,
|
|
860
913
|
analyzer: ReturnType<typeof createLevelAnalyzer>,
|
|
914
|
+
errors: SanyError[] = [],
|
|
861
915
|
): LevelData => {
|
|
862
916
|
const inner = new Map(scope);
|
|
863
917
|
const parts = assumeProve.assumptions.flatMap((assumption) => {
|
|
864
918
|
if (assumption.kind === "NewSymbol") {
|
|
865
919
|
const set = assumption.set && analyzer.analyze(assumption.set, inner);
|
|
866
|
-
|
|
920
|
+
const range = assumption.location.range;
|
|
921
|
+
if (set?.level === TEMPORAL_LEVEL && range) {
|
|
922
|
+
errors.push({
|
|
923
|
+
location: formatRange(range),
|
|
924
|
+
message: "Level error:\nTemporal formula used as set.",
|
|
925
|
+
});
|
|
926
|
+
}
|
|
927
|
+
inner.set(assumption.name, {
|
|
928
|
+
kind: "Formal",
|
|
929
|
+
arity: assumption.arity,
|
|
930
|
+
level: NEW_SYMBOL_LEVELS[assumption.level],
|
|
931
|
+
});
|
|
867
932
|
return set ? [set] : [];
|
|
868
933
|
}
|
|
869
934
|
return [
|
|
870
935
|
assumption.kind === "AssumeProve"
|
|
871
|
-
? analyzeAssumeProve(assumption, inner, analyzer)
|
|
936
|
+
? analyzeAssumeProve(assumption, inner, analyzer, errors)
|
|
872
937
|
: analyzer.analyze(assumption, inner),
|
|
873
938
|
];
|
|
874
939
|
});
|
|
@@ -876,9 +941,7 @@ export const analyzeAssumeProve = (
|
|
|
876
941
|
const data = createData(Math.max(...parts.map((part) => part.level)));
|
|
877
942
|
parts.forEach((part) => {
|
|
878
943
|
part.params.forEach((param) => data.params.add(param));
|
|
879
|
-
|
|
880
|
-
part.argConstraints.forEach((value, key) => putArgConstraint(data.argConstraints, key, value));
|
|
881
|
-
part.argParams.forEach((key) => data.argParams.add(key));
|
|
944
|
+
mergeConstraints(data, part);
|
|
882
945
|
});
|
|
883
946
|
return data;
|
|
884
947
|
};
|
|
@@ -905,7 +968,6 @@ export const checkModuleLevels = (
|
|
|
905
968
|
? analyzeAssumeProve(body.statement, new Map(), analyzer).level
|
|
906
969
|
: getLevel([body.statement]);
|
|
907
970
|
};
|
|
908
|
-
// SANY's TheoremNode.LevelCheckTemporal: the proof of a temporal goal may only assume constants.
|
|
909
971
|
const checkTemporalGoal = (proof: Proof | undefined): SanyError[] =>
|
|
910
972
|
proof?.kind !== "Steps"
|
|
911
973
|
? []
|
|
@@ -931,12 +993,15 @@ export const checkModuleLevels = (
|
|
|
931
993
|
}
|
|
932
994
|
return step.body.kind === "Qed" ? checkTemporalGoal(step.proof) : [];
|
|
933
995
|
});
|
|
934
|
-
// SANY checks each step as a theorem of its own after the steps of its proof.
|
|
935
996
|
const checkProof = (proof: Proof | undefined): SanyError[] =>
|
|
936
997
|
proof?.kind !== "Steps"
|
|
937
998
|
? []
|
|
938
999
|
: proof.steps.flatMap((step) => {
|
|
939
1000
|
const body = step.body;
|
|
1001
|
+
const newSymbolErrors: SanyError[] = [];
|
|
1002
|
+
if (body.kind === "Assert" && body.statement.kind === "AssumeProve") {
|
|
1003
|
+
analyzeAssumeProve(body.statement, new Map(), analyzer, newSymbolErrors);
|
|
1004
|
+
}
|
|
940
1005
|
const isTemporal = () => getStepLevel(step) === TEMPORAL_LEVEL;
|
|
941
1006
|
const pickErrors =
|
|
942
1007
|
body.kind === "Pick" && body.bounds.length > 0 && isTemporal()
|
|
@@ -954,6 +1019,7 @@ export const checkModuleLevels = (
|
|
|
954
1019
|
)
|
|
955
1020
|
: [];
|
|
956
1021
|
return [
|
|
1022
|
+
...newSymbolErrors,
|
|
957
1023
|
...checkProof(step.proof),
|
|
958
1024
|
...pickErrors,
|
|
959
1025
|
...(step.proof?.kind === "Steps" && isTemporal() ? checkTemporalGoal(step.proof) : []),
|
|
@@ -969,16 +1035,27 @@ export const checkModuleLevels = (
|
|
|
969
1035
|
})),
|
|
970
1036
|
...module.assumptions.map((assumption) => ({
|
|
971
1037
|
location: assumption.location,
|
|
972
|
-
check: () =>
|
|
1038
|
+
check: () => {
|
|
1039
|
+
const level = analyzer.analyze(assumption.expression, new Map()).level;
|
|
1040
|
+
const range = assumption.location.range;
|
|
1041
|
+
if (level !== CONSTANT_LEVEL && range) {
|
|
1042
|
+
throw createSemanticError(
|
|
1043
|
+
`Level error: assumptions must be level 0 (Constant), \nbut this one has level ${level}.`,
|
|
1044
|
+
range,
|
|
1045
|
+
);
|
|
1046
|
+
}
|
|
1047
|
+
},
|
|
973
1048
|
})),
|
|
974
1049
|
...module.theorems.map((theorem) => ({
|
|
975
1050
|
location: theorem.location,
|
|
976
1051
|
check: () => {
|
|
1052
|
+
const newSymbolErrors: SanyError[] = [];
|
|
977
1053
|
const data =
|
|
978
1054
|
theorem.statement.kind === "AssumeProve"
|
|
979
|
-
? analyzeAssumeProve(theorem.statement, new Map(), analyzer)
|
|
1055
|
+
? analyzeAssumeProve(theorem.statement, new Map(), analyzer, newSymbolErrors)
|
|
980
1056
|
: analyzer.analyze(theorem.statement, new Map());
|
|
981
1057
|
const errors = [
|
|
1058
|
+
...newSymbolErrors,
|
|
982
1059
|
...checkProof(theorem.proof),
|
|
983
1060
|
...(data.level === TEMPORAL_LEVEL ? checkTemporalGoal(theorem.proof) : []),
|
|
984
1061
|
];
|