tla-ts 0.0.10-dev.f16792fed → 0.0.10-dev.fdc173479
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +2 -1
- package/dist/compile.cjs +6 -6
- package/dist/compile.js +10 -10
- package/dist/deciders.cjs +41 -37
- package/dist/deciders.js +41 -37
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +21 -4
- package/dist/index.d.ts +21 -4
- 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 +2681 -425
- package/dist/prove.js +2681 -425
- package/dist/run.cjs +41 -42
- package/dist/run.js +41 -42
- package/dist/tlapm.cjs +2 -2
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +97 -89
- package/dist/transfer.js +97 -89
- package/dist/worker.cjs +7 -7
- package/dist/worker.js +7 -7
- package/package.json +1 -1
- package/src/ast.ts +72 -39
- package/src/bags.ts +50 -29
- package/src/builtins.ts +8 -16
- package/src/check-failure.ts +118 -0
- package/src/check-trace.ts +321 -0
- package/src/check.ts +828 -770
- package/src/cli/options.ts +6 -31
- package/src/cli/runtime-invariants.ts +20 -56
- package/src/cli/shared.ts +1 -1
- package/src/cli/tlapm.ts +433 -70
- package/src/cli/tlc-arguments.ts +224 -212
- package/src/cli/tlc-output.ts +701 -0
- package/src/cli/tlc-usage.ts +1 -2
- package/src/cli/tlc.ts +65 -712
- package/src/cli/xml-exporter.ts +23 -33
- package/src/codegen.ts +28 -20
- package/src/coverage.ts +255 -20
- package/src/dependencies.ts +96 -27
- package/src/dfid.ts +115 -50
- package/src/environment-config.ts +315 -0
- package/src/environment.ts +175 -373
- package/src/errors.ts +40 -5
- package/src/evaluate.ts +429 -139
- package/src/exit-codes.ts +28 -12
- package/src/fingerprints.ts +65 -1
- package/src/instances.ts +178 -17
- package/src/java-hash.ts +14 -0
- package/src/java-overrides.ts +2 -2
- package/src/json.ts +4 -7
- package/src/levels.ts +708 -272
- package/src/lexer.ts +17 -5
- package/src/liveness-checker.ts +707 -249
- package/src/liveness.ts +148 -95
- package/src/obligations/action.ts +14 -17
- package/src/obligations/anonymize.ts +37 -16
- package/src/obligations/enabled-axioms.ts +218 -0
- package/src/obligations/equality.ts +1 -3
- package/src/obligations/expression.ts +36 -8
- package/src/obligations/format.ts +0 -2
- package/src/obligations/generate.ts +66 -54
- package/src/obligations/index.ts +39 -9
- package/src/obligations/levels.ts +24 -11
- package/src/obligations/module.ts +28 -41
- package/src/obligations/normalize.ts +27 -18
- package/src/obligations/operators.ts +0 -2
- package/src/obligations/pragma.ts +53 -16
- package/src/obligations/printer.ts +48 -18
- package/src/obligations/proof.ts +3 -2
- package/src/obligations/regroup.ts +0 -2
- package/src/obligations/simplify.ts +55 -50
- package/src/obligations/source.ts +120 -74
- package/src/obligations/subexpression.ts +45 -18
- package/src/obligations/substitution.ts +1 -3
- package/src/obligations/temporal.ts +5 -7
- package/src/obligations/tuples.ts +0 -2
- package/src/parallel-worker.ts +17 -31
- package/src/parallel.ts +29 -47
- package/src/parser.ts +757 -326
- package/src/pretty-print.ts +1 -1
- package/src/prover/decide-pool.ts +3 -3
- package/src/prover/deciders.ts +12 -9
- package/src/prover/isabelle/decide.ts +3 -25
- package/src/prover/isabelle/encode.ts +72 -42
- package/src/prover/isabelle/isar/attrib.ts +250 -0
- package/src/prover/isabelle/isar/context.ts +335 -0
- package/src/prover/isabelle/isar/induct.ts +382 -0
- package/src/prover/isabelle/isar/inner-syntax.ts +158 -7
- package/src/prover/isabelle/isar/method.ts +509 -212
- package/src/prover/isabelle/isar/proof.ts +570 -14
- package/src/prover/isabelle/isar/rule-cases.ts +226 -0
- package/src/prover/isabelle/isar/theory.ts +487 -76
- package/src/prover/isabelle/isar/toplevel.ts +331 -0
- package/src/prover/isabelle/isar/type-check.ts +89 -14
- package/src/prover/isabelle/provers/blast/blast.ts +7 -65
- package/src/prover/isabelle/provers/blast/branch.ts +0 -2
- package/src/prover/isabelle/provers/blast/prove.ts +0 -2
- package/src/prover/isabelle/provers/blast/rules.ts +0 -2
- package/src/prover/isabelle/provers/blast/state.ts +0 -2
- package/src/prover/isabelle/provers/blast/term.ts +0 -2
- package/src/prover/isabelle/provers/clasimp.ts +1 -3
- package/src/prover/isabelle/provers/classical.ts +45 -20
- package/src/prover/isabelle/provers/hypsubst.ts +19 -30
- package/src/prover/isabelle/pure/bicompose.ts +9 -27
- package/src/prover/isabelle/pure/consts.ts +0 -2
- package/src/prover/isabelle/pure/conv.ts +2 -10
- package/src/prover/isabelle/pure/drule.ts +72 -6
- package/src/prover/isabelle/pure/envir.ts +0 -2
- package/src/prover/isabelle/pure/goal.ts +1 -3
- package/src/prover/isabelle/pure/logic.ts +1 -3
- package/src/prover/isabelle/pure/name.ts +0 -2
- package/src/prover/isabelle/pure/net.ts +0 -2
- package/src/prover/isabelle/pure/object-logic.ts +13 -7
- package/src/prover/isabelle/pure/pattern.ts +0 -2
- package/src/prover/isabelle/pure/raw-simplifier.ts +4 -15
- package/src/prover/isabelle/pure/rewriter.ts +9 -20
- package/src/prover/isabelle/pure/search.ts +0 -2
- package/src/prover/isabelle/pure/seq.ts +0 -2
- package/src/prover/isabelle/pure/simplifier.ts +26 -7
- package/src/prover/isabelle/pure/table.ts +2 -3
- package/src/prover/isabelle/pure/tactic.ts +0 -2
- package/src/prover/isabelle/pure/tactical.ts +42 -37
- package/src/prover/isabelle/pure/term-ord.ts +0 -2
- package/src/prover/isabelle/pure/term.ts +3 -5
- package/src/prover/isabelle/pure/thm.ts +14 -13
- package/src/prover/isabelle/pure/type.ts +0 -2
- package/src/prover/isabelle/pure/unify.ts +0 -2
- package/src/prover/isabelle/pure/variable.ts +0 -2
- package/src/prover/isabelle/tla/classical-setup.ts +18 -16
- package/src/prover/isabelle/tla/context.ts +58 -11
- package/src/prover/isabelle/tla/logic-data.ts +1 -1
- package/src/prover/isabelle/tla/logic.ts +49 -21
- package/src/prover/isabelle/tla/simpdata.ts +1 -12
- package/src/prover/isabelle/tools/intuitionistic.ts +28 -12
- package/src/prover/ocaml.ts +4 -1
- package/src/prover/prep/action.ts +30 -31
- package/src/prover/prep/enabled-axioms.ts +11 -2
- package/src/prover/prep/fingerprint.ts +2 -5
- package/src/prover/prep/md5.ts +26 -29
- package/src/prover/prep/methods.ts +181 -51
- package/src/prover/prep/normalize.ts +38 -9
- package/src/prover/prove.ts +395 -94
- package/src/prover/ptl/decide.ts +95 -50
- package/src/prover/ptl/encode.ts +2 -3
- package/src/prover/ptl/tableau.ts +28 -2
- package/src/prover/smt/arithmetic.ts +310 -0
- package/src/prover/smt/axioms.ts +12 -8
- package/src/prover/smt/context.ts +43 -8
- package/src/prover/smt/data.ts +498 -379
- package/src/prover/smt/encode.ts +148 -57
- package/src/prover/smt/extensionality.ts +5 -3
- package/src/prover/smt/flatten.ts +4 -6
- package/src/prover/smt/format.ts +28 -4
- package/src/prover/smt/instances.ts +7 -1
- package/src/prover/smt/layout.ts +91 -0
- package/src/prover/smt/rewrite.ts +1016 -618
- package/src/prover/smt/simplify.ts +441 -0
- package/src/prover/smt/solver/ackermannize-bv-tactic.ts +62 -0
- package/src/prover/smt/solver/ackr-helper.ts +179 -0
- package/src/prover/smt/solver/ackr-model-converter.ts +105 -0
- package/src/prover/smt/solver/act-cache.ts +0 -1
- package/src/prover/smt/solver/add-bounds-tactic.ts +59 -0
- package/src/prover/smt/solver/aig-tactic.ts +52 -0
- package/src/prover/smt/solver/aig.ts +889 -0
- package/src/prover/smt/solver/arith-rewriter.ts +624 -9
- 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/asserted-formulas.ts +240 -56
- package/src/prover/smt/solver/ast-lt.ts +165 -11
- package/src/prover/smt/solver/ast-util.ts +160 -2
- package/src/prover/smt/solver/ast.ts +1483 -45
- package/src/prover/smt/solver/auf-solver.ts +25 -18
- 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 -2
- package/src/prover/smt/solver/cg-table.ts +39 -25
- package/src/prover/smt/solver/check-logic.ts +330 -0
- package/src/prover/smt/solver/clause.ts +0 -1
- package/src/prover/smt/solver/cofactor-elim-term-ite.ts +293 -0
- package/src/prover/smt/solver/conflict-resolution.ts +78 -2
- package/src/prover/smt/solver/context.ts +598 -128
- package/src/prover/smt/solver/ctx-simplify.ts +29 -14
- 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 +38 -10
- package/src/prover/smt/solver/diff-neq.ts +207 -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 +298 -0
- package/src/prover/smt/solver/dyn-ack.ts +0 -1
- package/src/prover/smt/solver/e-matching.ts +7 -8
- package/src/prover/smt/solver/elim-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 +548 -0
- package/src/prover/smt/solver/enode.ts +100 -3
- package/src/prover/smt/solver/eq2bv-tactic.ts +227 -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 -1
- package/src/prover/smt/solver/expr-safe-replace.ts +26 -2
- 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 -15
- package/src/prover/smt/solver/fix-dl-var.ts +147 -0
- package/src/prover/smt/solver/flat-literals.ts +0 -1
- package/src/prover/smt/solver/fm-tactic.ts +886 -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 +178 -15
- 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 -1
- package/src/prover/smt/solver/hashtable.ts +34 -16
- package/src/prover/smt/solver/inf-eps.ts +63 -0
- package/src/prover/smt/solver/inj-axiom.ts +101 -0
- package/src/prover/smt/solver/internalizer.ts +111 -39
- package/src/prover/smt/solver/lackr.ts +381 -0
- package/src/prover/smt/solver/lbool.ts +0 -1
- package/src/prover/smt/solver/lia2card.ts +268 -0
- package/src/prover/smt/solver/lia2pb.ts +154 -0
- package/src/prover/smt/solver/literal.ts +0 -1
- package/src/prover/smt/solver/logic-tactics.ts +355 -0
- package/src/prover/smt/solver/lp/bound-propagator.ts +0 -1
- package/src/prover/smt/solver/lp/constraints.ts +0 -1
- package/src/prover/smt/solver/lp/containers.ts +7 -2
- package/src/prover/smt/solver/lp/core-solver.ts +30 -11
- package/src/prover/smt/solver/lp/cross-nested.ts +1 -4
- package/src/prover/smt/solver/lp/dep-intervals.ts +0 -3
- package/src/prover/smt/solver/lp/dependency.ts +0 -2
- package/src/prover/smt/solver/lp/dioph-eq.ts +1 -10
- package/src/prover/smt/solver/lp/explanation.ts +0 -1
- package/src/prover/smt/solver/lp/gomory.ts +0 -1
- package/src/prover/smt/solver/lp/hnf-cutter.ts +1 -2
- package/src/prover/smt/solver/lp/hnf.ts +0 -3
- package/src/prover/smt/solver/lp/int-cube.ts +3 -4
- package/src/prover/smt/solver/lp/int-solver.ts +0 -2
- package/src/prover/smt/solver/lp/lar-solver.ts +41 -5
- package/src/prover/smt/solver/lp/lar-term.ts +0 -1
- package/src/prover/smt/solver/lp/lp-settings.ts +6 -3
- package/src/prover/smt/solver/lp/maximize-term.ts +59 -10
- package/src/prover/smt/solver/lp/nex-creator.ts +3 -3
- package/src/prover/smt/solver/lp/nex.ts +2 -2
- package/src/prover/smt/solver/lp/nla-backoff.ts +0 -2
- package/src/prover/smt/solver/lp/nla-basics.ts +46 -3
- package/src/prover/smt/solver/lp/nla-core.ts +68 -17
- package/src/prover/smt/solver/lp/nla-divisions.ts +0 -2
- package/src/prover/smt/solver/lp/nla-emonics.ts +0 -1
- package/src/prover/smt/solver/lp/nla-factorization.ts +0 -1
- package/src/prover/smt/solver/lp/nla-grobner.ts +167 -85
- package/src/prover/smt/solver/lp/nla-horner.ts +0 -2
- package/src/prover/smt/solver/lp/nla-intervals.ts +0 -1
- package/src/prover/smt/solver/lp/nla-monomial-bounds.ts +0 -2
- package/src/prover/smt/solver/lp/nla-monotone.ts +0 -1
- package/src/prover/smt/solver/lp/nla-order.ts +0 -2
- package/src/prover/smt/solver/lp/nla-patcher.ts +0 -1
- package/src/prover/smt/solver/lp/nla-powers.ts +220 -0
- package/src/prover/smt/solver/lp/nla-tangents.ts +0 -2
- package/src/prover/smt/solver/lp/nla-throttle.ts +0 -1
- package/src/prover/smt/solver/lp/nla-transcendentals.ts +324 -0
- package/src/prover/smt/solver/lp/nla-types.ts +0 -2
- package/src/prover/smt/solver/lp/nla-var-eqs.ts +0 -1
- package/src/prover/smt/solver/lp/nra-solver.ts +163 -99
- package/src/prover/smt/solver/lp/numeric-pair.ts +0 -1
- package/src/prover/smt/solver/lp/pdd-interval.ts +6 -3
- package/src/prover/smt/solver/lp/pdd-simplifier.ts +60 -21
- package/src/prover/smt/solver/lp/pdd-solver.ts +72 -41
- package/src/prover/smt/solver/lp/pdd.ts +725 -290
- package/src/prover/smt/solver/lp/random-updater.ts +0 -2
- package/src/prover/smt/solver/lp/static-matrix.ts +0 -1
- package/src/prover/smt/solver/lp/union-find.ts +7 -2
- package/src/prover/smt/solver/macro-finder.ts +530 -0
- package/src/prover/smt/solver/mam-compiler.ts +122 -90
- package/src/prover/smt/solver/mam-interpreter.ts +0 -1
- package/src/prover/smt/solver/max-bv-sharing-tactic.ts +17 -0
- package/src/prover/smt/solver/max-cliques.ts +105 -0
- package/src/prover/smt/solver/maxcore.ts +310 -0
- package/src/prover/smt/solver/maximize-ac-sharing.ts +8 -6
- package/src/prover/smt/solver/maxlex.ts +115 -0
- package/src/prover/smt/solver/maxsmt-base.ts +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 +19 -28
- package/src/prover/smt/solver/model-evaluator.ts +190 -12
- package/src/prover/smt/solver/model-finder.ts +12 -18
- package/src/prover/smt/solver/model-generator.ts +104 -35
- package/src/prover/smt/solver/model-macro-solver.ts +49 -46
- package/src/prover/smt/solver/model-printer.ts +214 -0
- package/src/prover/smt/solver/mpf.ts +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 +485 -0
- package/src/prover/smt/solver/nlsat/algebraic.ts +315 -98
- package/src/prover/smt/solver/nlsat/atoms.ts +71 -38
- package/src/prover/smt/solver/nlsat/evaluator.ts +0 -1
- package/src/prover/smt/solver/nlsat/explain.ts +427 -229
- package/src/prover/smt/solver/nlsat/interval-set.ts +1 -2
- package/src/prover/smt/solver/nlsat/levelwise.ts +460 -246
- package/src/prover/smt/solver/nlsat/mpbq.ts +45 -1
- package/src/prover/smt/solver/nlsat/polynomial.ts +2376 -684
- package/src/prover/smt/solver/nlsat/solver.ts +293 -92
- 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 -2
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +9 -8
- package/src/prover/smt/solver/nlsat/upolynomial.ts +41 -20
- package/src/prover/smt/solver/nlsat-tactic.ts +82 -0
- package/src/prover/smt/solver/nnf.ts +110 -24
- 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 +19 -11
- package/src/prover/smt/solver/pb-rewriter.ts +281 -0
- package/src/prover/smt/solver/pb2bv-tactic.ts +546 -0
- package/src/prover/smt/solver/poly-rewriter.ts +259 -57
- package/src/prover/smt/solver/probes.ts +577 -0
- package/src/prover/smt/solver/propagate-values.ts +37 -21
- package/src/prover/smt/solver/proto-model.ts +648 -19
- package/src/prover/smt/solver/pull-quant.ts +28 -12
- package/src/prover/smt/solver/purify-arith.ts +634 -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 -3
- package/src/prover/smt/solver/qe-lite-fm.ts +3 -4
- package/src/prover/smt/solver/qe-lite.ts +39 -19
- 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 -1
- 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 +16 -56
- package/src/prover/smt/solver/quantifier-analyzer.ts +19 -20
- package/src/prover/smt/solver/quantifier-manager.ts +22 -25
- package/src/prover/smt/solver/quasi-macros.ts +243 -0
- package/src/prover/smt/solver/random-gen.ts +0 -1
- package/src/prover/smt/solver/rational.ts +45 -1
- package/src/prover/smt/solver/recfun-decl-plugin.ts +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 -1
- package/src/prover/smt/solver/relevancy.ts +1 -2
- package/src/prover/smt/solver/rewriter-tpl.ts +82 -14
- package/src/prover/smt/solver/rewriter.ts +505 -60
- package/src/prover/smt/solver/rlimit.ts +45 -5
- 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 +589 -0
- package/src/prover/smt/solver/sat/inc-sat-solver.ts +480 -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 +72 -0
- package/src/prover/smt/solver/sat/sat2goal.ts +190 -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 +3535 -360
- package/src/prover/smt/solver/smtlib-script.ts +2136 -0
- package/src/prover/smt/solver/solve-eqs.ts +928 -0
- package/src/prover/smt/solver/solver.ts +128 -23
- package/src/prover/smt/solver/static-features.ts +314 -0
- package/src/prover/smt/solver/sticky-generations.ts +0 -1
- package/src/prover/smt/solver/tactic.ts +2176 -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 +53 -2
- package/src/prover/smt/solver/theory-lra-bounds.ts +31 -6
- package/src/prover/smt/solver/theory-lra-final-check.ts +57 -70
- package/src/prover/smt/solver/theory-lra-internalize.ts +96 -27
- package/src/prover/smt/solver/theory-lra-model.ts +20 -35
- package/src/prover/smt/solver/theory-lra-propagate.ts +35 -28
- package/src/prover/smt/solver/theory-lra-state.ts +7 -23
- package/src/prover/smt/solver/theory-lra.ts +189 -2
- 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 +495 -0
- package/src/prover/smt/solver/var-subst.ts +36 -14
- package/src/prover/smt/table.ts +3 -2
- package/src/prover/smt/types.ts +146 -0
- package/src/prover/tlapm/cache.ts +57 -26
- package/src/prover/tlapm/tlapm.ts +15 -9
- package/src/prover/tlapm-library.ts +3208 -0
- package/src/prover/verdict.ts +9 -0
- package/src/prover/zenon/check/check.ts +1 -2
- package/src/prover/zenon/check/records.ts +1 -1
- package/src/prover/zenon/check/relations.ts +2 -1
- package/src/prover/zenon/check/rewrites.ts +2 -15
- package/src/prover/zenon/check/sets.ts +40 -58
- package/src/prover/zenon/check/terms.ts +1 -2
- package/src/prover/zenon/decide.ts +10 -7
- package/src/prover/zenon/encode.ts +0 -2
- package/src/prover/zenon/eqrel.ts +2 -2
- package/src/prover/zenon/equality-rules.ts +24 -2
- package/src/prover/zenon/expr.ts +28 -2
- package/src/prover/zenon/index-table.ts +16 -23
- package/src/prover/zenon/isar-case.ts +1 -3
- package/src/prover/zenon/isar.ts +37 -39
- package/src/prover/zenon/llproof.ts +2 -13
- package/src/prover/zenon/mltoll.ts +12 -30
- package/src/prover/zenon/node.ts +20 -5
- package/src/prover/zenon/parse.ts +9 -8
- package/src/prover/zenon/phrase.ts +1 -3
- package/src/prover/zenon/proof.ts +0 -2
- package/src/prover/zenon/propositional-rules.ts +0 -2
- package/src/prover/zenon/rules.ts +2 -3
- package/src/prover/zenon/search.ts +11 -19
- package/src/prover/zenon/tla/functions.ts +2 -4
- package/src/prover/zenon/tla/llproof.ts +9 -13
- package/src/prover/zenon/tla/records.ts +1 -8
- package/src/prover/zenon/tla/rewrites.ts +0 -2
- package/src/prover/zenon/tla/sets.ts +22 -22
- package/src/prover/zenon/tla/terms.ts +0 -2
- package/src/prover/zenon/tla/tla.ts +7 -8
- package/src/resolve.ts +1327 -328
- package/src/runtime.ts +25 -2
- package/src/sany/builtins.ts +10 -10
- package/src/sany/generation.ts +384 -0
- package/src/sany/generator-def-entries.ts +297 -0
- package/src/sany/generator-definitions.ts +688 -0
- package/src/sany/generator-expressions.ts +1123 -0
- package/src/sany/generator-proofs.ts +668 -0
- package/src/sany/generator.ts +161 -2625
- package/src/sany/levels.ts +0 -2
- package/src/sany/lexer.ts +32 -23
- package/src/sany/linter.ts +0 -2
- package/src/sany/modules.ts +4 -2
- package/src/sany/nodes.ts +3 -4
- package/src/sany/report.ts +3 -6
- package/src/sany/selectors.ts +46 -44
- package/src/sany/xml.ts +25 -58
- package/src/search.ts +513 -165
- package/src/simulate.ts +340 -251
- package/src/spec-description.ts +48 -55
- package/src/standard-definitions.ts +5 -0
- package/src/standard-modules.ts +72 -54
- package/src/state-graph.ts +0 -2
- package/src/subexpressions.ts +564 -138
- package/src/substitution-levels.ts +5 -4
- package/src/successors.ts +56 -28
- package/src/symmetry.ts +4 -3
- package/src/tableau.ts +2 -2
- package/src/tlc/fingerprint.ts +81 -9
- package/src/tlc/jar-data.ts +10 -0
- package/src/tlc/messages.ts +23 -18
- package/src/tlc/order.ts +14 -3
- package/src/tlc/random.ts +6 -5
- package/src/tlc/replay.ts +152 -58
- package/src/tlc/summary.ts +29 -14
- package/src/tlc/tlc-operators.ts +12 -11
- package/src/tlc/tlcext-operators.ts +87 -26
- package/src/tlc/trace-spec.ts +27 -60
- package/src/trace-liveness.ts +529 -0
- package/src/typed-tier.ts +6556 -0
- package/src/typescript/actions.ts +2 -4
- package/src/typescript/collections.ts +34 -20
- package/src/typescript/compile.ts +1 -3
- package/src/typescript/formula.ts +5 -3
- package/src/typescript/model.ts +4 -5
- package/src/typescript/steps.ts +20 -18
- package/src/typescript/types.ts +2 -2
- package/src/values.ts +208 -227
- package/src/prover/isabelle/isar/statement.ts +0 -52
- package/src/prover/smt/solver/z3-license.txt +0 -10
- package/src/prover/tlaps-module.ts +0 -510
- package/src/prover/zenon/LICENSE +0 -32
package/src/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
15
|
import type { ModuleOperator } from "./check";
|
|
13
|
-
import type {
|
|
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,27 +23,24 @@ import {
|
|
|
19
23
|
formatSanyWarnings,
|
|
20
24
|
TlaConfigError,
|
|
21
25
|
TlaEvaluationError,
|
|
22
|
-
TlaFeatureUnsupportedError,
|
|
23
|
-
TlaModuleError,
|
|
24
26
|
TlaSyntaxError,
|
|
25
|
-
UNEXPECTED_EXCEPTION,
|
|
26
27
|
type SanyError,
|
|
27
28
|
} from "./errors";
|
|
28
|
-
import { EXIT_STATUS, setExitCode } from "./exit-codes";
|
|
29
29
|
import {
|
|
30
30
|
bindOperatorArguments,
|
|
31
31
|
createBigNumberError,
|
|
32
32
|
createRealNumberError,
|
|
33
33
|
evaluate,
|
|
34
34
|
getDefinition,
|
|
35
|
+
getDefinitionClosure,
|
|
35
36
|
type Builtin,
|
|
36
37
|
type BuiltinArgument,
|
|
37
|
-
type Closure,
|
|
38
38
|
type Context,
|
|
39
39
|
type Environment,
|
|
40
40
|
} from "./evaluate";
|
|
41
41
|
import {
|
|
42
42
|
createInstantiation,
|
|
43
|
+
createLocalAlias,
|
|
43
44
|
createLocalArguments,
|
|
44
45
|
createLocalIdentifier,
|
|
45
46
|
getEnabledVariableName,
|
|
@@ -49,7 +50,9 @@ import {
|
|
|
49
50
|
import { overrideDefinitions, type JavaOverride } from "./java-overrides";
|
|
50
51
|
import { extractModule } from "./parser";
|
|
51
52
|
import {
|
|
53
|
+
collectSemanticErrors,
|
|
52
54
|
getArity,
|
|
55
|
+
getFunctionArity,
|
|
53
56
|
getParamArities,
|
|
54
57
|
isBefore,
|
|
55
58
|
isTheoremDefinition,
|
|
@@ -70,9 +73,10 @@ import { getSanyParseError } from "./sany/parse-error";
|
|
|
70
73
|
import {
|
|
71
74
|
CORE_OPERATORS,
|
|
72
75
|
getJavaOverrides,
|
|
73
|
-
|
|
76
|
+
getStandardOperators,
|
|
74
77
|
getTraceSpecArithmetic,
|
|
75
78
|
STANDARD_DEPENDENCIES,
|
|
79
|
+
STANDARD_EXTENDS,
|
|
76
80
|
} from "./standard-modules";
|
|
77
81
|
import { getStandardRange, STANDARD_LEVELS } from "./standard-definitions";
|
|
78
82
|
import { resolveInstanceSubexpressions, resolveModuleSubexpressions } from "./subexpressions";
|
|
@@ -81,15 +85,7 @@ import { createInstanceChecker, type InstanceCheck } from "./substitution-levels
|
|
|
81
85
|
import { isEvalException } from "./tlc/messages";
|
|
82
86
|
import { createDefinitionFacts } from "./dependencies";
|
|
83
87
|
import { createTlcOrder, type TlcOrder } from "./tlc/order";
|
|
84
|
-
import {
|
|
85
|
-
isTlcInteger,
|
|
86
|
-
createModelValue,
|
|
87
|
-
formatValue,
|
|
88
|
-
valuesEqual,
|
|
89
|
-
toFiniteSet,
|
|
90
|
-
type Value,
|
|
91
|
-
markNormalized,
|
|
92
|
-
} from "./values";
|
|
88
|
+
import { isTlcInteger, type Value } from "./values";
|
|
93
89
|
import type { TlcVersion } from "./tlc/version";
|
|
94
90
|
|
|
95
91
|
interface EnvironmentOptions {
|
|
@@ -106,6 +102,13 @@ interface EnvironmentOptions {
|
|
|
106
102
|
isWarningEnabled?: boolean;
|
|
107
103
|
version?: TlcVersion;
|
|
108
104
|
moduleOperators?: ModuleOperator[];
|
|
105
|
+
readLine?: () => string | undefined;
|
|
106
|
+
runtimeInvariants?: RuntimeInvariant[];
|
|
107
|
+
}
|
|
108
|
+
|
|
109
|
+
export interface RuntimeInvariant {
|
|
110
|
+
name: string;
|
|
111
|
+
module: string | undefined;
|
|
109
112
|
}
|
|
110
113
|
|
|
111
114
|
export interface ResolvedModuleOperator extends ModuleOperator {
|
|
@@ -120,6 +123,7 @@ export interface Specification {
|
|
|
120
123
|
startupDefinitions: Definition[];
|
|
121
124
|
javaOverrides: JavaOverride[];
|
|
122
125
|
moduleOperators: ResolvedModuleOperator[];
|
|
126
|
+
runtimeInvariants: RuntimeInvariant[];
|
|
123
127
|
rootName: string;
|
|
124
128
|
}
|
|
125
129
|
|
|
@@ -130,46 +134,7 @@ export interface InstanceAction {
|
|
|
130
134
|
|
|
131
135
|
const ANNOTATED_OVERRIDE_MODULES = new Set(["IOUtils", "Json", "TLCExt"]);
|
|
132
136
|
|
|
133
|
-
|
|
134
|
-
switch (value.kind) {
|
|
135
|
-
case "Number":
|
|
136
|
-
// Deviation from TLC: ModelConfig#parseValue lets Integer.parseInt fail on a number too big, where tla-ts reports it as TLC reports such a number in a module.
|
|
137
|
-
if (!isTlcInteger(value.value)) {
|
|
138
|
-
throw setExitCode(
|
|
139
|
-
new TlaModuleError(`TLC can't handle a number this big.\n${value.value}`),
|
|
140
|
-
EXIT_STATUS.error,
|
|
141
|
-
);
|
|
142
|
-
}
|
|
143
|
-
return value.value;
|
|
144
|
-
case "String":
|
|
145
|
-
case "Boolean":
|
|
146
|
-
return value.value;
|
|
147
|
-
case "ModelValue":
|
|
148
|
-
return createModelValue(value.name);
|
|
149
|
-
case "Set":
|
|
150
|
-
return toFiniteSet({ kind: "MixedSet", elements: value.elements.map(toValue) });
|
|
151
|
-
}
|
|
152
|
-
};
|
|
153
|
-
|
|
154
|
-
const toConstantValue = (value: ConfigValue) => {
|
|
155
|
-
try {
|
|
156
|
-
return toValue(value);
|
|
157
|
-
} catch (error) {
|
|
158
|
-
if (
|
|
159
|
-
!(error instanceof TlaEvaluationError) ||
|
|
160
|
-
error instanceof TlaModuleError ||
|
|
161
|
-
error instanceof TlaFeatureUnsupportedError
|
|
162
|
-
) {
|
|
163
|
-
throw error;
|
|
164
|
-
}
|
|
165
|
-
throw setExitCode(
|
|
166
|
-
new TlaEvaluationError(`${UNEXPECTED_EXCEPTION}${error.message}`),
|
|
167
|
-
EXIT_STATUS.error,
|
|
168
|
-
);
|
|
169
|
-
}
|
|
170
|
-
};
|
|
171
|
-
|
|
172
|
-
interface LinkedModule {
|
|
137
|
+
export interface LinkedModule {
|
|
173
138
|
module: Module;
|
|
174
139
|
constants: Declaration[];
|
|
175
140
|
variables: string[];
|
|
@@ -188,7 +153,7 @@ interface ModuleScope {
|
|
|
188
153
|
nested: Module[];
|
|
189
154
|
errors: SanyError[];
|
|
190
155
|
warnings: SanyError[];
|
|
191
|
-
levelChecks:
|
|
156
|
+
levelChecks: ReturnType<typeof checkModuleLevels>[];
|
|
192
157
|
}
|
|
193
158
|
|
|
194
159
|
const getDeclarations = (linked: LinkedModule): Declaration[] => [
|
|
@@ -253,42 +218,14 @@ const createLocalFunction = (definition: Definition, key: string): Definition =>
|
|
|
253
218
|
location: definition.location,
|
|
254
219
|
});
|
|
255
220
|
|
|
256
|
-
const
|
|
257
|
-
const
|
|
258
|
-
return
|
|
259
|
-
|
|
260
|
-
|
|
261
|
-
|
|
262
|
-
evaluate: (args) => {
|
|
263
|
-
const row = rows.find((candidate) => {
|
|
264
|
-
if (candidate[0].length !== args.length) {
|
|
265
|
-
throw new TlaEvaluationError(
|
|
266
|
-
`Attempted to apply the operator ${table}\nwith wrong number of arguments.`,
|
|
267
|
-
);
|
|
268
|
-
}
|
|
269
|
-
return candidate[0].every((value, index) => {
|
|
270
|
-
const argument = args[index];
|
|
271
|
-
return (
|
|
272
|
-
!(typeof argument === "object" && argument.kind === "Operator") &&
|
|
273
|
-
valuesEqual(value, argument)
|
|
274
|
-
);
|
|
275
|
-
});
|
|
276
|
-
});
|
|
277
|
-
if (row) return row[1];
|
|
278
|
-
throw new TlaEvaluationError(
|
|
279
|
-
`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.`,
|
|
280
|
-
);
|
|
281
|
-
},
|
|
282
|
-
evaluateUnary: undefined,
|
|
283
|
-
evaluateBinary: undefined,
|
|
284
|
-
};
|
|
221
|
+
const mentionsName = (expression: Expression, names: Set<string>): boolean => {
|
|
222
|
+
const name = getReferencedName(expression);
|
|
223
|
+
return (
|
|
224
|
+
(name !== undefined && names.has(name)) ||
|
|
225
|
+
getChildren(expression).some((child) => mentionsName(child, names))
|
|
226
|
+
);
|
|
285
227
|
};
|
|
286
228
|
|
|
287
|
-
const mentionsName = (expression: Expression, names: Set<string>): boolean =>
|
|
288
|
-
(expression.kind === "Identifier" && names.has(expression.name)) ||
|
|
289
|
-
(expression.kind === "Apply" && names.has(expression.operator)) ||
|
|
290
|
-
getChildren(expression).some((child) => mentionsName(child, names));
|
|
291
|
-
|
|
292
229
|
const getVariableIndex = (variables: string[], declared: string[]) => {
|
|
293
230
|
const index = new Map(variables.map((name, position) => [name, position]));
|
|
294
231
|
new Set(declared).forEach((name) =>
|
|
@@ -302,6 +239,19 @@ const getSubstitutions = (instances: Instance[]) =>
|
|
|
302
239
|
instance.substitutions.map((substitution) => substitution.expression),
|
|
303
240
|
);
|
|
304
241
|
|
|
242
|
+
const getProofInstances = (proof: Proof | undefined): Instance[] =>
|
|
243
|
+
proof?.kind === "Steps"
|
|
244
|
+
? proof.steps.flatMap((step) => [
|
|
245
|
+
...(step.body.kind === "Instance" ? [step.body] : []),
|
|
246
|
+
...(step.body.kind === "Define"
|
|
247
|
+
? step.body.definitions.flatMap((definition) =>
|
|
248
|
+
definition.kind === "Instance" ? [definition] : [],
|
|
249
|
+
)
|
|
250
|
+
: []),
|
|
251
|
+
...getProofInstances(step.proof),
|
|
252
|
+
])
|
|
253
|
+
: [];
|
|
254
|
+
|
|
305
255
|
const rejectLiterals = (expressions: Expression[]): void =>
|
|
306
256
|
expressions.forEach((expression) => {
|
|
307
257
|
if (expression.kind === "Decimal") throw createRealNumberError(expression);
|
|
@@ -323,7 +273,7 @@ export const createEnvironment = (
|
|
|
323
273
|
const root = order.parseModule(options.source);
|
|
324
274
|
const definitions = new Map<string, Definition>();
|
|
325
275
|
const parameterized = new Map<string, boolean>();
|
|
326
|
-
const copySources = new Map<string,
|
|
276
|
+
const copySources = new Map<string, CopySource>();
|
|
327
277
|
const substitutedDefinitions = new Set<Definition>();
|
|
328
278
|
const instanceParams = new Set<OperatorParam>();
|
|
329
279
|
const builtins = new Map<string, Builtin>(
|
|
@@ -334,15 +284,17 @@ export const createEnvironment = (
|
|
|
334
284
|
runtime.isWarningEnabled = options.isWarningEnabled ?? true;
|
|
335
285
|
runtime.isTool = options.isTool ?? false;
|
|
336
286
|
runtime.version = options.version ?? "master";
|
|
287
|
+
runtime.readLine = options.readLine;
|
|
337
288
|
const linkedModules = new Map<string, LinkedModule>();
|
|
338
289
|
const checkedModules = new Map<string, LinkedModule>();
|
|
339
290
|
const linkOrder: LinkedModule[] = [];
|
|
340
291
|
const dependencies = new Map<string, Set<string>>();
|
|
341
292
|
const loading: Set<string>[] = [];
|
|
342
293
|
const linking: string[] = [];
|
|
294
|
+
const usedModules = new Set<string>();
|
|
343
295
|
|
|
344
296
|
const useModule = (name: string, used: Iterable<string>) =>
|
|
345
|
-
loading.forEach((closure) => {
|
|
297
|
+
[usedModules, ...loading].forEach((closure) => {
|
|
346
298
|
closure.add(name);
|
|
347
299
|
[...used].forEach((dependency) => closure.add(dependency));
|
|
348
300
|
});
|
|
@@ -372,16 +324,16 @@ export const createEnvironment = (
|
|
|
372
324
|
const addStandardModule = (name: string): Symbols | undefined => {
|
|
373
325
|
const cached = standardExports.get(name);
|
|
374
326
|
if (cached) return cached;
|
|
375
|
-
const
|
|
376
|
-
if (!
|
|
327
|
+
const operators = getStandardOperators(name, options.print, runtime, options.files, builtins);
|
|
328
|
+
if (!operators) return undefined;
|
|
377
329
|
STANDARD_DEPENDENCIES.get(name)?.forEach(addStandardModule);
|
|
378
330
|
const exported: Symbols = new Map();
|
|
379
|
-
|
|
331
|
+
STANDARD_EXTENDS.get(name)?.forEach((extended) =>
|
|
380
332
|
addStandardModule(extended)?.forEach((symbol, symbolName) =>
|
|
381
333
|
exported.set(symbolName, symbol),
|
|
382
334
|
),
|
|
383
335
|
);
|
|
384
|
-
|
|
336
|
+
operators.forEach((operator) => {
|
|
385
337
|
builtins.set(operator.name, operator);
|
|
386
338
|
exported.set(operator.name, {
|
|
387
339
|
key: operator.name,
|
|
@@ -410,11 +362,7 @@ export const createEnvironment = (
|
|
|
410
362
|
|
|
411
363
|
const rejectModuleLiterals = (module: Module): Module => {
|
|
412
364
|
rejectLiterals([
|
|
413
|
-
...module.definitions.flatMap(
|
|
414
|
-
definition.kind === "Function"
|
|
415
|
-
? [...definition.bounds.map((bound) => bound.set), definition.body]
|
|
416
|
-
: [definition.body],
|
|
417
|
-
),
|
|
365
|
+
...module.definitions.flatMap(getDefinitionExpressions),
|
|
418
366
|
...module.assumptions.map((assumption) => assumption.expression),
|
|
419
367
|
...module.theorems.flatMap((theorem) =>
|
|
420
368
|
theorem.statement.kind === "AssumeProve" ? [] : [theorem.statement],
|
|
@@ -458,7 +406,7 @@ export const createEnvironment = (
|
|
|
458
406
|
const closure = new Set<string>();
|
|
459
407
|
const nested: Module[] = [];
|
|
460
408
|
const errors: SanyError[] = [];
|
|
461
|
-
const levelChecks:
|
|
409
|
+
const levelChecks: ReturnType<typeof checkModuleLevels>[] = [];
|
|
462
410
|
linking.push(parsed.name);
|
|
463
411
|
loading.push(closure);
|
|
464
412
|
const linked = linkModule(parsed, {
|
|
@@ -478,7 +426,20 @@ export const createEnvironment = (
|
|
|
478
426
|
const redefinition = loaded && getModuleRedefinition(duplicate, loaded.module);
|
|
479
427
|
if (redefinition) throw createSanyError([redefinition], false, undefined, warnings);
|
|
480
428
|
if (duplicate) throw createModuleRedefinedError(duplicate);
|
|
481
|
-
|
|
429
|
+
// SANY's Errors#addMessage drops a message it already has, such as an instantiated body's.
|
|
430
|
+
const levelErrors = [
|
|
431
|
+
...collectSemanticErrors(
|
|
432
|
+
levelChecks.flatMap((check) => check.sections),
|
|
433
|
+
warnings,
|
|
434
|
+
),
|
|
435
|
+
...levelChecks.flatMap((check) => check.check(check !== levelChecks.at(-1))),
|
|
436
|
+
].filter(
|
|
437
|
+
(error, index, all) =>
|
|
438
|
+
all.findIndex(
|
|
439
|
+
(other) => other.location === error.location && other.message === error.message,
|
|
440
|
+
) === index,
|
|
441
|
+
);
|
|
442
|
+
if (levelErrors.length > 0) throw createSanyError(levelErrors, false, undefined, warnings);
|
|
482
443
|
return { linked, closure };
|
|
483
444
|
};
|
|
484
445
|
|
|
@@ -504,16 +465,9 @@ export const createEnvironment = (
|
|
|
504
465
|
if (definition?.kind !== "Operator" || !context || expressions.length !== args.length) {
|
|
505
466
|
throw new TlaEvaluationError(`No definition of ${operator} to fall back to`);
|
|
506
467
|
}
|
|
507
|
-
const closure: Closure = {
|
|
508
|
-
kind: "Closure",
|
|
509
|
-
name: definition.name,
|
|
510
|
-
params: definition.params,
|
|
511
|
-
body: definition.body,
|
|
512
|
-
scope: undefined,
|
|
513
|
-
};
|
|
514
468
|
return evaluate(definition.body, {
|
|
515
469
|
environment: context.environment,
|
|
516
|
-
scope: bindOperatorArguments(
|
|
470
|
+
scope: bindOperatorArguments(getDefinitionClosure(definition), expressions, context),
|
|
517
471
|
state: context.state,
|
|
518
472
|
next: context.next,
|
|
519
473
|
isKeepLazy: context.isKeepLazy,
|
|
@@ -581,7 +535,7 @@ export const createEnvironment = (
|
|
|
581
535
|
const instantiation = createInstantiation({
|
|
582
536
|
params,
|
|
583
537
|
substitutions: new Map(
|
|
584
|
-
[...substitutions].map((
|
|
538
|
+
[...substitutions].map((entry) => [entry[0], renameLocals(entry[1], renamed)]),
|
|
585
539
|
),
|
|
586
540
|
variables: new Set(linked.variables),
|
|
587
541
|
getDefinition: (key) => definitions.get(key),
|
|
@@ -624,9 +578,14 @@ export const createEnvironment = (
|
|
|
624
578
|
instance.name === undefined
|
|
625
579
|
? standardSymbols
|
|
626
580
|
: new Map(
|
|
627
|
-
[...standardSymbols].map((
|
|
628
|
-
`${instance.name}!${
|
|
629
|
-
{
|
|
581
|
+
[...standardSymbols].map((entry) => [
|
|
582
|
+
`${instance.name}!${entry[0]}`,
|
|
583
|
+
{
|
|
584
|
+
key: entry[1].key,
|
|
585
|
+
arity: entry[1].arity,
|
|
586
|
+
params: entry[1].params,
|
|
587
|
+
kind: entry[1].kind,
|
|
588
|
+
},
|
|
630
589
|
]),
|
|
631
590
|
);
|
|
632
591
|
|
|
@@ -639,64 +598,52 @@ export const createEnvironment = (
|
|
|
639
598
|
const declared = new Set(declarations.map((declaration) => declaration.name));
|
|
640
599
|
return new Map(
|
|
641
600
|
[...exported]
|
|
642
|
-
.filter(
|
|
643
|
-
|
|
601
|
+
.filter(
|
|
602
|
+
(entry) =>
|
|
603
|
+
!declared.has(entry[0]) &&
|
|
604
|
+
(instance.name !== undefined || entry[1].kind !== "Instance"),
|
|
605
|
+
)
|
|
606
|
+
.map((entry): [string, ModuleSymbol] => {
|
|
644
607
|
if (instance.name === undefined) {
|
|
645
608
|
return [
|
|
646
|
-
|
|
609
|
+
entry[0],
|
|
647
610
|
{
|
|
648
|
-
key: getKey(
|
|
649
|
-
arity:
|
|
650
|
-
params:
|
|
651
|
-
kind:
|
|
611
|
+
key: getKey(entry[1].key, entry[0]),
|
|
612
|
+
arity: entry[1].arity,
|
|
613
|
+
params: entry[1].params,
|
|
614
|
+
kind: entry[1].kind,
|
|
652
615
|
range:
|
|
653
|
-
parameterized.get(
|
|
616
|
+
parameterized.get(entry[1].key) === true
|
|
617
|
+
? instance.location.range
|
|
618
|
+
: entry[1].range,
|
|
619
|
+
functionArity:
|
|
620
|
+
parameterized.get(entry[1].key) === true ? undefined : entry[1].functionArity,
|
|
654
621
|
},
|
|
655
622
|
];
|
|
656
623
|
}
|
|
657
|
-
const qualified = `${instance.name}!${
|
|
624
|
+
const qualified = `${instance.name}!${entry[0]}`;
|
|
658
625
|
return [
|
|
659
626
|
qualified,
|
|
660
627
|
{
|
|
661
|
-
key: getKey(
|
|
662
|
-
arity:
|
|
663
|
-
params:
|
|
628
|
+
key: entry[1].kind === "Instance" ? qualified : getKey(entry[1].key, qualified),
|
|
629
|
+
arity: entry[1].arity + instance.params.length,
|
|
630
|
+
params: entry[1].params && [
|
|
664
631
|
...instance.params.map((param) => param.arity),
|
|
665
|
-
...
|
|
632
|
+
...entry[1].params,
|
|
666
633
|
],
|
|
667
|
-
kind:
|
|
634
|
+
kind: entry[1].kind,
|
|
635
|
+
functionArity: declarations.length > 0 ? undefined : entry[1].functionArity,
|
|
668
636
|
},
|
|
669
637
|
];
|
|
670
638
|
}),
|
|
671
639
|
);
|
|
672
640
|
};
|
|
673
641
|
|
|
674
|
-
const
|
|
675
|
-
|
|
676
|
-
|
|
677
|
-
|
|
678
|
-
|
|
679
|
-
location: SourceLocation,
|
|
680
|
-
): Definition => ({
|
|
681
|
-
kind: "Operator",
|
|
682
|
-
name,
|
|
683
|
-
params,
|
|
684
|
-
body:
|
|
685
|
-
forwarded.length === 0
|
|
686
|
-
? { kind: "Identifier", name: key, location }
|
|
687
|
-
: {
|
|
688
|
-
kind: "Apply",
|
|
689
|
-
operator: key,
|
|
690
|
-
args: createLocalArguments(forwarded, location),
|
|
691
|
-
location,
|
|
692
|
-
},
|
|
693
|
-
isLocal: true,
|
|
694
|
-
isRecursive: false,
|
|
695
|
-
location,
|
|
696
|
-
});
|
|
697
|
-
|
|
698
|
-
const createArgumentParams = (arity: number) =>
|
|
699
|
-
Array.from({ length: arity }, (_value, index) => ({ name: `argument${index}`, arity: 0 }));
|
|
642
|
+
const createArgumentParams = (arity: number, params: number[] | undefined) =>
|
|
643
|
+
Array.from({ length: arity }, (_value, index) => ({
|
|
644
|
+
name: `argument${index}`,
|
|
645
|
+
arity: params?.[index] ?? 0,
|
|
646
|
+
}));
|
|
700
647
|
|
|
701
648
|
const getSubstitutionBody = (
|
|
702
649
|
replacement: Expression,
|
|
@@ -710,7 +657,7 @@ export const createEnvironment = (
|
|
|
710
657
|
body: replacement.body,
|
|
711
658
|
};
|
|
712
659
|
}
|
|
713
|
-
const params = createArgumentParams(declaration.arity);
|
|
660
|
+
const params = createArgumentParams(declaration.arity, undefined);
|
|
714
661
|
const operator =
|
|
715
662
|
replacement.kind === "Identifier"
|
|
716
663
|
? replacement.name
|
|
@@ -733,11 +680,11 @@ export const createEnvironment = (
|
|
|
733
680
|
const standardSymbols = nested ? undefined : getStandardSymbols(instance.module);
|
|
734
681
|
if (standardSymbols) {
|
|
735
682
|
if (instance.name === undefined) return [];
|
|
736
|
-
return [...standardSymbols].map((
|
|
737
|
-
const forwarded = createArgumentParams(
|
|
683
|
+
return [...standardSymbols].map((entry) => {
|
|
684
|
+
const forwarded = createArgumentParams(entry[1].arity, entry[1].params);
|
|
738
685
|
return createLocalAlias(
|
|
739
|
-
`${instance.name}!${
|
|
740
|
-
|
|
686
|
+
`${instance.name}!${entry[0]}`,
|
|
687
|
+
entry[1].key,
|
|
741
688
|
[...instance.params, ...forwarded],
|
|
742
689
|
forwarded,
|
|
743
690
|
location,
|
|
@@ -818,16 +765,16 @@ export const createEnvironment = (
|
|
|
818
765
|
});
|
|
819
766
|
const declared = new Set(declarations.map((declaration) => declaration.name));
|
|
820
767
|
const aliases = [...linked.exported]
|
|
821
|
-
.filter((
|
|
822
|
-
.map((
|
|
823
|
-
const key = instantiation.getKey(
|
|
824
|
-
const ownParams = createArgumentParams(
|
|
768
|
+
.filter((entry) => !declared.has(entry[0]) && entry[1].kind !== "Instance")
|
|
769
|
+
.map((entry) => {
|
|
770
|
+
const key = instantiation.getKey(entry[1].key);
|
|
771
|
+
const ownParams = createArgumentParams(entry[1].arity, entry[1].params);
|
|
825
772
|
const params = [...instance.params, ...ownParams];
|
|
826
773
|
return createLocalAlias(
|
|
827
|
-
instance.name === undefined ?
|
|
774
|
+
instance.name === undefined ? entry[0] : `${instance.name}!${entry[0]}`,
|
|
828
775
|
key,
|
|
829
776
|
params,
|
|
830
|
-
key ===
|
|
777
|
+
key === entry[1].key ? ownParams : params,
|
|
831
778
|
location,
|
|
832
779
|
);
|
|
833
780
|
});
|
|
@@ -835,9 +782,9 @@ export const createEnvironment = (
|
|
|
835
782
|
};
|
|
836
783
|
|
|
837
784
|
const getAvailableDefinitions = (visible: Symbols) =>
|
|
838
|
-
[...visible].flatMap((
|
|
839
|
-
const definition = definitions.get(
|
|
840
|
-
return definition ? [{ ...definition, name }] : [];
|
|
785
|
+
[...visible].flatMap((entry) => {
|
|
786
|
+
const definition = definitions.get(entry[1].key);
|
|
787
|
+
return definition ? [{ ...definition, name: entry[0] }] : [];
|
|
841
788
|
});
|
|
842
789
|
|
|
843
790
|
const javaOverrides = new Map<string, JavaOverride[]>();
|
|
@@ -947,6 +894,7 @@ export const createEnvironment = (
|
|
|
947
894
|
params: getParamArities(definition),
|
|
948
895
|
kind: isTheoremDefinition(parsed, definition) ? "Theorem" : "Definition",
|
|
949
896
|
range: definition.location.range,
|
|
897
|
+
functionArity: getFunctionArity(definition),
|
|
950
898
|
});
|
|
951
899
|
const isParameterFree = constants.length === 0 && variables.length === 0;
|
|
952
900
|
const getKey = (definition: Definition) =>
|
|
@@ -986,6 +934,13 @@ export const createEnvironment = (
|
|
|
986
934
|
module.definitions.toReversed().map((definition) => [definition.name, definition]),
|
|
987
935
|
),
|
|
988
936
|
getKey,
|
|
937
|
+
isModuleKnown: (name, location) =>
|
|
938
|
+
name === parsed.name ||
|
|
939
|
+
usedModules.has(name) ||
|
|
940
|
+
scope.modules.has(name) ||
|
|
941
|
+
parsed.modules.some(
|
|
942
|
+
(nested) => nested.name === name && isBefore(nested.location, location),
|
|
943
|
+
),
|
|
989
944
|
instanced,
|
|
990
945
|
facts,
|
|
991
946
|
reports,
|
|
@@ -1006,7 +961,7 @@ export const createEnvironment = (
|
|
|
1006
961
|
getDefinitionSymbol(definition),
|
|
1007
962
|
]),
|
|
1008
963
|
].reduce(
|
|
1009
|
-
(symbols,
|
|
964
|
+
(symbols, entry) => (symbols.has(entry[0]) ? symbols : symbols.set(entry[0], entry[1])),
|
|
1010
965
|
new Map(visible),
|
|
1011
966
|
);
|
|
1012
967
|
const linkNested = (nested: Module) => {
|
|
@@ -1047,6 +1002,14 @@ export const createEnvironment = (
|
|
|
1047
1002
|
visible.set(name, symbol);
|
|
1048
1003
|
if (!instance.isLocal) exported.set(name, symbol);
|
|
1049
1004
|
});
|
|
1005
|
+
if (instance.name !== undefined && !instance.isLocal) {
|
|
1006
|
+
exported.set(instance.name, {
|
|
1007
|
+
key: `${instance.name}${KEY_SEPARATOR}${scope.id}`,
|
|
1008
|
+
arity: instance.params.length,
|
|
1009
|
+
kind: "Instance",
|
|
1010
|
+
range: instance.location.range,
|
|
1011
|
+
});
|
|
1012
|
+
}
|
|
1050
1013
|
},
|
|
1051
1014
|
})),
|
|
1052
1015
|
...parsed.modules.map((nested) => ({
|
|
@@ -1062,6 +1025,13 @@ export const createEnvironment = (
|
|
|
1062
1025
|
),
|
|
1063
1026
|
getAvailableDefinitions(visible),
|
|
1064
1027
|
);
|
|
1028
|
+
parsed.theorems
|
|
1029
|
+
.flatMap((theorem) => getProofInstances(theorem.proof))
|
|
1030
|
+
.filter((instance) => !getVisibleModules().has(instance.module))
|
|
1031
|
+
.forEach(
|
|
1032
|
+
(instance) =>
|
|
1033
|
+
getStandardSymbols(instance.module) ?? getLinkedModule(instance.module, parsed.name),
|
|
1034
|
+
);
|
|
1065
1035
|
scope.errors.push(...resolveModule(module, getUnit(module)));
|
|
1066
1036
|
module.definitions.forEach((definition) => {
|
|
1067
1037
|
const key = getKey(definition);
|
|
@@ -1097,7 +1067,7 @@ export const createEnvironment = (
|
|
|
1097
1067
|
const checks = instanceChecks
|
|
1098
1068
|
.splice(firstCheck)
|
|
1099
1069
|
.map((check) => ({ location: check.location, check: () => checkInstance(check) }));
|
|
1100
|
-
scope.levelChecks.push(
|
|
1070
|
+
scope.levelChecks.push(
|
|
1101
1071
|
checkModuleLevels(
|
|
1102
1072
|
module,
|
|
1103
1073
|
{
|
|
@@ -1135,7 +1105,15 @@ export const createEnvironment = (
|
|
|
1135
1105
|
);
|
|
1136
1106
|
linkOrder.push(...linkOrder.splice(linkOrder.indexOf(linkedRoot), 1));
|
|
1137
1107
|
if (warnings.length > 0 && !options.isSanyReported) options.print(formatSanyWarnings(warnings));
|
|
1138
|
-
const
|
|
1108
|
+
const runtimeInvariants = options.runtimeInvariants ?? [];
|
|
1109
|
+
runtimeInvariants.forEach((invariant) => {
|
|
1110
|
+
if (invariant.module === undefined) return;
|
|
1111
|
+
linkedModules.set(root.name, linkedRoot);
|
|
1112
|
+
const linked = getLinkedModule(invariant.module, root.name);
|
|
1113
|
+
linkOrder.splice(linkOrder.indexOf(linked), 1);
|
|
1114
|
+
const definition = definitions.get(linked.visible.get(invariant.name)?.key ?? invariant.name);
|
|
1115
|
+
if (definition) definitions.set(invariant.name, definition);
|
|
1116
|
+
});
|
|
1139
1117
|
linkedRoot.visible.forEach((symbol, name) => {
|
|
1140
1118
|
const definition = definitions.get(symbol.key);
|
|
1141
1119
|
if (definition && symbol.key !== name) definitions.set(name, definition);
|
|
@@ -1158,208 +1136,30 @@ export const createEnvironment = (
|
|
|
1158
1136
|
const declaredConstants = linkedRoot.constants.map((constant) => constant.name);
|
|
1159
1137
|
const variables = linkedRoot.variables;
|
|
1160
1138
|
|
|
1161
|
-
const
|
|
1162
|
-
|
|
1163
|
-
|
|
1164
|
-
|
|
1165
|
-
|
|
1166
|
-
|
|
1167
|
-
|
|
1168
|
-
|
|
1169
|
-
|
|
1170
|
-
|
|
1171
|
-
|
|
1172
|
-
|
|
1173
|
-
|
|
1174
|
-
|
|
1175
|
-
|
|
1176
|
-
|
|
1177
|
-
|
|
1178
|
-
|
|
1179
|
-
|
|
1180
|
-
? definition.params.length
|
|
1181
|
-
: (linkedRoot.constants.find((constant) => constant.name === key)?.arity ??
|
|
1182
|
-
builtins.get(key)?.arity ??
|
|
1183
|
-
0);
|
|
1184
|
-
};
|
|
1185
|
-
const constants = new Map<string, Value>();
|
|
1186
|
-
const operatorKeys = new Set<string>();
|
|
1187
|
-
const setOperator = (key: string, operator: Builtin) => {
|
|
1188
|
-
builtins.set(key, operator);
|
|
1189
|
-
definitions.delete(key);
|
|
1190
|
-
constants.delete(key);
|
|
1191
|
-
operatorKeys.add(key);
|
|
1192
|
-
};
|
|
1193
|
-
config.constants
|
|
1194
|
-
.filter((assignment) => assignment.args === undefined)
|
|
1195
|
-
.forEach((assignment) => {
|
|
1196
|
-
const value = toConstantValue(assignment.value);
|
|
1197
|
-
markNormalized(value);
|
|
1198
|
-
getScopedKeys(assignment).forEach((key) => {
|
|
1199
|
-
const arity = getKeyArity(key);
|
|
1200
|
-
if (arity === 0) constants.set(key, value);
|
|
1201
|
-
else
|
|
1202
|
-
setOperator(key, {
|
|
1203
|
-
kind: "Builtin",
|
|
1204
|
-
name: key,
|
|
1205
|
-
arity,
|
|
1206
|
-
evaluate: () => value,
|
|
1207
|
-
evaluateUnary: undefined,
|
|
1208
|
-
evaluateBinary: undefined,
|
|
1209
|
-
isLazy: true,
|
|
1210
|
-
});
|
|
1211
|
-
});
|
|
1212
|
-
});
|
|
1213
|
-
const tables = new Map<string, { name: string; module?: string; rows: [Value[], Value][] }>();
|
|
1214
|
-
config.constants.forEach((assignment) => {
|
|
1215
|
-
if (assignment.args === undefined) return;
|
|
1216
|
-
const tableKey = `${assignment.module ?? ""}!${assignment.name}`;
|
|
1217
|
-
const table = tables.get(tableKey) ?? {
|
|
1218
|
-
name: assignment.name,
|
|
1219
|
-
module: assignment.module,
|
|
1220
|
-
rows: [],
|
|
1221
|
-
};
|
|
1222
|
-
if (table.rows.length > 0 && table.rows[0][0].length !== assignment.args.length) {
|
|
1223
|
-
throw new TlaConfigError(
|
|
1224
|
-
`The arity of the operator ${assignment.name} is inconsistent in the configuration file.`,
|
|
1225
|
-
);
|
|
1226
|
-
}
|
|
1227
|
-
table.rows.push([assignment.args.map(toValue), toValue(assignment.value)]);
|
|
1228
|
-
tables.set(tableKey, table);
|
|
1229
|
-
});
|
|
1230
|
-
tables.forEach((table) =>
|
|
1231
|
-
getScopedKeys(table).forEach((key) =>
|
|
1232
|
-
setOperator(key, createOperatorTable(table.name, getKeyArity(key), table.rows)),
|
|
1233
|
-
),
|
|
1234
|
-
);
|
|
1235
|
-
const substitutions = new Map(
|
|
1236
|
-
config.substitutions.flatMap((substitution) =>
|
|
1237
|
-
getSubstitutedKeys(substitution).map((key): [string, string] => [
|
|
1238
|
-
key,
|
|
1239
|
-
getRootKey(substitution.target),
|
|
1240
|
-
]),
|
|
1139
|
+
const applied = applyConfig(config, {
|
|
1140
|
+
root: linkedRoot,
|
|
1141
|
+
moduleSymbols: new Map([
|
|
1142
|
+
...standardExports,
|
|
1143
|
+
...[...linkedModules].map((entry): [string, Symbols] => [entry[0], entry[1].visible]),
|
|
1144
|
+
[root.name, linkedRoot.visible],
|
|
1145
|
+
]),
|
|
1146
|
+
definitions,
|
|
1147
|
+
builtins,
|
|
1148
|
+
copySources,
|
|
1149
|
+
operatorConstants: new Map(
|
|
1150
|
+
moduleOperators.flatMap((operator) =>
|
|
1151
|
+
getLinkedModule(operator.module, root.name).constants.flatMap(
|
|
1152
|
+
(constant): [string, Value][] => {
|
|
1153
|
+
const value = operator.constants?.[constant.name];
|
|
1154
|
+
return value === undefined ? [] : [[constant.name, value]];
|
|
1155
|
+
},
|
|
1156
|
+
),
|
|
1157
|
+
),
|
|
1241
1158
|
),
|
|
1242
|
-
|
|
1243
|
-
[...substitutions.keys()].forEach((key) => constants.delete(key));
|
|
1244
|
-
const checkSubstitutionTarget = (name: string, target: string, arity: number | undefined) => {
|
|
1245
|
-
const targetKey = getRootKey(target);
|
|
1246
|
-
const definition = definitions.get(targetKey);
|
|
1247
|
-
const isDefined =
|
|
1248
|
-
definition !== undefined ||
|
|
1249
|
-
builtins.has(targetKey) ||
|
|
1250
|
-
constants.has(targetKey) ||
|
|
1251
|
-
declaredConstants.includes(target) ||
|
|
1252
|
-
variables.includes(target);
|
|
1253
|
-
if (!isDefined) {
|
|
1254
|
-
throw new TlaConfigError(
|
|
1255
|
-
`The configuration file substitutes for ${name} with the undefined identifier ${target}.`,
|
|
1256
|
-
);
|
|
1257
|
-
}
|
|
1258
|
-
if (definition?.kind === "Operator" && definition.params.length !== arity) {
|
|
1259
|
-
throw new TlaConfigError(
|
|
1260
|
-
`The configuration file substitutes for ${name} with ${target} of different number of arguments.`,
|
|
1261
|
-
);
|
|
1262
|
-
}
|
|
1263
|
-
};
|
|
1264
|
-
config.substitutions
|
|
1265
|
-
.filter((substitution) => substitution.module === undefined)
|
|
1266
|
-
.forEach((substitution) => {
|
|
1267
|
-
const name = substitution.name;
|
|
1268
|
-
const target = substitution.target;
|
|
1269
|
-
if (!declaredConstants.includes(name) && !linkedRoot.visible.has(name)) {
|
|
1270
|
-
throw new TlaConfigError(
|
|
1271
|
-
`In the configuration file, the identifier ${name} does not appear in the specification.`,
|
|
1272
|
-
);
|
|
1273
|
-
}
|
|
1274
|
-
if (config.substitutions.some((other) => other.name === target)) {
|
|
1275
|
-
throw new TlaConfigError(
|
|
1276
|
-
`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.`,
|
|
1277
|
-
);
|
|
1278
|
-
}
|
|
1279
|
-
checkSubstitutionTarget(
|
|
1280
|
-
name,
|
|
1281
|
-
target,
|
|
1282
|
-
linkedRoot.constants.find((constant) => constant.name === name)?.arity ??
|
|
1283
|
-
linkedRoot.visible.get(name)?.arity,
|
|
1284
|
-
);
|
|
1285
|
-
});
|
|
1286
|
-
const scopedSubstitutions = config.substitutions.filter(
|
|
1287
|
-
(substitution) => substitution.module !== undefined,
|
|
1288
|
-
);
|
|
1289
|
-
[...moduleSymbols.keys()].forEach((name) => {
|
|
1290
|
-
const inModule = scopedSubstitutions.filter((substitution) => substitution.module === name);
|
|
1291
|
-
inModule.forEach((substitution) => {
|
|
1292
|
-
const symbol = getScopedSymbol(substitution);
|
|
1293
|
-
if (!symbol) return;
|
|
1294
|
-
if (inModule.some((other) => other.name === substitution.target)) {
|
|
1295
|
-
throw new TlaConfigError(
|
|
1296
|
-
`In the configuration file, the identifier ${substitution.target} appears\non the right-hand side of a <- after already appearing on the\nleft-hand side of one.`,
|
|
1297
|
-
);
|
|
1298
|
-
}
|
|
1299
|
-
checkSubstitutionTarget(substitution.name, substitution.target, symbol.arity);
|
|
1300
|
-
});
|
|
1301
|
-
const missing = inModule.find((substitution) => !getScopedSymbol(substitution));
|
|
1302
|
-
if (missing) {
|
|
1303
|
-
throw new TlaConfigError(
|
|
1304
|
-
`In the configuration file, the identifier ${missing.name} does not appear in the specification.`,
|
|
1305
|
-
);
|
|
1306
|
-
}
|
|
1159
|
+
order,
|
|
1307
1160
|
});
|
|
1308
|
-
const
|
|
1309
|
-
|
|
1310
|
-
);
|
|
1311
|
-
if (unknownModule) {
|
|
1312
|
-
throw new TlaConfigError(
|
|
1313
|
-
`In the configuration file, the module name ${unknownModule.module} is not a module in the specification.`,
|
|
1314
|
-
);
|
|
1315
|
-
}
|
|
1316
|
-
const scopedKeys = new Set(
|
|
1317
|
-
[...config.constants, ...config.substitutions]
|
|
1318
|
-
.filter((item) => item.module !== undefined)
|
|
1319
|
-
.flatMap(getScopedKeys),
|
|
1320
|
-
);
|
|
1321
|
-
const getOverride = (
|
|
1322
|
-
key: string,
|
|
1323
|
-
prefix: number,
|
|
1324
|
-
): { key: string; prefix: number } | undefined => {
|
|
1325
|
-
if (scopedKeys.has(key)) return { key, prefix };
|
|
1326
|
-
const copy = copySources.get(key);
|
|
1327
|
-
return copy && getOverride(copy.source, prefix + copy.prefix);
|
|
1328
|
-
};
|
|
1329
|
-
copySources.forEach((copy, key) => {
|
|
1330
|
-
const override = getOverride(copy.source, copy.prefix);
|
|
1331
|
-
const definition = definitions.get(key);
|
|
1332
|
-
if (!override || !definition) return;
|
|
1333
|
-
const params = definition.kind === "Operator" ? definition.params : [];
|
|
1334
|
-
const alias = createLocalAlias(
|
|
1335
|
-
key,
|
|
1336
|
-
override.key,
|
|
1337
|
-
params,
|
|
1338
|
-
params.slice(override.prefix),
|
|
1339
|
-
definition.location,
|
|
1340
|
-
);
|
|
1341
|
-
definitions.set(key, alias);
|
|
1342
|
-
linkedRoot.visible.forEach((symbol, name) => {
|
|
1343
|
-
if (symbol.key === key && name !== key) definitions.set(name, alias);
|
|
1344
|
-
});
|
|
1345
|
-
});
|
|
1346
|
-
moduleOperators.forEach((operator) =>
|
|
1347
|
-
getLinkedModule(operator.module, root.name).constants.forEach((constant) => {
|
|
1348
|
-
const value = operator.constants?.[constant.name];
|
|
1349
|
-
if (value !== undefined) constants.set(constant.name, value);
|
|
1350
|
-
}),
|
|
1351
|
-
);
|
|
1352
|
-
const unassigned = declaredConstants.filter(
|
|
1353
|
-
(name) => !constants.has(name) && !substitutions.has(name) && !operatorKeys.has(name),
|
|
1354
|
-
);
|
|
1355
|
-
if (unassigned.length > 0) {
|
|
1356
|
-
const name =
|
|
1357
|
-
order.getDeclarationOrder("constant").find((constant) => unassigned.includes(constant)) ??
|
|
1358
|
-
unassigned[0];
|
|
1359
|
-
throw new TlaConfigError(
|
|
1360
|
-
`The constant parameter ${name} is not assigned a value by the configuration file.`,
|
|
1361
|
-
);
|
|
1362
|
-
}
|
|
1161
|
+
const constants = applied.constants;
|
|
1162
|
+
const substitutions = applied.substitutions;
|
|
1363
1163
|
|
|
1364
1164
|
if (traceFile !== undefined) {
|
|
1365
1165
|
builtins.forEach((builtin, name) => {
|
|
@@ -1391,6 +1191,7 @@ export const createEnvironment = (
|
|
|
1391
1191
|
variableIndex,
|
|
1392
1192
|
facts,
|
|
1393
1193
|
startupValues: Array.from({ length: facts.ids.size }, (): Value | undefined => undefined),
|
|
1194
|
+
tlcEvalValues: new WeakMap(),
|
|
1394
1195
|
substitutedDefinitions,
|
|
1395
1196
|
instanceParams,
|
|
1396
1197
|
evaluators: new WeakMap(),
|
|
@@ -1454,6 +1255,7 @@ export const createEnvironment = (
|
|
|
1454
1255
|
),
|
|
1455
1256
|
javaOverrides: linkOrder.flatMap((linked) => javaOverrides.get(linked.module.name) ?? []),
|
|
1456
1257
|
moduleOperators,
|
|
1258
|
+
runtimeInvariants,
|
|
1457
1259
|
rootName: root.name,
|
|
1458
1260
|
};
|
|
1459
1261
|
};
|