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