tla-ts 0.0.9-dev.8298a52 → 0.0.10-dev.06b481ee0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +8 -0
- package/dist/compile.cjs +6 -6
- package/dist/compile.js +10 -10
- package/dist/deciders.cjs +41 -37
- package/dist/deciders.js +57 -53
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +121 -12
- package/dist/index.d.ts +121 -12
- package/dist/index.js +1 -1
- package/dist/parallel-worker.cjs +1 -1
- package/dist/parallel-worker.js +1 -1
- package/dist/prove-worker.cjs +1 -1
- package/dist/prove-worker.js +1 -1
- package/dist/prove.cjs +2746 -410
- package/dist/prove.js +2745 -409
- package/dist/run.cjs +144 -31
- package/dist/run.js +144 -31
- package/dist/tlapm.cjs +2 -2
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +134 -104
- package/dist/transfer.js +134 -104
- package/dist/worker.cjs +7 -7
- package/dist/worker.js +7 -7
- package/package.json +1 -1
- package/src/ast.ts +56 -60
- package/src/bags.ts +128 -110
- package/src/builtins.ts +31 -77
- package/src/bundled-modules.ts +1 -8
- package/src/check-failure.ts +118 -0
- package/src/check-trace.ts +320 -0
- package/src/check.ts +1155 -900
- package/src/cli/options.ts +12 -32
- package/src/cli/run.ts +0 -2
- package/src/cli/runtime-invariants.ts +100 -0
- package/src/cli/shared.ts +19 -12
- package/src/cli/tlapm.ts +433 -82
- package/src/cli/tlc-arguments.ts +652 -0
- package/src/cli/tlc-output.ts +701 -0
- package/src/cli/tlc-usage.ts +360 -0
- package/src/cli/tlc.ts +318 -656
- package/src/cli/typescript.ts +0 -3
- package/src/cli/xml-exporter.ts +27 -49
- package/src/cli.ts +0 -1
- package/src/codegen.ts +217 -82
- package/src/config.ts +140 -109
- package/src/coverage.ts +1019 -0
- package/src/dependencies.ts +101 -66
- package/src/dfid.ts +683 -0
- package/src/environment-config.ts +315 -0
- package/src/environment.ts +260 -371
- package/src/errors.ts +93 -58
- package/src/evaluate.ts +848 -374
- package/src/exit-codes.ts +63 -13
- package/src/fingerprints.ts +75 -11
- package/src/index.ts +3 -0
- package/src/instances.ts +97 -43
- package/src/java-hash.ts +21 -0
- package/src/java-overrides.ts +6 -21
- package/src/json-reader.ts +455 -0
- package/src/json.ts +252 -139
- package/src/levels.ts +231 -154
- package/src/lexer.ts +83 -101
- package/src/liveness-checker.ts +743 -325
- package/src/liveness.ts +224 -131
- package/src/obligations/action.ts +17 -44
- package/src/obligations/anonymize.ts +120 -95
- package/src/obligations/enabled-axioms.ts +218 -0
- package/src/obligations/equality.ts +1 -3
- package/src/obligations/expression.ts +37 -26
- package/src/obligations/format.ts +0 -10
- package/src/obligations/generate.ts +66 -64
- package/src/obligations/index.ts +39 -20
- package/src/obligations/levels.ts +27 -18
- package/src/obligations/module.ts +28 -55
- package/src/obligations/normalize.ts +31 -41
- package/src/obligations/operators.ts +0 -3
- package/src/obligations/pragma.ts +52 -24
- package/src/obligations/printer.ts +94 -63
- package/src/obligations/proof.ts +3 -6
- package/src/obligations/regroup.ts +0 -5
- package/src/obligations/simplify.ts +57 -63
- package/src/obligations/source.ts +121 -95
- package/src/obligations/subexpression.ts +49 -28
- package/src/obligations/substitution.ts +1 -5
- package/src/obligations/temporal.ts +12 -20
- package/src/obligations/tuples.ts +2 -10
- package/src/parallel-worker.ts +34 -57
- package/src/parallel.ts +62 -72
- package/src/parser.ts +1184 -531
- package/src/pcal/ast.ts +53 -86
- package/src/pcal/parse.ts +144 -219
- package/src/pcal/tokenize.ts +91 -131
- package/src/pcal/translate.ts +83 -130
- package/src/pcal/validate.ts +48 -68
- package/src/pretty-print.ts +7 -8
- package/src/prover/decide-pool.ts +8 -13
- package/src/prover/deciders.ts +12 -13
- package/src/prover/first-order.ts +0 -11
- package/src/prover/isabelle/decide.ts +3 -31
- package/src/prover/isabelle/encode.ts +82 -64
- package/src/prover/isabelle/isar/attrib.ts +250 -0
- package/src/prover/isabelle/isar/context.ts +335 -0
- package/src/prover/isabelle/isar/induct.ts +382 -0
- package/src/prover/isabelle/isar/inner-syntax.ts +262 -117
- package/src/prover/isabelle/isar/method.ts +510 -226
- package/src/prover/isabelle/isar/proof.ts +570 -23
- package/src/prover/isabelle/isar/rule-cases.ts +226 -0
- package/src/prover/isabelle/isar/theory.ts +488 -88
- package/src/prover/isabelle/isar/toplevel.ts +331 -0
- package/src/prover/isabelle/isar/type-check.ts +99 -38
- package/src/prover/isabelle/provers/blast/blast.ts +16 -105
- package/src/prover/isabelle/provers/blast/branch.ts +0 -33
- package/src/prover/isabelle/provers/blast/prove.ts +0 -36
- package/src/prover/isabelle/provers/blast/rules.ts +5 -45
- package/src/prover/isabelle/provers/blast/state.ts +1 -29
- package/src/prover/isabelle/provers/blast/term.ts +8 -37
- package/src/prover/isabelle/provers/clasimp.ts +1 -15
- package/src/prover/isabelle/provers/classical.ts +58 -61
- package/src/prover/isabelle/provers/hypsubst.ts +29 -54
- package/src/prover/isabelle/pure/bicompose.ts +24 -39
- package/src/prover/isabelle/pure/consts.ts +0 -8
- package/src/prover/isabelle/pure/conv.ts +2 -18
- package/src/prover/isabelle/pure/drule.ts +95 -45
- package/src/prover/isabelle/pure/envir.ts +2 -53
- package/src/prover/isabelle/pure/goal.ts +1 -9
- package/src/prover/isabelle/pure/interrupt.ts +0 -5
- package/src/prover/isabelle/pure/list.ts +0 -3
- package/src/prover/isabelle/pure/logic.ts +1 -16
- package/src/prover/isabelle/pure/name.ts +1 -10
- package/src/prover/isabelle/pure/net.ts +2 -60
- package/src/prover/isabelle/pure/object-logic.ts +15 -16
- package/src/prover/isabelle/pure/pattern.ts +1 -20
- package/src/prover/isabelle/pure/raw-simplifier.ts +16 -63
- package/src/prover/isabelle/pure/rewriter.ts +34 -77
- package/src/prover/isabelle/pure/search.ts +2 -11
- package/src/prover/isabelle/pure/seq.ts +0 -11
- package/src/prover/isabelle/pure/simplifier.ts +27 -16
- package/src/prover/isabelle/pure/table.ts +2 -33
- package/src/prover/isabelle/pure/tactic.ts +11 -23
- package/src/prover/isabelle/pure/tactical.ts +47 -48
- package/src/prover/isabelle/pure/term-ord.ts +1 -7
- package/src/prover/isabelle/pure/term.ts +4 -47
- package/src/prover/isabelle/pure/thm.ts +26 -48
- package/src/prover/isabelle/pure/type.ts +1 -16
- package/src/prover/isabelle/pure/unify.ts +19 -31
- package/src/prover/isabelle/pure/variable.ts +2 -8
- package/src/prover/isabelle/tla/classical-setup.ts +17 -25
- package/src/prover/isabelle/tla/context.ts +65 -26
- package/src/prover/isabelle/tla/logic-data.ts +1 -1
- package/src/prover/isabelle/tla/logic.ts +53 -32
- package/src/prover/isabelle/tla/simpdata.ts +45 -44
- package/src/prover/isabelle/tools/intuitionistic.ts +28 -21
- package/src/prover/ocaml.ts +4 -7
- package/src/prover/prep/action.ts +33 -66
- package/src/prover/prep/enabled-axioms.ts +22 -20
- package/src/prover/prep/fingerprint.ts +2 -21
- package/src/prover/prep/level-comparison.ts +8 -12
- package/src/prover/prep/md5.ts +26 -31
- package/src/prover/prep/methods.ts +189 -86
- package/src/prover/prep/normalize.ts +42 -37
- package/src/prover/prove-worker.ts +0 -2
- package/src/prover/prove.ts +398 -133
- package/src/prover/ptl/decide.ts +96 -56
- package/src/prover/ptl/encode.ts +15 -38
- package/src/prover/ptl/sat.ts +24 -32
- package/src/prover/ptl/tableau.ts +40 -28
- package/src/prover/smt/arithmetic.ts +310 -0
- package/src/prover/smt/axioms.ts +12 -15
- package/src/prover/smt/context.ts +60 -32
- package/src/prover/smt/data.ts +517 -401
- package/src/prover/smt/encode.ts +155 -85
- package/src/prover/smt/extensionality.ts +5 -13
- package/src/prover/smt/flatten.ts +7 -28
- package/src/prover/smt/format.ts +33 -14
- package/src/prover/smt/instances.ts +7 -11
- package/src/prover/smt/layout.ts +91 -0
- package/src/prover/smt/rewrite.ts +1021 -658
- package/src/prover/smt/simplify.ts +441 -0
- package/src/prover/smt/solver/ackermannize-bv-tactic.ts +61 -0
- package/src/prover/smt/solver/ackr-helper.ts +179 -0
- package/src/prover/smt/solver/ackr-model-converter.ts +105 -0
- package/src/prover/smt/solver/act-cache.ts +0 -16
- package/src/prover/smt/solver/add-bounds-tactic.ts +59 -0
- package/src/prover/smt/solver/aig-tactic.ts +52 -0
- package/src/prover/smt/solver/aig.ts +889 -0
- package/src/prover/smt/solver/arith-rewriter.ts +626 -56
- package/src/prover/smt/solver/arith-terms.ts +121 -0
- package/src/prover/smt/solver/array-decl-plugin.ts +175 -0
- package/src/prover/smt/solver/array-rewriter.ts +319 -0
- package/src/prover/smt/solver/array.ts +1 -3
- package/src/prover/smt/solver/asserted-formulas.ts +241 -99
- package/src/prover/smt/solver/ast-lt.ts +165 -21
- package/src/prover/smt/solver/ast-util.ts +160 -7
- package/src/prover/smt/solver/ast.ts +1480 -184
- package/src/prover/smt/solver/auf-solver.ts +30 -56
- package/src/prover/smt/solver/bit-blast-tactic.ts +608 -0
- package/src/prover/smt/solver/bit-blaster.ts +871 -0
- package/src/prover/smt/solver/blast-term-ite.ts +47 -0
- package/src/prover/smt/solver/bound-manager.ts +196 -0
- package/src/prover/smt/solver/bound-simplifier.ts +598 -0
- package/src/prover/smt/solver/bv-bound-chk.ts +492 -0
- package/src/prover/smt/solver/bv-decl-plugin.ts +341 -0
- package/src/prover/smt/solver/bv-divrem-bounds.ts +95 -0
- package/src/prover/smt/solver/bv-rewriter.ts +1901 -0
- package/src/prover/smt/solver/bv1-blast.ts +214 -0
- package/src/prover/smt/solver/bv2fpa-converter.ts +174 -0
- package/src/prover/smt/solver/bv2int-rewriter.ts +544 -0
- package/src/prover/smt/solver/bv2real-rewriter.ts +533 -0
- package/src/prover/smt/solver/card2bv.ts +127 -0
- package/src/prover/smt/solver/case-split-queue.ts +0 -10
- package/src/prover/smt/solver/cg-table.ts +39 -42
- package/src/prover/smt/solver/check-logic.ts +330 -0
- package/src/prover/smt/solver/clause.ts +0 -27
- package/src/prover/smt/solver/cofactor-elim-term-ite.ts +293 -0
- package/src/prover/smt/solver/conflict-resolution.ts +78 -11
- package/src/prover/smt/solver/context.ts +600 -187
- package/src/prover/smt/solver/ctx-simplify.ts +34 -52
- package/src/prover/smt/solver/ctx-solver-simplify.ts +122 -0
- package/src/prover/smt/solver/datatype-decl-plugin.ts +580 -0
- package/src/prover/smt/solver/datatype-rewriter.ts +82 -0
- package/src/prover/smt/solver/demodulator.ts +786 -0
- package/src/prover/smt/solver/dependent-expr-state.ts +93 -0
- package/src/prover/smt/solver/der.ts +39 -30
- package/src/prover/smt/solver/diff-neq.ts +205 -0
- package/src/prover/smt/solver/distribute-forall.ts +57 -0
- package/src/prover/smt/solver/dom-simplify.ts +511 -0
- package/src/prover/smt/solver/dt2bv-tactic.ts +296 -0
- package/src/prover/smt/solver/dyn-ack.ts +0 -11
- package/src/prover/smt/solver/e-matching.ts +9 -41
- package/src/prover/smt/solver/elim-bounds.ts +89 -0
- package/src/prover/smt/solver/elim-small-bv-tactic.ts +129 -0
- package/src/prover/smt/solver/elim-term-ite-tactic.ts +48 -0
- package/src/prover/smt/solver/elim-uncnstr.ts +542 -0
- package/src/prover/smt/solver/enode.ts +100 -23
- package/src/prover/smt/solver/eq2bv-tactic.ts +218 -0
- package/src/prover/smt/solver/euf/arith-axioms.ts +403 -0
- package/src/prover/smt/solver/euf/arith-internalize.ts +653 -0
- package/src/prover/smt/solver/euf/arith-solver.ts +889 -0
- package/src/prover/smt/solver/euf/array-axioms.ts +527 -0
- package/src/prover/smt/solver/euf/array-internalize.ts +428 -0
- package/src/prover/smt/solver/euf/array-solver.ts +306 -0
- package/src/prover/smt/solver/euf/bv-ackerman.ts +162 -0
- package/src/prover/smt/solver/euf/bv-internalize.ts +748 -0
- package/src/prover/smt/solver/euf/bv-solver.ts +449 -0
- package/src/prover/smt/solver/euf/dt-solver.ts +618 -0
- package/src/prover/smt/solver/euf/egraph.ts +901 -0
- package/src/prover/smt/solver/euf/euf-solver.ts +1204 -0
- package/src/prover/smt/solver/euf/fpa-solver.ts +317 -0
- package/src/prover/smt/solver/euf/mam.ts +1046 -0
- package/src/prover/smt/solver/euf/q-ematch.ts +829 -0
- package/src/prover/smt/solver/euf/q-mbi.ts +587 -0
- package/src/prover/smt/solver/euf/q-model-fixer.ts +296 -0
- package/src/prover/smt/solver/euf/q-solver.ts +361 -0
- package/src/prover/smt/solver/euf/th-solver.ts +328 -0
- package/src/prover/smt/solver/euf/th-solvers.ts +30 -0
- package/src/prover/smt/solver/expr-ref.ts +0 -5
- package/src/prover/smt/solver/expr-safe-replace.ts +26 -7
- package/src/prover/smt/solver/expr2polynomial.ts +271 -0
- package/src/prover/smt/solver/factor.ts +163 -0
- package/src/prover/smt/solver/fd-solver.ts +734 -0
- package/src/prover/smt/solver/fingerprints.ts +15 -26
- package/src/prover/smt/solver/fix-dl-var.ts +147 -0
- package/src/prover/smt/solver/flat-literals.ts +0 -9
- package/src/prover/smt/solver/fm-tactic.ts +884 -0
- package/src/prover/smt/solver/fpa-decl-plugin.ts +618 -0
- package/src/prover/smt/solver/fpa-rewriter.ts +639 -0
- package/src/prover/smt/solver/fpa2bv-converter.ts +2251 -0
- package/src/prover/smt/solver/fpa2bv-rewriter.ts +349 -0
- package/src/prover/smt/solver/fpa2bv-tactic.ts +73 -0
- package/src/prover/smt/solver/goal.ts +179 -28
- package/src/prover/smt/solver/goal2nlsat.ts +216 -0
- package/src/prover/smt/solver/guard-set.ts +219 -0
- package/src/prover/smt/solver/hash.ts +0 -9
- package/src/prover/smt/solver/hashtable.ts +30 -23
- package/src/prover/smt/solver/inf-eps.ts +63 -0
- package/src/prover/smt/solver/inj-axiom.ts +101 -0
- package/src/prover/smt/solver/internalizer.ts +113 -133
- package/src/prover/smt/solver/lackr.ts +381 -0
- package/src/prover/smt/solver/lbool.ts +0 -2
- package/src/prover/smt/solver/lia2card.ts +268 -0
- package/src/prover/smt/solver/lia2pb.ts +154 -0
- package/src/prover/smt/solver/literal.ts +0 -4
- package/src/prover/smt/solver/logic-tactics.ts +355 -0
- package/src/prover/smt/solver/lp/bound-propagator.ts +7 -26
- package/src/prover/smt/solver/lp/constraints.ts +1 -8
- package/src/prover/smt/solver/lp/containers.ts +18 -31
- package/src/prover/smt/solver/lp/core-solver.ts +35 -37
- package/src/prover/smt/solver/lp/cross-nested.ts +4 -21
- package/src/prover/smt/solver/lp/dep-intervals.ts +6 -24
- package/src/prover/smt/solver/lp/dependency.ts +0 -5
- package/src/prover/smt/solver/lp/dioph-eq.ts +8 -103
- package/src/prover/smt/solver/lp/explanation.ts +0 -6
- package/src/prover/smt/solver/lp/gomory.ts +8 -22
- package/src/prover/smt/solver/lp/hnf-cutter.ts +16 -23
- package/src/prover/smt/solver/lp/hnf.ts +10 -28
- package/src/prover/smt/solver/lp/int-cube.ts +17 -39
- package/src/prover/smt/solver/lp/int-solver.ts +3 -35
- package/src/prover/smt/solver/lp/lar-solver.ts +70 -83
- package/src/prover/smt/solver/lp/lar-term.ts +0 -5
- package/src/prover/smt/solver/lp/lp-settings.ts +6 -16
- package/src/prover/smt/solver/lp/maximize-term.ts +76 -52
- package/src/prover/smt/solver/lp/nex-creator.ts +7 -30
- package/src/prover/smt/solver/lp/nex.ts +2 -7
- package/src/prover/smt/solver/lp/nla-backoff.ts +0 -5
- package/src/prover/smt/solver/lp/nla-basics.ts +48 -30
- package/src/prover/smt/solver/lp/nla-core.ts +92 -136
- package/src/prover/smt/solver/lp/nla-divisions.ts +31 -43
- package/src/prover/smt/solver/lp/nla-emonics.ts +3 -21
- package/src/prover/smt/solver/lp/nla-factorization.ts +0 -4
- package/src/prover/smt/solver/lp/nla-grobner.ts +177 -149
- package/src/prover/smt/solver/lp/nla-horner.ts +2 -12
- package/src/prover/smt/solver/lp/nla-intervals.ts +1 -12
- package/src/prover/smt/solver/lp/nla-monomial-bounds.ts +15 -42
- package/src/prover/smt/solver/lp/nla-monotone.ts +1 -6
- package/src/prover/smt/solver/lp/nla-order.ts +0 -13
- package/src/prover/smt/solver/lp/nla-patcher.ts +3 -7
- package/src/prover/smt/solver/lp/nla-powers.ts +220 -0
- package/src/prover/smt/solver/lp/nla-tangents.ts +0 -10
- package/src/prover/smt/solver/lp/nla-throttle.ts +0 -6
- package/src/prover/smt/solver/lp/nla-transcendentals.ts +324 -0
- package/src/prover/smt/solver/lp/nla-types.ts +0 -12
- package/src/prover/smt/solver/lp/nla-var-eqs.ts +4 -26
- package/src/prover/smt/solver/lp/nra-solver.ts +164 -147
- package/src/prover/smt/solver/lp/numeric-pair.ts +0 -4
- package/src/prover/smt/solver/lp/pdd-interval.ts +6 -5
- package/src/prover/smt/solver/lp/pdd-simplifier.ts +61 -34
- package/src/prover/smt/solver/lp/pdd-solver.ts +74 -72
- package/src/prover/smt/solver/lp/pdd.ts +730 -358
- package/src/prover/smt/solver/lp/random-updater.ts +0 -9
- package/src/prover/smt/solver/lp/static-matrix.ts +8 -19
- package/src/prover/smt/solver/lp/union-find.ts +5 -5
- package/src/prover/smt/solver/macro-finder.ts +530 -0
- package/src/prover/smt/solver/mam-compiler.ts +129 -139
- package/src/prover/smt/solver/mam-interpreter.ts +0 -21
- package/src/prover/smt/solver/max-bv-sharing-tactic.ts +17 -0
- package/src/prover/smt/solver/max-cliques.ts +105 -0
- package/src/prover/smt/solver/maxcore.ts +310 -0
- package/src/prover/smt/solver/maximize-ac-sharing.ts +8 -21
- package/src/prover/smt/solver/maxlex.ts +115 -0
- package/src/prover/smt/solver/maxsmt-base.ts +106 -0
- package/src/prover/smt/solver/maxsmt.ts +92 -0
- package/src/prover/smt/solver/mbp/mbp-arith.ts +467 -0
- package/src/prover/smt/solver/mbp/mbp-basic-tg.ts +101 -0
- package/src/prover/smt/solver/mbp/mbp-plugin.ts +287 -0
- package/src/prover/smt/solver/mbp/mbp-qel.ts +48 -0
- package/src/prover/smt/solver/mbp/mbp-solve-plugin.ts +271 -0
- package/src/prover/smt/solver/mbp/mbp-term-graph.ts +606 -0
- package/src/prover/smt/solver/model-based-opt.ts +844 -0
- package/src/prover/smt/solver/model-checker.ts +20 -63
- package/src/prover/smt/solver/model-evaluator.ts +192 -40
- package/src/prover/smt/solver/model-finder.ts +14 -32
- package/src/prover/smt/solver/model-generator.ts +104 -46
- package/src/prover/smt/solver/model-macro-solver.ts +60 -114
- package/src/prover/smt/solver/model-printer.ts +214 -0
- package/src/prover/smt/solver/mpf.ts +709 -0
- package/src/prover/smt/solver/mus.ts +50 -0
- package/src/prover/smt/solver/muz/dl-context.ts +382 -0
- package/src/prover/smt/solver/muz/dl-mk-bit-blast.ts +97 -0
- package/src/prover/smt/solver/muz/dl-mk-coi-filter.ts +167 -0
- package/src/prover/smt/solver/muz/dl-mk-elim-term-ite.ts +125 -0
- package/src/prover/smt/solver/muz/dl-mk-interp-tail-simplifier.ts +299 -0
- package/src/prover/smt/solver/muz/dl-mk-rule-inliner.ts +455 -0
- package/src/prover/smt/solver/muz/dl-mk-slice.ts +340 -0
- package/src/prover/smt/solver/muz/dl-mk-subsumption-checker.ts +163 -0
- package/src/prover/smt/solver/muz/dl-rule-set.ts +273 -0
- package/src/prover/smt/solver/muz/dl-rule-transformer.ts +123 -0
- package/src/prover/smt/solver/muz/dl-rule.ts +495 -0
- package/src/prover/smt/solver/muz/hnf.ts +201 -0
- package/src/prover/smt/solver/muz/horn-subsume-model-converter.ts +176 -0
- package/src/prover/smt/solver/muz/horn-tactic.ts +214 -0
- package/src/prover/smt/solver/muz/rule-properties.ts +359 -0
- package/src/prover/smt/solver/muz/spacer-context.ts +1404 -0
- package/src/prover/smt/solver/muz/spacer-dl-interface.ts +52 -0
- package/src/prover/smt/solver/muz/spacer-generalizers.ts +241 -0
- package/src/prover/smt/solver/muz/spacer-manager.ts +127 -0
- package/src/prover/smt/solver/muz/spacer-pdr.ts +219 -0
- package/src/prover/smt/solver/muz/spacer-prop-solver.ts +333 -0
- package/src/prover/smt/solver/muz/spacer-util.ts +282 -0
- package/src/prover/smt/solver/muz/substitution.ts +203 -0
- package/src/prover/smt/solver/nla2bv-tactic.ts +285 -0
- package/src/prover/smt/solver/nlqsat.ts +484 -0
- package/src/prover/smt/solver/nlsat/algebraic.ts +357 -236
- package/src/prover/smt/solver/nlsat/atoms.ts +73 -54
- package/src/prover/smt/solver/nlsat/evaluator.ts +16 -22
- package/src/prover/smt/solver/nlsat/explain.ts +429 -275
- package/src/prover/smt/solver/nlsat/interval-set.ts +9 -51
- package/src/prover/smt/solver/nlsat/levelwise.ts +477 -344
- package/src/prover/smt/solver/nlsat/mpbq.ts +47 -14
- package/src/prover/smt/solver/nlsat/polynomial.ts +2385 -832
- package/src/prover/smt/solver/nlsat/solver.ts +297 -156
- package/src/prover/smt/solver/nlsat/transcendental-eval.ts +310 -0
- package/src/prover/smt/solver/nlsat/transcendentals.ts +391 -0
- package/src/prover/smt/solver/nlsat/types.ts +0 -9
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +9 -51
- package/src/prover/smt/solver/nlsat/upolynomial.ts +49 -109
- package/src/prover/smt/solver/nlsat-tactic.ts +82 -0
- package/src/prover/smt/solver/nnf.ts +112 -61
- package/src/prover/smt/solver/normalize-bounds.ts +53 -0
- package/src/prover/smt/solver/occf.ts +97 -0
- package/src/prover/smt/solver/opt-context.ts +801 -0
- package/src/prover/smt/solver/opt-nlsat.ts +386 -0
- package/src/prover/smt/solver/opt-pareto.ts +301 -0
- package/src/prover/smt/solver/opt-preprocess.ts +101 -0
- package/src/prover/smt/solver/opt-solver.ts +312 -0
- package/src/prover/smt/solver/opt-value.ts +55 -0
- package/src/prover/smt/solver/optsmt.ts +692 -0
- package/src/prover/smt/solver/parallel-tactic.ts +299 -0
- package/src/prover/smt/solver/pattern-inference.ts +21 -26
- package/src/prover/smt/solver/pb-rewriter.ts +281 -0
- package/src/prover/smt/solver/pb2bv-tactic.ts +540 -0
- package/src/prover/smt/solver/poly-rewriter.ts +261 -79
- package/src/prover/smt/solver/probes.ts +577 -0
- package/src/prover/smt/solver/propagate-values.ts +37 -30
- package/src/prover/smt/solver/proto-model.ts +650 -66
- package/src/prover/smt/solver/pull-quant.ts +28 -23
- package/src/prover/smt/solver/purify-arith.ts +632 -0
- package/src/prover/smt/solver/push-app-ite.ts +37 -0
- package/src/prover/smt/solver/qe-arith-plugin.ts +1096 -0
- package/src/prover/smt/solver/qe-lite-der.ts +2 -31
- package/src/prover/smt/solver/qe-lite-fm.ts +4 -28
- package/src/prover/smt/solver/qe-lite.ts +41 -51
- package/src/prover/smt/solver/qe-mbp.ts +270 -0
- package/src/prover/smt/solver/qe.ts +1499 -0
- package/src/prover/smt/solver/qel.ts +25 -0
- package/src/prover/smt/solver/qi-queue.ts +0 -16
- package/src/prover/smt/solver/qsat.ts +829 -0
- package/src/prover/smt/solver/quant-hoist.ts +196 -0
- package/src/prover/smt/solver/quant-tactics.ts +17 -74
- package/src/prover/smt/solver/quantifier-analyzer.ts +26 -47
- package/src/prover/smt/solver/quantifier-manager.ts +22 -32
- package/src/prover/smt/solver/quasi-macros.ts +243 -0
- package/src/prover/smt/solver/random-gen.ts +0 -2
- package/src/prover/smt/solver/rational.ts +45 -8
- package/src/prover/smt/solver/recfun-decl-plugin.ts +262 -0
- package/src/prover/smt/solver/recfun-rewriter.ts +107 -0
- package/src/prover/smt/solver/reduce-args.ts +225 -0
- package/src/prover/smt/solver/reduce-bv-size.ts +119 -0
- package/src/prover/smt/solver/ref-vector.ts +0 -6
- package/src/prover/smt/solver/relevancy.ts +2 -16
- package/src/prover/smt/solver/rewriter-tpl.ts +59 -135
- package/src/prover/smt/solver/rewriter.ts +507 -144
- package/src/prover/smt/solver/rlimit.ts +46 -24
- package/src/prover/smt/solver/sat/asymm-branch.ts +325 -0
- package/src/prover/smt/solver/sat/big.ts +177 -0
- package/src/prover/smt/solver/sat/clause-use-list.ts +71 -0
- package/src/prover/smt/solver/sat/clause.ts +203 -0
- package/src/prover/smt/solver/sat/cleaner.ts +94 -0
- package/src/prover/smt/solver/sat/config.ts +122 -0
- package/src/prover/smt/solver/sat/consequences.ts +203 -0
- package/src/prover/smt/solver/sat/elim-eqs.ts +142 -0
- package/src/prover/smt/solver/sat/goal2sat.ts +579 -0
- package/src/prover/smt/solver/sat/inc-sat-solver.ts +464 -0
- package/src/prover/smt/solver/sat/model-converter.ts +136 -0
- package/src/prover/smt/solver/sat/pb-constraint.ts +268 -0
- package/src/prover/smt/solver/sat/pb-solver.ts +1596 -0
- package/src/prover/smt/solver/sat/probing.ts +170 -0
- package/src/prover/smt/solver/sat/sat-tactic.ts +53 -0
- package/src/prover/smt/solver/sat/sat2goal.ts +189 -0
- package/src/prover/smt/solver/sat/scc.ts +142 -0
- package/src/prover/smt/solver/sat/simplifier.ts +1618 -0
- package/src/prover/smt/solver/sat/solver.ts +2107 -0
- package/src/prover/smt/solver/sat/var-queue.ts +117 -0
- package/src/prover/smt/solver/sat/watch-list.ts +140 -0
- package/src/prover/smt/solver/search-tree.ts +284 -0
- package/src/prover/smt/solver/seq-axioms.ts +995 -0
- package/src/prover/smt/solver/seq-decl-plugin.ts +819 -0
- package/src/prover/smt/solver/seq-derive.ts +1298 -0
- package/src/prover/smt/solver/seq-eq-approx.ts +236 -0
- package/src/prover/smt/solver/seq-eq-solver.ts +439 -0
- package/src/prover/smt/solver/seq-factory.ts +89 -0
- package/src/prover/smt/solver/seq-monadic.ts +730 -0
- package/src/prover/smt/solver/seq-range-predicate.ts +235 -0
- package/src/prover/smt/solver/seq-re-rewriter.ts +1171 -0
- package/src/prover/smt/solver/seq-re-util.ts +758 -0
- package/src/prover/smt/solver/seq-regex-bisim.ts +144 -0
- package/src/prover/smt/solver/seq-regex-live.ts +200 -0
- package/src/prover/smt/solver/seq-rewriter.ts +2404 -0
- package/src/prover/smt/solver/seq-skolem.ts +294 -0
- package/src/prover/smt/solver/seq-subset.ts +165 -0
- package/src/prover/smt/solver/seq-view-witness.ts +353 -0
- package/src/prover/smt/solver/smt-consequences.ts +297 -0
- package/src/prover/smt/solver/smt-kernel.ts +124 -0
- package/src/prover/smt/solver/smt-logics.ts +66 -0
- package/src/prover/smt/solver/smt-setup.ts +589 -0
- package/src/prover/smt/solver/smt2-printer.ts +765 -0
- package/src/prover/smt/solver/smtlib-parser.ts +3546 -406
- package/src/prover/smt/solver/smtlib-script.ts +2134 -0
- package/src/prover/smt/solver/solve-eqs.ts +928 -0
- package/src/prover/smt/solver/solver.ts +129 -38
- package/src/prover/smt/solver/sort.ts +1 -5
- package/src/prover/smt/solver/static-features.ts +314 -0
- package/src/prover/smt/solver/sticky-generations.ts +0 -6
- package/src/prover/smt/solver/tactic.ts +2141 -0
- package/src/prover/smt/solver/term-enumeration.ts +205 -0
- package/src/prover/smt/solver/theory-array.ts +1240 -0
- package/src/prover/smt/solver/theory-bv.ts +1210 -0
- package/src/prover/smt/solver/theory-char.ts +355 -0
- package/src/prover/smt/solver/theory-datatype.ts +598 -0
- package/src/prover/smt/solver/theory-finite-set.ts +30 -0
- package/src/prover/smt/solver/theory-fpa.ts +389 -0
- package/src/prover/smt/solver/theory-lra-axioms.ts +55 -25
- package/src/prover/smt/solver/theory-lra-bounds.ts +31 -11
- package/src/prover/smt/solver/theory-lra-final-check.ts +60 -91
- package/src/prover/smt/solver/theory-lra-internalize.ts +96 -53
- package/src/prover/smt/solver/theory-lra-model.ts +23 -53
- package/src/prover/smt/solver/theory-lra-propagate.ts +34 -42
- package/src/prover/smt/solver/theory-lra-state.ts +7 -28
- package/src/prover/smt/solver/theory-lra.ts +189 -9
- package/src/prover/smt/solver/theory-pb.ts +951 -0
- package/src/prover/smt/solver/theory-polymorphism.ts +58 -0
- package/src/prover/smt/solver/theory-recfun.ts +307 -0
- package/src/prover/smt/solver/theory-seq-regex.ts +867 -0
- package/src/prover/smt/solver/theory-seq-solve.ts +1373 -0
- package/src/prover/smt/solver/theory-seq-state.ts +852 -0
- package/src/prover/smt/solver/theory-seq.ts +961 -0
- package/src/prover/smt/solver/theory-without-terms.ts +24 -0
- package/src/prover/smt/solver/theory.ts +189 -0
- package/src/prover/smt/solver/tseitin-cnf.ts +486 -0
- package/src/prover/smt/solver/var-subst.ts +37 -39
- package/src/prover/smt/table.ts +3 -10
- package/src/prover/smt/types.ts +146 -0
- package/src/prover/tlapm/cache.ts +74 -48
- package/src/prover/tlapm/ocaml-marshal.ts +19 -21
- package/src/prover/tlapm/tlapm.ts +21 -20
- package/src/prover/tlapm-library.ts +3208 -0
- package/src/prover/verdict.ts +9 -2
- package/src/prover/zenon/check/check.ts +1 -11
- package/src/prover/zenon/check/definitions.ts +5 -15
- package/src/prover/zenon/check/equality.ts +0 -8
- package/src/prover/zenon/check/functions.ts +0 -4
- package/src/prover/zenon/check/keys.ts +0 -7
- package/src/prover/zenon/check/propositional.ts +0 -3
- package/src/prover/zenon/check/records.ts +1 -6
- package/src/prover/zenon/check/relations.ts +2 -14
- package/src/prover/zenon/check/rewrites.ts +2 -21
- package/src/prover/zenon/check/sets.ts +40 -61
- package/src/prover/zenon/check/terms.ts +1 -19
- package/src/prover/zenon/check/tla.ts +0 -6
- package/src/prover/zenon/decide.ts +10 -19
- package/src/prover/zenon/encode.ts +0 -9
- package/src/prover/zenon/eqrel.ts +2 -15
- package/src/prover/zenon/equality-rules.ts +24 -6
- package/src/prover/zenon/expr.ts +29 -28
- package/src/prover/zenon/index-table.ts +33 -61
- package/src/prover/zenon/isar-case.ts +9 -21
- package/src/prover/zenon/isar.ts +37 -67
- package/src/prover/zenon/limits.ts +0 -4
- package/src/prover/zenon/llproof.ts +2 -22
- package/src/prover/zenon/mltoll.ts +66 -106
- package/src/prover/zenon/node.ts +20 -15
- package/src/prover/zenon/ocaml.ts +1 -17
- package/src/prover/zenon/parse.ts +9 -13
- package/src/prover/zenon/phrase.ts +2 -14
- package/src/prover/zenon/proof.ts +0 -11
- package/src/prover/zenon/propositional-rules.ts +0 -7
- package/src/prover/zenon/rules.ts +3 -8
- package/src/prover/zenon/search.ts +11 -35
- package/src/prover/zenon/tla/functions.ts +59 -33
- package/src/prover/zenon/tla/llproof.ts +67 -78
- package/src/prover/zenon/tla/records.ts +57 -35
- package/src/prover/zenon/tla/rewrites.ts +12 -21
- package/src/prover/zenon/tla/sets.ts +88 -59
- package/src/prover/zenon/tla/terms.ts +0 -8
- package/src/prover/zenon/tla/tla.ts +66 -66
- package/src/randomization.ts +81 -35
- package/src/resolve.ts +1132 -430
- package/src/runtime.ts +33 -23
- package/src/sany/builtins.ts +11 -14
- package/src/sany/generation.ts +383 -0
- package/src/sany/generator-def-entries.ts +210 -0
- package/src/sany/generator-definitions.ts +688 -0
- package/src/sany/generator-expressions.ts +1108 -0
- package/src/sany/generator-proofs.ts +665 -0
- package/src/sany/generator.ts +192 -2764
- package/src/sany/levels.ts +5 -35
- package/src/sany/lexer.ts +61 -80
- package/src/sany/linter.ts +0 -10
- package/src/sany/modules.ts +5 -7
- package/src/sany/nodes.ts +6 -44
- package/src/sany/parse-error.ts +39 -117
- package/src/sany/report.ts +32 -69
- package/src/sany/selectors.ts +60 -82
- package/src/sany/source.ts +1 -17
- package/src/sany/xml.ts +37 -120
- package/src/search.ts +913 -227
- package/src/simulate.ts +765 -0
- package/src/spec-description.ts +198 -104
- package/src/standard-definitions.ts +4 -4
- package/src/standard-modules.ts +302 -99
- package/src/state-graph.ts +52 -33
- package/src/subexpressions.ts +578 -166
- package/src/substitution-levels.ts +7 -7
- package/src/successors.ts +296 -105
- package/src/symmetry.ts +37 -28
- package/src/tableau.ts +29 -26
- package/src/tlc/fingerprint.ts +267 -79
- package/src/tlc/jar-data.ts +122 -6
- package/src/tlc/messages.ts +127 -56
- package/src/tlc/order.ts +53 -72
- package/src/tlc/random.ts +38 -49
- package/src/tlc/replay.ts +579 -230
- package/src/tlc/summary.ts +64 -60
- package/src/tlc/tlc-operators.ts +83 -47
- package/src/tlc/tlcext-operators.ts +205 -127
- package/src/tlc/trace-spec.ts +235 -0
- package/src/tlc/value-stream.ts +139 -0
- package/src/tlc/version.ts +1 -4
- package/src/trace-liveness.ts +529 -0
- package/src/transfer.ts +22 -25
- package/src/typed-tier.ts +6556 -0
- package/src/typescript/actions.ts +10 -25
- package/src/typescript/collections.ts +34 -35
- package/src/typescript/compile.ts +1 -8
- package/src/typescript/context.ts +0 -12
- package/src/typescript/emit.ts +0 -1
- package/src/typescript/expressions.ts +0 -12
- package/src/typescript/formula.ts +9 -15
- package/src/typescript/functions.ts +6 -17
- package/src/typescript/model.ts +14 -16
- package/src/typescript/names.ts +0 -2
- package/src/typescript/program.ts +0 -3
- package/src/typescript/properties.ts +6 -8
- package/src/typescript/scope.ts +0 -5
- package/src/typescript/steps.ts +20 -28
- package/src/typescript/types.ts +3 -10
- package/src/values.ts +917 -522
- package/src/worker.ts +7 -8
- package/src/prover/isabelle/isar/statement.ts +0 -57
- package/src/prover/smt/solver/z3-license.txt +0 -10
- package/src/prover/tlaps-module.ts +0 -510
- package/src/prover/zenon/LICENSE +0 -32
package/src/environment.ts
CHANGED
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
import {
|
|
2
2
|
getChildren,
|
|
3
|
+
getDefinitionExpressions,
|
|
4
|
+
getReferencedName,
|
|
3
5
|
type Assumption,
|
|
4
6
|
type Declaration,
|
|
5
7
|
type Definition,
|
|
@@ -7,10 +9,12 @@ import {
|
|
|
7
9
|
type Instance,
|
|
8
10
|
type Module,
|
|
9
11
|
type OperatorParam,
|
|
12
|
+
type Proof,
|
|
10
13
|
type SourceLocation,
|
|
11
14
|
} from "./ast";
|
|
12
|
-
import {
|
|
13
|
-
import type {
|
|
15
|
+
import type { ModuleOperator } from "./check";
|
|
16
|
+
import type { ModelConfig } from "./config";
|
|
17
|
+
import { applyConfig, type CopySource } from "./environment-config";
|
|
14
18
|
import type { FileSystem } from "./json";
|
|
15
19
|
import {
|
|
16
20
|
createSanyError,
|
|
@@ -19,21 +23,24 @@ import {
|
|
|
19
23
|
formatSanyWarnings,
|
|
20
24
|
TlaConfigError,
|
|
21
25
|
TlaEvaluationError,
|
|
22
|
-
TlaModuleError,
|
|
23
26
|
TlaSyntaxError,
|
|
24
27
|
type SanyError,
|
|
25
28
|
} from "./errors";
|
|
26
|
-
import { EXIT_STATUS, setExitCode } from "./exit-codes";
|
|
27
29
|
import {
|
|
30
|
+
bindOperatorArguments,
|
|
28
31
|
createBigNumberError,
|
|
29
32
|
createRealNumberError,
|
|
30
33
|
evaluate,
|
|
31
34
|
getDefinition,
|
|
35
|
+
getDefinitionClosure,
|
|
32
36
|
type Builtin,
|
|
37
|
+
type BuiltinArgument,
|
|
38
|
+
type Context,
|
|
33
39
|
type Environment,
|
|
34
40
|
} from "./evaluate";
|
|
35
41
|
import {
|
|
36
42
|
createInstantiation,
|
|
43
|
+
createLocalAlias,
|
|
37
44
|
createLocalArguments,
|
|
38
45
|
createLocalIdentifier,
|
|
39
46
|
getEnabledVariableName,
|
|
@@ -60,13 +67,14 @@ import {
|
|
|
60
67
|
} from "./resolve";
|
|
61
68
|
import { createRuntime } from "./runtime";
|
|
62
69
|
import { getSanyStandardModules } from "./sany/modules";
|
|
63
|
-
import { USER_STANDARD_MODULES } from "./tlc/jar-data";
|
|
64
70
|
import { getSanyParseError } from "./sany/parse-error";
|
|
65
71
|
import {
|
|
66
72
|
CORE_OPERATORS,
|
|
67
|
-
|
|
73
|
+
getJavaOverrides,
|
|
74
|
+
getStandardOperators,
|
|
68
75
|
getTraceSpecArithmetic,
|
|
69
76
|
STANDARD_DEPENDENCIES,
|
|
77
|
+
STANDARD_EXTENDS,
|
|
70
78
|
} from "./standard-modules";
|
|
71
79
|
import { getStandardRange, STANDARD_LEVELS } from "./standard-definitions";
|
|
72
80
|
import { resolveInstanceSubexpressions, resolveModuleSubexpressions } from "./subexpressions";
|
|
@@ -75,48 +83,46 @@ import { createInstanceChecker, type InstanceCheck } from "./substitution-levels
|
|
|
75
83
|
import { isEvalException } from "./tlc/messages";
|
|
76
84
|
import { createDefinitionFacts } from "./dependencies";
|
|
77
85
|
import { createTlcOrder, type TlcOrder } from "./tlc/order";
|
|
78
|
-
import {
|
|
79
|
-
isTlcInteger,
|
|
80
|
-
createModelValue,
|
|
81
|
-
createSet,
|
|
82
|
-
formatValue,
|
|
83
|
-
valuesEqual,
|
|
84
|
-
type Value,
|
|
85
|
-
markNormalized,
|
|
86
|
-
} from "./values";
|
|
86
|
+
import { isTlcInteger, type Value } from "./values";
|
|
87
87
|
import type { TlcVersion } from "./tlc/version";
|
|
88
88
|
|
|
89
89
|
interface EnvironmentOptions {
|
|
90
90
|
source: string;
|
|
91
91
|
loadModule: ((name: string) => string | undefined) | undefined;
|
|
92
|
-
// The TLC orders of the same spec, when the caller already reads them.
|
|
93
92
|
order?: TlcOrder;
|
|
94
93
|
loadClass?: (name: string) => Uint8Array | undefined;
|
|
95
94
|
print: (text: string) => void;
|
|
96
95
|
files: FileSystem;
|
|
97
96
|
seed?: bigint;
|
|
98
|
-
// Links the modules without a model, as SANY does, so a declared constant needs no value.
|
|
99
|
-
isUnconfigured?: boolean;
|
|
100
97
|
isTool?: boolean;
|
|
101
|
-
|
|
102
|
-
// methods then compute the arithmetic of Naturals.
|
|
103
|
-
isTraceRecorded?: boolean;
|
|
98
|
+
traceFile?: string;
|
|
104
99
|
isSanyReported?: boolean;
|
|
105
100
|
isWarningEnabled?: boolean;
|
|
106
101
|
version?: TlcVersion;
|
|
102
|
+
moduleOperators?: ModuleOperator[];
|
|
103
|
+
readLine?: () => string | undefined;
|
|
104
|
+
runtimeInvariants?: RuntimeInvariant[];
|
|
105
|
+
}
|
|
106
|
+
|
|
107
|
+
export interface RuntimeInvariant {
|
|
108
|
+
name: string;
|
|
109
|
+
module: string | undefined;
|
|
110
|
+
}
|
|
111
|
+
|
|
112
|
+
export interface ResolvedModuleOperator extends ModuleOperator {
|
|
113
|
+
key: string | undefined;
|
|
107
114
|
}
|
|
108
115
|
|
|
109
|
-
interface Specification {
|
|
116
|
+
export interface Specification {
|
|
110
117
|
environment: Environment;
|
|
111
118
|
assumptions: Assumption[];
|
|
112
119
|
variableLocations: SourceLocation[];
|
|
113
120
|
instanceActions: Map<string, InstanceAction>;
|
|
114
|
-
// The definitions TLC computes when it starts, in the order it computes them.
|
|
115
121
|
startupDefinitions: Definition[];
|
|
116
|
-
rootConstants: Declaration[];
|
|
117
|
-
rootSymbols: Symbols;
|
|
118
|
-
// The methods of the modules' classes, in the order TLC loads the classes.
|
|
119
122
|
javaOverrides: JavaOverride[];
|
|
123
|
+
moduleOperators: ResolvedModuleOperator[];
|
|
124
|
+
runtimeInvariants: RuntimeInvariant[];
|
|
125
|
+
rootName: string;
|
|
120
126
|
}
|
|
121
127
|
|
|
122
128
|
export interface InstanceAction {
|
|
@@ -124,28 +130,9 @@ export interface InstanceAction {
|
|
|
124
130
|
location: SourceLocation;
|
|
125
131
|
}
|
|
126
132
|
|
|
127
|
-
const
|
|
128
|
-
switch (value.kind) {
|
|
129
|
-
case "Number":
|
|
130
|
-
// TLC fails with an unexpected exception on a configuration number too big for it.
|
|
131
|
-
if (!isTlcInteger(value.value)) {
|
|
132
|
-
throw setExitCode(
|
|
133
|
-
new TlaModuleError(`Integer overflow: ${value.value} is outside TLC's 32-bit range`),
|
|
134
|
-
EXIT_STATUS.error,
|
|
135
|
-
);
|
|
136
|
-
}
|
|
137
|
-
return value.value;
|
|
138
|
-
case "String":
|
|
139
|
-
case "Boolean":
|
|
140
|
-
return value.value;
|
|
141
|
-
case "ModelValue":
|
|
142
|
-
return createModelValue(value.name);
|
|
143
|
-
case "Set":
|
|
144
|
-
return createSet(value.elements.map(toValue));
|
|
145
|
-
}
|
|
146
|
-
};
|
|
133
|
+
const ANNOTATED_OVERRIDE_MODULES = new Set(["IOUtils", "Json", "TLCExt"]);
|
|
147
134
|
|
|
148
|
-
interface LinkedModule {
|
|
135
|
+
export interface LinkedModule {
|
|
149
136
|
module: Module;
|
|
150
137
|
constants: Declaration[];
|
|
151
138
|
variables: string[];
|
|
@@ -157,8 +144,6 @@ interface LinkedModule {
|
|
|
157
144
|
facts: Set<string>;
|
|
158
145
|
}
|
|
159
146
|
|
|
160
|
-
// errors and warnings collect what SANY reports for the module, and levelChecks the level checks of
|
|
161
|
-
// the modules in its file, which SANY runs only when it reports no error.
|
|
162
147
|
interface ModuleScope {
|
|
163
148
|
id: string;
|
|
164
149
|
symbols: Symbols;
|
|
@@ -178,8 +163,6 @@ const getDeclarations = (linked: LinkedModule): Declaration[] => [
|
|
|
178
163
|
})),
|
|
179
164
|
];
|
|
180
165
|
|
|
181
|
-
// Parses the module SANY reads from the file name.tla. A module SANY's parser rejects fails as it
|
|
182
|
-
// does in TLC: SANY's message, then a fatal error that names the module.
|
|
183
166
|
const parseModuleFile = (source: string, name: string, order: TlcOrder) => {
|
|
184
167
|
try {
|
|
185
168
|
return order.parseModule(source);
|
|
@@ -212,12 +195,9 @@ const getModuleRedefinition = (module: Module, existing: Module): SanyError | un
|
|
|
212
195
|
message: `Multiply-defined module '${module.name}': this definition or declaration conflicts \nwith the one at ${formatRange(existing.location.range)}.`,
|
|
213
196
|
};
|
|
214
197
|
|
|
215
|
-
// Context.kindOfNode names a definition or a parameter a definition, and any other symbol a
|
|
216
|
-
// declaration.
|
|
217
198
|
const getNodeWord = (kind: SymbolKind) =>
|
|
218
199
|
["Builtin", "Definition", "Instance", "Parameter"].includes(kind) ? "definition" : "declaration";
|
|
219
200
|
|
|
220
|
-
// The Java class of the node SANY binds a symbol to.
|
|
221
201
|
const getNodeClass = (kind: SymbolKind) =>
|
|
222
202
|
kind === "Theorem" ? "ThmOrAssumpDefNode" : getNodeWord(kind);
|
|
223
203
|
|
|
@@ -236,42 +216,14 @@ const createLocalFunction = (definition: Definition, key: string): Definition =>
|
|
|
236
216
|
location: definition.location,
|
|
237
217
|
});
|
|
238
218
|
|
|
239
|
-
const
|
|
240
|
-
const
|
|
241
|
-
return
|
|
242
|
-
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
evaluate: (args) => {
|
|
246
|
-
const row = rows.find((candidate) => {
|
|
247
|
-
if (candidate[0].length !== args.length) {
|
|
248
|
-
throw new TlaEvaluationError(
|
|
249
|
-
`Attempted to apply the operator ${table}\nwith wrong number of arguments.`,
|
|
250
|
-
);
|
|
251
|
-
}
|
|
252
|
-
return candidate[0].every((value, index) => {
|
|
253
|
-
const argument = args[index];
|
|
254
|
-
return (
|
|
255
|
-
!(typeof argument === "object" && argument.kind === "Operator") &&
|
|
256
|
-
valuesEqual(value, argument)
|
|
257
|
-
);
|
|
258
|
-
});
|
|
259
|
-
});
|
|
260
|
-
if (row) return row[1];
|
|
261
|
-
throw new TlaEvaluationError(
|
|
262
|
-
`Attempted to apply operator:\n${table}\nto arguments (${args.map((argument) => (typeof argument === "object" && argument.kind === "Operator" ? argument.name : formatValue(argument))).join(", ")}), which is undefined.`,
|
|
263
|
-
);
|
|
264
|
-
},
|
|
265
|
-
evaluateUnary: undefined,
|
|
266
|
-
evaluateBinary: undefined,
|
|
267
|
-
};
|
|
219
|
+
const mentionsName = (expression: Expression, names: Set<string>): boolean => {
|
|
220
|
+
const name = getReferencedName(expression);
|
|
221
|
+
return (
|
|
222
|
+
(name !== undefined && names.has(name)) ||
|
|
223
|
+
getChildren(expression).some((child) => mentionsName(child, names))
|
|
224
|
+
);
|
|
268
225
|
};
|
|
269
226
|
|
|
270
|
-
const mentionsName = (expression: Expression, names: Set<string>): boolean =>
|
|
271
|
-
(expression.kind === "Identifier" && names.has(expression.name)) ||
|
|
272
|
-
(expression.kind === "Apply" && names.has(expression.operator)) ||
|
|
273
|
-
getChildren(expression).some((child) => mentionsName(child, names));
|
|
274
|
-
|
|
275
227
|
const getVariableIndex = (variables: string[], declared: string[]) => {
|
|
276
228
|
const index = new Map(variables.map((name, position) => [name, position]));
|
|
277
229
|
new Set(declared).forEach((name) =>
|
|
@@ -285,6 +237,19 @@ const getSubstitutions = (instances: Instance[]) =>
|
|
|
285
237
|
instance.substitutions.map((substitution) => substitution.expression),
|
|
286
238
|
);
|
|
287
239
|
|
|
240
|
+
const getProofInstances = (proof: Proof | undefined): Instance[] =>
|
|
241
|
+
proof?.kind === "Steps"
|
|
242
|
+
? proof.steps.flatMap((step) => [
|
|
243
|
+
...(step.body.kind === "Instance" ? [step.body] : []),
|
|
244
|
+
...(step.body.kind === "Define"
|
|
245
|
+
? step.body.definitions.flatMap((definition) =>
|
|
246
|
+
definition.kind === "Instance" ? [definition] : [],
|
|
247
|
+
)
|
|
248
|
+
: []),
|
|
249
|
+
...getProofInstances(step.proof),
|
|
250
|
+
])
|
|
251
|
+
: [];
|
|
252
|
+
|
|
288
253
|
const rejectLiterals = (expressions: Expression[]): void =>
|
|
289
254
|
expressions.forEach((expression) => {
|
|
290
255
|
if (expression.kind === "Decimal") throw createRealNumberError(expression);
|
|
@@ -306,9 +271,9 @@ export const createEnvironment = (
|
|
|
306
271
|
const root = order.parseModule(options.source);
|
|
307
272
|
const definitions = new Map<string, Definition>();
|
|
308
273
|
const parameterized = new Map<string, boolean>();
|
|
309
|
-
|
|
310
|
-
const copySources = new Map<string, { source: string; prefix: number }>();
|
|
274
|
+
const copySources = new Map<string, CopySource>();
|
|
311
275
|
const substitutedDefinitions = new Set<Definition>();
|
|
276
|
+
const instanceParams = new Set<OperatorParam>();
|
|
312
277
|
const builtins = new Map<string, Builtin>(
|
|
313
278
|
CORE_OPERATORS.map((operator) => [operator.name, operator]),
|
|
314
279
|
);
|
|
@@ -317,23 +282,22 @@ export const createEnvironment = (
|
|
|
317
282
|
runtime.isWarningEnabled = options.isWarningEnabled ?? true;
|
|
318
283
|
runtime.isTool = options.isTool ?? false;
|
|
319
284
|
runtime.version = options.version ?? "master";
|
|
285
|
+
runtime.readLine = options.readLine;
|
|
320
286
|
const linkedModules = new Map<string, LinkedModule>();
|
|
321
|
-
const nestedModules = new Map<string, LinkedModule>();
|
|
322
|
-
// Each module by name, from the time its level checks run.
|
|
323
287
|
const checkedModules = new Map<string, LinkedModule>();
|
|
324
288
|
const linkOrder: LinkedModule[] = [];
|
|
325
289
|
const dependencies = new Map<string, Set<string>>();
|
|
326
290
|
const loading: Set<string>[] = [];
|
|
327
|
-
// The top-level modules being linked, to report a cycle of EXTENDS or INSTANCE.
|
|
328
291
|
const linking: string[] = [];
|
|
292
|
+
const usedModules = new Set<string>();
|
|
329
293
|
|
|
330
294
|
const useModule = (name: string, used: Iterable<string>) =>
|
|
331
|
-
loading.forEach((closure) => {
|
|
295
|
+
[usedModules, ...loading].forEach((closure) => {
|
|
332
296
|
closure.add(name);
|
|
333
297
|
[...used].forEach((dependency) => closure.add(dependency));
|
|
334
298
|
});
|
|
335
|
-
|
|
336
|
-
const createName = (name: string) => `${name}#${copyCount
|
|
299
|
+
let copyCount = 0;
|
|
300
|
+
const createName = (name: string) => `${name}#${copyCount++}`;
|
|
337
301
|
const instanceChecks: InstanceCheck[] = [];
|
|
338
302
|
const warnings: SanyError[] = [];
|
|
339
303
|
const checkInstance = createInstanceChecker((name) => {
|
|
@@ -358,18 +322,16 @@ export const createEnvironment = (
|
|
|
358
322
|
const addStandardModule = (name: string): Symbols | undefined => {
|
|
359
323
|
const cached = standardExports.get(name);
|
|
360
324
|
if (cached) return cached;
|
|
361
|
-
const
|
|
362
|
-
if (!
|
|
363
|
-
// TLC loads the modules a standard module instantiates too, and the Java methods of each
|
|
364
|
-
// replace the operators of every module, as those of Integers replace those of Naturals.
|
|
325
|
+
const operators = getStandardOperators(name, options.print, runtime, options.files, builtins);
|
|
326
|
+
if (!operators) return undefined;
|
|
365
327
|
STANDARD_DEPENDENCIES.get(name)?.forEach(addStandardModule);
|
|
366
328
|
const exported: Symbols = new Map();
|
|
367
|
-
|
|
329
|
+
STANDARD_EXTENDS.get(name)?.forEach((extended) =>
|
|
368
330
|
addStandardModule(extended)?.forEach((symbol, symbolName) =>
|
|
369
331
|
exported.set(symbolName, symbol),
|
|
370
332
|
),
|
|
371
333
|
);
|
|
372
|
-
|
|
334
|
+
operators.forEach((operator) => {
|
|
373
335
|
builtins.set(operator.name, operator);
|
|
374
336
|
exported.set(operator.name, {
|
|
375
337
|
key: operator.name,
|
|
@@ -384,26 +346,21 @@ export const createEnvironment = (
|
|
|
384
346
|
};
|
|
385
347
|
|
|
386
348
|
const getStandardSymbols = (name: string) => {
|
|
387
|
-
|
|
388
|
-
if (
|
|
349
|
+
const dependencies = STANDARD_DEPENDENCIES.get(name) ?? [];
|
|
350
|
+
if (
|
|
351
|
+
name === "TLCExt" ||
|
|
352
|
+
[name, ...dependencies].some((module) => options.loadModule?.(module) !== undefined)
|
|
353
|
+
)
|
|
389
354
|
return undefined;
|
|
390
355
|
const symbols = addStandardModule(name);
|
|
391
|
-
const dependencies = STANDARD_DEPENDENCIES.get(name) ?? [];
|
|
392
356
|
if (symbols) useModule(name, dependencies);
|
|
393
|
-
// TLC loads the Java class of each module a standard module uses, so one that uses Integers
|
|
394
|
-
// overrides the arithmetic of Naturals.
|
|
395
357
|
if (symbols && dependencies.includes("Integers")) addStandardModule("Integers");
|
|
396
358
|
return symbols;
|
|
397
359
|
};
|
|
398
360
|
|
|
399
|
-
// Like TLC, reject a decimal or a big integer anywhere in a module, even where nothing evaluates it.
|
|
400
361
|
const rejectModuleLiterals = (module: Module): Module => {
|
|
401
362
|
rejectLiterals([
|
|
402
|
-
...module.definitions.flatMap(
|
|
403
|
-
definition.kind === "Function"
|
|
404
|
-
? [...definition.bounds.map((bound) => bound.set), definition.body]
|
|
405
|
-
: [definition.body],
|
|
406
|
-
),
|
|
363
|
+
...module.definitions.flatMap(getDefinitionExpressions),
|
|
407
364
|
...module.assumptions.map((assumption) => assumption.expression),
|
|
408
365
|
...module.theorems.flatMap((theorem) =>
|
|
409
366
|
theorem.statement.kind === "AssumeProve" ? [] : [theorem.statement],
|
|
@@ -418,7 +375,7 @@ export const createEnvironment = (
|
|
|
418
375
|
const loadModule = (name: string, importer: string) => {
|
|
419
376
|
const source =
|
|
420
377
|
options.loadModule?.(name) ??
|
|
421
|
-
|
|
378
|
+
getSanyStandardModules(runtime.version).get(name) ??
|
|
422
379
|
extractModule(options.source, name);
|
|
423
380
|
if (source === undefined) throw createMissingModuleError(name, importer);
|
|
424
381
|
const module = parseModuleFile(source, name, order);
|
|
@@ -478,14 +435,42 @@ export const createEnvironment = (
|
|
|
478
435
|
return cached;
|
|
479
436
|
}
|
|
480
437
|
const top = linkTopLevel(loadModule(name, importer));
|
|
481
|
-
|
|
482
|
-
|
|
483
|
-
|
|
484
|
-
|
|
485
|
-
: undefined
|
|
486
|
-
|
|
438
|
+
const replaced = new Map<string, Definition>();
|
|
439
|
+
const evaluateReplaced = (
|
|
440
|
+
operator: string,
|
|
441
|
+
args: BuiltinArgument[],
|
|
442
|
+
context: Context | undefined,
|
|
443
|
+
) => {
|
|
444
|
+
const definition = replaced.get(operator);
|
|
445
|
+
const expressions = args.flatMap((arg) =>
|
|
446
|
+
typeof arg === "object" && arg.kind === "Operator" && arg.expression
|
|
447
|
+
? [arg.expression]
|
|
448
|
+
: [],
|
|
449
|
+
);
|
|
450
|
+
if (definition?.kind !== "Operator" || !context || expressions.length !== args.length) {
|
|
451
|
+
throw new TlaEvaluationError(`No definition of ${operator} to fall back to`);
|
|
452
|
+
}
|
|
453
|
+
return evaluate(definition.body, {
|
|
454
|
+
environment: context.environment,
|
|
455
|
+
scope: bindOperatorArguments(getDefinitionClosure(definition), expressions, context),
|
|
456
|
+
state: context.state,
|
|
457
|
+
next: context.next,
|
|
458
|
+
isKeepLazy: context.isKeepLazy,
|
|
459
|
+
});
|
|
460
|
+
};
|
|
461
|
+
getJavaOverrides(
|
|
462
|
+
name,
|
|
463
|
+
options.print,
|
|
464
|
+
runtime,
|
|
465
|
+
options.files,
|
|
466
|
+
builtins,
|
|
467
|
+
evaluateReplaced,
|
|
468
|
+
)?.forEach((operator) => {
|
|
487
469
|
const symbol = top.linked.visible.get(operator.name);
|
|
488
|
-
if (symbol?.kind !== "Definition"
|
|
470
|
+
if (symbol?.kind !== "Definition") return;
|
|
471
|
+
if (symbol.arity !== operator.arity && ANNOTATED_OVERRIDE_MODULES.has(name)) return;
|
|
472
|
+
const definition = definitions.get(symbol.key);
|
|
473
|
+
if (definition) replaced.set(operator.name, definition);
|
|
489
474
|
builtins.set(symbol.key, operator);
|
|
490
475
|
definitions.delete(symbol.key);
|
|
491
476
|
});
|
|
@@ -509,7 +494,7 @@ export const createEnvironment = (
|
|
|
509
494
|
unit.facts.add(instance.name === undefined ? name : `${instance.name}!${name}`),
|
|
510
495
|
);
|
|
511
496
|
const declarations = getDeclarations(linked);
|
|
512
|
-
const suffix = `#${copyCount
|
|
497
|
+
const suffix = `#${copyCount++}`;
|
|
513
498
|
const renamed = new Map(instance.params.map((param) => [param.name, `${param.name}${suffix}`]));
|
|
514
499
|
const substitutions = resolveSubstitutions(
|
|
515
500
|
resolveInstanceSubexpressions(instance, module),
|
|
@@ -524,10 +509,18 @@ export const createEnvironment = (
|
|
|
524
509
|
substitutions,
|
|
525
510
|
location: instance.location,
|
|
526
511
|
});
|
|
512
|
+
const params = instance.params.map((param) => ({ ...param, name: `${param.name}${suffix}` }));
|
|
513
|
+
params.forEach((param) => instanceParams.add(param));
|
|
514
|
+
const substitutionRange = instance.definitionRange
|
|
515
|
+
? {
|
|
516
|
+
...instance.definitionRange,
|
|
517
|
+
start: { line: instance.location.line, column: instance.location.column },
|
|
518
|
+
}
|
|
519
|
+
: instance.instanceRange;
|
|
527
520
|
const instantiation = createInstantiation({
|
|
528
|
-
params
|
|
521
|
+
params,
|
|
529
522
|
substitutions: new Map(
|
|
530
|
-
[...substitutions].map((
|
|
523
|
+
[...substitutions].map((entry) => [entry[0], renameLocals(entry[1], renamed)]),
|
|
531
524
|
),
|
|
532
525
|
variables: new Set(linked.variables),
|
|
533
526
|
getDefinition: (key) => definitions.get(key),
|
|
@@ -547,6 +540,13 @@ export const createEnvironment = (
|
|
|
547
540
|
return key;
|
|
548
541
|
},
|
|
549
542
|
createName,
|
|
543
|
+
...(declarations.length > 0 && {
|
|
544
|
+
frame: {
|
|
545
|
+
kind: "Identifier",
|
|
546
|
+
name: instance.name ?? instance.module,
|
|
547
|
+
location: { ...substitutionRange.start, range: substitutionRange },
|
|
548
|
+
},
|
|
549
|
+
}),
|
|
550
550
|
});
|
|
551
551
|
return getInstanceSymbols(instance, linked.exported, declarations, (key, name) => {
|
|
552
552
|
const copy =
|
|
@@ -563,15 +563,17 @@ export const createEnvironment = (
|
|
|
563
563
|
instance.name === undefined
|
|
564
564
|
? standardSymbols
|
|
565
565
|
: new Map(
|
|
566
|
-
[...standardSymbols].map((
|
|
567
|
-
`${instance.name}!${
|
|
568
|
-
{
|
|
566
|
+
[...standardSymbols].map((entry) => [
|
|
567
|
+
`${instance.name}!${entry[0]}`,
|
|
568
|
+
{
|
|
569
|
+
key: entry[1].key,
|
|
570
|
+
arity: entry[1].arity,
|
|
571
|
+
params: entry[1].params,
|
|
572
|
+
kind: entry[1].kind,
|
|
573
|
+
},
|
|
569
574
|
]),
|
|
570
575
|
);
|
|
571
576
|
|
|
572
|
-
// The names an INSTANCE adds for the definitions of the module it instantiates, each with the key
|
|
573
|
-
// that getKey gives it. SANY binds a copy of a definition that depends on the parameters at the
|
|
574
|
-
// INSTANCE.
|
|
575
577
|
const getInstanceSymbols = (
|
|
576
578
|
instance: Instance,
|
|
577
579
|
exported: Symbols,
|
|
@@ -581,64 +583,45 @@ export const createEnvironment = (
|
|
|
581
583
|
const declared = new Set(declarations.map((declaration) => declaration.name));
|
|
582
584
|
return new Map(
|
|
583
585
|
[...exported]
|
|
584
|
-
.filter((
|
|
585
|
-
.map((
|
|
586
|
+
.filter((entry) => !declared.has(entry[0]))
|
|
587
|
+
.map((entry): [string, ModuleSymbol] => {
|
|
586
588
|
if (instance.name === undefined) {
|
|
587
589
|
return [
|
|
588
|
-
|
|
590
|
+
entry[0],
|
|
589
591
|
{
|
|
590
|
-
key: getKey(
|
|
591
|
-
arity:
|
|
592
|
-
params:
|
|
593
|
-
kind:
|
|
592
|
+
key: getKey(entry[1].key, entry[0]),
|
|
593
|
+
arity: entry[1].arity,
|
|
594
|
+
params: entry[1].params,
|
|
595
|
+
kind: entry[1].kind,
|
|
594
596
|
range:
|
|
595
|
-
parameterized.get(
|
|
597
|
+
parameterized.get(entry[1].key) === true
|
|
598
|
+
? instance.location.range
|
|
599
|
+
: entry[1].range,
|
|
596
600
|
},
|
|
597
601
|
];
|
|
598
602
|
}
|
|
599
|
-
const qualified = `${instance.name}!${
|
|
603
|
+
const qualified = `${instance.name}!${entry[0]}`;
|
|
600
604
|
return [
|
|
601
605
|
qualified,
|
|
602
606
|
{
|
|
603
|
-
key: getKey(
|
|
604
|
-
arity:
|
|
605
|
-
params:
|
|
607
|
+
key: getKey(entry[1].key, qualified),
|
|
608
|
+
arity: entry[1].arity + instance.params.length,
|
|
609
|
+
params: entry[1].params && [
|
|
606
610
|
...instance.params.map((param) => param.arity),
|
|
607
|
-
...
|
|
611
|
+
...entry[1].params,
|
|
608
612
|
],
|
|
609
|
-
kind:
|
|
613
|
+
kind: entry[1].kind,
|
|
610
614
|
},
|
|
611
615
|
];
|
|
612
616
|
}),
|
|
613
617
|
);
|
|
614
618
|
};
|
|
615
619
|
|
|
616
|
-
const
|
|
617
|
-
|
|
618
|
-
|
|
619
|
-
|
|
620
|
-
|
|
621
|
-
location: SourceLocation,
|
|
622
|
-
): Definition => ({
|
|
623
|
-
kind: "Operator",
|
|
624
|
-
name,
|
|
625
|
-
params,
|
|
626
|
-
body:
|
|
627
|
-
forwarded.length === 0
|
|
628
|
-
? { kind: "Identifier", name: key, location }
|
|
629
|
-
: {
|
|
630
|
-
kind: "Apply",
|
|
631
|
-
operator: key,
|
|
632
|
-
args: createLocalArguments(forwarded, location),
|
|
633
|
-
location,
|
|
634
|
-
},
|
|
635
|
-
isLocal: true,
|
|
636
|
-
isRecursive: false,
|
|
637
|
-
location,
|
|
638
|
-
});
|
|
639
|
-
|
|
640
|
-
const createArgumentParams = (arity: number) =>
|
|
641
|
-
Array.from({ length: arity }, (_, index) => ({ name: `argument${index}`, arity: 0 }));
|
|
620
|
+
const createArgumentParams = (arity: number, params: number[] | undefined) =>
|
|
621
|
+
Array.from({ length: arity }, (_value, index) => ({
|
|
622
|
+
name: `argument${index}`,
|
|
623
|
+
arity: params?.[index] ?? 0,
|
|
624
|
+
}));
|
|
642
625
|
|
|
643
626
|
const getSubstitutionBody = (
|
|
644
627
|
replacement: Expression,
|
|
@@ -652,7 +635,7 @@ export const createEnvironment = (
|
|
|
652
635
|
body: replacement.body,
|
|
653
636
|
};
|
|
654
637
|
}
|
|
655
|
-
const params = createArgumentParams(declaration.arity);
|
|
638
|
+
const params = createArgumentParams(declaration.arity, undefined);
|
|
656
639
|
const operator =
|
|
657
640
|
replacement.kind === "Identifier"
|
|
658
641
|
? replacement.name
|
|
@@ -675,11 +658,11 @@ export const createEnvironment = (
|
|
|
675
658
|
const standardSymbols = nested ? undefined : getStandardSymbols(instance.module);
|
|
676
659
|
if (standardSymbols) {
|
|
677
660
|
if (instance.name === undefined) return [];
|
|
678
|
-
return [...standardSymbols].map((
|
|
679
|
-
const forwarded = createArgumentParams(
|
|
661
|
+
return [...standardSymbols].map((entry) => {
|
|
662
|
+
const forwarded = createArgumentParams(entry[1].arity, entry[1].params);
|
|
680
663
|
return createLocalAlias(
|
|
681
|
-
`${instance.name}!${
|
|
682
|
-
|
|
664
|
+
`${instance.name}!${entry[0]}`,
|
|
665
|
+
entry[1].key,
|
|
683
666
|
[...instance.params, ...forwarded],
|
|
684
667
|
forwarded,
|
|
685
668
|
location,
|
|
@@ -687,7 +670,7 @@ export const createEnvironment = (
|
|
|
687
670
|
});
|
|
688
671
|
}
|
|
689
672
|
const linked = nested ?? getLinkedModule(instance.module, instancer);
|
|
690
|
-
const suffix = `#${copyCount
|
|
673
|
+
const suffix = `#${copyCount++}`;
|
|
691
674
|
const explicitSubstitutions = new Map(
|
|
692
675
|
instance.substitutions.map((item) => [item.name, item.expression]),
|
|
693
676
|
);
|
|
@@ -744,7 +727,6 @@ export const createEnvironment = (
|
|
|
744
727
|
),
|
|
745
728
|
variables: new Set(linked.variables),
|
|
746
729
|
getDefinition: (key) => definitions.get(key),
|
|
747
|
-
// Each substitution is a local definition, which the copies read by name.
|
|
748
730
|
getOuterDefinition: () => undefined,
|
|
749
731
|
isParameterized: (key) => parameterized.get(key) === true,
|
|
750
732
|
addDefinition: (_source, name, create) => {
|
|
@@ -761,16 +743,16 @@ export const createEnvironment = (
|
|
|
761
743
|
});
|
|
762
744
|
const declared = new Set(declarations.map((declaration) => declaration.name));
|
|
763
745
|
const aliases = [...linked.exported]
|
|
764
|
-
.filter((
|
|
765
|
-
.map((
|
|
766
|
-
const key = instantiation.getKey(
|
|
767
|
-
const ownParams = createArgumentParams(
|
|
746
|
+
.filter((entry) => !declared.has(entry[0]))
|
|
747
|
+
.map((entry) => {
|
|
748
|
+
const key = instantiation.getKey(entry[1].key);
|
|
749
|
+
const ownParams = createArgumentParams(entry[1].arity, entry[1].params);
|
|
768
750
|
const params = [...instance.params, ...ownParams];
|
|
769
751
|
return createLocalAlias(
|
|
770
|
-
instance.name === undefined ?
|
|
752
|
+
instance.name === undefined ? entry[0] : `${instance.name}!${entry[0]}`,
|
|
771
753
|
key,
|
|
772
754
|
params,
|
|
773
|
-
key ===
|
|
755
|
+
key === entry[1].key ? ownParams : params,
|
|
774
756
|
location,
|
|
775
757
|
);
|
|
776
758
|
});
|
|
@@ -778,9 +760,9 @@ export const createEnvironment = (
|
|
|
778
760
|
};
|
|
779
761
|
|
|
780
762
|
const getAvailableDefinitions = (visible: Symbols) =>
|
|
781
|
-
[...visible].flatMap((
|
|
782
|
-
const definition = definitions.get(
|
|
783
|
-
return definition ? [{ ...definition, name }] : [];
|
|
763
|
+
[...visible].flatMap((entry) => {
|
|
764
|
+
const definition = definitions.get(entry[1].key);
|
|
765
|
+
return definition ? [{ ...definition, name: entry[0] }] : [];
|
|
784
766
|
});
|
|
785
767
|
|
|
786
768
|
const javaOverrides = new Map<string, JavaOverride[]>();
|
|
@@ -800,12 +782,9 @@ export const createEnvironment = (
|
|
|
800
782
|
]),
|
|
801
783
|
...scope.symbols,
|
|
802
784
|
]);
|
|
803
|
-
// Where an INSTANCE first made each name it adds visible.
|
|
804
785
|
const importedAt = new Map<string, SourceLocation>();
|
|
805
786
|
const extendsReport: ModuleReport = { location: MODULE_START, errors: [], warnings: [] };
|
|
806
787
|
const reports = [extendsReport];
|
|
807
|
-
// Context.mergeExtendContext keeps the first of the symbols the extended modules share by name,
|
|
808
|
-
// and warns of two definitions or two declarations but rejects a definition and a declaration.
|
|
809
788
|
const mergeExtended = (symbols: Symbols) =>
|
|
810
789
|
symbols.forEach((symbol, name) => {
|
|
811
790
|
const current = exported.get(name);
|
|
@@ -840,8 +819,12 @@ export const createEnvironment = (
|
|
|
840
819
|
const modules = new Map<string, LinkedModule>();
|
|
841
820
|
const extended: LinkedModule[] = [];
|
|
842
821
|
const constants = [...parsed.constants];
|
|
843
|
-
const
|
|
844
|
-
|
|
822
|
+
const declaredVariables = parsed.variables.filter(
|
|
823
|
+
(variable, index) =>
|
|
824
|
+
parsed.variables.findIndex((other) => other.name === variable.name) === index,
|
|
825
|
+
);
|
|
826
|
+
const variables = declaredVariables.map((variable) => variable.name);
|
|
827
|
+
const variableLocations = declaredVariables.map((variable) => variable.location);
|
|
845
828
|
parsed.extends.forEach((name) => {
|
|
846
829
|
const nested = scope.modules.get(name);
|
|
847
830
|
const standardSymbols = nested ? undefined : getStandardSymbols(name);
|
|
@@ -851,12 +834,16 @@ export const createEnvironment = (
|
|
|
851
834
|
}
|
|
852
835
|
const linked = nested ?? getLinkedModule(name, parsed.name);
|
|
853
836
|
constants.push(
|
|
854
|
-
...linked.constants.filter(
|
|
855
|
-
|
|
837
|
+
...linked.constants.filter(
|
|
838
|
+
(constant) =>
|
|
839
|
+
constants.every((existing) => existing.name !== constant.name) &&
|
|
840
|
+
!variables.includes(constant.name),
|
|
856
841
|
),
|
|
857
842
|
);
|
|
858
843
|
linked.variables.forEach((variable, index) => {
|
|
859
|
-
|
|
844
|
+
const isDeclared =
|
|
845
|
+
variables.includes(variable) || constants.some((constant) => constant.name === variable);
|
|
846
|
+
if (isDeclared) return;
|
|
860
847
|
variables.push(variable);
|
|
861
848
|
variableLocations.push(linked.variableLocations[index]);
|
|
862
849
|
});
|
|
@@ -891,14 +878,12 @@ export const createEnvironment = (
|
|
|
891
878
|
parsed === root ? definition.name : `${definition.name}${KEY_SEPARATOR}${scope.id}`;
|
|
892
879
|
const instanced = new Map<Instance, Symbols>();
|
|
893
880
|
const getVisibleModules = () => new Map([...scope.modules, ...modules]);
|
|
894
|
-
const isInstancedAfterDefinition = (nested: Module) => {
|
|
895
|
-
const first = parsed.instances.find((instance) => instance.module === nested.name);
|
|
896
|
-
return first !== undefined && isBefore(nested.location, first.location);
|
|
897
|
-
};
|
|
898
881
|
const getLetModule = (instance: Instance) => {
|
|
899
882
|
const ownModule = parsed.modules.find((nested) => nested.name === instance.module);
|
|
900
883
|
if (!ownModule) return getVisibleModules().get(instance.module);
|
|
901
|
-
return
|
|
884
|
+
return isBefore(ownModule.location, instance.location)
|
|
885
|
+
? modules.get(ownModule.name)
|
|
886
|
+
: undefined;
|
|
902
887
|
};
|
|
903
888
|
const getUnit = (module: Module): ModuleUnit => ({
|
|
904
889
|
imported: visible,
|
|
@@ -926,12 +911,18 @@ export const createEnvironment = (
|
|
|
926
911
|
module.definitions.toReversed().map((definition) => [definition.name, definition]),
|
|
927
912
|
),
|
|
928
913
|
getKey,
|
|
914
|
+
isModuleKnown: (name, location) =>
|
|
915
|
+
name === parsed.name ||
|
|
916
|
+
usedModules.has(name) ||
|
|
917
|
+
scope.modules.has(name) ||
|
|
918
|
+
parsed.modules.some(
|
|
919
|
+
(nested) => nested.name === name && isBefore(nested.location, location),
|
|
920
|
+
),
|
|
929
921
|
instanced,
|
|
930
922
|
facts,
|
|
931
923
|
reports,
|
|
932
924
|
warnings: scope.warnings,
|
|
933
925
|
});
|
|
934
|
-
// SANY keeps the first of two symbols of a name.
|
|
935
926
|
const getSymbolsBefore = (location: SourceLocation): Symbols =>
|
|
936
927
|
[
|
|
937
928
|
...declarations
|
|
@@ -947,11 +938,9 @@ export const createEnvironment = (
|
|
|
947
938
|
getDefinitionSymbol(definition),
|
|
948
939
|
]),
|
|
949
940
|
].reduce(
|
|
950
|
-
(symbols,
|
|
941
|
+
(symbols, entry) => (symbols.has(entry[0]) ? symbols : symbols.set(entry[0], entry[1])),
|
|
951
942
|
new Map(visible),
|
|
952
943
|
);
|
|
953
|
-
// Generator.generateModule reports the errors of a nested module and goes on, and then
|
|
954
|
-
// SymbolTable.addModule reports a module already defined.
|
|
955
944
|
const linkNested = (nested: Module) => {
|
|
956
945
|
const visibleModules = getVisibleModules();
|
|
957
946
|
const existing = visibleModules.get(nested.name);
|
|
@@ -971,7 +960,6 @@ export const createEnvironment = (
|
|
|
971
960
|
});
|
|
972
961
|
if (redefinition) report.errors.push(redefinition);
|
|
973
962
|
if (!existing) modules.set(nested.name, linked);
|
|
974
|
-
if (!nestedModules.has(nested.name)) nestedModules.set(nested.name, linked);
|
|
975
963
|
};
|
|
976
964
|
[
|
|
977
965
|
...parsed.instances.map((instance) => ({
|
|
@@ -1006,6 +994,13 @@ export const createEnvironment = (
|
|
|
1006
994
|
),
|
|
1007
995
|
getAvailableDefinitions(visible),
|
|
1008
996
|
);
|
|
997
|
+
parsed.theorems
|
|
998
|
+
.flatMap((theorem) => getProofInstances(theorem.proof))
|
|
999
|
+
.filter((instance) => !getVisibleModules().has(instance.module))
|
|
1000
|
+
.forEach(
|
|
1001
|
+
(instance) =>
|
|
1002
|
+
getStandardSymbols(instance.module) ?? getLinkedModule(instance.module, parsed.name),
|
|
1003
|
+
);
|
|
1009
1004
|
scope.errors.push(...resolveModule(module, getUnit(module)));
|
|
1010
1005
|
module.definitions.forEach((definition) => {
|
|
1011
1006
|
const key = getKey(definition);
|
|
@@ -1013,7 +1008,6 @@ export const createEnvironment = (
|
|
|
1013
1008
|
parameterized.set(key, !isParameterFree);
|
|
1014
1009
|
const symbol = getDefinitionSymbol(definition);
|
|
1015
1010
|
const importedLocation = importedAt.get(definition.name);
|
|
1016
|
-
// SANY binds the name of a fact to a fact the module imports before it.
|
|
1017
1011
|
if (
|
|
1018
1012
|
symbol.kind === "Theorem" &&
|
|
1019
1013
|
visible.get(definition.name)?.kind === "Theorem" &&
|
|
@@ -1039,8 +1033,6 @@ export const createEnvironment = (
|
|
|
1039
1033
|
]),
|
|
1040
1034
|
};
|
|
1041
1035
|
if (!checkedModules.has(parsed.name)) checkedModules.set(parsed.name, linked);
|
|
1042
|
-
// SANY checks the instances of a module with its definitions and theorems, so it reports their
|
|
1043
|
-
// errors together.
|
|
1044
1036
|
const checks = instanceChecks
|
|
1045
1037
|
.splice(firstCheck)
|
|
1046
1038
|
.map((check) => ({ location: check.location, check: () => checkInstance(check) }));
|
|
@@ -1062,12 +1054,45 @@ export const createEnvironment = (
|
|
|
1062
1054
|
};
|
|
1063
1055
|
|
|
1064
1056
|
const linkedRoot = linkTopLevel(root).linked;
|
|
1057
|
+
const traceFile = options.traceFile;
|
|
1058
|
+
const traceOperators: ModuleOperator[] =
|
|
1059
|
+
traceFile === undefined
|
|
1060
|
+
? []
|
|
1061
|
+
: [
|
|
1062
|
+
{
|
|
1063
|
+
kind: "postcondition",
|
|
1064
|
+
module: "_TLCTrace",
|
|
1065
|
+
operator: "_TLCTraceSilent",
|
|
1066
|
+
constants: { _TLCTraceFile: traceFile },
|
|
1067
|
+
},
|
|
1068
|
+
];
|
|
1069
|
+
const moduleOperators = [...(options.moduleOperators ?? []), ...traceOperators].map(
|
|
1070
|
+
(operator): ResolvedModuleOperator => {
|
|
1071
|
+
const symbol = getLinkedModule(operator.module, root.name).visible.get(operator.operator);
|
|
1072
|
+
return { ...operator, key: symbol?.kind === "Definition" ? symbol.key : undefined };
|
|
1073
|
+
},
|
|
1074
|
+
);
|
|
1075
|
+
linkOrder.push(...linkOrder.splice(linkOrder.indexOf(linkedRoot), 1));
|
|
1065
1076
|
if (warnings.length > 0 && !options.isSanyReported) options.print(formatSanyWarnings(warnings));
|
|
1066
|
-
const
|
|
1077
|
+
const runtimeInvariants = options.runtimeInvariants ?? [];
|
|
1078
|
+
runtimeInvariants.forEach((invariant) => {
|
|
1079
|
+
if (invariant.module === undefined) return;
|
|
1080
|
+
linkedModules.set(root.name, linkedRoot);
|
|
1081
|
+
const linked = getLinkedModule(invariant.module, root.name);
|
|
1082
|
+
linkOrder.splice(linkOrder.indexOf(linked), 1);
|
|
1083
|
+
const definition = definitions.get(linked.visible.get(invariant.name)?.key ?? invariant.name);
|
|
1084
|
+
if (definition) definitions.set(invariant.name, definition);
|
|
1085
|
+
});
|
|
1067
1086
|
linkedRoot.visible.forEach((symbol, name) => {
|
|
1068
1087
|
const definition = definitions.get(symbol.key);
|
|
1069
1088
|
if (definition && symbol.key !== name) definitions.set(name, definition);
|
|
1070
1089
|
});
|
|
1090
|
+
moduleOperators.forEach((operator) => {
|
|
1091
|
+
const definition = operator.key === undefined ? undefined : definitions.get(operator.key);
|
|
1092
|
+
if (operator.kind !== "postcondition" && definition) {
|
|
1093
|
+
definitions.set(operator.operator, definition);
|
|
1094
|
+
}
|
|
1095
|
+
});
|
|
1071
1096
|
|
|
1072
1097
|
const assumptions: Assumption[] = [];
|
|
1073
1098
|
const addAssumptions = (linked: LinkedModule, visited: Set<LinkedModule>) => {
|
|
@@ -1080,164 +1105,32 @@ export const createEnvironment = (
|
|
|
1080
1105
|
const declaredConstants = linkedRoot.constants.map((constant) => constant.name);
|
|
1081
1106
|
const variables = linkedRoot.variables;
|
|
1082
1107
|
|
|
1083
|
-
const
|
|
1084
|
-
|
|
1085
|
-
|
|
1086
|
-
|
|
1087
|
-
|
|
1088
|
-
|
|
1089
|
-
|
|
1090
|
-
|
|
1091
|
-
|
|
1092
|
-
|
|
1093
|
-
|
|
1094
|
-
|
|
1095
|
-
|
|
1096
|
-
|
|
1097
|
-
|
|
1098
|
-
|
|
1099
|
-
|
|
1100
|
-
|
|
1101
|
-
operatorKeys.add(key);
|
|
1102
|
-
};
|
|
1103
|
-
config.constants
|
|
1104
|
-
.filter((assignment) => assignment.args === undefined)
|
|
1105
|
-
.forEach((assignment) => {
|
|
1106
|
-
const value = toValue(assignment.value);
|
|
1107
|
-
markNormalized(value);
|
|
1108
|
-
getScopedKeys(assignment).forEach((key) => {
|
|
1109
|
-
const arity = getKeyArity(key);
|
|
1110
|
-
if (arity === 0) constants.set(key, value);
|
|
1111
|
-
else
|
|
1112
|
-
setOperator(key, {
|
|
1113
|
-
kind: "Builtin",
|
|
1114
|
-
name: key,
|
|
1115
|
-
arity,
|
|
1116
|
-
evaluate: () => value,
|
|
1117
|
-
evaluateUnary: undefined,
|
|
1118
|
-
evaluateBinary: undefined,
|
|
1119
|
-
isLazy: true,
|
|
1120
|
-
});
|
|
1121
|
-
});
|
|
1122
|
-
});
|
|
1123
|
-
const tables = new Map<string, { name: string; module?: string; rows: [Value[], Value][] }>();
|
|
1124
|
-
config.constants.forEach((assignment) => {
|
|
1125
|
-
if (assignment.args === undefined) return;
|
|
1126
|
-
const tableKey = `${assignment.module ?? ""}!${assignment.name}`;
|
|
1127
|
-
const table = tables.get(tableKey) ?? {
|
|
1128
|
-
name: assignment.name,
|
|
1129
|
-
module: assignment.module,
|
|
1130
|
-
rows: [],
|
|
1131
|
-
};
|
|
1132
|
-
if (table.rows.length > 0 && table.rows[0][0].length !== assignment.args.length) {
|
|
1133
|
-
throw new TlaConfigError(
|
|
1134
|
-
`The arity of the operator ${assignment.name} is inconsistent in the configuration file.`,
|
|
1135
|
-
);
|
|
1136
|
-
}
|
|
1137
|
-
table.rows.push([assignment.args.map(toValue), toValue(assignment.value)]);
|
|
1138
|
-
tables.set(tableKey, table);
|
|
1139
|
-
});
|
|
1140
|
-
tables.forEach((table) =>
|
|
1141
|
-
getScopedKeys(table).forEach((key) =>
|
|
1142
|
-
setOperator(
|
|
1143
|
-
key,
|
|
1144
|
-
createOperatorTable(table.name, getKeyArity(key) || table.rows[0][0].length, table.rows),
|
|
1108
|
+
const applied = applyConfig(config, {
|
|
1109
|
+
root: linkedRoot,
|
|
1110
|
+
moduleSymbols: new Map([
|
|
1111
|
+
...standardExports,
|
|
1112
|
+
...[...linkedModules].map((entry): [string, Symbols] => [entry[0], entry[1].visible]),
|
|
1113
|
+
[root.name, linkedRoot.visible],
|
|
1114
|
+
]),
|
|
1115
|
+
definitions,
|
|
1116
|
+
builtins,
|
|
1117
|
+
copySources,
|
|
1118
|
+
operatorConstants: new Map(
|
|
1119
|
+
moduleOperators.flatMap((operator) =>
|
|
1120
|
+
getLinkedModule(operator.module, root.name).constants.flatMap(
|
|
1121
|
+
(constant): [string, Value][] => {
|
|
1122
|
+
const value = operator.constants?.[constant.name];
|
|
1123
|
+
return value === undefined ? [] : [[constant.name, value]];
|
|
1124
|
+
},
|
|
1125
|
+
),
|
|
1145
1126
|
),
|
|
1146
1127
|
),
|
|
1147
|
-
|
|
1148
|
-
const substitutions = new Map(
|
|
1149
|
-
config.substitutions.flatMap((substitution) =>
|
|
1150
|
-
getScopedKeys(substitution).map((key): [string, string] => [
|
|
1151
|
-
key,
|
|
1152
|
-
getRootKey(substitution.target),
|
|
1153
|
-
]),
|
|
1154
|
-
),
|
|
1155
|
-
);
|
|
1156
|
-
config.substitutions
|
|
1157
|
-
.filter((substitution) => substitution.module === undefined)
|
|
1158
|
-
.forEach((substitution) => {
|
|
1159
|
-
const name = substitution.name;
|
|
1160
|
-
const target = substitution.target;
|
|
1161
|
-
if (!declaredConstants.includes(name) && !linkedRoot.visible.has(name)) {
|
|
1162
|
-
throw new TlaConfigError(
|
|
1163
|
-
`In the configuration file, the identifier ${name} does not appear in the specification.`,
|
|
1164
|
-
);
|
|
1165
|
-
}
|
|
1166
|
-
if (config.substitutions.some((other) => other.name === target)) {
|
|
1167
|
-
throw new TlaConfigError(
|
|
1168
|
-
`In the configuration file, the identifier ${target} appears\non the right-hand side of a <- after already appearing on the\nleft-hand side of one.`,
|
|
1169
|
-
);
|
|
1170
|
-
}
|
|
1171
|
-
const targetKey = getRootKey(target);
|
|
1172
|
-
const definition = definitions.get(targetKey);
|
|
1173
|
-
const isDefined =
|
|
1174
|
-
definition !== undefined ||
|
|
1175
|
-
builtins.has(targetKey) ||
|
|
1176
|
-
constants.has(targetKey) ||
|
|
1177
|
-
declaredConstants.includes(target) ||
|
|
1178
|
-
variables.includes(target);
|
|
1179
|
-
if (!isDefined) {
|
|
1180
|
-
throw new TlaConfigError(
|
|
1181
|
-
`The configuration file substitutes for ${name} with the undefined identifier ${target}.`,
|
|
1182
|
-
);
|
|
1183
|
-
}
|
|
1184
|
-
if (
|
|
1185
|
-
definition?.kind === "Operator" &&
|
|
1186
|
-
definition.params.length !==
|
|
1187
|
-
(linkedRoot.constants.find((constant) => constant.name === name)?.arity ??
|
|
1188
|
-
linkedRoot.visible.get(name)?.arity)
|
|
1189
|
-
) {
|
|
1190
|
-
throw new TlaConfigError(
|
|
1191
|
-
`The configuration file substitutes for ${name} with ${target} of different number of arguments.`,
|
|
1192
|
-
);
|
|
1193
|
-
}
|
|
1194
|
-
});
|
|
1195
|
-
// TLC sets a module-scoped entry on the body of the module's definition, which every instance of
|
|
1196
|
-
// the module shares.
|
|
1197
|
-
const scopedKeys = new Set(
|
|
1198
|
-
[...config.constants, ...config.substitutions]
|
|
1199
|
-
.filter((item) => item.module !== undefined)
|
|
1200
|
-
.flatMap(getScopedKeys),
|
|
1201
|
-
);
|
|
1202
|
-
const getOverride = (
|
|
1203
|
-
key: string,
|
|
1204
|
-
prefix: number,
|
|
1205
|
-
): { key: string; prefix: number } | undefined => {
|
|
1206
|
-
if (scopedKeys.has(key)) return { key, prefix };
|
|
1207
|
-
const copy = copySources.get(key);
|
|
1208
|
-
return copy && getOverride(copy.source, prefix + copy.prefix);
|
|
1209
|
-
};
|
|
1210
|
-
copySources.forEach((copy, key) => {
|
|
1211
|
-
const override = getOverride(copy.source, copy.prefix);
|
|
1212
|
-
const definition = definitions.get(key);
|
|
1213
|
-
if (!override || !definition) return;
|
|
1214
|
-
const params = definition.kind === "Operator" ? definition.params : [];
|
|
1215
|
-
const alias = createLocalAlias(
|
|
1216
|
-
key,
|
|
1217
|
-
override.key,
|
|
1218
|
-
params,
|
|
1219
|
-
params.slice(override.prefix),
|
|
1220
|
-
definition.location,
|
|
1221
|
-
);
|
|
1222
|
-
definitions.set(key, alias);
|
|
1223
|
-
linkedRoot.visible.forEach((symbol, name) => {
|
|
1224
|
-
if (symbol.key === key && name !== key) definitions.set(name, alias);
|
|
1225
|
-
});
|
|
1128
|
+
order,
|
|
1226
1129
|
});
|
|
1227
|
-
const
|
|
1228
|
-
|
|
1229
|
-
);
|
|
1230
|
-
if (unassigned.length > 0 && !options.isUnconfigured) {
|
|
1231
|
-
// TLC reports the first constant it finds unassigned in SANY's order of declarations.
|
|
1232
|
-
const name =
|
|
1233
|
-
order.getDeclarationOrder("constant").find((constant) => unassigned.includes(constant)) ??
|
|
1234
|
-
unassigned[0];
|
|
1235
|
-
throw new TlaConfigError(
|
|
1236
|
-
`The constant parameter ${name} is not assigned a value by the configuration file.`,
|
|
1237
|
-
);
|
|
1238
|
-
}
|
|
1130
|
+
const constants = applied.constants;
|
|
1131
|
+
const substitutions = applied.substitutions;
|
|
1239
1132
|
|
|
1240
|
-
if (
|
|
1133
|
+
if (traceFile !== undefined) {
|
|
1241
1134
|
builtins.forEach((builtin, name) => {
|
|
1242
1135
|
const replacement = getTraceSpecArithmetic(builtin);
|
|
1243
1136
|
if (replacement) builtins.set(name, replacement);
|
|
@@ -1267,14 +1160,13 @@ export const createEnvironment = (
|
|
|
1267
1160
|
variableIndex,
|
|
1268
1161
|
facts,
|
|
1269
1162
|
startupValues: Array.from({ length: facts.ids.size }, (): Value | undefined => undefined),
|
|
1163
|
+
tlcEvalValues: new WeakMap(),
|
|
1270
1164
|
substitutedDefinitions,
|
|
1165
|
+
instanceParams,
|
|
1271
1166
|
evaluators: new WeakMap(),
|
|
1272
1167
|
entryEvaluators: new WeakMap(),
|
|
1273
1168
|
definitionEvaluators: new WeakMap(),
|
|
1274
1169
|
};
|
|
1275
|
-
// TLC evaluates a substitute at startup and rejects it only when that fails and the level bound it
|
|
1276
|
-
// computes is above constant. The bound counts the operators that TLC's Java code overrides with
|
|
1277
|
-
// a minimum level as state-level, so the analyzer takes them for variables.
|
|
1278
1170
|
const analyzer = createLevelAnalyzer({
|
|
1279
1171
|
constants: new Set(constants.keys()),
|
|
1280
1172
|
variables: new Set([
|
|
@@ -1302,17 +1194,13 @@ export const createEnvironment = (
|
|
|
1302
1194
|
? getEvaluationError(definition.body)
|
|
1303
1195
|
: undefined;
|
|
1304
1196
|
if (error) {
|
|
1305
|
-
// TLC's SpecProcessor adds the message of a TLCRuntimeException, not of an EvalException.
|
|
1306
1197
|
const addendum = isEvalException(error) ? "" : ` - specifically: ${error.message}`;
|
|
1307
1198
|
throw new TlaConfigError(
|
|
1308
1199
|
`The configuration file substitutes constant ${name} with non-constant ${target}${addendum}`,
|
|
1309
1200
|
);
|
|
1310
1201
|
}
|
|
1311
1202
|
});
|
|
1312
|
-
// TLC 1.7.4 processes the whole spec before it creates its model checker, which TLCGet reads.
|
|
1313
1203
|
if (runtime.version !== "1.7.4") runtime.isStarted = true;
|
|
1314
|
-
// TLC computes the constant definitions of each module in the order SANY finishes the modules,
|
|
1315
|
-
// except those of a module that an INSTANCE gives parameters to.
|
|
1316
1204
|
const instantiated = new Set(
|
|
1317
1205
|
linkOrder.flatMap((linked) => linked.module.instances.map((instance) => instance.module)),
|
|
1318
1206
|
);
|
|
@@ -1334,8 +1222,9 @@ export const createEnvironment = (
|
|
|
1334
1222
|
},
|
|
1335
1223
|
),
|
|
1336
1224
|
),
|
|
1337
|
-
rootConstants: linkedRoot.constants,
|
|
1338
|
-
rootSymbols: linkedRoot.visible,
|
|
1339
1225
|
javaOverrides: linkOrder.flatMap((linked) => javaOverrides.get(linked.module.name) ?? []),
|
|
1226
|
+
moduleOperators,
|
|
1227
|
+
runtimeInvariants,
|
|
1228
|
+
rootName: root.name,
|
|
1340
1229
|
};
|
|
1341
1230
|
};
|