tla-ts 0.0.9 → 0.0.10-dev.09e53c2a6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +30 -1
- package/dist/compile.cjs +23 -0
- package/dist/compile.js +23 -0
- package/dist/deciders.cjs +41 -37
- package/dist/deciders.js +57 -53
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +109 -10
- package/dist/index.d.ts +109 -10
- package/dist/index.js +1 -1
- package/dist/parallel-worker.cjs +1 -1
- package/dist/parallel-worker.js +1 -1
- package/dist/prove-worker.cjs +1 -1
- package/dist/prove-worker.js +1 -1
- package/dist/prove.cjs +2746 -410
- package/dist/prove.js +2745 -409
- package/dist/run.cjs +146 -31
- package/dist/run.js +146 -31
- package/dist/tlapm.cjs +2 -2
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +132 -104
- package/dist/transfer.js +132 -104
- package/dist/worker.cjs +6 -6
- package/dist/worker.js +6 -6
- package/package.json +3 -1
- package/src/ast.ts +45 -59
- package/src/bags.ts +99 -102
- package/src/builtins.ts +28 -75
- package/src/bundled-modules.ts +1 -8
- package/src/check-failure.ts +116 -0
- package/src/check-trace.ts +282 -0
- package/src/check.ts +797 -782
- package/src/cli/options.ts +12 -32
- package/src/cli/run.ts +0 -2
- package/src/cli/runtime-invariants.ts +136 -0
- package/src/cli/shared.ts +19 -12
- package/src/cli/tlapm.ts +433 -82
- package/src/cli/tlc-arguments.ts +652 -0
- package/src/cli/tlc-output.ts +687 -0
- package/src/cli/tlc-usage.ts +360 -0
- package/src/cli/tlc.ts +323 -658
- package/src/cli/typescript.ts +23 -0
- package/src/cli/xml-exporter.ts +27 -49
- package/src/cli.ts +0 -1
- package/src/codegen.ts +196 -74
- package/src/config.ts +140 -109
- package/src/coverage.ts +830 -0
- package/src/dependencies.ts +36 -54
- package/src/dfid.ts +618 -0
- package/src/environment-config.ts +315 -0
- package/src/environment.ts +178 -339
- package/src/errors.ts +100 -57
- package/src/evaluate.ts +598 -340
- package/src/exit-codes.ts +38 -3
- package/src/fingerprints.ts +75 -11
- package/src/index.ts +3 -0
- package/src/instances.ts +126 -21
- package/src/java-hash.ts +7 -0
- package/src/java-overrides.ts +4 -19
- package/src/json-reader.ts +455 -0
- package/src/json.ts +252 -139
- package/src/levels.ts +46 -58
- package/src/lexer.ts +83 -101
- package/src/liveness-checker.ts +590 -311
- package/src/liveness.ts +180 -124
- package/src/obligations/action.ts +17 -44
- package/src/obligations/anonymize.ts +120 -95
- package/src/obligations/enabled-axioms.ts +218 -0
- package/src/obligations/equality.ts +1 -3
- package/src/obligations/expression.ts +37 -26
- package/src/obligations/format.ts +0 -10
- package/src/obligations/generate.ts +66 -64
- package/src/obligations/index.ts +38 -19
- package/src/obligations/levels.ts +27 -18
- package/src/obligations/module.ts +28 -55
- package/src/obligations/normalize.ts +30 -37
- package/src/obligations/operators.ts +0 -3
- package/src/obligations/pragma.ts +52 -24
- package/src/obligations/printer.ts +89 -58
- package/src/obligations/proof.ts +3 -6
- package/src/obligations/regroup.ts +0 -5
- package/src/obligations/simplify.ts +57 -63
- package/src/obligations/source.ts +119 -95
- package/src/obligations/subexpression.ts +49 -28
- package/src/obligations/substitution.ts +1 -5
- package/src/obligations/temporal.ts +12 -20
- package/src/obligations/tuples.ts +2 -10
- package/src/parallel-worker.ts +30 -60
- package/src/parallel.ts +59 -73
- package/src/parser.ts +1082 -399
- package/src/pcal/ast.ts +53 -86
- package/src/pcal/parse.ts +144 -219
- package/src/pcal/tokenize.ts +91 -131
- package/src/pcal/translate.ts +83 -130
- package/src/pcal/validate.ts +48 -68
- package/src/pretty-print.ts +7 -8
- package/src/prover/decide-pool.ts +8 -13
- package/src/prover/deciders.ts +12 -13
- package/src/prover/first-order.ts +0 -11
- package/src/prover/isabelle/decide.ts +3 -31
- package/src/prover/isabelle/encode.ts +82 -64
- package/src/prover/isabelle/isar/attrib.ts +250 -0
- package/src/prover/isabelle/isar/context.ts +335 -0
- package/src/prover/isabelle/isar/induct.ts +382 -0
- package/src/prover/isabelle/isar/inner-syntax.ts +262 -117
- package/src/prover/isabelle/isar/method.ts +510 -226
- package/src/prover/isabelle/isar/proof.ts +570 -23
- package/src/prover/isabelle/isar/rule-cases.ts +224 -0
- package/src/prover/isabelle/isar/theory.ts +488 -88
- package/src/prover/isabelle/isar/toplevel.ts +331 -0
- package/src/prover/isabelle/isar/type-check.ts +99 -38
- package/src/prover/isabelle/provers/blast/blast.ts +16 -105
- package/src/prover/isabelle/provers/blast/branch.ts +0 -33
- package/src/prover/isabelle/provers/blast/prove.ts +0 -36
- package/src/prover/isabelle/provers/blast/rules.ts +5 -45
- package/src/prover/isabelle/provers/blast/state.ts +1 -29
- package/src/prover/isabelle/provers/blast/term.ts +8 -37
- package/src/prover/isabelle/provers/clasimp.ts +0 -14
- package/src/prover/isabelle/provers/classical.ts +58 -61
- package/src/prover/isabelle/provers/hypsubst.ts +27 -52
- package/src/prover/isabelle/pure/bicompose.ts +24 -39
- package/src/prover/isabelle/pure/consts.ts +0 -8
- package/src/prover/isabelle/pure/conv.ts +2 -18
- package/src/prover/isabelle/pure/drule.ts +95 -45
- package/src/prover/isabelle/pure/envir.ts +2 -53
- package/src/prover/isabelle/pure/goal.ts +1 -9
- package/src/prover/isabelle/pure/interrupt.ts +0 -5
- package/src/prover/isabelle/pure/list.ts +0 -3
- package/src/prover/isabelle/pure/logic.ts +1 -16
- package/src/prover/isabelle/pure/name.ts +1 -10
- package/src/prover/isabelle/pure/net.ts +2 -60
- package/src/prover/isabelle/pure/object-logic.ts +15 -16
- package/src/prover/isabelle/pure/pattern.ts +1 -20
- package/src/prover/isabelle/pure/raw-simplifier.ts +16 -63
- package/src/prover/isabelle/pure/rewriter.ts +31 -74
- package/src/prover/isabelle/pure/search.ts +2 -11
- package/src/prover/isabelle/pure/seq.ts +0 -11
- package/src/prover/isabelle/pure/simplifier.ts +27 -16
- package/src/prover/isabelle/pure/table.ts +2 -33
- package/src/prover/isabelle/pure/tactic.ts +11 -23
- package/src/prover/isabelle/pure/tactical.ts +47 -48
- package/src/prover/isabelle/pure/term-ord.ts +1 -7
- package/src/prover/isabelle/pure/term.ts +1 -44
- package/src/prover/isabelle/pure/thm.ts +26 -48
- package/src/prover/isabelle/pure/type.ts +1 -16
- package/src/prover/isabelle/pure/unify.ts +19 -31
- package/src/prover/isabelle/pure/variable.ts +2 -8
- package/src/prover/isabelle/tla/classical-setup.ts +17 -25
- package/src/prover/isabelle/tla/context.ts +65 -26
- package/src/prover/isabelle/tla/logic-data.ts +1 -1
- package/src/prover/isabelle/tla/logic.ts +53 -32
- package/src/prover/isabelle/tla/simpdata.ts +45 -44
- package/src/prover/isabelle/tools/intuitionistic.ts +28 -21
- package/src/prover/ocaml.ts +4 -7
- package/src/prover/prep/action.ts +33 -66
- package/src/prover/prep/enabled-axioms.ts +22 -20
- package/src/prover/prep/fingerprint.ts +2 -21
- package/src/prover/prep/level-comparison.ts +8 -12
- package/src/prover/prep/md5.ts +0 -2
- package/src/prover/prep/methods.ts +189 -86
- package/src/prover/prep/normalize.ts +42 -37
- package/src/prover/prove-worker.ts +0 -2
- package/src/prover/prove.ts +398 -133
- package/src/prover/ptl/decide.ts +96 -56
- package/src/prover/ptl/encode.ts +15 -38
- package/src/prover/ptl/sat.ts +24 -32
- package/src/prover/ptl/tableau.ts +40 -28
- package/src/prover/smt/arithmetic.ts +310 -0
- package/src/prover/smt/axioms.ts +12 -15
- package/src/prover/smt/context.ts +60 -32
- package/src/prover/smt/data.ts +517 -401
- package/src/prover/smt/encode.ts +155 -85
- package/src/prover/smt/extensionality.ts +5 -13
- package/src/prover/smt/flatten.ts +7 -28
- package/src/prover/smt/format.ts +33 -14
- package/src/prover/smt/instances.ts +7 -11
- package/src/prover/smt/layout.ts +91 -0
- package/src/prover/smt/rewrite.ts +1026 -658
- package/src/prover/smt/simplify.ts +441 -0
- package/src/prover/smt/solver/ackermannize-bv-tactic.ts +61 -0
- package/src/prover/smt/solver/ackr-helper.ts +179 -0
- package/src/prover/smt/solver/ackr-model-converter.ts +105 -0
- package/src/prover/smt/solver/act-cache.ts +0 -16
- package/src/prover/smt/solver/add-bounds-tactic.ts +59 -0
- package/src/prover/smt/solver/aig-tactic.ts +52 -0
- package/src/prover/smt/solver/aig.ts +889 -0
- package/src/prover/smt/solver/arith-rewriter.ts +615 -53
- package/src/prover/smt/solver/arith-terms.ts +121 -0
- package/src/prover/smt/solver/array-decl-plugin.ts +175 -0
- package/src/prover/smt/solver/array-rewriter.ts +309 -0
- package/src/prover/smt/solver/array.ts +1 -3
- package/src/prover/smt/solver/asserted-formulas.ts +87 -58
- package/src/prover/smt/solver/ast-lt.ts +166 -22
- package/src/prover/smt/solver/ast-util.ts +160 -7
- package/src/prover/smt/solver/ast.ts +1424 -180
- package/src/prover/smt/solver/auf-solver.ts +7 -44
- package/src/prover/smt/solver/bit-blast-tactic.ts +582 -0
- package/src/prover/smt/solver/bit-blaster.ts +871 -0
- package/src/prover/smt/solver/bound-manager.ts +196 -0
- package/src/prover/smt/solver/bound-simplifier.ts +600 -0
- package/src/prover/smt/solver/bv-bound-chk.ts +492 -0
- package/src/prover/smt/solver/bv-decl-plugin.ts +338 -0
- package/src/prover/smt/solver/bv-divrem-bounds.ts +95 -0
- package/src/prover/smt/solver/bv-rewriter.ts +1901 -0
- package/src/prover/smt/solver/bv1-blast.ts +214 -0
- package/src/prover/smt/solver/bv2fpa-converter.ts +174 -0
- package/src/prover/smt/solver/bv2int-rewriter.ts +544 -0
- package/src/prover/smt/solver/bv2real-rewriter.ts +533 -0
- package/src/prover/smt/solver/card2bv.ts +110 -0
- package/src/prover/smt/solver/case-split-queue.ts +0 -10
- package/src/prover/smt/solver/cg-table.ts +39 -42
- package/src/prover/smt/solver/check-logic.ts +330 -0
- package/src/prover/smt/solver/clause.ts +0 -27
- package/src/prover/smt/solver/cofactor-elim-term-ite.ts +278 -0
- package/src/prover/smt/solver/conflict-resolution.ts +78 -11
- package/src/prover/smt/solver/context.ts +519 -175
- package/src/prover/smt/solver/ctx-simplify.ts +33 -50
- package/src/prover/smt/solver/ctx-solver-simplify.ts +122 -0
- package/src/prover/smt/solver/datatype-decl-plugin.ts +572 -0
- package/src/prover/smt/solver/datatype-rewriter.ts +82 -0
- package/src/prover/smt/solver/demodulator.ts +786 -0
- package/src/prover/smt/solver/dependent-expr-state.ts +81 -0
- package/src/prover/smt/solver/der.ts +39 -30
- package/src/prover/smt/solver/diff-neq.ts +206 -0
- package/src/prover/smt/solver/distribute-forall.ts +57 -0
- package/src/prover/smt/solver/dom-simplify.ts +511 -0
- package/src/prover/smt/solver/dt2bv-tactic.ts +260 -0
- package/src/prover/smt/solver/dyn-ack.ts +0 -11
- package/src/prover/smt/solver/e-matching.ts +9 -41
- package/src/prover/smt/solver/elim-small-bv-tactic.ts +129 -0
- package/src/prover/smt/solver/elim-uncnstr.ts +545 -0
- package/src/prover/smt/solver/enode.ts +100 -23
- package/src/prover/smt/solver/eq2bv-tactic.ts +218 -0
- package/src/prover/smt/solver/euf/arith-axioms.ts +403 -0
- package/src/prover/smt/solver/euf/arith-internalize.ts +653 -0
- package/src/prover/smt/solver/euf/arith-solver.ts +889 -0
- package/src/prover/smt/solver/euf/array-axioms.ts +527 -0
- package/src/prover/smt/solver/euf/array-internalize.ts +428 -0
- package/src/prover/smt/solver/euf/array-solver.ts +306 -0
- package/src/prover/smt/solver/euf/bv-ackerman.ts +162 -0
- package/src/prover/smt/solver/euf/bv-internalize.ts +748 -0
- package/src/prover/smt/solver/euf/bv-solver.ts +449 -0
- package/src/prover/smt/solver/euf/dt-solver.ts +618 -0
- package/src/prover/smt/solver/euf/egraph.ts +907 -0
- package/src/prover/smt/solver/euf/euf-solver.ts +1205 -0
- package/src/prover/smt/solver/euf/fpa-solver.ts +317 -0
- package/src/prover/smt/solver/euf/mam.ts +1050 -0
- package/src/prover/smt/solver/euf/q-ematch.ts +830 -0
- package/src/prover/smt/solver/euf/q-mbi.ts +587 -0
- package/src/prover/smt/solver/euf/q-model-fixer.ts +296 -0
- package/src/prover/smt/solver/euf/q-solver.ts +361 -0
- package/src/prover/smt/solver/euf/th-solver.ts +335 -0
- package/src/prover/smt/solver/euf/th-solvers.ts +30 -0
- package/src/prover/smt/solver/expr-ref.ts +0 -5
- package/src/prover/smt/solver/expr-safe-replace.ts +26 -7
- package/src/prover/smt/solver/expr2polynomial.ts +146 -0
- package/src/prover/smt/solver/factor.ts +141 -0
- package/src/prover/smt/solver/fd-solver.ts +265 -0
- package/src/prover/smt/solver/fingerprints.ts +15 -26
- package/src/prover/smt/solver/fix-dl-var.ts +148 -0
- package/src/prover/smt/solver/flat-literals.ts +0 -9
- package/src/prover/smt/solver/fm-tactic.ts +884 -0
- package/src/prover/smt/solver/fpa-decl-plugin.ts +618 -0
- package/src/prover/smt/solver/fpa-rewriter.ts +640 -0
- package/src/prover/smt/solver/fpa2bv-converter.ts +2249 -0
- package/src/prover/smt/solver/fpa2bv-rewriter.ts +348 -0
- package/src/prover/smt/solver/fpa2bv-tactic.ts +73 -0
- package/src/prover/smt/solver/goal.ts +176 -28
- package/src/prover/smt/solver/goal2nlsat.ts +189 -0
- package/src/prover/smt/solver/guard-set.ts +219 -0
- package/src/prover/smt/solver/hash.ts +0 -9
- package/src/prover/smt/solver/hashtable.ts +26 -23
- package/src/prover/smt/solver/inf-eps.ts +63 -0
- package/src/prover/smt/solver/inj-axiom.ts +101 -0
- package/src/prover/smt/solver/internalizer.ts +112 -132
- package/src/prover/smt/solver/lackr.ts +381 -0
- package/src/prover/smt/solver/lbool.ts +0 -2
- package/src/prover/smt/solver/lia2card.ts +268 -0
- package/src/prover/smt/solver/lia2pb.ts +154 -0
- package/src/prover/smt/solver/literal.ts +0 -4
- package/src/prover/smt/solver/logic-tactics.ts +345 -0
- package/src/prover/smt/solver/lp/bound-propagator.ts +7 -26
- package/src/prover/smt/solver/lp/constraints.ts +1 -8
- package/src/prover/smt/solver/lp/containers.ts +11 -30
- package/src/prover/smt/solver/lp/core-solver.ts +23 -29
- package/src/prover/smt/solver/lp/cross-nested.ts +5 -20
- package/src/prover/smt/solver/lp/dep-intervals.ts +6 -24
- package/src/prover/smt/solver/lp/dependency.ts +0 -5
- package/src/prover/smt/solver/lp/dioph-eq.ts +8 -103
- package/src/prover/smt/solver/lp/explanation.ts +0 -6
- package/src/prover/smt/solver/lp/gomory.ts +8 -22
- package/src/prover/smt/solver/lp/hnf-cutter.ts +16 -23
- package/src/prover/smt/solver/lp/hnf.ts +10 -28
- package/src/prover/smt/solver/lp/int-cube.ts +17 -39
- package/src/prover/smt/solver/lp/int-solver.ts +3 -35
- package/src/prover/smt/solver/lp/lar-solver.ts +69 -82
- package/src/prover/smt/solver/lp/lar-term.ts +0 -5
- package/src/prover/smt/solver/lp/lp-settings.ts +0 -14
- package/src/prover/smt/solver/lp/maximize-term.ts +76 -52
- package/src/prover/smt/solver/lp/nex-creator.ts +4 -28
- package/src/prover/smt/solver/lp/nex.ts +0 -6
- package/src/prover/smt/solver/lp/nla-backoff.ts +0 -5
- package/src/prover/smt/solver/lp/nla-basics.ts +48 -30
- package/src/prover/smt/solver/lp/nla-core.ts +91 -135
- package/src/prover/smt/solver/lp/nla-divisions.ts +31 -43
- package/src/prover/smt/solver/lp/nla-emonics.ts +3 -21
- package/src/prover/smt/solver/lp/nla-factorization.ts +0 -4
- package/src/prover/smt/solver/lp/nla-grobner.ts +22 -72
- package/src/prover/smt/solver/lp/nla-horner.ts +2 -12
- package/src/prover/smt/solver/lp/nla-intervals.ts +1 -12
- package/src/prover/smt/solver/lp/nla-monomial-bounds.ts +15 -42
- package/src/prover/smt/solver/lp/nla-monotone.ts +1 -6
- package/src/prover/smt/solver/lp/nla-order.ts +0 -13
- package/src/prover/smt/solver/lp/nla-patcher.ts +3 -7
- package/src/prover/smt/solver/lp/nla-powers.ts +220 -0
- package/src/prover/smt/solver/lp/nla-tangents.ts +0 -10
- package/src/prover/smt/solver/lp/nla-throttle.ts +0 -6
- package/src/prover/smt/solver/lp/nla-transcendentals.ts +324 -0
- package/src/prover/smt/solver/lp/nla-types.ts +0 -12
- package/src/prover/smt/solver/lp/nla-var-eqs.ts +4 -26
- package/src/prover/smt/solver/lp/nra-solver.ts +123 -112
- package/src/prover/smt/solver/lp/numeric-pair.ts +0 -4
- package/src/prover/smt/solver/lp/pdd-interval.ts +0 -3
- package/src/prover/smt/solver/lp/pdd-simplifier.ts +1 -14
- package/src/prover/smt/solver/lp/pdd-solver.ts +2 -33
- package/src/prover/smt/solver/lp/pdd.ts +7 -70
- package/src/prover/smt/solver/lp/random-updater.ts +0 -9
- package/src/prover/smt/solver/lp/static-matrix.ts +8 -19
- package/src/prover/smt/solver/lp/union-find.ts +5 -5
- package/src/prover/smt/solver/macro-finder.ts +530 -0
- package/src/prover/smt/solver/mam-compiler.ts +129 -139
- package/src/prover/smt/solver/mam-interpreter.ts +0 -21
- package/src/prover/smt/solver/max-bv-sharing-tactic.ts +17 -0
- package/src/prover/smt/solver/max-cliques.ts +105 -0
- package/src/prover/smt/solver/maxcore.ts +309 -0
- package/src/prover/smt/solver/maximize-ac-sharing.ts +8 -21
- package/src/prover/smt/solver/maxlex.ts +115 -0
- package/src/prover/smt/solver/maxsmt-base.ts +105 -0
- package/src/prover/smt/solver/maxsmt.ts +92 -0
- package/src/prover/smt/solver/mbp/mbp-arith.ts +467 -0
- package/src/prover/smt/solver/mbp/mbp-basic-tg.ts +101 -0
- package/src/prover/smt/solver/mbp/mbp-plugin.ts +287 -0
- package/src/prover/smt/solver/mbp/mbp-qel.ts +48 -0
- package/src/prover/smt/solver/mbp/mbp-solve-plugin.ts +271 -0
- package/src/prover/smt/solver/mbp/mbp-term-graph.ts +606 -0
- package/src/prover/smt/solver/model-based-opt.ts +844 -0
- package/src/prover/smt/solver/model-checker.ts +19 -62
- package/src/prover/smt/solver/model-evaluator.ts +190 -40
- package/src/prover/smt/solver/model-finder.ts +14 -32
- package/src/prover/smt/solver/model-generator.ts +56 -40
- package/src/prover/smt/solver/model-macro-solver.ts +60 -114
- package/src/prover/smt/solver/model-printer.ts +214 -0
- package/src/prover/smt/solver/mpf.ts +711 -0
- package/src/prover/smt/solver/mus.ts +51 -0
- package/src/prover/smt/solver/muz/dl-context.ts +404 -0
- package/src/prover/smt/solver/muz/dl-mk-bit-blast.ts +97 -0
- package/src/prover/smt/solver/muz/dl-mk-coi-filter.ts +167 -0
- package/src/prover/smt/solver/muz/dl-mk-elim-term-ite.ts +125 -0
- package/src/prover/smt/solver/muz/dl-mk-interp-tail-simplifier.ts +299 -0
- package/src/prover/smt/solver/muz/dl-mk-rule-inliner.ts +455 -0
- package/src/prover/smt/solver/muz/dl-mk-slice.ts +340 -0
- package/src/prover/smt/solver/muz/dl-mk-subsumption-checker.ts +163 -0
- package/src/prover/smt/solver/muz/dl-rule-set.ts +273 -0
- package/src/prover/smt/solver/muz/dl-rule-transformer.ts +123 -0
- package/src/prover/smt/solver/muz/dl-rule.ts +496 -0
- package/src/prover/smt/solver/muz/hnf.ts +201 -0
- package/src/prover/smt/solver/muz/horn-subsume-model-converter.ts +176 -0
- package/src/prover/smt/solver/muz/horn-tactic.ts +201 -0
- package/src/prover/smt/solver/muz/rule-properties.ts +337 -0
- package/src/prover/smt/solver/muz/spacer-context.ts +1406 -0
- package/src/prover/smt/solver/muz/spacer-dl-interface.ts +52 -0
- package/src/prover/smt/solver/muz/spacer-generalizers.ts +241 -0
- package/src/prover/smt/solver/muz/spacer-manager.ts +127 -0
- package/src/prover/smt/solver/muz/spacer-pdr.ts +218 -0
- package/src/prover/smt/solver/muz/spacer-prop-solver.ts +333 -0
- package/src/prover/smt/solver/muz/spacer-util.ts +282 -0
- package/src/prover/smt/solver/muz/substitution.ts +203 -0
- package/src/prover/smt/solver/nla2bv-tactic.ts +285 -0
- package/src/prover/smt/solver/nlqsat.ts +484 -0
- package/src/prover/smt/solver/nlsat/algebraic.ts +177 -160
- package/src/prover/smt/solver/nlsat/atoms.ts +24 -24
- package/src/prover/smt/solver/nlsat/evaluator.ts +16 -22
- package/src/prover/smt/solver/nlsat/explain.ts +65 -69
- package/src/prover/smt/solver/nlsat/interval-set.ts +9 -51
- package/src/prover/smt/solver/nlsat/levelwise.ts +48 -135
- package/src/prover/smt/solver/nlsat/mpbq.ts +47 -14
- package/src/prover/smt/solver/nlsat/polynomial.ts +29 -161
- package/src/prover/smt/solver/nlsat/solver.ts +241 -110
- package/src/prover/smt/solver/nlsat/transcendental-eval.ts +310 -0
- package/src/prover/smt/solver/nlsat/transcendentals.ts +367 -0
- package/src/prover/smt/solver/nlsat/types.ts +0 -9
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +1 -47
- package/src/prover/smt/solver/nlsat/upolynomial.ts +10 -93
- package/src/prover/smt/solver/nlsat-tactic.ts +82 -0
- package/src/prover/smt/solver/nnf.ts +107 -60
- package/src/prover/smt/solver/normalize-bounds.ts +53 -0
- package/src/prover/smt/solver/occf.ts +97 -0
- package/src/prover/smt/solver/opt-context.ts +787 -0
- package/src/prover/smt/solver/opt-nlsat.ts +375 -0
- package/src/prover/smt/solver/opt-pareto.ts +282 -0
- package/src/prover/smt/solver/opt-preprocess.ts +101 -0
- package/src/prover/smt/solver/opt-solver.ts +308 -0
- package/src/prover/smt/solver/opt-value.ts +55 -0
- package/src/prover/smt/solver/optsmt.ts +692 -0
- package/src/prover/smt/solver/parallel-tactic.ts +299 -0
- package/src/prover/smt/solver/pattern-inference.ts +21 -26
- package/src/prover/smt/solver/pb-rewriter.ts +284 -0
- package/src/prover/smt/solver/pb2bv-tactic.ts +540 -0
- package/src/prover/smt/solver/poly-rewriter.ts +204 -79
- package/src/prover/smt/solver/probes.ts +512 -0
- package/src/prover/smt/solver/propagate-values.ts +37 -30
- package/src/prover/smt/solver/proto-model.ts +650 -66
- package/src/prover/smt/solver/pull-quant.ts +28 -23
- package/src/prover/smt/solver/purify-arith.ts +632 -0
- package/src/prover/smt/solver/qe-arith-plugin.ts +1098 -0
- package/src/prover/smt/solver/qe-lite-der.ts +2 -31
- package/src/prover/smt/solver/qe-lite-fm.ts +4 -28
- package/src/prover/smt/solver/qe-lite.ts +39 -49
- package/src/prover/smt/solver/qe-mbp.ts +270 -0
- package/src/prover/smt/solver/qe.ts +1498 -0
- package/src/prover/smt/solver/qel.ts +25 -0
- package/src/prover/smt/solver/qi-queue.ts +0 -16
- package/src/prover/smt/solver/qsat.ts +814 -0
- package/src/prover/smt/solver/quant-hoist.ts +196 -0
- package/src/prover/smt/solver/quant-tactics.ts +17 -74
- package/src/prover/smt/solver/quantifier-analyzer.ts +26 -47
- package/src/prover/smt/solver/quantifier-manager.ts +8 -23
- package/src/prover/smt/solver/quasi-macros.ts +243 -0
- package/src/prover/smt/solver/random-gen.ts +0 -2
- package/src/prover/smt/solver/rational.ts +45 -8
- package/src/prover/smt/solver/recfun-decl-plugin.ts +261 -0
- package/src/prover/smt/solver/recfun-rewriter.ts +107 -0
- package/src/prover/smt/solver/reduce-args.ts +225 -0
- package/src/prover/smt/solver/reduce-bv-size.ts +119 -0
- package/src/prover/smt/solver/ref-vector.ts +0 -6
- package/src/prover/smt/solver/relevancy.ts +2 -16
- package/src/prover/smt/solver/rewriter-tpl.ts +52 -129
- package/src/prover/smt/solver/rewriter.ts +477 -120
- package/src/prover/smt/solver/rlimit.ts +39 -21
- package/src/prover/smt/solver/sat/asymm-branch.ts +325 -0
- package/src/prover/smt/solver/sat/big.ts +177 -0
- package/src/prover/smt/solver/sat/clause-use-list.ts +71 -0
- package/src/prover/smt/solver/sat/clause.ts +203 -0
- package/src/prover/smt/solver/sat/cleaner.ts +94 -0
- package/src/prover/smt/solver/sat/config.ts +122 -0
- package/src/prover/smt/solver/sat/consequences.ts +203 -0
- package/src/prover/smt/solver/sat/elim-eqs.ts +142 -0
- package/src/prover/smt/solver/sat/goal2sat.ts +526 -0
- package/src/prover/smt/solver/sat/inc-sat-solver.ts +378 -0
- package/src/prover/smt/solver/sat/model-converter.ts +136 -0
- package/src/prover/smt/solver/sat/pb-constraint.ts +261 -0
- package/src/prover/smt/solver/sat/pb-solver.ts +1577 -0
- package/src/prover/smt/solver/sat/probing.ts +170 -0
- package/src/prover/smt/solver/sat/sat-tactic.ts +43 -0
- package/src/prover/smt/solver/sat/sat2goal.ts +165 -0
- package/src/prover/smt/solver/sat/scc.ts +142 -0
- package/src/prover/smt/solver/sat/simplifier.ts +1618 -0
- package/src/prover/smt/solver/sat/solver.ts +2127 -0
- package/src/prover/smt/solver/sat/var-queue.ts +117 -0
- package/src/prover/smt/solver/sat/watch-list.ts +140 -0
- package/src/prover/smt/solver/search-tree.ts +284 -0
- package/src/prover/smt/solver/seq-axioms.ts +1010 -0
- package/src/prover/smt/solver/seq-decl-plugin.ts +819 -0
- package/src/prover/smt/solver/seq-derive.ts +1301 -0
- package/src/prover/smt/solver/seq-eq-approx.ts +236 -0
- package/src/prover/smt/solver/seq-eq-solver.ts +439 -0
- package/src/prover/smt/solver/seq-factory.ts +89 -0
- package/src/prover/smt/solver/seq-monadic.ts +728 -0
- package/src/prover/smt/solver/seq-range-predicate.ts +235 -0
- package/src/prover/smt/solver/seq-re-rewriter.ts +1170 -0
- package/src/prover/smt/solver/seq-re-util.ts +758 -0
- package/src/prover/smt/solver/seq-regex-bisim.ts +144 -0
- package/src/prover/smt/solver/seq-regex-live.ts +200 -0
- package/src/prover/smt/solver/seq-rewriter.ts +2402 -0
- package/src/prover/smt/solver/seq-skolem.ts +317 -0
- package/src/prover/smt/solver/seq-subset.ts +165 -0
- package/src/prover/smt/solver/seq-view-witness.ts +353 -0
- package/src/prover/smt/solver/smt-consequences.ts +297 -0
- package/src/prover/smt/solver/smt-kernel.ts +83 -0
- package/src/prover/smt/solver/smt-logics.ts +66 -0
- package/src/prover/smt/solver/smt-setup.ts +496 -0
- package/src/prover/smt/solver/smt2-printer.ts +765 -0
- package/src/prover/smt/solver/smtlib-parser.ts +3140 -365
- package/src/prover/smt/solver/smtlib-script.ts +1631 -0
- package/src/prover/smt/solver/solve-eqs.ts +929 -0
- package/src/prover/smt/solver/solver.ts +119 -39
- package/src/prover/smt/solver/sort.ts +1 -5
- package/src/prover/smt/solver/static-features.ts +314 -0
- package/src/prover/smt/solver/sticky-generations.ts +0 -6
- package/src/prover/smt/solver/tactic.ts +1986 -0
- package/src/prover/smt/solver/term-enumeration.ts +205 -0
- package/src/prover/smt/solver/theory-array.ts +1240 -0
- package/src/prover/smt/solver/theory-bv.ts +1200 -0
- package/src/prover/smt/solver/theory-char.ts +355 -0
- package/src/prover/smt/solver/theory-datatype.ts +598 -0
- package/src/prover/smt/solver/theory-finite-set.ts +30 -0
- package/src/prover/smt/solver/theory-fpa.ts +389 -0
- package/src/prover/smt/solver/theory-lra-axioms.ts +55 -25
- package/src/prover/smt/solver/theory-lra-bounds.ts +31 -11
- package/src/prover/smt/solver/theory-lra-final-check.ts +59 -91
- package/src/prover/smt/solver/theory-lra-internalize.ts +94 -53
- package/src/prover/smt/solver/theory-lra-model.ts +23 -53
- package/src/prover/smt/solver/theory-lra-propagate.ts +24 -40
- package/src/prover/smt/solver/theory-lra-state.ts +6 -27
- package/src/prover/smt/solver/theory-lra.ts +188 -8
- package/src/prover/smt/solver/theory-pb.ts +934 -0
- package/src/prover/smt/solver/theory-polymorphism.ts +58 -0
- package/src/prover/smt/solver/theory-recfun.ts +307 -0
- package/src/prover/smt/solver/theory-seq-regex.ts +867 -0
- package/src/prover/smt/solver/theory-seq-solve.ts +1373 -0
- package/src/prover/smt/solver/theory-seq-state.ts +871 -0
- package/src/prover/smt/solver/theory-seq.ts +961 -0
- package/src/prover/smt/solver/theory.ts +189 -0
- package/src/prover/smt/solver/tseitin-cnf.ts +485 -0
- package/src/prover/smt/solver/var-subst.ts +37 -39
- package/src/prover/smt/table.ts +3 -10
- package/src/prover/smt/types.ts +146 -0
- package/src/prover/tlapm/cache.ts +67 -41
- package/src/prover/tlapm/ocaml-marshal.ts +19 -21
- package/src/prover/tlapm/tlapm.ts +21 -20
- package/src/prover/tlapm-library.ts +3208 -0
- package/src/prover/verdict.ts +9 -2
- package/src/prover/zenon/check/check.ts +1 -11
- package/src/prover/zenon/check/definitions.ts +5 -15
- package/src/prover/zenon/check/equality.ts +0 -8
- package/src/prover/zenon/check/functions.ts +0 -4
- package/src/prover/zenon/check/keys.ts +0 -7
- package/src/prover/zenon/check/propositional.ts +0 -3
- package/src/prover/zenon/check/records.ts +1 -6
- package/src/prover/zenon/check/relations.ts +2 -14
- package/src/prover/zenon/check/rewrites.ts +2 -21
- package/src/prover/zenon/check/sets.ts +40 -61
- package/src/prover/zenon/check/terms.ts +1 -19
- package/src/prover/zenon/check/tla.ts +0 -6
- package/src/prover/zenon/decide.ts +10 -19
- package/src/prover/zenon/encode.ts +0 -9
- package/src/prover/zenon/eqrel.ts +2 -15
- package/src/prover/zenon/equality-rules.ts +0 -6
- package/src/prover/zenon/expr.ts +8 -28
- package/src/prover/zenon/index-table.ts +26 -59
- package/src/prover/zenon/isar-case.ts +8 -20
- package/src/prover/zenon/isar.ts +35 -65
- package/src/prover/zenon/limits.ts +0 -4
- package/src/prover/zenon/llproof.ts +2 -22
- package/src/prover/zenon/mltoll.ts +66 -106
- package/src/prover/zenon/node.ts +20 -15
- package/src/prover/zenon/ocaml.ts +1 -17
- package/src/prover/zenon/parse.ts +9 -13
- package/src/prover/zenon/phrase.ts +1 -13
- package/src/prover/zenon/proof.ts +0 -11
- package/src/prover/zenon/propositional-rules.ts +0 -7
- package/src/prover/zenon/rules.ts +2 -8
- package/src/prover/zenon/search.ts +11 -35
- package/src/prover/zenon/tla/functions.ts +59 -33
- package/src/prover/zenon/tla/llproof.ts +67 -78
- package/src/prover/zenon/tla/records.ts +57 -35
- package/src/prover/zenon/tla/rewrites.ts +12 -21
- package/src/prover/zenon/tla/sets.ts +88 -59
- package/src/prover/zenon/tla/terms.ts +0 -8
- package/src/prover/zenon/tla/tla.ts +66 -66
- package/src/randomization.ts +81 -35
- package/src/resolve.ts +67 -185
- package/src/runtime.ts +26 -22
- package/src/sany/builtins.ts +2 -5
- package/src/sany/generation.ts +394 -0
- package/src/sany/generator-def-entries.ts +210 -0
- package/src/sany/generator-definitions.ts +686 -0
- package/src/sany/generator-expressions.ts +1100 -0
- package/src/sany/generator-proofs.ts +662 -0
- package/src/sany/generator.ts +191 -2764
- package/src/sany/levels.ts +5 -35
- package/src/sany/lexer.ts +58 -77
- package/src/sany/linter.ts +0 -10
- package/src/sany/modules.ts +1 -5
- package/src/sany/nodes.ts +5 -43
- package/src/sany/parse-error.ts +39 -117
- package/src/sany/report.ts +32 -69
- package/src/sany/selectors.ts +49 -76
- package/src/sany/source.ts +1 -17
- package/src/sany/xml.ts +35 -117
- package/src/search.ts +671 -169
- package/src/simulate.ts +712 -0
- package/src/spec-description.ts +192 -100
- package/src/standard-definitions.ts +4 -4
- package/src/standard-modules.ts +264 -95
- package/src/state-graph.ts +52 -33
- package/src/subexpressions.ts +69 -52
- package/src/substitution-levels.ts +7 -7
- package/src/successors.ts +267 -100
- package/src/symmetry.ts +35 -27
- package/src/tableau.ts +29 -26
- package/src/tlc/fingerprint.ts +267 -79
- package/src/tlc/jar-data.ts +112 -6
- package/src/tlc/messages.ts +125 -54
- package/src/tlc/order.ts +39 -69
- package/src/tlc/random.ts +37 -49
- package/src/tlc/replay.ts +553 -228
- package/src/tlc/summary.ts +64 -60
- package/src/tlc/tlc-operators.ts +78 -44
- package/src/tlc/tlcext-operators.ts +171 -122
- package/src/tlc/trace-spec.ts +249 -0
- package/src/tlc/value-stream.ts +139 -0
- package/src/tlc/version.ts +1 -4
- package/src/transfer.ts +22 -25
- package/src/typed-tier.ts +6535 -0
- package/src/typescript/actions.ts +479 -0
- package/src/typescript/collections.ts +614 -0
- package/src/typescript/compile.ts +63 -0
- package/src/typescript/context.ts +94 -0
- package/src/typescript/emit.ts +121 -0
- package/src/typescript/expressions.ts +496 -0
- package/src/typescript/formula.ts +154 -0
- package/src/typescript/functions.ts +284 -0
- package/src/typescript/model.ts +162 -0
- package/src/typescript/names.ts +114 -0
- package/src/typescript/program.ts +48 -0
- package/src/typescript/properties.ts +139 -0
- package/src/typescript/scope.ts +112 -0
- package/src/typescript/steps.ts +167 -0
- package/src/typescript/types.ts +171 -0
- package/src/values.ts +832 -484
- package/src/worker.ts +7 -8
- package/src/prover/isabelle/isar/statement.ts +0 -57
- package/src/prover/smt/solver/z3-license.txt +0 -10
- package/src/prover/tlaps-module.ts +0 -510
- package/src/prover/zenon/LICENSE +0 -32
package/src/tlc/messages.ts
CHANGED
|
@@ -1,24 +1,32 @@
|
|
|
1
1
|
import {
|
|
2
2
|
getErrorExitCode,
|
|
3
|
+
getUnexpectedException,
|
|
3
4
|
STACK_OVERFLOW_MESSAGE,
|
|
4
5
|
TlaEvaluationError,
|
|
5
6
|
TlaModuleError,
|
|
7
|
+
TlaSetBoundError,
|
|
8
|
+
TlaStackOverflowError,
|
|
9
|
+
TlaUncodedError,
|
|
10
|
+
TlaWarningAsError,
|
|
11
|
+
TOO_MANY_STATES_MESSAGE,
|
|
6
12
|
UNEXPECTED_EVAL_EXCEPTION,
|
|
7
13
|
UNEXPECTED_EXCEPTION,
|
|
8
14
|
} from "../errors";
|
|
9
15
|
import { setExitCode } from "../exit-codes";
|
|
10
16
|
import type { TlcVersion } from "./version";
|
|
11
17
|
|
|
12
|
-
// TLC's codes for the messages it prints, from tlc2.output.EC.
|
|
13
18
|
export const MESSAGE_CODE = {
|
|
14
19
|
general: 1000,
|
|
20
|
+
stackOverflow: 1005,
|
|
15
21
|
commandLineError: 1102,
|
|
16
22
|
initialState: 2102,
|
|
17
23
|
nestedExpression: 2103,
|
|
18
24
|
assumptionFalse: 2104,
|
|
19
25
|
assumptionEvaluationError: 2105,
|
|
26
|
+
unchangedVariableChanged: 2143,
|
|
20
27
|
exceptAppliedToUnknownField: 2144,
|
|
21
28
|
fingerprintFailed: 2147,
|
|
29
|
+
initialStateIncomplete: 2106,
|
|
22
30
|
invariantViolatedInitial: 2107,
|
|
23
31
|
incompleteSuccessor: 2109,
|
|
24
32
|
propertyViolatedInitial: 2108,
|
|
@@ -28,13 +36,20 @@ export const MESSAGE_CODE = {
|
|
|
28
36
|
actionPropertyEvaluationFailed: 2113,
|
|
29
37
|
deadlockReached: 2114,
|
|
30
38
|
temporalPropertyViolated: 2116,
|
|
39
|
+
noInitialStates: 2118,
|
|
40
|
+
errorState: 2120,
|
|
31
41
|
behaviorUpToThisPoint: 2121,
|
|
32
42
|
backToState: 2122,
|
|
43
|
+
subscriptUndetermined: 2139,
|
|
44
|
+
subscriptMissingVariable: 2140,
|
|
33
45
|
constantLevelInvariant: 2149,
|
|
34
46
|
javaOverrideLoaded: 2168,
|
|
35
47
|
starting: 2185,
|
|
36
48
|
modelChecking: 2187,
|
|
49
|
+
simulating: 2188,
|
|
37
50
|
finished: 2186,
|
|
51
|
+
traceSpecWritten: 2501,
|
|
52
|
+
traceSpecFailed: 2502,
|
|
38
53
|
computingInit: 2189,
|
|
39
54
|
initGenerated1: 2190,
|
|
40
55
|
initGenerated2: 2191,
|
|
@@ -43,14 +58,27 @@ export const MESSAGE_CODE = {
|
|
|
43
58
|
searchDepth: 2194,
|
|
44
59
|
stats: 2199,
|
|
45
60
|
progress: 2200,
|
|
61
|
+
coverageStart: 2201,
|
|
62
|
+
coverageEnd: 2202,
|
|
63
|
+
coverageValue: 2221,
|
|
64
|
+
depthFirstStats: 2204,
|
|
65
|
+
depthFirstLevel: 2205,
|
|
66
|
+
depthFirstProgress: 2206,
|
|
67
|
+
depthFirstInitGenerated: 2208,
|
|
68
|
+
simulationProgress: 2209,
|
|
69
|
+
simulationStats: 2210,
|
|
46
70
|
temporalBranches: 2212,
|
|
71
|
+
statePrint1: 2216,
|
|
47
72
|
statePrint2: 2217,
|
|
48
73
|
statePrint3: 2218,
|
|
49
74
|
sanyFinished: 2219,
|
|
50
75
|
startingSany: 2220,
|
|
51
76
|
stateLevelProperty: 2255,
|
|
77
|
+
noInitialStatesInModel: 2256,
|
|
52
78
|
version: 2262,
|
|
79
|
+
depthFirstModelChecking: 2271,
|
|
53
80
|
noSpecificationButProperty: 2257,
|
|
81
|
+
fairnessTautology: 2258,
|
|
54
82
|
noFairnessButProperty: 2259,
|
|
55
83
|
counterExample: 2264,
|
|
56
84
|
checkingTemporalEnd: 2267,
|
|
@@ -62,17 +90,23 @@ export const MESSAGE_CODE = {
|
|
|
62
90
|
javaOverrideMismatch: 2400,
|
|
63
91
|
postconditionFalse: 2404,
|
|
64
92
|
postconditionFailed: 2405,
|
|
93
|
+
coverageNext: 2772,
|
|
94
|
+
coverageInit: 2773,
|
|
95
|
+
coverageProperty: 2774,
|
|
96
|
+
coverageValueCost: 2775,
|
|
97
|
+
coverageEndOverhead: 2777,
|
|
98
|
+
coverageConstraint: 2778,
|
|
99
|
+
coverageVariable: 2779,
|
|
65
100
|
possibleUnwitnessed: 2780,
|
|
66
101
|
parsingFailed: 3002,
|
|
67
102
|
configFileError: 5001,
|
|
103
|
+
moduleOverrideStdout: 20000,
|
|
68
104
|
} as const;
|
|
69
105
|
|
|
70
|
-
// TLC's message levels, from tlc2.output.MP.
|
|
71
106
|
export const MESSAGE_LEVEL = { none: 0, error: 1, warning: 3, state: 4 } as const;
|
|
72
107
|
|
|
73
108
|
type MessageLevel = (typeof MESSAGE_LEVEL)[keyof typeof MESSAGE_LEVEL];
|
|
74
109
|
|
|
75
|
-
// Without -tool, TLC starts a message with the prefix of its level.
|
|
76
110
|
const LEVEL_PREFIXES: Record<MessageLevel, string> = {
|
|
77
111
|
0: "",
|
|
78
112
|
1: "Error: ",
|
|
@@ -82,33 +116,43 @@ const LEVEL_PREFIXES: Record<MessageLevel, string> = {
|
|
|
82
116
|
|
|
83
117
|
export interface MessagePrinter {
|
|
84
118
|
isTool: boolean;
|
|
119
|
+
isDiffTrace: boolean;
|
|
85
120
|
version: TlcVersion;
|
|
86
121
|
print: (code: number, level: MessageLevel, text: string) => void;
|
|
87
122
|
}
|
|
88
123
|
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
124
|
+
interface MessagePrinterOptions {
|
|
125
|
+
isTool: boolean;
|
|
126
|
+
isWarningEnabled?: boolean;
|
|
127
|
+
isDiffTrace?: boolean;
|
|
128
|
+
version?: TlcVersion;
|
|
129
|
+
suppressedCodes?: number[];
|
|
130
|
+
errorCodes?: number[];
|
|
131
|
+
}
|
|
132
|
+
|
|
133
|
+
export const formatMessage = (isTool: boolean, code: number, level: MessageLevel, text: string) =>
|
|
134
|
+
isTool
|
|
135
|
+
? `@!@!@STARTMSG ${code}:${level} @!@!@\n${text}\n@!@!@ENDMSG ${code} @!@!@`
|
|
136
|
+
: `${LEVEL_PREFIXES[level]}${text}`;
|
|
137
|
+
|
|
138
|
+
export const createMessagePrinter = (options: MessagePrinterOptions): MessagePrinter => {
|
|
98
139
|
const warnings = new Set<string>();
|
|
99
140
|
return {
|
|
100
|
-
isTool,
|
|
101
|
-
|
|
141
|
+
isTool: options.isTool,
|
|
142
|
+
isDiffTrace: options.isDiffTrace ?? false,
|
|
143
|
+
version: options.version ?? "master",
|
|
102
144
|
print: (code, level, text) => {
|
|
103
145
|
const isWarning = level === MESSAGE_LEVEL.warning;
|
|
104
|
-
if (isWarning &&
|
|
146
|
+
if (isWarning && options.errorCodes?.includes(code)) {
|
|
147
|
+
throw new TlaWarningAsError(code, text);
|
|
148
|
+
}
|
|
149
|
+
if (isWarning && options.isWarningEnabled === false) return;
|
|
150
|
+
if (level !== MESSAGE_LEVEL.error && options.suppressedCodes?.includes(code)) return;
|
|
105
151
|
const hint =
|
|
106
|
-
isWarning && !isTool && warnings.size === 0
|
|
152
|
+
isWarning && !options.isTool && warnings.size === 0
|
|
107
153
|
? "\n(Use the -nowarning option to disable this warning.)"
|
|
108
154
|
: "";
|
|
109
|
-
const message = isTool
|
|
110
|
-
? `@!@!@STARTMSG ${code}:${level} @!@!@\n${text}\n@!@!@ENDMSG ${code} @!@!@`
|
|
111
|
-
: `${LEVEL_PREFIXES[level]}${text}${hint}`;
|
|
155
|
+
const message = formatMessage(options.isTool, code, level, `${text}${hint}`);
|
|
112
156
|
if (isWarning && warnings.has(message)) return;
|
|
113
157
|
if (isWarning) warnings.add(message);
|
|
114
158
|
console.log(message);
|
|
@@ -116,19 +160,22 @@ export const createMessagePrinter = (
|
|
|
116
160
|
};
|
|
117
161
|
};
|
|
118
162
|
|
|
119
|
-
// TLC 1.7.4's message for a missing initial predicate, which blames a parameterized INSTANCE as
|
|
120
|
-
// well.
|
|
121
163
|
export const MISSING_INIT_174 =
|
|
122
164
|
"The configuration file did not specify the initial state predicate.\nCan also be caused by trying to run TLC on a specification from\na module imported with a parameterized INSTANCE statement.";
|
|
123
165
|
|
|
124
|
-
// The messages that TLC builds from a message code, from tlc2.output.MP, by their code and
|
|
125
|
-
// template, with whether TLC throws them as an EvalException rather than a TLCRuntimeException.
|
|
126
|
-
// TLC's -tool output wraps such a message in its own markers even inside another message.
|
|
127
166
|
const CODED_MESSAGES: [code: number, template: string, isEvalException: boolean][] = [
|
|
128
167
|
[1005, STACK_OVERFLOW_MESSAGE, false],
|
|
168
|
+
[
|
|
169
|
+
1000,
|
|
170
|
+
"In evaluating TLCExt!Trace, the state is not completely specified yet (variable%1% %2% undefined).",
|
|
171
|
+
false,
|
|
172
|
+
],
|
|
173
|
+
[1000, "Could not find operator: %1% in module: %2%", false],
|
|
129
174
|
[2117, "Failed to recover the next state from its fingerprint.", true],
|
|
130
175
|
[2123, "Failed to recover the initial state from its fingerprint.", true],
|
|
131
176
|
[2132, "The first argument of Assert evaluated to FALSE; the second argument was:\n%1%", true],
|
|
177
|
+
[2143, "The variable %1% was changed while it is specified as UNCHANGED at\n%2%", false],
|
|
178
|
+
[2144, "The EXCEPT was applied to non-existing fields of the value at\n%1%", false],
|
|
132
179
|
[2145, "TLCGet(%1%) was undefined.", true],
|
|
133
180
|
[
|
|
134
181
|
2154,
|
|
@@ -147,8 +194,13 @@ const CODED_MESSAGES: [code: number, template: string, isEvalException: boolean]
|
|
|
147
194
|
"Attempted to apply TransitiveClosure to a set containing\nthe following value:\n%1%",
|
|
148
195
|
true,
|
|
149
196
|
],
|
|
197
|
+
[2156, "TLC supports at most %1% model values, but model value %2% exceeds this limit.", false],
|
|
198
|
+
[2156, "tla-ts can't recover a model check from the checkpoint in %1%.", false],
|
|
150
199
|
[2165, "Choose can only deal with numbers up to %1%", false],
|
|
151
200
|
[2169, "The %1% argument of %2% should be a %3%, but instead it is:\n%4%", true],
|
|
201
|
+
[2170, "Argument mismatch in operator application.%1%", false],
|
|
202
|
+
[2171, "Parsing or semantic analysis failed.%1%", false],
|
|
203
|
+
[2172, TOO_MANY_STATES_MESSAGE, false],
|
|
152
204
|
[2176, "Applying %1% to the following value,\nwhich is not %2%:\n%3%", true],
|
|
153
205
|
[
|
|
154
206
|
2177,
|
|
@@ -207,12 +259,23 @@ const CODED_MESSAGES: [code: number, template: string, isEvalException: boolean]
|
|
|
207
259
|
[2233, "The %1% %2% cannot be a constant.", false],
|
|
208
260
|
[2234, "The operator %1% cannot take any argument.", false],
|
|
209
261
|
[2235, "The operator %1% is not defined in the spec.", false],
|
|
262
|
+
[2236, "The operator %1%, which equals %2%,\ncannot be used as a %3%", false],
|
|
210
263
|
[2237, "The spec is trivially false because %1% is false.", false],
|
|
211
264
|
[2238, "TLC cannot handle subscript %1%", false],
|
|
212
265
|
[2239, "TLC cannot handle this conjunct of the spec:\n%1%", false],
|
|
266
|
+
[
|
|
267
|
+
2240,
|
|
268
|
+
"The specification contains more than one conjunct of the form [][Next]_v,\nbut TLC can handle only specifications with one next-state relation.",
|
|
269
|
+
false,
|
|
270
|
+
],
|
|
213
271
|
[2241, "The property %1% is not correctly defined.", false],
|
|
214
272
|
[2242, "The arity of the operator %1% is inconsistent in the configuration file.", false],
|
|
215
273
|
[2244, "TLC can't handle real numbers.\n%1%", false],
|
|
274
|
+
[
|
|
275
|
+
2245,
|
|
276
|
+
"In the configuration file, the module name %1% is not a module in the specification.",
|
|
277
|
+
false,
|
|
278
|
+
],
|
|
216
279
|
[2247, "In computing %1%, TLC expected a %2% expression,\nbut instead found %3%.\n%4%", false],
|
|
217
280
|
[2248, "In computing %1%, TLC expected a %2% expression,\nbut didn't find one.\n%3%", false],
|
|
218
281
|
[2260, "In computing ENABLED, TLC encountered a temporal formula (%1%).\n%2%", false],
|
|
@@ -223,6 +286,21 @@ const CODED_MESSAGES: [code: number, template: string, isEvalException: boolean]
|
|
|
223
286
|
],
|
|
224
287
|
[2265, "TLC can't handle a number this big.\n%1%", false],
|
|
225
288
|
[2266, "The %1% argument of %2% should be an %3%, but instead it is:\n%4%", true],
|
|
289
|
+
[
|
|
290
|
+
2272,
|
|
291
|
+
"The formula %1% at %2% is an action-level formula (i.e., it contains no temporal operators). Only temporal-level (or state-level) formulas are allowed under PROPERTY or PROPERTIES. To check that action %1% holds in *every* step of the behavior, define a temporal property: Let A be the formula at %2%; rewrite A as [][A]_v, where v is a state function (typically the tuple of variables) (compare page 90 of Specifying Systems at https://lamport.azurewebsites.net/tla/book.html).",
|
|
292
|
+
false,
|
|
293
|
+
],
|
|
294
|
+
[
|
|
295
|
+
2273,
|
|
296
|
+
'The formula %1% at %2% is an action-level formula (i.e., it contains no temporal operators). Only temporal-level (or state-level) formulas are allowed under PROPERTY or PROPERTIES. To check that action %1% holds in *every* step of the behavior, define a temporal property by applying the "always" temporal operator ([]) to the formula at %2% (compare page 90 of Specifying Systems at https://lamport.azurewebsites.net/tla/book.html).',
|
|
297
|
+
false,
|
|
298
|
+
],
|
|
299
|
+
[
|
|
300
|
+
2274,
|
|
301
|
+
'The formula %1% at %2% is an action-level formula (i.e., it contains no temporal operators). Only temporal-level (or state-level) formulas are allowed under PROPERTY or PROPERTIES. To check that infinitely many %1% steps occur, define a temporal property by applying the "always eventually" temporal operator combination ([]<>) to the formula at %2% (compare page 91 of Specifying Systems at https://lamport.azurewebsites.net/tla/book.html).',
|
|
302
|
+
false,
|
|
303
|
+
],
|
|
226
304
|
[2280, "In evaluation, the identifier %1% is either undefined or not an operator.\n%2%", false],
|
|
227
305
|
[2281, "The configuration file substitutes constant %1% with non-constant %2%%3%", false],
|
|
228
306
|
[2283, "The argument of %1% should be a %2%, but instead it is:\n%3%", true],
|
|
@@ -249,6 +327,8 @@ const CODED_MESSAGES: [code: number, template: string, isEvalException: boolean]
|
|
|
249
327
|
[5007, "TLC found an error in the configuration file:\n%1%", false],
|
|
250
328
|
// The general message is a prefix of the others above.
|
|
251
329
|
[5002, "TLC found an error in the configuration file at line %1%\n", false],
|
|
330
|
+
[2250, "A state predicate was evaluated to a non-boolean value.", false],
|
|
331
|
+
[2252, "Encountered an action predicate that's not a boolean.", false],
|
|
252
332
|
[2253, "Temporal formula is a tautology (its negation is unsatisfiable).", false],
|
|
253
333
|
[
|
|
254
334
|
2301,
|
|
@@ -262,12 +342,10 @@ interface CodedMessage {
|
|
|
262
342
|
isEvalException: boolean;
|
|
263
343
|
}
|
|
264
344
|
|
|
265
|
-
|
|
266
|
-
value: undefined as { pattern: RegExp; message: CodedMessage }[] | undefined,
|
|
267
|
-
};
|
|
345
|
+
let codedMessagePatterns: { pattern: RegExp; message: CodedMessage }[] | undefined;
|
|
268
346
|
|
|
269
347
|
const getCodedMessagePatterns = () =>
|
|
270
|
-
(codedMessagePatterns
|
|
348
|
+
(codedMessagePatterns ??= CODED_MESSAGES.map(([code, template, isEvalException]) => ({
|
|
271
349
|
pattern: new RegExp(
|
|
272
350
|
`^${template
|
|
273
351
|
.split(/%\d+%/)
|
|
@@ -277,33 +355,27 @@ const getCodedMessagePatterns = () =>
|
|
|
277
355
|
message: { code, isEvalException },
|
|
278
356
|
})));
|
|
279
357
|
|
|
280
|
-
// The overflows of SetOfFcnsValue and SetOfTuplesValue, which TLC raises with a plain message that
|
|
281
|
-
// reads like the coded overflow of SetOfRcdsValue and SubsetValue.
|
|
282
358
|
const UNCODED_MESSAGE_PATTERN =
|
|
283
|
-
/^Overflow when computing the number of elements in( |:\n\[(?![A-Za-z0-9_]
|
|
359
|
+
/^Overflow when computing the number of elements in( |:\n\[(?![A-Za-z0-9_]+: ))|\nis an element of a set of \d+-tuples\.$|^In computing ENABLED, TLC encountered a temporal formula \(a (~> b|-\+-> formula)\)\./;
|
|
284
360
|
|
|
285
361
|
export const getCodedMessage = (text: string): CodedMessage | undefined =>
|
|
286
362
|
UNCODED_MESSAGE_PATTERN.test(text)
|
|
287
363
|
? undefined
|
|
288
364
|
: getCodedMessagePatterns().find((item) => item.pattern.test(text))?.message;
|
|
289
365
|
|
|
290
|
-
// Whether TLC raises an error as an EvalException, which only a standard module's Java code throws,
|
|
291
|
-
// rather than as the TLCRuntimeException of every Assert.fail.
|
|
292
366
|
export const isEvalException = (error: TlaEvaluationError) =>
|
|
293
367
|
error instanceof TlaModuleError || getCodedMessage(error.message)?.isEvalException === true;
|
|
294
368
|
|
|
295
|
-
// The messages that end with the message of the error they report, after this text.
|
|
296
369
|
const INNER_MESSAGE_PREFIXES = new Map([
|
|
297
|
-
// "The exception was a <class>\n: "
|
|
298
370
|
[1000, "\n: "],
|
|
299
371
|
[2105, "failed.\n"],
|
|
300
372
|
[2154, "but it produced the following error:\n"],
|
|
373
|
+
[2171, "Parsing or semantic analysis failed."],
|
|
301
374
|
[2213, ":\n"],
|
|
302
375
|
[2281, " - specifically: "],
|
|
376
|
+
[2405, "failed.\n"],
|
|
303
377
|
]);
|
|
304
378
|
|
|
305
|
-
// The text of a coded message with the message of the error it reports marked in -tool output, as
|
|
306
|
-
// TLC's message holds that error's text as TLC printed it.
|
|
307
379
|
export const formatInnerMessage = (code: number, text: string, isTool: boolean) => {
|
|
308
380
|
const prefix = isTool ? INNER_MESSAGE_PREFIXES.get(code) : undefined;
|
|
309
381
|
const index = prefix === undefined ? -1 : text.indexOf(prefix);
|
|
@@ -312,7 +384,6 @@ export const formatInnerMessage = (code: number, text: string, isTool: boolean)
|
|
|
312
384
|
return `${text.slice(0, end)}${formatNestedMessage(text.slice(end), isTool)}`;
|
|
313
385
|
};
|
|
314
386
|
|
|
315
|
-
// The text of an error's message as TLC prints it inside another message.
|
|
316
387
|
export const formatNestedMessage = (text: string, isTool: boolean): string => {
|
|
317
388
|
const code = isTool ? getCodedMessage(text)?.code : undefined;
|
|
318
389
|
return code === undefined
|
|
@@ -320,9 +391,8 @@ export const formatNestedMessage = (text: string, isTool: boolean): string => {
|
|
|
320
391
|
: `@!@!@STARTMSG ${code}:${MESSAGE_LEVEL.none} @!@!@\n${formatInnerMessage(code, text, isTool)}\n@!@!@ENDMSG ${code} @!@!@`;
|
|
321
392
|
};
|
|
322
393
|
|
|
323
|
-
const zeroPad = (value: number) => String(value).padStart(
|
|
394
|
+
export const zeroPad = (value: number, length = 2) => String(value).padStart(length, "0");
|
|
324
395
|
|
|
325
|
-
// TLC's convertRuntimeToHumanReadable: a duration in its two largest units.
|
|
326
396
|
export const formatTlcDuration = (milliseconds: number) => {
|
|
327
397
|
const seconds = Math.floor(milliseconds / 1000) % 60;
|
|
328
398
|
const minutes = Math.floor(milliseconds / 60_000) % 60;
|
|
@@ -334,12 +404,9 @@ export const formatTlcDuration = (milliseconds: number) => {
|
|
|
334
404
|
: `${zeroPad(seconds)}s`;
|
|
335
405
|
};
|
|
336
406
|
|
|
337
|
-
// TLC's SimpleDateFormat("yyyy-MM-dd HH:mm:ss") in the local time zone.
|
|
338
407
|
export const formatTlcDate = (date: Date) =>
|
|
339
408
|
`${date.getFullYear()}-${zeroPad(date.getMonth() + 1)}-${zeroPad(date.getDate())} ${zeroPad(date.getHours())}:${zeroPad(date.getMinutes())}:${zeroPad(date.getSeconds())}`;
|
|
340
409
|
|
|
341
|
-
// An error that TLC reports with a message of its own, by that message's code and first line, and
|
|
342
|
-
// the error whose message follows.
|
|
343
410
|
interface HeadedError {
|
|
344
411
|
code: number;
|
|
345
412
|
headline: string;
|
|
@@ -360,18 +427,16 @@ export const withHeadline = (error: unknown, code: number, headline: string) =>
|
|
|
360
427
|
|
|
361
428
|
export const isHeadedError = (error: Error) => headedErrors.has(error);
|
|
362
429
|
|
|
430
|
+
const WRONG_INVOCATION_EXCEPTION = getUnexpectedException("util.WrongInvocationException");
|
|
431
|
+
|
|
363
432
|
const UNEXPECTED_HEADLINE = UNEXPECTED_EXCEPTION.slice(0, UNEXPECTED_EXCEPTION.indexOf("\n"));
|
|
364
433
|
|
|
365
|
-
// TLC 1.7.4's Worker wraps an error in adding a successor in a RuntimeException, whose message
|
|
366
|
-
// names the class of the error.
|
|
367
434
|
const WRAPPED_EVAL_EXCEPTION = `${UNEXPECTED_EXCEPTION}tlc2.tool.EvalException: `;
|
|
368
435
|
const WRAPPED_RUNTIME_EXCEPTION = `${UNEXPECTED_EXCEPTION}util.Assert$TLCRuntimeException: `;
|
|
369
436
|
|
|
370
437
|
export const getWrappedException = (error: TlaEvaluationError) =>
|
|
371
438
|
isEvalException(error) ? WRAPPED_EVAL_EXCEPTION : WRAPPED_RUNTIME_EXCEPTION;
|
|
372
439
|
|
|
373
|
-
// TLC reports an EvalException, or a TLCRuntimeException without a message of its own, as an
|
|
374
|
-
// exception it didn't expect.
|
|
375
440
|
export const withUnexpectedException = <Result>(compute: () => Result) => {
|
|
376
441
|
try {
|
|
377
442
|
return compute();
|
|
@@ -392,19 +457,15 @@ const UNEXPECTED_EXCEPTION_PREFIXES = [
|
|
|
392
457
|
UNEXPECTED_EVAL_EXCEPTION,
|
|
393
458
|
];
|
|
394
459
|
|
|
395
|
-
// The text of an error's message, with the message of a coded error inside it marked in -tool
|
|
396
|
-
// output as TLC marks it.
|
|
397
460
|
const formatErrorMessage = (error: TlaEvaluationError, isTool: boolean): string => {
|
|
398
461
|
const headed = headedErrors.get(error);
|
|
399
462
|
if (headed) return `${headed.headline}\n${formatErrorMessage(headed.inner, isTool)}`;
|
|
400
463
|
const message = error.message;
|
|
464
|
+
if (error instanceof TlaUncodedError) return message;
|
|
401
465
|
const prefix = UNEXPECTED_EXCEPTION_PREFIXES.find((start) => message.startsWith(start)) ?? "";
|
|
402
466
|
return `${prefix}${formatNestedMessage(message.slice(prefix.length), isTool)}`;
|
|
403
467
|
};
|
|
404
468
|
|
|
405
|
-
// How TLC reports an error: with the code of its own message for an error that it reports with a
|
|
406
|
-
// headline; and, when the error escapes the computation of next states, with the code of an
|
|
407
|
-
// EvalException, or as an unexpected exception for any other error.
|
|
408
469
|
export interface FailureMessage {
|
|
409
470
|
code: number;
|
|
410
471
|
message: string;
|
|
@@ -424,6 +485,13 @@ export const getFailureMessage = (
|
|
|
424
485
|
toolMessage: formatErrorMessage(error, true),
|
|
425
486
|
};
|
|
426
487
|
}
|
|
488
|
+
if (error instanceof TlaStackOverflowError) {
|
|
489
|
+
return {
|
|
490
|
+
code: isNextState ? MESSAGE_CODE.stackOverflow : MESSAGE_CODE.general,
|
|
491
|
+
message,
|
|
492
|
+
toolMessage: message,
|
|
493
|
+
};
|
|
494
|
+
}
|
|
427
495
|
if (isNextState && isEvalException(error)) {
|
|
428
496
|
return {
|
|
429
497
|
code: getCodedMessage(message)?.code ?? MESSAGE_CODE.general,
|
|
@@ -431,8 +499,11 @@ export const getFailureMessage = (
|
|
|
431
499
|
toolMessage: message,
|
|
432
500
|
};
|
|
433
501
|
}
|
|
434
|
-
const isUnexpected =
|
|
435
|
-
|
|
502
|
+
const isUnexpected =
|
|
503
|
+
isNextState && !message.startsWith(UNEXPECTED_HEADLINE) && !(error instanceof TlaUncodedError);
|
|
504
|
+
const exception =
|
|
505
|
+
error instanceof TlaSetBoundError ? WRONG_INVOCATION_EXCEPTION : UNEXPECTED_EXCEPTION;
|
|
506
|
+
const prefix = isUnexpected ? exception : "";
|
|
436
507
|
return {
|
|
437
508
|
code: MESSAGE_CODE.general,
|
|
438
509
|
message: `${prefix}${message}`,
|
package/src/tlc/order.ts
CHANGED
|
@@ -1,11 +1,11 @@
|
|
|
1
|
-
// TLC orders strings and model values by when it first interned their text, and compares a
|
|
2
|
-
// state's variables in the order of SANY's symbol table. This reproduces both orders.
|
|
3
1
|
import type { Module, SourceLocation } from "../ast";
|
|
4
2
|
import type { ConfigValue, ModelConfig } from "../config";
|
|
5
3
|
import { createMissingModuleError } from "../errors";
|
|
4
|
+
import { getJavaHashCode } from "../java-hash";
|
|
6
5
|
import { tokenize, type Token } from "../lexer";
|
|
7
6
|
import { extractModule, parseModule, parseModuleTokens } from "../parser";
|
|
8
7
|
import { isBefore } from "../resolve";
|
|
8
|
+
import { SANY_STANDARD_MODULES } from "../sany/modules";
|
|
9
9
|
import {
|
|
10
10
|
SANY_BUILTINS,
|
|
11
11
|
SANY_NODE_NAMES,
|
|
@@ -13,7 +13,6 @@ import {
|
|
|
13
13
|
TLC_MODULE_SOURCES,
|
|
14
14
|
TLC_RUNTIME_STRINGS,
|
|
15
15
|
TLC_STARTUP_STRINGS,
|
|
16
|
-
USER_STANDARD_MODULES,
|
|
17
16
|
} from "./jar-data";
|
|
18
17
|
|
|
19
18
|
type SymbolKind = "builtin" | "constant" | "variable" | "definition" | "theorem" | "module";
|
|
@@ -29,7 +28,6 @@ interface SymbolEntry {
|
|
|
29
28
|
interface SymbolTable {
|
|
30
29
|
put: (entry: SymbolEntry) => void;
|
|
31
30
|
inserted: SymbolEntry[];
|
|
32
|
-
// Where the entries the module adds itself start, after those of the modules it extends.
|
|
33
31
|
ownStart: number;
|
|
34
32
|
enumerate: () => SymbolEntry[];
|
|
35
33
|
}
|
|
@@ -58,17 +56,6 @@ const CANONICAL_OPERATORS = new Map(
|
|
|
58
56
|
|
|
59
57
|
const getCanonicalName = (name: string) => CANONICAL_OPERATORS.get(name) ?? name;
|
|
60
58
|
|
|
61
|
-
const getJavaHash = (text: string) => {
|
|
62
|
-
let hash = 0;
|
|
63
|
-
for (let index = 0; index < text.length; index++) {
|
|
64
|
-
hash = (Math.imul(hash, 31) + text.charCodeAt(index)) | 0;
|
|
65
|
-
}
|
|
66
|
-
return hash;
|
|
67
|
-
};
|
|
68
|
-
|
|
69
|
-
// java.util.Hashtable as SANY's Context uses it: default capacity 11, load factor 0.75, new
|
|
70
|
-
// entries at the head of their bucket, and enumeration from the last bucket to the first. Each
|
|
71
|
-
// bucket lists its entries from tail to head, so a new entry goes at the end.
|
|
72
59
|
const createSymbolTable = (): SymbolTable => {
|
|
73
60
|
let buckets: SymbolEntry[][] = Array.from({ length: 11 }, () => []);
|
|
74
61
|
let threshold = 8;
|
|
@@ -108,7 +95,7 @@ const createSymbolTable = (): SymbolTable => {
|
|
|
108
95
|
const createEntry = (name: string, kind: SymbolKind, isLocal: boolean): SymbolEntry => ({
|
|
109
96
|
key: kind === "module" ? `module ${name}` : name,
|
|
110
97
|
name,
|
|
111
|
-
hash:
|
|
98
|
+
hash: getJavaHashCode(name) & 0x7fffffff,
|
|
112
99
|
kind,
|
|
113
100
|
isLocal,
|
|
114
101
|
});
|
|
@@ -156,8 +143,6 @@ type ModuleSearch = (
|
|
|
156
143
|
visited: Set<string>,
|
|
157
144
|
) => [ModuleReferences, string] | undefined;
|
|
158
145
|
|
|
159
|
-
// The modules a module extends and instantiates, with its inner modules, as SANY's SpecObj
|
|
160
|
-
// walks them to decide which module to parse next.
|
|
161
146
|
const getModuleReferences = (
|
|
162
147
|
tokens: Token[],
|
|
163
148
|
unit: string | undefined,
|
|
@@ -182,10 +167,10 @@ const getModuleReferences = (
|
|
|
182
167
|
innerModules.set(name, inner.references);
|
|
183
168
|
references.inner.push(inner.references);
|
|
184
169
|
index = inner.end;
|
|
185
|
-
} else if (tokens[index - 1]?.text === ".") {
|
|
186
|
-
// A record field named EXTENDS or INSTANCE, as in r.EXTENDS or [r EXCEPT !.INSTANCE = 0].
|
|
187
170
|
continue;
|
|
188
|
-
}
|
|
171
|
+
}
|
|
172
|
+
if (tokens[index - 1]?.text === ".") continue;
|
|
173
|
+
if (token.text === "EXTENDS") {
|
|
189
174
|
const names = getDeclarations(tokens, index + 1);
|
|
190
175
|
references.extends.push(...names);
|
|
191
176
|
names.forEach((name) => allExtends.add(name));
|
|
@@ -212,9 +197,6 @@ const STRING_ESCAPES: Record<string, string> = {
|
|
|
212
197
|
"\f": "\\f",
|
|
213
198
|
};
|
|
214
199
|
|
|
215
|
-
// The texts SANY interns while parsing, in order. SANY reads a proof step label such as <1>2 and
|
|
216
|
-
// a module header such as ---- MODULE as one token. It interns a string literal as written, quotes
|
|
217
|
-
// included, and interns the literal's contents only during semantic analysis.
|
|
218
200
|
const getParsedTexts = (tokens: Token[]) => {
|
|
219
201
|
const texts: string[] = [];
|
|
220
202
|
for (let index = 0; index < tokens.length; index++) {
|
|
@@ -240,7 +222,6 @@ const getParsedTexts = (tokens: Token[]) => {
|
|
|
240
222
|
return texts;
|
|
241
223
|
};
|
|
242
224
|
|
|
243
|
-
// A module starts with ---- MODULE Name, so its third token is its name.
|
|
244
225
|
const getModuleName = (tokens: Token[]) => tokens[2]?.text;
|
|
245
226
|
|
|
246
227
|
const getRanges = (tokens: Token[]) => {
|
|
@@ -268,26 +249,20 @@ interface ModuleText {
|
|
|
268
249
|
getModule: () => Module;
|
|
269
250
|
}
|
|
270
251
|
|
|
271
|
-
// A module's source is read into tokens once, and parsed from them once, for every order and for
|
|
272
|
-
// the environment that evaluates it.
|
|
273
252
|
const readModuleText = (text: string | undefined): ModuleText => {
|
|
274
253
|
const tokens = text === undefined ? [] : tokenize(text);
|
|
275
|
-
|
|
254
|
+
let parsedModule: Module | undefined;
|
|
276
255
|
return {
|
|
277
256
|
tokens,
|
|
278
257
|
ranges: getRanges(tokens),
|
|
279
258
|
getModule: () =>
|
|
280
|
-
(
|
|
259
|
+
(parsedModule ??= text === undefined ? parseModule("") : parseModuleTokens(text, tokens)),
|
|
281
260
|
};
|
|
282
261
|
};
|
|
283
262
|
|
|
284
|
-
// The modules TLC reads for a spec: the root module, TLC's standard modules, the files the loader
|
|
285
|
-
// returns, the modules that follow the root module, and the modules nested in any of these. A
|
|
286
|
-
// module without a source has no tokens.
|
|
287
263
|
const createModuleSet = (source: string, loadModule: ModuleLoader) => {
|
|
288
264
|
const files = new Map<string, ParsedModule>();
|
|
289
265
|
const nestedModules = new Map<string, ParsedModule>();
|
|
290
|
-
// The read of each module text, so that the environment parses a text the order read only once.
|
|
291
266
|
const texts = new Map<string, ModuleText>();
|
|
292
267
|
const readText = (text: string | undefined) => {
|
|
293
268
|
const known = text === undefined ? undefined : texts.get(text);
|
|
@@ -302,15 +277,16 @@ const createModuleSet = (source: string, loadModule: ModuleLoader) => {
|
|
|
302
277
|
const text =
|
|
303
278
|
name === undefined
|
|
304
279
|
? source
|
|
305
|
-
: (
|
|
280
|
+
: (loadModule?.(name) ??
|
|
306
281
|
TLC_MODULE_SOURCES.get(name) ??
|
|
307
|
-
|
|
282
|
+
SANY_STANDARD_MODULES.get(name) ??
|
|
308
283
|
extractModule(source, name));
|
|
309
|
-
const
|
|
310
|
-
const
|
|
311
|
-
const
|
|
284
|
+
const moduleText = readText(text);
|
|
285
|
+
const tokens = moduleText.tokens;
|
|
286
|
+
const range = moduleText.ranges.get(getModuleName(tokens) ?? "") ?? { start: 0, end: 0 };
|
|
287
|
+
const file = { tokens, ...range, getModule: moduleText.getModule };
|
|
312
288
|
files.set(name ?? "", file);
|
|
313
|
-
ranges.forEach((nestedRange, nestedName) => {
|
|
289
|
+
moduleText.ranges.forEach((nestedRange, nestedName) => {
|
|
314
290
|
if (nestedRange.start === range.start || nestedModules.has(nestedName)) return;
|
|
315
291
|
nestedModules.set(nestedName, {
|
|
316
292
|
tokens,
|
|
@@ -328,7 +304,6 @@ const createModuleSet = (source: string, loadModule: ModuleLoader) => {
|
|
|
328
304
|
};
|
|
329
305
|
};
|
|
330
306
|
|
|
331
|
-
// SANY's Context of each module, which the root module has under undefined.
|
|
332
307
|
type ModuleSet = ReturnType<typeof createModuleSet>["getParsed"];
|
|
333
308
|
|
|
334
309
|
const createContexts = (getParsed: ModuleSet) => {
|
|
@@ -347,13 +322,19 @@ const createContexts = (getParsed: ModuleSet) => {
|
|
|
347
322
|
const recursiveNames = new Set(
|
|
348
323
|
module.definitions.filter((definition) => definition.isRecursive).map((item) => item.name),
|
|
349
324
|
);
|
|
350
|
-
const
|
|
351
|
-
|
|
325
|
+
const declarationKeywords = new Set(
|
|
326
|
+
module.units.flatMap((moduleUnit) =>
|
|
327
|
+
moduleUnit.kind === "Constants" || moduleUnit.kind === "Variables"
|
|
328
|
+
? [`${moduleUnit.location.line}:${moduleUnit.location.column}`]
|
|
329
|
+
: [],
|
|
330
|
+
),
|
|
331
|
+
);
|
|
332
|
+
let depth = 0;
|
|
333
|
+
tokens.slice(unit.start, unit.end).forEach((token, offset) => {
|
|
352
334
|
const index = unit.start + offset;
|
|
353
|
-
const token = tokens[index];
|
|
354
335
|
if (token.kind === "Separator" && tokens[index + 1]?.text === "MODULE") {
|
|
355
|
-
depth
|
|
356
|
-
if (depth
|
|
336
|
+
depth++;
|
|
337
|
+
if (depth === 2) {
|
|
357
338
|
const name = tokens[index + 2].text;
|
|
358
339
|
units.push({
|
|
359
340
|
location: getLocation(token),
|
|
@@ -362,10 +343,15 @@ const createContexts = (getParsed: ModuleSet) => {
|
|
|
362
343
|
}
|
|
363
344
|
return;
|
|
364
345
|
}
|
|
365
|
-
if (token.kind === "ModuleEnd") depth
|
|
366
|
-
if (depth
|
|
367
|
-
|
|
368
|
-
if (token.text === "
|
|
346
|
+
if (token.kind === "ModuleEnd") depth--;
|
|
347
|
+
if (depth !== 1 || token.kind !== "Keyword") return;
|
|
348
|
+
const isDeclaration = declarationKeywords.has(`${token.line}:${token.column}`);
|
|
349
|
+
if (isDeclaration && (token.text === "CONSTANT" || token.text === "CONSTANTS")) {
|
|
350
|
+
declare(index, "constant");
|
|
351
|
+
}
|
|
352
|
+
if (isDeclaration && (token.text === "VARIABLE" || token.text === "VARIABLES")) {
|
|
353
|
+
declare(index, "variable");
|
|
354
|
+
}
|
|
369
355
|
if (token.text === "RECURSIVE") {
|
|
370
356
|
const names = getDeclarations(tokens, index + 1);
|
|
371
357
|
if (names.every((name) => recursiveNames.has(name))) declare(index, "definition");
|
|
@@ -458,9 +444,6 @@ const createContexts = (getParsed: ModuleSet) => {
|
|
|
458
444
|
};
|
|
459
445
|
};
|
|
460
446
|
|
|
461
|
-
// Every string TLC interns before model checking starts, in order: values in the config, TLC's
|
|
462
|
-
// startup strings, each module's tokens in the order SpecObj.loadSpec parses the modules, string
|
|
463
|
-
// literals in semantic analysis order, and the names TLC interns for TLCGet.
|
|
464
447
|
const getStringOrder = (getParsed: ModuleSet, config: ModelConfig): string[] => {
|
|
465
448
|
const order = new Set<string>();
|
|
466
449
|
const intern = (text: string) => {
|
|
@@ -536,7 +519,6 @@ const getStringOrder = (getParsed: ModuleSet, config: ModelConfig): string[] =>
|
|
|
536
519
|
dependencies.set(module.unit, [...(dependencies.get(module.unit) ?? []), name]);
|
|
537
520
|
if (parsedUnits.has(name)) continue;
|
|
538
521
|
parsedUnits.add(name);
|
|
539
|
-
// SANY stops at the first module it can't find, in the order it reads them.
|
|
540
522
|
if (getParsed(name).tokens.length === 0) {
|
|
541
523
|
const importer = module.unit ?? getModuleName(getParsed(undefined).tokens);
|
|
542
524
|
throw createMissingModuleError(name, importer);
|
|
@@ -564,23 +546,12 @@ const getStringOrder = (getParsed: ModuleSet, config: ModelConfig): string[] =>
|
|
|
564
546
|
};
|
|
565
547
|
|
|
566
548
|
export interface TlcOrder {
|
|
567
|
-
// Every string TLC interns before model checking starts.
|
|
568
549
|
getStringOrder: (config: ModelConfig) => string[];
|
|
569
|
-
// The variables or constants of the root module in the reverse of its context enumeration, as
|
|
570
|
-
// ModuleNode.getVariableDecls and getConstantDecls return them. TLC compares variables in this
|
|
571
|
-
// order, and checks that the configuration assigns each constant in it.
|
|
572
550
|
getDeclarationOrder: (kind: "variable" | "constant") => string[];
|
|
573
|
-
// The names of the definitions each module adds to its context, in the order of
|
|
574
|
-
// ModuleNode.getOpDefs, in which TLC computes the constant definitions as it starts. An INSTANCE
|
|
575
|
-
// adds the definitions of the module it instantiates in the order that module's Hashtable
|
|
576
|
-
// enumerates them.
|
|
577
551
|
createDefinitionOrder: () => (name: string | undefined) => string[];
|
|
578
|
-
// Parses a module's source, once for the order and the environment.
|
|
579
552
|
parseModule: (source: string) => Module;
|
|
580
553
|
}
|
|
581
554
|
|
|
582
|
-
// One check reads the spec's modules once, and every order shares their tokens, parses and
|
|
583
|
-
// contexts.
|
|
584
555
|
export const createTlcOrder = (source: string, loadModule: ModuleLoader): TlcOrder => {
|
|
585
556
|
const modules = createModuleSet(source, loadModule);
|
|
586
557
|
const getParsed = modules.getParsed;
|
|
@@ -597,12 +568,11 @@ export const createTlcOrder = (source: string, loadModule: ModuleLoader): TlcOrd
|
|
|
597
568
|
.reverse(),
|
|
598
569
|
parseModule: modules.parseText,
|
|
599
570
|
createDefinitionOrder: () => {
|
|
600
|
-
const
|
|
601
|
-
|
|
602
|
-
// in the files it extends or instantiates.
|
|
603
|
-
getContext(undefined);
|
|
571
|
+
const moduleContexts = getContexts();
|
|
572
|
+
moduleContexts.getContext(undefined);
|
|
604
573
|
return (name) =>
|
|
605
|
-
|
|
574
|
+
moduleContexts
|
|
575
|
+
.getOwnEntries(name)
|
|
606
576
|
.filter((entry) => entry.kind === "definition")
|
|
607
577
|
.map((entry) => entry.name);
|
|
608
578
|
},
|