tla-ts 0.0.9 → 0.0.10-dev.28c823e4b
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 +29 -1
- package/dist/compile.cjs +23 -0
- package/dist/compile.js +23 -0
- package/dist/deciders.cjs +28 -28
- package/dist/deciders.js +43 -43
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +106 -10
- package/dist/index.d.ts +106 -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 +116 -36
- package/dist/prove.js +116 -36
- package/dist/run.cjs +143 -31
- package/dist/run.js +143 -31
- package/dist/tlapm.cjs +2 -2
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +129 -104
- package/dist/transfer.js +129 -104
- package/dist/worker.cjs +7 -7
- package/dist/worker.js +7 -7
- package/package.json +3 -1
- package/src/ast.ts +4 -23
- package/src/bags.ts +99 -102
- package/src/builtins.ts +40 -78
- package/src/bundled-modules.ts +1 -8
- package/src/check.ts +599 -388
- package/src/cli/options.ts +11 -6
- package/src/cli/run.ts +0 -2
- package/src/cli/runtime-invariants.ts +136 -0
- package/src/cli/shared.ts +18 -11
- package/src/cli/tlapm.ts +0 -12
- package/src/cli/tlc-arguments.ts +640 -0
- package/src/cli/tlc-usage.ts +361 -0
- package/src/cli/tlc.ts +538 -220
- package/src/cli/typescript.ts +23 -0
- package/src/cli/xml-exporter.ts +4 -16
- package/src/cli.ts +0 -1
- package/src/codegen.ts +191 -64
- package/src/config.ts +140 -109
- package/src/coverage.ts +837 -0
- package/src/dependencies.ts +6 -40
- package/src/dfid.ts +618 -0
- package/src/environment.ts +240 -118
- package/src/errors.ts +70 -55
- package/src/evaluate.ts +596 -339
- package/src/exit-codes.ts +37 -3
- package/src/fingerprints.ts +10 -10
- package/src/index.ts +3 -0
- package/src/instances.ts +79 -11
- package/src/java-overrides.ts +4 -19
- package/src/json-reader.ts +455 -0
- package/src/json.ts +255 -139
- package/src/levels.ts +8 -17
- package/src/lexer.ts +80 -100
- package/src/liveness-checker.ts +82 -119
- package/src/liveness.ts +112 -64
- package/src/obligations/action.ts +4 -28
- package/src/obligations/anonymize.ts +84 -80
- package/src/obligations/equality.ts +1 -1
- package/src/obligations/expression.ts +2 -19
- package/src/obligations/format.ts +1 -9
- package/src/obligations/generate.ts +1 -11
- package/src/obligations/index.ts +0 -11
- package/src/obligations/levels.ts +4 -8
- package/src/obligations/module.ts +1 -15
- package/src/obligations/normalize.ts +5 -24
- package/src/obligations/operators.ts +1 -2
- package/src/obligations/pragma.ts +1 -10
- package/src/obligations/printer.ts +47 -46
- package/src/obligations/proof.ts +1 -5
- package/src/obligations/regroup.ts +1 -4
- package/src/obligations/simplify.ts +3 -14
- package/src/obligations/source.ts +1 -21
- package/src/obligations/subexpression.ts +5 -11
- package/src/obligations/substitution.ts +1 -3
- package/src/obligations/temporal.ts +8 -14
- package/src/obligations/tuples.ts +3 -9
- package/src/parallel-worker.ts +29 -39
- package/src/parallel.ts +53 -44
- package/src/parser.ts +565 -282
- 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 +5 -10
- package/src/prover/deciders.ts +0 -4
- package/src/prover/first-order.ts +0 -11
- package/src/prover/isabelle/decide.ts +0 -6
- package/src/prover/isabelle/encode.ts +11 -23
- package/src/prover/isabelle/isar/inner-syntax.ts +108 -114
- package/src/prover/isabelle/isar/method.ts +25 -38
- package/src/prover/isabelle/isar/proof.ts +1 -10
- package/src/prover/isabelle/isar/statement.ts +1 -6
- package/src/prover/isabelle/isar/theory.ts +15 -26
- package/src/prover/isabelle/isar/type-check.ts +11 -25
- package/src/prover/isabelle/provers/blast/blast.ts +10 -41
- package/src/prover/isabelle/provers/blast/branch.ts +1 -32
- package/src/prover/isabelle/provers/blast/prove.ts +1 -35
- package/src/prover/isabelle/provers/blast/rules.ts +6 -44
- package/src/prover/isabelle/provers/blast/state.ts +2 -28
- package/src/prover/isabelle/provers/blast/term.ts +9 -36
- package/src/prover/isabelle/provers/clasimp.ts +1 -13
- package/src/prover/isabelle/provers/classical.ts +14 -42
- package/src/prover/isabelle/provers/hypsubst.ts +11 -25
- package/src/prover/isabelle/pure/bicompose.ts +16 -13
- package/src/prover/isabelle/pure/consts.ts +1 -7
- package/src/prover/isabelle/pure/conv.ts +1 -9
- package/src/prover/isabelle/pure/drule.ts +24 -40
- package/src/prover/isabelle/pure/envir.ts +3 -52
- package/src/prover/isabelle/pure/goal.ts +1 -7
- 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 -14
- package/src/prover/isabelle/pure/name.ts +2 -9
- package/src/prover/isabelle/pure/net.ts +3 -59
- package/src/prover/isabelle/pure/object-logic.ts +3 -10
- package/src/prover/isabelle/pure/pattern.ts +2 -19
- package/src/prover/isabelle/pure/raw-simplifier.ts +13 -49
- package/src/prover/isabelle/pure/rewriter.ts +26 -58
- package/src/prover/isabelle/pure/search.ts +3 -10
- package/src/prover/isabelle/pure/seq.ts +1 -10
- package/src/prover/isabelle/pure/simplifier.ts +4 -12
- package/src/prover/isabelle/pure/table.ts +1 -31
- package/src/prover/isabelle/pure/tactic.ts +12 -22
- package/src/prover/isabelle/pure/tactical.ts +6 -12
- package/src/prover/isabelle/pure/term-ord.ts +2 -6
- package/src/prover/isabelle/pure/term.ts +2 -43
- package/src/prover/isabelle/pure/thm.ts +13 -36
- package/src/prover/isabelle/pure/type.ts +2 -15
- package/src/prover/isabelle/pure/unify.ts +20 -30
- package/src/prover/isabelle/pure/variable.ts +3 -7
- package/src/prover/isabelle/tla/classical-setup.ts +9 -19
- package/src/prover/isabelle/tla/context.ts +8 -16
- package/src/prover/isabelle/tla/logic.ts +4 -11
- package/src/prover/isabelle/tla/simpdata.ts +46 -34
- package/src/prover/isabelle/tools/intuitionistic.ts +1 -10
- package/src/prover/ocaml.ts +0 -6
- package/src/prover/prep/action.ts +4 -36
- package/src/prover/prep/enabled-axioms.ts +12 -19
- package/src/prover/prep/fingerprint.ts +0 -16
- package/src/prover/prep/level-comparison.ts +8 -12
- package/src/prover/prep/md5.ts +0 -2
- package/src/prover/prep/methods.ts +9 -36
- package/src/prover/prep/normalize.ts +4 -28
- package/src/prover/prove-worker.ts +0 -2
- package/src/prover/prove.ts +0 -36
- package/src/prover/ptl/decide.ts +7 -12
- package/src/prover/ptl/encode.ts +14 -36
- package/src/prover/ptl/sat.ts +24 -32
- package/src/prover/ptl/tableau.ts +12 -26
- package/src/prover/smt/axioms.ts +0 -7
- package/src/prover/smt/context.ts +19 -26
- package/src/prover/smt/data.ts +51 -54
- package/src/prover/smt/encode.ts +14 -35
- package/src/prover/smt/extensionality.ts +0 -10
- package/src/prover/smt/flatten.ts +3 -22
- package/src/prover/smt/format.ts +5 -10
- package/src/prover/smt/instances.ts +0 -10
- package/src/prover/smt/rewrite.ts +66 -101
- package/src/prover/smt/solver/act-cache.ts +0 -15
- package/src/prover/smt/solver/arith-rewriter.ts +3 -48
- package/src/prover/smt/solver/array.ts +1 -3
- package/src/prover/smt/solver/asserted-formulas.ts +1 -43
- package/src/prover/smt/solver/ast-lt.ts +1 -11
- package/src/prover/smt/solver/ast-util.ts +1 -6
- package/src/prover/smt/solver/ast.ts +1 -143
- package/src/prover/smt/solver/auf-solver.ts +6 -39
- package/src/prover/smt/solver/case-split-queue.ts +1 -9
- package/src/prover/smt/solver/cg-table.ts +1 -18
- package/src/prover/smt/solver/clause.ts +1 -27
- package/src/prover/smt/solver/conflict-resolution.ts +0 -9
- package/src/prover/smt/solver/context.ts +4 -61
- package/src/prover/smt/solver/ctx-simplify.ts +14 -41
- package/src/prover/smt/solver/der.ts +2 -21
- package/src/prover/smt/solver/dyn-ack.ts +1 -11
- package/src/prover/smt/solver/e-matching.ts +3 -34
- package/src/prover/smt/solver/enode.ts +1 -21
- package/src/prover/smt/solver/expr-ref.ts +1 -5
- package/src/prover/smt/solver/expr-safe-replace.ts +0 -5
- package/src/prover/smt/solver/fingerprints.ts +1 -12
- package/src/prover/smt/solver/flat-literals.ts +1 -9
- package/src/prover/smt/solver/goal.ts +2 -14
- package/src/prover/smt/solver/hash.ts +0 -8
- package/src/prover/smt/solver/hashtable.ts +1 -12
- package/src/prover/smt/solver/internalizer.ts +6 -98
- package/src/prover/smt/solver/lbool.ts +1 -2
- package/src/prover/smt/solver/literal.ts +0 -3
- package/src/prover/smt/solver/lp/bound-propagator.ts +8 -26
- package/src/prover/smt/solver/lp/constraints.ts +2 -8
- package/src/prover/smt/solver/lp/containers.ts +12 -30
- package/src/prover/smt/solver/lp/core-solver.ts +10 -31
- package/src/prover/smt/solver/lp/cross-nested.ts +6 -20
- package/src/prover/smt/solver/lp/dep-intervals.ts +7 -22
- package/src/prover/smt/solver/lp/dependency.ts +1 -4
- package/src/prover/smt/solver/lp/dioph-eq.ts +12 -98
- package/src/prover/smt/solver/lp/explanation.ts +1 -6
- package/src/prover/smt/solver/lp/gomory.ts +9 -22
- package/src/prover/smt/solver/lp/hnf-cutter.ts +17 -23
- package/src/prover/smt/solver/lp/hnf.ts +11 -26
- package/src/prover/smt/solver/lp/int-cube.ts +15 -36
- package/src/prover/smt/solver/lp/int-solver.ts +4 -34
- package/src/prover/smt/solver/lp/lar-solver.ts +32 -81
- package/src/prover/smt/solver/lp/lar-term.ts +1 -5
- package/src/prover/smt/solver/lp/lp-settings.ts +1 -14
- package/src/prover/smt/solver/lp/maximize-term.ts +20 -45
- package/src/prover/smt/solver/lp/nex-creator.ts +5 -28
- package/src/prover/smt/solver/lp/nex.ts +1 -6
- package/src/prover/smt/solver/lp/nla-backoff.ts +1 -4
- package/src/prover/smt/solver/lp/nla-basics.ts +5 -30
- package/src/prover/smt/solver/lp/nla-core.ts +35 -130
- package/src/prover/smt/solver/lp/nla-divisions.ts +32 -42
- package/src/prover/smt/solver/lp/nla-emonics.ts +4 -21
- package/src/prover/smt/solver/lp/nla-factorization.ts +1 -4
- package/src/prover/smt/solver/lp/nla-grobner.ts +15 -69
- package/src/prover/smt/solver/lp/nla-horner.ts +3 -11
- package/src/prover/smt/solver/lp/nla-intervals.ts +2 -12
- package/src/prover/smt/solver/lp/nla-monomial-bounds.ts +16 -41
- package/src/prover/smt/solver/lp/nla-monotone.ts +2 -6
- package/src/prover/smt/solver/lp/nla-order.ts +2 -13
- package/src/prover/smt/solver/lp/nla-patcher.ts +4 -7
- package/src/prover/smt/solver/lp/nla-tangents.ts +1 -9
- package/src/prover/smt/solver/lp/nla-throttle.ts +1 -6
- package/src/prover/smt/solver/lp/nla-types.ts +1 -11
- package/src/prover/smt/solver/lp/nla-var-eqs.ts +4 -25
- package/src/prover/smt/solver/lp/nra-solver.ts +5 -52
- package/src/prover/smt/solver/lp/numeric-pair.ts +1 -4
- package/src/prover/smt/solver/lp/pdd-interval.ts +1 -3
- package/src/prover/smt/solver/lp/pdd-simplifier.ts +2 -14
- package/src/prover/smt/solver/lp/pdd-solver.ts +4 -33
- package/src/prover/smt/solver/lp/pdd.ts +7 -70
- package/src/prover/smt/solver/lp/random-updater.ts +1 -8
- package/src/prover/smt/solver/lp/static-matrix.ts +9 -19
- package/src/prover/smt/solver/lp/union-find.ts +1 -6
- package/src/prover/smt/solver/mam-compiler.ts +14 -56
- package/src/prover/smt/solver/mam-interpreter.ts +1 -21
- package/src/prover/smt/solver/maximize-ac-sharing.ts +2 -17
- package/src/prover/smt/solver/model-checker.ts +2 -36
- package/src/prover/smt/solver/model-evaluator.ts +3 -29
- package/src/prover/smt/solver/model-finder.ts +3 -15
- package/src/prover/smt/solver/model-generator.ts +1 -12
- package/src/prover/smt/solver/model-macro-solver.ts +12 -69
- package/src/prover/smt/solver/nlsat/algebraic.ts +55 -151
- package/src/prover/smt/solver/nlsat/atoms.ts +5 -19
- package/src/prover/smt/solver/nlsat/evaluator.ts +17 -22
- package/src/prover/smt/solver/nlsat/explain.ts +3 -47
- package/src/prover/smt/solver/nlsat/interval-set.ts +9 -50
- package/src/prover/smt/solver/nlsat/levelwise.ts +48 -129
- package/src/prover/smt/solver/nlsat/mpbq.ts +3 -14
- package/src/prover/smt/solver/nlsat/polynomial.ts +17 -156
- package/src/prover/smt/solver/nlsat/solver.ts +7 -67
- package/src/prover/smt/solver/nlsat/types.ts +1 -8
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +1 -44
- package/src/prover/smt/solver/nlsat/upolynomial.ts +11 -92
- package/src/prover/smt/solver/nnf.ts +3 -38
- package/src/prover/smt/solver/pattern-inference.ts +2 -15
- package/src/prover/smt/solver/poly-rewriter.ts +3 -23
- package/src/prover/smt/solver/propagate-values.ts +1 -10
- package/src/prover/smt/solver/proto-model.ts +3 -48
- package/src/prover/smt/solver/pull-quant.ts +1 -12
- package/src/prover/smt/solver/qe-lite-der.ts +1 -29
- package/src/prover/smt/solver/qe-lite-fm.ts +2 -25
- package/src/prover/smt/solver/qe-lite.ts +3 -33
- package/src/prover/smt/solver/qi-queue.ts +1 -16
- package/src/prover/smt/solver/quant-tactics.ts +5 -22
- package/src/prover/smt/solver/quantifier-analyzer.ts +17 -37
- package/src/prover/smt/solver/quantifier-manager.ts +1 -8
- package/src/prover/smt/solver/random-gen.ts +1 -2
- package/src/prover/smt/solver/rational.ts +1 -8
- package/src/prover/smt/solver/ref-vector.ts +1 -6
- package/src/prover/smt/solver/relevancy.ts +2 -15
- package/src/prover/smt/solver/rewriter-tpl.ts +3 -147
- package/src/prover/smt/solver/rewriter.ts +3 -85
- package/src/prover/smt/solver/rlimit.ts +2 -20
- package/src/prover/smt/solver/smtlib-parser.ts +2 -37
- package/src/prover/smt/solver/solver.ts +23 -34
- package/src/prover/smt/solver/sort.ts +1 -5
- package/src/prover/smt/solver/sticky-generations.ts +0 -5
- package/src/prover/smt/solver/theory-lra-axioms.ts +3 -24
- package/src/prover/smt/solver/theory-lra-bounds.ts +0 -5
- package/src/prover/smt/solver/theory-lra-final-check.ts +4 -22
- package/src/prover/smt/solver/theory-lra-internalize.ts +1 -27
- package/src/prover/smt/solver/theory-lra-model.ts +4 -19
- package/src/prover/smt/solver/theory-lra-propagate.ts +1 -15
- package/src/prover/smt/solver/theory-lra-state.ts +3 -8
- package/src/prover/smt/solver/theory-lra.ts +1 -8
- package/src/prover/smt/solver/var-subst.ts +2 -26
- package/src/prover/smt/table.ts +0 -8
- package/src/prover/tlapm/cache.ts +20 -25
- package/src/prover/tlapm/ocaml-marshal.ts +19 -21
- package/src/prover/tlapm/tlapm.ts +12 -17
- package/src/prover/verdict.ts +0 -2
- package/src/prover/zenon/check/check.ts +0 -9
- 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 +0 -5
- package/src/prover/zenon/check/relations.ts +0 -13
- package/src/prover/zenon/check/rewrites.ts +0 -6
- package/src/prover/zenon/check/sets.ts +0 -3
- package/src/prover/zenon/check/terms.ts +0 -17
- package/src/prover/zenon/check/tla.ts +0 -6
- package/src/prover/zenon/decide.ts +0 -12
- package/src/prover/zenon/encode.ts +1 -8
- package/src/prover/zenon/eqrel.ts +0 -13
- package/src/prover/zenon/equality-rules.ts +0 -4
- package/src/prover/zenon/expr.ts +1 -26
- package/src/prover/zenon/index-table.ts +17 -38
- package/src/prover/zenon/isar-case.ts +9 -19
- package/src/prover/zenon/isar.ts +1 -29
- package/src/prover/zenon/limits.ts +0 -4
- package/src/prover/zenon/llproof.ts +0 -9
- package/src/prover/zenon/mltoll.ts +54 -76
- package/src/prover/zenon/node.ts +1 -11
- package/src/prover/zenon/ocaml.ts +1 -17
- package/src/prover/zenon/parse.ts +2 -7
- package/src/prover/zenon/phrase.ts +1 -11
- package/src/prover/zenon/proof.ts +0 -9
- package/src/prover/zenon/propositional-rules.ts +0 -5
- package/src/prover/zenon/rules.ts +2 -6
- package/src/prover/zenon/search.ts +1 -17
- package/src/prover/zenon/tla/functions.ts +57 -29
- package/src/prover/zenon/tla/llproof.ts +63 -70
- package/src/prover/zenon/tla/records.ts +56 -27
- package/src/prover/zenon/tla/rewrites.ts +12 -19
- package/src/prover/zenon/tla/sets.ts +68 -39
- package/src/prover/zenon/tla/terms.ts +0 -6
- package/src/prover/zenon/tla/tla.ts +59 -58
- package/src/randomization.ts +81 -35
- package/src/resolve.ts +12 -112
- package/src/runtime.ts +22 -22
- package/src/sany/builtins.ts +2 -5
- package/src/sany/generator.ts +149 -252
- package/src/sany/levels.ts +6 -34
- package/src/sany/lexer.ts +41 -61
- package/src/sany/linter.ts +1 -9
- package/src/sany/modules.ts +1 -5
- package/src/sany/nodes.ts +0 -31
- package/src/sany/parse-error.ts +39 -117
- package/src/sany/report.ts +29 -63
- package/src/sany/selectors.ts +15 -39
- package/src/sany/source.ts +1 -17
- package/src/sany/xml.ts +13 -63
- package/src/search.ts +495 -155
- package/src/simulate.ts +685 -0
- package/src/spec-description.ts +176 -69
- package/src/standard-definitions.ts +0 -4
- package/src/standard-modules.ts +254 -69
- package/src/state-graph.ts +50 -24
- package/src/subexpressions.ts +69 -52
- package/src/substitution-levels.ts +2 -3
- package/src/successors.ts +263 -94
- package/src/symmetry.ts +33 -25
- package/src/tableau.ts +27 -24
- package/src/tlc/fingerprint.ts +183 -67
- package/src/tlc/jar-data.ts +112 -6
- package/src/tlc/messages.ts +110 -44
- package/src/tlc/order.ts +37 -60
- package/src/tlc/random.ts +33 -45
- package/src/tlc/replay.ts +549 -217
- package/src/tlc/summary.ts +36 -47
- package/src/tlc/tlc-operators.ts +76 -41
- package/src/tlc/tlcext-operators.ts +139 -122
- package/src/tlc/trace-spec.ts +269 -0
- package/src/tlc/value-stream.ts +139 -0
- package/src/tlc/version.ts +1 -4
- package/src/transfer.ts +22 -25
- package/src/typescript/actions.ts +481 -0
- package/src/typescript/collections.ts +600 -0
- package/src/typescript/compile.ts +65 -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 +152 -0
- package/src/typescript/functions.ts +284 -0
- package/src/typescript/model.ts +163 -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 +165 -0
- package/src/typescript/types.ts +171 -0
- package/src/values.ts +780 -337
- package/src/worker.ts +7 -8
|
@@ -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
|
@@ -14,7 +14,6 @@ import {
|
|
|
14
14
|
toLibraryPath,
|
|
15
15
|
} from "./shared";
|
|
16
16
|
|
|
17
|
-
// The usage that XMLExporter.printUsage prints with UsageGenerator.
|
|
18
17
|
const XML_EXPORT_USAGE = (() => {
|
|
19
18
|
const bold = (text: string) => `\x1b[1m${text}\x1b[0m`;
|
|
20
19
|
const options = [
|
|
@@ -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));
|
|
@@ -91,24 +89,22 @@ interface XmlExportArgs {
|
|
|
91
89
|
error: "missing-include" | "several-files" | undefined;
|
|
92
90
|
}
|
|
93
91
|
|
|
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
92
|
const parseXmlExportArgs = (args: string[], flagNames: Set<string>): XmlExportArgs => {
|
|
97
93
|
const parsed: XmlExportArgs = { flags: new Set(), includes: [], error: undefined };
|
|
98
|
-
|
|
94
|
+
let lastFlagIndex = -1;
|
|
99
95
|
for (let index = 0; index < args.length - 1; index++) {
|
|
100
96
|
if (flagNames.has(args[index])) {
|
|
101
97
|
parsed.flags.add(args[index]);
|
|
102
|
-
|
|
98
|
+
lastFlagIndex = index;
|
|
103
99
|
continue;
|
|
104
100
|
}
|
|
105
101
|
if (args[index] !== "-I") continue;
|
|
106
102
|
index++;
|
|
107
103
|
if (index > args.length - 2) return { ...parsed, error: "missing-include" };
|
|
108
104
|
parsed.includes.push(args[index]);
|
|
109
|
-
|
|
105
|
+
lastFlagIndex = index;
|
|
110
106
|
}
|
|
111
|
-
return
|
|
107
|
+
return lastFlagIndex === args.length - 2 ? parsed : { ...parsed, error: "several-files" };
|
|
112
108
|
};
|
|
113
109
|
|
|
114
110
|
export const exportXml = (args: string[]) => {
|
|
@@ -128,8 +124,6 @@ export const exportXml = (args: string[]) => {
|
|
|
128
124
|
return EXIT_STATUS.success;
|
|
129
125
|
}
|
|
130
126
|
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
127
|
const directories = [".", ...parsed.includes];
|
|
134
128
|
const path = directories.map((directory) => resolve(directory, fileName)).find(existsSync);
|
|
135
129
|
if (path === undefined && !SANY_STANDARD_MODULES.has(fileName.slice(0, -".tla".length))) {
|
|
@@ -152,8 +146,6 @@ export const exportXml = (args: string[]) => {
|
|
|
152
146
|
});
|
|
153
147
|
};
|
|
154
148
|
|
|
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
149
|
const printXmlExporterException = (exception: string, line: number) => {
|
|
158
150
|
console.error(
|
|
159
151
|
`Exception in thread "main" ${exception}\n\tat tla2sany.xml.XMLExporter.main(XMLExporter.java:${line})`,
|
|
@@ -161,8 +153,6 @@ const printXmlExporterException = (exception: string, line: number) => {
|
|
|
161
153
|
return XML_EXPORT_EXIT_CODE.uncaughtException;
|
|
162
154
|
};
|
|
163
155
|
|
|
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
156
|
export const exportXml174 = (args: string[], jar: string | undefined) => {
|
|
167
157
|
if (args.length === 0) {
|
|
168
158
|
return printXmlExporterException(
|
|
@@ -185,8 +175,6 @@ export const exportXml174 = (args: string[], jar: string | undefined) => {
|
|
|
185
175
|
}
|
|
186
176
|
const name = args[args.length - 1];
|
|
187
177
|
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
178
|
const libraries = (parsed.includes.length === 0 ? ["/"] : parsed.includes).map(toLibraryPath);
|
|
191
179
|
const directories = [".", ...libraries];
|
|
192
180
|
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
1
|
import { getChildren, 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,6 @@ import {
|
|
|
16
25
|
resolveGlobalOperator,
|
|
17
26
|
expectFunction,
|
|
18
27
|
toKeepLazyContext,
|
|
19
|
-
createPrimeOutsideActionError,
|
|
20
28
|
createUnassignedError,
|
|
21
29
|
getSortedFields,
|
|
22
30
|
hasDuplicateFields,
|
|
@@ -25,12 +33,20 @@ import {
|
|
|
25
33
|
type Evaluator,
|
|
26
34
|
} from "./evaluate";
|
|
27
35
|
import {
|
|
36
|
+
addBoundedElement,
|
|
28
37
|
applyFunction,
|
|
29
38
|
createEnumeratedSet,
|
|
39
|
+
createNormalizedSet,
|
|
40
|
+
createSortedFunction,
|
|
30
41
|
createSortedRecord,
|
|
31
42
|
createTuple,
|
|
32
43
|
createWrittenRecord,
|
|
44
|
+
getCardinality,
|
|
45
|
+
getFunctionDomain,
|
|
46
|
+
isBeyondSetBound,
|
|
47
|
+
isReducibleSet,
|
|
33
48
|
isTlcInteger,
|
|
49
|
+
toFiniteSet,
|
|
34
50
|
valuesEqual,
|
|
35
51
|
type Value,
|
|
36
52
|
} from "./values";
|
|
@@ -64,10 +80,16 @@ const GENERATED_KINDS = new Set([
|
|
|
64
80
|
"Unchanged",
|
|
65
81
|
"Forall",
|
|
66
82
|
"Exists",
|
|
83
|
+
"Choose",
|
|
84
|
+
"SetFilter",
|
|
85
|
+
"FunctionConstruction",
|
|
67
86
|
]);
|
|
68
87
|
|
|
69
88
|
const createGeneratedHelpers = () => ({
|
|
70
|
-
|
|
89
|
+
implication: expectImplication,
|
|
90
|
+
negate,
|
|
91
|
+
equivalent: isEquivalent,
|
|
92
|
+
body: expectBooleanBody,
|
|
71
93
|
condition: (value: Value, expression: Expression) => {
|
|
72
94
|
if (typeof value !== "boolean") throw createConditionError(expression, value);
|
|
73
95
|
return value;
|
|
@@ -84,12 +106,22 @@ const createGeneratedHelpers = () => ({
|
|
|
84
106
|
writtenRecord: createWrittenRecord,
|
|
85
107
|
equal: valuesEqual,
|
|
86
108
|
enumerate: getQuantifierElements,
|
|
109
|
+
choiceElements: getChoiceElements,
|
|
110
|
+
noChoice: (expression: Expression & { kind: "Choose" }): never => {
|
|
111
|
+
throw createNoChoiceError(expression);
|
|
112
|
+
},
|
|
113
|
+
filterPredicate: expectFilterPredicate,
|
|
114
|
+
isReducible: isReducibleSet,
|
|
115
|
+
finiteElements: (set: Value) => toFiniteSet(set).elements,
|
|
116
|
+
addBounded: addBoundedElement,
|
|
117
|
+
normalizedSet: createNormalizedSet,
|
|
118
|
+
isBeyondBound: isBeyondSetBound,
|
|
119
|
+
cardinality: getCardinality,
|
|
120
|
+
functionDomain: getFunctionDomain,
|
|
121
|
+
sortedFunction: createSortedFunction,
|
|
87
122
|
unassigned: (name: string, expression: Expression): never => {
|
|
88
123
|
throw createUnassignedError(name, expression);
|
|
89
124
|
},
|
|
90
|
-
primeOutsideAction: (expression: Expression): never => {
|
|
91
|
-
throw createPrimeOutsideActionError(expression);
|
|
92
|
-
},
|
|
93
125
|
prime: (context: Context): Context => ({
|
|
94
126
|
environment: context.environment,
|
|
95
127
|
scope: context.scope,
|
|
@@ -110,11 +142,9 @@ const createGeneratedHelpers = () => ({
|
|
|
110
142
|
}),
|
|
111
143
|
});
|
|
112
144
|
|
|
113
|
-
|
|
114
|
-
value: undefined as ReturnType<typeof createGeneratedHelpers> | undefined,
|
|
115
|
-
};
|
|
145
|
+
let generatedHelpers: ReturnType<typeof createGeneratedHelpers> | undefined;
|
|
116
146
|
|
|
117
|
-
|
|
147
|
+
let isCodeGenerationAllowed: boolean | undefined;
|
|
118
148
|
|
|
119
149
|
// Hosts such as Cloudflare Workers, or a page whose CSP lacks 'unsafe-eval', throw an EvalError.
|
|
120
150
|
const getIsCodeGenerationAllowed = () => {
|
|
@@ -140,26 +170,26 @@ const getFreeNames = (expression: Expression, names = new Set<string>()) => {
|
|
|
140
170
|
return names;
|
|
141
171
|
};
|
|
142
172
|
|
|
143
|
-
const
|
|
144
|
-
const evaluator = addReference(generator, getEvaluator(expression, generator.environment));
|
|
173
|
+
const getDelegateContext = (generator: Generator, expression: Expression, frame: Frame) => {
|
|
145
174
|
const freeNames = getFreeNames(expression);
|
|
146
175
|
const captured = [...frame.locals].filter(([name]) => freeNames.has(name));
|
|
147
|
-
if (captured.length === 0) return
|
|
176
|
+
if (captured.length === 0) return frame.context;
|
|
148
177
|
const names = addReference(
|
|
149
178
|
generator,
|
|
150
179
|
captured.map(([name]) => name),
|
|
151
180
|
);
|
|
152
|
-
return
|
|
181
|
+
return `extend(${frame.context}, ${names}, [${captured.map(([, local]) => local).join(", ")}])`;
|
|
153
182
|
};
|
|
154
183
|
|
|
155
|
-
const
|
|
184
|
+
const generateDelegate = (generator: Generator, expression: Expression, frame: Frame) =>
|
|
185
|
+
`${addReference(generator, getEvaluator(expression, generator.environment))}(${getDelegateContext(generator, expression, frame)})`;
|
|
186
|
+
|
|
187
|
+
const generateHelper = (
|
|
156
188
|
generator: Generator,
|
|
157
|
-
expression: Expression & { kind: "Forall" | "Exists" },
|
|
158
189
|
frame: Frame,
|
|
190
|
+
build: (bodyFrame: Frame) => string,
|
|
159
191
|
) => {
|
|
160
|
-
const
|
|
161
|
-
const description = JSON.stringify(isForall ? "the body of \\A" : "the body of \\E");
|
|
162
|
-
const name = `quantifier${generator.counter++}`;
|
|
192
|
+
const name = `helper${generator.counter++}`;
|
|
163
193
|
const outerLocals = [...frame.locals.values()];
|
|
164
194
|
const bodyFrame = {
|
|
165
195
|
context: "context",
|
|
@@ -168,32 +198,106 @@ const generateQuantifier = (
|
|
|
168
198
|
isPrimed: false,
|
|
169
199
|
locals: new Map(frame.locals),
|
|
170
200
|
};
|
|
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
201
|
const parameters = outerLocals.map((local) => `, ${local}`).join("");
|
|
191
202
|
generator.helpers.push(
|
|
192
|
-
`function ${name}(context, state, next${parameters}) { let primed; let applied; ${
|
|
203
|
+
`function ${name}(context, state, next${parameters}) { let primed; let applied; ${build(bodyFrame)} }`,
|
|
193
204
|
);
|
|
194
205
|
return `${name}(${frame.context}, ${frame.state}, ${frame.isPrimed ? "undefined" : frame.next}${parameters})`;
|
|
195
206
|
};
|
|
196
207
|
|
|
208
|
+
const generateLoop = (generator: Generator, list: string, element: string, code: string) => {
|
|
209
|
+
const position = createLocal(generator);
|
|
210
|
+
const low = createLocal(generator);
|
|
211
|
+
const size = createLocal(generator);
|
|
212
|
+
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} }`;
|
|
213
|
+
};
|
|
214
|
+
|
|
215
|
+
const generateQuantifier = (
|
|
216
|
+
generator: Generator,
|
|
217
|
+
expression: Expression & { kind: "Forall" | "Exists" },
|
|
218
|
+
frame: Frame,
|
|
219
|
+
) => {
|
|
220
|
+
const isForall = expression.kind === "Forall";
|
|
221
|
+
return generateHelper(generator, frame, (bodyFrame) => {
|
|
222
|
+
const lists = expression.bounds.map(() => createLocal(generator));
|
|
223
|
+
const declarations = expression.bounds.map((bound, index) =>
|
|
224
|
+
index > 0 && expression.bounds[index - 1].set === bound.set
|
|
225
|
+
? `const ${lists[index]} = ${lists[index - 1]};`
|
|
226
|
+
: `const ${lists[index]} = enumerate(${generateExpression(generator, bound.set, bodyFrame)}, ${addReference(generator, bound.set)}, ${JSON.stringify(generator.environment.runtime.version)});`,
|
|
227
|
+
);
|
|
228
|
+
const elements = expression.bounds.map((bound) => {
|
|
229
|
+
const local = createLocal(generator);
|
|
230
|
+
if (bound.pattern.kind === "Name") bodyFrame.locals.set(bound.pattern.name, local);
|
|
231
|
+
return local;
|
|
232
|
+
});
|
|
233
|
+
const test = `if (body(${generateExpression(generator, expression.body, bodyFrame)}, ${addReference(generator, expression)}) !== ${isForall}) return ${!isForall};`;
|
|
234
|
+
const loops = elements.reduce(
|
|
235
|
+
(code, element, index) => generateLoop(generator, lists[index], element, code),
|
|
236
|
+
test,
|
|
237
|
+
);
|
|
238
|
+
return `${declarations.join(" ")} ${loops} return ${isForall};`;
|
|
239
|
+
});
|
|
240
|
+
};
|
|
241
|
+
|
|
242
|
+
const generateChoose = (
|
|
243
|
+
generator: Generator,
|
|
244
|
+
expression: Expression & { kind: "Choose" },
|
|
245
|
+
set: Expression,
|
|
246
|
+
name: string,
|
|
247
|
+
frame: Frame,
|
|
248
|
+
) =>
|
|
249
|
+
generateHelper(generator, frame, (bodyFrame) => {
|
|
250
|
+
const list = createLocal(generator);
|
|
251
|
+
const element = createLocal(generator);
|
|
252
|
+
const node = addReference(generator, expression);
|
|
253
|
+
const elements = `choiceElements(${generateExpression(generator, set, bodyFrame)}, ${node}, ${addReference(generator, set)}, ${JSON.stringify(generator.environment.runtime.version)})`;
|
|
254
|
+
bodyFrame.locals.set(name, element);
|
|
255
|
+
const test = `if (body(${generateExpression(generator, expression.body, bodyFrame)}, ${node})) return ${element};`;
|
|
256
|
+
return `const ${list} = ${elements}; ${generateLoop(generator, list, element, test)} return noChoice(${node});`;
|
|
257
|
+
});
|
|
258
|
+
|
|
259
|
+
const generateSetFilter = (
|
|
260
|
+
generator: Generator,
|
|
261
|
+
expression: Expression & { kind: "SetFilter" },
|
|
262
|
+
name: string,
|
|
263
|
+
frame: Frame,
|
|
264
|
+
) =>
|
|
265
|
+
generateHelper(generator, frame, (bodyFrame) => {
|
|
266
|
+
const base = createLocal(generator);
|
|
267
|
+
const list = createLocal(generator);
|
|
268
|
+
const kept = createLocal(generator);
|
|
269
|
+
const element = createLocal(generator);
|
|
270
|
+
const node = addReference(generator, expression);
|
|
271
|
+
const filterLazily = addReference(generator, getLazyFilter(expression, generator.environment));
|
|
272
|
+
const lazy = `if (!isReducible(${base})) return ${filterLazily}(${base}, ${getDelegateContext(generator, expression, bodyFrame)});`;
|
|
273
|
+
const set = generateExpression(generator, expression.bound.set, bodyFrame);
|
|
274
|
+
bodyFrame.locals.set(name, element);
|
|
275
|
+
const test = `if (filterPredicate(${generateExpression(generator, expression.predicate, bodyFrame)}, ${node})) addBounded(${kept}, ${element});`;
|
|
276
|
+
return `const ${base} = ${set}; ${lazy} const ${list} = ${base}.kind === "Interval" ? ${base} : finiteElements(${base}); const ${kept} = []; ${generateLoop(generator, list, element, test)} return normalizedSet(${kept});`;
|
|
277
|
+
});
|
|
278
|
+
|
|
279
|
+
const generateFunctionConstruction = (
|
|
280
|
+
generator: Generator,
|
|
281
|
+
expression: Expression & { kind: "FunctionConstruction" },
|
|
282
|
+
name: string,
|
|
283
|
+
frame: Frame,
|
|
284
|
+
) =>
|
|
285
|
+
generateHelper(generator, frame, (bodyFrame) => {
|
|
286
|
+
const domain = createLocal(generator);
|
|
287
|
+
const isBeyond = createLocal(generator);
|
|
288
|
+
const keys = createLocal(generator);
|
|
289
|
+
const values = createLocal(generator);
|
|
290
|
+
const element = createLocal(generator);
|
|
291
|
+
const value = createLocal(generator);
|
|
292
|
+
const builder = addReference(generator, getFunctionBuilder(expression, generator.environment));
|
|
293
|
+
const builtContext = getDelegateContext(generator, expression, bodyFrame);
|
|
294
|
+
const built = `if (context.isKeepLazy || !isReducible(${domain})) return ${builder}.build(${domain}, ${builtContext});`;
|
|
295
|
+
const set = generateExpression(generator, expression.bounds[0].set, bodyFrame);
|
|
296
|
+
bodyFrame.locals.set(name, element);
|
|
297
|
+
const store = `const ${value} = ${generateExpression(generator, expression.body, bodyFrame)}; if (!${isBeyond}) ${values}.push(${value});`;
|
|
298
|
+
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});`;
|
|
299
|
+
});
|
|
300
|
+
|
|
197
301
|
const generateApply = (
|
|
198
302
|
generator: Generator,
|
|
199
303
|
expression: Expression & { kind: "Apply" },
|
|
@@ -203,7 +307,14 @@ const generateApply = (
|
|
|
203
307
|
if (expression.operator === "=>") {
|
|
204
308
|
const left = generateExpression(generator, args[0], frame);
|
|
205
309
|
const right = generateExpression(generator, args[1], frame);
|
|
206
|
-
|
|
310
|
+
const reference = addReference(generator, expression);
|
|
311
|
+
return `(implication(${left}, ${reference}, "P") ? implication(${right}, ${reference}, "Q") : true)`;
|
|
312
|
+
}
|
|
313
|
+
if (expression.operator === "~" && args.length === 1) {
|
|
314
|
+
return `negate(${generateExpression(generator, args[0], frame)}, ${addReference(generator, expression)})`;
|
|
315
|
+
}
|
|
316
|
+
if (expression.operator === "<=>") {
|
|
317
|
+
return `equivalent(${generateExpression(generator, args[0], frame)}, ${generateExpression(generator, args[1], frame)}, ${addReference(generator, expression)})`;
|
|
207
318
|
}
|
|
208
319
|
if (isLocallyResolved(expression)) return generateDelegate(generator, expression, frame);
|
|
209
320
|
const builtin = resolveGlobalOperator(expression.operator, generator.environment);
|
|
@@ -233,7 +344,6 @@ const generateApply = (
|
|
|
233
344
|
return generateDelegate(generator, expression, frame);
|
|
234
345
|
};
|
|
235
346
|
|
|
236
|
-
// Whether an expression only reads values, so that it constructs no function whatever the control.
|
|
237
347
|
const isConstructionFree = (
|
|
238
348
|
expression: Expression,
|
|
239
349
|
frame: Frame,
|
|
@@ -259,8 +369,6 @@ const isConstructionFree = (
|
|
|
259
369
|
}
|
|
260
370
|
};
|
|
261
371
|
|
|
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
372
|
const isReadOnly = (expression: Expression): boolean => {
|
|
265
373
|
switch (expression.kind) {
|
|
266
374
|
case "Identifier":
|
|
@@ -281,9 +389,7 @@ const generateExpression = (generator: Generator, expression: Expression, frame:
|
|
|
281
389
|
generateExpression(generator, node, nodeFrame);
|
|
282
390
|
switch (expression.kind) {
|
|
283
391
|
case "Number":
|
|
284
|
-
if (isTlcInteger(expression.value))
|
|
285
|
-
return String(expression.value);
|
|
286
|
-
}
|
|
392
|
+
if (isTlcInteger(expression.value)) return String(expression.value);
|
|
287
393
|
return generateDelegate(generator, expression, frame);
|
|
288
394
|
case "String":
|
|
289
395
|
return JSON.stringify(expression.value);
|
|
@@ -304,6 +410,7 @@ const generateExpression = (generator: Generator, expression: Expression, frame:
|
|
|
304
410
|
return generateApply(generator, expression, frame);
|
|
305
411
|
case "And":
|
|
306
412
|
case "Or": {
|
|
413
|
+
if (expression.operands.length === 0) return String(expression.kind === "And");
|
|
307
414
|
const node = addReference(generator, expression);
|
|
308
415
|
const operator = expression.kind === "And" ? " && " : " || ";
|
|
309
416
|
return `(${expression.operands.map((operand, index) => `junct(${generate(operand)}, ${node}, ${index})`).join(operator)})`;
|
|
@@ -312,7 +419,6 @@ const generateExpression = (generator: Generator, expression: Expression, frame:
|
|
|
312
419
|
return `(condition(${generate(expression.condition)}, ${addReference(generator, expression)}) ? ${generate(expression.consequent)} : ${generate(expression.alternative)})`;
|
|
313
420
|
case "FunctionApplication": {
|
|
314
421
|
keepLazy(expression.function);
|
|
315
|
-
// The interpreter evaluates a function that may construct one with EvalControl.KeepLazy.
|
|
316
422
|
const keepLazyFrame = { ...frame, context: `keepLazyContext(${frame.context})` };
|
|
317
423
|
const evaluatedFunction = isConstructionFree(
|
|
318
424
|
expression.function,
|
|
@@ -323,8 +429,6 @@ const generateExpression = (generator: Generator, expression: Expression, frame:
|
|
|
323
429
|
: isReadOnly(expression.function)
|
|
324
430
|
? generate(expression.function, keepLazyFrame)
|
|
325
431
|
: 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
432
|
const functionCode = `(applied = ${evaluatedFunction}, typeof applied === "object" && (applied.kind === "Function" || applied.kind === "LazyFunction") ? applied : expectFunction(applied, ${addReference(generator, expression)}))`;
|
|
329
433
|
const describeMissing = getMissingArgumentDescriber(generator.environment.runtime.version);
|
|
330
434
|
const error = describeMissing ? `, ${addReference(generator, describeMissing)}` : "";
|
|
@@ -352,18 +456,15 @@ const generateExpression = (generator: Generator, expression: Expression, frame:
|
|
|
352
456
|
return `tuple([${expression.elements.map((element) => generate(element)).join(", ")}])`;
|
|
353
457
|
case "SetEnumeration":
|
|
354
458
|
return `set([${expression.elements.map((element) => generate(element)).join(", ")}])`;
|
|
355
|
-
case "Prime":
|
|
356
|
-
|
|
357
|
-
|
|
358
|
-
const primed = {
|
|
459
|
+
case "Prime":
|
|
460
|
+
if (frame.isPrimed) return generateDelegate(generator, expression, frame);
|
|
461
|
+
return generate(expression.expression, {
|
|
359
462
|
context: `(primed ??= prime(${frame.context}))`,
|
|
360
463
|
state: frame.next,
|
|
361
464
|
next: "undefined",
|
|
362
465
|
isPrimed: true,
|
|
363
466
|
locals: frame.locals,
|
|
364
|
-
};
|
|
365
|
-
return `(${frame.next} === undefined ? primeOutsideAction(${node}) : ${generate(expression.expression, primed)})`;
|
|
366
|
-
}
|
|
467
|
+
});
|
|
367
468
|
case "Unchanged": {
|
|
368
469
|
const primed = generate({
|
|
369
470
|
kind: "Prime",
|
|
@@ -378,6 +479,34 @@ const generateExpression = (generator: Generator, expression: Expression, frame:
|
|
|
378
479
|
return generateQuantifier(generator, expression, frame);
|
|
379
480
|
}
|
|
380
481
|
return generateDelegate(generator, expression, frame);
|
|
482
|
+
case "Choose":
|
|
483
|
+
if (expression.set && expression.pattern.kind === "Name") {
|
|
484
|
+
return generateChoose(
|
|
485
|
+
generator,
|
|
486
|
+
expression,
|
|
487
|
+
expression.set,
|
|
488
|
+
expression.pattern.name,
|
|
489
|
+
frame,
|
|
490
|
+
);
|
|
491
|
+
}
|
|
492
|
+
return generateDelegate(generator, expression, frame);
|
|
493
|
+
case "FunctionConstruction": {
|
|
494
|
+
const bound = expression.bounds[0];
|
|
495
|
+
if (
|
|
496
|
+
expression.bounds.length === 1 &&
|
|
497
|
+
bound.pattern.kind === "Name" &&
|
|
498
|
+
!expression.isRecursive &&
|
|
499
|
+
!isKeptLazy(expression)
|
|
500
|
+
) {
|
|
501
|
+
return generateFunctionConstruction(generator, expression, bound.pattern.name, frame);
|
|
502
|
+
}
|
|
503
|
+
return generateDelegate(generator, expression, frame);
|
|
504
|
+
}
|
|
505
|
+
case "SetFilter":
|
|
506
|
+
if (expression.bound.pattern.kind === "Name") {
|
|
507
|
+
return generateSetFilter(generator, expression, expression.bound.pattern.name, frame);
|
|
508
|
+
}
|
|
509
|
+
return generateDelegate(generator, expression, frame);
|
|
381
510
|
default:
|
|
382
511
|
return generateDelegate(generator, expression, frame);
|
|
383
512
|
}
|
|
@@ -388,8 +517,8 @@ export const generateEvaluator = (
|
|
|
388
517
|
environment: Environment,
|
|
389
518
|
): Evaluator | undefined => {
|
|
390
519
|
if (!GENERATED_KINDS.has(expression.kind)) return undefined;
|
|
391
|
-
|
|
392
|
-
if (!
|
|
520
|
+
isCodeGenerationAllowed ??= getIsCodeGenerationAllowed();
|
|
521
|
+
if (!isCodeGenerationAllowed) return undefined;
|
|
393
522
|
const generator: Generator = { environment, references: [], helpers: [], counter: 0 };
|
|
394
523
|
const frame: Frame = {
|
|
395
524
|
context: "context",
|
|
@@ -399,11 +528,9 @@ export const generateEvaluator = (
|
|
|
399
528
|
locals: new Map(),
|
|
400
529
|
};
|
|
401
530
|
const body = generateExpression(generator, expression, frame);
|
|
402
|
-
const referenceNames = generator.references.map((
|
|
531
|
+
const referenceNames = generator.references.map((_reference, index) => `reference${index}`);
|
|
403
532
|
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);
|
|
533
|
+
generatedHelpers ??= createGeneratedHelpers();
|
|
534
|
+
const factory = new Function(...Object.keys(generatedHelpers), ...referenceNames, source);
|
|
535
|
+
return factory(...Object.values(generatedHelpers), ...generator.references);
|
|
409
536
|
};
|