tla-ts 0.0.9 → 0.0.10-dev.06b481ee0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +30 -1
- package/dist/compile.cjs +23 -0
- package/dist/compile.js +23 -0
- package/dist/deciders.cjs +41 -37
- package/dist/deciders.js +48 -44
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +122 -12
- package/dist/index.d.ts +122 -12
- package/dist/index.js +1 -1
- package/dist/parallel-worker.cjs +1 -1
- package/dist/parallel-worker.js +1 -1
- package/dist/prove-worker.cjs +1 -1
- package/dist/prove-worker.js +1 -1
- package/dist/prove.cjs +2746 -410
- package/dist/prove.js +2745 -409
- package/dist/run.cjs +144 -31
- package/dist/run.js +144 -31
- package/dist/tlapm.cjs +2 -2
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +134 -104
- package/dist/transfer.js +134 -104
- package/dist/worker.cjs +7 -7
- package/dist/worker.js +7 -7
- package/package.json +3 -1
- package/src/ast.ts +56 -60
- package/src/bags.ts +128 -110
- package/src/builtins.ts +31 -77
- package/src/bundled-modules.ts +1 -8
- package/src/check-failure.ts +118 -0
- package/src/check-trace.ts +320 -0
- package/src/check.ts +1156 -888
- package/src/cli/options.ts +12 -32
- package/src/cli/run.ts +0 -2
- package/src/cli/runtime-invariants.ts +100 -0
- package/src/cli/shared.ts +19 -12
- package/src/cli/tlapm.ts +433 -82
- package/src/cli/tlc-arguments.ts +652 -0
- package/src/cli/tlc-output.ts +701 -0
- package/src/cli/tlc-usage.ts +360 -0
- package/src/cli/tlc.ts +330 -659
- package/src/cli/typescript.ts +23 -0
- package/src/cli/xml-exporter.ts +27 -49
- package/src/cli.ts +0 -1
- package/src/codegen.ts +217 -82
- package/src/config.ts +140 -109
- package/src/coverage.ts +1019 -0
- package/src/dependencies.ts +101 -66
- package/src/dfid.ts +683 -0
- package/src/environment-config.ts +315 -0
- package/src/environment.ts +263 -370
- package/src/errors.ts +107 -57
- package/src/evaluate.ts +898 -369
- package/src/exit-codes.ts +63 -13
- package/src/fingerprints.ts +75 -11
- package/src/index.ts +3 -0
- package/src/instances.ts +137 -22
- package/src/java-hash.ts +21 -0
- package/src/java-overrides.ts +6 -21
- package/src/json-reader.ts +455 -0
- package/src/json.ts +252 -139
- package/src/levels.ts +231 -154
- package/src/lexer.ts +83 -101
- package/src/liveness-checker.ts +743 -322
- package/src/liveness.ts +230 -133
- package/src/obligations/action.ts +17 -44
- package/src/obligations/anonymize.ts +120 -95
- package/src/obligations/enabled-axioms.ts +218 -0
- package/src/obligations/equality.ts +1 -3
- package/src/obligations/expression.ts +37 -26
- package/src/obligations/format.ts +0 -10
- package/src/obligations/generate.ts +66 -64
- package/src/obligations/index.ts +39 -20
- package/src/obligations/levels.ts +27 -18
- package/src/obligations/module.ts +28 -55
- package/src/obligations/normalize.ts +31 -41
- package/src/obligations/operators.ts +0 -3
- package/src/obligations/pragma.ts +52 -24
- package/src/obligations/printer.ts +94 -63
- package/src/obligations/proof.ts +3 -6
- package/src/obligations/regroup.ts +0 -5
- package/src/obligations/simplify.ts +57 -63
- package/src/obligations/source.ts +121 -95
- package/src/obligations/subexpression.ts +49 -28
- package/src/obligations/substitution.ts +1 -5
- package/src/obligations/temporal.ts +12 -20
- package/src/obligations/tuples.ts +2 -10
- package/src/parallel-worker.ts +36 -60
- package/src/parallel.ts +64 -73
- package/src/parser.ts +1184 -531
- package/src/pcal/ast.ts +53 -86
- package/src/pcal/parse.ts +144 -219
- package/src/pcal/tokenize.ts +91 -131
- package/src/pcal/translate.ts +83 -130
- package/src/pcal/validate.ts +48 -68
- package/src/pretty-print.ts +7 -8
- package/src/prover/decide-pool.ts +8 -13
- package/src/prover/deciders.ts +12 -13
- package/src/prover/first-order.ts +0 -11
- package/src/prover/isabelle/decide.ts +3 -31
- package/src/prover/isabelle/encode.ts +82 -64
- package/src/prover/isabelle/isar/attrib.ts +250 -0
- package/src/prover/isabelle/isar/context.ts +335 -0
- package/src/prover/isabelle/isar/induct.ts +382 -0
- package/src/prover/isabelle/isar/inner-syntax.ts +262 -117
- package/src/prover/isabelle/isar/method.ts +510 -226
- package/src/prover/isabelle/isar/proof.ts +570 -23
- package/src/prover/isabelle/isar/rule-cases.ts +226 -0
- package/src/prover/isabelle/isar/theory.ts +488 -88
- package/src/prover/isabelle/isar/toplevel.ts +331 -0
- package/src/prover/isabelle/isar/type-check.ts +99 -38
- package/src/prover/isabelle/provers/blast/blast.ts +16 -105
- package/src/prover/isabelle/provers/blast/branch.ts +0 -33
- package/src/prover/isabelle/provers/blast/prove.ts +0 -36
- package/src/prover/isabelle/provers/blast/rules.ts +5 -45
- package/src/prover/isabelle/provers/blast/state.ts +1 -29
- package/src/prover/isabelle/provers/blast/term.ts +8 -37
- package/src/prover/isabelle/provers/clasimp.ts +1 -15
- package/src/prover/isabelle/provers/classical.ts +58 -61
- package/src/prover/isabelle/provers/hypsubst.ts +29 -54
- package/src/prover/isabelle/pure/bicompose.ts +24 -39
- package/src/prover/isabelle/pure/consts.ts +0 -8
- package/src/prover/isabelle/pure/conv.ts +2 -18
- package/src/prover/isabelle/pure/drule.ts +95 -45
- package/src/prover/isabelle/pure/envir.ts +2 -53
- package/src/prover/isabelle/pure/goal.ts +1 -9
- package/src/prover/isabelle/pure/interrupt.ts +0 -5
- package/src/prover/isabelle/pure/list.ts +0 -3
- package/src/prover/isabelle/pure/logic.ts +1 -16
- package/src/prover/isabelle/pure/name.ts +1 -10
- package/src/prover/isabelle/pure/net.ts +2 -60
- package/src/prover/isabelle/pure/object-logic.ts +15 -16
- package/src/prover/isabelle/pure/pattern.ts +1 -20
- package/src/prover/isabelle/pure/raw-simplifier.ts +16 -63
- package/src/prover/isabelle/pure/rewriter.ts +34 -77
- package/src/prover/isabelle/pure/search.ts +2 -11
- package/src/prover/isabelle/pure/seq.ts +0 -11
- package/src/prover/isabelle/pure/simplifier.ts +27 -16
- package/src/prover/isabelle/pure/table.ts +2 -33
- package/src/prover/isabelle/pure/tactic.ts +11 -23
- package/src/prover/isabelle/pure/tactical.ts +47 -48
- package/src/prover/isabelle/pure/term-ord.ts +1 -7
- package/src/prover/isabelle/pure/term.ts +4 -47
- package/src/prover/isabelle/pure/thm.ts +26 -48
- package/src/prover/isabelle/pure/type.ts +1 -16
- package/src/prover/isabelle/pure/unify.ts +19 -31
- package/src/prover/isabelle/pure/variable.ts +2 -8
- package/src/prover/isabelle/tla/classical-setup.ts +17 -25
- package/src/prover/isabelle/tla/context.ts +65 -26
- package/src/prover/isabelle/tla/logic-data.ts +1 -1
- package/src/prover/isabelle/tla/logic.ts +53 -32
- package/src/prover/isabelle/tla/simpdata.ts +45 -44
- package/src/prover/isabelle/tools/intuitionistic.ts +28 -21
- package/src/prover/ocaml.ts +4 -7
- package/src/prover/prep/action.ts +33 -66
- package/src/prover/prep/enabled-axioms.ts +22 -20
- package/src/prover/prep/fingerprint.ts +2 -21
- package/src/prover/prep/level-comparison.ts +8 -12
- package/src/prover/prep/md5.ts +26 -31
- package/src/prover/prep/methods.ts +189 -86
- package/src/prover/prep/normalize.ts +42 -37
- package/src/prover/prove-worker.ts +0 -2
- package/src/prover/prove.ts +398 -133
- package/src/prover/ptl/decide.ts +96 -56
- package/src/prover/ptl/encode.ts +15 -38
- package/src/prover/ptl/sat.ts +24 -32
- package/src/prover/ptl/tableau.ts +40 -28
- package/src/prover/smt/arithmetic.ts +310 -0
- package/src/prover/smt/axioms.ts +12 -15
- package/src/prover/smt/context.ts +60 -32
- package/src/prover/smt/data.ts +517 -401
- package/src/prover/smt/encode.ts +155 -85
- package/src/prover/smt/extensionality.ts +5 -13
- package/src/prover/smt/flatten.ts +7 -28
- package/src/prover/smt/format.ts +33 -14
- package/src/prover/smt/instances.ts +7 -11
- package/src/prover/smt/layout.ts +91 -0
- package/src/prover/smt/rewrite.ts +1021 -658
- package/src/prover/smt/simplify.ts +441 -0
- package/src/prover/smt/solver/ackermannize-bv-tactic.ts +61 -0
- package/src/prover/smt/solver/ackr-helper.ts +179 -0
- package/src/prover/smt/solver/ackr-model-converter.ts +105 -0
- package/src/prover/smt/solver/act-cache.ts +0 -16
- package/src/prover/smt/solver/add-bounds-tactic.ts +59 -0
- package/src/prover/smt/solver/aig-tactic.ts +52 -0
- package/src/prover/smt/solver/aig.ts +889 -0
- package/src/prover/smt/solver/arith-rewriter.ts +626 -56
- package/src/prover/smt/solver/arith-terms.ts +121 -0
- package/src/prover/smt/solver/array-decl-plugin.ts +175 -0
- package/src/prover/smt/solver/array-rewriter.ts +319 -0
- package/src/prover/smt/solver/array.ts +1 -3
- package/src/prover/smt/solver/asserted-formulas.ts +241 -99
- package/src/prover/smt/solver/ast-lt.ts +165 -21
- package/src/prover/smt/solver/ast-util.ts +160 -7
- package/src/prover/smt/solver/ast.ts +1480 -184
- package/src/prover/smt/solver/auf-solver.ts +30 -56
- package/src/prover/smt/solver/bit-blast-tactic.ts +608 -0
- package/src/prover/smt/solver/bit-blaster.ts +871 -0
- package/src/prover/smt/solver/blast-term-ite.ts +47 -0
- package/src/prover/smt/solver/bound-manager.ts +196 -0
- package/src/prover/smt/solver/bound-simplifier.ts +598 -0
- package/src/prover/smt/solver/bv-bound-chk.ts +492 -0
- package/src/prover/smt/solver/bv-decl-plugin.ts +341 -0
- package/src/prover/smt/solver/bv-divrem-bounds.ts +95 -0
- package/src/prover/smt/solver/bv-rewriter.ts +1901 -0
- package/src/prover/smt/solver/bv1-blast.ts +214 -0
- package/src/prover/smt/solver/bv2fpa-converter.ts +174 -0
- package/src/prover/smt/solver/bv2int-rewriter.ts +544 -0
- package/src/prover/smt/solver/bv2real-rewriter.ts +533 -0
- package/src/prover/smt/solver/card2bv.ts +127 -0
- package/src/prover/smt/solver/case-split-queue.ts +0 -10
- package/src/prover/smt/solver/cg-table.ts +39 -42
- package/src/prover/smt/solver/check-logic.ts +330 -0
- package/src/prover/smt/solver/clause.ts +0 -27
- package/src/prover/smt/solver/cofactor-elim-term-ite.ts +293 -0
- package/src/prover/smt/solver/conflict-resolution.ts +78 -11
- package/src/prover/smt/solver/context.ts +600 -187
- package/src/prover/smt/solver/ctx-simplify.ts +34 -52
- package/src/prover/smt/solver/ctx-solver-simplify.ts +122 -0
- package/src/prover/smt/solver/datatype-decl-plugin.ts +580 -0
- package/src/prover/smt/solver/datatype-rewriter.ts +82 -0
- package/src/prover/smt/solver/demodulator.ts +786 -0
- package/src/prover/smt/solver/dependent-expr-state.ts +93 -0
- package/src/prover/smt/solver/der.ts +39 -30
- package/src/prover/smt/solver/diff-neq.ts +205 -0
- package/src/prover/smt/solver/distribute-forall.ts +57 -0
- package/src/prover/smt/solver/dom-simplify.ts +511 -0
- package/src/prover/smt/solver/dt2bv-tactic.ts +296 -0
- package/src/prover/smt/solver/dyn-ack.ts +0 -11
- package/src/prover/smt/solver/e-matching.ts +9 -41
- package/src/prover/smt/solver/elim-bounds.ts +89 -0
- package/src/prover/smt/solver/elim-small-bv-tactic.ts +129 -0
- package/src/prover/smt/solver/elim-term-ite-tactic.ts +48 -0
- package/src/prover/smt/solver/elim-uncnstr.ts +542 -0
- package/src/prover/smt/solver/enode.ts +100 -23
- package/src/prover/smt/solver/eq2bv-tactic.ts +218 -0
- package/src/prover/smt/solver/euf/arith-axioms.ts +403 -0
- package/src/prover/smt/solver/euf/arith-internalize.ts +653 -0
- package/src/prover/smt/solver/euf/arith-solver.ts +889 -0
- package/src/prover/smt/solver/euf/array-axioms.ts +527 -0
- package/src/prover/smt/solver/euf/array-internalize.ts +428 -0
- package/src/prover/smt/solver/euf/array-solver.ts +306 -0
- package/src/prover/smt/solver/euf/bv-ackerman.ts +162 -0
- package/src/prover/smt/solver/euf/bv-internalize.ts +748 -0
- package/src/prover/smt/solver/euf/bv-solver.ts +449 -0
- package/src/prover/smt/solver/euf/dt-solver.ts +618 -0
- package/src/prover/smt/solver/euf/egraph.ts +901 -0
- package/src/prover/smt/solver/euf/euf-solver.ts +1204 -0
- package/src/prover/smt/solver/euf/fpa-solver.ts +317 -0
- package/src/prover/smt/solver/euf/mam.ts +1046 -0
- package/src/prover/smt/solver/euf/q-ematch.ts +829 -0
- package/src/prover/smt/solver/euf/q-mbi.ts +587 -0
- package/src/prover/smt/solver/euf/q-model-fixer.ts +296 -0
- package/src/prover/smt/solver/euf/q-solver.ts +361 -0
- package/src/prover/smt/solver/euf/th-solver.ts +328 -0
- package/src/prover/smt/solver/euf/th-solvers.ts +30 -0
- package/src/prover/smt/solver/expr-ref.ts +0 -5
- package/src/prover/smt/solver/expr-safe-replace.ts +26 -7
- package/src/prover/smt/solver/expr2polynomial.ts +271 -0
- package/src/prover/smt/solver/factor.ts +163 -0
- package/src/prover/smt/solver/fd-solver.ts +734 -0
- package/src/prover/smt/solver/fingerprints.ts +15 -26
- package/src/prover/smt/solver/fix-dl-var.ts +147 -0
- package/src/prover/smt/solver/flat-literals.ts +0 -9
- package/src/prover/smt/solver/fm-tactic.ts +884 -0
- package/src/prover/smt/solver/fpa-decl-plugin.ts +618 -0
- package/src/prover/smt/solver/fpa-rewriter.ts +639 -0
- package/src/prover/smt/solver/fpa2bv-converter.ts +2251 -0
- package/src/prover/smt/solver/fpa2bv-rewriter.ts +349 -0
- package/src/prover/smt/solver/fpa2bv-tactic.ts +73 -0
- package/src/prover/smt/solver/goal.ts +179 -28
- package/src/prover/smt/solver/goal2nlsat.ts +216 -0
- package/src/prover/smt/solver/guard-set.ts +219 -0
- package/src/prover/smt/solver/hash.ts +0 -9
- package/src/prover/smt/solver/hashtable.ts +30 -23
- package/src/prover/smt/solver/inf-eps.ts +63 -0
- package/src/prover/smt/solver/inj-axiom.ts +101 -0
- package/src/prover/smt/solver/internalizer.ts +113 -133
- package/src/prover/smt/solver/lackr.ts +381 -0
- package/src/prover/smt/solver/lbool.ts +0 -2
- package/src/prover/smt/solver/lia2card.ts +268 -0
- package/src/prover/smt/solver/lia2pb.ts +154 -0
- package/src/prover/smt/solver/literal.ts +0 -4
- package/src/prover/smt/solver/logic-tactics.ts +355 -0
- package/src/prover/smt/solver/lp/bound-propagator.ts +7 -26
- package/src/prover/smt/solver/lp/constraints.ts +1 -8
- package/src/prover/smt/solver/lp/containers.ts +18 -31
- package/src/prover/smt/solver/lp/core-solver.ts +35 -37
- package/src/prover/smt/solver/lp/cross-nested.ts +4 -21
- package/src/prover/smt/solver/lp/dep-intervals.ts +6 -24
- package/src/prover/smt/solver/lp/dependency.ts +0 -5
- package/src/prover/smt/solver/lp/dioph-eq.ts +8 -103
- package/src/prover/smt/solver/lp/explanation.ts +0 -6
- package/src/prover/smt/solver/lp/gomory.ts +8 -22
- package/src/prover/smt/solver/lp/hnf-cutter.ts +16 -23
- package/src/prover/smt/solver/lp/hnf.ts +10 -28
- package/src/prover/smt/solver/lp/int-cube.ts +17 -39
- package/src/prover/smt/solver/lp/int-solver.ts +3 -35
- package/src/prover/smt/solver/lp/lar-solver.ts +70 -83
- package/src/prover/smt/solver/lp/lar-term.ts +0 -5
- package/src/prover/smt/solver/lp/lp-settings.ts +6 -16
- package/src/prover/smt/solver/lp/maximize-term.ts +76 -52
- package/src/prover/smt/solver/lp/nex-creator.ts +7 -30
- package/src/prover/smt/solver/lp/nex.ts +2 -7
- package/src/prover/smt/solver/lp/nla-backoff.ts +0 -5
- package/src/prover/smt/solver/lp/nla-basics.ts +48 -30
- package/src/prover/smt/solver/lp/nla-core.ts +92 -136
- package/src/prover/smt/solver/lp/nla-divisions.ts +31 -43
- package/src/prover/smt/solver/lp/nla-emonics.ts +3 -21
- package/src/prover/smt/solver/lp/nla-factorization.ts +0 -4
- package/src/prover/smt/solver/lp/nla-grobner.ts +177 -149
- package/src/prover/smt/solver/lp/nla-horner.ts +2 -12
- package/src/prover/smt/solver/lp/nla-intervals.ts +1 -12
- package/src/prover/smt/solver/lp/nla-monomial-bounds.ts +15 -42
- package/src/prover/smt/solver/lp/nla-monotone.ts +1 -6
- package/src/prover/smt/solver/lp/nla-order.ts +0 -13
- package/src/prover/smt/solver/lp/nla-patcher.ts +3 -7
- package/src/prover/smt/solver/lp/nla-powers.ts +220 -0
- package/src/prover/smt/solver/lp/nla-tangents.ts +0 -10
- package/src/prover/smt/solver/lp/nla-throttle.ts +0 -6
- package/src/prover/smt/solver/lp/nla-transcendentals.ts +324 -0
- package/src/prover/smt/solver/lp/nla-types.ts +0 -12
- package/src/prover/smt/solver/lp/nla-var-eqs.ts +4 -26
- package/src/prover/smt/solver/lp/nra-solver.ts +164 -147
- package/src/prover/smt/solver/lp/numeric-pair.ts +0 -4
- package/src/prover/smt/solver/lp/pdd-interval.ts +6 -5
- package/src/prover/smt/solver/lp/pdd-simplifier.ts +61 -34
- package/src/prover/smt/solver/lp/pdd-solver.ts +74 -72
- package/src/prover/smt/solver/lp/pdd.ts +730 -358
- package/src/prover/smt/solver/lp/random-updater.ts +0 -9
- package/src/prover/smt/solver/lp/static-matrix.ts +8 -19
- package/src/prover/smt/solver/lp/union-find.ts +5 -5
- package/src/prover/smt/solver/macro-finder.ts +530 -0
- package/src/prover/smt/solver/mam-compiler.ts +129 -139
- package/src/prover/smt/solver/mam-interpreter.ts +0 -21
- package/src/prover/smt/solver/max-bv-sharing-tactic.ts +17 -0
- package/src/prover/smt/solver/max-cliques.ts +105 -0
- package/src/prover/smt/solver/maxcore.ts +310 -0
- package/src/prover/smt/solver/maximize-ac-sharing.ts +8 -21
- package/src/prover/smt/solver/maxlex.ts +115 -0
- package/src/prover/smt/solver/maxsmt-base.ts +106 -0
- package/src/prover/smt/solver/maxsmt.ts +92 -0
- package/src/prover/smt/solver/mbp/mbp-arith.ts +467 -0
- package/src/prover/smt/solver/mbp/mbp-basic-tg.ts +101 -0
- package/src/prover/smt/solver/mbp/mbp-plugin.ts +287 -0
- package/src/prover/smt/solver/mbp/mbp-qel.ts +48 -0
- package/src/prover/smt/solver/mbp/mbp-solve-plugin.ts +271 -0
- package/src/prover/smt/solver/mbp/mbp-term-graph.ts +606 -0
- package/src/prover/smt/solver/model-based-opt.ts +844 -0
- package/src/prover/smt/solver/model-checker.ts +20 -63
- package/src/prover/smt/solver/model-evaluator.ts +192 -40
- package/src/prover/smt/solver/model-finder.ts +14 -32
- package/src/prover/smt/solver/model-generator.ts +104 -46
- package/src/prover/smt/solver/model-macro-solver.ts +60 -114
- package/src/prover/smt/solver/model-printer.ts +214 -0
- package/src/prover/smt/solver/mpf.ts +709 -0
- package/src/prover/smt/solver/mus.ts +50 -0
- package/src/prover/smt/solver/muz/dl-context.ts +382 -0
- package/src/prover/smt/solver/muz/dl-mk-bit-blast.ts +97 -0
- package/src/prover/smt/solver/muz/dl-mk-coi-filter.ts +167 -0
- package/src/prover/smt/solver/muz/dl-mk-elim-term-ite.ts +125 -0
- package/src/prover/smt/solver/muz/dl-mk-interp-tail-simplifier.ts +299 -0
- package/src/prover/smt/solver/muz/dl-mk-rule-inliner.ts +455 -0
- package/src/prover/smt/solver/muz/dl-mk-slice.ts +340 -0
- package/src/prover/smt/solver/muz/dl-mk-subsumption-checker.ts +163 -0
- package/src/prover/smt/solver/muz/dl-rule-set.ts +273 -0
- package/src/prover/smt/solver/muz/dl-rule-transformer.ts +123 -0
- package/src/prover/smt/solver/muz/dl-rule.ts +495 -0
- package/src/prover/smt/solver/muz/hnf.ts +201 -0
- package/src/prover/smt/solver/muz/horn-subsume-model-converter.ts +176 -0
- package/src/prover/smt/solver/muz/horn-tactic.ts +214 -0
- package/src/prover/smt/solver/muz/rule-properties.ts +359 -0
- package/src/prover/smt/solver/muz/spacer-context.ts +1404 -0
- package/src/prover/smt/solver/muz/spacer-dl-interface.ts +52 -0
- package/src/prover/smt/solver/muz/spacer-generalizers.ts +241 -0
- package/src/prover/smt/solver/muz/spacer-manager.ts +127 -0
- package/src/prover/smt/solver/muz/spacer-pdr.ts +219 -0
- package/src/prover/smt/solver/muz/spacer-prop-solver.ts +333 -0
- package/src/prover/smt/solver/muz/spacer-util.ts +282 -0
- package/src/prover/smt/solver/muz/substitution.ts +203 -0
- package/src/prover/smt/solver/nla2bv-tactic.ts +285 -0
- package/src/prover/smt/solver/nlqsat.ts +484 -0
- package/src/prover/smt/solver/nlsat/algebraic.ts +357 -236
- package/src/prover/smt/solver/nlsat/atoms.ts +73 -54
- package/src/prover/smt/solver/nlsat/evaluator.ts +16 -22
- package/src/prover/smt/solver/nlsat/explain.ts +429 -275
- package/src/prover/smt/solver/nlsat/interval-set.ts +9 -51
- package/src/prover/smt/solver/nlsat/levelwise.ts +477 -344
- package/src/prover/smt/solver/nlsat/mpbq.ts +47 -14
- package/src/prover/smt/solver/nlsat/polynomial.ts +2385 -832
- package/src/prover/smt/solver/nlsat/solver.ts +297 -156
- package/src/prover/smt/solver/nlsat/transcendental-eval.ts +310 -0
- package/src/prover/smt/solver/nlsat/transcendentals.ts +391 -0
- package/src/prover/smt/solver/nlsat/types.ts +0 -9
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +9 -51
- package/src/prover/smt/solver/nlsat/upolynomial.ts +49 -109
- package/src/prover/smt/solver/nlsat-tactic.ts +82 -0
- package/src/prover/smt/solver/nnf.ts +112 -61
- package/src/prover/smt/solver/normalize-bounds.ts +53 -0
- package/src/prover/smt/solver/occf.ts +97 -0
- package/src/prover/smt/solver/opt-context.ts +801 -0
- package/src/prover/smt/solver/opt-nlsat.ts +386 -0
- package/src/prover/smt/solver/opt-pareto.ts +301 -0
- package/src/prover/smt/solver/opt-preprocess.ts +101 -0
- package/src/prover/smt/solver/opt-solver.ts +312 -0
- package/src/prover/smt/solver/opt-value.ts +55 -0
- package/src/prover/smt/solver/optsmt.ts +692 -0
- package/src/prover/smt/solver/parallel-tactic.ts +299 -0
- package/src/prover/smt/solver/pattern-inference.ts +21 -26
- package/src/prover/smt/solver/pb-rewriter.ts +281 -0
- package/src/prover/smt/solver/pb2bv-tactic.ts +540 -0
- package/src/prover/smt/solver/poly-rewriter.ts +261 -79
- package/src/prover/smt/solver/probes.ts +577 -0
- package/src/prover/smt/solver/propagate-values.ts +37 -30
- package/src/prover/smt/solver/proto-model.ts +650 -66
- package/src/prover/smt/solver/pull-quant.ts +28 -23
- package/src/prover/smt/solver/purify-arith.ts +632 -0
- package/src/prover/smt/solver/push-app-ite.ts +37 -0
- package/src/prover/smt/solver/qe-arith-plugin.ts +1096 -0
- package/src/prover/smt/solver/qe-lite-der.ts +2 -31
- package/src/prover/smt/solver/qe-lite-fm.ts +4 -28
- package/src/prover/smt/solver/qe-lite.ts +41 -51
- package/src/prover/smt/solver/qe-mbp.ts +270 -0
- package/src/prover/smt/solver/qe.ts +1499 -0
- package/src/prover/smt/solver/qel.ts +25 -0
- package/src/prover/smt/solver/qi-queue.ts +0 -16
- package/src/prover/smt/solver/qsat.ts +829 -0
- package/src/prover/smt/solver/quant-hoist.ts +196 -0
- package/src/prover/smt/solver/quant-tactics.ts +17 -74
- package/src/prover/smt/solver/quantifier-analyzer.ts +26 -47
- package/src/prover/smt/solver/quantifier-manager.ts +22 -32
- package/src/prover/smt/solver/quasi-macros.ts +243 -0
- package/src/prover/smt/solver/random-gen.ts +0 -2
- package/src/prover/smt/solver/rational.ts +45 -8
- package/src/prover/smt/solver/recfun-decl-plugin.ts +262 -0
- package/src/prover/smt/solver/recfun-rewriter.ts +107 -0
- package/src/prover/smt/solver/reduce-args.ts +225 -0
- package/src/prover/smt/solver/reduce-bv-size.ts +119 -0
- package/src/prover/smt/solver/ref-vector.ts +0 -6
- package/src/prover/smt/solver/relevancy.ts +2 -16
- package/src/prover/smt/solver/rewriter-tpl.ts +59 -135
- package/src/prover/smt/solver/rewriter.ts +507 -144
- package/src/prover/smt/solver/rlimit.ts +46 -24
- package/src/prover/smt/solver/sat/asymm-branch.ts +325 -0
- package/src/prover/smt/solver/sat/big.ts +177 -0
- package/src/prover/smt/solver/sat/clause-use-list.ts +71 -0
- package/src/prover/smt/solver/sat/clause.ts +203 -0
- package/src/prover/smt/solver/sat/cleaner.ts +94 -0
- package/src/prover/smt/solver/sat/config.ts +122 -0
- package/src/prover/smt/solver/sat/consequences.ts +203 -0
- package/src/prover/smt/solver/sat/elim-eqs.ts +142 -0
- package/src/prover/smt/solver/sat/goal2sat.ts +579 -0
- package/src/prover/smt/solver/sat/inc-sat-solver.ts +464 -0
- package/src/prover/smt/solver/sat/model-converter.ts +136 -0
- package/src/prover/smt/solver/sat/pb-constraint.ts +268 -0
- package/src/prover/smt/solver/sat/pb-solver.ts +1596 -0
- package/src/prover/smt/solver/sat/probing.ts +170 -0
- package/src/prover/smt/solver/sat/sat-tactic.ts +53 -0
- package/src/prover/smt/solver/sat/sat2goal.ts +189 -0
- package/src/prover/smt/solver/sat/scc.ts +142 -0
- package/src/prover/smt/solver/sat/simplifier.ts +1618 -0
- package/src/prover/smt/solver/sat/solver.ts +2107 -0
- package/src/prover/smt/solver/sat/var-queue.ts +117 -0
- package/src/prover/smt/solver/sat/watch-list.ts +140 -0
- package/src/prover/smt/solver/search-tree.ts +284 -0
- package/src/prover/smt/solver/seq-axioms.ts +995 -0
- package/src/prover/smt/solver/seq-decl-plugin.ts +819 -0
- package/src/prover/smt/solver/seq-derive.ts +1298 -0
- package/src/prover/smt/solver/seq-eq-approx.ts +236 -0
- package/src/prover/smt/solver/seq-eq-solver.ts +439 -0
- package/src/prover/smt/solver/seq-factory.ts +89 -0
- package/src/prover/smt/solver/seq-monadic.ts +730 -0
- package/src/prover/smt/solver/seq-range-predicate.ts +235 -0
- package/src/prover/smt/solver/seq-re-rewriter.ts +1171 -0
- package/src/prover/smt/solver/seq-re-util.ts +758 -0
- package/src/prover/smt/solver/seq-regex-bisim.ts +144 -0
- package/src/prover/smt/solver/seq-regex-live.ts +200 -0
- package/src/prover/smt/solver/seq-rewriter.ts +2404 -0
- package/src/prover/smt/solver/seq-skolem.ts +294 -0
- package/src/prover/smt/solver/seq-subset.ts +165 -0
- package/src/prover/smt/solver/seq-view-witness.ts +353 -0
- package/src/prover/smt/solver/smt-consequences.ts +297 -0
- package/src/prover/smt/solver/smt-kernel.ts +124 -0
- package/src/prover/smt/solver/smt-logics.ts +66 -0
- package/src/prover/smt/solver/smt-setup.ts +589 -0
- package/src/prover/smt/solver/smt2-printer.ts +765 -0
- package/src/prover/smt/solver/smtlib-parser.ts +3546 -406
- package/src/prover/smt/solver/smtlib-script.ts +2134 -0
- package/src/prover/smt/solver/solve-eqs.ts +928 -0
- package/src/prover/smt/solver/solver.ts +135 -40
- package/src/prover/smt/solver/sort.ts +1 -5
- package/src/prover/smt/solver/static-features.ts +314 -0
- package/src/prover/smt/solver/sticky-generations.ts +0 -6
- package/src/prover/smt/solver/tactic.ts +2141 -0
- package/src/prover/smt/solver/term-enumeration.ts +205 -0
- package/src/prover/smt/solver/theory-array.ts +1240 -0
- package/src/prover/smt/solver/theory-bv.ts +1210 -0
- package/src/prover/smt/solver/theory-char.ts +355 -0
- package/src/prover/smt/solver/theory-datatype.ts +598 -0
- package/src/prover/smt/solver/theory-finite-set.ts +30 -0
- package/src/prover/smt/solver/theory-fpa.ts +389 -0
- package/src/prover/smt/solver/theory-lra-axioms.ts +55 -25
- package/src/prover/smt/solver/theory-lra-bounds.ts +31 -11
- package/src/prover/smt/solver/theory-lra-final-check.ts +60 -91
- package/src/prover/smt/solver/theory-lra-internalize.ts +96 -53
- package/src/prover/smt/solver/theory-lra-model.ts +23 -53
- package/src/prover/smt/solver/theory-lra-propagate.ts +34 -42
- package/src/prover/smt/solver/theory-lra-state.ts +7 -28
- package/src/prover/smt/solver/theory-lra.ts +189 -9
- package/src/prover/smt/solver/theory-pb.ts +951 -0
- package/src/prover/smt/solver/theory-polymorphism.ts +58 -0
- package/src/prover/smt/solver/theory-recfun.ts +307 -0
- package/src/prover/smt/solver/theory-seq-regex.ts +867 -0
- package/src/prover/smt/solver/theory-seq-solve.ts +1373 -0
- package/src/prover/smt/solver/theory-seq-state.ts +852 -0
- package/src/prover/smt/solver/theory-seq.ts +961 -0
- package/src/prover/smt/solver/theory-without-terms.ts +24 -0
- package/src/prover/smt/solver/theory.ts +189 -0
- package/src/prover/smt/solver/tseitin-cnf.ts +486 -0
- package/src/prover/smt/solver/var-subst.ts +37 -39
- package/src/prover/smt/table.ts +3 -10
- package/src/prover/smt/types.ts +146 -0
- package/src/prover/tlapm/cache.ts +74 -48
- package/src/prover/tlapm/ocaml-marshal.ts +19 -21
- package/src/prover/tlapm/tlapm.ts +21 -20
- package/src/prover/tlapm-library.ts +3208 -0
- package/src/prover/verdict.ts +9 -2
- package/src/prover/zenon/check/check.ts +1 -11
- package/src/prover/zenon/check/definitions.ts +5 -15
- package/src/prover/zenon/check/equality.ts +0 -8
- package/src/prover/zenon/check/functions.ts +0 -4
- package/src/prover/zenon/check/keys.ts +0 -7
- package/src/prover/zenon/check/propositional.ts +0 -3
- package/src/prover/zenon/check/records.ts +1 -6
- package/src/prover/zenon/check/relations.ts +2 -14
- package/src/prover/zenon/check/rewrites.ts +2 -21
- package/src/prover/zenon/check/sets.ts +40 -61
- package/src/prover/zenon/check/terms.ts +1 -19
- package/src/prover/zenon/check/tla.ts +0 -6
- package/src/prover/zenon/decide.ts +10 -19
- package/src/prover/zenon/encode.ts +0 -9
- package/src/prover/zenon/eqrel.ts +2 -15
- package/src/prover/zenon/equality-rules.ts +24 -6
- package/src/prover/zenon/expr.ts +29 -28
- package/src/prover/zenon/index-table.ts +33 -61
- package/src/prover/zenon/isar-case.ts +9 -21
- package/src/prover/zenon/isar.ts +37 -67
- package/src/prover/zenon/limits.ts +0 -4
- package/src/prover/zenon/llproof.ts +2 -22
- package/src/prover/zenon/mltoll.ts +66 -106
- package/src/prover/zenon/node.ts +20 -15
- package/src/prover/zenon/ocaml.ts +1 -17
- package/src/prover/zenon/parse.ts +9 -13
- package/src/prover/zenon/phrase.ts +2 -14
- package/src/prover/zenon/proof.ts +0 -11
- package/src/prover/zenon/propositional-rules.ts +0 -7
- package/src/prover/zenon/rules.ts +3 -8
- package/src/prover/zenon/search.ts +11 -35
- package/src/prover/zenon/tla/functions.ts +59 -33
- package/src/prover/zenon/tla/llproof.ts +67 -78
- package/src/prover/zenon/tla/records.ts +57 -35
- package/src/prover/zenon/tla/rewrites.ts +12 -21
- package/src/prover/zenon/tla/sets.ts +88 -59
- package/src/prover/zenon/tla/terms.ts +0 -8
- package/src/prover/zenon/tla/tla.ts +66 -66
- package/src/randomization.ts +81 -35
- package/src/resolve.ts +1132 -430
- package/src/runtime.ts +33 -23
- package/src/sany/builtins.ts +11 -14
- package/src/sany/generation.ts +383 -0
- package/src/sany/generator-def-entries.ts +210 -0
- package/src/sany/generator-definitions.ts +688 -0
- package/src/sany/generator-expressions.ts +1108 -0
- package/src/sany/generator-proofs.ts +665 -0
- package/src/sany/generator.ts +192 -2764
- package/src/sany/levels.ts +5 -35
- package/src/sany/lexer.ts +61 -80
- package/src/sany/linter.ts +0 -10
- package/src/sany/modules.ts +5 -7
- package/src/sany/nodes.ts +6 -44
- package/src/sany/parse-error.ts +39 -117
- package/src/sany/report.ts +32 -69
- package/src/sany/selectors.ts +60 -82
- package/src/sany/source.ts +1 -17
- package/src/sany/xml.ts +37 -120
- package/src/search.ts +913 -227
- package/src/simulate.ts +765 -0
- package/src/spec-description.ts +198 -104
- package/src/standard-definitions.ts +4 -4
- package/src/standard-modules.ts +302 -99
- package/src/state-graph.ts +52 -33
- package/src/subexpressions.ts +578 -166
- package/src/substitution-levels.ts +7 -7
- package/src/successors.ts +299 -108
- package/src/symmetry.ts +37 -28
- package/src/tableau.ts +29 -26
- package/src/tlc/fingerprint.ts +267 -79
- package/src/tlc/jar-data.ts +122 -6
- package/src/tlc/messages.ts +127 -56
- package/src/tlc/order.ts +53 -72
- package/src/tlc/random.ts +38 -49
- package/src/tlc/replay.ts +579 -230
- package/src/tlc/summary.ts +64 -60
- package/src/tlc/tlc-operators.ts +83 -47
- package/src/tlc/tlcext-operators.ts +205 -127
- package/src/tlc/trace-spec.ts +235 -0
- package/src/tlc/value-stream.ts +139 -0
- package/src/tlc/version.ts +1 -4
- package/src/trace-liveness.ts +529 -0
- package/src/transfer.ts +22 -25
- package/src/typed-tier.ts +6556 -0
- package/src/typescript/actions.ts +479 -0
- package/src/typescript/collections.ts +614 -0
- package/src/typescript/compile.ts +63 -0
- package/src/typescript/context.ts +94 -0
- package/src/typescript/emit.ts +121 -0
- package/src/typescript/expressions.ts +496 -0
- package/src/typescript/formula.ts +154 -0
- package/src/typescript/functions.ts +284 -0
- package/src/typescript/model.ts +162 -0
- package/src/typescript/names.ts +114 -0
- package/src/typescript/program.ts +48 -0
- package/src/typescript/properties.ts +139 -0
- package/src/typescript/scope.ts +112 -0
- package/src/typescript/steps.ts +167 -0
- package/src/typescript/types.ts +171 -0
- package/src/values.ts +945 -526
- package/src/worker.ts +7 -8
- package/src/prover/isabelle/isar/statement.ts +0 -57
- package/src/prover/smt/solver/z3-license.txt +0 -10
- package/src/prover/tlaps-module.ts +0 -510
- package/src/prover/zenon/LICENSE +0 -32
package/src/bags.ts
CHANGED
|
@@ -1,52 +1,76 @@
|
|
|
1
1
|
import {
|
|
2
|
-
createJavaOverrideError,
|
|
3
2
|
createModuleArgumentError,
|
|
4
3
|
createOverflowError,
|
|
5
4
|
defineConstant,
|
|
6
5
|
defineHigherOrderOperator,
|
|
7
6
|
defineOperator,
|
|
8
|
-
|
|
7
|
+
getKindString,
|
|
9
8
|
getOperator,
|
|
10
9
|
getValue,
|
|
11
10
|
isOutOfRange,
|
|
12
11
|
} from "./builtins";
|
|
13
12
|
import { TlaEvaluationError, TlaModuleError } from "./errors";
|
|
14
13
|
import type { Builtin, BuiltinArgument } from "./evaluate";
|
|
14
|
+
import { prettyPrint } from "./pretty-print";
|
|
15
15
|
import {
|
|
16
|
+
createEnumeratedSet,
|
|
16
17
|
createFunction,
|
|
17
18
|
createSet,
|
|
18
19
|
createSortedFunction,
|
|
19
20
|
formatValue,
|
|
20
21
|
getDomain,
|
|
21
22
|
isEnumerable,
|
|
23
|
+
isEqualLikeTlc,
|
|
22
24
|
isFunctionValue,
|
|
23
25
|
isSetValue,
|
|
24
26
|
toFiniteFunction,
|
|
25
27
|
toFiniteSet,
|
|
26
|
-
valuesEqual,
|
|
27
28
|
type FunctionValue,
|
|
28
29
|
type Value,
|
|
29
30
|
} from "./values";
|
|
30
31
|
|
|
31
32
|
const createWrongValueError = (name: string, expected: string, value: Value) =>
|
|
32
33
|
new TlaModuleError(
|
|
33
|
-
`Applying ${name} to the following value,\nwhich is not ${expected}:\n${formatValue(value)}`,
|
|
34
|
+
`Applying ${name} to the following value,\nwhich is not ${expected}:\n${prettyPrint(formatValue(value))}`,
|
|
34
35
|
);
|
|
35
36
|
|
|
36
37
|
const toFunction = (value: Value) => (isFunctionValue(value) ? toFiniteFunction(value) : undefined);
|
|
37
38
|
|
|
39
|
+
const FINITE_FUNCTION = "a function with a finite domain";
|
|
40
|
+
|
|
38
41
|
const getFunction = (args: BuiltinArgument[], index: number, name: string) => {
|
|
39
42
|
const value = getValue(args, index, name);
|
|
40
43
|
const functionValue = toFunction(value);
|
|
41
|
-
if (!functionValue) throw createWrongValueError(name,
|
|
44
|
+
if (!functionValue) throw createWrongValueError(name, FINITE_FUNCTION, value);
|
|
42
45
|
return functionValue;
|
|
43
46
|
};
|
|
44
47
|
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
const
|
|
48
|
-
|
|
49
|
-
|
|
48
|
+
// Deviation from TLC: Bags#BagIn and Bags#CopiesIn read the null that toFcnRcd gives for a value that isn't a function and leak a NullPointerException, where tla-ts reports the argument as not a bag.
|
|
49
|
+
const getCount = (args: BuiltinArgument[], name: string) => {
|
|
50
|
+
const bag = getValue(args, 1, name);
|
|
51
|
+
const functionValue = toFunction(bag);
|
|
52
|
+
const count = functionValue && findCount(functionValue, getValue(args, 0, name));
|
|
53
|
+
if (!functionValue || (count !== undefined && typeof count !== "number")) {
|
|
54
|
+
throw createModuleArgumentError("second", name, "bag", bag);
|
|
55
|
+
}
|
|
56
|
+
return count;
|
|
57
|
+
};
|
|
58
|
+
|
|
59
|
+
// Deviation from TLC: Bags#BagCup passes the null that toFcnRcd gives for a value that isn't a function to IsABag and leaks a NullPointerException, where tla-ts reports the argument as not a bag.
|
|
60
|
+
const getAddedBag = (
|
|
61
|
+
args: BuiltinArgument[],
|
|
62
|
+
functions: (FunctionValue | undefined)[],
|
|
63
|
+
index: number,
|
|
64
|
+
) => {
|
|
65
|
+
const functionValue = functions[index];
|
|
66
|
+
if (!functionValue || !isBag(functionValue)) {
|
|
67
|
+
throw createModuleArgumentError(
|
|
68
|
+
index === 0 ? "first" : "second",
|
|
69
|
+
"(+)",
|
|
70
|
+
"bag",
|
|
71
|
+
getValue(args, index, "(+)"),
|
|
72
|
+
);
|
|
73
|
+
}
|
|
50
74
|
return functionValue;
|
|
51
75
|
};
|
|
52
76
|
|
|
@@ -59,67 +83,56 @@ const isBag = (functionValue: FunctionValue) =>
|
|
|
59
83
|
functionValue.range.every((count) => typeof count === "number" && count > 0);
|
|
60
84
|
|
|
61
85
|
const findCount = (functionValue: FunctionValue, element: Value) => {
|
|
62
|
-
const position = functionValue.domain.findIndex((key) =>
|
|
86
|
+
const position = functionValue.domain.findIndex((key) => isEqualLikeTlc(element, key));
|
|
63
87
|
return position === -1 ? undefined : functionValue.range[position];
|
|
64
88
|
};
|
|
65
89
|
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
const BAG_DIFF_SIGNATURE = getBagsSignature("BagDiff", "tlc2.value.impl.Value", 2);
|
|
70
|
-
const SQ_SUBSETEQ_SIGNATURE = getBagsSignature("SqSubseteq", "tlc2.value.IBoolValue", 2);
|
|
71
|
-
const BAG_UNION_SIGNATURE = getBagsSignature("BagUnion", "tlc2.value.impl.Value", 1);
|
|
72
|
-
const BAG_OF_ALL_SIGNATURE = getBagsSignature("BagOfAll", "tlc2.value.impl.Value", 2);
|
|
73
|
-
const BAG_CUP_SIGNATURE = getBagsSignature("BagCup", "tlc2.value.impl.Value", 2);
|
|
74
|
-
const BAG_CARDINALITY_SIGNATURE = getBagsSignature("BagCardinality", "tlc2.value.impl.IntValue", 1);
|
|
75
|
-
|
|
76
|
-
// Bags.java casts each count to IntValue, so a count that isn't an integer fails with Java's
|
|
77
|
-
// ClassCastException.
|
|
78
|
-
const toCount = (value: Value, method: string) => {
|
|
90
|
+
// Deviation from TLC: Bags.java casts a count to IntValue and leaks the ClassCastException, where tla-ts reports the argument as not a bag.
|
|
91
|
+
const toCount = (value: Value, createError: () => TlaModuleError) => {
|
|
79
92
|
if (typeof value === "number") return value;
|
|
80
|
-
|
|
81
|
-
throw createJavaOverrideError(
|
|
82
|
-
method,
|
|
83
|
-
`class ${javaClass} cannot be cast to class tlc2.value.impl.IntValue (${javaClass} and tlc2.value.impl.IntValue are in unnamed module of loader 'app')`,
|
|
84
|
-
);
|
|
93
|
+
throw createError();
|
|
85
94
|
};
|
|
86
95
|
|
|
87
|
-
const addCounts = (left: Value, right: Value,
|
|
88
|
-
const sum = toCount(left,
|
|
96
|
+
const addCounts = (left: Value, right: Value, createError: () => TlaModuleError) => {
|
|
97
|
+
const sum = toCount(left, createError) + toCount(right, createError);
|
|
89
98
|
if (isOutOfRange(sum)) throw createOverflowError(`${left}+${right}`);
|
|
90
99
|
return sum;
|
|
91
100
|
};
|
|
92
101
|
|
|
93
|
-
// TLC subtracts counts as Java ints
|
|
102
|
+
// Deviation from TLC: Bags#BagDiff subtracts counts as Java ints that wrap, where tla-ts reports the overflow as - does.
|
|
94
103
|
const subtractCounts = (
|
|
95
104
|
functionValue: FunctionValue,
|
|
96
105
|
index: number,
|
|
97
106
|
other: FunctionValue,
|
|
98
|
-
|
|
107
|
+
createLeftError: () => TlaModuleError,
|
|
108
|
+
createRightError: () => TlaModuleError,
|
|
99
109
|
) => {
|
|
110
|
+
const count = toCount(functionValue.range[index], createLeftError);
|
|
100
111
|
const removed = findCount(other, functionValue.domain[index]);
|
|
101
|
-
|
|
102
|
-
|
|
112
|
+
if (removed === undefined) return count;
|
|
113
|
+
const difference = count - toCount(removed, createRightError);
|
|
114
|
+
if (isOutOfRange(difference)) throw createOverflowError(`${count}-${removed}`);
|
|
115
|
+
return difference;
|
|
103
116
|
};
|
|
104
117
|
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
118
|
+
// BagCup looks up a key of its second bag only among the keys of its first.
|
|
119
|
+
const addToBag = (
|
|
120
|
+
pairs: [Value, Value][],
|
|
121
|
+
key: Value,
|
|
122
|
+
count: Value,
|
|
123
|
+
createError: () => TlaModuleError,
|
|
124
|
+
end = pairs.length,
|
|
125
|
+
) => {
|
|
126
|
+
const existing = pairs.slice(0, end).find((pair) => isEqualLikeTlc(key, pair[0]));
|
|
127
|
+
if (existing) existing[1] = addCounts(existing[1], count, createError);
|
|
128
|
+
else pairs.push([key, count]);
|
|
129
|
+
};
|
|
130
|
+
|
|
131
|
+
const getPairs = (functionValue: FunctionValue) =>
|
|
132
|
+
functionValue.domain.map((key, index): [Value, Value] => [key, functionValue.range[index]]);
|
|
119
133
|
|
|
120
134
|
const EMPTY_BAG = createSortedFunction([], []);
|
|
121
135
|
|
|
122
|
-
// SubBag compares the counts with the >= of Naturals, which Integers replaces when TLC loads it.
|
|
123
136
|
export const createBagsOperators = (builtins: ReadonlyMap<string, Builtin>): Builtin[] => [
|
|
124
137
|
defineConstant("EmptyBag", EMPTY_BAG),
|
|
125
138
|
defineOperator("IsABag", 1, (args) => {
|
|
@@ -129,49 +142,41 @@ export const createBagsOperators = (builtins: ReadonlyMap<string, Builtin>): Bui
|
|
|
129
142
|
defineOperator("BagCardinality", 1, (args) => {
|
|
130
143
|
const bag = getValue(args, 0, "BagCardinality");
|
|
131
144
|
const functionValue = getFunction(args, 0, "BagCardinality");
|
|
145
|
+
const createError = () => createWrongValueError("BagCardinality", "a bag", bag);
|
|
132
146
|
return functionValue.range.reduce<number>((total, count) => {
|
|
133
|
-
if (typeof count !== "number" || count <= 0)
|
|
134
|
-
|
|
135
|
-
}
|
|
136
|
-
return addCounts(total, count, BAG_CARDINALITY_SIGNATURE);
|
|
147
|
+
if (typeof count !== "number" || count <= 0) throw createError();
|
|
148
|
+
return addCounts(total, count, createError);
|
|
137
149
|
}, 0);
|
|
138
150
|
}),
|
|
139
151
|
defineOperator("BagIn", 2, (args) => {
|
|
140
|
-
const
|
|
141
|
-
|
|
142
|
-
if (count === undefined) return false;
|
|
143
|
-
if (typeof count !== "number") throw createModuleArgumentError("second", "BagIn", "bag", bag);
|
|
144
|
-
return count > 0;
|
|
145
|
-
}),
|
|
146
|
-
defineOperator("CopiesIn", 2, (args) => {
|
|
147
|
-
const bag = getValue(args, 1, "CopiesIn");
|
|
148
|
-
const count = findCount(getFunction(args, 1, "CopiesIn"), getValue(args, 0, "CopiesIn"));
|
|
149
|
-
if (count === undefined) return 0;
|
|
150
|
-
if (typeof count !== "number")
|
|
151
|
-
throw createModuleArgumentError("second", "CopiesIn", "bag", bag);
|
|
152
|
-
return count;
|
|
152
|
+
const count = getCount(args, "BagIn");
|
|
153
|
+
return count !== undefined && count > 0;
|
|
153
154
|
}),
|
|
155
|
+
defineOperator("CopiesIn", 2, (args) => getCount(args, "CopiesIn") ?? 0),
|
|
154
156
|
defineOperator("\\oplus", 2, (args) => {
|
|
155
|
-
const
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
return functionValue;
|
|
166
|
-
});
|
|
167
|
-
return mergeBags(bags, BAG_CUP_SIGNATURE);
|
|
157
|
+
const functions = [0, 1].map((index) => toFunction(getValue(args, index, "(+)")));
|
|
158
|
+
const left = getAddedBag(args, functions, 0);
|
|
159
|
+
const right = getAddedBag(args, functions, 1);
|
|
160
|
+
const pairs = getPairs(left);
|
|
161
|
+
const createError = () =>
|
|
162
|
+
createModuleArgumentError("second", "(+)", "bag", getValue(args, 1, "(+)"));
|
|
163
|
+
right.domain.forEach((key, index) =>
|
|
164
|
+
addToBag(pairs, key, right.range[index], createError, left.domain.length),
|
|
165
|
+
);
|
|
166
|
+
return createFunction(pairs);
|
|
168
167
|
}),
|
|
169
168
|
defineOperator("\\ominus", 2, (args) => {
|
|
170
|
-
const
|
|
171
|
-
const
|
|
169
|
+
const leftValue = getValue(args, 0, "(-)");
|
|
170
|
+
const rightValue = getValue(args, 1, "(-)");
|
|
171
|
+
const left = toFunction(leftValue);
|
|
172
|
+
const right = toFunction(rightValue);
|
|
173
|
+
if (!left) throw createModuleArgumentError("first", "(-)", "bag", leftValue);
|
|
174
|
+
if (!right) throw createModuleArgumentError("second", "(-)", "bag", rightValue);
|
|
175
|
+
const createLeftError = () => createModuleArgumentError("first", "(-)", "bag", leftValue);
|
|
176
|
+
const createRightError = () => createModuleArgumentError("second", "(-)", "bag", rightValue);
|
|
172
177
|
return createFunction(
|
|
173
178
|
left.domain.flatMap((key, index): [Value, Value][] => {
|
|
174
|
-
const count = subtractCounts(left, index, right,
|
|
179
|
+
const count = subtractCounts(left, index, right, createLeftError, createRightError);
|
|
175
180
|
return count > 0 ? [[key, count]] : [];
|
|
176
181
|
}),
|
|
177
182
|
);
|
|
@@ -182,51 +187,64 @@ export const createBagsOperators = (builtins: ReadonlyMap<string, Builtin>): Bui
|
|
|
182
187
|
createWrongValueError("BagUnion", "a finite enumerable set", set),
|
|
183
188
|
);
|
|
184
189
|
if (elements.length < 2) return elements[0] ?? EMPTY_BAG;
|
|
185
|
-
const
|
|
190
|
+
const createUnionError = () =>
|
|
191
|
+
new TlaModuleError(
|
|
192
|
+
`Attempted to apply BagUnion to the following set, whose\nelement is not a bag:\n${prettyPrint(formatValue(set))}`,
|
|
193
|
+
);
|
|
194
|
+
const getBag = (element: Value) => {
|
|
186
195
|
const functionValue = toFunction(element);
|
|
187
|
-
if (!functionValue)
|
|
188
|
-
throw new TlaModuleError(
|
|
189
|
-
`Attempted to apply BagUnion to the following set, whose\nelement is not a bag:\n${formatValue(set)}`,
|
|
190
|
-
);
|
|
191
|
-
}
|
|
196
|
+
if (!functionValue) throw createUnionError();
|
|
192
197
|
return functionValue;
|
|
198
|
+
};
|
|
199
|
+
const pairs = getPairs(getBag(elements[0]));
|
|
200
|
+
elements.slice(1).forEach((element) => {
|
|
201
|
+
const functionValue = getBag(element);
|
|
202
|
+
functionValue.domain.forEach((key, index) =>
|
|
203
|
+
addToBag(pairs, key, functionValue.range[index], createUnionError),
|
|
204
|
+
);
|
|
193
205
|
});
|
|
194
|
-
return
|
|
206
|
+
return createFunction(pairs);
|
|
195
207
|
}),
|
|
196
208
|
defineOperator("\\sqsubseteq", 2, (args) => {
|
|
197
|
-
const
|
|
198
|
-
const
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
);
|
|
209
|
+
const leftValue = getValue(args, 0, "\\sqsubseteq");
|
|
210
|
+
const rightValue = getValue(args, 1, "\\sqsubseteq");
|
|
211
|
+
const left = toFunction(leftValue);
|
|
212
|
+
const right = toFunction(rightValue);
|
|
213
|
+
if (!left) throw createWrongValueError("\\sqsubseteq", FINITE_FUNCTION, leftValue);
|
|
214
|
+
if (!right) throw createWrongValueError("\\sqsubseteq", FINITE_FUNCTION, rightValue);
|
|
215
|
+
const createLeftError = () => createWrongValueError("\\sqsubseteq", "a bag", leftValue);
|
|
216
|
+
const createRightError = () => createWrongValueError("\\sqsubseteq", "a bag", rightValue);
|
|
217
|
+
return left.domain.every((key, index) => {
|
|
218
|
+
const count = findCount(right, key);
|
|
219
|
+
return (
|
|
220
|
+
toCount(left.range[index], createLeftError) <=
|
|
221
|
+
(count === undefined ? 0 : toCount(count, createRightError))
|
|
222
|
+
);
|
|
223
|
+
});
|
|
202
224
|
}),
|
|
203
225
|
defineHigherOrderOperator("BagOfAll", 2, (args) => {
|
|
204
226
|
const operator = getOperator(args, 0, "BagOfAll");
|
|
205
|
-
// TLC passes an operator whose body is a number or string literal to Bags.java as that literal.
|
|
206
|
-
if (operator.literalBody !== undefined) {
|
|
207
|
-
throw new TlaModuleError(
|
|
208
|
-
`The first argument of BagOfAll should be an operator, but instead it is:\n${formatValue(operator.literalBody)}`,
|
|
209
|
-
);
|
|
210
|
-
}
|
|
211
227
|
const value = getValue(args, 1, "BagOfAll");
|
|
212
228
|
const functionValue = toFunction(value);
|
|
213
229
|
if (!functionValue) {
|
|
214
230
|
throw createModuleArgumentError("second", "BagOfAll", "function with a finite domain", value);
|
|
215
231
|
}
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
),
|
|
220
|
-
BAG_OF_ALL_SIGNATURE,
|
|
232
|
+
const pairs: [Value, Value][] = [];
|
|
233
|
+
const createError = () => createModuleArgumentError("second", "BagOfAll", "bag", value);
|
|
234
|
+
functionValue.domain.forEach((key, index) =>
|
|
235
|
+
addToBag(pairs, operator.call([key]), functionValue.range[index], createError),
|
|
221
236
|
);
|
|
237
|
+
return createFunction(pairs);
|
|
222
238
|
}),
|
|
223
239
|
defineOperator("SubBag", 1, (args) => {
|
|
224
240
|
const value = getValue(args, 0, "SubBag");
|
|
225
241
|
if (!isFunctionValue(value)) {
|
|
226
|
-
throw new TlaEvaluationError(
|
|
242
|
+
throw new TlaEvaluationError(
|
|
243
|
+
`Attempted to apply the operator DOMAIN to a non-function\n(${getKindString(value)})\nline 106, col 58 to line 106, col 65 of module Bags`,
|
|
244
|
+
);
|
|
227
245
|
}
|
|
228
246
|
const functionValue = toFiniteFunction(value);
|
|
229
|
-
const range =
|
|
247
|
+
const range = toFiniteSet(createEnumeratedSet(functionValue.range)).elements;
|
|
230
248
|
const invalid = range.find((count) => typeof count !== "number");
|
|
231
249
|
// A count that isn't an integer fails the comparison.
|
|
232
250
|
if (invalid !== undefined) builtins.get(">=")?.evaluateBinary?.(range[0], invalid);
|
|
@@ -242,7 +260,7 @@ export const createBagsOperators = (builtins: ReadonlyMap<string, Builtin>): Bui
|
|
|
242
260
|
(subBags, key, index) =>
|
|
243
261
|
subBags.flatMap((entries) => [
|
|
244
262
|
entries,
|
|
245
|
-
...Array.from({ length: counts[index] }, (
|
|
263
|
+
...Array.from({ length: counts[index] }, (_value, copies): [Value, Value][] => [
|
|
246
264
|
...entries,
|
|
247
265
|
[key, copies + 1],
|
|
248
266
|
]),
|
|
@@ -261,7 +279,7 @@ export const createBagsOperators = (builtins: ReadonlyMap<string, Builtin>): Bui
|
|
|
261
279
|
defineOperator("SetToBag", 1, (args) => {
|
|
262
280
|
const set = getValue(args, 0, "SetToBag");
|
|
263
281
|
const elements = getFiniteElements(set, () =>
|
|
264
|
-
createWrongValueError("BagToSet",
|
|
282
|
+
createWrongValueError("BagToSet", FINITE_FUNCTION, set),
|
|
265
283
|
);
|
|
266
284
|
return createSortedFunction(
|
|
267
285
|
[...elements],
|
package/src/builtins.ts
CHANGED
|
@@ -1,13 +1,12 @@
|
|
|
1
|
-
import { TlaEvaluationError, TlaModuleError } from "./errors";
|
|
1
|
+
import { TlaEndOfInputError, TlaEvaluationError, TlaModuleError } from "./errors";
|
|
2
2
|
import type { Builtin, BuiltinArgument, Context, OperatorValue } from "./evaluate";
|
|
3
|
+
import { prettyPrint } from "./pretty-print";
|
|
3
4
|
import {
|
|
4
5
|
formatValue,
|
|
5
6
|
getFunctionClass,
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
isFunctionValue,
|
|
7
|
+
isFingerprintedSince,
|
|
8
|
+
isOverriddenSet,
|
|
9
9
|
isSetValue,
|
|
10
|
-
toFiniteFunction,
|
|
11
10
|
MAXIMUM_INTEGER,
|
|
12
11
|
MINIMUM_INTEGER,
|
|
13
12
|
setTrace,
|
|
@@ -15,9 +14,6 @@ import {
|
|
|
15
14
|
type Value,
|
|
16
15
|
} from "./values";
|
|
17
16
|
|
|
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
17
|
const CORE_OPERATOR_NAMES = new Set([
|
|
22
18
|
"=",
|
|
23
19
|
"#",
|
|
@@ -44,13 +40,11 @@ const CORE_OPERATOR_NAMES = new Set([
|
|
|
44
40
|
"..",
|
|
45
41
|
"Seq",
|
|
46
42
|
"IsFiniteSet",
|
|
47
|
-
"RandomElement",
|
|
48
43
|
]);
|
|
49
44
|
|
|
50
45
|
const createArgumentError = (name: string, message: string) =>
|
|
51
46
|
CORE_OPERATOR_NAMES.has(name) ? new TlaEvaluationError(message) : new TlaModuleError(message);
|
|
52
47
|
|
|
53
|
-
// TLC's EC.TLC_MODULE_ARGUMENT_ERROR.
|
|
54
48
|
export const createModuleArgumentError = (
|
|
55
49
|
position: string,
|
|
56
50
|
name: string,
|
|
@@ -58,9 +52,18 @@ export const createModuleArgumentError = (
|
|
|
58
52
|
value: Value,
|
|
59
53
|
) =>
|
|
60
54
|
new TlaModuleError(
|
|
61
|
-
`The ${position} argument of ${name} should be a ${expected}, but instead it is:\n${formatValue(value)}`,
|
|
55
|
+
`The ${position} argument of ${name} should be a ${expected}, but instead it is:\n${prettyPrint(formatValue(value))}`,
|
|
62
56
|
);
|
|
63
57
|
|
|
58
|
+
export const toEnumeratedSet = (value: Value, name: string, reported = value) => {
|
|
59
|
+
if (!isSetValue(value) || isOverriddenSet(value)) {
|
|
60
|
+
throw new TlaModuleError(
|
|
61
|
+
`Applying ${name} to the following value,\nwhich is not a finite set:\n${prettyPrint(formatValue(reported))}`,
|
|
62
|
+
);
|
|
63
|
+
}
|
|
64
|
+
return toFiniteSet(value);
|
|
65
|
+
};
|
|
66
|
+
|
|
64
67
|
const isOperatorValue = (argument: BuiltinArgument): argument is OperatorValue =>
|
|
65
68
|
typeof argument === "object" && argument.kind === "Operator";
|
|
66
69
|
|
|
@@ -72,17 +75,6 @@ export const getValue = (args: BuiltinArgument[], index: number, name: string):
|
|
|
72
75
|
return argument;
|
|
73
76
|
};
|
|
74
77
|
|
|
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
78
|
export const getBoolean = (args: BuiltinArgument[], index: number, name: string) => {
|
|
87
79
|
const value = getValue(args, index, name);
|
|
88
80
|
if (typeof value !== "boolean") {
|
|
@@ -91,49 +83,6 @@ export const getBoolean = (args: BuiltinArgument[], index: number, name: string)
|
|
|
91
83
|
return value;
|
|
92
84
|
};
|
|
93
85
|
|
|
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
86
|
export const getOperator = (args: BuiltinArgument[], index: number, name: string) => {
|
|
138
87
|
const argument = args[index];
|
|
139
88
|
if (argument === undefined || !isOperatorValue(argument)) {
|
|
@@ -271,14 +220,11 @@ export const getJavaClassName = (value: Value) => {
|
|
|
271
220
|
|
|
272
221
|
export const getKindString = (value: Value) => KIND_STRINGS[getJavaClassName(value)];
|
|
273
222
|
|
|
274
|
-
|
|
223
|
+
const createJavaOverrideError = (signature: string, message: string) =>
|
|
275
224
|
new TlaEvaluationError(
|
|
276
225
|
`Attempted to apply the operator overridden by the Java method\n${signature},\nbut it produced the following error:\n${message}`,
|
|
277
226
|
);
|
|
278
227
|
|
|
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
228
|
export const overrideWithJava = (builtin: Builtin, signature: string): Builtin => {
|
|
283
229
|
const reportAsJavaFailure =
|
|
284
230
|
<Arguments extends unknown[]>(compute: (...args: Arguments) => Value) =>
|
|
@@ -287,18 +233,26 @@ export const overrideWithJava = (builtin: Builtin, signature: string): Builtin =
|
|
|
287
233
|
try {
|
|
288
234
|
return compute(...args);
|
|
289
235
|
} catch (error) {
|
|
236
|
+
if (!(error instanceof TlaEvaluationError) || error instanceof TlaEndOfInputError) {
|
|
237
|
+
throw error;
|
|
238
|
+
}
|
|
239
|
+
const isFingerprinted = isFingerprintedSince(depth);
|
|
240
|
+
if (setTrace.sets) setTrace.sets.length = depth;
|
|
290
241
|
const isWrapped =
|
|
291
|
-
error instanceof
|
|
292
|
-
(builtin.isLazy === true || !(error instanceof TlaModuleError));
|
|
242
|
+
builtin.isLazy === true || !(error instanceof TlaModuleError) || isFingerprinted;
|
|
293
243
|
if (!isWrapped) throw error;
|
|
294
|
-
// The wrapping error replaces a FingerprintException that a set with a source raised.
|
|
295
|
-
if (setTrace.sets) setTrace.sets.length = depth;
|
|
296
244
|
throw createJavaOverrideError(signature, error.message);
|
|
297
245
|
}
|
|
298
246
|
};
|
|
247
|
+
const evaluate = reportAsJavaFailure(builtin.evaluate);
|
|
299
248
|
return {
|
|
300
249
|
...builtin,
|
|
301
|
-
evaluate:
|
|
250
|
+
evaluate: (args, context) => {
|
|
251
|
+
if (args.length !== builtin.arity) {
|
|
252
|
+
throw createJavaOverrideError(signature, `array is not of length ${builtin.arity}`);
|
|
253
|
+
}
|
|
254
|
+
return evaluate(args, context);
|
|
255
|
+
},
|
|
302
256
|
evaluateUnary: builtin.evaluateUnary && reportAsJavaFailure(builtin.evaluateUnary),
|
|
303
257
|
evaluateBinary: builtin.evaluateBinary && reportAsJavaFailure(builtin.evaluateBinary),
|
|
304
258
|
};
|
|
@@ -325,8 +279,9 @@ export const defineArithmetic = (
|
|
|
325
279
|
) => {
|
|
326
280
|
const signature = getJavaSignature(module, method, "IntValue", 2);
|
|
327
281
|
return defineBinary(name, (left, right) => {
|
|
328
|
-
|
|
282
|
+
// TLC's MethodHandle casts the last argument first.
|
|
329
283
|
const rightNumber = getJavaInteger(right, signature);
|
|
284
|
+
const leftNumber = getJavaInteger(left, signature);
|
|
330
285
|
const result = compute(leftNumber, rightNumber);
|
|
331
286
|
if (isOutOfRange(result)) throw createOverflowError(`${leftNumber}${name}${rightNumber}`);
|
|
332
287
|
return result;
|
|
@@ -336,13 +291,12 @@ export const defineArithmetic = (
|
|
|
336
291
|
const getIntegerArgument = (value: Value, position: string, name: string) => {
|
|
337
292
|
if (typeof value !== "number") {
|
|
338
293
|
throw new TlaModuleError(
|
|
339
|
-
`The ${position} argument of ${name} should be an integer, but instead it is:\n${formatValue(value)}`,
|
|
294
|
+
`The ${position} argument of ${name} should be an integer, but instead it is:\n${prettyPrint(formatValue(value))}`,
|
|
340
295
|
);
|
|
341
296
|
}
|
|
342
297
|
return value;
|
|
343
298
|
};
|
|
344
299
|
|
|
345
|
-
// The error of an argument that isn't an integer names the operator as TLC's method does.
|
|
346
300
|
export const defineComparison = (
|
|
347
301
|
name: string,
|
|
348
302
|
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
|
-
]);
|