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
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
import { existsSync, readFileSync, writeFileSync } from "node:fs";
|
|
2
|
+
import { basename, dirname, join } from "node:path";
|
|
3
|
+
import { TlaTypeScriptError } from "../errors";
|
|
4
|
+
|
|
5
|
+
export const writeTypeScriptSpec = async (path: string) => {
|
|
6
|
+
const compiled = (await import("../typescript/compile")).compile(
|
|
7
|
+
readFileSync(path, "utf8"),
|
|
8
|
+
path,
|
|
9
|
+
);
|
|
10
|
+
const header = `\\* Generated by tla-ts from ${basename(path)}. Edit ${basename(path)} instead.`;
|
|
11
|
+
const specPath = join(dirname(path), `${compiled.name}.tla`);
|
|
12
|
+
const configPath = join(dirname(path), `${compiled.name}.cfg`);
|
|
13
|
+
for (const outputPath of [specPath, configPath]) {
|
|
14
|
+
if (existsSync(outputPath) && !readFileSync(outputPath, "utf8").startsWith(header)) {
|
|
15
|
+
throw new TlaTypeScriptError(
|
|
16
|
+
`${outputPath} already exists, and tla-ts didn't generate it from ${path}`,
|
|
17
|
+
);
|
|
18
|
+
}
|
|
19
|
+
}
|
|
20
|
+
writeFileSync(specPath, `${header}\n${compiled.source}\n`);
|
|
21
|
+
writeFileSync(configPath, `${header}\n${compiled.config}\n`);
|
|
22
|
+
return specPath;
|
|
23
|
+
};
|
package/src/cli/xml-exporter.ts
CHANGED
|
@@ -13,10 +13,9 @@ import {
|
|
|
13
13
|
reportMissingModules174,
|
|
14
14
|
toLibraryPath,
|
|
15
15
|
} from "./shared";
|
|
16
|
+
import { getBold } from "./tlc-usage";
|
|
16
17
|
|
|
17
|
-
// The usage that XMLExporter.printUsage prints with UsageGenerator.
|
|
18
18
|
const XML_EXPORT_USAGE = (() => {
|
|
19
|
-
const bold = (text: string) => `\x1b[1m${text}\x1b[0m`;
|
|
20
19
|
const options = [
|
|
21
20
|
["-I", "Include; use given directory path to resolve module dependencies."],
|
|
22
21
|
["-help", "Print this usage information."],
|
|
@@ -38,24 +37,24 @@ const XML_EXPORT_USAGE = (() => {
|
|
|
38
37
|
];
|
|
39
38
|
return [
|
|
40
39
|
"",
|
|
41
|
-
|
|
40
|
+
getBold("NAME"),
|
|
42
41
|
"",
|
|
43
42
|
"\ttla2sany.xml.XMLExporter - Emit SANY's parse tree as XML - Version 2.2 created 08 July 2020",
|
|
44
43
|
"",
|
|
45
44
|
"",
|
|
46
|
-
|
|
45
|
+
getBold("SYNOPSIS"),
|
|
47
46
|
"",
|
|
48
|
-
`\t${
|
|
47
|
+
`\t${getBold("tla2sany.xml.XMLExporter")} [${getBold("-Iortu")}] [${getBold("-help")}] FILE`,
|
|
49
48
|
"",
|
|
50
|
-
|
|
49
|
+
getBold("DESCRIPTION"),
|
|
51
50
|
"",
|
|
52
51
|
"\tGiven a TLA+ file, parse that file with SANY then translate the module's semantic parse tree to XML, including all the modules depended on. The XML is printed to stdout and its output format is given by an XML Schema file (.xsd) found at https://proofs.tlapl.us/doc/web/sany.xsd.",
|
|
53
52
|
"",
|
|
54
|
-
|
|
53
|
+
getBold("OPTIONS"),
|
|
55
54
|
"",
|
|
56
|
-
...options.map(([flag, description]) => `\t${
|
|
55
|
+
...options.map(([flag, description]) => `\t${getBold(flag)}\n\t\t${description}`),
|
|
57
56
|
"",
|
|
58
|
-
|
|
57
|
+
getBold("TIPS"),
|
|
59
58
|
"",
|
|
60
59
|
...tips.flatMap((tip) => [`\t${tip}`, ""]),
|
|
61
60
|
"",
|
|
@@ -67,7 +66,6 @@ const printXmlExportUsageError = (message: string) => {
|
|
|
67
66
|
return XML_EXPORT_EXIT_CODE.argsParsingFailure;
|
|
68
67
|
};
|
|
69
68
|
|
|
70
|
-
// XMLExporter.run.
|
|
71
69
|
const writeXml = (specification: SanySpecification, options: XmlExportOptions) => {
|
|
72
70
|
try {
|
|
73
71
|
process.stdout.write(exportSanyXml(specification, options));
|
|
@@ -85,51 +83,49 @@ const writeXml = (specification: SanySpecification, options: XmlExportOptions) =
|
|
|
85
83
|
}
|
|
86
84
|
};
|
|
87
85
|
|
|
86
|
+
const ARGUMENT_ERRORS = {
|
|
87
|
+
"no-file": { message: "at least one .tla file must be given", line174: 59 },
|
|
88
|
+
"missing-include": {
|
|
89
|
+
message: "the -I flag must be followed by a directory and at least one .tla file",
|
|
90
|
+
line174: 71,
|
|
91
|
+
},
|
|
92
|
+
"several-files": { message: "Only one TLA file to check allowed!", line174: 83 },
|
|
93
|
+
};
|
|
94
|
+
|
|
88
95
|
interface XmlExportArgs {
|
|
89
96
|
flags: Set<string>;
|
|
90
97
|
includes: string[];
|
|
91
|
-
error:
|
|
98
|
+
error: keyof typeof ARGUMENT_ERRORS | undefined;
|
|
92
99
|
}
|
|
93
100
|
|
|
94
|
-
// XMLExporter reads the flags before the last argument, which names the module, and skips an
|
|
95
|
-
// argument it does not know, which then counts as another module.
|
|
96
101
|
const parseXmlExportArgs = (args: string[], flagNames: Set<string>): XmlExportArgs => {
|
|
97
102
|
const parsed: XmlExportArgs = { flags: new Set(), includes: [], error: undefined };
|
|
98
|
-
|
|
103
|
+
if (args.length === 0) return { ...parsed, error: "no-file" };
|
|
104
|
+
let lastFlagIndex = -1;
|
|
99
105
|
for (let index = 0; index < args.length - 1; index++) {
|
|
100
106
|
if (flagNames.has(args[index])) {
|
|
101
107
|
parsed.flags.add(args[index]);
|
|
102
|
-
|
|
108
|
+
lastFlagIndex = index;
|
|
103
109
|
continue;
|
|
104
110
|
}
|
|
105
111
|
if (args[index] !== "-I") continue;
|
|
106
112
|
index++;
|
|
107
113
|
if (index > args.length - 2) return { ...parsed, error: "missing-include" };
|
|
108
114
|
parsed.includes.push(args[index]);
|
|
109
|
-
|
|
115
|
+
lastFlagIndex = index;
|
|
110
116
|
}
|
|
111
|
-
return
|
|
117
|
+
return lastFlagIndex === args.length - 2 ? parsed : { ...parsed, error: "several-files" };
|
|
112
118
|
};
|
|
113
119
|
|
|
114
120
|
export const exportXml = (args: string[]) => {
|
|
115
|
-
if (args.length === 0) return printXmlExportUsageError("at least one .tla file must be given");
|
|
116
121
|
const parsed = parseXmlExportArgs(args, new Set(["-o", "-t", "-r", "-u"]));
|
|
117
|
-
if (parsed.error
|
|
118
|
-
return printXmlExportUsageError(
|
|
119
|
-
"the -I flag must be followed by a directory and at least one .tla file",
|
|
120
|
-
);
|
|
121
|
-
}
|
|
122
|
-
if (parsed.error === "several-files") {
|
|
123
|
-
return printXmlExportUsageError("Only one TLA file to check allowed!");
|
|
124
|
-
}
|
|
122
|
+
if (parsed.error) return printXmlExportUsageError(ARGUMENT_ERRORS[parsed.error].message);
|
|
125
123
|
const name = args[args.length - 1];
|
|
126
124
|
if (name === "-help") {
|
|
127
125
|
process.stdout.write(XML_EXPORT_USAGE);
|
|
128
126
|
return EXIT_STATUS.success;
|
|
129
127
|
}
|
|
130
128
|
const fileName = name.endsWith(".tla") ? name : `${name}.tla`;
|
|
131
|
-
// SANY looks for each module in the working directory, then in the -I directories, which
|
|
132
|
-
// XMLExporter passes in place of TLA-Library, then among its standard modules.
|
|
133
129
|
const directories = [".", ...parsed.includes];
|
|
134
130
|
const path = directories.map((directory) => resolve(directory, fileName)).find(existsSync);
|
|
135
131
|
if (path === undefined && !SANY_STANDARD_MODULES.has(fileName.slice(0, -".tla".length))) {
|
|
@@ -152,8 +148,6 @@ export const exportXml = (args: string[]) => {
|
|
|
152
148
|
});
|
|
153
149
|
};
|
|
154
150
|
|
|
155
|
-
// TLC 1.7.4's XMLExporter.main throws an exception for an argument it can't take or a
|
|
156
|
-
// specification without a root module.
|
|
157
151
|
const printXmlExporterException = (exception: string, line: number) => {
|
|
158
152
|
console.error(
|
|
159
153
|
`Exception in thread "main" ${exception}\n\tat tla2sany.xml.XMLExporter.main(XMLExporter.java:${line})`,
|
|
@@ -161,32 +155,16 @@ const printXmlExporterException = (exception: string, line: number) => {
|
|
|
161
155
|
return XML_EXPORT_EXIT_CODE.uncaughtException;
|
|
162
156
|
};
|
|
163
157
|
|
|
164
|
-
// TLC 1.7.4's XMLExporter.main, which takes only -o, as it can't validate the XML without
|
|
165
|
-
// fetching its schema, and -I, and exports a specification that SANY finds errors in.
|
|
166
158
|
export const exportXml174 = (args: string[], jar: string | undefined) => {
|
|
167
|
-
if (args.length === 0) {
|
|
168
|
-
return printXmlExporterException(
|
|
169
|
-
"java.lang.IllegalArgumentException: at least one .tla file must be given",
|
|
170
|
-
59,
|
|
171
|
-
);
|
|
172
|
-
}
|
|
173
159
|
const parsed = parseXmlExportArgs(args, new Set(["-o"]));
|
|
174
|
-
if (parsed.error
|
|
175
|
-
return printXmlExporterException(
|
|
176
|
-
"java.lang.IllegalArgumentException: the -I flag must be followed by a directory and at least one .tla file",
|
|
177
|
-
71,
|
|
178
|
-
);
|
|
179
|
-
}
|
|
180
|
-
if (parsed.error === "several-files") {
|
|
160
|
+
if (parsed.error) {
|
|
181
161
|
return printXmlExporterException(
|
|
182
|
-
|
|
183
|
-
|
|
162
|
+
`java.lang.IllegalArgumentException: ${ARGUMENT_ERRORS[parsed.error].message}`,
|
|
163
|
+
ARGUMENT_ERRORS[parsed.error].line174,
|
|
184
164
|
);
|
|
185
165
|
}
|
|
186
166
|
const name = args[args.length - 1];
|
|
187
167
|
const fileName = `${name.replace(/\.tla$/i, "")}.tla`;
|
|
188
|
-
// SimpleFilenameToStream looks for a module in the working directory, then in the -I
|
|
189
|
-
// directories, or the root directory when there are none, then among the standard modules.
|
|
190
168
|
const libraries = (parsed.includes.length === 0 ? ["/"] : parsed.includes).map(toLibraryPath);
|
|
191
169
|
const directories = [".", ...libraries];
|
|
192
170
|
const printMissingFile = (moduleFileName: string) =>
|
package/src/cli.ts
CHANGED
|
@@ -2,7 +2,6 @@
|
|
|
2
2
|
import { enableCompileCache } from "node:module";
|
|
3
3
|
import { join } from "node:path";
|
|
4
4
|
|
|
5
|
-
// When tla-ts runs in place of java, it keeps its temporary files where Java would.
|
|
6
5
|
const JAVA_TMPDIR_PROPERTY = "-Djava.io.tmpdir=";
|
|
7
6
|
const javaTmpdir = process.argv
|
|
8
7
|
.find((arg) => arg.startsWith(JAVA_TMPDIR_PROPERTY))
|
package/src/codegen.ts
CHANGED
|
@@ -1,10 +1,19 @@
|
|
|
1
|
-
import { getChildren, isLocallyResolved, type Expression } from "./ast";
|
|
1
|
+
import { getChildren, getReferencedName, isLocallyResolved, type Expression } from "./ast";
|
|
2
2
|
import {
|
|
3
3
|
bindValue,
|
|
4
|
-
|
|
4
|
+
expectBooleanBody,
|
|
5
|
+
expectImplication,
|
|
6
|
+
isEquivalent,
|
|
7
|
+
negate,
|
|
5
8
|
findGlobalName,
|
|
6
9
|
createConditionError,
|
|
7
10
|
createJunctionError,
|
|
11
|
+
createNoChoiceError,
|
|
12
|
+
expectFilterPredicate,
|
|
13
|
+
getChoiceElements,
|
|
14
|
+
getFunctionBuilder,
|
|
15
|
+
getLazyFilter,
|
|
16
|
+
isKeptLazy,
|
|
8
17
|
getDomainOperator,
|
|
9
18
|
getSubsetOperator,
|
|
10
19
|
getEvaluator,
|
|
@@ -16,7 +25,7 @@ import {
|
|
|
16
25
|
resolveGlobalOperator,
|
|
17
26
|
expectFunction,
|
|
18
27
|
toKeepLazyContext,
|
|
19
|
-
|
|
28
|
+
toNextContext,
|
|
20
29
|
createUnassignedError,
|
|
21
30
|
getSortedFields,
|
|
22
31
|
hasDuplicateFields,
|
|
@@ -25,12 +34,20 @@ import {
|
|
|
25
34
|
type Evaluator,
|
|
26
35
|
} from "./evaluate";
|
|
27
36
|
import {
|
|
37
|
+
addBoundedElement,
|
|
28
38
|
applyFunction,
|
|
29
39
|
createEnumeratedSet,
|
|
40
|
+
createNormalizedSet,
|
|
41
|
+
createSortedFunction,
|
|
30
42
|
createSortedRecord,
|
|
31
43
|
createTuple,
|
|
32
44
|
createWrittenRecord,
|
|
45
|
+
getCardinality,
|
|
46
|
+
getFunctionDomain,
|
|
47
|
+
isBeyondSetBound,
|
|
48
|
+
isReducibleSet,
|
|
33
49
|
isTlcInteger,
|
|
50
|
+
toFiniteSet,
|
|
34
51
|
valuesEqual,
|
|
35
52
|
type Value,
|
|
36
53
|
} from "./values";
|
|
@@ -64,10 +81,16 @@ const GENERATED_KINDS = new Set([
|
|
|
64
81
|
"Unchanged",
|
|
65
82
|
"Forall",
|
|
66
83
|
"Exists",
|
|
84
|
+
"Choose",
|
|
85
|
+
"SetFilter",
|
|
86
|
+
"FunctionConstruction",
|
|
67
87
|
]);
|
|
68
88
|
|
|
69
89
|
const createGeneratedHelpers = () => ({
|
|
70
|
-
|
|
90
|
+
implication: expectImplication,
|
|
91
|
+
negate,
|
|
92
|
+
equivalent: isEquivalent,
|
|
93
|
+
body: expectBooleanBody,
|
|
71
94
|
condition: (value: Value, expression: Expression) => {
|
|
72
95
|
if (typeof value !== "boolean") throw createConditionError(expression, value);
|
|
73
96
|
return value;
|
|
@@ -84,19 +107,23 @@ const createGeneratedHelpers = () => ({
|
|
|
84
107
|
writtenRecord: createWrittenRecord,
|
|
85
108
|
equal: valuesEqual,
|
|
86
109
|
enumerate: getQuantifierElements,
|
|
110
|
+
choiceElements: getChoiceElements,
|
|
111
|
+
noChoice: (expression: Expression & { kind: "Choose" }): never => {
|
|
112
|
+
throw createNoChoiceError(expression);
|
|
113
|
+
},
|
|
114
|
+
filterPredicate: expectFilterPredicate,
|
|
115
|
+
isReducible: isReducibleSet,
|
|
116
|
+
finiteElements: (set: Value) => toFiniteSet(set).elements,
|
|
117
|
+
addBounded: addBoundedElement,
|
|
118
|
+
normalizedSet: createNormalizedSet,
|
|
119
|
+
isBeyondBound: isBeyondSetBound,
|
|
120
|
+
cardinality: getCardinality,
|
|
121
|
+
functionDomain: getFunctionDomain,
|
|
122
|
+
sortedFunction: createSortedFunction,
|
|
87
123
|
unassigned: (name: string, expression: Expression): never => {
|
|
88
124
|
throw createUnassignedError(name, expression);
|
|
89
125
|
},
|
|
90
|
-
|
|
91
|
-
throw createPrimeOutsideActionError(expression);
|
|
92
|
-
},
|
|
93
|
-
prime: (context: Context): Context => ({
|
|
94
|
-
environment: context.environment,
|
|
95
|
-
scope: context.scope,
|
|
96
|
-
state: context.next,
|
|
97
|
-
next: undefined,
|
|
98
|
-
isKeepLazy: context.isKeepLazy,
|
|
99
|
-
}),
|
|
126
|
+
prime: toNextContext,
|
|
100
127
|
keepLazyContext: toKeepLazyContext,
|
|
101
128
|
extend: (context: Context, names: string[], values: Value[]): Context => ({
|
|
102
129
|
environment: context.environment,
|
|
@@ -110,11 +137,9 @@ const createGeneratedHelpers = () => ({
|
|
|
110
137
|
}),
|
|
111
138
|
});
|
|
112
139
|
|
|
113
|
-
|
|
114
|
-
value: undefined as ReturnType<typeof createGeneratedHelpers> | undefined,
|
|
115
|
-
};
|
|
140
|
+
let generatedHelpers: ReturnType<typeof createGeneratedHelpers> | undefined;
|
|
116
141
|
|
|
117
|
-
|
|
142
|
+
let isCodeGenerationAllowed: boolean | undefined;
|
|
118
143
|
|
|
119
144
|
// Hosts such as Cloudflare Workers, or a page whose CSP lacks 'unsafe-eval', throw an EvalError.
|
|
120
145
|
const getIsCodeGenerationAllowed = () => {
|
|
@@ -134,32 +159,32 @@ const addReference = (generator: Generator, value: unknown) => {
|
|
|
134
159
|
const createLocal = (generator: Generator) => `local${generator.counter++}`;
|
|
135
160
|
|
|
136
161
|
const getFreeNames = (expression: Expression, names = new Set<string>()) => {
|
|
137
|
-
|
|
138
|
-
if (
|
|
162
|
+
const name = getReferencedName(expression);
|
|
163
|
+
if (name !== undefined) names.add(name);
|
|
139
164
|
getChildren(expression).forEach((child) => getFreeNames(child, names));
|
|
140
165
|
return names;
|
|
141
166
|
};
|
|
142
167
|
|
|
143
|
-
const
|
|
144
|
-
const evaluator = addReference(generator, getEvaluator(expression, generator.environment));
|
|
168
|
+
const getDelegateContext = (generator: Generator, expression: Expression, frame: Frame) => {
|
|
145
169
|
const freeNames = getFreeNames(expression);
|
|
146
170
|
const captured = [...frame.locals].filter(([name]) => freeNames.has(name));
|
|
147
|
-
if (captured.length === 0) return
|
|
171
|
+
if (captured.length === 0) return frame.context;
|
|
148
172
|
const names = addReference(
|
|
149
173
|
generator,
|
|
150
174
|
captured.map(([name]) => name),
|
|
151
175
|
);
|
|
152
|
-
return
|
|
176
|
+
return `extend(${frame.context}, ${names}, [${captured.map(([, local]) => local).join(", ")}])`;
|
|
153
177
|
};
|
|
154
178
|
|
|
155
|
-
const
|
|
179
|
+
const generateDelegate = (generator: Generator, expression: Expression, frame: Frame) =>
|
|
180
|
+
`${addReference(generator, getEvaluator(expression, generator.environment))}(${getDelegateContext(generator, expression, frame)})`;
|
|
181
|
+
|
|
182
|
+
const generateHelper = (
|
|
156
183
|
generator: Generator,
|
|
157
|
-
expression: Expression & { kind: "Forall" | "Exists" },
|
|
158
184
|
frame: Frame,
|
|
185
|
+
build: (bodyFrame: Frame) => string,
|
|
159
186
|
) => {
|
|
160
|
-
const
|
|
161
|
-
const description = JSON.stringify(isForall ? "the body of \\A" : "the body of \\E");
|
|
162
|
-
const name = `quantifier${generator.counter++}`;
|
|
187
|
+
const name = `helper${generator.counter++}`;
|
|
163
188
|
const outerLocals = [...frame.locals.values()];
|
|
164
189
|
const bodyFrame = {
|
|
165
190
|
context: "context",
|
|
@@ -168,32 +193,106 @@ const generateQuantifier = (
|
|
|
168
193
|
isPrimed: false,
|
|
169
194
|
locals: new Map(frame.locals),
|
|
170
195
|
};
|
|
171
|
-
const lists = expression.bounds.map(() => createLocal(generator));
|
|
172
|
-
const declarations = expression.bounds.map(
|
|
173
|
-
(bound, index) =>
|
|
174
|
-
`const ${lists[index]} = enumerate(${generateExpression(generator, bound.set, bodyFrame)}, ${addReference(generator, bound.set)}, ${JSON.stringify(generator.environment.runtime.version)});`,
|
|
175
|
-
);
|
|
176
|
-
const elements = expression.bounds.map((bound) => {
|
|
177
|
-
const local = createLocal(generator);
|
|
178
|
-
if (bound.pattern.kind === "Name") bodyFrame.locals.set(bound.pattern.name, local);
|
|
179
|
-
return local;
|
|
180
|
-
});
|
|
181
|
-
const test = `if (bool(${generateExpression(generator, expression.body, bodyFrame)}, ${description}) !== ${isForall}) return ${!isForall};`;
|
|
182
|
-
// enumerate returns an array, or an interval, which has a low end, to step through.
|
|
183
|
-
const loops = elements.reduce((code, element, index) => {
|
|
184
|
-
const position = createLocal(generator);
|
|
185
|
-
const low = createLocal(generator);
|
|
186
|
-
const size = createLocal(generator);
|
|
187
|
-
const list = lists[index];
|
|
188
|
-
return `for (let ${position} = 0, ${low} = ${list}.low, ${size} = ${low} === undefined ? ${list}.length : ${list}.high - ${low} + 1; ${position} < ${size}; ${position}++) { const ${element} = ${low} === undefined ? ${list}[${position}] : ${low} + ${position}; ${code} }`;
|
|
189
|
-
}, test);
|
|
190
196
|
const parameters = outerLocals.map((local) => `, ${local}`).join("");
|
|
191
197
|
generator.helpers.push(
|
|
192
|
-
`function ${name}(context, state, next${parameters}) { let primed; let applied; ${
|
|
198
|
+
`function ${name}(context, state, next${parameters}) { let primed; let applied; ${build(bodyFrame)} }`,
|
|
193
199
|
);
|
|
194
200
|
return `${name}(${frame.context}, ${frame.state}, ${frame.isPrimed ? "undefined" : frame.next}${parameters})`;
|
|
195
201
|
};
|
|
196
202
|
|
|
203
|
+
const generateLoop = (generator: Generator, list: string, element: string, code: string) => {
|
|
204
|
+
const position = createLocal(generator);
|
|
205
|
+
const low = createLocal(generator);
|
|
206
|
+
const size = createLocal(generator);
|
|
207
|
+
return `for (let ${position} = 0, ${low} = ${list}.low, ${size} = ${low} === undefined ? ${list}.length : ${list}.high - ${low} + 1; ${position} < ${size}; ${position}++) { const ${element} = ${low} === undefined ? ${list}[${position}] : ${low} + ${position}; ${code} }`;
|
|
208
|
+
};
|
|
209
|
+
|
|
210
|
+
const generateQuantifier = (
|
|
211
|
+
generator: Generator,
|
|
212
|
+
expression: Expression & { kind: "Forall" | "Exists" },
|
|
213
|
+
frame: Frame,
|
|
214
|
+
) => {
|
|
215
|
+
const isForall = expression.kind === "Forall";
|
|
216
|
+
return generateHelper(generator, frame, (bodyFrame) => {
|
|
217
|
+
const lists = expression.bounds.map(() => createLocal(generator));
|
|
218
|
+
const declarations = expression.bounds.map((bound, index) =>
|
|
219
|
+
index > 0 && expression.bounds[index - 1].set === bound.set
|
|
220
|
+
? `const ${lists[index]} = ${lists[index - 1]};`
|
|
221
|
+
: `const ${lists[index]} = enumerate(${generateExpression(generator, bound.set, bodyFrame)}, ${addReference(generator, bound.set)}, ${JSON.stringify(generator.environment.runtime.version)});`,
|
|
222
|
+
);
|
|
223
|
+
const elements = expression.bounds.map((bound) => {
|
|
224
|
+
const local = createLocal(generator);
|
|
225
|
+
if (bound.pattern.kind === "Name") bodyFrame.locals.set(bound.pattern.name, local);
|
|
226
|
+
return local;
|
|
227
|
+
});
|
|
228
|
+
const test = `if (body(${generateExpression(generator, expression.body, bodyFrame)}, ${addReference(generator, expression)}) !== ${isForall}) return ${!isForall};`;
|
|
229
|
+
const loops = elements.reduce(
|
|
230
|
+
(code, element, index) => generateLoop(generator, lists[index], element, code),
|
|
231
|
+
test,
|
|
232
|
+
);
|
|
233
|
+
return `${declarations.join(" ")} ${loops} return ${isForall};`;
|
|
234
|
+
});
|
|
235
|
+
};
|
|
236
|
+
|
|
237
|
+
const generateChoose = (
|
|
238
|
+
generator: Generator,
|
|
239
|
+
expression: Expression & { kind: "Choose" },
|
|
240
|
+
set: Expression,
|
|
241
|
+
name: string,
|
|
242
|
+
frame: Frame,
|
|
243
|
+
) =>
|
|
244
|
+
generateHelper(generator, frame, (bodyFrame) => {
|
|
245
|
+
const list = createLocal(generator);
|
|
246
|
+
const element = createLocal(generator);
|
|
247
|
+
const node = addReference(generator, expression);
|
|
248
|
+
const elements = `choiceElements(${generateExpression(generator, set, bodyFrame)}, ${node}, ${addReference(generator, set)}, ${JSON.stringify(generator.environment.runtime.version)})`;
|
|
249
|
+
bodyFrame.locals.set(name, element);
|
|
250
|
+
const test = `if (body(${generateExpression(generator, expression.body, bodyFrame)}, ${node})) return ${element};`;
|
|
251
|
+
return `const ${list} = ${elements}; ${generateLoop(generator, list, element, test)} return noChoice(${node});`;
|
|
252
|
+
});
|
|
253
|
+
|
|
254
|
+
const generateSetFilter = (
|
|
255
|
+
generator: Generator,
|
|
256
|
+
expression: Expression & { kind: "SetFilter" },
|
|
257
|
+
name: string,
|
|
258
|
+
frame: Frame,
|
|
259
|
+
) =>
|
|
260
|
+
generateHelper(generator, frame, (bodyFrame) => {
|
|
261
|
+
const base = createLocal(generator);
|
|
262
|
+
const list = createLocal(generator);
|
|
263
|
+
const kept = createLocal(generator);
|
|
264
|
+
const element = createLocal(generator);
|
|
265
|
+
const node = addReference(generator, expression);
|
|
266
|
+
const filterLazily = addReference(generator, getLazyFilter(expression, generator.environment));
|
|
267
|
+
const lazy = `if (!isReducible(${base})) return ${filterLazily}(${base}, ${getDelegateContext(generator, expression, bodyFrame)});`;
|
|
268
|
+
const set = generateExpression(generator, expression.bound.set, bodyFrame);
|
|
269
|
+
bodyFrame.locals.set(name, element);
|
|
270
|
+
const test = `if (filterPredicate(${generateExpression(generator, expression.predicate, bodyFrame)}, ${node})) addBounded(${kept}, ${element});`;
|
|
271
|
+
return `const ${base} = ${set}; ${lazy} const ${list} = ${base}.kind === "Interval" ? ${base} : finiteElements(${base}); const ${kept} = []; ${generateLoop(generator, list, element, test)} return normalizedSet(${kept});`;
|
|
272
|
+
});
|
|
273
|
+
|
|
274
|
+
const generateFunctionConstruction = (
|
|
275
|
+
generator: Generator,
|
|
276
|
+
expression: Expression & { kind: "FunctionConstruction" },
|
|
277
|
+
name: string,
|
|
278
|
+
frame: Frame,
|
|
279
|
+
) =>
|
|
280
|
+
generateHelper(generator, frame, (bodyFrame) => {
|
|
281
|
+
const domain = createLocal(generator);
|
|
282
|
+
const isBeyond = createLocal(generator);
|
|
283
|
+
const keys = createLocal(generator);
|
|
284
|
+
const values = createLocal(generator);
|
|
285
|
+
const element = createLocal(generator);
|
|
286
|
+
const value = createLocal(generator);
|
|
287
|
+
const builder = addReference(generator, getFunctionBuilder(expression, generator.environment));
|
|
288
|
+
const builtContext = getDelegateContext(generator, expression, bodyFrame);
|
|
289
|
+
const built = `if (context.isKeepLazy || !isReducible(${domain})) return ${builder}.build(${domain}, ${builtContext});`;
|
|
290
|
+
const set = generateExpression(generator, expression.bounds[0].set, bodyFrame);
|
|
291
|
+
bodyFrame.locals.set(name, element);
|
|
292
|
+
const store = `const ${value} = ${generateExpression(generator, expression.body, bodyFrame)}; if (!${isBeyond}) ${values}.push(${value});`;
|
|
293
|
+
return `const ${domain} = ${set}; ${built} const ${isBeyond} = isBeyondBound(${domain}); const ${keys} = ${isBeyond} ? ${domain} : functionDomain(${domain}); if (${isBeyond}) cardinality(${domain}); const ${values} = []; ${generateLoop(generator, keys, element, store)} return ${isBeyond} ? ${builder}.createLazy(${domain}, ${builtContext}) : sortedFunction(${keys}, ${values});`;
|
|
294
|
+
});
|
|
295
|
+
|
|
197
296
|
const generateApply = (
|
|
198
297
|
generator: Generator,
|
|
199
298
|
expression: Expression & { kind: "Apply" },
|
|
@@ -203,7 +302,14 @@ const generateApply = (
|
|
|
203
302
|
if (expression.operator === "=>") {
|
|
204
303
|
const left = generateExpression(generator, args[0], frame);
|
|
205
304
|
const right = generateExpression(generator, args[1], frame);
|
|
206
|
-
|
|
305
|
+
const reference = addReference(generator, expression);
|
|
306
|
+
return `(implication(${left}, ${reference}, "P") ? implication(${right}, ${reference}, "Q") : true)`;
|
|
307
|
+
}
|
|
308
|
+
if (expression.operator === "~" && args.length === 1) {
|
|
309
|
+
return `negate(${generateExpression(generator, args[0], frame)}, ${addReference(generator, expression)})`;
|
|
310
|
+
}
|
|
311
|
+
if (expression.operator === "<=>") {
|
|
312
|
+
return `equivalent(${generateExpression(generator, args[0], frame)}, ${generateExpression(generator, args[1], frame)}, ${addReference(generator, expression)})`;
|
|
207
313
|
}
|
|
208
314
|
if (isLocallyResolved(expression)) return generateDelegate(generator, expression, frame);
|
|
209
315
|
const builtin = resolveGlobalOperator(expression.operator, generator.environment);
|
|
@@ -233,7 +339,6 @@ const generateApply = (
|
|
|
233
339
|
return generateDelegate(generator, expression, frame);
|
|
234
340
|
};
|
|
235
341
|
|
|
236
|
-
// Whether an expression only reads values, so that it constructs no function whatever the control.
|
|
237
342
|
const isConstructionFree = (
|
|
238
343
|
expression: Expression,
|
|
239
344
|
frame: Frame,
|
|
@@ -259,8 +364,6 @@ const isConstructionFree = (
|
|
|
259
364
|
}
|
|
260
365
|
};
|
|
261
366
|
|
|
262
|
-
// Whether the generated code evaluates an expression only in the context its frame names. A primed
|
|
263
|
-
// expression doesn't, since it shares the generated function's primed context.
|
|
264
367
|
const isReadOnly = (expression: Expression): boolean => {
|
|
265
368
|
switch (expression.kind) {
|
|
266
369
|
case "Identifier":
|
|
@@ -281,9 +384,7 @@ const generateExpression = (generator: Generator, expression: Expression, frame:
|
|
|
281
384
|
generateExpression(generator, node, nodeFrame);
|
|
282
385
|
switch (expression.kind) {
|
|
283
386
|
case "Number":
|
|
284
|
-
if (isTlcInteger(expression.value))
|
|
285
|
-
return String(expression.value);
|
|
286
|
-
}
|
|
387
|
+
if (isTlcInteger(expression.value)) return String(expression.value);
|
|
287
388
|
return generateDelegate(generator, expression, frame);
|
|
288
389
|
case "String":
|
|
289
390
|
return JSON.stringify(expression.value);
|
|
@@ -304,6 +405,7 @@ const generateExpression = (generator: Generator, expression: Expression, frame:
|
|
|
304
405
|
return generateApply(generator, expression, frame);
|
|
305
406
|
case "And":
|
|
306
407
|
case "Or": {
|
|
408
|
+
if (expression.operands.length === 0) return String(expression.kind === "And");
|
|
307
409
|
const node = addReference(generator, expression);
|
|
308
410
|
const operator = expression.kind === "And" ? " && " : " || ";
|
|
309
411
|
return `(${expression.operands.map((operand, index) => `junct(${generate(operand)}, ${node}, ${index})`).join(operator)})`;
|
|
@@ -312,7 +414,6 @@ const generateExpression = (generator: Generator, expression: Expression, frame:
|
|
|
312
414
|
return `(condition(${generate(expression.condition)}, ${addReference(generator, expression)}) ? ${generate(expression.consequent)} : ${generate(expression.alternative)})`;
|
|
313
415
|
case "FunctionApplication": {
|
|
314
416
|
keepLazy(expression.function);
|
|
315
|
-
// The interpreter evaluates a function that may construct one with EvalControl.KeepLazy.
|
|
316
417
|
const keepLazyFrame = { ...frame, context: `keepLazyContext(${frame.context})` };
|
|
317
418
|
const evaluatedFunction = isConstructionFree(
|
|
318
419
|
expression.function,
|
|
@@ -323,8 +424,6 @@ const generateExpression = (generator: Generator, expression: Expression, frame:
|
|
|
323
424
|
: isReadOnly(expression.function)
|
|
324
425
|
? generate(expression.function, keepLazyFrame)
|
|
325
426
|
: generateDelegate(generator, expression.function, keepLazyFrame);
|
|
326
|
-
// Tool#evalAppl checks that it applies a function before it evaluates the argument. The check
|
|
327
|
-
// is written out, as calling expectFunction for each application costs more.
|
|
328
427
|
const functionCode = `(applied = ${evaluatedFunction}, typeof applied === "object" && (applied.kind === "Function" || applied.kind === "LazyFunction") ? applied : expectFunction(applied, ${addReference(generator, expression)}))`;
|
|
329
428
|
const describeMissing = getMissingArgumentDescriber(generator.environment.runtime.version);
|
|
330
429
|
const error = describeMissing ? `, ${addReference(generator, describeMissing)}` : "";
|
|
@@ -352,18 +451,15 @@ const generateExpression = (generator: Generator, expression: Expression, frame:
|
|
|
352
451
|
return `tuple([${expression.elements.map((element) => generate(element)).join(", ")}])`;
|
|
353
452
|
case "SetEnumeration":
|
|
354
453
|
return `set([${expression.elements.map((element) => generate(element)).join(", ")}])`;
|
|
355
|
-
case "Prime":
|
|
356
|
-
|
|
357
|
-
|
|
358
|
-
const primed = {
|
|
454
|
+
case "Prime":
|
|
455
|
+
if (frame.isPrimed) return generateDelegate(generator, expression, frame);
|
|
456
|
+
return generate(expression.expression, {
|
|
359
457
|
context: `(primed ??= prime(${frame.context}))`,
|
|
360
458
|
state: frame.next,
|
|
361
459
|
next: "undefined",
|
|
362
460
|
isPrimed: true,
|
|
363
461
|
locals: frame.locals,
|
|
364
|
-
};
|
|
365
|
-
return `(${frame.next} === undefined ? primeOutsideAction(${node}) : ${generate(expression.expression, primed)})`;
|
|
366
|
-
}
|
|
462
|
+
});
|
|
367
463
|
case "Unchanged": {
|
|
368
464
|
const primed = generate({
|
|
369
465
|
kind: "Prime",
|
|
@@ -378,6 +474,34 @@ const generateExpression = (generator: Generator, expression: Expression, frame:
|
|
|
378
474
|
return generateQuantifier(generator, expression, frame);
|
|
379
475
|
}
|
|
380
476
|
return generateDelegate(generator, expression, frame);
|
|
477
|
+
case "Choose":
|
|
478
|
+
if (expression.set && expression.pattern.kind === "Name") {
|
|
479
|
+
return generateChoose(
|
|
480
|
+
generator,
|
|
481
|
+
expression,
|
|
482
|
+
expression.set,
|
|
483
|
+
expression.pattern.name,
|
|
484
|
+
frame,
|
|
485
|
+
);
|
|
486
|
+
}
|
|
487
|
+
return generateDelegate(generator, expression, frame);
|
|
488
|
+
case "FunctionConstruction": {
|
|
489
|
+
const bound = expression.bounds[0];
|
|
490
|
+
if (
|
|
491
|
+
expression.bounds.length === 1 &&
|
|
492
|
+
bound.pattern.kind === "Name" &&
|
|
493
|
+
!expression.isRecursive &&
|
|
494
|
+
!isKeptLazy(expression)
|
|
495
|
+
) {
|
|
496
|
+
return generateFunctionConstruction(generator, expression, bound.pattern.name, frame);
|
|
497
|
+
}
|
|
498
|
+
return generateDelegate(generator, expression, frame);
|
|
499
|
+
}
|
|
500
|
+
case "SetFilter":
|
|
501
|
+
if (expression.bound.pattern.kind === "Name") {
|
|
502
|
+
return generateSetFilter(generator, expression, expression.bound.pattern.name, frame);
|
|
503
|
+
}
|
|
504
|
+
return generateDelegate(generator, expression, frame);
|
|
381
505
|
default:
|
|
382
506
|
return generateDelegate(generator, expression, frame);
|
|
383
507
|
}
|
|
@@ -388,8 +512,8 @@ export const generateEvaluator = (
|
|
|
388
512
|
environment: Environment,
|
|
389
513
|
): Evaluator | undefined => {
|
|
390
514
|
if (!GENERATED_KINDS.has(expression.kind)) return undefined;
|
|
391
|
-
|
|
392
|
-
if (!
|
|
515
|
+
isCodeGenerationAllowed ??= getIsCodeGenerationAllowed();
|
|
516
|
+
if (!isCodeGenerationAllowed) return undefined;
|
|
393
517
|
const generator: Generator = { environment, references: [], helpers: [], counter: 0 };
|
|
394
518
|
const frame: Frame = {
|
|
395
519
|
context: "context",
|
|
@@ -399,11 +523,9 @@ export const generateEvaluator = (
|
|
|
399
523
|
locals: new Map(),
|
|
400
524
|
};
|
|
401
525
|
const body = generateExpression(generator, expression, frame);
|
|
402
|
-
const referenceNames = generator.references.map((
|
|
526
|
+
const referenceNames = generator.references.map((_reference, index) => `reference${index}`);
|
|
403
527
|
const source = `${generator.helpers.join("\n")}\nreturn (context) => { const state = context.state; const next = context.next; let primed; let applied; return ${body}; };`;
|
|
404
|
-
generatedHelpers
|
|
405
|
-
const
|
|
406
|
-
|
|
407
|
-
const factory = new Function(...helperNames, ...referenceNames, source);
|
|
408
|
-
return factory(...Object.values(helpers), ...generator.references);
|
|
528
|
+
generatedHelpers ??= createGeneratedHelpers();
|
|
529
|
+
const factory = new Function(...Object.keys(generatedHelpers), ...referenceNames, source);
|
|
530
|
+
return factory(...Object.values(generatedHelpers), ...generator.references);
|
|
409
531
|
};
|