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/lexer.ts
CHANGED
|
@@ -12,7 +12,6 @@ type TokenKind =
|
|
|
12
12
|
| "ModuleEnd"
|
|
13
13
|
| "End";
|
|
14
14
|
|
|
15
|
-
// spelling holds the text of an operator written as a synonym, such as (+) for \oplus.
|
|
16
15
|
export interface Token {
|
|
17
16
|
kind: TokenKind;
|
|
18
17
|
text: string;
|
|
@@ -234,7 +233,6 @@ const SYMBOL_OPERATORS = [
|
|
|
234
233
|
"?",
|
|
235
234
|
];
|
|
236
235
|
|
|
237
|
-
// The Unicode forms of the operators SANY's grammar, javacc/tla+.jj, reads, as their ASCII forms.
|
|
238
236
|
const UNICODE_OPERATORS = new Map([
|
|
239
237
|
["∃", "\\E"],
|
|
240
238
|
["∀", "\\A"],
|
|
@@ -320,13 +318,12 @@ const NUMBER_BASES = new Map([
|
|
|
320
318
|
["h", 16],
|
|
321
319
|
]);
|
|
322
320
|
|
|
323
|
-
// A numeral token keeps its text as typed, such as \hFF, so errors can quote it as TLC does.
|
|
324
321
|
export const getNumeralValue = (text: string) =>
|
|
325
322
|
text.startsWith("\\")
|
|
326
323
|
? parseInt(text.slice(2), NUMBER_BASES.get(text[1].toLowerCase()))
|
|
327
324
|
: Number(text);
|
|
328
325
|
|
|
329
|
-
const MODULE_HEADER = /-{4,}
|
|
326
|
+
const MODULE_HEADER = /-{4,} *MODULE\b/;
|
|
330
327
|
|
|
331
328
|
const CODE_TAB = 9;
|
|
332
329
|
const CODE_NEWLINE = 10;
|
|
@@ -352,7 +349,6 @@ const IDENTIFIER = DIGIT | LETTER | UNDERSCORE;
|
|
|
352
349
|
|
|
353
350
|
const LOWERCASE = "abcdefghijklmnopqrstuvwxyz";
|
|
354
351
|
|
|
355
|
-
// The classes each ASCII character belongs to, as a bit each.
|
|
356
352
|
const CHARACTER_CLASSES = new Uint8Array(128);
|
|
357
353
|
new Map([
|
|
358
354
|
["0123456789", DIGIT | HEX_DIGIT],
|
|
@@ -367,7 +363,6 @@ new Map([
|
|
|
367
363
|
}
|
|
368
364
|
});
|
|
369
365
|
|
|
370
|
-
// charCodeAt past the end of a source gives NaN, which is in no class.
|
|
371
366
|
const isInClass = (code: number, characterClass: number) =>
|
|
372
367
|
code < 128 && (CHARACTER_CLASSES[code] & characterClass) !== 0;
|
|
373
368
|
|
|
@@ -382,8 +377,6 @@ interface OperatorMatch {
|
|
|
382
377
|
length: number;
|
|
383
378
|
}
|
|
384
379
|
|
|
385
|
-
// The symbol operators that start with each character, in the order of SYMBOL_OPERATORS, which
|
|
386
|
-
// lists a longer operator before the operators it starts with.
|
|
387
380
|
const SYMBOL_OPERATORS_BY_START = new Map<number, string[]>();
|
|
388
381
|
SYMBOL_OPERATORS.forEach((symbol) => {
|
|
389
382
|
const start = symbol.charCodeAt(0);
|
|
@@ -413,13 +406,10 @@ export const matchOperator = (source: string, index: number): OperatorMatch | un
|
|
|
413
406
|
const code = source.charCodeAt(index);
|
|
414
407
|
if (code === CODE_BACKSLASH && isInClass(source.charCodeAt(index + 1), LETTER)) {
|
|
415
408
|
const word = source.slice(index + 1, skipClass(source, index + 1, LETTER));
|
|
416
|
-
|
|
417
|
-
|
|
418
|
-
|
|
419
|
-
|
|
420
|
-
}
|
|
421
|
-
const operator = BACKSLASH_OPERATORS.get(word.slice(0, length.value));
|
|
422
|
-
return { text: operator ?? "\\", length: operator === undefined ? 1 : length.value + 1 };
|
|
409
|
+
let length = word.length;
|
|
410
|
+
while (length > 0 && !BACKSLASH_OPERATORS.has(word.slice(0, length))) length--;
|
|
411
|
+
const operator = BACKSLASH_OPERATORS.get(word.slice(0, length));
|
|
412
|
+
return { text: operator ?? "\\", length: operator === undefined ? 1 : length + 1 };
|
|
423
413
|
}
|
|
424
414
|
const unicodeSymbol = matchUnicodeOperator(source, index);
|
|
425
415
|
if (unicodeSymbol !== undefined) {
|
|
@@ -430,8 +420,6 @@ export const matchOperator = (source: string, index: number): OperatorMatch | un
|
|
|
430
420
|
return code === CODE_BACKSLASH ? { text: "\\", length: 1 } : undefined;
|
|
431
421
|
};
|
|
432
422
|
|
|
433
|
-
// TLC's configuration parser reads its tokens with SANY's lexer, so it reads a Unicode operator, or
|
|
434
|
-
// ℕ, ℤ, or ℝ, as one token, which it compares as written with the words it expects.
|
|
435
423
|
const UNICODE_NAMES = new Set(["ℕ", "ℤ", "ℝ"]);
|
|
436
424
|
export const matchUnicodeToken = (source: string, index: number): OperatorMatch | undefined => {
|
|
437
425
|
const token = [source.slice(index, index + 2), source[index]].find(
|
|
@@ -445,25 +433,24 @@ export const skipWhile = (
|
|
|
445
433
|
index: number,
|
|
446
434
|
isMatch: (character: string) => boolean,
|
|
447
435
|
) => {
|
|
448
|
-
|
|
449
|
-
while (end
|
|
450
|
-
return end
|
|
436
|
+
let end = index;
|
|
437
|
+
while (end < source.length && isMatch(source[end])) end++;
|
|
438
|
+
return end;
|
|
451
439
|
};
|
|
452
440
|
|
|
453
|
-
|
|
454
|
-
// it appears.
|
|
455
|
-
const matchStep = (source: string, index: number) => {
|
|
441
|
+
const matchStep = (source: string, index: number, isTlapm: boolean) => {
|
|
456
442
|
const isImplicit = source[index + 1] === "+" || source[index + 1] === "*";
|
|
457
443
|
const levelEnd = isImplicit ? index + 2 : skipClass(source, index + 1, DIGIT);
|
|
458
444
|
if (levelEnd === index + 1 || source[levelEnd] !== ">") return 0;
|
|
459
|
-
const
|
|
460
|
-
const
|
|
445
|
+
const isNamed = !isImplicit || !isTlapm;
|
|
446
|
+
const nameEnd = isNamed ? skipClass(source, levelEnd + 1, IDENTIFIER) : levelEnd + 1;
|
|
447
|
+
const isDash =
|
|
448
|
+
isNamed && nameEnd === levelEnd + 1 && (source[nameEnd] === "*" || source[nameEnd] === "-");
|
|
461
449
|
return (
|
|
462
450
|
skipWhile(source, isDash ? nameEnd + 1 : nameEnd, (character) => character === ".") - index
|
|
463
451
|
);
|
|
464
452
|
};
|
|
465
453
|
|
|
466
|
-
// SANY's lexer reads @ as an identifier, which stands for the value an EXCEPT changes only alone.
|
|
467
454
|
export const readAtAsIdentifier = (token: Token): Token =>
|
|
468
455
|
token.kind === "Operator" && token.text === "@" ? { ...token, kind: "Identifier" } : token;
|
|
469
456
|
|
|
@@ -480,16 +467,17 @@ const BASED_NUMBER_DIGITS = new Map([
|
|
|
480
467
|
["h", HEX_DIGIT],
|
|
481
468
|
]);
|
|
482
469
|
|
|
483
|
-
//
|
|
484
|
-
const matchBasedNumber = (source: string, index: number) => {
|
|
470
|
+
// tlapm's lexer reads only \b, \o and \h, and SANY's their capitals too.
|
|
471
|
+
export const matchBasedNumber = (source: string, index: number, isTlapm = false) => {
|
|
485
472
|
if (source.charCodeAt(index) !== CODE_BACKSLASH) return 0;
|
|
486
|
-
const
|
|
473
|
+
const base = source.charAt(index + 1);
|
|
474
|
+
const digits = BASED_NUMBER_DIGITS.get(isTlapm ? base : base.toLowerCase());
|
|
487
475
|
if (digits === undefined) return 0;
|
|
488
476
|
const end = skipClass(source, index + 2, digits);
|
|
489
477
|
return end === index + 2 ? 0 : end - index;
|
|
490
478
|
};
|
|
491
479
|
|
|
492
|
-
export const tokenize = (source: string): Token[] => {
|
|
480
|
+
export const tokenize = (source: string, isTlapm = false): Token[] => {
|
|
493
481
|
const headerMatch = MODULE_HEADER.exec(source);
|
|
494
482
|
if (!headerMatch)
|
|
495
483
|
throw new TlaSyntaxError("Expected a module header such as ---- MODULE Name ----");
|
|
@@ -497,24 +485,24 @@ export const tokenize = (source: string): Token[] => {
|
|
|
497
485
|
// Each name is one string object, so looking a name up in a scope compares pointers.
|
|
498
486
|
const names = new Map<string, string>();
|
|
499
487
|
const prefixLines = source.slice(0, headerMatch.index).split("\n");
|
|
500
|
-
|
|
501
|
-
|
|
502
|
-
|
|
503
|
-
|
|
504
|
-
|
|
505
|
-
|
|
506
|
-
|
|
507
|
-
|
|
488
|
+
let index = headerMatch.index;
|
|
489
|
+
let line = prefixLines.length;
|
|
490
|
+
let lineStart = headerMatch.index - prefixLines[prefixLines.length - 1].length;
|
|
491
|
+
let moduleDepth = 0;
|
|
492
|
+
|
|
493
|
+
let scanLineStart = -1;
|
|
494
|
+
let scanPosition = 0;
|
|
495
|
+
let scanWidth = 0;
|
|
508
496
|
const getColumn = () => {
|
|
509
|
-
if (
|
|
510
|
-
|
|
511
|
-
|
|
512
|
-
|
|
497
|
+
if (scanLineStart !== lineStart || scanPosition > index) {
|
|
498
|
+
scanLineStart = lineStart;
|
|
499
|
+
scanPosition = lineStart;
|
|
500
|
+
scanWidth = 0;
|
|
513
501
|
}
|
|
514
|
-
for (;
|
|
515
|
-
|
|
502
|
+
for (; scanPosition < index; scanPosition++) {
|
|
503
|
+
scanWidth = getWidthAfter(scanWidth, source.charCodeAt(scanPosition));
|
|
516
504
|
}
|
|
517
|
-
return getWidthAfter(
|
|
505
|
+
return getWidthAfter(scanWidth, source.charCodeAt(index));
|
|
518
506
|
};
|
|
519
507
|
const pushToken = (kind: TokenKind, text: string, length: number, spelling?: string) => {
|
|
520
508
|
const column = getColumn();
|
|
@@ -522,88 +510,83 @@ export const tokenize = (source: string): Token[] => {
|
|
|
522
510
|
kind,
|
|
523
511
|
text,
|
|
524
512
|
spelling,
|
|
525
|
-
line
|
|
513
|
+
line,
|
|
526
514
|
column,
|
|
527
515
|
endColumn: column + length - 1,
|
|
528
516
|
});
|
|
529
|
-
|
|
517
|
+
index += length;
|
|
530
518
|
};
|
|
531
519
|
const advanceOver = (length: number) => {
|
|
532
520
|
for (let offset = 0; offset < length; offset++) {
|
|
533
|
-
if (source.charCodeAt(
|
|
534
|
-
|
|
535
|
-
|
|
521
|
+
if (source.charCodeAt(index) === CODE_NEWLINE) {
|
|
522
|
+
line++;
|
|
523
|
+
lineStart = index + 1;
|
|
536
524
|
}
|
|
537
|
-
|
|
525
|
+
index++;
|
|
538
526
|
}
|
|
539
527
|
};
|
|
540
528
|
const createError = (message: string) =>
|
|
541
|
-
new TlaSyntaxError(`${message} at line ${
|
|
529
|
+
new TlaSyntaxError(`${message} at line ${line}, column ${getColumn()}`, undefined, {
|
|
542
530
|
reason: message,
|
|
543
|
-
line
|
|
531
|
+
line,
|
|
544
532
|
column: getColumn(),
|
|
545
|
-
isEnd:
|
|
533
|
+
isEnd: index >= source.length,
|
|
546
534
|
});
|
|
547
535
|
|
|
548
|
-
while (
|
|
549
|
-
const code = source.charCodeAt(
|
|
536
|
+
while (index < source.length) {
|
|
537
|
+
const code = source.charCodeAt(index);
|
|
550
538
|
|
|
551
539
|
if (code === CODE_NEWLINE || code === CODE_SPACE || code === CODE_TAB || code === CODE_RETURN) {
|
|
552
540
|
advanceOver(1);
|
|
553
541
|
continue;
|
|
554
542
|
}
|
|
555
|
-
if (code === CODE_BACKSLASH && source.charCodeAt(
|
|
556
|
-
const lineEnd = source
|
|
557
|
-
advanceOver(
|
|
543
|
+
if (code === CODE_BACKSLASH && source.charCodeAt(index + 1) === CODE_STAR) {
|
|
544
|
+
const lineEnd = skipWhile(source, index, (next) => next !== "\n" && next !== "\r");
|
|
545
|
+
advanceOver(lineEnd - index);
|
|
558
546
|
continue;
|
|
559
547
|
}
|
|
560
|
-
if (code === CODE_OPEN_PAREN && source.charCodeAt(
|
|
561
|
-
|
|
548
|
+
if (code === CODE_OPEN_PAREN && source.charCodeAt(index + 1) === CODE_STAR) {
|
|
549
|
+
let depth = 0;
|
|
562
550
|
do {
|
|
563
|
-
if (
|
|
564
|
-
if (source.startsWith("(*",
|
|
565
|
-
depth
|
|
551
|
+
if (index >= source.length) throw createError("Unterminated comment");
|
|
552
|
+
if (source.startsWith("(*", index)) {
|
|
553
|
+
depth++;
|
|
566
554
|
advanceOver(2);
|
|
567
|
-
} else if (source.startsWith("*)",
|
|
568
|
-
depth
|
|
555
|
+
} else if (source.startsWith("*)", index)) {
|
|
556
|
+
depth--;
|
|
569
557
|
advanceOver(2);
|
|
570
558
|
} else {
|
|
571
559
|
advanceOver(1);
|
|
572
560
|
}
|
|
573
|
-
} while (depth
|
|
561
|
+
} while (depth > 0);
|
|
574
562
|
continue;
|
|
575
563
|
}
|
|
576
|
-
if (code === CODE_DASH && source.startsWith("----",
|
|
577
|
-
const length = skipWhile(source,
|
|
578
|
-
|
|
579
|
-
|
|
580
|
-
.slice(cursor.index + length)
|
|
581
|
-
.trimStart()
|
|
582
|
-
.startsWith("MODULE")
|
|
583
|
-
)
|
|
584
|
-
cursor.moduleDepth++;
|
|
564
|
+
if (code === CODE_DASH && source.startsWith("----", index)) {
|
|
565
|
+
const length = skipWhile(source, index, (next) => next === "-") - index;
|
|
566
|
+
const keyword = skipWhile(source, index + length, (next) => next === " ");
|
|
567
|
+
if (source.startsWith("MODULE", keyword)) moduleDepth++;
|
|
585
568
|
pushToken("Separator", "----", length);
|
|
586
569
|
continue;
|
|
587
570
|
}
|
|
588
|
-
if (code === CODE_EQUALS && source.startsWith("====",
|
|
589
|
-
const length = skipWhile(source,
|
|
571
|
+
if (code === CODE_EQUALS && source.startsWith("====", index)) {
|
|
572
|
+
const length = skipWhile(source, index, (next) => next === "=") - index;
|
|
590
573
|
pushToken("ModuleEnd", "====", length);
|
|
591
|
-
|
|
592
|
-
if (
|
|
574
|
+
moduleDepth--;
|
|
575
|
+
if (moduleDepth <= 0) break;
|
|
593
576
|
continue;
|
|
594
577
|
}
|
|
595
578
|
if (code === CODE_QUOTE) {
|
|
596
|
-
const
|
|
579
|
+
const startLine = line;
|
|
597
580
|
const column = getColumn();
|
|
598
581
|
const characters: string[] = [];
|
|
599
582
|
advanceOver(1);
|
|
600
|
-
while (source.charCodeAt(
|
|
601
|
-
const next = source.charCodeAt(
|
|
602
|
-
if (
|
|
583
|
+
while (source.charCodeAt(index) !== CODE_QUOTE) {
|
|
584
|
+
const next = source.charCodeAt(index);
|
|
585
|
+
if (index >= source.length || next === CODE_NEWLINE || next === CODE_RETURN) {
|
|
603
586
|
throw createError("Unterminated string");
|
|
604
587
|
}
|
|
605
588
|
if (next === CODE_BACKSLASH) {
|
|
606
|
-
const escaped = source[
|
|
589
|
+
const escaped = source[index + 1];
|
|
607
590
|
if (escaped === undefined || !'ntrf\\"'.includes(escaped)) {
|
|
608
591
|
throw createError("Invalid escape in string");
|
|
609
592
|
}
|
|
@@ -611,39 +594,38 @@ export const tokenize = (source: string): Token[] => {
|
|
|
611
594
|
advanceOver(2);
|
|
612
595
|
continue;
|
|
613
596
|
}
|
|
614
|
-
characters.push(source[
|
|
597
|
+
characters.push(source[index]);
|
|
615
598
|
advanceOver(1);
|
|
616
599
|
}
|
|
617
600
|
advanceOver(1);
|
|
618
601
|
tokens.push({
|
|
619
602
|
kind: "String",
|
|
620
603
|
text: characters.join(""),
|
|
621
|
-
line,
|
|
604
|
+
line: startLine,
|
|
622
605
|
column,
|
|
623
606
|
endColumn: getColumn() - 1,
|
|
624
607
|
});
|
|
625
608
|
continue;
|
|
626
609
|
}
|
|
627
|
-
const basedLength = matchBasedNumber(source,
|
|
610
|
+
const basedLength = matchBasedNumber(source, index, isTlapm);
|
|
628
611
|
if (basedLength > 0) {
|
|
629
|
-
pushToken("Number", source.slice(
|
|
612
|
+
pushToken("Number", source.slice(index, index + basedLength), basedLength);
|
|
630
613
|
continue;
|
|
631
614
|
}
|
|
632
615
|
if (isInClass(code, IDENTIFIER)) {
|
|
633
|
-
const wordEnd = skipClass(source,
|
|
634
|
-
const word = source.slice(
|
|
635
|
-
const digitsEnd = skipClass(source,
|
|
616
|
+
const wordEnd = skipClass(source, index, IDENTIFIER);
|
|
617
|
+
const word = source.slice(index, wordEnd);
|
|
618
|
+
const digitsEnd = skipClass(source, index, DIGIT);
|
|
636
619
|
if (digitsEnd === wordEnd) {
|
|
637
620
|
const fractionEnd =
|
|
638
621
|
source.charCodeAt(wordEnd) === CODE_DOT ? skipClass(source, wordEnd + 1, DIGIT) : wordEnd;
|
|
639
622
|
const isDecimal = fractionEnd > wordEnd + 1;
|
|
640
|
-
const number = isDecimal ? source.slice(
|
|
623
|
+
const number = isDecimal ? source.slice(index, fractionEnd) : word;
|
|
641
624
|
pushToken(isDecimal ? "Decimal" : "Number", number, number.length);
|
|
642
625
|
continue;
|
|
643
626
|
}
|
|
644
|
-
// A word needs a letter to be a name, so SANY reads one without as underscores and numbers.
|
|
645
627
|
if (!/[A-Za-z]/.test(word)) {
|
|
646
|
-
const part = code === CODE_UNDERSCORE ? "_" : source.slice(
|
|
628
|
+
const part = code === CODE_UNDERSCORE ? "_" : source.slice(index, digitsEnd);
|
|
647
629
|
pushToken(part === "_" ? "Operator" : "Number", part, part.length);
|
|
648
630
|
continue;
|
|
649
631
|
}
|
|
@@ -656,22 +638,22 @@ export const tokenize = (source: string): Token[] => {
|
|
|
656
638
|
pushToken(KEYWORDS.has(word) ? "Keyword" : "Identifier", name, word.length);
|
|
657
639
|
continue;
|
|
658
640
|
}
|
|
659
|
-
const character = source[
|
|
641
|
+
const character = source[index];
|
|
660
642
|
if (code >= 128 && UNICODE_NAMES.has(character)) {
|
|
661
643
|
pushToken("Identifier", names.get(character) ?? character, 1);
|
|
662
644
|
names.set(character, character);
|
|
663
645
|
continue;
|
|
664
646
|
}
|
|
665
647
|
if (code === CODE_LESS_THAN) {
|
|
666
|
-
const stepLength = matchStep(source,
|
|
648
|
+
const stepLength = matchStep(source, index, isTlapm);
|
|
667
649
|
if (stepLength > 0) {
|
|
668
|
-
pushToken("Step", source.slice(
|
|
650
|
+
pushToken("Step", source.slice(index, index + stepLength), stepLength);
|
|
669
651
|
continue;
|
|
670
652
|
}
|
|
671
653
|
}
|
|
672
|
-
const operator = matchOperator(source,
|
|
654
|
+
const operator = matchOperator(source, index);
|
|
673
655
|
if (operator) {
|
|
674
|
-
const spelling = source.slice(
|
|
656
|
+
const spelling = source.slice(index, index + operator.length);
|
|
675
657
|
pushToken(
|
|
676
658
|
"Operator",
|
|
677
659
|
operator.text,
|
|
@@ -684,6 +666,6 @@ export const tokenize = (source: string): Token[] => {
|
|
|
684
666
|
}
|
|
685
667
|
|
|
686
668
|
const endColumn = getColumn();
|
|
687
|
-
tokens.push({ kind: "End", text: "", line
|
|
669
|
+
tokens.push({ kind: "End", text: "", line, column: endColumn, endColumn });
|
|
688
670
|
return tokens;
|
|
689
671
|
};
|