tla-ts 0.0.9-dev.8298a52 → 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 +7 -0
- package/dist/compile.cjs +3 -3
- package/dist/compile.js +3 -3
- package/dist/deciders.cjs +28 -28
- package/dist/deciders.js +52 -52
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +105 -10
- package/dist/index.d.ts +105 -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 +1 -1
- 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 +1 -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 +564 -366
- package/src/cli/options.ts +10 -5
- 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 +525 -216
- package/src/cli/typescript.ts +0 -3
- 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 +237 -119
- package/src/errors.ts +56 -56
- package/src/evaluate.ts +543 -341
- package/src/exit-codes.ts +37 -3
- package/src/fingerprints.ts +10 -10
- package/src/index.ts +3 -0
- package/src/instances.ts +38 -31
- 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 +77 -117
- package/src/liveness.ts +106 -62
- 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 +24 -33
- package/src/parallel.ts +48 -40
- 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 +1 -16
- 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 +260 -91
- 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 +8 -21
- package/src/typescript/collections.ts +0 -15
- package/src/typescript/compile.ts +0 -5
- 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 +4 -12
- package/src/typescript/functions.ts +6 -17
- package/src/typescript/model.ts +10 -11
- 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 +0 -10
- package/src/typescript/types.ts +1 -8
- package/src/values.ts +749 -330
- package/src/worker.ts +7 -8
package/src/pcal/ast.ts
CHANGED
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import { PcalBugError, PcalError, PcalRuntimeError } from "../errors";
|
|
2
2
|
import type { TlcVersion } from "../tlc/version";
|
|
3
3
|
|
|
4
|
-
// TLAToken's types.
|
|
5
4
|
export const PCAL_TOKEN = { builtin: 1, number: 2, string: 3, ident: 4, added: 5 } as const;
|
|
6
5
|
|
|
7
6
|
export interface PcalToken {
|
|
@@ -10,22 +9,17 @@ export interface PcalToken {
|
|
|
10
9
|
type: number;
|
|
11
10
|
}
|
|
12
11
|
|
|
13
|
-
// TLAExpr: the tokens of an expression, line by line, and for each line the token of an earlier
|
|
14
|
-
// line it is aligned under, with that token's column when the expression was normalized.
|
|
15
12
|
export interface PcalExpr {
|
|
16
13
|
tokens: PcalToken[][];
|
|
17
14
|
anchorTokens: (PcalToken | undefined)[] | undefined;
|
|
18
15
|
anchorTokCol: number[] | undefined;
|
|
19
16
|
}
|
|
20
17
|
|
|
21
|
-
// IntPair, as the "Java coordinates" of a token in an expression.
|
|
22
18
|
interface PcalCoord {
|
|
23
19
|
line: number;
|
|
24
20
|
item: number;
|
|
25
21
|
}
|
|
26
22
|
|
|
27
|
-
// PcalParams: the translator's options, which the Java keeps in static fields that SANY never
|
|
28
|
-
// resets, so options one module sets carry over to the modules SANY validates after it.
|
|
29
23
|
export interface PcalParams {
|
|
30
24
|
labelFlag: boolean;
|
|
31
25
|
labelRoot: string;
|
|
@@ -36,7 +30,6 @@ export interface PcalParams {
|
|
|
36
30
|
inputVersionNumber: number;
|
|
37
31
|
}
|
|
38
32
|
|
|
39
|
-
// PcalParams.versionWeight.
|
|
40
33
|
export const PCAL_VERSION_WEIGHT = 1903;
|
|
41
34
|
|
|
42
35
|
export const createPcalParams = (): PcalParams => ({
|
|
@@ -49,20 +42,21 @@ export const createPcalParams = (): PcalParams => ({
|
|
|
49
42
|
inputVersionNumber: PCAL_VERSION_WEIGHT,
|
|
50
43
|
});
|
|
51
44
|
|
|
52
|
-
// PcalParams.VersionToNumber: "1.5" is 1500, and -1 means a malformed version.
|
|
53
45
|
export const getPcalVersionNumber = (text: string) => {
|
|
54
|
-
|
|
46
|
+
let result = 0;
|
|
47
|
+
let digitsAfterDecimal = 0;
|
|
48
|
+
let isAfterDecimal = false;
|
|
55
49
|
for (const char of text) {
|
|
56
50
|
if (char === ".") {
|
|
57
|
-
|
|
51
|
+
isAfterDecimal = true;
|
|
58
52
|
continue;
|
|
59
53
|
}
|
|
60
54
|
if (char < "0" || char > "9") return -1;
|
|
61
|
-
|
|
62
|
-
if (
|
|
63
|
-
if (
|
|
55
|
+
result = 10 * result + Number(char);
|
|
56
|
+
if (isAfterDecimal) digitsAfterDecimal += 1;
|
|
57
|
+
if (digitsAfterDecimal > 3) return -1;
|
|
64
58
|
}
|
|
65
|
-
return
|
|
59
|
+
return result * 10 ** Math.max(0, 3 - digitsAfterDecimal);
|
|
66
60
|
};
|
|
67
61
|
|
|
68
62
|
interface PcalBase {
|
|
@@ -104,7 +98,6 @@ export interface PcalProcedure extends PcalBase {
|
|
|
104
98
|
body: PcalStmt[];
|
|
105
99
|
}
|
|
106
100
|
|
|
107
|
-
// AST.UNFAIR_PROC, WF_PROC and SF_PROC index FairnessString.
|
|
108
101
|
const PCAL_FAIRNESS = ["unfair", "wf", "sf"];
|
|
109
102
|
|
|
110
103
|
export interface PcalProcess extends PcalBase {
|
|
@@ -229,7 +222,6 @@ export interface PcalCall extends PcalBase {
|
|
|
229
222
|
args: PcalExpr[];
|
|
230
223
|
}
|
|
231
224
|
|
|
232
|
-
// A Return or CallReturn outside a procedure has a null from, which Java prints as "null".
|
|
233
225
|
export interface PcalReturn extends PcalBase {
|
|
234
226
|
kind: "Return";
|
|
235
227
|
from: string | undefined;
|
|
@@ -309,20 +301,17 @@ export const createPcalBase = (): PcalBase => ({
|
|
|
309
301
|
lbl: "",
|
|
310
302
|
});
|
|
311
303
|
|
|
312
|
-
// AST.location.
|
|
313
304
|
export const getPcalLocation = (node: PcalBase) =>
|
|
314
305
|
node.macroLine < 0
|
|
315
306
|
? `line ${node.line}, column ${node.col}`
|
|
316
307
|
: `line ${node.line}, column ${node.col} of macro called at line ${node.macroLine}, column ${node.macroCol}`;
|
|
317
308
|
|
|
318
|
-
// A Java cast of a statement to AST.LabeledStmt.
|
|
319
309
|
export const toLabeledStmt = (node: PcalStmt) => {
|
|
320
310
|
if (node.kind !== "LabeledStmt") throw new PcalRuntimeError(`ClassCastException: ${node.kind}`);
|
|
321
311
|
return node;
|
|
322
312
|
};
|
|
323
313
|
|
|
324
|
-
|
|
325
|
-
export const getElement = <T>(vector: T[], index: number) => {
|
|
314
|
+
export const getElement = <Item>(vector: Item[], index: number) => {
|
|
326
315
|
if (index < 0 || index >= vector.length) {
|
|
327
316
|
throw new PcalRuntimeError(`ArrayIndexOutOfBoundsException: ${index}`);
|
|
328
317
|
}
|
|
@@ -335,7 +324,6 @@ export const createPcalToken = (string: string, column: number, type: number): P
|
|
|
335
324
|
type,
|
|
336
325
|
});
|
|
337
326
|
|
|
338
|
-
// TLAToken.getWidth: a string token's width counts its quotes.
|
|
339
327
|
export const getPcalTokenWidth = (token: PcalToken) =>
|
|
340
328
|
token.type === PCAL_TOKEN.string ? token.string.length + 2 : token.string.length;
|
|
341
329
|
|
|
@@ -345,8 +333,6 @@ export const createPcalExpr = (tokens: PcalToken[][] = []): PcalExpr => ({
|
|
|
345
333
|
anchorTokCol: undefined,
|
|
346
334
|
});
|
|
347
335
|
|
|
348
|
-
// TLAExpr.normalize: drops empty first and last lines, shifts the tokens left as far as they go,
|
|
349
|
-
// and records the token each line is aligned under.
|
|
350
336
|
export const normalizePcalExpr = (expr: PcalExpr) => {
|
|
351
337
|
while (expr.tokens.length > 0 && expr.tokens[0].length === 0) expr.tokens.shift();
|
|
352
338
|
while (expr.tokens.length > 0 && expr.tokens[expr.tokens.length - 1].length === 0) {
|
|
@@ -387,7 +373,6 @@ export const createNormalizedPcalExpr = (tokens: PcalToken[][]) => {
|
|
|
387
373
|
return expr;
|
|
388
374
|
};
|
|
389
375
|
|
|
390
|
-
// TLAExpr.renormalize: shifts each line right by as much as its anchor token has moved.
|
|
391
376
|
const renormalizePcalExpr = (expr: PcalExpr) => {
|
|
392
377
|
const anchorTokens = expr.anchorTokens;
|
|
393
378
|
const anchorTokCol = expr.anchorTokCol;
|
|
@@ -409,7 +394,6 @@ const renormalizePcalExpr = (expr: PcalExpr) => {
|
|
|
409
394
|
export const clonePcalExpr = (expr: PcalExpr) =>
|
|
410
395
|
createNormalizedPcalExpr(expr.tokens.map((line) => line.map((token) => ({ ...token }))));
|
|
411
396
|
|
|
412
|
-
// TLAExpr.prepend: puts prefix in front of the expression, spaces columns before its first token.
|
|
413
397
|
export const prependPcalExpr = (expr: PcalExpr, prefix: PcalExpr, spaces: number) => {
|
|
414
398
|
const prefixLines = prefix.tokens.length;
|
|
415
399
|
expr.tokens.splice(0, 0, ...prefix.tokens.slice(0, prefixLines - 1));
|
|
@@ -438,7 +422,6 @@ export const isOneTokenPcalExpr = (expr: PcalExpr) =>
|
|
|
438
422
|
export const getPcalTokenAt = (expr: PcalExpr, coord: PcalCoord) =>
|
|
439
423
|
getElement(getElement(expr.tokens, coord.line), coord.item);
|
|
440
424
|
|
|
441
|
-
// TLAExpr.stepCoord: the coordinates steps tokens after coord, or undefined past the end.
|
|
442
425
|
export const stepPcalCoord = (expr: PcalExpr, coord: PcalCoord, steps: number) => {
|
|
443
426
|
if (expr.tokens.length <= coord.line) {
|
|
444
427
|
throw new PcalBugError("TLAExpr.StepCoord called with line too big");
|
|
@@ -461,13 +444,10 @@ export const stepPcalCoord = (expr: PcalExpr, coord: PcalCoord, steps: number) =
|
|
|
461
444
|
return result;
|
|
462
445
|
};
|
|
463
446
|
|
|
464
|
-
// TLAExpr.findNextInstanceIn: the next token id at or after start that is not a record field
|
|
465
|
-
// name, such as the a in r.a, [a |-> 1] or [a : S].
|
|
466
447
|
const findNextInstance = (expr: PcalExpr, id: string, start: PcalCoord) => {
|
|
467
448
|
for (let coord = expr.tokens.length === 0 ? undefined : { ...start }; coord !== undefined;) {
|
|
468
449
|
const token = getPcalTokenAt(expr, coord);
|
|
469
450
|
const isString = token.type === PCAL_TOKEN.string;
|
|
470
|
-
// The id is an identifier, so a token that is the id is none of the tokens skipped below.
|
|
471
451
|
if (!isString && token.string === id) return coord;
|
|
472
452
|
const afterNext =
|
|
473
453
|
!isString && (token.string === "[" || token.string === ",")
|
|
@@ -484,9 +464,6 @@ const findNextInstance = (expr: PcalExpr, id: string, start: PcalCoord) => {
|
|
|
484
464
|
return undefined;
|
|
485
465
|
};
|
|
486
466
|
|
|
487
|
-
// TLAExpr.substituteAt: replaces the token at coord with a copy of replacement, parenthesized when
|
|
488
|
-
// isParenthesized and replacement has more than one token, and returns the coordinates of the
|
|
489
|
-
// token after it.
|
|
490
467
|
const substituteAt = (
|
|
491
468
|
expr: PcalExpr,
|
|
492
469
|
replacement: PcalExpr,
|
|
@@ -507,13 +484,10 @@ const substituteAt = (
|
|
|
507
484
|
? tokenLine[coord.item + 1].column - (token.column + getPcalTokenWidth(token))
|
|
508
485
|
: 0;
|
|
509
486
|
const restOfLine = tokenLine.splice(coord.item + 1);
|
|
510
|
-
|
|
511
|
-
|
|
512
|
-
|
|
513
|
-
|
|
514
|
-
isInserting: !isParenthesized,
|
|
515
|
-
};
|
|
516
|
-
const getLine = () => expr.tokens[cursor.lineIndex];
|
|
487
|
+
let lineIndex = coord.line;
|
|
488
|
+
let indent = (isParenthesized ? 1 : 0) + token.column;
|
|
489
|
+
let isInserting = !isParenthesized;
|
|
490
|
+
const getLine = () => expr.tokens[lineIndex];
|
|
517
491
|
if (isOneTokenPcalExpr(replacement)) {
|
|
518
492
|
const replacementToken = replacement.tokens[0][0];
|
|
519
493
|
token.string = replacementToken.string;
|
|
@@ -526,30 +500,30 @@ const substituteAt = (
|
|
|
526
500
|
const newExpr = clonePcalExpr(replacement);
|
|
527
501
|
newExpr.tokens.forEach((replacementLine, index) => {
|
|
528
502
|
replacementLine.forEach((nextToken) => {
|
|
529
|
-
nextToken.column +=
|
|
530
|
-
if (!
|
|
503
|
+
nextToken.column += indent;
|
|
504
|
+
if (!isInserting) {
|
|
531
505
|
getLine().push(nextToken);
|
|
532
506
|
return;
|
|
533
507
|
}
|
|
534
508
|
token.string = nextToken.string;
|
|
535
509
|
token.type = nextToken.type;
|
|
536
|
-
|
|
510
|
+
isInserting = false;
|
|
537
511
|
});
|
|
538
512
|
if (index + 1 >= newExpr.tokens.length) return;
|
|
539
|
-
|
|
540
|
-
|
|
541
|
-
const currentLine =
|
|
513
|
+
indent = 0;
|
|
514
|
+
lineIndex += 1;
|
|
515
|
+
const currentLine = lineIndex;
|
|
542
516
|
expr.tokens.splice(currentLine, 0, []);
|
|
543
517
|
const oldAnchors = expr.anchorTokens ?? [];
|
|
544
518
|
const oldColumns = expr.anchorTokCol ?? [];
|
|
545
|
-
expr.anchorTokens = expr.tokens.map((
|
|
519
|
+
expr.anchorTokens = expr.tokens.map((_line, item) =>
|
|
546
520
|
item < currentLine
|
|
547
521
|
? oldAnchors[item]
|
|
548
522
|
: item === currentLine
|
|
549
523
|
? newExpr.anchorTokens?.[index + 1]
|
|
550
524
|
: oldAnchors[item - 1],
|
|
551
525
|
);
|
|
552
|
-
expr.anchorTokCol = expr.tokens.map((
|
|
526
|
+
expr.anchorTokCol = expr.tokens.map((_line, item) =>
|
|
553
527
|
item < currentLine
|
|
554
528
|
? oldColumns[item]
|
|
555
529
|
: item === currentLine
|
|
@@ -565,7 +539,7 @@ const substituteAt = (
|
|
|
565
539
|
}
|
|
566
540
|
}
|
|
567
541
|
const line = getLine();
|
|
568
|
-
const result = { line:
|
|
542
|
+
const result = { line: lineIndex, item: line.length - 1 };
|
|
569
543
|
if (restOfLine.length > 0) {
|
|
570
544
|
const previous = line[line.length - 1];
|
|
571
545
|
const shift = previous.column + getPcalTokenWidth(previous) + spaces - restOfLine[0].column;
|
|
@@ -578,8 +552,6 @@ const substituteAt = (
|
|
|
578
552
|
return stepPcalCoord(expr, result, 1);
|
|
579
553
|
};
|
|
580
554
|
|
|
581
|
-
// TLAExpr.substituteForAll: replaces each instance of names[i] with exprs[i], in the order the
|
|
582
|
-
// instances appear.
|
|
583
555
|
export const substitutePcalExpr = (
|
|
584
556
|
expr: PcalExpr,
|
|
585
557
|
exprs: PcalExpr[],
|
|
@@ -625,11 +597,9 @@ export const getSubstitutedPcalExpr = (expr: PcalExpr, args: PcalExpr[], params:
|
|
|
625
597
|
return result;
|
|
626
598
|
};
|
|
627
599
|
|
|
628
|
-
// TLAExpr.SeqSubstituteForAll.
|
|
629
600
|
export const substitutePcalExprs = (exprs: PcalExpr[], args: PcalExpr[], params: string[]) =>
|
|
630
601
|
exprs.map((expr) => getSubstitutedPcalExpr(expr, args, params));
|
|
631
602
|
|
|
632
|
-
// TLAExpr.toString, which names the column of a junction except in TLC 1.7.4.
|
|
633
603
|
const formatPcalExpr = (expr: PcalExpr, version?: TlcVersion) => {
|
|
634
604
|
const getColumn = (token: PcalToken) => (version === "1.7.4" ? "" : `(col${token.column}) `);
|
|
635
605
|
const tokens = expr.tokens.map((line) =>
|
|
@@ -651,8 +621,6 @@ const formatPcalExpr = (expr: PcalExpr, version?: TlcVersion) => {
|
|
|
651
621
|
return `<< ${text} >>`;
|
|
652
622
|
};
|
|
653
623
|
|
|
654
|
-
// AST.toString: the TLA+ record that PlusCal.tla uses for the node. Indent, EndIndent and NewLine
|
|
655
|
-
// keep a stack of indentation columns as the Java concatenates the record's text left to right.
|
|
656
624
|
export const formatPcalNode = (
|
|
657
625
|
node: PcalNode,
|
|
658
626
|
inputVersionNumber: number,
|
|
@@ -660,95 +628,94 @@ export const formatPcalNode = (
|
|
|
660
628
|
) => {
|
|
661
629
|
const formatExpr = (expr: PcalExpr) => formatPcalExpr(expr, version);
|
|
662
630
|
const columns = [0];
|
|
663
|
-
|
|
631
|
+
let depth = 0;
|
|
664
632
|
const indent = (text: string) => {
|
|
665
|
-
columns[depth
|
|
666
|
-
depth
|
|
633
|
+
columns[depth + 1] = columns[depth] + text.length;
|
|
634
|
+
depth += 1;
|
|
667
635
|
return text;
|
|
668
636
|
};
|
|
669
637
|
const endIndent = () => {
|
|
670
|
-
depth
|
|
638
|
+
depth -= 1;
|
|
671
639
|
return "";
|
|
672
640
|
};
|
|
673
|
-
const
|
|
641
|
+
const getNewLine = () => `\n${" ".repeat(columns[depth])}`;
|
|
674
642
|
const isOldVersion = inputVersionNumber < 1500;
|
|
675
|
-
// The separators' new lines take the indentation the elements before them leave.
|
|
676
643
|
const formatSeq = (vector: (PcalNode | PcalExpr)[]) =>
|
|
677
644
|
`${indent("<<")}${vector
|
|
678
645
|
.map(
|
|
679
646
|
(element, index) =>
|
|
680
|
-
`${index > 0 ? `, ${
|
|
647
|
+
`${index > 0 ? `, ${getNewLine()}` : ""}${"kind" in element ? format(element) : formatExpr(element)}`,
|
|
681
648
|
)
|
|
682
649
|
.join("")}>>${endIndent()}`;
|
|
683
650
|
const formatQuotedSeq = (vector: string[]) =>
|
|
684
651
|
`${indent("<<")}${vector.map((element) => `"${element}"`).join(", ")}>>${endIndent()}`;
|
|
685
652
|
const formatSeqOfSeqs = (vectors: PcalStmt[][]) =>
|
|
686
653
|
`${indent("<< ")}${vectors
|
|
687
|
-
.map((vector, index) => `${index > 0 ? `, ${
|
|
654
|
+
.map((vector, index) => `${index > 0 ? `, ${getNewLine()}` : ""}${formatSeq(vector)}`)
|
|
688
655
|
.join("")} >>${endIndent()}`;
|
|
689
656
|
const formatEqOrIn = (isEq: boolean) => (isEq ? '"="' : '"\\\\in"');
|
|
690
657
|
const format = (node: PcalNode): string => {
|
|
691
658
|
switch (node.kind) {
|
|
692
659
|
case "Uniprocess":
|
|
693
|
-
return `${indent("")}[type |-> "uniprocess", ${
|
|
660
|
+
return `${indent("")}[type |-> "uniprocess", ${getNewLine()} name |-> "${node.name}", ${getNewLine()}${indent(" decls |-> ")}${formatSeq(node.decls)},${endIndent()}${getNewLine()}${indent(" defs |-> ")}${formatExpr(node.defs)},${endIndent()}${getNewLine()}${indent(" prcds |-> ")}${formatSeq(node.prcds)},${endIndent()}${getNewLine()}${indent(" body |-> ")}${formatSeq(node.body)}]${endIndent()}${endIndent()}`;
|
|
694
661
|
case "Multiprocess":
|
|
695
|
-
return `${indent("")}[type |-> "multiprocess", ${
|
|
662
|
+
return `${indent("")}[type |-> "multiprocess", ${getNewLine()} name |-> "${node.name}", ${getNewLine()}${indent(" decls |-> ")}${formatSeq(node.decls)},${endIndent()}${getNewLine()}${indent(" defs |-> ")}${formatExpr(node.defs)},${endIndent()}${getNewLine()}${indent(" prcds |-> ")}${formatSeq(node.prcds)},${endIndent()}${getNewLine()}${indent(" procs |-> ")}${formatSeq(node.procs)}]${endIndent()}${endIndent()}`;
|
|
696
663
|
case "Procedure":
|
|
697
664
|
return isOldVersion
|
|
698
|
-
? `${indent("")}[name |-> "${node.name}", ${
|
|
699
|
-
: `${indent("")}[name |-> "${node.name}", ${
|
|
665
|
+
? `${indent("")}[name |-> "${node.name}", ${getNewLine()}${indent(" params |-> ")}${formatSeq(node.params)},${endIndent()}${getNewLine()}${indent(" decls |-> ")}${formatSeq(node.decls)},${endIndent()}${getNewLine()}${indent(" body |-> ")}${formatSeq(node.body)}]${endIndent()}${endIndent()}`
|
|
666
|
+
: `${indent("")}[name |-> "${node.name}", ${getNewLine()}minusLabels |-> ${formatQuotedSeq(node.minusLabels)}, plusLabels |->${formatQuotedSeq(node.plusLabels)}, proceduresCalled |->${formatQuotedSeq(node.proceduresCalled)},${getNewLine()}${indent(" params |-> ")}${formatSeq(node.params)},${endIndent()}${getNewLine()}${indent(" decls |-> ")}${formatSeq(node.decls)},${endIndent()}${getNewLine()}${indent(" body |-> ")}${formatSeq(node.body)}]${endIndent()}${endIndent()}`;
|
|
700
667
|
case "Process":
|
|
701
668
|
return isOldVersion
|
|
702
|
-
? `${indent("")}[name |-> "${node.name}", ${
|
|
703
|
-
: `${indent("")}[name |-> "${node.name}",${
|
|
669
|
+
? `${indent("")}[name |-> "${node.name}", ${getNewLine()} eqOrIn |-> ${formatEqOrIn(node.isEq)},${getNewLine()} id |-> ${formatExpr(node.id)},${getNewLine()}${indent(" decls |-> ")}${formatSeq(node.decls)},${endIndent()}${getNewLine()}${indent(" body |-> ")}${formatSeq(node.body)}]${endIndent()}${endIndent()}`
|
|
670
|
+
: `${indent("")}[name |-> "${node.name}",${getNewLine()} fairness |-> "${PCAL_FAIRNESS[node.fairness]}", minusLabels |-> ${formatQuotedSeq(node.minusLabels)}, plusLabels |->${formatQuotedSeq(node.plusLabels)}, proceduresCalled |->${formatQuotedSeq(node.proceduresCalled)},${getNewLine()} eqOrIn |-> ${formatEqOrIn(node.isEq)},${getNewLine()} id |-> ${formatExpr(node.id)},${getNewLine()}${indent(" decls |-> ")}${formatSeq(node.decls)},${endIndent()}${getNewLine()}${indent(" body |-> ")}${formatSeq(node.body)}]${endIndent()}${endIndent()}`;
|
|
704
671
|
case "VarDecl":
|
|
705
672
|
return `${indent("")}[var |-> "${node.var}", eqOrIn |-> ${formatEqOrIn(node.isEq)}, val |-> ${formatExpr(node.val)}]${endIndent()}`;
|
|
706
673
|
case "PVarDecl":
|
|
707
674
|
return `${indent("")}[var |-> "${node.var}", eqOrIn |-> "=", val |-> ${formatExpr(node.val)}]${endIndent()}`;
|
|
708
675
|
case "LabeledStmt":
|
|
709
|
-
return `${indent("")}[label |-> "${node.label}",${
|
|
676
|
+
return `${indent("")}[label |-> "${node.label}",${getNewLine()}${indent(" stmts |-> ")}${formatSeq(node.stmts)}]${endIndent()}${endIndent()}`;
|
|
710
677
|
case "While":
|
|
711
|
-
return `${indent("")}[type |-> "while", ${
|
|
678
|
+
return `${indent("")}[type |-> "while", ${getNewLine()} test |-> ${formatExpr(node.test)},${getNewLine()}${indent(" labDo |-> ")}${formatSeq(node.labDo)},${endIndent()}${getNewLine()}${indent(" unlabDo |-> ")}${formatSeq(node.unlabDo)}]${endIndent()}${endIndent()}`;
|
|
712
679
|
case "Assign":
|
|
713
|
-
return `${indent("")}[type |-> "assignment",${
|
|
680
|
+
return `${indent("")}[type |-> "assignment",${getNewLine()}${indent(" ass |-> ")}${formatSeq(node.ass)}]${endIndent()}${endIndent()}`;
|
|
714
681
|
case "SingleAssign":
|
|
715
|
-
return `${indent("")}[lhs |-> ${format(node.lhs)},${
|
|
682
|
+
return `${indent("")}[lhs |-> ${format(node.lhs)},${getNewLine()} rhs |-> ${formatExpr(node.rhs)}]${endIndent()}`;
|
|
716
683
|
case "Lhs":
|
|
717
684
|
return `[var |-> "${node.var}", sub |-> ${formatExpr(node.sub)}]`;
|
|
718
685
|
case "If":
|
|
719
|
-
return `${indent("")}[type |-> "if", ${
|
|
686
|
+
return `${indent("")}[type |-> "if", ${getNewLine()} test |-> ${formatExpr(node.test)},${getNewLine()}${indent(" then |-> ")}${formatSeq(node.Then)},${endIndent()}${getNewLine()}${indent(" else |-> ")}${formatSeq(node.Else)}]${endIndent()}${endIndent()}`;
|
|
720
687
|
case "Either":
|
|
721
|
-
return `${indent("")}[type |-> "either", ${
|
|
688
|
+
return `${indent("")}[type |-> "either", ${getNewLine()}${indent(" ors |-> ")}${formatSeqOfSeqs(node.ors)}]${endIndent()}${endIndent()}`;
|
|
722
689
|
case "With":
|
|
723
|
-
return `${indent("")}[type |-> "with", ${
|
|
690
|
+
return `${indent("")}[type |-> "with", ${getNewLine()} var |-> "${node.var}",${getNewLine()} eqOrIn |-> ${formatEqOrIn(node.isEq)},${getNewLine()} exp |-> ${formatExpr(node.exp)},${getNewLine()}${indent(" do |-> ")}${formatSeq(node.Do)}]${endIndent()}${endIndent()}`;
|
|
724
691
|
case "When":
|
|
725
|
-
return `${indent("")}[type |-> "when", ${
|
|
692
|
+
return `${indent("")}[type |-> "when", ${getNewLine()} exp |-> ${formatExpr(node.exp)}]${endIndent()}`;
|
|
726
693
|
case "PrintS":
|
|
727
|
-
return `${indent("")}[type |-> "print", ${
|
|
694
|
+
return `${indent("")}[type |-> "print", ${getNewLine()} exp |-> ${formatExpr(node.exp)}]${endIndent()}`;
|
|
728
695
|
case "Assert":
|
|
729
|
-
return `${indent("")}[type |-> "assert", ${
|
|
696
|
+
return `${indent("")}[type |-> "assert", ${getNewLine()} exp |-> ${formatExpr(node.exp)}]${endIndent()}`;
|
|
730
697
|
case "Skip":
|
|
731
698
|
return '[type |-> "skip"]';
|
|
732
699
|
case "LabelIf":
|
|
733
|
-
return `${indent("")}[type |-> "labelIf",${
|
|
700
|
+
return `${indent("")}[type |-> "labelIf",${getNewLine()} test |-> ${formatExpr(node.test)},${getNewLine()}${indent(" unlabThen |-> ")}${formatSeq(node.unlabThen)},${endIndent()}${getNewLine()}${indent(" labThen |-> ")}${formatSeq(node.labThen)},${endIndent()}${getNewLine()}${indent(" unlabElse |-> ")}${formatSeq(node.unlabElse)},${endIndent()}${getNewLine()}${indent(" labElse |-> ")}${formatSeq(node.labElse)}]${endIndent()}${getNewLine()}${endIndent()}`;
|
|
734
701
|
case "LabelEither":
|
|
735
|
-
return `${indent("")}[type |-> "labelEither",${
|
|
702
|
+
return `${indent("")}[type |-> "labelEither",${getNewLine()}${indent(" clauses |-> ")}${formatSeq(node.clauses)}]${endIndent()}${getNewLine()}${endIndent()}`;
|
|
736
703
|
case "Clause":
|
|
737
|
-
return `${indent("")}${indent("[unlabOr |-> ")}${formatSeq(node.unlabOr)},${endIndent()}${
|
|
704
|
+
return `${indent("")}${indent("[unlabOr |-> ")}${formatSeq(node.unlabOr)},${endIndent()}${getNewLine()}${indent(" labOr |-> ")}${formatSeq(node.labOr)}]${endIndent()}${getNewLine()}${endIndent()}`;
|
|
738
705
|
case "Call":
|
|
739
|
-
return `${indent("")}[type |-> "call",${
|
|
706
|
+
return `${indent("")}[type |-> "call",${getNewLine()} returnTo |-> "${node.returnTo}",${getNewLine()} to |-> "${node.to}",${getNewLine()}${indent(" args |-> ")}${formatSeq(node.args)}]${endIndent()}${endIndent()}`;
|
|
740
707
|
case "Return":
|
|
741
708
|
return `[type |-> "return", from |-> "${node.from ?? "null"}"]`;
|
|
742
709
|
case "CallReturn":
|
|
743
|
-
return `${indent("")}[type |-> "callReturn",${
|
|
710
|
+
return `${indent("")}[type |-> "callReturn",${getNewLine()} from |-> "${node.from ?? "null"}",${getNewLine()} to |-> "${node.to}",${getNewLine()}${indent("args |-> ")}${formatSeq(node.args)}]${getNewLine()}${endIndent()}${endIndent()}`;
|
|
744
711
|
case "CallGoto":
|
|
745
|
-
return `${indent("")}[type |-> "callGoto",${
|
|
712
|
+
return `${indent("")}[type |-> "callGoto",${getNewLine()} after |-> "${node.after}",${getNewLine()} to |-> "${node.to}",${getNewLine()}${indent("args |-> ")}${formatSeq(node.args)}]${getNewLine()}${endIndent()}${endIndent()}`;
|
|
746
713
|
case "Goto":
|
|
747
714
|
return `[type |-> "goto", to |-> "${node.to}"]`;
|
|
748
715
|
case "Macro":
|
|
749
|
-
return `${indent("")}[name |-> "${node.name}", ${
|
|
716
|
+
return `${indent("")}[name |-> "${node.name}", ${getNewLine()}${indent(" params |-> ")}${indent("<<")}${node.params.join(`, ${getNewLine()}`)}>>${endIndent()},${endIndent()}${getNewLine()}${indent(" body |-> ")}${formatSeq(node.body)}]${endIndent()}${endIndent()}`;
|
|
750
717
|
case "MacroCall":
|
|
751
|
-
return `${indent("")}[type |-> "macrocall",${
|
|
718
|
+
return `${indent("")}[type |-> "macrocall",${getNewLine()} name |-> "${node.name}",${getNewLine()}${indent(" args |-> ")}${formatSeq(node.args)}]${endIndent()}${endIndent()}`;
|
|
752
719
|
}
|
|
753
720
|
};
|
|
754
721
|
return format(node);
|