tla-ts 0.0.10-dev.b4a856304 → 0.0.10-dev.c92e6a4ea
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 +2 -1
- 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 +37 -0
- package/dist/index.d.ts +37 -0
- package/dist/index.js +1 -1
- package/dist/parallel-worker.cjs +1 -1
- package/dist/parallel-worker.js +1 -1
- package/dist/prove.cjs +2683 -427
- package/dist/prove.js +2681 -425
- package/dist/run.cjs +45 -44
- package/dist/run.js +45 -44
- package/dist/tlapm.cjs +2 -2
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +44 -41
- package/dist/transfer.js +45 -42
- package/dist/worker.cjs +7 -7
- package/dist/worker.js +7 -7
- package/package.json +1 -1
- package/src/ast.ts +41 -41
- package/src/bags.ts +2 -5
- package/src/builtins.ts +5 -21
- package/src/check-failure.ts +116 -0
- package/src/check-trace.ts +268 -0
- package/src/check.ts +578 -757
- package/src/cli/options.ts +6 -31
- package/src/cli/run.ts +0 -2
- package/src/cli/runtime-invariants.ts +27 -62
- package/src/cli/shared.ts +1 -5
- package/src/cli/tlapm.ts +433 -70
- package/src/cli/tlc-arguments.ts +246 -240
- package/src/cli/tlc-output.ts +686 -0
- package/src/cli/tlc-usage.ts +3 -5
- package/src/cli/tlc.ts +59 -707
- package/src/cli/xml-exporter.ts +23 -33
- package/src/codegen.ts +5 -10
- package/src/coverage.ts +3 -10
- package/src/dependencies.ts +30 -14
- package/src/dfid.ts +16 -16
- package/src/environment-config.ts +315 -0
- package/src/environment.ts +73 -338
- package/src/errors.ts +33 -5
- package/src/evaluate.ts +34 -107
- package/src/exit-codes.ts +3 -0
- package/src/fingerprints.ts +65 -1
- package/src/instances.ts +47 -10
- package/src/java-hash.ts +7 -0
- package/src/java-overrides.ts +4 -9
- package/src/json-reader.ts +1 -2
- package/src/json.ts +8 -18
- package/src/levels.ts +46 -57
- package/src/lexer.ts +76 -85
- package/src/liveness-checker.ts +634 -306
- package/src/liveness.ts +104 -120
- package/src/obligations/action.ts +14 -17
- package/src/obligations/anonymize.ts +37 -16
- package/src/obligations/enabled-axioms.ts +218 -0
- package/src/obligations/equality.ts +1 -3
- package/src/obligations/expression.ts +36 -8
- package/src/obligations/format.ts +0 -2
- package/src/obligations/generate.ts +66 -54
- package/src/obligations/index.ts +38 -8
- package/src/obligations/levels.ts +24 -11
- package/src/obligations/module.ts +28 -41
- package/src/obligations/normalize.ts +26 -14
- package/src/obligations/operators.ts +0 -2
- package/src/obligations/pragma.ts +53 -16
- package/src/obligations/printer.ts +43 -13
- package/src/obligations/proof.ts +3 -2
- package/src/obligations/regroup.ts +0 -2
- package/src/obligations/simplify.ts +55 -50
- package/src/obligations/source.ts +118 -74
- package/src/obligations/subexpression.ts +45 -18
- package/src/obligations/substitution.ts +1 -3
- package/src/obligations/temporal.ts +5 -7
- package/src/obligations/tuples.ts +0 -2
- package/src/parallel-worker.ts +17 -31
- package/src/parallel.ts +55 -80
- package/src/parser.ts +722 -385
- package/src/pcal/ast.ts +53 -65
- package/src/pcal/parse.ts +144 -191
- package/src/pcal/tokenize.ts +91 -115
- package/src/pcal/translate.ts +83 -98
- package/src/pcal/validate.ts +48 -50
- package/src/pretty-print.ts +7 -7
- package/src/prover/decide-pool.ts +3 -3
- package/src/prover/deciders.ts +12 -9
- package/src/prover/isabelle/decide.ts +3 -25
- package/src/prover/isabelle/encode.ts +72 -42
- 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 +158 -7
- package/src/prover/isabelle/isar/method.ts +509 -212
- package/src/prover/isabelle/isar/proof.ts +570 -14
- package/src/prover/isabelle/isar/rule-cases.ts +224 -0
- package/src/prover/isabelle/isar/theory.ts +487 -76
- package/src/prover/isabelle/isar/toplevel.ts +331 -0
- package/src/prover/isabelle/isar/type-check.ts +89 -14
- package/src/prover/isabelle/provers/blast/blast.ts +7 -65
- package/src/prover/isabelle/provers/blast/branch.ts +0 -2
- package/src/prover/isabelle/provers/blast/prove.ts +0 -2
- package/src/prover/isabelle/provers/blast/rules.ts +0 -2
- package/src/prover/isabelle/provers/blast/state.ts +0 -2
- package/src/prover/isabelle/provers/blast/term.ts +0 -2
- package/src/prover/isabelle/provers/clasimp.ts +0 -2
- package/src/prover/isabelle/provers/classical.ts +45 -20
- package/src/prover/isabelle/provers/hypsubst.ts +17 -28
- package/src/prover/isabelle/pure/bicompose.ts +9 -27
- package/src/prover/isabelle/pure/consts.ts +0 -2
- package/src/prover/isabelle/pure/conv.ts +2 -10
- package/src/prover/isabelle/pure/drule.ts +72 -6
- package/src/prover/isabelle/pure/envir.ts +0 -2
- package/src/prover/isabelle/pure/goal.ts +1 -3
- package/src/prover/isabelle/pure/logic.ts +1 -3
- package/src/prover/isabelle/pure/name.ts +0 -2
- package/src/prover/isabelle/pure/net.ts +0 -2
- package/src/prover/isabelle/pure/object-logic.ts +13 -7
- package/src/prover/isabelle/pure/pattern.ts +0 -2
- package/src/prover/isabelle/pure/raw-simplifier.ts +4 -15
- package/src/prover/isabelle/pure/rewriter.ts +6 -17
- package/src/prover/isabelle/pure/search.ts +0 -2
- package/src/prover/isabelle/pure/seq.ts +0 -2
- package/src/prover/isabelle/pure/simplifier.ts +26 -7
- package/src/prover/isabelle/pure/table.ts +2 -3
- package/src/prover/isabelle/pure/tactic.ts +0 -2
- package/src/prover/isabelle/pure/tactical.ts +42 -37
- package/src/prover/isabelle/pure/term-ord.ts +0 -2
- package/src/prover/isabelle/pure/term.ts +0 -2
- package/src/prover/isabelle/pure/thm.ts +14 -13
- package/src/prover/isabelle/pure/type.ts +0 -2
- package/src/prover/isabelle/pure/unify.ts +0 -2
- package/src/prover/isabelle/pure/variable.ts +0 -2
- package/src/prover/isabelle/tla/classical-setup.ts +18 -16
- package/src/prover/isabelle/tla/context.ts +58 -11
- package/src/prover/isabelle/tla/logic-data.ts +1 -1
- package/src/prover/isabelle/tla/logic.ts +49 -21
- package/src/prover/isabelle/tla/simpdata.ts +1 -12
- package/src/prover/isabelle/tools/intuitionistic.ts +28 -12
- package/src/prover/ocaml.ts +4 -1
- package/src/prover/prep/action.ts +30 -31
- package/src/prover/prep/enabled-axioms.ts +11 -2
- package/src/prover/prep/fingerprint.ts +2 -5
- package/src/prover/prep/methods.ts +181 -51
- package/src/prover/prep/normalize.ts +38 -9
- package/src/prover/prove.ts +395 -94
- package/src/prover/ptl/decide.ts +95 -50
- package/src/prover/ptl/encode.ts +2 -3
- package/src/prover/ptl/tableau.ts +28 -2
- package/src/prover/smt/arithmetic.ts +310 -0
- package/src/prover/smt/axioms.ts +12 -8
- package/src/prover/smt/context.ts +43 -8
- package/src/prover/smt/data.ts +498 -379
- package/src/prover/smt/encode.ts +148 -57
- package/src/prover/smt/extensionality.ts +5 -3
- package/src/prover/smt/flatten.ts +4 -6
- package/src/prover/smt/format.ts +28 -4
- package/src/prover/smt/instances.ts +7 -1
- package/src/prover/smt/layout.ts +91 -0
- package/src/prover/smt/rewrite.ts +1021 -618
- 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 -1
- 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 +613 -6
- 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/asserted-formulas.ts +87 -16
- package/src/prover/smt/solver/ast-lt.ts +166 -12
- package/src/prover/smt/solver/ast-util.ts +160 -2
- package/src/prover/smt/solver/ast.ts +1427 -41
- package/src/prover/smt/solver/auf-solver.ts +2 -6
- 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 -2
- package/src/prover/smt/solver/cg-table.ts +39 -25
- package/src/prover/smt/solver/check-logic.ts +330 -0
- package/src/prover/smt/solver/clause.ts +0 -1
- package/src/prover/smt/solver/cofactor-elim-term-ite.ts +278 -0
- package/src/prover/smt/solver/conflict-resolution.ts +78 -2
- package/src/prover/smt/solver/context.ts +516 -115
- package/src/prover/smt/solver/ctx-simplify.ts +20 -10
- 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 +38 -10
- 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 -1
- package/src/prover/smt/solver/e-matching.ts +7 -8
- 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 -3
- 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 +908 -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 -1
- package/src/prover/smt/solver/expr-safe-replace.ts +26 -2
- 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 -15
- package/src/prover/smt/solver/fix-dl-var.ts +148 -0
- package/src/prover/smt/solver/flat-literals.ts +0 -1
- 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 +175 -15
- 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 -1
- package/src/prover/smt/solver/hashtable.ts +30 -16
- 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 +110 -38
- package/src/prover/smt/solver/lackr.ts +381 -0
- package/src/prover/smt/solver/lbool.ts +0 -1
- 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 -1
- package/src/prover/smt/solver/logic-tactics.ts +345 -0
- package/src/prover/smt/solver/lp/bound-propagator.ts +0 -1
- package/src/prover/smt/solver/lp/constraints.ts +0 -1
- package/src/prover/smt/solver/lp/containers.ts +7 -2
- package/src/prover/smt/solver/lp/core-solver.ts +18 -3
- package/src/prover/smt/solver/lp/cross-nested.ts +1 -4
- package/src/prover/smt/solver/lp/dep-intervals.ts +0 -3
- package/src/prover/smt/solver/lp/dependency.ts +0 -2
- package/src/prover/smt/solver/lp/dioph-eq.ts +1 -10
- package/src/prover/smt/solver/lp/explanation.ts +0 -1
- package/src/prover/smt/solver/lp/gomory.ts +0 -1
- package/src/prover/smt/solver/lp/hnf-cutter.ts +1 -2
- package/src/prover/smt/solver/lp/hnf.ts +0 -3
- package/src/prover/smt/solver/lp/int-cube.ts +3 -4
- package/src/prover/smt/solver/lp/int-solver.ts +0 -2
- package/src/prover/smt/solver/lp/lar-solver.ts +40 -4
- package/src/prover/smt/solver/lp/lar-term.ts +0 -1
- package/src/prover/smt/solver/lp/lp-settings.ts +0 -1
- package/src/prover/smt/solver/lp/maximize-term.ts +59 -10
- package/src/prover/smt/solver/lp/nex-creator.ts +3 -3
- package/src/prover/smt/solver/lp/nex.ts +2 -2
- package/src/prover/smt/solver/lp/nla-backoff.ts +0 -2
- package/src/prover/smt/solver/lp/nla-basics.ts +46 -3
- package/src/prover/smt/solver/lp/nla-core.ts +67 -16
- package/src/prover/smt/solver/lp/nla-divisions.ts +0 -2
- package/src/prover/smt/solver/lp/nla-emonics.ts +0 -1
- package/src/prover/smt/solver/lp/nla-factorization.ts +0 -1
- package/src/prover/smt/solver/lp/nla-grobner.ts +165 -83
- package/src/prover/smt/solver/lp/nla-horner.ts +0 -2
- package/src/prover/smt/solver/lp/nla-intervals.ts +0 -1
- package/src/prover/smt/solver/lp/nla-monomial-bounds.ts +0 -2
- package/src/prover/smt/solver/lp/nla-monotone.ts +0 -1
- package/src/prover/smt/solver/lp/nla-order.ts +0 -2
- package/src/prover/smt/solver/lp/nla-patcher.ts +0 -1
- package/src/prover/smt/solver/lp/nla-powers.ts +220 -0
- package/src/prover/smt/solver/lp/nla-tangents.ts +0 -2
- package/src/prover/smt/solver/lp/nla-throttle.ts +0 -1
- package/src/prover/smt/solver/lp/nla-transcendentals.ts +324 -0
- package/src/prover/smt/solver/lp/nla-types.ts +0 -2
- package/src/prover/smt/solver/lp/nla-var-eqs.ts +0 -1
- package/src/prover/smt/solver/lp/nra-solver.ts +122 -64
- package/src/prover/smt/solver/lp/numeric-pair.ts +0 -1
- package/src/prover/smt/solver/lp/pdd-interval.ts +6 -3
- package/src/prover/smt/solver/lp/pdd-simplifier.ts +60 -21
- package/src/prover/smt/solver/lp/pdd-solver.ts +72 -41
- package/src/prover/smt/solver/lp/pdd.ts +725 -289
- package/src/prover/smt/solver/lp/random-updater.ts +0 -2
- package/src/prover/smt/solver/lp/static-matrix.ts +0 -1
- package/src/prover/smt/solver/lp/union-find.ts +7 -2
- package/src/prover/smt/solver/macro-finder.ts +530 -0
- package/src/prover/smt/solver/mam-compiler.ts +122 -90
- package/src/prover/smt/solver/mam-interpreter.ts +0 -1
- 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 -6
- 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 +18 -27
- package/src/prover/smt/solver/model-evaluator.ts +188 -12
- package/src/prover/smt/solver/model-finder.ts +12 -18
- package/src/prover/smt/solver/model-generator.ts +56 -29
- package/src/prover/smt/solver/model-macro-solver.ts +49 -46
- 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 +125 -12
- package/src/prover/smt/solver/nlsat/atoms.ts +20 -6
- package/src/prover/smt/solver/nlsat/evaluator.ts +0 -1
- package/src/prover/smt/solver/nlsat/explain.ts +63 -23
- package/src/prover/smt/solver/nlsat/interval-set.ts +1 -2
- package/src/prover/smt/solver/nlsat/levelwise.ts +3 -9
- package/src/prover/smt/solver/nlsat/mpbq.ts +45 -1
- package/src/prover/smt/solver/nlsat/polynomial.ts +13 -6
- package/src/prover/smt/solver/nlsat/solver.ts +236 -45
- 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 -2
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +1 -4
- package/src/prover/smt/solver/nlsat/upolynomial.ts +0 -2
- package/src/prover/smt/solver/nlsat-tactic.ts +82 -0
- package/src/prover/smt/solver/nnf.ts +105 -23
- 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 +19 -11
- 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 +202 -57
- package/src/prover/smt/solver/probes.ts +512 -0
- package/src/prover/smt/solver/propagate-values.ts +37 -21
- package/src/prover/smt/solver/proto-model.ts +648 -19
- package/src/prover/smt/solver/pull-quant.ts +28 -12
- 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 -3
- package/src/prover/smt/solver/qe-lite-fm.ts +3 -4
- package/src/prover/smt/solver/qe-lite.ts +37 -17
- 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 -1
- 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 +16 -56
- package/src/prover/smt/solver/quantifier-analyzer.ts +19 -20
- package/src/prover/smt/solver/quantifier-manager.ts +8 -16
- package/src/prover/smt/solver/quasi-macros.ts +243 -0
- package/src/prover/smt/solver/random-gen.ts +0 -1
- package/src/prover/smt/solver/rational.ts +45 -1
- 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 -1
- package/src/prover/smt/solver/relevancy.ts +1 -2
- package/src/prover/smt/solver/rewriter-tpl.ts +77 -10
- package/src/prover/smt/solver/rewriter.ts +475 -36
- package/src/prover/smt/solver/rlimit.ts +38 -2
- 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 +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 +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 +3126 -316
- 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 +113 -22
- package/src/prover/smt/solver/static-features.ts +314 -0
- package/src/prover/smt/solver/sticky-generations.ts +0 -1
- 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 +53 -2
- package/src/prover/smt/solver/theory-lra-bounds.ts +31 -6
- package/src/prover/smt/solver/theory-lra-final-check.ts +56 -70
- package/src/prover/smt/solver/theory-lra-internalize.ts +94 -27
- package/src/prover/smt/solver/theory-lra-model.ts +20 -35
- package/src/prover/smt/solver/theory-lra-propagate.ts +24 -26
- package/src/prover/smt/solver/theory-lra-state.ts +6 -22
- package/src/prover/smt/solver/theory-lra.ts +188 -1
- 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 +36 -14
- package/src/prover/smt/table.ts +3 -2
- package/src/prover/smt/types.ts +146 -0
- package/src/prover/tlapm/cache.ts +50 -19
- package/src/prover/tlapm/tlapm.ts +15 -9
- package/src/prover/tlapm-library.ts +3208 -0
- package/src/prover/verdict.ts +9 -0
- package/src/prover/zenon/check/check.ts +1 -2
- package/src/prover/zenon/check/records.ts +1 -1
- package/src/prover/zenon/check/relations.ts +2 -1
- package/src/prover/zenon/check/rewrites.ts +2 -15
- package/src/prover/zenon/check/sets.ts +40 -58
- package/src/prover/zenon/check/terms.ts +1 -2
- package/src/prover/zenon/decide.ts +10 -7
- package/src/prover/zenon/encode.ts +0 -2
- package/src/prover/zenon/eqrel.ts +2 -2
- package/src/prover/zenon/equality-rules.ts +24 -2
- package/src/prover/zenon/expr.ts +28 -2
- package/src/prover/zenon/index-table.ts +11 -21
- package/src/prover/zenon/isar-case.ts +0 -2
- package/src/prover/zenon/isar.ts +35 -37
- package/src/prover/zenon/llproof.ts +2 -13
- package/src/prover/zenon/mltoll.ts +12 -30
- package/src/prover/zenon/node.ts +20 -5
- package/src/prover/zenon/parse.ts +9 -8
- package/src/prover/zenon/phrase.ts +0 -2
- package/src/prover/zenon/proof.ts +0 -2
- package/src/prover/zenon/propositional-rules.ts +0 -2
- package/src/prover/zenon/rules.ts +2 -3
- package/src/prover/zenon/search.ts +11 -19
- package/src/prover/zenon/tla/functions.ts +2 -4
- package/src/prover/zenon/tla/llproof.ts +9 -13
- package/src/prover/zenon/tla/records.ts +1 -8
- package/src/prover/zenon/tla/rewrites.ts +0 -2
- package/src/prover/zenon/tla/sets.ts +22 -22
- package/src/prover/zenon/tla/terms.ts +0 -2
- package/src/prover/zenon/tla/tla.ts +7 -8
- package/src/randomization.ts +1 -4
- package/src/resolve.ts +67 -143
- package/src/runtime.ts +17 -18
- package/src/sany/builtins.ts +1 -3
- 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 +160 -2683
- package/src/sany/levels.ts +5 -11
- package/src/sany/lexer.ts +57 -60
- package/src/sany/linter.ts +0 -3
- package/src/sany/nodes.ts +6 -13
- package/src/sany/report.ts +3 -6
- package/src/sany/selectors.ts +35 -38
- package/src/sany/xml.ts +23 -55
- package/src/search.ts +244 -53
- package/src/simulate.ts +202 -184
- package/src/spec-description.ts +56 -82
- package/src/standard-definitions.ts +4 -3
- package/src/standard-modules.ts +17 -44
- package/src/state-graph.ts +3 -17
- package/src/subexpressions.ts +38 -47
- package/src/substitution-levels.ts +5 -4
- package/src/successors.ts +20 -43
- package/src/symmetry.ts +6 -21
- package/src/tableau.ts +2 -2
- package/src/tlc/fingerprint.ts +96 -30
- package/src/tlc/jar-data.ts +0 -1
- package/src/tlc/messages.ts +22 -36
- package/src/tlc/order.ts +36 -50
- package/src/tlc/random.ts +22 -34
- package/src/tlc/replay.ts +21 -48
- package/src/tlc/summary.ts +64 -58
- package/src/tlc/tlc-operators.ts +6 -17
- package/src/tlc/tlcext-operators.ts +70 -29
- package/src/tlc/trace-spec.ts +26 -51
- package/src/tlc/value-stream.ts +9 -13
- package/src/tlc/version.ts +0 -1
- package/src/typed-tier.ts +6535 -0
- package/src/typescript/actions.ts +2 -4
- package/src/typescript/collections.ts +34 -20
- package/src/typescript/compile.ts +1 -3
- package/src/typescript/formula.ts +5 -3
- package/src/typescript/model.ts +4 -5
- package/src/typescript/steps.ts +20 -18
- package/src/values.ts +136 -338
- package/src/prover/isabelle/isar/statement.ts +0 -52
- 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/fingerprint.ts
CHANGED
|
@@ -143,9 +143,9 @@ const POLYNOMIALS = [
|
|
|
143
143
|
0x91f5a5fa9c5515a5n,
|
|
144
144
|
];
|
|
145
145
|
|
|
146
|
-
|
|
146
|
+
let selectedPolynomial = POLYNOMIALS[0];
|
|
147
147
|
|
|
148
|
-
export const getFingerprintPolynomial = () =>
|
|
148
|
+
export const getFingerprintPolynomial = () => selectedPolynomial;
|
|
149
149
|
|
|
150
150
|
const SLICE_HIGH_0 = new Int32Array(256);
|
|
151
151
|
const SLICE_HIGH_1 = new Int32Array(256);
|
|
@@ -155,8 +155,8 @@ const SLICE_LOW_0 = new Int32Array(256);
|
|
|
155
155
|
const SLICE_LOW_1 = new Int32Array(256);
|
|
156
156
|
const SLICE_LOW_2 = new Int32Array(256);
|
|
157
157
|
const SLICE_LOW_3 = new Int32Array(256);
|
|
158
|
-
|
|
159
|
-
|
|
158
|
+
let initialHigh = 0;
|
|
159
|
+
let initialLow = 0;
|
|
160
160
|
let high = 0;
|
|
161
161
|
let low = 0;
|
|
162
162
|
|
|
@@ -166,12 +166,9 @@ const extendByte = (byte: number) => {
|
|
|
166
166
|
high = (high >>> 8) ^ SLICE_HIGH_0[index];
|
|
167
167
|
};
|
|
168
168
|
|
|
169
|
-
// Extending is linear over GF(2), so extending by four bytes at once shifts the fingerprint by a
|
|
170
|
-
// word and adds, for each of the four, the fingerprint from zero of that byte followed by the zero
|
|
171
|
-
// bytes that come after it: SLICE_HIGH_k and SLICE_LOW_k hold them for k zero bytes after.
|
|
172
169
|
export const setFingerprintPolynomial = (index: number) => {
|
|
173
170
|
const polynomial = POLYNOMIALS[index];
|
|
174
|
-
|
|
171
|
+
selectedPolynomial = polynomial;
|
|
175
172
|
const powers: bigint[] = [];
|
|
176
173
|
for (let power = 1n << 63n; powers.length < 72;) {
|
|
177
174
|
powers.push(power);
|
|
@@ -198,8 +195,8 @@ export const setFingerprintPolynomial = (index: number) => {
|
|
|
198
195
|
highs[zeros][byte] = (previousHigh[byte] >>> 8) ^ SLICE_HIGH_0[index];
|
|
199
196
|
}
|
|
200
197
|
}
|
|
201
|
-
|
|
202
|
-
|
|
198
|
+
initialHigh = Number(BigInt.asIntN(32, polynomial >> 32n));
|
|
199
|
+
initialLow = Number(BigInt.asIntN(32, polynomial));
|
|
203
200
|
};
|
|
204
201
|
|
|
205
202
|
setFingerprintPolynomial(0);
|
|
@@ -221,8 +218,6 @@ const SET_ENUM_VALUE = 5;
|
|
|
221
218
|
const FCN_RCD_VALUE = 9;
|
|
222
219
|
const MODEL_VALUE = 21;
|
|
223
220
|
|
|
224
|
-
// Returns how many bytes it extends the fingerprint by. A model value extends it with its
|
|
225
|
-
// UniqueString token, which TLC numbers from 1 in intern order.
|
|
226
221
|
const extendScalar = (value: boolean | number | string | ModelValue) => {
|
|
227
222
|
if (typeof value === "boolean") {
|
|
228
223
|
extendByte(BOOL_VALUE);
|
|
@@ -254,51 +249,122 @@ const extendScalar = (value: boolean | number | string | ModelValue) => {
|
|
|
254
249
|
return 5;
|
|
255
250
|
};
|
|
256
251
|
|
|
252
|
+
// TLC's fingerprint is linear in the bytes it extends by. A scalar extends it as zero bytes of its
|
|
253
|
+
// length would, and then by its fingerprint from zero, so code may extend by a scalar it knows
|
|
254
|
+
// without inspecting it.
|
|
255
|
+
export const getScalarExtension = (value: boolean | number | string | ModelValue) => {
|
|
256
|
+
const outerHigh = high;
|
|
257
|
+
const outerLow = low;
|
|
258
|
+
high = 0;
|
|
259
|
+
low = 0;
|
|
260
|
+
const extension = [extendScalar(value), high, low];
|
|
261
|
+
high = outerHigh;
|
|
262
|
+
low = outerLow;
|
|
263
|
+
return extension;
|
|
264
|
+
};
|
|
265
|
+
|
|
266
|
+
// Code that extends a fingerprint in the locals h and l as the functions here extend theirs, with
|
|
267
|
+
// a local m and the tables FINGERPRINT_TABLES gives as H0 to H3 and L0 to L3.
|
|
268
|
+
const getByteCode = (byte: string) =>
|
|
269
|
+
`m = (${byte} ^ l) & 255; l = ((l >>> 8) | (h << 24)) ^ L0[m]; h = (h >>> 8) ^ H0[m];`;
|
|
270
|
+
const getWordCode = (word: string) =>
|
|
271
|
+
`m = l ^ ${word}; l = h ^ L3[m & 255] ^ L2[(m >>> 8) & 255] ^ L1[(m >>> 16) & 255] ^ L0[m >>> 24]; h = H3[m & 255] ^ H2[(m >>> 8) & 255] ^ H1[(m >>> 16) & 255] ^ H0[m >>> 24];`;
|
|
272
|
+
|
|
273
|
+
export const FINGERPRINT_CODE = {
|
|
274
|
+
integer: (value: string) => `${getByteCode(String(INT_VALUE))} ${getWordCode(value)}`,
|
|
275
|
+
boolean: (value: string) =>
|
|
276
|
+
`${getByteCode(String(BOOL_VALUE))} ${getByteCode(`(${value} ? 116 : 102)`)}`,
|
|
277
|
+
set: (length: string) => `${getByteCode(String(SET_ENUM_VALUE))} ${getWordCode(length)}`,
|
|
278
|
+
function: (length: string) => `${getByteCode(String(FCN_RCD_VALUE))} ${getWordCode(length)}`,
|
|
279
|
+
// A scalar of the extension getScalarExtension gives.
|
|
280
|
+
scalar: (length: string, scalarHigh: string, scalarLow: string) =>
|
|
281
|
+
`{ let r = ${length}; for (; r >= 4; r -= 4) { ${getWordCode("0")} } for (; r > 0; r--) { ${getByteCode("0")} } h ^= ${scalarHigh}; l ^= ${scalarLow}; }`,
|
|
282
|
+
};
|
|
283
|
+
|
|
284
|
+
export const getFingerprintTables = () => ({
|
|
285
|
+
H0: SLICE_HIGH_0,
|
|
286
|
+
H1: SLICE_HIGH_1,
|
|
287
|
+
H2: SLICE_HIGH_2,
|
|
288
|
+
H3: SLICE_HIGH_3,
|
|
289
|
+
L0: SLICE_LOW_0,
|
|
290
|
+
L1: SLICE_LOW_1,
|
|
291
|
+
L2: SLICE_LOW_2,
|
|
292
|
+
L3: SLICE_LOW_3,
|
|
293
|
+
initialHigh,
|
|
294
|
+
initialLow,
|
|
295
|
+
});
|
|
296
|
+
|
|
297
|
+
// Extends the fingerprint held in state, as low and high words, by a value.
|
|
298
|
+
export const extendFingerprint = (state: Int32Array, value: Value) => {
|
|
299
|
+
const outerHigh = high;
|
|
300
|
+
const outerLow = low;
|
|
301
|
+
low = state[0];
|
|
302
|
+
high = state[1];
|
|
303
|
+
extendValue(value);
|
|
304
|
+
state[0] = low;
|
|
305
|
+
state[1] = high;
|
|
306
|
+
high = outerHigh;
|
|
307
|
+
low = outerLow;
|
|
308
|
+
};
|
|
309
|
+
|
|
310
|
+
const extendSet = (length: number) => {
|
|
311
|
+
extendByte(SET_ENUM_VALUE);
|
|
312
|
+
extendInt(length);
|
|
313
|
+
};
|
|
314
|
+
|
|
315
|
+
const extendFunction = (length: number) => {
|
|
316
|
+
extendByte(FCN_RCD_VALUE);
|
|
317
|
+
extendInt(length);
|
|
318
|
+
};
|
|
319
|
+
|
|
257
320
|
const extendValue = (value: Value) => {
|
|
258
321
|
if (typeof value !== "object" || isModelValue(value)) {
|
|
259
322
|
extendScalar(value);
|
|
260
323
|
} else if (isFunctionValue(value)) {
|
|
261
324
|
const functionValue = toFiniteFunction(value);
|
|
262
|
-
|
|
263
|
-
extendInt(functionValue.domain.length);
|
|
325
|
+
extendFunction(functionValue.domain.length);
|
|
264
326
|
for (let index = 0; index < functionValue.domain.length; index++) {
|
|
265
327
|
extendValue(functionValue.domain[index]);
|
|
266
328
|
extendValue(functionValue.range[index]);
|
|
267
329
|
}
|
|
268
330
|
} else {
|
|
269
331
|
const elements = toFiniteSet(value).elements;
|
|
270
|
-
|
|
271
|
-
extendInt(elements.length);
|
|
332
|
+
extendSet(elements.length);
|
|
272
333
|
for (const element of elements) extendValue(element);
|
|
273
334
|
}
|
|
274
335
|
};
|
|
275
336
|
|
|
276
|
-
// Evaluating a lazy value can fingerprint another, so this restores the fingerprint it interrupts.
|
|
277
337
|
export const getTlcFingerprint = (state: Value[]) => {
|
|
278
|
-
const
|
|
279
|
-
|
|
280
|
-
|
|
338
|
+
const outerHigh = high;
|
|
339
|
+
const outerLow = low;
|
|
340
|
+
high = initialHigh;
|
|
341
|
+
low = initialLow;
|
|
281
342
|
for (const value of state) extendValue(value);
|
|
282
343
|
const fingerprint = (BigInt(high >>> 0) << 32n) | BigInt(low >>> 0);
|
|
283
|
-
high =
|
|
284
|
-
low =
|
|
344
|
+
high = outerHigh;
|
|
345
|
+
low = outerLow;
|
|
285
346
|
return fingerprint;
|
|
286
347
|
};
|
|
287
348
|
|
|
288
|
-
|
|
289
|
-
|
|
290
|
-
|
|
349
|
+
// Fingerprints each of count states from the values extend adds for it.
|
|
350
|
+
const getExtendedFingerprints = (count: number, extend: (position: number) => void) => {
|
|
351
|
+
const fingerprints = new BigInt64Array(count);
|
|
291
352
|
const words = new Int32Array(fingerprints.buffer);
|
|
292
353
|
const outerHigh = high;
|
|
293
354
|
const outerLow = low;
|
|
294
|
-
|
|
295
|
-
high =
|
|
296
|
-
low =
|
|
297
|
-
|
|
355
|
+
for (let position = 0; position < count; position++) {
|
|
356
|
+
high = initialHigh;
|
|
357
|
+
low = initialLow;
|
|
358
|
+
extend(position);
|
|
298
359
|
words[2 * position] = low;
|
|
299
360
|
words[2 * position + 1] = high;
|
|
300
|
-
}
|
|
361
|
+
}
|
|
301
362
|
high = outerHigh;
|
|
302
363
|
low = outerLow;
|
|
303
364
|
return fingerprints;
|
|
304
365
|
};
|
|
366
|
+
|
|
367
|
+
export const getTlcFingerprints = (states: Value[][], order: number[]) =>
|
|
368
|
+
getExtendedFingerprints(states.length, (position) => {
|
|
369
|
+
for (const index of order) extendValue(states[position][index]);
|
|
370
|
+
});
|
package/src/tlc/jar-data.ts
CHANGED
package/src/tlc/messages.ts
CHANGED
|
@@ -116,41 +116,43 @@ const LEVEL_PREFIXES: Record<MessageLevel, string> = {
|
|
|
116
116
|
|
|
117
117
|
export interface MessagePrinter {
|
|
118
118
|
isTool: boolean;
|
|
119
|
+
isDiffTrace: boolean;
|
|
119
120
|
version: TlcVersion;
|
|
120
121
|
print: (code: number, level: MessageLevel, text: string) => void;
|
|
121
122
|
}
|
|
122
123
|
|
|
124
|
+
interface MessagePrinterOptions {
|
|
125
|
+
isTool: boolean;
|
|
126
|
+
isWarningEnabled?: boolean;
|
|
127
|
+
isDiffTrace?: boolean;
|
|
128
|
+
version?: TlcVersion;
|
|
129
|
+
suppressedCodes?: number[];
|
|
130
|
+
errorCodes?: number[];
|
|
131
|
+
}
|
|
132
|
+
|
|
123
133
|
export const formatMessage = (isTool: boolean, code: number, level: MessageLevel, text: string) =>
|
|
124
134
|
isTool
|
|
125
135
|
? `@!@!@STARTMSG ${code}:${level} @!@!@\n${text}\n@!@!@ENDMSG ${code} @!@!@`
|
|
126
136
|
: `${LEVEL_PREFIXES[level]}${text}`;
|
|
127
137
|
|
|
128
|
-
|
|
129
|
-
// Print's bare. A warning prints once, -nowarning drops it, and without -tool the first one
|
|
130
|
-
// says how to drop them.
|
|
131
|
-
export const createMessagePrinter = (
|
|
132
|
-
isTool: boolean,
|
|
133
|
-
isWarningEnabled = true,
|
|
134
|
-
version: TlcVersion = "master",
|
|
135
|
-
suppressedCodes: number[] = [],
|
|
136
|
-
errorCodes: number[] = [],
|
|
137
|
-
): MessagePrinter => {
|
|
138
|
+
export const createMessagePrinter = (options: MessagePrinterOptions): MessagePrinter => {
|
|
138
139
|
const warnings = new Set<string>();
|
|
139
140
|
return {
|
|
140
|
-
isTool,
|
|
141
|
-
|
|
141
|
+
isTool: options.isTool,
|
|
142
|
+
isDiffTrace: options.isDiffTrace ?? false,
|
|
143
|
+
version: options.version ?? "master",
|
|
142
144
|
print: (code, level, text) => {
|
|
143
145
|
const isWarning = level === MESSAGE_LEVEL.warning;
|
|
144
|
-
if (isWarning && errorCodes
|
|
146
|
+
if (isWarning && options.errorCodes?.includes(code)) {
|
|
145
147
|
throw new TlaWarningAsError(code, text);
|
|
146
148
|
}
|
|
147
|
-
if (isWarning &&
|
|
148
|
-
if (level !== MESSAGE_LEVEL.error && suppressedCodes
|
|
149
|
+
if (isWarning && options.isWarningEnabled === false) return;
|
|
150
|
+
if (level !== MESSAGE_LEVEL.error && options.suppressedCodes?.includes(code)) return;
|
|
149
151
|
const hint =
|
|
150
|
-
isWarning && !isTool && warnings.size === 0
|
|
152
|
+
isWarning && !options.isTool && warnings.size === 0
|
|
151
153
|
? "\n(Use the -nowarning option to disable this warning.)"
|
|
152
154
|
: "";
|
|
153
|
-
const message = formatMessage(isTool, code, level, `${text}${hint}`);
|
|
155
|
+
const message = formatMessage(options.isTool, code, level, `${text}${hint}`);
|
|
154
156
|
if (isWarning && warnings.has(message)) return;
|
|
155
157
|
if (isWarning) warnings.add(message);
|
|
156
158
|
console.log(message);
|
|
@@ -158,12 +160,9 @@ export const createMessagePrinter = (
|
|
|
158
160
|
};
|
|
159
161
|
};
|
|
160
162
|
|
|
161
|
-
// TLC 1.7.4's message for a missing initial predicate also blames a parameterized INSTANCE.
|
|
162
163
|
export const MISSING_INIT_174 =
|
|
163
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.";
|
|
164
165
|
|
|
165
|
-
// isEvalException: whether TLC throws the message as an EvalException, not a TLCRuntimeException.
|
|
166
|
-
// TLC's -tool output wraps such a message in its own markers even inside another message.
|
|
167
166
|
const CODED_MESSAGES: [code: number, template: string, isEvalException: boolean][] = [
|
|
168
167
|
[1005, STACK_OVERFLOW_MESSAGE, false],
|
|
169
168
|
[
|
|
@@ -343,12 +342,10 @@ interface CodedMessage {
|
|
|
343
342
|
isEvalException: boolean;
|
|
344
343
|
}
|
|
345
344
|
|
|
346
|
-
|
|
347
|
-
value: undefined as { pattern: RegExp; message: CodedMessage }[] | undefined,
|
|
348
|
-
};
|
|
345
|
+
let codedMessagePatterns: { pattern: RegExp; message: CodedMessage }[] | undefined;
|
|
349
346
|
|
|
350
347
|
const getCodedMessagePatterns = () =>
|
|
351
|
-
(codedMessagePatterns
|
|
348
|
+
(codedMessagePatterns ??= CODED_MESSAGES.map(([code, template, isEvalException]) => ({
|
|
352
349
|
pattern: new RegExp(
|
|
353
350
|
`^${template
|
|
354
351
|
.split(/%\d+%/)
|
|
@@ -358,8 +355,6 @@ const getCodedMessagePatterns = () =>
|
|
|
358
355
|
message: { code, isEvalException },
|
|
359
356
|
})));
|
|
360
357
|
|
|
361
|
-
// Plain messages that read like coded ones: the overflows of SetOfFcnsValue and SetOfTuplesValue,
|
|
362
|
-
// SetPredValue's tuple membership, and Tool#enabled's for ~> and -+->.
|
|
363
358
|
const UNCODED_MESSAGE_PATTERN =
|
|
364
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)\)\./;
|
|
365
360
|
|
|
@@ -368,13 +363,10 @@ export const getCodedMessage = (text: string): CodedMessage | undefined =>
|
|
|
368
363
|
? undefined
|
|
369
364
|
: getCodedMessagePatterns().find((item) => item.pattern.test(text))?.message;
|
|
370
365
|
|
|
371
|
-
// Only a standard module's Java code throws an EvalException; Assert.fail throws the other kind.
|
|
372
366
|
export const isEvalException = (error: TlaEvaluationError) =>
|
|
373
367
|
error instanceof TlaModuleError || getCodedMessage(error.message)?.isEvalException === true;
|
|
374
368
|
|
|
375
|
-
// The messages that end with the message of the error they report, after this text.
|
|
376
369
|
const INNER_MESSAGE_PREFIXES = new Map([
|
|
377
|
-
// "The exception was a <class>\n: "
|
|
378
370
|
[1000, "\n: "],
|
|
379
371
|
[2105, "failed.\n"],
|
|
380
372
|
[2154, "but it produced the following error:\n"],
|
|
@@ -384,7 +376,6 @@ const INNER_MESSAGE_PREFIXES = new Map([
|
|
|
384
376
|
[2405, "failed.\n"],
|
|
385
377
|
]);
|
|
386
378
|
|
|
387
|
-
// TLC's message holds the inner error's text as TLC printed it, markers included.
|
|
388
379
|
export const formatInnerMessage = (code: number, text: string, isTool: boolean) => {
|
|
389
380
|
const prefix = isTool ? INNER_MESSAGE_PREFIXES.get(code) : undefined;
|
|
390
381
|
const index = prefix === undefined ? -1 : text.indexOf(prefix);
|
|
@@ -400,7 +391,7 @@ export const formatNestedMessage = (text: string, isTool: boolean): string => {
|
|
|
400
391
|
: `@!@!@STARTMSG ${code}:${MESSAGE_LEVEL.none} @!@!@\n${formatInnerMessage(code, text, isTool)}\n@!@!@ENDMSG ${code} @!@!@`;
|
|
401
392
|
};
|
|
402
393
|
|
|
403
|
-
const zeroPad = (value: number) => String(value).padStart(
|
|
394
|
+
export const zeroPad = (value: number, length = 2) => String(value).padStart(length, "0");
|
|
404
395
|
|
|
405
396
|
export const formatTlcDuration = (milliseconds: number) => {
|
|
406
397
|
const seconds = Math.floor(milliseconds / 1000) % 60;
|
|
@@ -440,14 +431,12 @@ const WRONG_INVOCATION_EXCEPTION = getUnexpectedException("util.WrongInvocationE
|
|
|
440
431
|
|
|
441
432
|
const UNEXPECTED_HEADLINE = UNEXPECTED_EXCEPTION.slice(0, UNEXPECTED_EXCEPTION.indexOf("\n"));
|
|
442
433
|
|
|
443
|
-
// TLC 1.7.4 wraps an error in adding a successor in a RuntimeException naming its class.
|
|
444
434
|
const WRAPPED_EVAL_EXCEPTION = `${UNEXPECTED_EXCEPTION}tlc2.tool.EvalException: `;
|
|
445
435
|
const WRAPPED_RUNTIME_EXCEPTION = `${UNEXPECTED_EXCEPTION}util.Assert$TLCRuntimeException: `;
|
|
446
436
|
|
|
447
437
|
export const getWrappedException = (error: TlaEvaluationError) =>
|
|
448
438
|
isEvalException(error) ? WRAPPED_EVAL_EXCEPTION : WRAPPED_RUNTIME_EXCEPTION;
|
|
449
439
|
|
|
450
|
-
// TLC reports an EvalException, or a TLCRuntimeException without its own message, as unexpected.
|
|
451
440
|
export const withUnexpectedException = <Result>(compute: () => Result) => {
|
|
452
441
|
try {
|
|
453
442
|
return compute();
|
|
@@ -477,8 +466,6 @@ const formatErrorMessage = (error: TlaEvaluationError, isTool: boolean): string
|
|
|
477
466
|
return `${prefix}${formatNestedMessage(message.slice(prefix.length), isTool)}`;
|
|
478
467
|
};
|
|
479
468
|
|
|
480
|
-
// TLC reports an error with a headline by its message's code, and one that escapes the next
|
|
481
|
-
// states with an EvalException's code, or as an unexpected exception.
|
|
482
469
|
export interface FailureMessage {
|
|
483
470
|
code: number;
|
|
484
471
|
message: string;
|
|
@@ -498,7 +485,6 @@ export const getFailureMessage = (
|
|
|
498
485
|
toolMessage: formatErrorMessage(error, true),
|
|
499
486
|
};
|
|
500
487
|
}
|
|
501
|
-
// TLC prints a StackOverflowError by its code in the next states, as plain text in the initial.
|
|
502
488
|
if (error instanceof TlaStackOverflowError) {
|
|
503
489
|
return {
|
|
504
490
|
code: isNextState ? MESSAGE_CODE.stackOverflow : MESSAGE_CODE.general,
|
package/src/tlc/order.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
// Reproduces TLC's string order, by first interning, and its variable order, from SANY's context.
|
|
2
1
|
import type { Module, SourceLocation } from "../ast";
|
|
3
2
|
import type { ConfigValue, ModelConfig } from "../config";
|
|
4
3
|
import { createMissingModuleError } from "../errors";
|
|
4
|
+
import { getJavaHashCode } from "../java-hash";
|
|
5
5
|
import { tokenize, type Token } from "../lexer";
|
|
6
6
|
import { extractModule, parseModule, parseModuleTokens } from "../parser";
|
|
7
7
|
import { isBefore } from "../resolve";
|
|
@@ -28,7 +28,6 @@ interface SymbolEntry {
|
|
|
28
28
|
interface SymbolTable {
|
|
29
29
|
put: (entry: SymbolEntry) => void;
|
|
30
30
|
inserted: SymbolEntry[];
|
|
31
|
-
// Where the entries the module adds itself start, after those of the modules it extends.
|
|
32
31
|
ownStart: number;
|
|
33
32
|
enumerate: () => SymbolEntry[];
|
|
34
33
|
}
|
|
@@ -57,16 +56,6 @@ const CANONICAL_OPERATORS = new Map(
|
|
|
57
56
|
|
|
58
57
|
const getCanonicalName = (name: string) => CANONICAL_OPERATORS.get(name) ?? name;
|
|
59
58
|
|
|
60
|
-
const getJavaHash = (text: string) => {
|
|
61
|
-
let hash = 0;
|
|
62
|
-
for (let index = 0; index < text.length; index++) {
|
|
63
|
-
hash = (Math.imul(hash, 31) + text.charCodeAt(index)) | 0;
|
|
64
|
-
}
|
|
65
|
-
return hash;
|
|
66
|
-
};
|
|
67
|
-
|
|
68
|
-
// java.util.Hashtable as SANY's Context uses it: capacity 11, load factor 0.75, new entries at
|
|
69
|
-
// the head of their bucket, and enumeration from the last bucket, each from tail to head.
|
|
70
59
|
const createSymbolTable = (): SymbolTable => {
|
|
71
60
|
let buckets: SymbolEntry[][] = Array.from({ length: 11 }, () => []);
|
|
72
61
|
let threshold = 8;
|
|
@@ -106,7 +95,7 @@ const createSymbolTable = (): SymbolTable => {
|
|
|
106
95
|
const createEntry = (name: string, kind: SymbolKind, isLocal: boolean): SymbolEntry => ({
|
|
107
96
|
key: kind === "module" ? `module ${name}` : name,
|
|
108
97
|
name,
|
|
109
|
-
hash:
|
|
98
|
+
hash: getJavaHashCode(name) & 0x7fffffff,
|
|
110
99
|
kind,
|
|
111
100
|
isLocal,
|
|
112
101
|
});
|
|
@@ -154,7 +143,6 @@ type ModuleSearch = (
|
|
|
154
143
|
visited: Set<string>,
|
|
155
144
|
) => [ModuleReferences, string] | undefined;
|
|
156
145
|
|
|
157
|
-
// In the order SANY's SpecObj walks them to decide which module to parse next.
|
|
158
146
|
const getModuleReferences = (
|
|
159
147
|
tokens: Token[],
|
|
160
148
|
unit: string | undefined,
|
|
@@ -179,10 +167,10 @@ const getModuleReferences = (
|
|
|
179
167
|
innerModules.set(name, inner.references);
|
|
180
168
|
references.inner.push(inner.references);
|
|
181
169
|
index = inner.end;
|
|
182
|
-
} else if (tokens[index - 1]?.text === ".") {
|
|
183
|
-
// A record field named EXTENDS or INSTANCE, as in r.EXTENDS or [r EXCEPT !.INSTANCE = 0].
|
|
184
170
|
continue;
|
|
185
|
-
}
|
|
171
|
+
}
|
|
172
|
+
if (tokens[index - 1]?.text === ".") continue;
|
|
173
|
+
if (token.text === "EXTENDS") {
|
|
186
174
|
const names = getDeclarations(tokens, index + 1);
|
|
187
175
|
references.extends.push(...names);
|
|
188
176
|
names.forEach((name) => allExtends.add(name));
|
|
@@ -209,8 +197,6 @@ const STRING_ESCAPES: Record<string, string> = {
|
|
|
209
197
|
"\f": "\\f",
|
|
210
198
|
};
|
|
211
199
|
|
|
212
|
-
// SANY reads <1>2 and ---- MODULE as one token each, and interns a string literal with its
|
|
213
|
-
// quotes, its contents only during semantic analysis.
|
|
214
200
|
const getParsedTexts = (tokens: Token[]) => {
|
|
215
201
|
const texts: string[] = [];
|
|
216
202
|
for (let index = 0; index < tokens.length; index++) {
|
|
@@ -236,7 +222,6 @@ const getParsedTexts = (tokens: Token[]) => {
|
|
|
236
222
|
return texts;
|
|
237
223
|
};
|
|
238
224
|
|
|
239
|
-
// A module starts with ---- MODULE Name, so its third token is its name.
|
|
240
225
|
const getModuleName = (tokens: Token[]) => tokens[2]?.text;
|
|
241
226
|
|
|
242
227
|
const getRanges = (tokens: Token[]) => {
|
|
@@ -264,19 +249,17 @@ interface ModuleText {
|
|
|
264
249
|
getModule: () => Module;
|
|
265
250
|
}
|
|
266
251
|
|
|
267
|
-
// Read and parsed once, for every order and for the environment that evaluates it.
|
|
268
252
|
const readModuleText = (text: string | undefined): ModuleText => {
|
|
269
253
|
const tokens = text === undefined ? [] : tokenize(text);
|
|
270
|
-
|
|
254
|
+
let parsedModule: Module | undefined;
|
|
271
255
|
return {
|
|
272
256
|
tokens,
|
|
273
257
|
ranges: getRanges(tokens),
|
|
274
258
|
getModule: () =>
|
|
275
|
-
(
|
|
259
|
+
(parsedModule ??= text === undefined ? parseModule("") : parseModuleTokens(text, tokens)),
|
|
276
260
|
};
|
|
277
261
|
};
|
|
278
262
|
|
|
279
|
-
// A module without a source has no tokens.
|
|
280
263
|
const createModuleSet = (source: string, loadModule: ModuleLoader) => {
|
|
281
264
|
const files = new Map<string, ParsedModule>();
|
|
282
265
|
const nestedModules = new Map<string, ParsedModule>();
|
|
@@ -298,11 +281,12 @@ const createModuleSet = (source: string, loadModule: ModuleLoader) => {
|
|
|
298
281
|
TLC_MODULE_SOURCES.get(name) ??
|
|
299
282
|
SANY_STANDARD_MODULES.get(name) ??
|
|
300
283
|
extractModule(source, name));
|
|
301
|
-
const
|
|
302
|
-
const
|
|
303
|
-
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 };
|
|
304
288
|
files.set(name ?? "", file);
|
|
305
|
-
ranges.forEach((nestedRange, nestedName) => {
|
|
289
|
+
moduleText.ranges.forEach((nestedRange, nestedName) => {
|
|
306
290
|
if (nestedRange.start === range.start || nestedModules.has(nestedName)) return;
|
|
307
291
|
nestedModules.set(nestedName, {
|
|
308
292
|
tokens,
|
|
@@ -320,7 +304,6 @@ const createModuleSet = (source: string, loadModule: ModuleLoader) => {
|
|
|
320
304
|
};
|
|
321
305
|
};
|
|
322
306
|
|
|
323
|
-
// The root module's context is under undefined.
|
|
324
307
|
type ModuleSet = ReturnType<typeof createModuleSet>["getParsed"];
|
|
325
308
|
|
|
326
309
|
const createContexts = (getParsed: ModuleSet) => {
|
|
@@ -346,13 +329,12 @@ const createContexts = (getParsed: ModuleSet) => {
|
|
|
346
329
|
: [],
|
|
347
330
|
),
|
|
348
331
|
);
|
|
349
|
-
|
|
350
|
-
tokens.slice(unit.start, unit.end).forEach((
|
|
332
|
+
let depth = 0;
|
|
333
|
+
tokens.slice(unit.start, unit.end).forEach((token, offset) => {
|
|
351
334
|
const index = unit.start + offset;
|
|
352
|
-
const token = tokens[index];
|
|
353
335
|
if (token.kind === "Separator" && tokens[index + 1]?.text === "MODULE") {
|
|
354
|
-
depth
|
|
355
|
-
if (depth
|
|
336
|
+
depth++;
|
|
337
|
+
if (depth === 2) {
|
|
356
338
|
const name = tokens[index + 2].text;
|
|
357
339
|
units.push({
|
|
358
340
|
location: getLocation(token),
|
|
@@ -361,8 +343,8 @@ const createContexts = (getParsed: ModuleSet) => {
|
|
|
361
343
|
}
|
|
362
344
|
return;
|
|
363
345
|
}
|
|
364
|
-
if (token.kind === "ModuleEnd") depth
|
|
365
|
-
if (depth
|
|
346
|
+
if (token.kind === "ModuleEnd") depth--;
|
|
347
|
+
if (depth !== 1 || token.kind !== "Keyword") return;
|
|
366
348
|
const isDeclaration = declarationKeywords.has(`${token.line}:${token.column}`);
|
|
367
349
|
if (isDeclaration && (token.text === "CONSTANT" || token.text === "CONSTANTS")) {
|
|
368
350
|
declare(index, "constant");
|
|
@@ -462,9 +444,11 @@ const createContexts = (getParsed: ModuleSet) => {
|
|
|
462
444
|
};
|
|
463
445
|
};
|
|
464
446
|
|
|
465
|
-
|
|
466
|
-
|
|
467
|
-
|
|
447
|
+
const getStringOrder = (
|
|
448
|
+
getParsed: ModuleSet,
|
|
449
|
+
config: ModelConfig,
|
|
450
|
+
runtimeModules: string[],
|
|
451
|
+
): string[] => {
|
|
468
452
|
const order = new Set<string>();
|
|
469
453
|
const intern = (text: string) => {
|
|
470
454
|
order.add(text);
|
|
@@ -539,7 +523,6 @@ const getStringOrder = (getParsed: ModuleSet, config: ModelConfig): string[] =>
|
|
|
539
523
|
dependencies.set(module.unit, [...(dependencies.get(module.unit) ?? []), name]);
|
|
540
524
|
if (parsedUnits.has(name)) continue;
|
|
541
525
|
parsedUnits.add(name);
|
|
542
|
-
// SANY stops at the first module it can't find, in the order it reads them.
|
|
543
526
|
if (getParsed(name).tokens.length === 0) {
|
|
544
527
|
const importer = module.unit ?? getModuleName(getParsed(undefined).tokens);
|
|
545
528
|
throw createMissingModuleError(name, importer);
|
|
@@ -562,17 +545,20 @@ const getStringOrder = (getParsed: ModuleSet, config: ModelConfig): string[] =>
|
|
|
562
545
|
});
|
|
563
546
|
};
|
|
564
547
|
analyze(undefined);
|
|
548
|
+
runtimeModules.forEach((name) => {
|
|
549
|
+
const tokens = getUnitTokens(name);
|
|
550
|
+
getParsedTexts(tokens).forEach(intern);
|
|
551
|
+
tokens.forEach((token) => {
|
|
552
|
+
if (token.kind === "String") intern(token.text);
|
|
553
|
+
});
|
|
554
|
+
});
|
|
565
555
|
TLC_RUNTIME_STRINGS.forEach(intern);
|
|
566
556
|
return [...order];
|
|
567
557
|
};
|
|
568
558
|
|
|
569
559
|
export interface TlcOrder {
|
|
570
|
-
getStringOrder: (config: ModelConfig) => string[];
|
|
571
|
-
// The reverse of the root module's context enumeration, in which TLC compares variables and
|
|
572
|
-
// checks that the configuration assigns each constant.
|
|
560
|
+
getStringOrder: (config: ModelConfig, runtimeModules: string[]) => string[];
|
|
573
561
|
getDeclarationOrder: (kind: "variable" | "constant") => string[];
|
|
574
|
-
// In the order TLC computes constant definitions at startup. An INSTANCE adds those of the
|
|
575
|
-
// module it instantiates in the order that module's Hashtable enumerates them.
|
|
576
562
|
createDefinitionOrder: () => (name: string | undefined) => string[];
|
|
577
563
|
parseModule: (source: string) => Module;
|
|
578
564
|
}
|
|
@@ -583,7 +569,7 @@ export const createTlcOrder = (source: string, loadModule: ModuleLoader): TlcOrd
|
|
|
583
569
|
let contexts: ReturnType<typeof createContexts> | undefined;
|
|
584
570
|
const getContexts = () => (contexts ??= createContexts(getParsed));
|
|
585
571
|
return {
|
|
586
|
-
getStringOrder: (config) => getStringOrder(getParsed, config),
|
|
572
|
+
getStringOrder: (config, runtimeModules) => getStringOrder(getParsed, config, runtimeModules),
|
|
587
573
|
getDeclarationOrder: (kind) =>
|
|
588
574
|
getContexts()
|
|
589
575
|
.getContext(undefined)
|
|
@@ -593,11 +579,11 @@ export const createTlcOrder = (source: string, loadModule: ModuleLoader): TlcOrd
|
|
|
593
579
|
.reverse(),
|
|
594
580
|
parseModule: modules.parseText,
|
|
595
581
|
createDefinitionOrder: () => {
|
|
596
|
-
const
|
|
597
|
-
|
|
598
|
-
getContext(undefined);
|
|
582
|
+
const moduleContexts = getContexts();
|
|
583
|
+
moduleContexts.getContext(undefined);
|
|
599
584
|
return (name) =>
|
|
600
|
-
|
|
585
|
+
moduleContexts
|
|
586
|
+
.getOwnEntries(name)
|
|
601
587
|
.filter((entry) => entry.kind === "definition")
|
|
602
588
|
.map((entry) => entry.name);
|
|
603
589
|
},
|