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/sany/xml.ts
CHANGED
|
@@ -22,10 +22,10 @@ import {
|
|
|
22
22
|
type TheoremNode,
|
|
23
23
|
type ProofPartNode,
|
|
24
24
|
type InstanceNode,
|
|
25
|
+
type LevelFields,
|
|
25
26
|
type UseOrHideNode,
|
|
26
27
|
} from "./nodes";
|
|
27
28
|
|
|
28
|
-
// XMLExporterExitCode, and the status Java exits with on an exception that nothing catches.
|
|
29
29
|
export const XML_EXPORT_EXIT_CODE = {
|
|
30
30
|
uncaughtException: 1,
|
|
31
31
|
argsParsingFailure: 1,
|
|
@@ -40,7 +40,6 @@ interface XmlElement {
|
|
|
40
40
|
children: XmlElement[];
|
|
41
41
|
}
|
|
42
42
|
|
|
43
|
-
// The exception that SANY's XMLExporter throws for a node of a kind it can't export.
|
|
44
43
|
const getUnsupportedKind = (kind: number) =>
|
|
45
44
|
`java.lang.IllegalArgumentException: unsupported kind: ${kind} in xml export`;
|
|
46
45
|
|
|
@@ -62,14 +61,11 @@ const XML_ENTITIES: Record<string, string> = {
|
|
|
62
61
|
"\r": " ",
|
|
63
62
|
};
|
|
64
63
|
|
|
65
|
-
// Java's serializer also writes a character outside the Basic Multilingual Plane, which a Java
|
|
66
|
-
// string holds as two chars, as a character reference.
|
|
67
64
|
const escapeXml = (text: string) =>
|
|
68
65
|
text.replace(/[&<>\r]|[\u{10000}-\u{10FFFF}]/gu, (character) =>
|
|
69
66
|
character.length === 2 ? `&#${character.codePointAt(0)};` : XML_ENTITIES[character],
|
|
70
67
|
);
|
|
71
68
|
|
|
72
|
-
// A character outside XML 1.0's Char production.
|
|
73
69
|
const UNREPRESENTABLE_CHARACTER = /[^\t\n\r\u0020-\uD7FF\uE000-\uFFFD\u{10000}-\u{10FFFF}]/u;
|
|
74
70
|
|
|
75
71
|
interface UnrepresentableCharacter {
|
|
@@ -77,8 +73,6 @@ interface UnrepresentableCharacter {
|
|
|
77
73
|
character: string;
|
|
78
74
|
}
|
|
79
75
|
|
|
80
|
-
// XMLExporter.findUnrepresentableCharacterData: the first element, in document order, whose
|
|
81
|
-
// character data XML 1.0 cannot represent, with the character.
|
|
82
76
|
const findUnrepresentable = (element: XmlElement): UnrepresentableCharacter | undefined => {
|
|
83
77
|
const character = (element.cdata ?? element.text)?.match(UNREPRESENTABLE_CHARACTER)?.[0];
|
|
84
78
|
if (character !== undefined) return { tag: element.tag, character };
|
|
@@ -89,7 +83,6 @@ const findUnrepresentable = (element: XmlElement): UnrepresentableCharacter | un
|
|
|
89
83
|
return undefined;
|
|
90
84
|
};
|
|
91
85
|
|
|
92
|
-
// The lines of Java's identity Transformer, which pretty prints with an indent amount of 2.
|
|
93
86
|
const printElement = (
|
|
94
87
|
element: XmlElement,
|
|
95
88
|
depth: number,
|
|
@@ -97,8 +90,6 @@ const printElement = (
|
|
|
97
90
|
lines: string[],
|
|
98
91
|
): void => {
|
|
99
92
|
const indent = " ".repeat(depth * indentAmount);
|
|
100
|
-
// An element whose text or character data is empty has no content, like an element without
|
|
101
|
-
// children.
|
|
102
93
|
if (element.cdata) {
|
|
103
94
|
const data = element.cdata.replaceAll("]]>", "]]]]><![CDATA[>");
|
|
104
95
|
lines.push(`${indent}<${element.tag}><![CDATA[${data}]]></${element.tag}>`);
|
|
@@ -155,15 +146,11 @@ const getReferenceTag = (node: ContextNode) => {
|
|
|
155
146
|
}
|
|
156
147
|
};
|
|
157
148
|
|
|
158
|
-
// A frame of the Java stack of TLC 1.7.4's XMLExporter, in package tla2sany, with the node that
|
|
159
|
-
// the frame reports when an exception unwinds it.
|
|
160
149
|
interface JavaFrame {
|
|
161
150
|
at: string;
|
|
162
151
|
failedFor?: string;
|
|
163
152
|
}
|
|
164
153
|
|
|
165
|
-
// A call by which TLC 1.7.4's XMLExporter exports an expression that may be the null SANY generates
|
|
166
|
-
// for an operator it can't resolve, and how the JVM names that null.
|
|
167
154
|
interface JavaExpressionCall extends JavaFrame {
|
|
168
155
|
nullType: string;
|
|
169
156
|
nullValue: string;
|
|
@@ -268,7 +255,6 @@ const JAVA_CALLS = {
|
|
|
268
255
|
defStep: { at: "semantic.DefStepNode.getLevelElement(DefStepNode.java:99)" },
|
|
269
256
|
} satisfies Record<string, JavaFrame | JavaExpressionCall>;
|
|
270
257
|
|
|
271
|
-
// The calls by which TLC 1.7.4's XMLExporter exports the parts of a SubstInNode or APSubstInNode.
|
|
272
258
|
const SUBST_IN_CALLS = {
|
|
273
259
|
SubstIn: {
|
|
274
260
|
subst: { at: "semantic.SubstInNode.getLevelElement(SubstInNode.java:530)" },
|
|
@@ -295,11 +281,8 @@ const SUBST_IN_CALLS = {
|
|
|
295
281
|
const SEMANTIC_EXPORT = "semantic.SemanticNode.export(SemanticNode.java:379)";
|
|
296
282
|
const LEVEL_EXPORT = "semantic.LevelNode.getSemanticElement(LevelNode.java:333)";
|
|
297
283
|
const UNSUPPORTED_KIND_FRAME = { at: "semantic.OpDefNode.getSymbolElement(OpDefNode.java:1424)" };
|
|
298
|
-
// Where SANY's builtin operators, such as nullODN, are.
|
|
299
284
|
const IN_BUILTINS = formatSanyLocation("--TLA+ BUILTINS--");
|
|
300
285
|
|
|
301
|
-
// The frames of the export of a node by reference in TLC 1.7.4's XMLExporter, down to the export
|
|
302
|
-
// of its definition, which reports the node.
|
|
303
286
|
const getDefinitionFrames = (kind: ContextNode["kind"], location: string): JavaFrame[] => {
|
|
304
287
|
const [exportAt, putLine, definitionAt] =
|
|
305
288
|
kind === "Theorem"
|
|
@@ -328,29 +311,23 @@ const getDefinitionFrames = (kind: ContextNode["kind"], location: string): JavaF
|
|
|
328
311
|
];
|
|
329
312
|
};
|
|
330
313
|
|
|
331
|
-
// java.util.HashMap, which holds SymbolContext's entries, and lists them by the bucket of their
|
|
332
|
-
// Integer key, and the entries of a bucket in the order they were added.
|
|
333
314
|
const getHashMapCapacity = (size: number, capacity = 16): number =>
|
|
334
315
|
size > capacity * 0.75 ? getHashMapCapacity(size, capacity * 2) : capacity;
|
|
335
316
|
|
|
336
317
|
const getHashMapBucket = (key: number, capacity: number) => (key ^ (key >>> 16)) & (capacity - 1);
|
|
337
318
|
|
|
338
|
-
// Java's String.split, which drops the empty strings at the end.
|
|
339
319
|
const splitLines = (text: string) => {
|
|
340
320
|
const lines = text.split(/\r?\n/);
|
|
341
321
|
while (lines.at(-1) === "") lines.pop();
|
|
342
322
|
return lines;
|
|
343
323
|
};
|
|
344
324
|
|
|
345
|
-
// Java's String.trim, which removes the control characters and spaces at either end.
|
|
346
325
|
const trimJava = (text: string) => text.replace(/^[\0-\x20]+|[\0-\x20]+$/g, "");
|
|
347
326
|
|
|
348
|
-
// The characters of Java's Character.isWhitespace, which include four control characters.
|
|
349
327
|
const TRAILING_WHITESPACE =
|
|
350
328
|
// eslint-disable-next-line no-control-regex
|
|
351
329
|
/[\t-\r\x1C-\x20\u1680\u2000-\u2006\u2008-\u200A\u2028\u2029\u205F\u3000]+$/;
|
|
352
330
|
|
|
353
|
-
// SyntaxTreeNode.unboxComment: the lines of a comment boxed in (** and **), without the box.
|
|
354
331
|
const unboxComment = (text: string) => {
|
|
355
332
|
const start = text.indexOf("(**");
|
|
356
333
|
const end = text.lastIndexOf("**)");
|
|
@@ -370,8 +347,6 @@ const unboxComment = (text: string) => {
|
|
|
370
347
|
.join("\n");
|
|
371
348
|
};
|
|
372
349
|
|
|
373
|
-
// SyntaxTreeNode.unboxBackslashStarComment: the lines of a comment, without the \* that starts
|
|
374
|
-
// them, when at least half of them start with one.
|
|
375
350
|
const unboxBackslashStarComment = (text: string) => {
|
|
376
351
|
const lines = splitLines(text);
|
|
377
352
|
const isCommentLine = (line: string) => trimJava(line).startsWith("\\*");
|
|
@@ -387,31 +362,20 @@ const unboxBackslashStarComment = (text: string) => {
|
|
|
387
362
|
|
|
388
363
|
export interface XmlExportOptions {
|
|
389
364
|
version: TlcVersion;
|
|
390
|
-
// -r: only the root module, and only the declarations and definitions a module makes itself.
|
|
391
365
|
isRestricted: boolean;
|
|
392
|
-
// -u: the pre-comments without the boxes and \* that format them.
|
|
393
366
|
isUncommented: boolean;
|
|
394
|
-
// -t: the XML on one line.
|
|
395
367
|
isTerse: boolean;
|
|
396
368
|
}
|
|
397
369
|
|
|
398
|
-
// The XML of SANY's XMLExporter: every module of the specification, and a context with an entry
|
|
399
|
-
// for each symbol, theorem and assumption that the modules refer to.
|
|
400
370
|
const exportSpecification = (
|
|
401
371
|
modules: ModuleNode[],
|
|
402
372
|
root: ModuleNode,
|
|
403
373
|
options: XmlExportOptions,
|
|
404
374
|
) => {
|
|
405
|
-
// TLC 1.7.4's XMLExporter writes fewer elements, which keeps their nodes out of the context.
|
|
406
375
|
const isTlc174 = options.version === "1.7.4";
|
|
407
|
-
// SymbolContext: SANY marks a node's UID as exported before it exports the node's definition,
|
|
408
|
-
// which can export other definitions, and adds the definition to its entries after them.
|
|
409
376
|
const keys = new Set<number>();
|
|
410
377
|
const entries = new Map<number, XmlElement>();
|
|
411
|
-
|
|
412
|
-
// CASE with an OTHER arm on, a node missing its first operand exports it as $Other.
|
|
413
|
-
const otherBug = { isSet: false };
|
|
414
|
-
// The Java stack of TLC 1.7.4's XMLExporter as it exports the current node, outermost first.
|
|
378
|
+
let isOtherBugSet = false;
|
|
415
379
|
const javaStack: JavaFrame[] = [];
|
|
416
380
|
|
|
417
381
|
const withFrames = <Result>(frames: JavaFrame[], run: () => Result) => {
|
|
@@ -422,8 +386,6 @@ const exportSpecification = (
|
|
|
422
386
|
return result;
|
|
423
387
|
};
|
|
424
388
|
|
|
425
|
-
// TLC 1.7.4's XMLExporter reports the exception at each node it unwinds before the JVM reports
|
|
426
|
-
// it uncaught.
|
|
427
389
|
const getJavaException = (exception: string, frames: JavaFrame[]) => {
|
|
428
390
|
const trace = [...javaStack, ...frames].reverse();
|
|
429
391
|
const stackTrace = [exception, ...trace.map((frame) => `\tat tla2sany.${frame.at}`)].join("\n");
|
|
@@ -464,7 +426,7 @@ const exportSpecification = (
|
|
|
464
426
|
|
|
465
427
|
const withLevel = (
|
|
466
428
|
element: XmlElement,
|
|
467
|
-
node:
|
|
429
|
+
node: LevelFields,
|
|
468
430
|
location: SanyLocation | undefined,
|
|
469
431
|
) => {
|
|
470
432
|
const level = node.levelChecked === 0 ? [] : [createText("level", node.level)];
|
|
@@ -518,7 +480,6 @@ const exportSpecification = (
|
|
|
518
480
|
node.location,
|
|
519
481
|
);
|
|
520
482
|
case "OpDef": {
|
|
521
|
-
// SANY's XMLExporter fails on the definition of a proof step that a DEF clause names.
|
|
522
483
|
if (node.defKind === "NumberedProofStep") {
|
|
523
484
|
throw isTlc174
|
|
524
485
|
? getJavaException(getUnsupportedKind(37), [UNSUPPORTED_KIND_FRAME])
|
|
@@ -553,7 +514,6 @@ const exportSpecification = (
|
|
|
553
514
|
}
|
|
554
515
|
const body = node.body;
|
|
555
516
|
const module = node.module;
|
|
556
|
-
// SANY leaves the body of an operator a RECURSIVE statement declares but nothing defines null.
|
|
557
517
|
if (body === undefined && isTlc174) throw getNullPointerException(JAVA_CALLS.body);
|
|
558
518
|
if (body === undefined || module === undefined) {
|
|
559
519
|
throw new Error(`The definition of ${node.name} has no body`);
|
|
@@ -624,7 +584,6 @@ const exportSpecification = (
|
|
|
624
584
|
node.location,
|
|
625
585
|
);
|
|
626
586
|
case "Assume":
|
|
627
|
-
// AssumeNode#getLevel is its body's, which fails before the body is level-checked.
|
|
628
587
|
return createElement("AssumeNode", [
|
|
629
588
|
getLocationElement(node.location),
|
|
630
589
|
...(node.body.levelChecked === 0 ? [] : [createText("level", node.body.level)]),
|
|
@@ -640,10 +599,7 @@ const exportSpecification = (
|
|
|
640
599
|
}
|
|
641
600
|
};
|
|
642
601
|
|
|
643
|
-
// The children of a ModuleNode element after its name, built in the order SANY builds them so
|
|
644
|
-
// that the context entries they add appear in the same order.
|
|
645
602
|
const exportModuleChildren = (module: ModuleNode): XmlElement[] => {
|
|
646
|
-
// XMLExporter's filter for -r: a declaration or definition that the module makes itself.
|
|
647
603
|
const isExported = (node: OpDeclNode | OpDefNode) =>
|
|
648
604
|
!options.isRestricted || node.module === module;
|
|
649
605
|
return [
|
|
@@ -678,7 +634,6 @@ const exportSpecification = (
|
|
|
678
634
|
];
|
|
679
635
|
};
|
|
680
636
|
|
|
681
|
-
// A Subst is no SemanticNode, so it reports no exception that unwinds it.
|
|
682
637
|
const exportSubst = (subst: Subst, call: JavaFrame) =>
|
|
683
638
|
withFrames([call], () =>
|
|
684
639
|
createElement("Subst", [
|
|
@@ -688,8 +643,6 @@ const exportSpecification = (
|
|
|
688
643
|
);
|
|
689
644
|
|
|
690
645
|
const exportApplication = (node: OpApplNode) => {
|
|
691
|
-
// TLC 1.7.4's XMLExporter exports a specification with semantic errors, and fails on the
|
|
692
|
-
// operator of the node that SANY puts where it found one.
|
|
693
646
|
if (node.isNull && isTlc174) {
|
|
694
647
|
throw getJavaException(getUnsupportedKind(0), [
|
|
695
648
|
JAVA_CALLS.operator,
|
|
@@ -705,11 +658,11 @@ const exportSpecification = (
|
|
|
705
658
|
last.operator.name === "$Pair" &&
|
|
706
659
|
last.operands[0] === undefined
|
|
707
660
|
) {
|
|
708
|
-
|
|
661
|
+
isOtherBugSet = true;
|
|
709
662
|
}
|
|
710
663
|
const operator = getReference(node.operator, JAVA_CALLS.operator);
|
|
711
664
|
const operands = node.operands.map((operand, index) =>
|
|
712
|
-
operand === undefined || (index === 0 &&
|
|
665
|
+
operand === undefined || (index === 0 && isOtherBugSet && isAbsent(operand))
|
|
713
666
|
? isTlc174
|
|
714
667
|
? createText("StringNode", "$Other")
|
|
715
668
|
: createElement("StringNode", [createText("StringValue", "$Other")])
|
|
@@ -748,7 +701,6 @@ const exportSpecification = (
|
|
|
748
701
|
? getReference(fact, call)
|
|
749
702
|
: exportExpression(fact, call);
|
|
750
703
|
|
|
751
|
-
// SemanticNode.export reports an exception that unwinds the export of a node.
|
|
752
704
|
const exportExpression = (
|
|
753
705
|
node: ExportedNode,
|
|
754
706
|
call: JavaFrame | JavaExpressionCall,
|
|
@@ -757,12 +709,14 @@ const exportSpecification = (
|
|
|
757
709
|
if (node.kind === "OpAppl" && node.isAbsent && "nullType" in call) {
|
|
758
710
|
throw getNullPointerException(call);
|
|
759
711
|
}
|
|
760
|
-
|
|
761
|
-
|
|
762
|
-
|
|
763
|
-
|
|
764
|
-
|
|
765
|
-
|
|
712
|
+
return withFrames(
|
|
713
|
+
[
|
|
714
|
+
call,
|
|
715
|
+
{ at: SEMANTIC_EXPORT, failedFor: formatSanyLocation(node.location) },
|
|
716
|
+
{ at: LEVEL_EXPORT },
|
|
717
|
+
],
|
|
718
|
+
() => exportLevelNode(node),
|
|
719
|
+
);
|
|
766
720
|
};
|
|
767
721
|
|
|
768
722
|
const exportLevelNode = (node: ExportedNode): XmlElement => {
|
|
@@ -897,7 +851,6 @@ const exportSpecification = (
|
|
|
897
851
|
return withLevel(
|
|
898
852
|
createElement("NewSymbNode", [
|
|
899
853
|
getReference(node.declaration, JAVA_CALLS.newDeclaration),
|
|
900
|
-
// TLC 1.7.4's NewSymbNode leaves out a set that is null.
|
|
901
854
|
...(node.set && !(isTlc174 && isAbsent(node.set))
|
|
902
855
|
? [exportExpression(node.set, JAVA_CALLS.newSet)]
|
|
903
856
|
: []),
|
|
@@ -987,9 +940,6 @@ const exportSpecification = (
|
|
|
987
940
|
|
|
988
941
|
type ExportedNode = LevelNode | InstanceNode | UseOrHideNode | ProofPartNode;
|
|
989
942
|
|
|
990
|
-
// The specification SANY accepts, level-checked, as SANY's tla2sany.xml.XMLExporter prints it
|
|
991
|
-
// with -o and the given options: every module the root module depends on, the standard modules
|
|
992
|
-
// among them, with the level of every expression.
|
|
993
943
|
export const exportSanyXml = (
|
|
994
944
|
specification: SanySpecification,
|
|
995
945
|
options: XmlExportOptions = {
|