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/builtins.ts
CHANGED
|
@@ -1,13 +1,16 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import {
|
|
2
|
+
TlaEndOfInputError,
|
|
3
|
+
TlaEvaluationError,
|
|
4
|
+
TlaModuleError,
|
|
5
|
+
TlaNullPointerError,
|
|
6
|
+
} from "./errors";
|
|
2
7
|
import type { Builtin, BuiltinArgument, Context, OperatorValue } from "./evaluate";
|
|
3
8
|
import {
|
|
4
9
|
formatValue,
|
|
5
10
|
getFunctionClass,
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
isFunctionValue,
|
|
11
|
+
isFingerprintedSince,
|
|
12
|
+
isOverriddenSet,
|
|
9
13
|
isSetValue,
|
|
10
|
-
toFiniteFunction,
|
|
11
14
|
MAXIMUM_INTEGER,
|
|
12
15
|
MINIMUM_INTEGER,
|
|
13
16
|
setTrace,
|
|
@@ -15,9 +18,6 @@ import {
|
|
|
15
18
|
type Value,
|
|
16
19
|
} from "./values";
|
|
17
20
|
|
|
18
|
-
// TLC evaluates these operators in its core, or its Java code for them takes integers, so a wrong
|
|
19
|
-
// argument is an evaluation failure. Every other standard-module operator checks its arguments in
|
|
20
|
-
// Java and raises an EvalException.
|
|
21
21
|
const CORE_OPERATOR_NAMES = new Set([
|
|
22
22
|
"=",
|
|
23
23
|
"#",
|
|
@@ -44,13 +44,11 @@ const CORE_OPERATOR_NAMES = new Set([
|
|
|
44
44
|
"..",
|
|
45
45
|
"Seq",
|
|
46
46
|
"IsFiniteSet",
|
|
47
|
-
"RandomElement",
|
|
48
47
|
]);
|
|
49
48
|
|
|
50
49
|
const createArgumentError = (name: string, message: string) =>
|
|
51
50
|
CORE_OPERATOR_NAMES.has(name) ? new TlaEvaluationError(message) : new TlaModuleError(message);
|
|
52
51
|
|
|
53
|
-
// TLC's EC.TLC_MODULE_ARGUMENT_ERROR.
|
|
54
52
|
export const createModuleArgumentError = (
|
|
55
53
|
position: string,
|
|
56
54
|
name: string,
|
|
@@ -61,6 +59,15 @@ export const createModuleArgumentError = (
|
|
|
61
59
|
`The ${position} argument of ${name} should be a ${expected}, but instead it is:\n${formatValue(value)}`,
|
|
62
60
|
);
|
|
63
61
|
|
|
62
|
+
export const toEnumeratedSet = (value: Value, name: string, reported = value) => {
|
|
63
|
+
if (!isSetValue(value) || isOverriddenSet(value)) {
|
|
64
|
+
throw new TlaModuleError(
|
|
65
|
+
`Applying ${name} to the following value,\nwhich is not a finite set:\n${formatValue(reported)}`,
|
|
66
|
+
);
|
|
67
|
+
}
|
|
68
|
+
return toFiniteSet(value);
|
|
69
|
+
};
|
|
70
|
+
|
|
64
71
|
const isOperatorValue = (argument: BuiltinArgument): argument is OperatorValue =>
|
|
65
72
|
typeof argument === "object" && argument.kind === "Operator";
|
|
66
73
|
|
|
@@ -72,17 +79,6 @@ export const getValue = (args: BuiltinArgument[], index: number, name: string):
|
|
|
72
79
|
return argument;
|
|
73
80
|
};
|
|
74
81
|
|
|
75
|
-
export const getNumber = (args: BuiltinArgument[], index: number, name: string) => {
|
|
76
|
-
const value = getValue(args, index, name);
|
|
77
|
-
if (typeof value !== "number") {
|
|
78
|
-
throw createArgumentError(
|
|
79
|
-
name,
|
|
80
|
-
`${name} expects an integer but received ${formatValue(value)}`,
|
|
81
|
-
);
|
|
82
|
-
}
|
|
83
|
-
return value;
|
|
84
|
-
};
|
|
85
|
-
|
|
86
82
|
export const getBoolean = (args: BuiltinArgument[], index: number, name: string) => {
|
|
87
83
|
const value = getValue(args, index, name);
|
|
88
84
|
if (typeof value !== "boolean") {
|
|
@@ -91,49 +87,6 @@ export const getBoolean = (args: BuiltinArgument[], index: number, name: string)
|
|
|
91
87
|
return value;
|
|
92
88
|
};
|
|
93
89
|
|
|
94
|
-
export const getSet = (args: BuiltinArgument[], index: number, name: string) => {
|
|
95
|
-
const value = getValue(args, index, name);
|
|
96
|
-
if (!isSetValue(value))
|
|
97
|
-
throw createArgumentError(name, `${name} expects a set but received ${formatValue(value)}`);
|
|
98
|
-
return value;
|
|
99
|
-
};
|
|
100
|
-
|
|
101
|
-
export const getEnumerableSet = (args: BuiltinArgument[], index: number, name: string) => {
|
|
102
|
-
const set = getSet(args, index, name);
|
|
103
|
-
if (!isEnumerable(set)) {
|
|
104
|
-
throw createArgumentError(
|
|
105
|
-
name,
|
|
106
|
-
`${name} cannot enumerate the non-enumerable set ${formatValue(set)}`,
|
|
107
|
-
);
|
|
108
|
-
}
|
|
109
|
-
return set;
|
|
110
|
-
};
|
|
111
|
-
|
|
112
|
-
export const getElements = (args: BuiltinArgument[], index: number, name: string) =>
|
|
113
|
-
toFiniteSet(getEnumerableSet(args, index, name)).elements;
|
|
114
|
-
|
|
115
|
-
export const getSequence = (args: BuiltinArgument[], index: number, name: string) => {
|
|
116
|
-
const value = getValue(args, index, name);
|
|
117
|
-
const elements = getSequenceElements(value);
|
|
118
|
-
if (!elements)
|
|
119
|
-
throw createArgumentError(
|
|
120
|
-
name,
|
|
121
|
-
`${name} expects a sequence but received ${formatValue(value)}`,
|
|
122
|
-
);
|
|
123
|
-
return elements;
|
|
124
|
-
};
|
|
125
|
-
|
|
126
|
-
export const getFunction = (args: BuiltinArgument[], index: number, name: string) => {
|
|
127
|
-
const value = getValue(args, index, name);
|
|
128
|
-
if (!isFunctionValue(value)) {
|
|
129
|
-
throw createArgumentError(
|
|
130
|
-
name,
|
|
131
|
-
`${name} expects a function but received ${formatValue(value)}`,
|
|
132
|
-
);
|
|
133
|
-
}
|
|
134
|
-
return toFiniteFunction(value);
|
|
135
|
-
};
|
|
136
|
-
|
|
137
90
|
export const getOperator = (args: BuiltinArgument[], index: number, name: string) => {
|
|
138
91
|
const argument = args[index];
|
|
139
92
|
if (argument === undefined || !isOperatorValue(argument)) {
|
|
@@ -271,14 +224,12 @@ export const getJavaClassName = (value: Value) => {
|
|
|
271
224
|
|
|
272
225
|
export const getKindString = (value: Value) => KIND_STRINGS[getJavaClassName(value)];
|
|
273
226
|
|
|
274
|
-
|
|
275
|
-
|
|
276
|
-
|
|
277
|
-
|
|
227
|
+
const getJavaOverrideMessage = (signature: string, message: string) =>
|
|
228
|
+
`Attempted to apply the operator overridden by the Java method\n${signature},\nbut it produced the following error:\n${message}`;
|
|
229
|
+
|
|
230
|
+
const createJavaOverrideError = (signature: string, message: string) =>
|
|
231
|
+
new TlaEvaluationError(getJavaOverrideMessage(signature, message));
|
|
278
232
|
|
|
279
|
-
// TLC reports a failure inside an operator's Java method as a failure of the method, except an
|
|
280
|
-
// EvalException that the method raises itself. A method that evaluates its own arguments reports
|
|
281
|
-
// every failure that way.
|
|
282
233
|
export const overrideWithJava = (builtin: Builtin, signature: string): Builtin => {
|
|
283
234
|
const reportAsJavaFailure =
|
|
284
235
|
<Arguments extends unknown[]>(compute: (...args: Arguments) => Value) =>
|
|
@@ -287,18 +238,29 @@ export const overrideWithJava = (builtin: Builtin, signature: string): Builtin =
|
|
|
287
238
|
try {
|
|
288
239
|
return compute(...args);
|
|
289
240
|
} catch (error) {
|
|
241
|
+
if (!(error instanceof TlaEvaluationError) || error instanceof TlaEndOfInputError) {
|
|
242
|
+
throw error;
|
|
243
|
+
}
|
|
244
|
+
const isFingerprinted = isFingerprintedSince(depth);
|
|
245
|
+
if (setTrace.sets) setTrace.sets.length = depth;
|
|
290
246
|
const isWrapped =
|
|
291
|
-
error instanceof
|
|
292
|
-
(builtin.isLazy === true || !(error instanceof TlaModuleError));
|
|
247
|
+
builtin.isLazy === true || !(error instanceof TlaModuleError) || isFingerprinted;
|
|
293
248
|
if (!isWrapped) throw error;
|
|
294
|
-
|
|
295
|
-
|
|
249
|
+
if (builtin.isLazy !== true && error instanceof TlaNullPointerError) {
|
|
250
|
+
throw new TlaModuleError(getJavaOverrideMessage(signature, error.message));
|
|
251
|
+
}
|
|
296
252
|
throw createJavaOverrideError(signature, error.message);
|
|
297
253
|
}
|
|
298
254
|
};
|
|
255
|
+
const evaluate = reportAsJavaFailure(builtin.evaluate);
|
|
299
256
|
return {
|
|
300
257
|
...builtin,
|
|
301
|
-
evaluate:
|
|
258
|
+
evaluate: (args, context) => {
|
|
259
|
+
if (args.length !== builtin.arity) {
|
|
260
|
+
throw createJavaOverrideError(signature, `array is not of length ${builtin.arity}`);
|
|
261
|
+
}
|
|
262
|
+
return evaluate(args, context);
|
|
263
|
+
},
|
|
302
264
|
evaluateUnary: builtin.evaluateUnary && reportAsJavaFailure(builtin.evaluateUnary),
|
|
303
265
|
evaluateBinary: builtin.evaluateBinary && reportAsJavaFailure(builtin.evaluateBinary),
|
|
304
266
|
};
|
|
@@ -325,8 +287,9 @@ export const defineArithmetic = (
|
|
|
325
287
|
) => {
|
|
326
288
|
const signature = getJavaSignature(module, method, "IntValue", 2);
|
|
327
289
|
return defineBinary(name, (left, right) => {
|
|
328
|
-
|
|
290
|
+
// TLC's MethodHandle casts the last argument first.
|
|
329
291
|
const rightNumber = getJavaInteger(right, signature);
|
|
292
|
+
const leftNumber = getJavaInteger(left, signature);
|
|
330
293
|
const result = compute(leftNumber, rightNumber);
|
|
331
294
|
if (isOutOfRange(result)) throw createOverflowError(`${leftNumber}${name}${rightNumber}`);
|
|
332
295
|
return result;
|
|
@@ -342,7 +305,6 @@ const getIntegerArgument = (value: Value, position: string, name: string) => {
|
|
|
342
305
|
return value;
|
|
343
306
|
};
|
|
344
307
|
|
|
345
|
-
// The error of an argument that isn't an integer names the operator as TLC's method does.
|
|
346
308
|
export const defineComparison = (
|
|
347
309
|
name: string,
|
|
348
310
|
compare: (left: number, right: number) => boolean,
|
package/src/bundled-modules.ts
CHANGED
|
@@ -1,5 +1,4 @@
|
|
|
1
|
-
// TLC's Reals
|
|
2
|
-
// lines as TLC's errors.
|
|
1
|
+
// TLC's Reals, RealTime, and Toolbox modules, verbatim, so errors in them name TLC's lines.
|
|
3
2
|
export const REALS = `-------------------------------- MODULE Reals -------------------------------
|
|
4
3
|
(***************************************************************************)
|
|
5
4
|
(* This module provides dummy definitions of the operators that are *)
|
|
@@ -74,9 +73,3 @@ _TEPosition ==
|
|
|
74
73
|
ELSE IF TLCGet("level") = 0 THEN 1 ELSE TLCGet("level")
|
|
75
74
|
|
|
76
75
|
=============================================================================`;
|
|
77
|
-
|
|
78
|
-
export const BUNDLED_MODULES = new Map([
|
|
79
|
-
["Reals", REALS],
|
|
80
|
-
["RealTime", REAL_TIME],
|
|
81
|
-
["Toolbox", TOOLBOX],
|
|
82
|
-
]);
|