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/levels.ts
CHANGED
|
@@ -27,10 +27,6 @@ import {
|
|
|
27
27
|
type ThmOrAssumpDefNode,
|
|
28
28
|
} from "./nodes";
|
|
29
29
|
|
|
30
|
-
// A port of the levelCheck methods of SANY's semantic nodes: the levels, weights and Leibniz flags
|
|
31
|
-
// its XMLExporter writes, and the level errors it reports. Each check returns what SANY's returns,
|
|
32
|
-
// which is whether the node is free of level errors, or true for the nodes that ignore that.
|
|
33
|
-
|
|
34
30
|
type AnyDefNode = OpDefNode | ThmOrAssumpDefNode;
|
|
35
31
|
|
|
36
32
|
interface LevelCheck {
|
|
@@ -72,7 +68,6 @@ const addArgLevelParams = (
|
|
|
72
68
|
});
|
|
73
69
|
};
|
|
74
70
|
|
|
75
|
-
// SetOfLevelConstraints.put keeps the lowest bound.
|
|
76
71
|
const putLevelConstraint = (target: Map<SymbolNode, number>, param: SymbolNode, level: number) => {
|
|
77
72
|
target.set(param, Math.min(level, target.get(param) ?? TEMPORAL_LEVEL));
|
|
78
73
|
};
|
|
@@ -89,7 +84,6 @@ const putLevelConstraints = (
|
|
|
89
84
|
|
|
90
85
|
const getArgLevelConstraintKey = (param: SymbolNode, position: number) => `${param.id}:${position}`;
|
|
91
86
|
|
|
92
|
-
// SetOfArgLevelConstraints.put keeps the highest bound.
|
|
93
87
|
const putArgLevelConstraint = (
|
|
94
88
|
target: Map<string, ArgLevelConstraint>,
|
|
95
89
|
param: SymbolNode,
|
|
@@ -129,7 +123,6 @@ const mergeLevels = (node: LevelFields, part: LevelFields) => {
|
|
|
129
123
|
addArgLevelParams(node.argLevelParams, part.argLevelParams);
|
|
130
124
|
};
|
|
131
125
|
|
|
132
|
-
// ArgLevelParam.occur.
|
|
133
126
|
const isOccurring = (argLevelParam: ArgLevelParam, symbols: SymbolNode[]) =>
|
|
134
127
|
symbols.includes(argLevelParam.op) || symbols.includes(argLevelParam.param);
|
|
135
128
|
|
|
@@ -170,14 +163,12 @@ const getBoundSymbols = (node: OpApplNode) => [
|
|
|
170
163
|
const getSubstitute = (symbol: SymbolNode, substs: Subst[]) =>
|
|
171
164
|
substs.find((subst) => subst.op === symbol)?.expr;
|
|
172
165
|
|
|
173
|
-
// Subst.paramSet and Subst.allParamSet.
|
|
174
166
|
const getSubstitutedParams = (param: SymbolNode, substs: Subst[], isAll: boolean) => {
|
|
175
167
|
const substitute = getSubstitute(param, substs);
|
|
176
168
|
if (substitute === undefined) return new Set([param]);
|
|
177
169
|
return isAll ? substitute.allParams : substitute.levelParams;
|
|
178
170
|
};
|
|
179
171
|
|
|
180
|
-
// Subst.getSubALPSet.
|
|
181
172
|
const getSubstitutedArgLevelParams = (source: Map<string, ArgLevelParam>, substs: Subst[]) => {
|
|
182
173
|
const result = new Map<string, ArgLevelParam>();
|
|
183
174
|
source.forEach((argLevelParam, key) => {
|
|
@@ -201,7 +192,6 @@ interface ConstraintSource {
|
|
|
201
192
|
argLevelParams: Map<string, ArgLevelParam>;
|
|
202
193
|
}
|
|
203
194
|
|
|
204
|
-
// Subst.getSubLCSet.
|
|
205
195
|
const getSubstitutedLevelConstraints = (
|
|
206
196
|
body: ConstraintSource,
|
|
207
197
|
substs: Subst[],
|
|
@@ -235,7 +225,6 @@ const getSubstitutedLevelConstraints = (
|
|
|
235
225
|
return result;
|
|
236
226
|
};
|
|
237
227
|
|
|
238
|
-
// Subst.getSubALCSet.
|
|
239
228
|
const getSubstitutedArgLevelConstraints = (
|
|
240
229
|
body: ConstraintSource,
|
|
241
230
|
substs: Subst[],
|
|
@@ -268,7 +257,6 @@ const getSubstitutedArgLevelConstraints = (
|
|
|
268
257
|
return result;
|
|
269
258
|
};
|
|
270
259
|
|
|
271
|
-
// ModuleNode.isConstant.
|
|
272
260
|
const isConstantModule = (module: ModuleNode, check: LevelCheck) => {
|
|
273
261
|
if (getDeclarations(module, VARIABLE_DECL_KIND).length > 0) return false;
|
|
274
262
|
checkModuleLevels(module, check);
|
|
@@ -278,19 +266,18 @@ const isConstantModule = (module: ModuleNode, check: LevelCheck) => {
|
|
|
278
266
|
return module.topLevel.every((node) => node.kind !== "Theorem" || node.level === CONSTANT_LEVEL);
|
|
279
267
|
};
|
|
280
268
|
|
|
281
|
-
// The parts of OpDefNode.levelCheck and ThmOrAssumpDefNode.levelCheck that follow the body's.
|
|
282
269
|
const checkDefinitionBody = (node: AnyDefNode, params: FormalParamNode[], body: LevelFields) => {
|
|
283
270
|
node.minMaxLevel = params.map((param) =>
|
|
284
271
|
Array.from(
|
|
285
272
|
{ length: param.arity },
|
|
286
|
-
(
|
|
273
|
+
(_value, position) =>
|
|
287
274
|
body.argLevelConstraints.get(getArgLevelConstraintKey(param, position))?.level ??
|
|
288
275
|
CONSTANT_LEVEL,
|
|
289
276
|
),
|
|
290
277
|
);
|
|
291
278
|
node.opLevelCond = params.map((param) =>
|
|
292
279
|
params.map((other) =>
|
|
293
|
-
Array.from({ length: param.arity }, (
|
|
280
|
+
Array.from({ length: param.arity }, (_value, index) =>
|
|
294
281
|
body.argLevelParams.has(getArgLevelKey(param, index, other)),
|
|
295
282
|
),
|
|
296
283
|
),
|
|
@@ -323,8 +310,6 @@ const checkDefinitionBody = (node: AnyDefNode, params: FormalParamNode[], body:
|
|
|
323
310
|
);
|
|
324
311
|
};
|
|
325
312
|
|
|
326
|
-
// The checks of OpApplNode.levelCheck that compare the levels of the arguments of a defined
|
|
327
|
-
// operator with the levels it allows.
|
|
328
313
|
const checkArguments = (
|
|
329
314
|
node: OpApplNode,
|
|
330
315
|
operator: AnyDefNode,
|
|
@@ -395,7 +380,6 @@ const checkArguments = (
|
|
|
395
380
|
});
|
|
396
381
|
};
|
|
397
382
|
|
|
398
|
-
// The level constraints OpApplNode.levelCheck derives for an application of a defined operator.
|
|
399
383
|
const constrainArguments = (
|
|
400
384
|
node: OpApplNode,
|
|
401
385
|
operator: AnyDefNode,
|
|
@@ -405,7 +389,7 @@ const constrainArguments = (
|
|
|
405
389
|
) => {
|
|
406
390
|
const params = operator.params ?? [];
|
|
407
391
|
const getArgument = (symbol: SymbolNode) =>
|
|
408
|
-
node.operands.find((
|
|
392
|
+
node.operands.find((_operand, index) => params[index] === symbol);
|
|
409
393
|
putLevelConstraints(node.levelConstraints, operator.levelConstraints);
|
|
410
394
|
node.operands.forEach((operand) => {
|
|
411
395
|
if (operand === undefined) return;
|
|
@@ -532,8 +516,6 @@ const constrainArguments = (
|
|
|
532
516
|
});
|
|
533
517
|
};
|
|
534
518
|
|
|
535
|
-
// The operators OpApplNode.levelCheck rejects with both temporal and action arguments, and how its
|
|
536
|
-
// message names them.
|
|
537
519
|
const LOGICAL_OPERATOR_NAMES = new Map([
|
|
538
520
|
["\\land", "\\land"],
|
|
539
521
|
["\\lor", "\\lor"],
|
|
@@ -543,9 +525,6 @@ const LOGICAL_OPERATOR_NAMES = new Map([
|
|
|
543
525
|
["$DisjList", "Disjunction list"],
|
|
544
526
|
]);
|
|
545
527
|
|
|
546
|
-
// The checks at the end of OpApplNode.levelCheck of the temporal operators and quantifiers. TLC
|
|
547
|
-
// 1.7.4's SANY reports these errors but leaves the node level-correct, so an operator applied to it
|
|
548
|
-
// still checks its level.
|
|
549
528
|
const checkTemporalApplication = (node: OpApplNode, check: LevelCheck) => {
|
|
550
529
|
const addTemporalError = (location: SanyLocation, text: string) => {
|
|
551
530
|
addError(check, location, text);
|
|
@@ -698,7 +677,7 @@ const checkTheoremDefinition = (node: ThmOrAssumpDefNode, iteration: number, che
|
|
|
698
677
|
node.levelChecked = iteration;
|
|
699
678
|
node.maxLevels = node.params.map(() => TEMPORAL_LEVEL);
|
|
700
679
|
// SANY allocates isLeibnizArg anew for each parameter, so only the last one starts out Leibniz.
|
|
701
|
-
node.isLeibnizArg = node.params.map((
|
|
680
|
+
node.isLeibnizArg = node.params.map((_param, index) => index === node.params.length - 1);
|
|
702
681
|
if (node.params.length > 0) node.isLeibniz = true;
|
|
703
682
|
node.levelCorrect = checkLevel(node.body, iteration, check);
|
|
704
683
|
node.level = node.body.level;
|
|
@@ -710,8 +689,6 @@ const checkTheoremDefinition = (node: ThmOrAssumpDefNode, iteration: number, che
|
|
|
710
689
|
return node.levelCorrect;
|
|
711
690
|
};
|
|
712
691
|
|
|
713
|
-
// ModuleNode.levelCheck: the definitions of each recursive section are checked twice, the second
|
|
714
|
-
// time with the highest level and the parameters of the section's recursive operators.
|
|
715
692
|
export const checkModuleLevels = (module: ModuleNode, check: LevelCheck) => {
|
|
716
693
|
if (module.isLevelChecked) return module.levelCorrect;
|
|
717
694
|
module.isLevelChecked = true;
|
|
@@ -796,7 +773,6 @@ export const checkModuleLevels = (module: ModuleNode, check: LevelCheck) => {
|
|
|
796
773
|
return module.levelCorrect;
|
|
797
774
|
};
|
|
798
775
|
|
|
799
|
-
// LevelNode.levelCheckSubnodes, which skips modules.
|
|
800
776
|
const checkSubnodes = (
|
|
801
777
|
node: LevelFields,
|
|
802
778
|
subnodes: SemanticNode[],
|
|
@@ -816,8 +792,6 @@ const checkSubnodes = (
|
|
|
816
792
|
return node.levelCorrect;
|
|
817
793
|
};
|
|
818
794
|
|
|
819
|
-
// TheoremNode.LevelCheckTemporal: the steps of the proof of a temporal theorem that must be
|
|
820
|
-
// constant.
|
|
821
795
|
const checkTemporalProof = (proof: ProofNode | undefined, check: LevelCheck) => {
|
|
822
796
|
if (proof?.kind !== "NonLeafProof") return;
|
|
823
797
|
proof.steps.forEach((step) => {
|
|
@@ -840,7 +814,6 @@ const checkTemporalProof = (proof: ProofNode | undefined, check: LevelCheck) =>
|
|
|
840
814
|
});
|
|
841
815
|
};
|
|
842
816
|
|
|
843
|
-
// InstanceNode.levelCheck.
|
|
844
817
|
const checkInstance = (node: InstanceNode, iteration: number, check: LevelCheck) => {
|
|
845
818
|
if (node.levelChecked >= iteration) return node.levelCorrect;
|
|
846
819
|
node.levelChecked = iteration;
|
|
@@ -1121,7 +1094,6 @@ const checkLevel = (node: SemanticNode, iteration: number, check: LevelCheck): b
|
|
|
1121
1094
|
node.levelChecked = iteration;
|
|
1122
1095
|
const isBodyCorrect = checkLevel(node.body, iteration, check);
|
|
1123
1096
|
const isDefinitionCorrect = !node.definition || checkLevel(node.definition, iteration, check);
|
|
1124
|
-
// AssumeNode's getters return its expression's levels.
|
|
1125
1097
|
node.level = node.body.level;
|
|
1126
1098
|
shareLevels(node, node.body);
|
|
1127
1099
|
if (node.level !== CONSTANT_LEVEL) {
|
|
@@ -1134,8 +1106,7 @@ const checkLevel = (node: SemanticNode, iteration: number, check: LevelCheck): b
|
|
|
1134
1106
|
return isBodyCorrect && isDefinitionCorrect;
|
|
1135
1107
|
}
|
|
1136
1108
|
case "Theorem": {
|
|
1137
|
-
// TheoremNode declares its own levelChecked, so levelCheckSubnodes still runs on
|
|
1138
|
-
// theorem's definition, or its statement when it has none, and its proof.
|
|
1109
|
+
// SANY's TheoremNode declares its own levelChecked, so levelCheckSubnodes still runs on it.
|
|
1139
1110
|
if (node.levelChecked >= iteration) return true;
|
|
1140
1111
|
const isCorrect = checkSubnodes(
|
|
1141
1112
|
node,
|
|
@@ -1191,7 +1162,6 @@ const checkLevel = (node: SemanticNode, iteration: number, check: LevelCheck): b
|
|
|
1191
1162
|
node.goal.level,
|
|
1192
1163
|
);
|
|
1193
1164
|
[node.goal, ...node.assumptions].forEach((part) => mergeLevels(node, part));
|
|
1194
|
-
// LevelNode.addTemporalLevelConstraintToConstants.
|
|
1195
1165
|
if (node.levelCorrect) {
|
|
1196
1166
|
node.levelParams.forEach((param) => {
|
|
1197
1167
|
if (param.kind === "OpDecl" && param.declKind === CONSTANT_DECL_KIND) {
|
package/src/sany/lexer.ts
CHANGED
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import { TlaError } from "../errors";
|
|
2
2
|
|
|
3
|
-
// An emulation of the token manager that JavaCC generates for SANY's grammar, javacc/tla+.jj
|
|
4
|
-
// tokens it produces, their kinds in TLAplusParserConstants order, and their positions.
|
|
3
|
+
// An emulation of the token manager that JavaCC generates for SANY's grammar, javacc/tla+.jj.
|
|
5
4
|
|
|
6
5
|
export interface SanyToken {
|
|
7
6
|
kind: number;
|
|
@@ -11,8 +10,6 @@ export interface SanyToken {
|
|
|
11
10
|
next: SanyToken | undefined;
|
|
12
11
|
}
|
|
13
12
|
|
|
14
|
-
// The token kinds, in the order of TLAplusParserConstants, each with the literal images that
|
|
15
|
-
// produce it. JavaCC breaks a tie between matches of the same length by this order.
|
|
16
13
|
const KINDS: [string, ...string[]][] = [
|
|
17
14
|
["EOF"],
|
|
18
15
|
["BEGIN_PRAGMA", "--->"],
|
|
@@ -228,7 +225,6 @@ const KIND_INDEXES = new Map(
|
|
|
228
225
|
KIND_NAMES.map((name, kind): [string, number] => [name, kind]).reverse(),
|
|
229
226
|
);
|
|
230
227
|
|
|
231
|
-
// The anonymous infix operators share the name "infix", which no caller looks up.
|
|
232
228
|
export const getKind = (name: string) => {
|
|
233
229
|
const kind = KIND_INDEXES.get(name);
|
|
234
230
|
if (kind === undefined) throw new TlaError(`Unknown SANY token kind ${name}`);
|
|
@@ -241,7 +237,7 @@ const LITERALS = new Map(
|
|
|
241
237
|
const LONGEST_LITERAL = Math.max(...[...LITERALS.keys()].map((image) => image.length));
|
|
242
238
|
const LITERAL_LENGTHS = Array.from(
|
|
243
239
|
{ length: LONGEST_LITERAL },
|
|
244
|
-
(
|
|
240
|
+
(_value, index) => LONGEST_LITERAL - index,
|
|
245
241
|
);
|
|
246
242
|
|
|
247
243
|
const BEGIN_MODULE = /----+ *MODULE/y;
|
|
@@ -261,7 +257,6 @@ const BAND_PATTERNS = getJunctionPatterns(String.raw`\.\/\\`);
|
|
|
261
257
|
const BOR_PATTERNS = getJunctionPatterns(String.raw`\.\\\/`);
|
|
262
258
|
const STEP = String.raw`<(?:[0-9]+|\+|\*)>`;
|
|
263
259
|
|
|
264
|
-
// The tokens of the SPEC lexical state that are not literals, with their kinds.
|
|
265
260
|
const SPEC_PATTERNS: [string, RegExp[]][] = [
|
|
266
261
|
["_BM0", [BEGIN_MODULE]],
|
|
267
262
|
["SEPARATOR", [/----+/y]],
|
|
@@ -278,7 +273,6 @@ const SPEC_PATTERNS: [string, RegExp[]][] = [
|
|
|
278
273
|
["UnnumberedStepLexeme", [new RegExp(String.raw`${STEP}(?:\*\.*|-\.*|\.+)`, "y")]],
|
|
279
274
|
];
|
|
280
275
|
|
|
281
|
-
// The tokens of the DEFAULT and PRAGMA lexical states, which skip every other character.
|
|
282
276
|
const DEFAULT_PATTERNS: [string, RegExp[]][] = [
|
|
283
277
|
["BEGIN_PRAGMA", [/--->/y]],
|
|
284
278
|
["_BM1", [BEGIN_MODULE]],
|
|
@@ -296,79 +290,78 @@ const getMatchLength = (pattern: RegExp, source: string, offset: number) => {
|
|
|
296
290
|
return pattern.exec(source)?.[0].length ?? 0;
|
|
297
291
|
};
|
|
298
292
|
|
|
299
|
-
|
|
293
|
+
interface TokenMatch {
|
|
294
|
+
kind: number;
|
|
295
|
+
length: number;
|
|
296
|
+
}
|
|
297
|
+
|
|
298
|
+
const getLongerMatch = (best: TokenMatch, match: TokenMatch) =>
|
|
299
|
+
match.length > best.length || (match.length === best.length && match.kind < best.kind)
|
|
300
|
+
? match
|
|
301
|
+
: best;
|
|
302
|
+
|
|
300
303
|
const matchPatterns = (patterns: [string, RegExp[]][], source: string, offset: number) =>
|
|
301
304
|
patterns
|
|
302
|
-
.map((
|
|
303
|
-
kind: getKind(
|
|
304
|
-
length: Math.max(...
|
|
305
|
+
.map((pattern) => ({
|
|
306
|
+
kind: getKind(pattern[0]),
|
|
307
|
+
length: Math.max(...pattern[1].map((regex) => getMatchLength(regex, source, offset))),
|
|
305
308
|
}))
|
|
306
|
-
.reduce(
|
|
307
|
-
(best, match) =>
|
|
308
|
-
match.length > best.length || (match.length === best.length && match.kind < best.kind)
|
|
309
|
-
? match
|
|
310
|
-
: best,
|
|
311
|
-
{ kind: -1, length: 0 },
|
|
312
|
-
);
|
|
309
|
+
.reduce(getLongerMatch, { kind: -1, length: 0 });
|
|
313
310
|
|
|
314
311
|
const matchSpecToken = (source: string, offset: number) => {
|
|
315
312
|
const literalLength = LITERAL_LENGTHS.find((length) =>
|
|
316
313
|
LITERALS.has(source.slice(offset, offset + length)),
|
|
317
314
|
);
|
|
318
315
|
const pattern = matchPatterns(SPEC_PATTERNS, source, offset);
|
|
319
|
-
|
|
320
|
-
|
|
321
|
-
|
|
322
|
-
|
|
323
|
-
|
|
324
|
-
|
|
325
|
-
(literal.length === pattern.length && literal.kind < pattern.kind)
|
|
326
|
-
? literal
|
|
327
|
-
: pattern;
|
|
316
|
+
return literalLength === undefined
|
|
317
|
+
? pattern
|
|
318
|
+
: getLongerMatch(pattern, {
|
|
319
|
+
kind: LITERALS.get(source.slice(offset, offset + literalLength)) ?? -1,
|
|
320
|
+
length: literalLength,
|
|
321
|
+
});
|
|
328
322
|
};
|
|
329
323
|
|
|
330
324
|
export const getTabStop = (column: number) => column + 8 - (column % 8);
|
|
331
325
|
|
|
332
|
-
// SimpleCharStream.UpdateLineColumn: the line and column of each character, with tabs stopping
|
|
333
|
-
// at multiples of 8.
|
|
334
326
|
const getPositions = (source: string) => {
|
|
335
327
|
const lines: number[] = [];
|
|
336
328
|
const columns: number[] = [];
|
|
337
|
-
|
|
329
|
+
let line = 1;
|
|
330
|
+
let column = 0;
|
|
331
|
+
let isAfterCr = false;
|
|
332
|
+
let isAfterLf = false;
|
|
338
333
|
for (const character of source) {
|
|
339
334
|
for (let unit = 0; unit < character.length; unit++) {
|
|
340
|
-
|
|
341
|
-
if (
|
|
342
|
-
|
|
343
|
-
|
|
344
|
-
|
|
345
|
-
} else if (
|
|
346
|
-
|
|
347
|
-
if (character === "\n")
|
|
335
|
+
column++;
|
|
336
|
+
if (isAfterLf) {
|
|
337
|
+
isAfterLf = false;
|
|
338
|
+
line++;
|
|
339
|
+
column = 1;
|
|
340
|
+
} else if (isAfterCr) {
|
|
341
|
+
isAfterCr = false;
|
|
342
|
+
if (character === "\n") isAfterLf = true;
|
|
348
343
|
else {
|
|
349
|
-
|
|
350
|
-
|
|
344
|
+
line++;
|
|
345
|
+
column = 1;
|
|
351
346
|
}
|
|
352
347
|
}
|
|
353
|
-
if (character === "\r")
|
|
354
|
-
else if (character === "\n")
|
|
355
|
-
else if (character === "\t")
|
|
356
|
-
lines.push(
|
|
357
|
-
columns.push(
|
|
348
|
+
if (character === "\r") isAfterCr = true;
|
|
349
|
+
else if (character === "\n") isAfterLf = true;
|
|
350
|
+
else if (character === "\t") column = getTabStop(column - 1);
|
|
351
|
+
lines.push(line);
|
|
352
|
+
columns.push(column);
|
|
358
353
|
}
|
|
359
354
|
}
|
|
360
355
|
return { lines, columns };
|
|
361
356
|
};
|
|
362
357
|
|
|
363
|
-
// The characters of a string literal that a string literal could still continue.
|
|
364
358
|
const STRING_PREFIX = /"(?:[^"\n\r\\]|\\[ntrf\\"])*\\?/y;
|
|
365
359
|
const LITERAL_PREFIXES = new Set(
|
|
366
360
|
[...LITERALS.keys()].flatMap((image) =>
|
|
367
|
-
Array.from({ length: image.length - 1 }, (
|
|
361
|
+
Array.from({ length: image.length - 1 }, (_value, index) => image.slice(0, index + 1)),
|
|
368
362
|
),
|
|
369
363
|
);
|
|
370
364
|
|
|
371
|
-
// The characters JavaCC's token manager reads at offset while some token could still continue.
|
|
372
365
|
const getTokenPrefix = (source: string, offset: number) => {
|
|
373
366
|
let length = 0;
|
|
374
367
|
while (LITERAL_PREFIXES.has(source.slice(offset, offset + length + 1))) length++;
|
|
@@ -378,12 +371,10 @@ const getTokenPrefix = (source: string, offset: number) => {
|
|
|
378
371
|
);
|
|
379
372
|
};
|
|
380
373
|
|
|
381
|
-
// A lazy token stream over source, which returns SANY's message for the TokenMgrError JavaCC's
|
|
382
|
-
// token manager throws at a character no token continues with, or at the end of the file in a
|
|
383
|
-
// comment.
|
|
384
374
|
export const createSanyLexer = (source: string) => {
|
|
385
375
|
const positions = getPositions(source);
|
|
386
|
-
|
|
376
|
+
let nextOffset = 0;
|
|
377
|
+
let mode = "DEFAULT";
|
|
387
378
|
const createToken = (kind: number, start: number, length: number): SanyToken => ({
|
|
388
379
|
kind,
|
|
389
380
|
image: source.slice(start, start + length),
|
|
@@ -393,8 +384,6 @@ export const createSanyLexer = (source: string) => {
|
|
|
393
384
|
});
|
|
394
385
|
// JavaCC places the end of the file at the file's last character.
|
|
395
386
|
const getEndOfFile = () => createToken(getKind("EOF"), source.length - 1, 0);
|
|
396
|
-
// The lexer read the characters from start to end, and TLAplusParser.parse reports the end of
|
|
397
|
-
// the file in a token that starts on an earlier line as an open comment.
|
|
398
387
|
const getLexicalError = (start: number, end: number, after: string) => {
|
|
399
388
|
const index = end - 1;
|
|
400
389
|
const line = positions.lines[index];
|
|
@@ -407,14 +396,12 @@ export const createSanyLexer = (source: string) => {
|
|
|
407
396
|
? formatLexicalError(line + 1, 0, undefined, after)
|
|
408
397
|
: formatLexicalError(line, column + 1, undefined, after);
|
|
409
398
|
};
|
|
410
|
-
// A comment is a chain of MORE matches, which restarts after each nested comment bracket, and the
|
|
411
|
-
// end of the file right after a bracket ends the token stream.
|
|
412
399
|
const skipComment = () => {
|
|
413
|
-
const start =
|
|
400
|
+
const start = nextOffset;
|
|
414
401
|
if (source.startsWith("\\*", start)) {
|
|
415
402
|
const end = source.slice(start).search(/[\n\r]/);
|
|
416
403
|
if (end === -1) return getLexicalError(start, source.length, "");
|
|
417
|
-
|
|
404
|
+
nextOffset += end + 1;
|
|
418
405
|
return undefined;
|
|
419
406
|
}
|
|
420
407
|
let depth = 0;
|
|
@@ -430,41 +417,40 @@ export const createSanyLexer = (source: string) => {
|
|
|
430
417
|
offset += 2;
|
|
431
418
|
chainStart = offset;
|
|
432
419
|
if (depth === 0) {
|
|
433
|
-
|
|
420
|
+
nextOffset = offset;
|
|
434
421
|
return undefined;
|
|
435
422
|
}
|
|
436
423
|
} else offset++;
|
|
437
424
|
}
|
|
438
|
-
|
|
425
|
+
nextOffset = offset;
|
|
439
426
|
return chainStart === source.length ? undefined : getLexicalError(chainStart, offset, "");
|
|
440
427
|
};
|
|
441
428
|
const getSkippingToken = (patterns: [string, RegExp[]][]): SanyToken => {
|
|
442
|
-
while (
|
|
443
|
-
const match = matchPatterns(patterns, source,
|
|
429
|
+
while (nextOffset < source.length) {
|
|
430
|
+
const match = matchPatterns(patterns, source, nextOffset);
|
|
444
431
|
if (match.length > 0) {
|
|
445
|
-
const token = createToken(match.kind,
|
|
446
|
-
|
|
447
|
-
if (KIND_NAMES[match.kind].startsWith("_BM"))
|
|
448
|
-
if (KIND_NAMES[match.kind] === "BEGIN_PRAGMA")
|
|
432
|
+
const token = createToken(match.kind, nextOffset, match.length);
|
|
433
|
+
nextOffset += match.length;
|
|
434
|
+
if (KIND_NAMES[match.kind].startsWith("_BM")) mode = "SPEC";
|
|
435
|
+
if (KIND_NAMES[match.kind] === "BEGIN_PRAGMA") mode = "PRAGMA";
|
|
449
436
|
return token;
|
|
450
437
|
}
|
|
451
|
-
|
|
438
|
+
nextOffset++;
|
|
452
439
|
}
|
|
453
440
|
return getEndOfFile();
|
|
454
441
|
};
|
|
455
442
|
const getNextToken = (): SanyToken | string => {
|
|
456
|
-
if (
|
|
457
|
-
if (
|
|
458
|
-
while (
|
|
459
|
-
const offset =
|
|
460
|
-
if (" \t\n\r".includes(source[offset]))
|
|
443
|
+
if (mode === "DEFAULT") return getSkippingToken(DEFAULT_PATTERNS);
|
|
444
|
+
if (mode === "PRAGMA") return getSkippingToken(PRAGMA_PATTERNS);
|
|
445
|
+
while (nextOffset < source.length) {
|
|
446
|
+
const offset = nextOffset;
|
|
447
|
+
if (" \t\n\r".includes(source[offset])) nextOffset++;
|
|
461
448
|
else if (source.startsWith("(*", offset) || source.startsWith("\\*", offset)) {
|
|
462
449
|
const error = skipComment();
|
|
463
450
|
if (error !== undefined) return error;
|
|
464
451
|
} else {
|
|
465
452
|
const match = matchSpecToken(source, offset);
|
|
466
453
|
if (match.length === 0) {
|
|
467
|
-
// JavaCC reads on while a token could continue, and one more character.
|
|
468
454
|
const prefix = getTokenPrefix(source, offset);
|
|
469
455
|
const end = Math.min(offset + prefix.length + 1, source.length);
|
|
470
456
|
const read = source.slice(offset, end);
|
|
@@ -472,7 +458,7 @@ export const createSanyLexer = (source: string) => {
|
|
|
472
458
|
return getLexicalError(offset, end, after);
|
|
473
459
|
}
|
|
474
460
|
const token = createToken(match.kind, offset, match.length);
|
|
475
|
-
|
|
461
|
+
nextOffset += match.length;
|
|
476
462
|
return token;
|
|
477
463
|
}
|
|
478
464
|
}
|
|
@@ -481,7 +467,6 @@ export const createSanyLexer = (source: string) => {
|
|
|
481
467
|
return getNextToken;
|
|
482
468
|
};
|
|
483
469
|
|
|
484
|
-
// JavaCC's TokenMgrError.addEscapes, which escapes the characters of a lexical error's message.
|
|
485
470
|
const LEXEME_ESCAPES = new Map([
|
|
486
471
|
["\b", "\\b"],
|
|
487
472
|
["\t", "\\t"],
|
|
@@ -502,8 +487,6 @@ export const escapeLexeme = (text: string) =>
|
|
|
502
487
|
(character === "\0" ? "" : `\\u${character.charCodeAt(0).toString(16).padStart(4, "0")}`),
|
|
503
488
|
);
|
|
504
489
|
|
|
505
|
-
// TokenMgrError.LexicalError: the character the lexer stopped at, or the end of the file, and the
|
|
506
|
-
// characters of the token it had read.
|
|
507
490
|
export const formatLexicalError = (
|
|
508
491
|
line: number,
|
|
509
492
|
column: number,
|
|
@@ -512,8 +495,6 @@ export const formatLexicalError = (
|
|
|
512
495
|
) =>
|
|
513
496
|
`Lexical error at line ${line}, column ${column}. Encountered: ${character === undefined ? "<EOF> " : `"${escapeLexeme(character)}" (${character.charCodeAt(0)}), `}after : "${escapeLexeme(after)}"`;
|
|
514
497
|
|
|
515
|
-
// TLC 1.7.4's lexer, which JavaCC generated without UNICODE_INPUT, reads a character past U+00FF
|
|
516
|
-
// outside a comment by its low byte, and stops at one whose low byte is below 0x80.
|
|
517
498
|
export const getSany174LexicalError = (source: string) => {
|
|
518
499
|
const readToken = createSanyLexer(source);
|
|
519
500
|
for (
|
package/src/sany/linter.ts
CHANGED
|
@@ -7,10 +7,6 @@ import {
|
|
|
7
7
|
type SemanticNode,
|
|
8
8
|
} from "./nodes";
|
|
9
9
|
|
|
10
|
-
// A port of SANY's tla2sany.linter.Linter, which warns about a record field named like a
|
|
11
|
-
// definition or declaration of the module.
|
|
12
|
-
|
|
13
|
-
// SemanticNode.getChildren.
|
|
14
10
|
const getChildren = (node: SemanticNode): (SemanticNode | undefined)[] => {
|
|
15
11
|
switch (node.kind) {
|
|
16
12
|
case "OpAppl":
|
|
@@ -35,7 +31,6 @@ const getChildren = (node: SemanticNode): (SemanticNode | undefined)[] => {
|
|
|
35
31
|
}
|
|
36
32
|
};
|
|
37
33
|
|
|
38
|
-
// Operators whose values are sets of values that a record field may range over.
|
|
39
34
|
const SET_OPERATORS = new Map([
|
|
40
35
|
["Integers", "Int"],
|
|
41
36
|
["Naturals", "Nat"],
|
|
@@ -43,8 +38,6 @@ const SET_OPERATORS = new Map([
|
|
|
43
38
|
["Reals", "Reals"],
|
|
44
39
|
]);
|
|
45
40
|
|
|
46
|
-
// Linter.isBuiltFromDeclarations: whether an expression applies a declared or bound symbol, BOOLEAN
|
|
47
|
-
// or a standard set of numbers, directly or through the definitions it applies.
|
|
48
41
|
const isBuiltFromDeclarations = (node: SemanticNode | undefined) => {
|
|
49
42
|
const visited = new Set<SemanticNode>();
|
|
50
43
|
const visit = (current: SemanticNode | undefined): boolean => {
|
|
@@ -74,7 +67,6 @@ const getFieldName = (pair: OpApplNode) => {
|
|
|
74
67
|
return name?.kind === "String" ? name : undefined;
|
|
75
68
|
};
|
|
76
69
|
|
|
77
|
-
// Records.sameDomain, given that SANY rejects a record with two fields of the same name.
|
|
78
70
|
const getDomain = (record: OpApplNode) =>
|
|
79
71
|
JSON.stringify([
|
|
80
72
|
record.operands.length,
|
|
@@ -83,7 +75,6 @@ const getDomain = (record: OpApplNode) =>
|
|
|
83
75
|
.sort(),
|
|
84
76
|
]);
|
|
85
77
|
|
|
86
|
-
// ModuleNode.getExtendedModuleSet(true).
|
|
87
78
|
const getExtendedModules = (module: ModuleNode, found = new Set<ModuleNode>()) => {
|
|
88
79
|
module.extendees.forEach((extendee) => {
|
|
89
80
|
if (found.has(extendee)) return;
|
|
@@ -93,7 +84,6 @@ const getExtendedModules = (module: ModuleNode, found = new Set<ModuleNode>()) =
|
|
|
93
84
|
return found;
|
|
94
85
|
};
|
|
95
86
|
|
|
96
|
-
// Linter.lintRecords: the warnings for the records of a module.
|
|
97
87
|
export const lintSanyModule = (module: ModuleNode): SanyMessage[] => {
|
|
98
88
|
const linted = module.records.map((record) => ({
|
|
99
89
|
domain: getDomain(record),
|
package/src/sany/modules.ts
CHANGED
|
@@ -156,8 +156,7 @@ CopiesIn(e, B) ==
|
|
|
156
156
|
5 Dec 98 : Initial version.
|
|
157
157
|
`;
|
|
158
158
|
|
|
159
|
-
//
|
|
160
|
-
// since the XML that SANY exports locates every node of them and keeps their comments.
|
|
159
|
+
// Verbatim from tla2tools.jar 2026.10.28, since SANY's XML locates every node and keeps comments.
|
|
161
160
|
export const SANY_STANDARD_MODULES = new Map([
|
|
162
161
|
["Bags", BAGS],
|
|
163
162
|
[
|
|
@@ -1289,11 +1288,11 @@ _TLCTrace ==
|
|
|
1289
1288
|
],
|
|
1290
1289
|
]);
|
|
1291
1290
|
|
|
1292
|
-
// The standard modules of TLC 1.7.4's tla2tools.jar, which has none of the later ones and older
|
|
1293
|
-
// Bags, Randomization and Toolbox modules.
|
|
1294
1291
|
export const SANY_174_STANDARD_MODULES = new Map([
|
|
1295
|
-
...[...SANY_STANDARD_MODULES].filter((
|
|
1296
|
-
["FiniteSets", "Integers", "Naturals", "RealTime", "Reals", "Sequences", "TLC"].includes(
|
|
1292
|
+
...[...SANY_STANDARD_MODULES].filter((entry) =>
|
|
1293
|
+
["FiniteSets", "Integers", "Naturals", "RealTime", "Reals", "Sequences", "TLC"].includes(
|
|
1294
|
+
entry[0],
|
|
1295
|
+
),
|
|
1297
1296
|
),
|
|
1298
1297
|
["Bags", BAGS.replace("\nLOCAL INSTANCE Naturals\n", "\nEXTENDS TLC\nLOCAL INSTANCE Naturals\n")],
|
|
1299
1298
|
[
|
|
@@ -1393,6 +1392,5 @@ _TEPosition ==
|
|
|
1393
1392
|
],
|
|
1394
1393
|
]);
|
|
1395
1394
|
|
|
1396
|
-
// The standard modules of the SANY of a TLC.
|
|
1397
1395
|
export const getSanyStandardModules = (version: TlcVersion = "master") =>
|
|
1398
1396
|
version === "1.7.4" ? SANY_174_STANDARD_MODULES : SANY_STANDARD_MODULES;
|