tla-ts 0.0.9 → 0.0.10-dev.09e53c2a6
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 +57 -53
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +109 -10
- package/dist/index.d.ts +109 -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 +2746 -410
- package/dist/prove.js +2745 -409
- package/dist/run.cjs +146 -31
- package/dist/run.js +146 -31
- package/dist/tlapm.cjs +2 -2
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +132 -104
- package/dist/transfer.js +132 -104
- package/dist/worker.cjs +6 -6
- package/dist/worker.js +6 -6
- package/package.json +3 -1
- package/src/ast.ts +45 -59
- package/src/bags.ts +99 -102
- package/src/builtins.ts +28 -75
- package/src/bundled-modules.ts +1 -8
- package/src/check-failure.ts +116 -0
- package/src/check-trace.ts +282 -0
- package/src/check.ts +797 -782
- package/src/cli/options.ts +12 -32
- package/src/cli/run.ts +0 -2
- package/src/cli/runtime-invariants.ts +136 -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 +687 -0
- package/src/cli/tlc-usage.ts +360 -0
- package/src/cli/tlc.ts +323 -658
- 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 +196 -74
- package/src/config.ts +140 -109
- package/src/coverage.ts +830 -0
- package/src/dependencies.ts +36 -54
- package/src/dfid.ts +618 -0
- package/src/environment-config.ts +315 -0
- package/src/environment.ts +178 -339
- package/src/errors.ts +100 -57
- package/src/evaluate.ts +598 -340
- package/src/exit-codes.ts +38 -3
- package/src/fingerprints.ts +75 -11
- package/src/index.ts +3 -0
- package/src/instances.ts +126 -21
- package/src/java-hash.ts +7 -0
- package/src/java-overrides.ts +4 -19
- package/src/json-reader.ts +455 -0
- package/src/json.ts +252 -139
- package/src/levels.ts +46 -58
- package/src/lexer.ts +83 -101
- package/src/liveness-checker.ts +590 -311
- package/src/liveness.ts +180 -124
- 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 +38 -19
- package/src/obligations/levels.ts +27 -18
- package/src/obligations/module.ts +28 -55
- package/src/obligations/normalize.ts +30 -37
- package/src/obligations/operators.ts +0 -3
- package/src/obligations/pragma.ts +52 -24
- package/src/obligations/printer.ts +89 -58
- 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 +119 -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 +30 -60
- package/src/parallel.ts +59 -73
- package/src/parser.ts +1082 -399
- 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 +224 -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 +0 -14
- package/src/prover/isabelle/provers/classical.ts +58 -61
- package/src/prover/isabelle/provers/hypsubst.ts +27 -52
- 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 +31 -74
- 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 +1 -44
- 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 +0 -2
- 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 +1026 -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 +615 -53
- 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 +309 -0
- package/src/prover/smt/solver/array.ts +1 -3
- package/src/prover/smt/solver/asserted-formulas.ts +87 -58
- package/src/prover/smt/solver/ast-lt.ts +166 -22
- package/src/prover/smt/solver/ast-util.ts +160 -7
- package/src/prover/smt/solver/ast.ts +1424 -180
- package/src/prover/smt/solver/auf-solver.ts +7 -44
- package/src/prover/smt/solver/bit-blast-tactic.ts +582 -0
- package/src/prover/smt/solver/bit-blaster.ts +871 -0
- package/src/prover/smt/solver/bound-manager.ts +196 -0
- package/src/prover/smt/solver/bound-simplifier.ts +600 -0
- package/src/prover/smt/solver/bv-bound-chk.ts +492 -0
- package/src/prover/smt/solver/bv-decl-plugin.ts +338 -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 +110 -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 +278 -0
- package/src/prover/smt/solver/conflict-resolution.ts +78 -11
- package/src/prover/smt/solver/context.ts +519 -175
- package/src/prover/smt/solver/ctx-simplify.ts +33 -50
- package/src/prover/smt/solver/ctx-solver-simplify.ts +122 -0
- package/src/prover/smt/solver/datatype-decl-plugin.ts +572 -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 +81 -0
- package/src/prover/smt/solver/der.ts +39 -30
- package/src/prover/smt/solver/diff-neq.ts +206 -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 +260 -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-small-bv-tactic.ts +129 -0
- package/src/prover/smt/solver/elim-uncnstr.ts +545 -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 +907 -0
- package/src/prover/smt/solver/euf/euf-solver.ts +1205 -0
- package/src/prover/smt/solver/euf/fpa-solver.ts +317 -0
- package/src/prover/smt/solver/euf/mam.ts +1050 -0
- package/src/prover/smt/solver/euf/q-ematch.ts +830 -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 +335 -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 +146 -0
- package/src/prover/smt/solver/factor.ts +141 -0
- package/src/prover/smt/solver/fd-solver.ts +265 -0
- package/src/prover/smt/solver/fingerprints.ts +15 -26
- package/src/prover/smt/solver/fix-dl-var.ts +148 -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 +640 -0
- package/src/prover/smt/solver/fpa2bv-converter.ts +2249 -0
- package/src/prover/smt/solver/fpa2bv-rewriter.ts +348 -0
- package/src/prover/smt/solver/fpa2bv-tactic.ts +73 -0
- package/src/prover/smt/solver/goal.ts +176 -28
- package/src/prover/smt/solver/goal2nlsat.ts +189 -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 +26 -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 +112 -132
- 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 +345 -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 +11 -30
- package/src/prover/smt/solver/lp/core-solver.ts +23 -29
- package/src/prover/smt/solver/lp/cross-nested.ts +5 -20
- 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 +69 -82
- package/src/prover/smt/solver/lp/lar-term.ts +0 -5
- package/src/prover/smt/solver/lp/lp-settings.ts +0 -14
- package/src/prover/smt/solver/lp/maximize-term.ts +76 -52
- package/src/prover/smt/solver/lp/nex-creator.ts +4 -28
- package/src/prover/smt/solver/lp/nex.ts +0 -6
- 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 +91 -135
- 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 +22 -72
- 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 +123 -112
- package/src/prover/smt/solver/lp/numeric-pair.ts +0 -4
- package/src/prover/smt/solver/lp/pdd-interval.ts +0 -3
- package/src/prover/smt/solver/lp/pdd-simplifier.ts +1 -14
- package/src/prover/smt/solver/lp/pdd-solver.ts +2 -33
- package/src/prover/smt/solver/lp/pdd.ts +7 -70
- 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 +309 -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 +105 -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 +19 -62
- package/src/prover/smt/solver/model-evaluator.ts +190 -40
- package/src/prover/smt/solver/model-finder.ts +14 -32
- package/src/prover/smt/solver/model-generator.ts +56 -40
- 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 +711 -0
- package/src/prover/smt/solver/mus.ts +51 -0
- package/src/prover/smt/solver/muz/dl-context.ts +404 -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 +496 -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 +201 -0
- package/src/prover/smt/solver/muz/rule-properties.ts +337 -0
- package/src/prover/smt/solver/muz/spacer-context.ts +1406 -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 +218 -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 +177 -160
- package/src/prover/smt/solver/nlsat/atoms.ts +24 -24
- package/src/prover/smt/solver/nlsat/evaluator.ts +16 -22
- package/src/prover/smt/solver/nlsat/explain.ts +65 -69
- package/src/prover/smt/solver/nlsat/interval-set.ts +9 -51
- package/src/prover/smt/solver/nlsat/levelwise.ts +48 -135
- package/src/prover/smt/solver/nlsat/mpbq.ts +47 -14
- package/src/prover/smt/solver/nlsat/polynomial.ts +29 -161
- package/src/prover/smt/solver/nlsat/solver.ts +241 -110
- package/src/prover/smt/solver/nlsat/transcendental-eval.ts +310 -0
- package/src/prover/smt/solver/nlsat/transcendentals.ts +367 -0
- package/src/prover/smt/solver/nlsat/types.ts +0 -9
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +1 -47
- package/src/prover/smt/solver/nlsat/upolynomial.ts +10 -93
- package/src/prover/smt/solver/nlsat-tactic.ts +82 -0
- package/src/prover/smt/solver/nnf.ts +107 -60
- 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 +787 -0
- package/src/prover/smt/solver/opt-nlsat.ts +375 -0
- package/src/prover/smt/solver/opt-pareto.ts +282 -0
- package/src/prover/smt/solver/opt-preprocess.ts +101 -0
- package/src/prover/smt/solver/opt-solver.ts +308 -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 +284 -0
- package/src/prover/smt/solver/pb2bv-tactic.ts +540 -0
- package/src/prover/smt/solver/poly-rewriter.ts +204 -79
- package/src/prover/smt/solver/probes.ts +512 -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/qe-arith-plugin.ts +1098 -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 +39 -49
- package/src/prover/smt/solver/qe-mbp.ts +270 -0
- package/src/prover/smt/solver/qe.ts +1498 -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 +814 -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 +8 -23
- 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 +261 -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 +52 -129
- package/src/prover/smt/solver/rewriter.ts +477 -120
- package/src/prover/smt/solver/rlimit.ts +39 -21
- 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 +526 -0
- package/src/prover/smt/solver/sat/inc-sat-solver.ts +378 -0
- package/src/prover/smt/solver/sat/model-converter.ts +136 -0
- package/src/prover/smt/solver/sat/pb-constraint.ts +261 -0
- package/src/prover/smt/solver/sat/pb-solver.ts +1577 -0
- package/src/prover/smt/solver/sat/probing.ts +170 -0
- package/src/prover/smt/solver/sat/sat-tactic.ts +43 -0
- package/src/prover/smt/solver/sat/sat2goal.ts +165 -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 +2127 -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 +1010 -0
- package/src/prover/smt/solver/seq-decl-plugin.ts +819 -0
- package/src/prover/smt/solver/seq-derive.ts +1301 -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 +728 -0
- package/src/prover/smt/solver/seq-range-predicate.ts +235 -0
- package/src/prover/smt/solver/seq-re-rewriter.ts +1170 -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 +2402 -0
- package/src/prover/smt/solver/seq-skolem.ts +317 -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 +83 -0
- package/src/prover/smt/solver/smt-logics.ts +66 -0
- package/src/prover/smt/solver/smt-setup.ts +496 -0
- package/src/prover/smt/solver/smt2-printer.ts +765 -0
- package/src/prover/smt/solver/smtlib-parser.ts +3140 -365
- package/src/prover/smt/solver/smtlib-script.ts +1631 -0
- package/src/prover/smt/solver/solve-eqs.ts +929 -0
- package/src/prover/smt/solver/solver.ts +119 -39
- 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 +1986 -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 +1200 -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 +59 -91
- package/src/prover/smt/solver/theory-lra-internalize.ts +94 -53
- package/src/prover/smt/solver/theory-lra-model.ts +23 -53
- package/src/prover/smt/solver/theory-lra-propagate.ts +24 -40
- package/src/prover/smt/solver/theory-lra-state.ts +6 -27
- package/src/prover/smt/solver/theory-lra.ts +188 -8
- package/src/prover/smt/solver/theory-pb.ts +934 -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 +871 -0
- package/src/prover/smt/solver/theory-seq.ts +961 -0
- package/src/prover/smt/solver/theory.ts +189 -0
- package/src/prover/smt/solver/tseitin-cnf.ts +485 -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 +67 -41
- 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 +0 -6
- package/src/prover/zenon/expr.ts +8 -28
- package/src/prover/zenon/index-table.ts +26 -59
- package/src/prover/zenon/isar-case.ts +8 -20
- package/src/prover/zenon/isar.ts +35 -65
- 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 +1 -13
- package/src/prover/zenon/proof.ts +0 -11
- package/src/prover/zenon/propositional-rules.ts +0 -7
- package/src/prover/zenon/rules.ts +2 -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 +67 -185
- package/src/runtime.ts +26 -22
- package/src/sany/builtins.ts +2 -5
- package/src/sany/generation.ts +394 -0
- package/src/sany/generator-def-entries.ts +210 -0
- package/src/sany/generator-definitions.ts +686 -0
- package/src/sany/generator-expressions.ts +1100 -0
- package/src/sany/generator-proofs.ts +662 -0
- package/src/sany/generator.ts +191 -2764
- package/src/sany/levels.ts +5 -35
- package/src/sany/lexer.ts +58 -77
- package/src/sany/linter.ts +0 -10
- package/src/sany/modules.ts +1 -5
- package/src/sany/nodes.ts +5 -43
- package/src/sany/parse-error.ts +39 -117
- package/src/sany/report.ts +32 -69
- package/src/sany/selectors.ts +49 -76
- package/src/sany/source.ts +1 -17
- package/src/sany/xml.ts +35 -117
- package/src/search.ts +671 -169
- package/src/simulate.ts +712 -0
- package/src/spec-description.ts +192 -100
- package/src/standard-definitions.ts +4 -4
- package/src/standard-modules.ts +264 -95
- package/src/state-graph.ts +52 -33
- package/src/subexpressions.ts +69 -52
- package/src/substitution-levels.ts +7 -7
- package/src/successors.ts +267 -100
- package/src/symmetry.ts +35 -27
- package/src/tableau.ts +29 -26
- package/src/tlc/fingerprint.ts +267 -79
- package/src/tlc/jar-data.ts +112 -6
- package/src/tlc/messages.ts +125 -54
- package/src/tlc/order.ts +39 -69
- package/src/tlc/random.ts +37 -49
- package/src/tlc/replay.ts +553 -228
- package/src/tlc/summary.ts +64 -60
- package/src/tlc/tlc-operators.ts +78 -44
- package/src/tlc/tlcext-operators.ts +171 -122
- package/src/tlc/trace-spec.ts +249 -0
- package/src/tlc/value-stream.ts +139 -0
- package/src/tlc/version.ts +1 -4
- package/src/transfer.ts +22 -25
- package/src/typed-tier.ts +6535 -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 +832 -484
- 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/config.ts
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
|
-
import { TlaConfigError } from "./errors";
|
|
2
|
-
import {
|
|
1
|
+
import { getUnexpectedException, TlaConfigError } from "./errors";
|
|
2
|
+
import { EXIT_STATUS, setExitCode } from "./exit-codes";
|
|
3
|
+
import { matchBasedNumber, matchOperator, matchUnicodeToken } from "./lexer";
|
|
3
4
|
import { formatLexicalError } from "./sany/lexer";
|
|
4
5
|
import type { TlcVersion } from "./tlc/version";
|
|
5
6
|
|
|
@@ -33,6 +34,7 @@ export interface ModelConfig {
|
|
|
33
34
|
actionConstraints: string[];
|
|
34
35
|
constants: ConstantAssignment[];
|
|
35
36
|
substitutions: Substitution[];
|
|
37
|
+
rawConstants: string[];
|
|
36
38
|
checkDeadlock: boolean;
|
|
37
39
|
symmetry: string | undefined;
|
|
38
40
|
view: string | undefined;
|
|
@@ -78,44 +80,53 @@ const KEYWORDS = new Set([
|
|
|
78
80
|
"_RL_REWARD",
|
|
79
81
|
]);
|
|
80
82
|
|
|
81
|
-
// TLC 1.7.4 reads a TYPE and a TYPE_CONSTRAINT, which it doesn't check, and none of the keywords
|
|
82
|
-
// that came after it.
|
|
83
83
|
const TYPE_KEYWORDS = ["TYPE", "TYPE_CONSTRAINT"];
|
|
84
84
|
const KEYWORDS_174 = new Set([...SHARED_KEYWORDS, ...TYPE_KEYWORDS]);
|
|
85
85
|
|
|
86
86
|
const SYMBOLS = ["<-", "<<", ">>", "=", "{", "}", ",", "[", "]", "(", ")", "!"];
|
|
87
87
|
|
|
88
|
-
|
|
89
|
-
|
|
88
|
+
const getCommentLength = (text: string) => {
|
|
89
|
+
let position = 0;
|
|
90
|
+
let depth = 0;
|
|
91
|
+
do {
|
|
92
|
+
if (position >= text.length) return undefined;
|
|
93
|
+
const pair = text.slice(position, position + 2);
|
|
94
|
+
const step = pair === "(*" ? 1 : pair === "*)" ? -1 : 0;
|
|
95
|
+
depth += step;
|
|
96
|
+
position += step === 0 ? 1 : 2;
|
|
97
|
+
} while (depth > 0);
|
|
98
|
+
return position;
|
|
99
|
+
};
|
|
100
|
+
|
|
90
101
|
const tokenizeConfig = (source: string) => {
|
|
91
102
|
const tokens: ConfigToken[] = [];
|
|
92
|
-
|
|
103
|
+
let position = 0;
|
|
104
|
+
let lineNumber = 1;
|
|
105
|
+
let lineStart = 0;
|
|
93
106
|
const addLexicalError = (index: number, after: string) => {
|
|
94
107
|
tokens.push({
|
|
95
108
|
kind: "Error",
|
|
96
|
-
text: formatLexicalError(
|
|
97
|
-
line:
|
|
109
|
+
text: formatLexicalError(lineNumber, index - lineStart + 1, source[index], after),
|
|
110
|
+
line: lineNumber,
|
|
98
111
|
});
|
|
99
112
|
};
|
|
100
|
-
// TLC appends a newline to the file. JavaCC reports a token that the end of the input cuts off,
|
|
101
|
-
// that newline included, at the start of the line after it.
|
|
102
113
|
const addEndOfInputError = (after: string) => {
|
|
103
114
|
tokens.push({
|
|
104
115
|
kind: "Error",
|
|
105
|
-
text: formatLexicalError(
|
|
106
|
-
line:
|
|
116
|
+
text: formatLexicalError(lineNumber + 1, 0, undefined, after),
|
|
117
|
+
line: lineNumber,
|
|
107
118
|
});
|
|
108
119
|
};
|
|
109
120
|
const skip = (text: string) => {
|
|
110
121
|
const lines = text.split("\n");
|
|
111
122
|
if (lines.length > 1) {
|
|
112
|
-
|
|
113
|
-
|
|
123
|
+
lineNumber += lines.length - 1;
|
|
124
|
+
lineStart = position + text.length - lines[lines.length - 1].length;
|
|
114
125
|
}
|
|
115
|
-
|
|
126
|
+
position += text.length;
|
|
116
127
|
};
|
|
117
|
-
while (
|
|
118
|
-
const rest = source.slice(
|
|
128
|
+
while (position < source.length) {
|
|
129
|
+
const rest = source.slice(position);
|
|
119
130
|
const whitespace = /^\s+/.exec(rest)?.[0];
|
|
120
131
|
if (whitespace) {
|
|
121
132
|
skip(whitespace);
|
|
@@ -127,17 +138,19 @@ const tokenizeConfig = (source: string) => {
|
|
|
127
138
|
continue;
|
|
128
139
|
}
|
|
129
140
|
if (rest.startsWith("(*")) {
|
|
130
|
-
const
|
|
131
|
-
if (
|
|
141
|
+
const length = getCommentLength(rest);
|
|
142
|
+
if (length === undefined) {
|
|
132
143
|
skip(rest);
|
|
133
144
|
addEndOfInputError("");
|
|
134
145
|
return tokens;
|
|
135
146
|
}
|
|
136
|
-
skip(rest.slice(0,
|
|
147
|
+
skip(rest.slice(0, length));
|
|
137
148
|
continue;
|
|
138
149
|
}
|
|
139
|
-
const line =
|
|
140
|
-
const
|
|
150
|
+
const line = lineNumber;
|
|
151
|
+
const basedLength = matchBasedNumber(source, position);
|
|
152
|
+
const number =
|
|
153
|
+
basedLength > 0 ? rest.slice(0, basedLength) : /^\d+(?![A-Za-z_])/.exec(rest)?.[0];
|
|
141
154
|
if (number) {
|
|
142
155
|
tokens.push({ kind: "Number", text: number, line });
|
|
143
156
|
skip(number);
|
|
@@ -154,33 +167,32 @@ const tokenizeConfig = (source: string) => {
|
|
|
154
167
|
const text = string?.[0] ?? '"';
|
|
155
168
|
if (string?.[2] !== '"') {
|
|
156
169
|
skip(text);
|
|
157
|
-
if (
|
|
158
|
-
else addLexicalError(
|
|
170
|
+
if (position === source.length) addEndOfInputError(`${text}\n`);
|
|
171
|
+
else addLexicalError(position, text);
|
|
159
172
|
return tokens;
|
|
160
173
|
}
|
|
161
|
-
tokens.push({ kind: "String", text
|
|
174
|
+
tokens.push({ kind: "String", text, line });
|
|
162
175
|
skip(text);
|
|
163
176
|
continue;
|
|
164
177
|
}
|
|
178
|
+
const operator = matchUnicodeToken(source, position) ?? matchOperator(source, position);
|
|
165
179
|
const symbol = SYMBOLS.find((candidate) => rest.startsWith(candidate));
|
|
166
|
-
if (symbol) {
|
|
180
|
+
if (symbol && symbol.length >= (operator?.length ?? 0)) {
|
|
167
181
|
tokens.push({ kind: "Symbol", text: symbol, line });
|
|
168
182
|
skip(symbol);
|
|
169
183
|
continue;
|
|
170
184
|
}
|
|
171
|
-
const operator = matchUnicodeToken(source, cursor.index) ?? matchOperator(source, cursor.index);
|
|
172
185
|
if (!operator) {
|
|
173
|
-
addLexicalError(
|
|
186
|
+
addLexicalError(position, "");
|
|
174
187
|
return tokens;
|
|
175
188
|
}
|
|
176
189
|
tokens.push({ kind: "Word", text: operator.text, line });
|
|
177
|
-
skip(source.slice(
|
|
190
|
+
skip(source.slice(position, position + operator.length));
|
|
178
191
|
}
|
|
179
|
-
tokens.push({ kind: "End", text: "", line:
|
|
192
|
+
tokens.push({ kind: "End", text: "", line: lineNumber });
|
|
180
193
|
return tokens;
|
|
181
194
|
};
|
|
182
195
|
|
|
183
|
-
// TLC's messages for a configuration file it can't read, from ModelConfig.parse.
|
|
184
196
|
const createSyntaxError = (line: number, problem: string) =>
|
|
185
197
|
new TlaConfigError(`TLC found an error in the configuration file at line ${line}\n${problem}`);
|
|
186
198
|
|
|
@@ -218,11 +230,10 @@ const LIST_KEYWORDS = new Map<
|
|
|
218
230
|
["_POSSIBLE", "possible"],
|
|
219
231
|
]);
|
|
220
232
|
|
|
221
|
-
// A port of TLC's ModelConfig.parse, which takes any token where it expects a name or a value.
|
|
222
233
|
export const parseConfig = (source: string, version: TlcVersion = "master"): ModelConfig => {
|
|
223
234
|
const keywords = version === "1.7.4" ? KEYWORDS_174 : KEYWORDS;
|
|
224
235
|
const tokens = tokenizeConfig(source);
|
|
225
|
-
|
|
236
|
+
let tokenIndex = 0;
|
|
226
237
|
const config: ModelConfig = {
|
|
227
238
|
init: undefined,
|
|
228
239
|
next: undefined,
|
|
@@ -233,6 +244,7 @@ export const parseConfig = (source: string, version: TlcVersion = "master"): Mod
|
|
|
233
244
|
actionConstraints: [],
|
|
234
245
|
constants: [],
|
|
235
246
|
substitutions: [],
|
|
247
|
+
rawConstants: [],
|
|
236
248
|
checkDeadlock: true,
|
|
237
249
|
symmetry: undefined,
|
|
238
250
|
view: undefined,
|
|
@@ -242,10 +254,10 @@ export const parseConfig = (source: string, version: TlcVersion = "master"): Mod
|
|
|
242
254
|
periodic: undefined,
|
|
243
255
|
rlReward: undefined,
|
|
244
256
|
};
|
|
245
|
-
|
|
257
|
+
let isDeadlockSet = false;
|
|
246
258
|
const typeKeywords = new Set<string>();
|
|
247
259
|
const advance = () => {
|
|
248
|
-
const token = tokens[Math.min(
|
|
260
|
+
const token = tokens[Math.min(tokenIndex++, tokens.length - 1)];
|
|
249
261
|
if (token.kind === "Error") {
|
|
250
262
|
throw new TlaConfigError(`TLC found an error in the configuration file:\n${token.text}`);
|
|
251
263
|
}
|
|
@@ -253,23 +265,36 @@ export const parseConfig = (source: string, version: TlcVersion = "master"): Mod
|
|
|
253
265
|
};
|
|
254
266
|
|
|
255
267
|
const parseValue = (token: ConfigToken): ConfigValue => {
|
|
268
|
+
if (token.kind === "Number" && token.text.startsWith("\\")) {
|
|
269
|
+
throw setExitCode(
|
|
270
|
+
new TlaConfigError(
|
|
271
|
+
`${getUnexpectedException("java.lang.NumberFormatException")}For input string: "${token.text}"`,
|
|
272
|
+
),
|
|
273
|
+
EXIT_STATUS.error,
|
|
274
|
+
);
|
|
275
|
+
}
|
|
256
276
|
if (token.kind === "Number") return { kind: "Number", value: Number(token.text) };
|
|
257
|
-
if (token.kind === "String"
|
|
277
|
+
if (token.kind === "String" && token.text.includes("\\")) {
|
|
278
|
+
throw new TlaConfigError(
|
|
279
|
+
`TLC found an error in the configuration file:\nescape sequences are not supported in strings at line ${token.line}`,
|
|
280
|
+
);
|
|
281
|
+
}
|
|
282
|
+
if (token.kind === "String") return { kind: "String", value: token.text.slice(1, -1) };
|
|
258
283
|
if (token.text === "TRUE" || token.text === "FALSE")
|
|
259
284
|
return { kind: "Boolean", value: token.text === "TRUE" };
|
|
260
285
|
if (token.text === "{") {
|
|
261
286
|
const elements: ConfigValue[] = [];
|
|
262
|
-
|
|
263
|
-
if (
|
|
287
|
+
let element = advance();
|
|
288
|
+
if (element.text !== "}") {
|
|
264
289
|
while (true) {
|
|
265
|
-
elements.push(parseValue(
|
|
266
|
-
|
|
267
|
-
if (
|
|
268
|
-
|
|
290
|
+
elements.push(parseValue(element));
|
|
291
|
+
element = advance();
|
|
292
|
+
if (element.text !== ",") break;
|
|
293
|
+
element = advance();
|
|
269
294
|
}
|
|
270
295
|
}
|
|
271
|
-
if (
|
|
272
|
-
throw createSyntaxError(
|
|
296
|
+
if (element.text !== "}") {
|
|
297
|
+
throw createSyntaxError(element.line, "It was expecting }, but did not find it.");
|
|
273
298
|
}
|
|
274
299
|
return { kind: "Set", elements };
|
|
275
300
|
}
|
|
@@ -277,7 +302,6 @@ export const parseConfig = (source: string, version: TlcVersion = "master"): Mod
|
|
|
277
302
|
throw createSyntaxError(token.line, "It was expecting a value, but did not find it.");
|
|
278
303
|
};
|
|
279
304
|
|
|
280
|
-
// A module name in brackets after = or <-, which applies the assignment in that module.
|
|
281
305
|
const parseModuleScope = (operator: string) => {
|
|
282
306
|
const name = advance();
|
|
283
307
|
if (name.kind === "End") {
|
|
@@ -290,62 +314,69 @@ export const parseConfig = (source: string, version: TlcVersion = "master"): Mod
|
|
|
290
314
|
return name.text;
|
|
291
315
|
};
|
|
292
316
|
|
|
293
|
-
|
|
294
|
-
|
|
295
|
-
|
|
296
|
-
|
|
297
|
-
|
|
298
|
-
|
|
299
|
-
|
|
300
|
-
|
|
301
|
-
|
|
302
|
-
|
|
303
|
-
|
|
304
|
-
|
|
305
|
-
|
|
306
|
-
|
|
307
|
-
const module = parseModuleScope("<-");
|
|
308
|
-
const target = advance();
|
|
309
|
-
if (target.kind === "End") {
|
|
310
|
-
throw createSyntaxError(target.line, "Expected an identifier after <-[mod].");
|
|
311
|
-
}
|
|
312
|
-
config.substitutions.push({ name, target: target.text, module });
|
|
313
|
-
continue;
|
|
314
|
-
}
|
|
315
|
-
if (current.token.kind === "End") {
|
|
316
|
-
throw createSyntaxError(current.token.line, "Expected an identifier after <-.");
|
|
317
|
+
const parseConstant = (first: ConfigToken, keywordLine: number) => {
|
|
318
|
+
let name = first.text;
|
|
319
|
+
let token = advance();
|
|
320
|
+
while (token.text === "!") {
|
|
321
|
+
name = `${name}!${advance().text}`;
|
|
322
|
+
token = advance();
|
|
323
|
+
}
|
|
324
|
+
if (token.text === "<-") {
|
|
325
|
+
token = advance();
|
|
326
|
+
if (token.text === "[") {
|
|
327
|
+
const module = parseModuleScope("<-");
|
|
328
|
+
const target = advance();
|
|
329
|
+
if (target.kind === "End") {
|
|
330
|
+
throw createSyntaxError(target.line, "Expected an identifier after <-[mod].");
|
|
317
331
|
}
|
|
318
|
-
config.substitutions.push({ name, target:
|
|
319
|
-
|
|
332
|
+
config.substitutions.push({ name, target: target.text, module });
|
|
333
|
+
return;
|
|
320
334
|
}
|
|
321
|
-
|
|
322
|
-
|
|
323
|
-
|
|
324
|
-
|
|
325
|
-
|
|
326
|
-
|
|
327
|
-
|
|
328
|
-
|
|
329
|
-
|
|
330
|
-
|
|
331
|
-
|
|
332
|
-
|
|
335
|
+
if (token.kind === "End") {
|
|
336
|
+
throw createSyntaxError(token.line, "Expected an identifier after <-.");
|
|
337
|
+
}
|
|
338
|
+
config.substitutions.push({ name, target: token.text });
|
|
339
|
+
return;
|
|
340
|
+
}
|
|
341
|
+
const args: ConfigValue[] = [];
|
|
342
|
+
const hasArgs = token.text === "(";
|
|
343
|
+
if (hasArgs) {
|
|
344
|
+
while (true) {
|
|
345
|
+
args.push(parseValue(advance()));
|
|
346
|
+
token = advance();
|
|
347
|
+
if (token.text !== ",") break;
|
|
333
348
|
}
|
|
334
|
-
if (
|
|
335
|
-
throw createSyntaxError(
|
|
336
|
-
current.token.line,
|
|
337
|
-
"It was expecting = or <-, but did not find it.",
|
|
338
|
-
);
|
|
349
|
+
if (token.text !== ")") {
|
|
350
|
+
throw createSyntaxError(keywordLine, "");
|
|
339
351
|
}
|
|
340
|
-
|
|
341
|
-
|
|
342
|
-
|
|
343
|
-
|
|
344
|
-
|
|
345
|
-
|
|
346
|
-
|
|
347
|
-
|
|
348
|
-
|
|
352
|
+
token = advance();
|
|
353
|
+
}
|
|
354
|
+
if (token.text !== "=") {
|
|
355
|
+
throw createSyntaxError(token.line, "It was expecting = or <-, but did not find it.");
|
|
356
|
+
}
|
|
357
|
+
token = advance();
|
|
358
|
+
const module = token.text === "[" ? parseModuleScope("=") : undefined;
|
|
359
|
+
const value = parseValue(module === undefined ? token : advance());
|
|
360
|
+
config.constants.push({
|
|
361
|
+
name,
|
|
362
|
+
value,
|
|
363
|
+
...(hasArgs && { args }),
|
|
364
|
+
...(module !== undefined && { module }),
|
|
365
|
+
});
|
|
366
|
+
};
|
|
367
|
+
|
|
368
|
+
const parseConstants = (keywordLine: number) => {
|
|
369
|
+
while (true) {
|
|
370
|
+
const first = advance();
|
|
371
|
+
if (first.kind === "End" || keywords.has(first.text)) return first;
|
|
372
|
+
const start = tokenIndex - 1;
|
|
373
|
+
parseConstant(first, keywordLine);
|
|
374
|
+
config.rawConstants.push(
|
|
375
|
+
tokens
|
|
376
|
+
.slice(start, tokenIndex)
|
|
377
|
+
.map((token) => token.text)
|
|
378
|
+
.join(" "),
|
|
379
|
+
);
|
|
349
380
|
}
|
|
350
381
|
};
|
|
351
382
|
|
|
@@ -357,10 +388,10 @@ export const parseConfig = (source: string, version: TlcVersion = "master"): Mod
|
|
|
357
388
|
}
|
|
358
389
|
};
|
|
359
390
|
|
|
360
|
-
|
|
361
|
-
while (
|
|
362
|
-
const keyword =
|
|
363
|
-
const line =
|
|
391
|
+
let keywordToken = advance();
|
|
392
|
+
while (keywordToken.kind !== "End") {
|
|
393
|
+
const keyword = keywordToken.text;
|
|
394
|
+
const line = keywordToken.line;
|
|
364
395
|
const singleKey = keywords.has(keyword) ? SINGLE_KEYWORDS.get(keyword) : undefined;
|
|
365
396
|
const listKey = keywords.has(keyword) ? LIST_KEYWORDS.get(keyword) : undefined;
|
|
366
397
|
const advanceToArgument = () => {
|
|
@@ -376,15 +407,15 @@ export const parseConfig = (source: string, version: TlcVersion = "master"): Mod
|
|
|
376
407
|
throw createDuplicateKeywordError(line, keyword);
|
|
377
408
|
}
|
|
378
409
|
config[singleKey] = name.text;
|
|
379
|
-
|
|
410
|
+
keywordToken = advance();
|
|
380
411
|
continue;
|
|
381
412
|
}
|
|
382
413
|
if (listKey !== undefined) {
|
|
383
|
-
|
|
414
|
+
keywordToken = parseNames(config[listKey]);
|
|
384
415
|
continue;
|
|
385
416
|
}
|
|
386
417
|
if (keyword === "CONSTANT" || keyword === "CONSTANTS") {
|
|
387
|
-
|
|
418
|
+
keywordToken = parseConstants(line);
|
|
388
419
|
continue;
|
|
389
420
|
}
|
|
390
421
|
if (keyword === "CHECK_DEADLOCK") {
|
|
@@ -392,10 +423,10 @@ export const parseConfig = (source: string, version: TlcVersion = "master"): Mod
|
|
|
392
423
|
if (value.text !== "TRUE" && value.text !== "FALSE") {
|
|
393
424
|
throw createSyntaxError(value.line, "It was expecting TRUE or FALSE, but did not find it.");
|
|
394
425
|
}
|
|
395
|
-
if (
|
|
396
|
-
|
|
426
|
+
if (isDeadlockSet) throw createDuplicateKeywordError(line, keyword);
|
|
427
|
+
isDeadlockSet = true;
|
|
397
428
|
config.checkDeadlock = value.text === "TRUE";
|
|
398
|
-
|
|
429
|
+
keywordToken = advance();
|
|
399
430
|
continue;
|
|
400
431
|
}
|
|
401
432
|
if (!keywords.has(keyword) || !TYPE_KEYWORDS.includes(keyword)) {
|
|
@@ -404,7 +435,7 @@ export const parseConfig = (source: string, version: TlcVersion = "master"): Mod
|
|
|
404
435
|
advanceToArgument();
|
|
405
436
|
if (typeKeywords.has(keyword)) throw createDuplicateKeywordError(line, keyword);
|
|
406
437
|
typeKeywords.add(keyword);
|
|
407
|
-
|
|
438
|
+
keywordToken = advance();
|
|
408
439
|
}
|
|
409
440
|
return config;
|
|
410
441
|
};
|