tla-ts 0.0.9-dev.8298a52 → 0.0.10-dev.06b481ee0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +8 -0
- package/dist/compile.cjs +6 -6
- package/dist/compile.js +10 -10
- package/dist/deciders.cjs +41 -37
- package/dist/deciders.js +57 -53
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +121 -12
- package/dist/index.d.ts +121 -12
- package/dist/index.js +1 -1
- package/dist/parallel-worker.cjs +1 -1
- package/dist/parallel-worker.js +1 -1
- package/dist/prove-worker.cjs +1 -1
- package/dist/prove-worker.js +1 -1
- package/dist/prove.cjs +2746 -410
- package/dist/prove.js +2745 -409
- package/dist/run.cjs +144 -31
- package/dist/run.js +144 -31
- package/dist/tlapm.cjs +2 -2
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +134 -104
- package/dist/transfer.js +134 -104
- package/dist/worker.cjs +7 -7
- package/dist/worker.js +7 -7
- package/package.json +1 -1
- package/src/ast.ts +56 -60
- package/src/bags.ts +128 -110
- package/src/builtins.ts +31 -77
- package/src/bundled-modules.ts +1 -8
- package/src/check-failure.ts +118 -0
- package/src/check-trace.ts +320 -0
- package/src/check.ts +1155 -900
- package/src/cli/options.ts +12 -32
- package/src/cli/run.ts +0 -2
- package/src/cli/runtime-invariants.ts +100 -0
- package/src/cli/shared.ts +19 -12
- package/src/cli/tlapm.ts +433 -82
- package/src/cli/tlc-arguments.ts +652 -0
- package/src/cli/tlc-output.ts +701 -0
- package/src/cli/tlc-usage.ts +360 -0
- package/src/cli/tlc.ts +318 -656
- package/src/cli/typescript.ts +0 -3
- package/src/cli/xml-exporter.ts +27 -49
- package/src/cli.ts +0 -1
- package/src/codegen.ts +217 -82
- package/src/config.ts +140 -109
- package/src/coverage.ts +1019 -0
- package/src/dependencies.ts +101 -66
- package/src/dfid.ts +683 -0
- package/src/environment-config.ts +315 -0
- package/src/environment.ts +260 -371
- package/src/errors.ts +93 -58
- package/src/evaluate.ts +848 -374
- package/src/exit-codes.ts +63 -13
- package/src/fingerprints.ts +75 -11
- package/src/index.ts +3 -0
- package/src/instances.ts +97 -43
- package/src/java-hash.ts +21 -0
- package/src/java-overrides.ts +6 -21
- package/src/json-reader.ts +455 -0
- package/src/json.ts +252 -139
- package/src/levels.ts +231 -154
- package/src/lexer.ts +83 -101
- package/src/liveness-checker.ts +743 -325
- package/src/liveness.ts +224 -131
- package/src/obligations/action.ts +17 -44
- package/src/obligations/anonymize.ts +120 -95
- package/src/obligations/enabled-axioms.ts +218 -0
- package/src/obligations/equality.ts +1 -3
- package/src/obligations/expression.ts +37 -26
- package/src/obligations/format.ts +0 -10
- package/src/obligations/generate.ts +66 -64
- package/src/obligations/index.ts +39 -20
- package/src/obligations/levels.ts +27 -18
- package/src/obligations/module.ts +28 -55
- package/src/obligations/normalize.ts +31 -41
- package/src/obligations/operators.ts +0 -3
- package/src/obligations/pragma.ts +52 -24
- package/src/obligations/printer.ts +94 -63
- package/src/obligations/proof.ts +3 -6
- package/src/obligations/regroup.ts +0 -5
- package/src/obligations/simplify.ts +57 -63
- package/src/obligations/source.ts +121 -95
- package/src/obligations/subexpression.ts +49 -28
- package/src/obligations/substitution.ts +1 -5
- package/src/obligations/temporal.ts +12 -20
- package/src/obligations/tuples.ts +2 -10
- package/src/parallel-worker.ts +34 -57
- package/src/parallel.ts +62 -72
- package/src/parser.ts +1184 -531
- package/src/pcal/ast.ts +53 -86
- package/src/pcal/parse.ts +144 -219
- package/src/pcal/tokenize.ts +91 -131
- package/src/pcal/translate.ts +83 -130
- package/src/pcal/validate.ts +48 -68
- package/src/pretty-print.ts +7 -8
- package/src/prover/decide-pool.ts +8 -13
- package/src/prover/deciders.ts +12 -13
- package/src/prover/first-order.ts +0 -11
- package/src/prover/isabelle/decide.ts +3 -31
- package/src/prover/isabelle/encode.ts +82 -64
- package/src/prover/isabelle/isar/attrib.ts +250 -0
- package/src/prover/isabelle/isar/context.ts +335 -0
- package/src/prover/isabelle/isar/induct.ts +382 -0
- package/src/prover/isabelle/isar/inner-syntax.ts +262 -117
- package/src/prover/isabelle/isar/method.ts +510 -226
- package/src/prover/isabelle/isar/proof.ts +570 -23
- package/src/prover/isabelle/isar/rule-cases.ts +226 -0
- package/src/prover/isabelle/isar/theory.ts +488 -88
- package/src/prover/isabelle/isar/toplevel.ts +331 -0
- package/src/prover/isabelle/isar/type-check.ts +99 -38
- package/src/prover/isabelle/provers/blast/blast.ts +16 -105
- package/src/prover/isabelle/provers/blast/branch.ts +0 -33
- package/src/prover/isabelle/provers/blast/prove.ts +0 -36
- package/src/prover/isabelle/provers/blast/rules.ts +5 -45
- package/src/prover/isabelle/provers/blast/state.ts +1 -29
- package/src/prover/isabelle/provers/blast/term.ts +8 -37
- package/src/prover/isabelle/provers/clasimp.ts +1 -15
- package/src/prover/isabelle/provers/classical.ts +58 -61
- package/src/prover/isabelle/provers/hypsubst.ts +29 -54
- package/src/prover/isabelle/pure/bicompose.ts +24 -39
- package/src/prover/isabelle/pure/consts.ts +0 -8
- package/src/prover/isabelle/pure/conv.ts +2 -18
- package/src/prover/isabelle/pure/drule.ts +95 -45
- package/src/prover/isabelle/pure/envir.ts +2 -53
- package/src/prover/isabelle/pure/goal.ts +1 -9
- package/src/prover/isabelle/pure/interrupt.ts +0 -5
- package/src/prover/isabelle/pure/list.ts +0 -3
- package/src/prover/isabelle/pure/logic.ts +1 -16
- package/src/prover/isabelle/pure/name.ts +1 -10
- package/src/prover/isabelle/pure/net.ts +2 -60
- package/src/prover/isabelle/pure/object-logic.ts +15 -16
- package/src/prover/isabelle/pure/pattern.ts +1 -20
- package/src/prover/isabelle/pure/raw-simplifier.ts +16 -63
- package/src/prover/isabelle/pure/rewriter.ts +34 -77
- package/src/prover/isabelle/pure/search.ts +2 -11
- package/src/prover/isabelle/pure/seq.ts +0 -11
- package/src/prover/isabelle/pure/simplifier.ts +27 -16
- package/src/prover/isabelle/pure/table.ts +2 -33
- package/src/prover/isabelle/pure/tactic.ts +11 -23
- package/src/prover/isabelle/pure/tactical.ts +47 -48
- package/src/prover/isabelle/pure/term-ord.ts +1 -7
- package/src/prover/isabelle/pure/term.ts +4 -47
- package/src/prover/isabelle/pure/thm.ts +26 -48
- package/src/prover/isabelle/pure/type.ts +1 -16
- package/src/prover/isabelle/pure/unify.ts +19 -31
- package/src/prover/isabelle/pure/variable.ts +2 -8
- package/src/prover/isabelle/tla/classical-setup.ts +17 -25
- package/src/prover/isabelle/tla/context.ts +65 -26
- package/src/prover/isabelle/tla/logic-data.ts +1 -1
- package/src/prover/isabelle/tla/logic.ts +53 -32
- package/src/prover/isabelle/tla/simpdata.ts +45 -44
- package/src/prover/isabelle/tools/intuitionistic.ts +28 -21
- package/src/prover/ocaml.ts +4 -7
- package/src/prover/prep/action.ts +33 -66
- package/src/prover/prep/enabled-axioms.ts +22 -20
- package/src/prover/prep/fingerprint.ts +2 -21
- package/src/prover/prep/level-comparison.ts +8 -12
- package/src/prover/prep/md5.ts +26 -31
- package/src/prover/prep/methods.ts +189 -86
- package/src/prover/prep/normalize.ts +42 -37
- package/src/prover/prove-worker.ts +0 -2
- package/src/prover/prove.ts +398 -133
- package/src/prover/ptl/decide.ts +96 -56
- package/src/prover/ptl/encode.ts +15 -38
- package/src/prover/ptl/sat.ts +24 -32
- package/src/prover/ptl/tableau.ts +40 -28
- package/src/prover/smt/arithmetic.ts +310 -0
- package/src/prover/smt/axioms.ts +12 -15
- package/src/prover/smt/context.ts +60 -32
- package/src/prover/smt/data.ts +517 -401
- package/src/prover/smt/encode.ts +155 -85
- package/src/prover/smt/extensionality.ts +5 -13
- package/src/prover/smt/flatten.ts +7 -28
- package/src/prover/smt/format.ts +33 -14
- package/src/prover/smt/instances.ts +7 -11
- package/src/prover/smt/layout.ts +91 -0
- package/src/prover/smt/rewrite.ts +1021 -658
- package/src/prover/smt/simplify.ts +441 -0
- package/src/prover/smt/solver/ackermannize-bv-tactic.ts +61 -0
- package/src/prover/smt/solver/ackr-helper.ts +179 -0
- package/src/prover/smt/solver/ackr-model-converter.ts +105 -0
- package/src/prover/smt/solver/act-cache.ts +0 -16
- package/src/prover/smt/solver/add-bounds-tactic.ts +59 -0
- package/src/prover/smt/solver/aig-tactic.ts +52 -0
- package/src/prover/smt/solver/aig.ts +889 -0
- package/src/prover/smt/solver/arith-rewriter.ts +626 -56
- package/src/prover/smt/solver/arith-terms.ts +121 -0
- package/src/prover/smt/solver/array-decl-plugin.ts +175 -0
- package/src/prover/smt/solver/array-rewriter.ts +319 -0
- package/src/prover/smt/solver/array.ts +1 -3
- package/src/prover/smt/solver/asserted-formulas.ts +241 -99
- package/src/prover/smt/solver/ast-lt.ts +165 -21
- package/src/prover/smt/solver/ast-util.ts +160 -7
- package/src/prover/smt/solver/ast.ts +1480 -184
- package/src/prover/smt/solver/auf-solver.ts +30 -56
- package/src/prover/smt/solver/bit-blast-tactic.ts +608 -0
- package/src/prover/smt/solver/bit-blaster.ts +871 -0
- package/src/prover/smt/solver/blast-term-ite.ts +47 -0
- package/src/prover/smt/solver/bound-manager.ts +196 -0
- package/src/prover/smt/solver/bound-simplifier.ts +598 -0
- package/src/prover/smt/solver/bv-bound-chk.ts +492 -0
- package/src/prover/smt/solver/bv-decl-plugin.ts +341 -0
- package/src/prover/smt/solver/bv-divrem-bounds.ts +95 -0
- package/src/prover/smt/solver/bv-rewriter.ts +1901 -0
- package/src/prover/smt/solver/bv1-blast.ts +214 -0
- package/src/prover/smt/solver/bv2fpa-converter.ts +174 -0
- package/src/prover/smt/solver/bv2int-rewriter.ts +544 -0
- package/src/prover/smt/solver/bv2real-rewriter.ts +533 -0
- package/src/prover/smt/solver/card2bv.ts +127 -0
- package/src/prover/smt/solver/case-split-queue.ts +0 -10
- package/src/prover/smt/solver/cg-table.ts +39 -42
- package/src/prover/smt/solver/check-logic.ts +330 -0
- package/src/prover/smt/solver/clause.ts +0 -27
- package/src/prover/smt/solver/cofactor-elim-term-ite.ts +293 -0
- package/src/prover/smt/solver/conflict-resolution.ts +78 -11
- package/src/prover/smt/solver/context.ts +600 -187
- package/src/prover/smt/solver/ctx-simplify.ts +34 -52
- package/src/prover/smt/solver/ctx-solver-simplify.ts +122 -0
- package/src/prover/smt/solver/datatype-decl-plugin.ts +580 -0
- package/src/prover/smt/solver/datatype-rewriter.ts +82 -0
- package/src/prover/smt/solver/demodulator.ts +786 -0
- package/src/prover/smt/solver/dependent-expr-state.ts +93 -0
- package/src/prover/smt/solver/der.ts +39 -30
- package/src/prover/smt/solver/diff-neq.ts +205 -0
- package/src/prover/smt/solver/distribute-forall.ts +57 -0
- package/src/prover/smt/solver/dom-simplify.ts +511 -0
- package/src/prover/smt/solver/dt2bv-tactic.ts +296 -0
- package/src/prover/smt/solver/dyn-ack.ts +0 -11
- package/src/prover/smt/solver/e-matching.ts +9 -41
- package/src/prover/smt/solver/elim-bounds.ts +89 -0
- package/src/prover/smt/solver/elim-small-bv-tactic.ts +129 -0
- package/src/prover/smt/solver/elim-term-ite-tactic.ts +48 -0
- package/src/prover/smt/solver/elim-uncnstr.ts +542 -0
- package/src/prover/smt/solver/enode.ts +100 -23
- package/src/prover/smt/solver/eq2bv-tactic.ts +218 -0
- package/src/prover/smt/solver/euf/arith-axioms.ts +403 -0
- package/src/prover/smt/solver/euf/arith-internalize.ts +653 -0
- package/src/prover/smt/solver/euf/arith-solver.ts +889 -0
- package/src/prover/smt/solver/euf/array-axioms.ts +527 -0
- package/src/prover/smt/solver/euf/array-internalize.ts +428 -0
- package/src/prover/smt/solver/euf/array-solver.ts +306 -0
- package/src/prover/smt/solver/euf/bv-ackerman.ts +162 -0
- package/src/prover/smt/solver/euf/bv-internalize.ts +748 -0
- package/src/prover/smt/solver/euf/bv-solver.ts +449 -0
- package/src/prover/smt/solver/euf/dt-solver.ts +618 -0
- package/src/prover/smt/solver/euf/egraph.ts +901 -0
- package/src/prover/smt/solver/euf/euf-solver.ts +1204 -0
- package/src/prover/smt/solver/euf/fpa-solver.ts +317 -0
- package/src/prover/smt/solver/euf/mam.ts +1046 -0
- package/src/prover/smt/solver/euf/q-ematch.ts +829 -0
- package/src/prover/smt/solver/euf/q-mbi.ts +587 -0
- package/src/prover/smt/solver/euf/q-model-fixer.ts +296 -0
- package/src/prover/smt/solver/euf/q-solver.ts +361 -0
- package/src/prover/smt/solver/euf/th-solver.ts +328 -0
- package/src/prover/smt/solver/euf/th-solvers.ts +30 -0
- package/src/prover/smt/solver/expr-ref.ts +0 -5
- package/src/prover/smt/solver/expr-safe-replace.ts +26 -7
- package/src/prover/smt/solver/expr2polynomial.ts +271 -0
- package/src/prover/smt/solver/factor.ts +163 -0
- package/src/prover/smt/solver/fd-solver.ts +734 -0
- package/src/prover/smt/solver/fingerprints.ts +15 -26
- package/src/prover/smt/solver/fix-dl-var.ts +147 -0
- package/src/prover/smt/solver/flat-literals.ts +0 -9
- package/src/prover/smt/solver/fm-tactic.ts +884 -0
- package/src/prover/smt/solver/fpa-decl-plugin.ts +618 -0
- package/src/prover/smt/solver/fpa-rewriter.ts +639 -0
- package/src/prover/smt/solver/fpa2bv-converter.ts +2251 -0
- package/src/prover/smt/solver/fpa2bv-rewriter.ts +349 -0
- package/src/prover/smt/solver/fpa2bv-tactic.ts +73 -0
- package/src/prover/smt/solver/goal.ts +179 -28
- package/src/prover/smt/solver/goal2nlsat.ts +216 -0
- package/src/prover/smt/solver/guard-set.ts +219 -0
- package/src/prover/smt/solver/hash.ts +0 -9
- package/src/prover/smt/solver/hashtable.ts +30 -23
- package/src/prover/smt/solver/inf-eps.ts +63 -0
- package/src/prover/smt/solver/inj-axiom.ts +101 -0
- package/src/prover/smt/solver/internalizer.ts +113 -133
- package/src/prover/smt/solver/lackr.ts +381 -0
- package/src/prover/smt/solver/lbool.ts +0 -2
- package/src/prover/smt/solver/lia2card.ts +268 -0
- package/src/prover/smt/solver/lia2pb.ts +154 -0
- package/src/prover/smt/solver/literal.ts +0 -4
- package/src/prover/smt/solver/logic-tactics.ts +355 -0
- package/src/prover/smt/solver/lp/bound-propagator.ts +7 -26
- package/src/prover/smt/solver/lp/constraints.ts +1 -8
- package/src/prover/smt/solver/lp/containers.ts +18 -31
- package/src/prover/smt/solver/lp/core-solver.ts +35 -37
- package/src/prover/smt/solver/lp/cross-nested.ts +4 -21
- package/src/prover/smt/solver/lp/dep-intervals.ts +6 -24
- package/src/prover/smt/solver/lp/dependency.ts +0 -5
- package/src/prover/smt/solver/lp/dioph-eq.ts +8 -103
- package/src/prover/smt/solver/lp/explanation.ts +0 -6
- package/src/prover/smt/solver/lp/gomory.ts +8 -22
- package/src/prover/smt/solver/lp/hnf-cutter.ts +16 -23
- package/src/prover/smt/solver/lp/hnf.ts +10 -28
- package/src/prover/smt/solver/lp/int-cube.ts +17 -39
- package/src/prover/smt/solver/lp/int-solver.ts +3 -35
- package/src/prover/smt/solver/lp/lar-solver.ts +70 -83
- package/src/prover/smt/solver/lp/lar-term.ts +0 -5
- package/src/prover/smt/solver/lp/lp-settings.ts +6 -16
- package/src/prover/smt/solver/lp/maximize-term.ts +76 -52
- package/src/prover/smt/solver/lp/nex-creator.ts +7 -30
- package/src/prover/smt/solver/lp/nex.ts +2 -7
- package/src/prover/smt/solver/lp/nla-backoff.ts +0 -5
- package/src/prover/smt/solver/lp/nla-basics.ts +48 -30
- package/src/prover/smt/solver/lp/nla-core.ts +92 -136
- package/src/prover/smt/solver/lp/nla-divisions.ts +31 -43
- package/src/prover/smt/solver/lp/nla-emonics.ts +3 -21
- package/src/prover/smt/solver/lp/nla-factorization.ts +0 -4
- package/src/prover/smt/solver/lp/nla-grobner.ts +177 -149
- package/src/prover/smt/solver/lp/nla-horner.ts +2 -12
- package/src/prover/smt/solver/lp/nla-intervals.ts +1 -12
- package/src/prover/smt/solver/lp/nla-monomial-bounds.ts +15 -42
- package/src/prover/smt/solver/lp/nla-monotone.ts +1 -6
- package/src/prover/smt/solver/lp/nla-order.ts +0 -13
- package/src/prover/smt/solver/lp/nla-patcher.ts +3 -7
- package/src/prover/smt/solver/lp/nla-powers.ts +220 -0
- package/src/prover/smt/solver/lp/nla-tangents.ts +0 -10
- package/src/prover/smt/solver/lp/nla-throttle.ts +0 -6
- package/src/prover/smt/solver/lp/nla-transcendentals.ts +324 -0
- package/src/prover/smt/solver/lp/nla-types.ts +0 -12
- package/src/prover/smt/solver/lp/nla-var-eqs.ts +4 -26
- package/src/prover/smt/solver/lp/nra-solver.ts +164 -147
- package/src/prover/smt/solver/lp/numeric-pair.ts +0 -4
- package/src/prover/smt/solver/lp/pdd-interval.ts +6 -5
- package/src/prover/smt/solver/lp/pdd-simplifier.ts +61 -34
- package/src/prover/smt/solver/lp/pdd-solver.ts +74 -72
- package/src/prover/smt/solver/lp/pdd.ts +730 -358
- package/src/prover/smt/solver/lp/random-updater.ts +0 -9
- package/src/prover/smt/solver/lp/static-matrix.ts +8 -19
- package/src/prover/smt/solver/lp/union-find.ts +5 -5
- package/src/prover/smt/solver/macro-finder.ts +530 -0
- package/src/prover/smt/solver/mam-compiler.ts +129 -139
- package/src/prover/smt/solver/mam-interpreter.ts +0 -21
- package/src/prover/smt/solver/max-bv-sharing-tactic.ts +17 -0
- package/src/prover/smt/solver/max-cliques.ts +105 -0
- package/src/prover/smt/solver/maxcore.ts +310 -0
- package/src/prover/smt/solver/maximize-ac-sharing.ts +8 -21
- package/src/prover/smt/solver/maxlex.ts +115 -0
- package/src/prover/smt/solver/maxsmt-base.ts +106 -0
- package/src/prover/smt/solver/maxsmt.ts +92 -0
- package/src/prover/smt/solver/mbp/mbp-arith.ts +467 -0
- package/src/prover/smt/solver/mbp/mbp-basic-tg.ts +101 -0
- package/src/prover/smt/solver/mbp/mbp-plugin.ts +287 -0
- package/src/prover/smt/solver/mbp/mbp-qel.ts +48 -0
- package/src/prover/smt/solver/mbp/mbp-solve-plugin.ts +271 -0
- package/src/prover/smt/solver/mbp/mbp-term-graph.ts +606 -0
- package/src/prover/smt/solver/model-based-opt.ts +844 -0
- package/src/prover/smt/solver/model-checker.ts +20 -63
- package/src/prover/smt/solver/model-evaluator.ts +192 -40
- package/src/prover/smt/solver/model-finder.ts +14 -32
- package/src/prover/smt/solver/model-generator.ts +104 -46
- package/src/prover/smt/solver/model-macro-solver.ts +60 -114
- package/src/prover/smt/solver/model-printer.ts +214 -0
- package/src/prover/smt/solver/mpf.ts +709 -0
- package/src/prover/smt/solver/mus.ts +50 -0
- package/src/prover/smt/solver/muz/dl-context.ts +382 -0
- package/src/prover/smt/solver/muz/dl-mk-bit-blast.ts +97 -0
- package/src/prover/smt/solver/muz/dl-mk-coi-filter.ts +167 -0
- package/src/prover/smt/solver/muz/dl-mk-elim-term-ite.ts +125 -0
- package/src/prover/smt/solver/muz/dl-mk-interp-tail-simplifier.ts +299 -0
- package/src/prover/smt/solver/muz/dl-mk-rule-inliner.ts +455 -0
- package/src/prover/smt/solver/muz/dl-mk-slice.ts +340 -0
- package/src/prover/smt/solver/muz/dl-mk-subsumption-checker.ts +163 -0
- package/src/prover/smt/solver/muz/dl-rule-set.ts +273 -0
- package/src/prover/smt/solver/muz/dl-rule-transformer.ts +123 -0
- package/src/prover/smt/solver/muz/dl-rule.ts +495 -0
- package/src/prover/smt/solver/muz/hnf.ts +201 -0
- package/src/prover/smt/solver/muz/horn-subsume-model-converter.ts +176 -0
- package/src/prover/smt/solver/muz/horn-tactic.ts +214 -0
- package/src/prover/smt/solver/muz/rule-properties.ts +359 -0
- package/src/prover/smt/solver/muz/spacer-context.ts +1404 -0
- package/src/prover/smt/solver/muz/spacer-dl-interface.ts +52 -0
- package/src/prover/smt/solver/muz/spacer-generalizers.ts +241 -0
- package/src/prover/smt/solver/muz/spacer-manager.ts +127 -0
- package/src/prover/smt/solver/muz/spacer-pdr.ts +219 -0
- package/src/prover/smt/solver/muz/spacer-prop-solver.ts +333 -0
- package/src/prover/smt/solver/muz/spacer-util.ts +282 -0
- package/src/prover/smt/solver/muz/substitution.ts +203 -0
- package/src/prover/smt/solver/nla2bv-tactic.ts +285 -0
- package/src/prover/smt/solver/nlqsat.ts +484 -0
- package/src/prover/smt/solver/nlsat/algebraic.ts +357 -236
- package/src/prover/smt/solver/nlsat/atoms.ts +73 -54
- package/src/prover/smt/solver/nlsat/evaluator.ts +16 -22
- package/src/prover/smt/solver/nlsat/explain.ts +429 -275
- package/src/prover/smt/solver/nlsat/interval-set.ts +9 -51
- package/src/prover/smt/solver/nlsat/levelwise.ts +477 -344
- package/src/prover/smt/solver/nlsat/mpbq.ts +47 -14
- package/src/prover/smt/solver/nlsat/polynomial.ts +2385 -832
- package/src/prover/smt/solver/nlsat/solver.ts +297 -156
- package/src/prover/smt/solver/nlsat/transcendental-eval.ts +310 -0
- package/src/prover/smt/solver/nlsat/transcendentals.ts +391 -0
- package/src/prover/smt/solver/nlsat/types.ts +0 -9
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +9 -51
- package/src/prover/smt/solver/nlsat/upolynomial.ts +49 -109
- package/src/prover/smt/solver/nlsat-tactic.ts +82 -0
- package/src/prover/smt/solver/nnf.ts +112 -61
- package/src/prover/smt/solver/normalize-bounds.ts +53 -0
- package/src/prover/smt/solver/occf.ts +97 -0
- package/src/prover/smt/solver/opt-context.ts +801 -0
- package/src/prover/smt/solver/opt-nlsat.ts +386 -0
- package/src/prover/smt/solver/opt-pareto.ts +301 -0
- package/src/prover/smt/solver/opt-preprocess.ts +101 -0
- package/src/prover/smt/solver/opt-solver.ts +312 -0
- package/src/prover/smt/solver/opt-value.ts +55 -0
- package/src/prover/smt/solver/optsmt.ts +692 -0
- package/src/prover/smt/solver/parallel-tactic.ts +299 -0
- package/src/prover/smt/solver/pattern-inference.ts +21 -26
- package/src/prover/smt/solver/pb-rewriter.ts +281 -0
- package/src/prover/smt/solver/pb2bv-tactic.ts +540 -0
- package/src/prover/smt/solver/poly-rewriter.ts +261 -79
- package/src/prover/smt/solver/probes.ts +577 -0
- package/src/prover/smt/solver/propagate-values.ts +37 -30
- package/src/prover/smt/solver/proto-model.ts +650 -66
- package/src/prover/smt/solver/pull-quant.ts +28 -23
- package/src/prover/smt/solver/purify-arith.ts +632 -0
- package/src/prover/smt/solver/push-app-ite.ts +37 -0
- package/src/prover/smt/solver/qe-arith-plugin.ts +1096 -0
- package/src/prover/smt/solver/qe-lite-der.ts +2 -31
- package/src/prover/smt/solver/qe-lite-fm.ts +4 -28
- package/src/prover/smt/solver/qe-lite.ts +41 -51
- package/src/prover/smt/solver/qe-mbp.ts +270 -0
- package/src/prover/smt/solver/qe.ts +1499 -0
- package/src/prover/smt/solver/qel.ts +25 -0
- package/src/prover/smt/solver/qi-queue.ts +0 -16
- package/src/prover/smt/solver/qsat.ts +829 -0
- package/src/prover/smt/solver/quant-hoist.ts +196 -0
- package/src/prover/smt/solver/quant-tactics.ts +17 -74
- package/src/prover/smt/solver/quantifier-analyzer.ts +26 -47
- package/src/prover/smt/solver/quantifier-manager.ts +22 -32
- package/src/prover/smt/solver/quasi-macros.ts +243 -0
- package/src/prover/smt/solver/random-gen.ts +0 -2
- package/src/prover/smt/solver/rational.ts +45 -8
- package/src/prover/smt/solver/recfun-decl-plugin.ts +262 -0
- package/src/prover/smt/solver/recfun-rewriter.ts +107 -0
- package/src/prover/smt/solver/reduce-args.ts +225 -0
- package/src/prover/smt/solver/reduce-bv-size.ts +119 -0
- package/src/prover/smt/solver/ref-vector.ts +0 -6
- package/src/prover/smt/solver/relevancy.ts +2 -16
- package/src/prover/smt/solver/rewriter-tpl.ts +59 -135
- package/src/prover/smt/solver/rewriter.ts +507 -144
- package/src/prover/smt/solver/rlimit.ts +46 -24
- package/src/prover/smt/solver/sat/asymm-branch.ts +325 -0
- package/src/prover/smt/solver/sat/big.ts +177 -0
- package/src/prover/smt/solver/sat/clause-use-list.ts +71 -0
- package/src/prover/smt/solver/sat/clause.ts +203 -0
- package/src/prover/smt/solver/sat/cleaner.ts +94 -0
- package/src/prover/smt/solver/sat/config.ts +122 -0
- package/src/prover/smt/solver/sat/consequences.ts +203 -0
- package/src/prover/smt/solver/sat/elim-eqs.ts +142 -0
- package/src/prover/smt/solver/sat/goal2sat.ts +579 -0
- package/src/prover/smt/solver/sat/inc-sat-solver.ts +464 -0
- package/src/prover/smt/solver/sat/model-converter.ts +136 -0
- package/src/prover/smt/solver/sat/pb-constraint.ts +268 -0
- package/src/prover/smt/solver/sat/pb-solver.ts +1596 -0
- package/src/prover/smt/solver/sat/probing.ts +170 -0
- package/src/prover/smt/solver/sat/sat-tactic.ts +53 -0
- package/src/prover/smt/solver/sat/sat2goal.ts +189 -0
- package/src/prover/smt/solver/sat/scc.ts +142 -0
- package/src/prover/smt/solver/sat/simplifier.ts +1618 -0
- package/src/prover/smt/solver/sat/solver.ts +2107 -0
- package/src/prover/smt/solver/sat/var-queue.ts +117 -0
- package/src/prover/smt/solver/sat/watch-list.ts +140 -0
- package/src/prover/smt/solver/search-tree.ts +284 -0
- package/src/prover/smt/solver/seq-axioms.ts +995 -0
- package/src/prover/smt/solver/seq-decl-plugin.ts +819 -0
- package/src/prover/smt/solver/seq-derive.ts +1298 -0
- package/src/prover/smt/solver/seq-eq-approx.ts +236 -0
- package/src/prover/smt/solver/seq-eq-solver.ts +439 -0
- package/src/prover/smt/solver/seq-factory.ts +89 -0
- package/src/prover/smt/solver/seq-monadic.ts +730 -0
- package/src/prover/smt/solver/seq-range-predicate.ts +235 -0
- package/src/prover/smt/solver/seq-re-rewriter.ts +1171 -0
- package/src/prover/smt/solver/seq-re-util.ts +758 -0
- package/src/prover/smt/solver/seq-regex-bisim.ts +144 -0
- package/src/prover/smt/solver/seq-regex-live.ts +200 -0
- package/src/prover/smt/solver/seq-rewriter.ts +2404 -0
- package/src/prover/smt/solver/seq-skolem.ts +294 -0
- package/src/prover/smt/solver/seq-subset.ts +165 -0
- package/src/prover/smt/solver/seq-view-witness.ts +353 -0
- package/src/prover/smt/solver/smt-consequences.ts +297 -0
- package/src/prover/smt/solver/smt-kernel.ts +124 -0
- package/src/prover/smt/solver/smt-logics.ts +66 -0
- package/src/prover/smt/solver/smt-setup.ts +589 -0
- package/src/prover/smt/solver/smt2-printer.ts +765 -0
- package/src/prover/smt/solver/smtlib-parser.ts +3546 -406
- package/src/prover/smt/solver/smtlib-script.ts +2134 -0
- package/src/prover/smt/solver/solve-eqs.ts +928 -0
- package/src/prover/smt/solver/solver.ts +129 -38
- package/src/prover/smt/solver/sort.ts +1 -5
- package/src/prover/smt/solver/static-features.ts +314 -0
- package/src/prover/smt/solver/sticky-generations.ts +0 -6
- package/src/prover/smt/solver/tactic.ts +2141 -0
- package/src/prover/smt/solver/term-enumeration.ts +205 -0
- package/src/prover/smt/solver/theory-array.ts +1240 -0
- package/src/prover/smt/solver/theory-bv.ts +1210 -0
- package/src/prover/smt/solver/theory-char.ts +355 -0
- package/src/prover/smt/solver/theory-datatype.ts +598 -0
- package/src/prover/smt/solver/theory-finite-set.ts +30 -0
- package/src/prover/smt/solver/theory-fpa.ts +389 -0
- package/src/prover/smt/solver/theory-lra-axioms.ts +55 -25
- package/src/prover/smt/solver/theory-lra-bounds.ts +31 -11
- package/src/prover/smt/solver/theory-lra-final-check.ts +60 -91
- package/src/prover/smt/solver/theory-lra-internalize.ts +96 -53
- package/src/prover/smt/solver/theory-lra-model.ts +23 -53
- package/src/prover/smt/solver/theory-lra-propagate.ts +34 -42
- package/src/prover/smt/solver/theory-lra-state.ts +7 -28
- package/src/prover/smt/solver/theory-lra.ts +189 -9
- package/src/prover/smt/solver/theory-pb.ts +951 -0
- package/src/prover/smt/solver/theory-polymorphism.ts +58 -0
- package/src/prover/smt/solver/theory-recfun.ts +307 -0
- package/src/prover/smt/solver/theory-seq-regex.ts +867 -0
- package/src/prover/smt/solver/theory-seq-solve.ts +1373 -0
- package/src/prover/smt/solver/theory-seq-state.ts +852 -0
- package/src/prover/smt/solver/theory-seq.ts +961 -0
- package/src/prover/smt/solver/theory-without-terms.ts +24 -0
- package/src/prover/smt/solver/theory.ts +189 -0
- package/src/prover/smt/solver/tseitin-cnf.ts +486 -0
- package/src/prover/smt/solver/var-subst.ts +37 -39
- package/src/prover/smt/table.ts +3 -10
- package/src/prover/smt/types.ts +146 -0
- package/src/prover/tlapm/cache.ts +74 -48
- package/src/prover/tlapm/ocaml-marshal.ts +19 -21
- package/src/prover/tlapm/tlapm.ts +21 -20
- package/src/prover/tlapm-library.ts +3208 -0
- package/src/prover/verdict.ts +9 -2
- package/src/prover/zenon/check/check.ts +1 -11
- package/src/prover/zenon/check/definitions.ts +5 -15
- package/src/prover/zenon/check/equality.ts +0 -8
- package/src/prover/zenon/check/functions.ts +0 -4
- package/src/prover/zenon/check/keys.ts +0 -7
- package/src/prover/zenon/check/propositional.ts +0 -3
- package/src/prover/zenon/check/records.ts +1 -6
- package/src/prover/zenon/check/relations.ts +2 -14
- package/src/prover/zenon/check/rewrites.ts +2 -21
- package/src/prover/zenon/check/sets.ts +40 -61
- package/src/prover/zenon/check/terms.ts +1 -19
- package/src/prover/zenon/check/tla.ts +0 -6
- package/src/prover/zenon/decide.ts +10 -19
- package/src/prover/zenon/encode.ts +0 -9
- package/src/prover/zenon/eqrel.ts +2 -15
- package/src/prover/zenon/equality-rules.ts +24 -6
- package/src/prover/zenon/expr.ts +29 -28
- package/src/prover/zenon/index-table.ts +33 -61
- package/src/prover/zenon/isar-case.ts +9 -21
- package/src/prover/zenon/isar.ts +37 -67
- package/src/prover/zenon/limits.ts +0 -4
- package/src/prover/zenon/llproof.ts +2 -22
- package/src/prover/zenon/mltoll.ts +66 -106
- package/src/prover/zenon/node.ts +20 -15
- package/src/prover/zenon/ocaml.ts +1 -17
- package/src/prover/zenon/parse.ts +9 -13
- package/src/prover/zenon/phrase.ts +2 -14
- package/src/prover/zenon/proof.ts +0 -11
- package/src/prover/zenon/propositional-rules.ts +0 -7
- package/src/prover/zenon/rules.ts +3 -8
- package/src/prover/zenon/search.ts +11 -35
- package/src/prover/zenon/tla/functions.ts +59 -33
- package/src/prover/zenon/tla/llproof.ts +67 -78
- package/src/prover/zenon/tla/records.ts +57 -35
- package/src/prover/zenon/tla/rewrites.ts +12 -21
- package/src/prover/zenon/tla/sets.ts +88 -59
- package/src/prover/zenon/tla/terms.ts +0 -8
- package/src/prover/zenon/tla/tla.ts +66 -66
- package/src/randomization.ts +81 -35
- package/src/resolve.ts +1132 -430
- package/src/runtime.ts +33 -23
- package/src/sany/builtins.ts +11 -14
- package/src/sany/generation.ts +383 -0
- package/src/sany/generator-def-entries.ts +210 -0
- package/src/sany/generator-definitions.ts +688 -0
- package/src/sany/generator-expressions.ts +1108 -0
- package/src/sany/generator-proofs.ts +665 -0
- package/src/sany/generator.ts +192 -2764
- package/src/sany/levels.ts +5 -35
- package/src/sany/lexer.ts +61 -80
- package/src/sany/linter.ts +0 -10
- package/src/sany/modules.ts +5 -7
- package/src/sany/nodes.ts +6 -44
- package/src/sany/parse-error.ts +39 -117
- package/src/sany/report.ts +32 -69
- package/src/sany/selectors.ts +60 -82
- package/src/sany/source.ts +1 -17
- package/src/sany/xml.ts +37 -120
- package/src/search.ts +913 -227
- package/src/simulate.ts +765 -0
- package/src/spec-description.ts +198 -104
- package/src/standard-definitions.ts +4 -4
- package/src/standard-modules.ts +302 -99
- package/src/state-graph.ts +52 -33
- package/src/subexpressions.ts +578 -166
- package/src/substitution-levels.ts +7 -7
- package/src/successors.ts +296 -105
- package/src/symmetry.ts +37 -28
- package/src/tableau.ts +29 -26
- package/src/tlc/fingerprint.ts +267 -79
- package/src/tlc/jar-data.ts +122 -6
- package/src/tlc/messages.ts +127 -56
- package/src/tlc/order.ts +53 -72
- package/src/tlc/random.ts +38 -49
- package/src/tlc/replay.ts +579 -230
- package/src/tlc/summary.ts +64 -60
- package/src/tlc/tlc-operators.ts +83 -47
- package/src/tlc/tlcext-operators.ts +205 -127
- package/src/tlc/trace-spec.ts +235 -0
- package/src/tlc/value-stream.ts +139 -0
- package/src/tlc/version.ts +1 -4
- package/src/trace-liveness.ts +529 -0
- package/src/transfer.ts +22 -25
- package/src/typed-tier.ts +6556 -0
- package/src/typescript/actions.ts +10 -25
- package/src/typescript/collections.ts +34 -35
- package/src/typescript/compile.ts +1 -8
- package/src/typescript/context.ts +0 -12
- package/src/typescript/emit.ts +0 -1
- package/src/typescript/expressions.ts +0 -12
- package/src/typescript/formula.ts +9 -15
- package/src/typescript/functions.ts +6 -17
- package/src/typescript/model.ts +14 -16
- package/src/typescript/names.ts +0 -2
- package/src/typescript/program.ts +0 -3
- package/src/typescript/properties.ts +6 -8
- package/src/typescript/scope.ts +0 -5
- package/src/typescript/steps.ts +20 -28
- package/src/typescript/types.ts +3 -10
- package/src/values.ts +917 -522
- package/src/worker.ts +7 -8
- package/src/prover/isabelle/isar/statement.ts +0 -57
- package/src/prover/smt/solver/z3-license.txt +0 -10
- package/src/prover/tlaps-module.ts +0 -510
- package/src/prover/zenon/LICENSE +0 -32
package/src/cli/typescript.ts
CHANGED
|
@@ -2,10 +2,7 @@ import { existsSync, readFileSync, writeFileSync } from "node:fs";
|
|
|
2
2
|
import { basename, dirname, join } from "node:path";
|
|
3
3
|
import { TlaTypeScriptError } from "../errors";
|
|
4
4
|
|
|
5
|
-
// Compiles a TypeScript file to the TLA+ spec and config of its module, beside it, and returns the
|
|
6
|
-
// spec's path. A file there that tla-ts didn't generate is left alone.
|
|
7
5
|
export const writeTypeScriptSpec = async (path: string) => {
|
|
8
|
-
// The TypeScript compiler takes a while to load, so only a TypeScript input loads it.
|
|
9
6
|
const compiled = (await import("../typescript/compile")).compile(
|
|
10
7
|
readFileSync(path, "utf8"),
|
|
11
8
|
path,
|
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((
|
|
55
|
+
...options.map((option) => `\t${getBold(option[0])}\n\t\t${option[1]}`),
|
|
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,21 @@
|
|
|
1
|
-
import { getChildren, isLocallyResolved, type Expression } from "./ast";
|
|
1
|
+
import { getChildren, getReferencedName, isLocallyResolved, type Expression } from "./ast";
|
|
2
|
+
import { isTlcEvalReached } from "./dependencies";
|
|
2
3
|
import {
|
|
3
4
|
bindValue,
|
|
4
|
-
|
|
5
|
+
expectBooleanBody,
|
|
6
|
+
expectImplication,
|
|
7
|
+
isEquivalent,
|
|
8
|
+
negate,
|
|
5
9
|
findGlobalName,
|
|
6
10
|
createConditionError,
|
|
7
11
|
createJunctionError,
|
|
12
|
+
createNoChoiceError,
|
|
13
|
+
expectFilterPredicate,
|
|
14
|
+
getChoiceElements,
|
|
15
|
+
getFunctionBuilder,
|
|
16
|
+
getLazyFilter,
|
|
17
|
+
isKeptLazy,
|
|
18
|
+
isUniformPredicate,
|
|
8
19
|
getDomainOperator,
|
|
9
20
|
getSubsetOperator,
|
|
10
21
|
getEvaluator,
|
|
@@ -16,7 +27,7 @@ import {
|
|
|
16
27
|
resolveGlobalOperator,
|
|
17
28
|
expectFunction,
|
|
18
29
|
toKeepLazyContext,
|
|
19
|
-
|
|
30
|
+
toNextContext,
|
|
20
31
|
createUnassignedError,
|
|
21
32
|
getSortedFields,
|
|
22
33
|
hasDuplicateFields,
|
|
@@ -25,12 +36,20 @@ import {
|
|
|
25
36
|
type Evaluator,
|
|
26
37
|
} from "./evaluate";
|
|
27
38
|
import {
|
|
39
|
+
addBoundedElement,
|
|
28
40
|
applyFunction,
|
|
29
41
|
createEnumeratedSet,
|
|
42
|
+
createNormalizedSet,
|
|
43
|
+
createSortedFunction,
|
|
30
44
|
createSortedRecord,
|
|
31
45
|
createTuple,
|
|
32
46
|
createWrittenRecord,
|
|
47
|
+
getCardinality,
|
|
48
|
+
getFunctionDomain,
|
|
49
|
+
isBeyondSetBound,
|
|
50
|
+
isReducibleSet,
|
|
33
51
|
isTlcInteger,
|
|
52
|
+
toFiniteSet,
|
|
34
53
|
valuesEqual,
|
|
35
54
|
type Value,
|
|
36
55
|
} from "./values";
|
|
@@ -64,10 +83,16 @@ const GENERATED_KINDS = new Set([
|
|
|
64
83
|
"Unchanged",
|
|
65
84
|
"Forall",
|
|
66
85
|
"Exists",
|
|
86
|
+
"Choose",
|
|
87
|
+
"SetFilter",
|
|
88
|
+
"FunctionConstruction",
|
|
67
89
|
]);
|
|
68
90
|
|
|
69
91
|
const createGeneratedHelpers = () => ({
|
|
70
|
-
|
|
92
|
+
implication: expectImplication,
|
|
93
|
+
negate,
|
|
94
|
+
equivalent: isEquivalent,
|
|
95
|
+
body: expectBooleanBody,
|
|
71
96
|
condition: (value: Value, expression: Expression) => {
|
|
72
97
|
if (typeof value !== "boolean") throw createConditionError(expression, value);
|
|
73
98
|
return value;
|
|
@@ -84,19 +109,23 @@ const createGeneratedHelpers = () => ({
|
|
|
84
109
|
writtenRecord: createWrittenRecord,
|
|
85
110
|
equal: valuesEqual,
|
|
86
111
|
enumerate: getQuantifierElements,
|
|
112
|
+
choiceElements: getChoiceElements,
|
|
113
|
+
noChoice: (expression: Expression & { kind: "Choose" }): never => {
|
|
114
|
+
throw createNoChoiceError(expression);
|
|
115
|
+
},
|
|
116
|
+
filterPredicate: expectFilterPredicate,
|
|
117
|
+
isReducible: isReducibleSet,
|
|
118
|
+
finiteElements: (set: Value) => toFiniteSet(set).elements,
|
|
119
|
+
addBounded: addBoundedElement,
|
|
120
|
+
normalizedSet: createNormalizedSet,
|
|
121
|
+
isBeyondBound: isBeyondSetBound,
|
|
122
|
+
cardinality: getCardinality,
|
|
123
|
+
functionDomain: getFunctionDomain,
|
|
124
|
+
sortedFunction: createSortedFunction,
|
|
87
125
|
unassigned: (name: string, expression: Expression): never => {
|
|
88
126
|
throw createUnassignedError(name, expression);
|
|
89
127
|
},
|
|
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
|
-
}),
|
|
128
|
+
prime: toNextContext,
|
|
100
129
|
keepLazyContext: toKeepLazyContext,
|
|
101
130
|
extend: (context: Context, names: string[], values: Value[]): Context => ({
|
|
102
131
|
environment: context.environment,
|
|
@@ -110,11 +139,9 @@ const createGeneratedHelpers = () => ({
|
|
|
110
139
|
}),
|
|
111
140
|
});
|
|
112
141
|
|
|
113
|
-
|
|
114
|
-
value: undefined as ReturnType<typeof createGeneratedHelpers> | undefined,
|
|
115
|
-
};
|
|
142
|
+
let generatedHelpers: ReturnType<typeof createGeneratedHelpers> | undefined;
|
|
116
143
|
|
|
117
|
-
|
|
144
|
+
let isCodeGenerationAllowed: boolean | undefined;
|
|
118
145
|
|
|
119
146
|
// Hosts such as Cloudflare Workers, or a page whose CSP lacks 'unsafe-eval', throw an EvalError.
|
|
120
147
|
const getIsCodeGenerationAllowed = () => {
|
|
@@ -134,32 +161,39 @@ const addReference = (generator: Generator, value: unknown) => {
|
|
|
134
161
|
const createLocal = (generator: Generator) => `local${generator.counter++}`;
|
|
135
162
|
|
|
136
163
|
const getFreeNames = (expression: Expression, names = new Set<string>()) => {
|
|
137
|
-
|
|
138
|
-
if (
|
|
139
|
-
|
|
164
|
+
const name = getReferencedName(expression);
|
|
165
|
+
if (name !== undefined) names.add(name);
|
|
166
|
+
if (expression.kind !== "Selection") {
|
|
167
|
+
getChildren(expression).forEach((child) => getFreeNames(child, names));
|
|
168
|
+
}
|
|
140
169
|
return names;
|
|
141
170
|
};
|
|
142
171
|
|
|
143
|
-
const
|
|
144
|
-
|
|
172
|
+
const getDelegateContext = (generator: Generator, expression: Expression, frame: Frame) => {
|
|
173
|
+
if (frame.locals.size === 0) return frame.context;
|
|
174
|
+
// TLC caches a constant TLCEval only where no name is bound, so a delegate that reaches one sees every local.
|
|
175
|
+
const isEveryLocalCaptured = isTlcEvalReached(expression, generator.environment);
|
|
145
176
|
const freeNames = getFreeNames(expression);
|
|
146
|
-
const captured = [...frame.locals].filter(
|
|
147
|
-
|
|
177
|
+
const captured = [...frame.locals].filter(
|
|
178
|
+
(entry) => isEveryLocalCaptured || freeNames.has(entry[0]),
|
|
179
|
+
);
|
|
180
|
+
if (captured.length === 0) return frame.context;
|
|
148
181
|
const names = addReference(
|
|
149
182
|
generator,
|
|
150
|
-
captured.map((
|
|
183
|
+
captured.map((entry) => entry[0]),
|
|
151
184
|
);
|
|
152
|
-
return
|
|
185
|
+
return `extend(${frame.context}, ${names}, [${captured.map((entry) => entry[1]).join(", ")}])`;
|
|
153
186
|
};
|
|
154
187
|
|
|
155
|
-
const
|
|
188
|
+
const generateDelegate = (generator: Generator, expression: Expression, frame: Frame) =>
|
|
189
|
+
`${addReference(generator, getEvaluator(expression, generator.environment))}(${getDelegateContext(generator, expression, frame)})`;
|
|
190
|
+
|
|
191
|
+
const generateHelper = (
|
|
156
192
|
generator: Generator,
|
|
157
|
-
expression: Expression & { kind: "Forall" | "Exists" },
|
|
158
193
|
frame: Frame,
|
|
194
|
+
build: (bodyFrame: Frame) => string,
|
|
159
195
|
) => {
|
|
160
|
-
const
|
|
161
|
-
const description = JSON.stringify(isForall ? "the body of \\A" : "the body of \\E");
|
|
162
|
-
const name = `quantifier${generator.counter++}`;
|
|
196
|
+
const name = `helper${generator.counter++}`;
|
|
163
197
|
const outerLocals = [...frame.locals.values()];
|
|
164
198
|
const bodyFrame = {
|
|
165
199
|
context: "context",
|
|
@@ -168,32 +202,107 @@ const generateQuantifier = (
|
|
|
168
202
|
isPrimed: false,
|
|
169
203
|
locals: new Map(frame.locals),
|
|
170
204
|
};
|
|
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
205
|
const parameters = outerLocals.map((local) => `, ${local}`).join("");
|
|
191
206
|
generator.helpers.push(
|
|
192
|
-
`function ${name}(context, state, next${parameters}) { let primed; let applied; ${
|
|
207
|
+
`function ${name}(context, state, next${parameters}) { let primed; let applied; ${build(bodyFrame)} }`,
|
|
193
208
|
);
|
|
194
209
|
return `${name}(${frame.context}, ${frame.state}, ${frame.isPrimed ? "undefined" : frame.next}${parameters})`;
|
|
195
210
|
};
|
|
196
211
|
|
|
212
|
+
const generateLoop = (generator: Generator, list: string, element: string, code: string) => {
|
|
213
|
+
const position = createLocal(generator);
|
|
214
|
+
const low = createLocal(generator);
|
|
215
|
+
const size = createLocal(generator);
|
|
216
|
+
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} }`;
|
|
217
|
+
};
|
|
218
|
+
|
|
219
|
+
const generateQuantifier = (
|
|
220
|
+
generator: Generator,
|
|
221
|
+
expression: Expression & { kind: "Forall" | "Exists" },
|
|
222
|
+
frame: Frame,
|
|
223
|
+
) => {
|
|
224
|
+
const isForall = expression.kind === "Forall";
|
|
225
|
+
return generateHelper(generator, frame, (bodyFrame) => {
|
|
226
|
+
const lists = expression.bounds.map(() => createLocal(generator));
|
|
227
|
+
const declarations = expression.bounds.map((bound, index) =>
|
|
228
|
+
index > 0 && expression.bounds[index - 1].set === bound.set
|
|
229
|
+
? `const ${lists[index]} = ${lists[index - 1]};`
|
|
230
|
+
: `const ${lists[index]} = enumerate(${generateExpression(generator, bound.set, bodyFrame)}, ${addReference(generator, bound.set)}, ${JSON.stringify(generator.environment.runtime.version)});`,
|
|
231
|
+
);
|
|
232
|
+
const elements = expression.bounds.map((bound) => {
|
|
233
|
+
const local = createLocal(generator);
|
|
234
|
+
if (bound.pattern.kind === "Name") bodyFrame.locals.set(bound.pattern.name, local);
|
|
235
|
+
return local;
|
|
236
|
+
});
|
|
237
|
+
const test = `if (body(${generateExpression(generator, expression.body, bodyFrame)}, ${addReference(generator, expression)}) !== ${isForall}) return ${!isForall};`;
|
|
238
|
+
const loops = elements.reduce(
|
|
239
|
+
(code, element, index) => generateLoop(generator, lists[index], element, code),
|
|
240
|
+
test,
|
|
241
|
+
);
|
|
242
|
+
return `${declarations.join(" ")} ${loops} return ${isForall};`;
|
|
243
|
+
});
|
|
244
|
+
};
|
|
245
|
+
|
|
246
|
+
const generateChoose = (
|
|
247
|
+
generator: Generator,
|
|
248
|
+
expression: Expression & { kind: "Choose" },
|
|
249
|
+
set: Expression,
|
|
250
|
+
name: string,
|
|
251
|
+
frame: Frame,
|
|
252
|
+
) =>
|
|
253
|
+
generateHelper(generator, frame, (bodyFrame) => {
|
|
254
|
+
const list = createLocal(generator);
|
|
255
|
+
const element = createLocal(generator);
|
|
256
|
+
const node = addReference(generator, expression);
|
|
257
|
+
const elements = `choiceElements(${generateExpression(generator, set, bodyFrame)}, ${node}, ${addReference(generator, set)}, ${JSON.stringify(generator.environment.runtime.version)})`;
|
|
258
|
+
bodyFrame.locals.set(name, element);
|
|
259
|
+
const test = `if (body(${generateExpression(generator, expression.body, bodyFrame)}, ${node})) return ${element};`;
|
|
260
|
+
return `const ${list} = ${elements}; ${generateLoop(generator, list, element, test)} return noChoice(${node});`;
|
|
261
|
+
});
|
|
262
|
+
|
|
263
|
+
const generateSetFilter = (
|
|
264
|
+
generator: Generator,
|
|
265
|
+
expression: Expression & { kind: "SetFilter" },
|
|
266
|
+
name: string,
|
|
267
|
+
frame: Frame,
|
|
268
|
+
) =>
|
|
269
|
+
generateHelper(generator, frame, (bodyFrame) => {
|
|
270
|
+
const base = createLocal(generator);
|
|
271
|
+
const list = createLocal(generator);
|
|
272
|
+
const kept = createLocal(generator);
|
|
273
|
+
const element = createLocal(generator);
|
|
274
|
+
const node = addReference(generator, expression);
|
|
275
|
+
const filterLazily = addReference(generator, getLazyFilter(expression, generator.environment));
|
|
276
|
+
const lazy = `if (!isReducible(${base})) return ${filterLazily}(${base}, ${getDelegateContext(generator, expression, bodyFrame)});`;
|
|
277
|
+
const set = generateExpression(generator, expression.bound.set, bodyFrame);
|
|
278
|
+
bodyFrame.locals.set(name, element);
|
|
279
|
+
const stop = isUniformPredicate(expression, generator.environment) ? " else break;" : "";
|
|
280
|
+
const test = `if (filterPredicate(${generateExpression(generator, expression.predicate, bodyFrame)}, ${node})) addBounded(${kept}, ${element});${stop}`;
|
|
281
|
+
return `const ${base} = ${set}; ${lazy} const ${list} = ${base}.kind === "Interval" ? ${base} : finiteElements(${base}); const ${kept} = []; ${generateLoop(generator, list, element, test)} return normalizedSet(${kept});`;
|
|
282
|
+
});
|
|
283
|
+
|
|
284
|
+
const generateFunctionConstruction = (
|
|
285
|
+
generator: Generator,
|
|
286
|
+
expression: Expression & { kind: "FunctionConstruction" },
|
|
287
|
+
name: string,
|
|
288
|
+
frame: Frame,
|
|
289
|
+
) =>
|
|
290
|
+
generateHelper(generator, frame, (bodyFrame) => {
|
|
291
|
+
const domain = createLocal(generator);
|
|
292
|
+
const isBeyond = createLocal(generator);
|
|
293
|
+
const keys = createLocal(generator);
|
|
294
|
+
const values = createLocal(generator);
|
|
295
|
+
const element = createLocal(generator);
|
|
296
|
+
const value = createLocal(generator);
|
|
297
|
+
const builder = addReference(generator, getFunctionBuilder(expression, generator.environment));
|
|
298
|
+
const builtContext = getDelegateContext(generator, expression, bodyFrame);
|
|
299
|
+
const built = `if (context.isKeepLazy || !isReducible(${domain})) return ${builder}.build(${domain}, ${builtContext});`;
|
|
300
|
+
const set = generateExpression(generator, expression.bounds[0].set, bodyFrame);
|
|
301
|
+
bodyFrame.locals.set(name, element);
|
|
302
|
+
const store = `const ${value} = ${generateExpression(generator, expression.body, bodyFrame)}; if (!${isBeyond}) ${values}.push(${value});`;
|
|
303
|
+
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});`;
|
|
304
|
+
});
|
|
305
|
+
|
|
197
306
|
const generateApply = (
|
|
198
307
|
generator: Generator,
|
|
199
308
|
expression: Expression & { kind: "Apply" },
|
|
@@ -203,7 +312,14 @@ const generateApply = (
|
|
|
203
312
|
if (expression.operator === "=>") {
|
|
204
313
|
const left = generateExpression(generator, args[0], frame);
|
|
205
314
|
const right = generateExpression(generator, args[1], frame);
|
|
206
|
-
|
|
315
|
+
const reference = addReference(generator, expression);
|
|
316
|
+
return `(implication(${left}, ${reference}, "P") ? implication(${right}, ${reference}, "Q") : true)`;
|
|
317
|
+
}
|
|
318
|
+
if (expression.operator === "~" && args.length === 1) {
|
|
319
|
+
return `negate(${generateExpression(generator, args[0], frame)}, ${addReference(generator, expression)})`;
|
|
320
|
+
}
|
|
321
|
+
if (expression.operator === "<=>") {
|
|
322
|
+
return `equivalent(${generateExpression(generator, args[0], frame)}, ${generateExpression(generator, args[1], frame)}, ${addReference(generator, expression)})`;
|
|
207
323
|
}
|
|
208
324
|
if (isLocallyResolved(expression)) return generateDelegate(generator, expression, frame);
|
|
209
325
|
const builtin = resolveGlobalOperator(expression.operator, generator.environment);
|
|
@@ -212,9 +328,8 @@ const generateApply = (
|
|
|
212
328
|
const domain = addReference(generator, getDomainOperator(expression));
|
|
213
329
|
return `${domain}(${generateExpression(generator, args[0], frame)})`;
|
|
214
330
|
}
|
|
215
|
-
if (builtin.name === "
|
|
216
|
-
|
|
217
|
-
const subset = addReference(generator, getSubsetOperator(expression, builtin));
|
|
331
|
+
if (builtin.name === "\\subseteq" && builtin.evaluateBinary && args.length === 2) {
|
|
332
|
+
const subset = addReference(generator, getSubsetOperator(expression, builtin.evaluateBinary));
|
|
218
333
|
return `${subset}(${generateExpression(generator, args[0], frame)}, ${generateExpression(generator, args[1], frame)})`;
|
|
219
334
|
}
|
|
220
335
|
const environment = generator.environment;
|
|
@@ -233,7 +348,6 @@ const generateApply = (
|
|
|
233
348
|
return generateDelegate(generator, expression, frame);
|
|
234
349
|
};
|
|
235
350
|
|
|
236
|
-
// Whether an expression only reads values, so that it constructs no function whatever the control.
|
|
237
351
|
const isConstructionFree = (
|
|
238
352
|
expression: Expression,
|
|
239
353
|
frame: Frame,
|
|
@@ -259,8 +373,6 @@ const isConstructionFree = (
|
|
|
259
373
|
}
|
|
260
374
|
};
|
|
261
375
|
|
|
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
376
|
const isReadOnly = (expression: Expression): boolean => {
|
|
265
377
|
switch (expression.kind) {
|
|
266
378
|
case "Identifier":
|
|
@@ -281,9 +393,7 @@ const generateExpression = (generator: Generator, expression: Expression, frame:
|
|
|
281
393
|
generateExpression(generator, node, nodeFrame);
|
|
282
394
|
switch (expression.kind) {
|
|
283
395
|
case "Number":
|
|
284
|
-
if (isTlcInteger(expression.value))
|
|
285
|
-
return String(expression.value);
|
|
286
|
-
}
|
|
396
|
+
if (isTlcInteger(expression.value)) return String(expression.value);
|
|
287
397
|
return generateDelegate(generator, expression, frame);
|
|
288
398
|
case "String":
|
|
289
399
|
return JSON.stringify(expression.value);
|
|
@@ -304,6 +414,7 @@ const generateExpression = (generator: Generator, expression: Expression, frame:
|
|
|
304
414
|
return generateApply(generator, expression, frame);
|
|
305
415
|
case "And":
|
|
306
416
|
case "Or": {
|
|
417
|
+
if (expression.operands.length === 0) return String(expression.kind === "And");
|
|
307
418
|
const node = addReference(generator, expression);
|
|
308
419
|
const operator = expression.kind === "And" ? " && " : " || ";
|
|
309
420
|
return `(${expression.operands.map((operand, index) => `junct(${generate(operand)}, ${node}, ${index})`).join(operator)})`;
|
|
@@ -312,7 +423,6 @@ const generateExpression = (generator: Generator, expression: Expression, frame:
|
|
|
312
423
|
return `(condition(${generate(expression.condition)}, ${addReference(generator, expression)}) ? ${generate(expression.consequent)} : ${generate(expression.alternative)})`;
|
|
313
424
|
case "FunctionApplication": {
|
|
314
425
|
keepLazy(expression.function);
|
|
315
|
-
// The interpreter evaluates a function that may construct one with EvalControl.KeepLazy.
|
|
316
426
|
const keepLazyFrame = { ...frame, context: `keepLazyContext(${frame.context})` };
|
|
317
427
|
const evaluatedFunction = isConstructionFree(
|
|
318
428
|
expression.function,
|
|
@@ -323,8 +433,6 @@ const generateExpression = (generator: Generator, expression: Expression, frame:
|
|
|
323
433
|
: isReadOnly(expression.function)
|
|
324
434
|
? generate(expression.function, keepLazyFrame)
|
|
325
435
|
: 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
436
|
const functionCode = `(applied = ${evaluatedFunction}, typeof applied === "object" && (applied.kind === "Function" || applied.kind === "LazyFunction") ? applied : expectFunction(applied, ${addReference(generator, expression)}))`;
|
|
329
437
|
const describeMissing = getMissingArgumentDescriber(generator.environment.runtime.version);
|
|
330
438
|
const error = describeMissing ? `, ${addReference(generator, describeMissing)}` : "";
|
|
@@ -341,29 +449,30 @@ const generateExpression = (generator: Generator, expression: Expression, frame:
|
|
|
341
449
|
generator,
|
|
342
450
|
fields.map((field) => field.name),
|
|
343
451
|
);
|
|
344
|
-
const values = `[${fields.map((field) => generate(field.value)).join(", ")}]`;
|
|
452
|
+
const values = `[${expression.fields.map((field) => generate(field.value)).join(", ")}]`;
|
|
345
453
|
const writtenNames = expression.fields.map((field) => field.name);
|
|
346
454
|
if (writtenNames.every((name, index) => name === fields[index].name)) {
|
|
347
455
|
return `record(${names}, ${values})`;
|
|
348
456
|
}
|
|
349
|
-
|
|
457
|
+
const writtenIndexes = addReference(
|
|
458
|
+
generator,
|
|
459
|
+
fields.map((field) => expression.fields.indexOf(field)),
|
|
460
|
+
);
|
|
461
|
+
return `writtenRecord(${names}, ${writtenIndexes}, ${values}, ${addReference(generator, writtenNames)})`;
|
|
350
462
|
}
|
|
351
463
|
case "Tuple":
|
|
352
464
|
return `tuple([${expression.elements.map((element) => generate(element)).join(", ")}])`;
|
|
353
465
|
case "SetEnumeration":
|
|
354
466
|
return `set([${expression.elements.map((element) => generate(element)).join(", ")}])`;
|
|
355
|
-
case "Prime":
|
|
356
|
-
|
|
357
|
-
|
|
358
|
-
const primed = {
|
|
467
|
+
case "Prime":
|
|
468
|
+
if (frame.isPrimed) return generateDelegate(generator, expression, frame);
|
|
469
|
+
return generate(expression.expression, {
|
|
359
470
|
context: `(primed ??= prime(${frame.context}))`,
|
|
360
471
|
state: frame.next,
|
|
361
472
|
next: "undefined",
|
|
362
473
|
isPrimed: true,
|
|
363
474
|
locals: frame.locals,
|
|
364
|
-
};
|
|
365
|
-
return `(${frame.next} === undefined ? primeOutsideAction(${node}) : ${generate(expression.expression, primed)})`;
|
|
366
|
-
}
|
|
475
|
+
});
|
|
367
476
|
case "Unchanged": {
|
|
368
477
|
const primed = generate({
|
|
369
478
|
kind: "Prime",
|
|
@@ -378,6 +487,34 @@ const generateExpression = (generator: Generator, expression: Expression, frame:
|
|
|
378
487
|
return generateQuantifier(generator, expression, frame);
|
|
379
488
|
}
|
|
380
489
|
return generateDelegate(generator, expression, frame);
|
|
490
|
+
case "Choose":
|
|
491
|
+
if (expression.set && expression.pattern.kind === "Name") {
|
|
492
|
+
return generateChoose(
|
|
493
|
+
generator,
|
|
494
|
+
expression,
|
|
495
|
+
expression.set,
|
|
496
|
+
expression.pattern.name,
|
|
497
|
+
frame,
|
|
498
|
+
);
|
|
499
|
+
}
|
|
500
|
+
return generateDelegate(generator, expression, frame);
|
|
501
|
+
case "FunctionConstruction": {
|
|
502
|
+
const bound = expression.bounds[0];
|
|
503
|
+
if (
|
|
504
|
+
expression.bounds.length === 1 &&
|
|
505
|
+
bound.pattern.kind === "Name" &&
|
|
506
|
+
!expression.isRecursive &&
|
|
507
|
+
!isKeptLazy(expression)
|
|
508
|
+
) {
|
|
509
|
+
return generateFunctionConstruction(generator, expression, bound.pattern.name, frame);
|
|
510
|
+
}
|
|
511
|
+
return generateDelegate(generator, expression, frame);
|
|
512
|
+
}
|
|
513
|
+
case "SetFilter":
|
|
514
|
+
if (expression.bound.pattern.kind === "Name") {
|
|
515
|
+
return generateSetFilter(generator, expression, expression.bound.pattern.name, frame);
|
|
516
|
+
}
|
|
517
|
+
return generateDelegate(generator, expression, frame);
|
|
381
518
|
default:
|
|
382
519
|
return generateDelegate(generator, expression, frame);
|
|
383
520
|
}
|
|
@@ -388,8 +525,8 @@ export const generateEvaluator = (
|
|
|
388
525
|
environment: Environment,
|
|
389
526
|
): Evaluator | undefined => {
|
|
390
527
|
if (!GENERATED_KINDS.has(expression.kind)) return undefined;
|
|
391
|
-
|
|
392
|
-
if (!
|
|
528
|
+
isCodeGenerationAllowed ??= getIsCodeGenerationAllowed();
|
|
529
|
+
if (!isCodeGenerationAllowed) return undefined;
|
|
393
530
|
const generator: Generator = { environment, references: [], helpers: [], counter: 0 };
|
|
394
531
|
const frame: Frame = {
|
|
395
532
|
context: "context",
|
|
@@ -399,11 +536,9 @@ export const generateEvaluator = (
|
|
|
399
536
|
locals: new Map(),
|
|
400
537
|
};
|
|
401
538
|
const body = generateExpression(generator, expression, frame);
|
|
402
|
-
const referenceNames = generator.references.map((
|
|
539
|
+
const referenceNames = generator.references.map((_reference, index) => `reference${index}`);
|
|
403
540
|
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);
|
|
541
|
+
generatedHelpers ??= createGeneratedHelpers();
|
|
542
|
+
const factory = new Function(...Object.keys(generatedHelpers), ...referenceNames, source);
|
|
543
|
+
return factory(...Object.values(generatedHelpers), ...generator.references);
|
|
409
544
|
};
|