tla-ts 0.0.10-dev.b4a856304 → 0.0.10-dev.c92e6a4ea
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 +2 -1
- package/dist/compile.cjs +6 -6
- package/dist/compile.js +10 -10
- package/dist/deciders.cjs +41 -37
- package/dist/deciders.js +57 -53
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +37 -0
- package/dist/index.d.ts +37 -0
- package/dist/index.js +1 -1
- package/dist/parallel-worker.cjs +1 -1
- package/dist/parallel-worker.js +1 -1
- package/dist/prove.cjs +2683 -427
- package/dist/prove.js +2681 -425
- package/dist/run.cjs +45 -44
- package/dist/run.js +45 -44
- package/dist/tlapm.cjs +2 -2
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +44 -41
- package/dist/transfer.js +45 -42
- package/dist/worker.cjs +7 -7
- package/dist/worker.js +7 -7
- package/package.json +1 -1
- package/src/ast.ts +41 -41
- package/src/bags.ts +2 -5
- package/src/builtins.ts +5 -21
- package/src/check-failure.ts +116 -0
- package/src/check-trace.ts +268 -0
- package/src/check.ts +578 -757
- package/src/cli/options.ts +6 -31
- package/src/cli/run.ts +0 -2
- package/src/cli/runtime-invariants.ts +27 -62
- package/src/cli/shared.ts +1 -5
- package/src/cli/tlapm.ts +433 -70
- package/src/cli/tlc-arguments.ts +246 -240
- package/src/cli/tlc-output.ts +686 -0
- package/src/cli/tlc-usage.ts +3 -5
- package/src/cli/tlc.ts +59 -707
- package/src/cli/xml-exporter.ts +23 -33
- package/src/codegen.ts +5 -10
- package/src/coverage.ts +3 -10
- package/src/dependencies.ts +30 -14
- package/src/dfid.ts +16 -16
- package/src/environment-config.ts +315 -0
- package/src/environment.ts +73 -338
- package/src/errors.ts +33 -5
- package/src/evaluate.ts +34 -107
- package/src/exit-codes.ts +3 -0
- package/src/fingerprints.ts +65 -1
- package/src/instances.ts +47 -10
- package/src/java-hash.ts +7 -0
- package/src/java-overrides.ts +4 -9
- package/src/json-reader.ts +1 -2
- package/src/json.ts +8 -18
- package/src/levels.ts +46 -57
- package/src/lexer.ts +76 -85
- package/src/liveness-checker.ts +634 -306
- package/src/liveness.ts +104 -120
- package/src/obligations/action.ts +14 -17
- package/src/obligations/anonymize.ts +37 -16
- package/src/obligations/enabled-axioms.ts +218 -0
- package/src/obligations/equality.ts +1 -3
- package/src/obligations/expression.ts +36 -8
- package/src/obligations/format.ts +0 -2
- package/src/obligations/generate.ts +66 -54
- package/src/obligations/index.ts +38 -8
- package/src/obligations/levels.ts +24 -11
- package/src/obligations/module.ts +28 -41
- package/src/obligations/normalize.ts +26 -14
- package/src/obligations/operators.ts +0 -2
- package/src/obligations/pragma.ts +53 -16
- package/src/obligations/printer.ts +43 -13
- package/src/obligations/proof.ts +3 -2
- package/src/obligations/regroup.ts +0 -2
- package/src/obligations/simplify.ts +55 -50
- package/src/obligations/source.ts +118 -74
- package/src/obligations/subexpression.ts +45 -18
- package/src/obligations/substitution.ts +1 -3
- package/src/obligations/temporal.ts +5 -7
- package/src/obligations/tuples.ts +0 -2
- package/src/parallel-worker.ts +17 -31
- package/src/parallel.ts +55 -80
- package/src/parser.ts +722 -385
- package/src/pcal/ast.ts +53 -65
- package/src/pcal/parse.ts +144 -191
- package/src/pcal/tokenize.ts +91 -115
- package/src/pcal/translate.ts +83 -98
- package/src/pcal/validate.ts +48 -50
- package/src/pretty-print.ts +7 -7
- package/src/prover/decide-pool.ts +3 -3
- package/src/prover/deciders.ts +12 -9
- package/src/prover/isabelle/decide.ts +3 -25
- package/src/prover/isabelle/encode.ts +72 -42
- 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 +158 -7
- package/src/prover/isabelle/isar/method.ts +509 -212
- package/src/prover/isabelle/isar/proof.ts +570 -14
- package/src/prover/isabelle/isar/rule-cases.ts +224 -0
- package/src/prover/isabelle/isar/theory.ts +487 -76
- package/src/prover/isabelle/isar/toplevel.ts +331 -0
- package/src/prover/isabelle/isar/type-check.ts +89 -14
- package/src/prover/isabelle/provers/blast/blast.ts +7 -65
- package/src/prover/isabelle/provers/blast/branch.ts +0 -2
- package/src/prover/isabelle/provers/blast/prove.ts +0 -2
- package/src/prover/isabelle/provers/blast/rules.ts +0 -2
- package/src/prover/isabelle/provers/blast/state.ts +0 -2
- package/src/prover/isabelle/provers/blast/term.ts +0 -2
- package/src/prover/isabelle/provers/clasimp.ts +0 -2
- package/src/prover/isabelle/provers/classical.ts +45 -20
- package/src/prover/isabelle/provers/hypsubst.ts +17 -28
- package/src/prover/isabelle/pure/bicompose.ts +9 -27
- package/src/prover/isabelle/pure/consts.ts +0 -2
- package/src/prover/isabelle/pure/conv.ts +2 -10
- package/src/prover/isabelle/pure/drule.ts +72 -6
- package/src/prover/isabelle/pure/envir.ts +0 -2
- package/src/prover/isabelle/pure/goal.ts +1 -3
- package/src/prover/isabelle/pure/logic.ts +1 -3
- package/src/prover/isabelle/pure/name.ts +0 -2
- package/src/prover/isabelle/pure/net.ts +0 -2
- package/src/prover/isabelle/pure/object-logic.ts +13 -7
- package/src/prover/isabelle/pure/pattern.ts +0 -2
- package/src/prover/isabelle/pure/raw-simplifier.ts +4 -15
- package/src/prover/isabelle/pure/rewriter.ts +6 -17
- package/src/prover/isabelle/pure/search.ts +0 -2
- package/src/prover/isabelle/pure/seq.ts +0 -2
- package/src/prover/isabelle/pure/simplifier.ts +26 -7
- package/src/prover/isabelle/pure/table.ts +2 -3
- package/src/prover/isabelle/pure/tactic.ts +0 -2
- package/src/prover/isabelle/pure/tactical.ts +42 -37
- package/src/prover/isabelle/pure/term-ord.ts +0 -2
- package/src/prover/isabelle/pure/term.ts +0 -2
- package/src/prover/isabelle/pure/thm.ts +14 -13
- package/src/prover/isabelle/pure/type.ts +0 -2
- package/src/prover/isabelle/pure/unify.ts +0 -2
- package/src/prover/isabelle/pure/variable.ts +0 -2
- package/src/prover/isabelle/tla/classical-setup.ts +18 -16
- package/src/prover/isabelle/tla/context.ts +58 -11
- package/src/prover/isabelle/tla/logic-data.ts +1 -1
- package/src/prover/isabelle/tla/logic.ts +49 -21
- package/src/prover/isabelle/tla/simpdata.ts +1 -12
- package/src/prover/isabelle/tools/intuitionistic.ts +28 -12
- package/src/prover/ocaml.ts +4 -1
- package/src/prover/prep/action.ts +30 -31
- package/src/prover/prep/enabled-axioms.ts +11 -2
- package/src/prover/prep/fingerprint.ts +2 -5
- package/src/prover/prep/methods.ts +181 -51
- package/src/prover/prep/normalize.ts +38 -9
- package/src/prover/prove.ts +395 -94
- package/src/prover/ptl/decide.ts +95 -50
- package/src/prover/ptl/encode.ts +2 -3
- package/src/prover/ptl/tableau.ts +28 -2
- package/src/prover/smt/arithmetic.ts +310 -0
- package/src/prover/smt/axioms.ts +12 -8
- package/src/prover/smt/context.ts +43 -8
- package/src/prover/smt/data.ts +498 -379
- package/src/prover/smt/encode.ts +148 -57
- package/src/prover/smt/extensionality.ts +5 -3
- package/src/prover/smt/flatten.ts +4 -6
- package/src/prover/smt/format.ts +28 -4
- package/src/prover/smt/instances.ts +7 -1
- package/src/prover/smt/layout.ts +91 -0
- package/src/prover/smt/rewrite.ts +1021 -618
- 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 -1
- 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 +613 -6
- 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/asserted-formulas.ts +87 -16
- package/src/prover/smt/solver/ast-lt.ts +166 -12
- package/src/prover/smt/solver/ast-util.ts +160 -2
- package/src/prover/smt/solver/ast.ts +1427 -41
- package/src/prover/smt/solver/auf-solver.ts +2 -6
- 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 -2
- package/src/prover/smt/solver/cg-table.ts +39 -25
- package/src/prover/smt/solver/check-logic.ts +330 -0
- package/src/prover/smt/solver/clause.ts +0 -1
- package/src/prover/smt/solver/cofactor-elim-term-ite.ts +278 -0
- package/src/prover/smt/solver/conflict-resolution.ts +78 -2
- package/src/prover/smt/solver/context.ts +516 -115
- package/src/prover/smt/solver/ctx-simplify.ts +20 -10
- 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 +38 -10
- 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 -1
- package/src/prover/smt/solver/e-matching.ts +7 -8
- 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 -3
- 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 +908 -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 -1
- package/src/prover/smt/solver/expr-safe-replace.ts +26 -2
- 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 -15
- package/src/prover/smt/solver/fix-dl-var.ts +148 -0
- package/src/prover/smt/solver/flat-literals.ts +0 -1
- 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 +175 -15
- 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 -1
- package/src/prover/smt/solver/hashtable.ts +30 -16
- 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 +110 -38
- package/src/prover/smt/solver/lackr.ts +381 -0
- package/src/prover/smt/solver/lbool.ts +0 -1
- 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 -1
- package/src/prover/smt/solver/logic-tactics.ts +345 -0
- package/src/prover/smt/solver/lp/bound-propagator.ts +0 -1
- package/src/prover/smt/solver/lp/constraints.ts +0 -1
- package/src/prover/smt/solver/lp/containers.ts +7 -2
- package/src/prover/smt/solver/lp/core-solver.ts +18 -3
- package/src/prover/smt/solver/lp/cross-nested.ts +1 -4
- package/src/prover/smt/solver/lp/dep-intervals.ts +0 -3
- package/src/prover/smt/solver/lp/dependency.ts +0 -2
- package/src/prover/smt/solver/lp/dioph-eq.ts +1 -10
- package/src/prover/smt/solver/lp/explanation.ts +0 -1
- package/src/prover/smt/solver/lp/gomory.ts +0 -1
- package/src/prover/smt/solver/lp/hnf-cutter.ts +1 -2
- package/src/prover/smt/solver/lp/hnf.ts +0 -3
- package/src/prover/smt/solver/lp/int-cube.ts +3 -4
- package/src/prover/smt/solver/lp/int-solver.ts +0 -2
- package/src/prover/smt/solver/lp/lar-solver.ts +40 -4
- package/src/prover/smt/solver/lp/lar-term.ts +0 -1
- package/src/prover/smt/solver/lp/lp-settings.ts +0 -1
- package/src/prover/smt/solver/lp/maximize-term.ts +59 -10
- package/src/prover/smt/solver/lp/nex-creator.ts +3 -3
- package/src/prover/smt/solver/lp/nex.ts +2 -2
- package/src/prover/smt/solver/lp/nla-backoff.ts +0 -2
- package/src/prover/smt/solver/lp/nla-basics.ts +46 -3
- package/src/prover/smt/solver/lp/nla-core.ts +67 -16
- package/src/prover/smt/solver/lp/nla-divisions.ts +0 -2
- package/src/prover/smt/solver/lp/nla-emonics.ts +0 -1
- package/src/prover/smt/solver/lp/nla-factorization.ts +0 -1
- package/src/prover/smt/solver/lp/nla-grobner.ts +165 -83
- package/src/prover/smt/solver/lp/nla-horner.ts +0 -2
- package/src/prover/smt/solver/lp/nla-intervals.ts +0 -1
- package/src/prover/smt/solver/lp/nla-monomial-bounds.ts +0 -2
- package/src/prover/smt/solver/lp/nla-monotone.ts +0 -1
- package/src/prover/smt/solver/lp/nla-order.ts +0 -2
- package/src/prover/smt/solver/lp/nla-patcher.ts +0 -1
- package/src/prover/smt/solver/lp/nla-powers.ts +220 -0
- package/src/prover/smt/solver/lp/nla-tangents.ts +0 -2
- package/src/prover/smt/solver/lp/nla-throttle.ts +0 -1
- package/src/prover/smt/solver/lp/nla-transcendentals.ts +324 -0
- package/src/prover/smt/solver/lp/nla-types.ts +0 -2
- package/src/prover/smt/solver/lp/nla-var-eqs.ts +0 -1
- package/src/prover/smt/solver/lp/nra-solver.ts +122 -64
- package/src/prover/smt/solver/lp/numeric-pair.ts +0 -1
- package/src/prover/smt/solver/lp/pdd-interval.ts +6 -3
- package/src/prover/smt/solver/lp/pdd-simplifier.ts +60 -21
- package/src/prover/smt/solver/lp/pdd-solver.ts +72 -41
- package/src/prover/smt/solver/lp/pdd.ts +725 -289
- package/src/prover/smt/solver/lp/random-updater.ts +0 -2
- package/src/prover/smt/solver/lp/static-matrix.ts +0 -1
- package/src/prover/smt/solver/lp/union-find.ts +7 -2
- package/src/prover/smt/solver/macro-finder.ts +530 -0
- package/src/prover/smt/solver/mam-compiler.ts +122 -90
- package/src/prover/smt/solver/mam-interpreter.ts +0 -1
- 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 -6
- 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 +18 -27
- package/src/prover/smt/solver/model-evaluator.ts +188 -12
- package/src/prover/smt/solver/model-finder.ts +12 -18
- package/src/prover/smt/solver/model-generator.ts +56 -29
- package/src/prover/smt/solver/model-macro-solver.ts +49 -46
- 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 +125 -12
- package/src/prover/smt/solver/nlsat/atoms.ts +20 -6
- package/src/prover/smt/solver/nlsat/evaluator.ts +0 -1
- package/src/prover/smt/solver/nlsat/explain.ts +63 -23
- package/src/prover/smt/solver/nlsat/interval-set.ts +1 -2
- package/src/prover/smt/solver/nlsat/levelwise.ts +3 -9
- package/src/prover/smt/solver/nlsat/mpbq.ts +45 -1
- package/src/prover/smt/solver/nlsat/polynomial.ts +13 -6
- package/src/prover/smt/solver/nlsat/solver.ts +236 -45
- 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 -2
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +1 -4
- package/src/prover/smt/solver/nlsat/upolynomial.ts +0 -2
- package/src/prover/smt/solver/nlsat-tactic.ts +82 -0
- package/src/prover/smt/solver/nnf.ts +105 -23
- 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 +19 -11
- 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 +202 -57
- package/src/prover/smt/solver/probes.ts +512 -0
- package/src/prover/smt/solver/propagate-values.ts +37 -21
- package/src/prover/smt/solver/proto-model.ts +648 -19
- package/src/prover/smt/solver/pull-quant.ts +28 -12
- 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 -3
- package/src/prover/smt/solver/qe-lite-fm.ts +3 -4
- package/src/prover/smt/solver/qe-lite.ts +37 -17
- 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 -1
- 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 +16 -56
- package/src/prover/smt/solver/quantifier-analyzer.ts +19 -20
- package/src/prover/smt/solver/quantifier-manager.ts +8 -16
- package/src/prover/smt/solver/quasi-macros.ts +243 -0
- package/src/prover/smt/solver/random-gen.ts +0 -1
- package/src/prover/smt/solver/rational.ts +45 -1
- 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 -1
- package/src/prover/smt/solver/relevancy.ts +1 -2
- package/src/prover/smt/solver/rewriter-tpl.ts +77 -10
- package/src/prover/smt/solver/rewriter.ts +475 -36
- package/src/prover/smt/solver/rlimit.ts +38 -2
- 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 +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 +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 +3126 -316
- 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 +113 -22
- package/src/prover/smt/solver/static-features.ts +314 -0
- package/src/prover/smt/solver/sticky-generations.ts +0 -1
- 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 +53 -2
- package/src/prover/smt/solver/theory-lra-bounds.ts +31 -6
- package/src/prover/smt/solver/theory-lra-final-check.ts +56 -70
- package/src/prover/smt/solver/theory-lra-internalize.ts +94 -27
- package/src/prover/smt/solver/theory-lra-model.ts +20 -35
- package/src/prover/smt/solver/theory-lra-propagate.ts +24 -26
- package/src/prover/smt/solver/theory-lra-state.ts +6 -22
- package/src/prover/smt/solver/theory-lra.ts +188 -1
- 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 +36 -14
- package/src/prover/smt/table.ts +3 -2
- package/src/prover/smt/types.ts +146 -0
- package/src/prover/tlapm/cache.ts +50 -19
- package/src/prover/tlapm/tlapm.ts +15 -9
- package/src/prover/tlapm-library.ts +3208 -0
- package/src/prover/verdict.ts +9 -0
- package/src/prover/zenon/check/check.ts +1 -2
- package/src/prover/zenon/check/records.ts +1 -1
- package/src/prover/zenon/check/relations.ts +2 -1
- package/src/prover/zenon/check/rewrites.ts +2 -15
- package/src/prover/zenon/check/sets.ts +40 -58
- package/src/prover/zenon/check/terms.ts +1 -2
- package/src/prover/zenon/decide.ts +10 -7
- package/src/prover/zenon/encode.ts +0 -2
- package/src/prover/zenon/eqrel.ts +2 -2
- package/src/prover/zenon/equality-rules.ts +24 -2
- package/src/prover/zenon/expr.ts +28 -2
- package/src/prover/zenon/index-table.ts +11 -21
- package/src/prover/zenon/isar-case.ts +0 -2
- package/src/prover/zenon/isar.ts +35 -37
- package/src/prover/zenon/llproof.ts +2 -13
- package/src/prover/zenon/mltoll.ts +12 -30
- package/src/prover/zenon/node.ts +20 -5
- package/src/prover/zenon/parse.ts +9 -8
- package/src/prover/zenon/phrase.ts +0 -2
- package/src/prover/zenon/proof.ts +0 -2
- package/src/prover/zenon/propositional-rules.ts +0 -2
- package/src/prover/zenon/rules.ts +2 -3
- package/src/prover/zenon/search.ts +11 -19
- package/src/prover/zenon/tla/functions.ts +2 -4
- package/src/prover/zenon/tla/llproof.ts +9 -13
- package/src/prover/zenon/tla/records.ts +1 -8
- package/src/prover/zenon/tla/rewrites.ts +0 -2
- package/src/prover/zenon/tla/sets.ts +22 -22
- package/src/prover/zenon/tla/terms.ts +0 -2
- package/src/prover/zenon/tla/tla.ts +7 -8
- package/src/randomization.ts +1 -4
- package/src/resolve.ts +67 -143
- package/src/runtime.ts +17 -18
- package/src/sany/builtins.ts +1 -3
- 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 +160 -2683
- package/src/sany/levels.ts +5 -11
- package/src/sany/lexer.ts +57 -60
- package/src/sany/linter.ts +0 -3
- package/src/sany/nodes.ts +6 -13
- package/src/sany/report.ts +3 -6
- package/src/sany/selectors.ts +35 -38
- package/src/sany/xml.ts +23 -55
- package/src/search.ts +244 -53
- package/src/simulate.ts +202 -184
- package/src/spec-description.ts +56 -82
- package/src/standard-definitions.ts +4 -3
- package/src/standard-modules.ts +17 -44
- package/src/state-graph.ts +3 -17
- package/src/subexpressions.ts +38 -47
- package/src/substitution-levels.ts +5 -4
- package/src/successors.ts +20 -43
- package/src/symmetry.ts +6 -21
- package/src/tableau.ts +2 -2
- package/src/tlc/fingerprint.ts +96 -30
- package/src/tlc/jar-data.ts +0 -1
- package/src/tlc/messages.ts +22 -36
- package/src/tlc/order.ts +36 -50
- package/src/tlc/random.ts +22 -34
- package/src/tlc/replay.ts +21 -48
- package/src/tlc/summary.ts +64 -58
- package/src/tlc/tlc-operators.ts +6 -17
- package/src/tlc/tlcext-operators.ts +70 -29
- package/src/tlc/trace-spec.ts +26 -51
- package/src/tlc/value-stream.ts +9 -13
- package/src/tlc/version.ts +0 -1
- package/src/typed-tier.ts +6535 -0
- package/src/typescript/actions.ts +2 -4
- package/src/typescript/collections.ts +34 -20
- package/src/typescript/compile.ts +1 -3
- package/src/typescript/formula.ts +5 -3
- package/src/typescript/model.ts +4 -5
- package/src/typescript/steps.ts +20 -18
- package/src/values.ts +136 -338
- package/src/prover/isabelle/isar/statement.ts +0 -52
- 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/sany/levels.ts
CHANGED
|
@@ -27,8 +27,6 @@ import {
|
|
|
27
27
|
type ThmOrAssumpDefNode,
|
|
28
28
|
} from "./nodes";
|
|
29
29
|
|
|
30
|
-
// A port of the levelCheck methods of SANY's semantic nodes.
|
|
31
|
-
|
|
32
30
|
type AnyDefNode = OpDefNode | ThmOrAssumpDefNode;
|
|
33
31
|
|
|
34
32
|
interface LevelCheck {
|
|
@@ -272,14 +270,14 @@ const checkDefinitionBody = (node: AnyDefNode, params: FormalParamNode[], body:
|
|
|
272
270
|
node.minMaxLevel = params.map((param) =>
|
|
273
271
|
Array.from(
|
|
274
272
|
{ length: param.arity },
|
|
275
|
-
(
|
|
273
|
+
(_value, position) =>
|
|
276
274
|
body.argLevelConstraints.get(getArgLevelConstraintKey(param, position))?.level ??
|
|
277
275
|
CONSTANT_LEVEL,
|
|
278
276
|
),
|
|
279
277
|
);
|
|
280
278
|
node.opLevelCond = params.map((param) =>
|
|
281
279
|
params.map((other) =>
|
|
282
|
-
Array.from({ length: param.arity }, (
|
|
280
|
+
Array.from({ length: param.arity }, (_value, index) =>
|
|
283
281
|
body.argLevelParams.has(getArgLevelKey(param, index, other)),
|
|
284
282
|
),
|
|
285
283
|
),
|
|
@@ -391,7 +389,7 @@ const constrainArguments = (
|
|
|
391
389
|
) => {
|
|
392
390
|
const params = operator.params ?? [];
|
|
393
391
|
const getArgument = (symbol: SymbolNode) =>
|
|
394
|
-
node.operands.find((
|
|
392
|
+
node.operands.find((_operand, index) => params[index] === symbol);
|
|
395
393
|
putLevelConstraints(node.levelConstraints, operator.levelConstraints);
|
|
396
394
|
node.operands.forEach((operand) => {
|
|
397
395
|
if (operand === undefined) return;
|
|
@@ -527,7 +525,6 @@ const LOGICAL_OPERATOR_NAMES = new Map([
|
|
|
527
525
|
["$DisjList", "Disjunction list"],
|
|
528
526
|
]);
|
|
529
527
|
|
|
530
|
-
// TLC 1.7.4's SANY reports these errors but leaves the node level-correct.
|
|
531
528
|
const checkTemporalApplication = (node: OpApplNode, check: LevelCheck) => {
|
|
532
529
|
const addTemporalError = (location: SanyLocation, text: string) => {
|
|
533
530
|
addError(check, location, text);
|
|
@@ -680,7 +677,7 @@ const checkTheoremDefinition = (node: ThmOrAssumpDefNode, iteration: number, che
|
|
|
680
677
|
node.levelChecked = iteration;
|
|
681
678
|
node.maxLevels = node.params.map(() => TEMPORAL_LEVEL);
|
|
682
679
|
// SANY allocates isLeibnizArg anew for each parameter, so only the last one starts out Leibniz.
|
|
683
|
-
node.isLeibnizArg = node.params.map((
|
|
680
|
+
node.isLeibnizArg = node.params.map((_param, index) => index === node.params.length - 1);
|
|
684
681
|
if (node.params.length > 0) node.isLeibniz = true;
|
|
685
682
|
node.levelCorrect = checkLevel(node.body, iteration, check);
|
|
686
683
|
node.level = node.body.level;
|
|
@@ -692,8 +689,6 @@ const checkTheoremDefinition = (node: ThmOrAssumpDefNode, iteration: number, che
|
|
|
692
689
|
return node.levelCorrect;
|
|
693
690
|
};
|
|
694
691
|
|
|
695
|
-
// SANY checks the definitions of each recursive section twice, the second time with the highest
|
|
696
|
-
// level and the parameters of the section's recursive operators.
|
|
697
692
|
export const checkModuleLevels = (module: ModuleNode, check: LevelCheck) => {
|
|
698
693
|
if (module.isLevelChecked) return module.levelCorrect;
|
|
699
694
|
module.isLevelChecked = true;
|
|
@@ -1111,8 +1106,7 @@ const checkLevel = (node: SemanticNode, iteration: number, check: LevelCheck): b
|
|
|
1111
1106
|
return isBodyCorrect && isDefinitionCorrect;
|
|
1112
1107
|
}
|
|
1113
1108
|
case "Theorem": {
|
|
1114
|
-
// TheoremNode declares its own levelChecked, so levelCheckSubnodes still runs on
|
|
1115
|
-
// or its statement when it has none, and its proof.
|
|
1109
|
+
// SANY's TheoremNode declares its own levelChecked, so levelCheckSubnodes still runs on it.
|
|
1116
1110
|
if (node.levelChecked >= iteration) return true;
|
|
1117
1111
|
const isCorrect = checkSubnodes(
|
|
1118
1112
|
node,
|
package/src/sany/lexer.ts
CHANGED
|
@@ -10,7 +10,6 @@ export interface SanyToken {
|
|
|
10
10
|
next: SanyToken | undefined;
|
|
11
11
|
}
|
|
12
12
|
|
|
13
|
-
// In TLAplusParserConstants order, by which JavaCC breaks a tie between matches of one length.
|
|
14
13
|
const KINDS: [string, ...string[]][] = [
|
|
15
14
|
["EOF"],
|
|
16
15
|
["BEGIN_PRAGMA", "--->"],
|
|
@@ -226,7 +225,6 @@ const KIND_INDEXES = new Map(
|
|
|
226
225
|
KIND_NAMES.map((name, kind): [string, number] => [name, kind]).reverse(),
|
|
227
226
|
);
|
|
228
227
|
|
|
229
|
-
// The anonymous infix operators share the name "infix", which no caller looks up.
|
|
230
228
|
export const getKind = (name: string) => {
|
|
231
229
|
const kind = KIND_INDEXES.get(name);
|
|
232
230
|
if (kind === undefined) throw new TlaError(`Unknown SANY token kind ${name}`);
|
|
@@ -239,7 +237,7 @@ const LITERALS = new Map(
|
|
|
239
237
|
const LONGEST_LITERAL = Math.max(...[...LITERALS.keys()].map((image) => image.length));
|
|
240
238
|
const LITERAL_LENGTHS = Array.from(
|
|
241
239
|
{ length: LONGEST_LITERAL },
|
|
242
|
-
(
|
|
240
|
+
(_value, index) => LONGEST_LITERAL - index,
|
|
243
241
|
);
|
|
244
242
|
|
|
245
243
|
const BEGIN_MODULE = /----+ *MODULE/y;
|
|
@@ -292,34 +290,35 @@ const getMatchLength = (pattern: RegExp, source: string, offset: number) => {
|
|
|
292
290
|
return pattern.exec(source)?.[0].length ?? 0;
|
|
293
291
|
};
|
|
294
292
|
|
|
293
|
+
interface TokenMatch {
|
|
294
|
+
kind: number;
|
|
295
|
+
length: number;
|
|
296
|
+
}
|
|
297
|
+
|
|
298
|
+
const getLongerMatch = (best: TokenMatch, match: TokenMatch) =>
|
|
299
|
+
match.length > best.length || (match.length === best.length && match.kind < best.kind)
|
|
300
|
+
? match
|
|
301
|
+
: best;
|
|
302
|
+
|
|
295
303
|
const matchPatterns = (patterns: [string, RegExp[]][], source: string, offset: number) =>
|
|
296
304
|
patterns
|
|
297
305
|
.map(([name, regexes]) => ({
|
|
298
306
|
kind: getKind(name),
|
|
299
307
|
length: Math.max(...regexes.map((regex) => getMatchLength(regex, source, offset))),
|
|
300
308
|
}))
|
|
301
|
-
.reduce(
|
|
302
|
-
(best, match) =>
|
|
303
|
-
match.length > best.length || (match.length === best.length && match.kind < best.kind)
|
|
304
|
-
? match
|
|
305
|
-
: best,
|
|
306
|
-
{ kind: -1, length: 0 },
|
|
307
|
-
);
|
|
309
|
+
.reduce(getLongerMatch, { kind: -1, length: 0 });
|
|
308
310
|
|
|
309
311
|
const matchSpecToken = (source: string, offset: number) => {
|
|
310
312
|
const literalLength = LITERAL_LENGTHS.find((length) =>
|
|
311
313
|
LITERALS.has(source.slice(offset, offset + length)),
|
|
312
314
|
);
|
|
313
315
|
const pattern = matchPatterns(SPEC_PATTERNS, source, offset);
|
|
314
|
-
|
|
315
|
-
|
|
316
|
-
|
|
317
|
-
|
|
318
|
-
|
|
319
|
-
|
|
320
|
-
(literal.length === pattern.length && literal.kind < pattern.kind)
|
|
321
|
-
? literal
|
|
322
|
-
: pattern;
|
|
316
|
+
return literalLength === undefined
|
|
317
|
+
? pattern
|
|
318
|
+
: getLongerMatch(pattern, {
|
|
319
|
+
kind: LITERALS.get(source.slice(offset, offset + literalLength)) ?? -1,
|
|
320
|
+
length: literalLength,
|
|
321
|
+
});
|
|
323
322
|
};
|
|
324
323
|
|
|
325
324
|
export const getTabStop = (column: number) => column + 8 - (column % 8);
|
|
@@ -327,27 +326,30 @@ export const getTabStop = (column: number) => column + 8 - (column % 8);
|
|
|
327
326
|
const getPositions = (source: string) => {
|
|
328
327
|
const lines: number[] = [];
|
|
329
328
|
const columns: number[] = [];
|
|
330
|
-
|
|
329
|
+
let line = 1;
|
|
330
|
+
let column = 0;
|
|
331
|
+
let isAfterCr = false;
|
|
332
|
+
let isAfterLf = false;
|
|
331
333
|
for (const character of source) {
|
|
332
334
|
for (let unit = 0; unit < character.length; unit++) {
|
|
333
|
-
|
|
334
|
-
if (
|
|
335
|
-
|
|
336
|
-
|
|
337
|
-
|
|
338
|
-
} else if (
|
|
339
|
-
|
|
340
|
-
if (character === "\n")
|
|
335
|
+
column++;
|
|
336
|
+
if (isAfterLf) {
|
|
337
|
+
isAfterLf = false;
|
|
338
|
+
line++;
|
|
339
|
+
column = 1;
|
|
340
|
+
} else if (isAfterCr) {
|
|
341
|
+
isAfterCr = false;
|
|
342
|
+
if (character === "\n") isAfterLf = true;
|
|
341
343
|
else {
|
|
342
|
-
|
|
343
|
-
|
|
344
|
+
line++;
|
|
345
|
+
column = 1;
|
|
344
346
|
}
|
|
345
347
|
}
|
|
346
|
-
if (character === "\r")
|
|
347
|
-
else if (character === "\n")
|
|
348
|
-
else if (character === "\t")
|
|
349
|
-
lines.push(
|
|
350
|
-
columns.push(
|
|
348
|
+
if (character === "\r") isAfterCr = true;
|
|
349
|
+
else if (character === "\n") isAfterLf = true;
|
|
350
|
+
else if (character === "\t") column = getTabStop(column - 1);
|
|
351
|
+
lines.push(line);
|
|
352
|
+
columns.push(column);
|
|
351
353
|
}
|
|
352
354
|
}
|
|
353
355
|
return { lines, columns };
|
|
@@ -356,7 +358,7 @@ const getPositions = (source: string) => {
|
|
|
356
358
|
const STRING_PREFIX = /"(?:[^"\n\r\\]|\\[ntrf\\"])*\\?/y;
|
|
357
359
|
const LITERAL_PREFIXES = new Set(
|
|
358
360
|
[...LITERALS.keys()].flatMap((image) =>
|
|
359
|
-
Array.from({ length: image.length - 1 }, (
|
|
361
|
+
Array.from({ length: image.length - 1 }, (_value, index) => image.slice(0, index + 1)),
|
|
360
362
|
),
|
|
361
363
|
);
|
|
362
364
|
|
|
@@ -371,7 +373,8 @@ const getTokenPrefix = (source: string, offset: number) => {
|
|
|
371
373
|
|
|
372
374
|
export const createSanyLexer = (source: string) => {
|
|
373
375
|
const positions = getPositions(source);
|
|
374
|
-
|
|
376
|
+
let nextOffset = 0;
|
|
377
|
+
let mode = "DEFAULT";
|
|
375
378
|
const createToken = (kind: number, start: number, length: number): SanyToken => ({
|
|
376
379
|
kind,
|
|
377
380
|
image: source.slice(start, start + length),
|
|
@@ -381,8 +384,6 @@ export const createSanyLexer = (source: string) => {
|
|
|
381
384
|
});
|
|
382
385
|
// JavaCC places the end of the file at the file's last character.
|
|
383
386
|
const getEndOfFile = () => createToken(getKind("EOF"), source.length - 1, 0);
|
|
384
|
-
// TLAplusParser.parse reports the end of the file in a token that starts on an earlier line as an
|
|
385
|
-
// open comment.
|
|
386
387
|
const getLexicalError = (start: number, end: number, after: string) => {
|
|
387
388
|
const index = end - 1;
|
|
388
389
|
const line = positions.lines[index];
|
|
@@ -395,13 +396,12 @@ export const createSanyLexer = (source: string) => {
|
|
|
395
396
|
? formatLexicalError(line + 1, 0, undefined, after)
|
|
396
397
|
: formatLexicalError(line, column + 1, undefined, after);
|
|
397
398
|
};
|
|
398
|
-
// The end of the file right after a nested comment bracket ends the token stream.
|
|
399
399
|
const skipComment = () => {
|
|
400
|
-
const start =
|
|
400
|
+
const start = nextOffset;
|
|
401
401
|
if (source.startsWith("\\*", start)) {
|
|
402
402
|
const end = source.slice(start).search(/[\n\r]/);
|
|
403
403
|
if (end === -1) return getLexicalError(start, source.length, "");
|
|
404
|
-
|
|
404
|
+
nextOffset += end + 1;
|
|
405
405
|
return undefined;
|
|
406
406
|
}
|
|
407
407
|
let depth = 0;
|
|
@@ -417,41 +417,40 @@ export const createSanyLexer = (source: string) => {
|
|
|
417
417
|
offset += 2;
|
|
418
418
|
chainStart = offset;
|
|
419
419
|
if (depth === 0) {
|
|
420
|
-
|
|
420
|
+
nextOffset = offset;
|
|
421
421
|
return undefined;
|
|
422
422
|
}
|
|
423
423
|
} else offset++;
|
|
424
424
|
}
|
|
425
|
-
|
|
425
|
+
nextOffset = offset;
|
|
426
426
|
return chainStart === source.length ? undefined : getLexicalError(chainStart, offset, "");
|
|
427
427
|
};
|
|
428
428
|
const getSkippingToken = (patterns: [string, RegExp[]][]): SanyToken => {
|
|
429
|
-
while (
|
|
430
|
-
const match = matchPatterns(patterns, source,
|
|
429
|
+
while (nextOffset < source.length) {
|
|
430
|
+
const match = matchPatterns(patterns, source, nextOffset);
|
|
431
431
|
if (match.length > 0) {
|
|
432
|
-
const token = createToken(match.kind,
|
|
433
|
-
|
|
434
|
-
if (KIND_NAMES[match.kind].startsWith("_BM"))
|
|
435
|
-
if (KIND_NAMES[match.kind] === "BEGIN_PRAGMA")
|
|
432
|
+
const token = createToken(match.kind, nextOffset, match.length);
|
|
433
|
+
nextOffset += match.length;
|
|
434
|
+
if (KIND_NAMES[match.kind].startsWith("_BM")) mode = "SPEC";
|
|
435
|
+
if (KIND_NAMES[match.kind] === "BEGIN_PRAGMA") mode = "PRAGMA";
|
|
436
436
|
return token;
|
|
437
437
|
}
|
|
438
|
-
|
|
438
|
+
nextOffset++;
|
|
439
439
|
}
|
|
440
440
|
return getEndOfFile();
|
|
441
441
|
};
|
|
442
442
|
const getNextToken = (): SanyToken | string => {
|
|
443
|
-
if (
|
|
444
|
-
if (
|
|
445
|
-
while (
|
|
446
|
-
const offset =
|
|
447
|
-
if (" \t\n\r".includes(source[offset]))
|
|
443
|
+
if (mode === "DEFAULT") return getSkippingToken(DEFAULT_PATTERNS);
|
|
444
|
+
if (mode === "PRAGMA") return getSkippingToken(PRAGMA_PATTERNS);
|
|
445
|
+
while (nextOffset < source.length) {
|
|
446
|
+
const offset = nextOffset;
|
|
447
|
+
if (" \t\n\r".includes(source[offset])) nextOffset++;
|
|
448
448
|
else if (source.startsWith("(*", offset) || source.startsWith("\\*", offset)) {
|
|
449
449
|
const error = skipComment();
|
|
450
450
|
if (error !== undefined) return error;
|
|
451
451
|
} else {
|
|
452
452
|
const match = matchSpecToken(source, offset);
|
|
453
453
|
if (match.length === 0) {
|
|
454
|
-
// JavaCC reads on while a token could continue, and one more character.
|
|
455
454
|
const prefix = getTokenPrefix(source, offset);
|
|
456
455
|
const end = Math.min(offset + prefix.length + 1, source.length);
|
|
457
456
|
const read = source.slice(offset, end);
|
|
@@ -459,7 +458,7 @@ export const createSanyLexer = (source: string) => {
|
|
|
459
458
|
return getLexicalError(offset, end, after);
|
|
460
459
|
}
|
|
461
460
|
const token = createToken(match.kind, offset, match.length);
|
|
462
|
-
|
|
461
|
+
nextOffset += match.length;
|
|
463
462
|
return token;
|
|
464
463
|
}
|
|
465
464
|
}
|
|
@@ -496,8 +495,6 @@ export const formatLexicalError = (
|
|
|
496
495
|
) =>
|
|
497
496
|
`Lexical error at line ${line}, column ${column}. Encountered: ${character === undefined ? "<EOF> " : `"${escapeLexeme(character)}" (${character.charCodeAt(0)}), `}after : "${escapeLexeme(after)}"`;
|
|
498
497
|
|
|
499
|
-
// TLC 1.7.4's lexer, generated without UNICODE_INPUT, reads a character past U+00FF outside a
|
|
500
|
-
// comment by its low byte, and stops at one whose low byte is below 0x80.
|
|
501
498
|
export const getSany174LexicalError = (source: string) => {
|
|
502
499
|
const readToken = createSanyLexer(source);
|
|
503
500
|
for (
|
package/src/sany/linter.ts
CHANGED
|
@@ -7,8 +7,6 @@ import {
|
|
|
7
7
|
type SemanticNode,
|
|
8
8
|
} from "./nodes";
|
|
9
9
|
|
|
10
|
-
// A port of SANY's tla2sany.linter.Linter.
|
|
11
|
-
|
|
12
10
|
const getChildren = (node: SemanticNode): (SemanticNode | undefined)[] => {
|
|
13
11
|
switch (node.kind) {
|
|
14
12
|
case "OpAppl":
|
|
@@ -69,7 +67,6 @@ const getFieldName = (pair: OpApplNode) => {
|
|
|
69
67
|
return name?.kind === "String" ? name : undefined;
|
|
70
68
|
};
|
|
71
69
|
|
|
72
|
-
// Records.sameDomain, given that SANY rejects a record with two fields of the same name.
|
|
73
70
|
const getDomain = (record: OpApplNode) =>
|
|
74
71
|
JSON.stringify([
|
|
75
72
|
record.operands.length,
|
package/src/sany/nodes.ts
CHANGED
|
@@ -1,3 +1,5 @@
|
|
|
1
|
+
import { getJavaHashCode } from "../java-hash";
|
|
2
|
+
|
|
1
3
|
export interface SanyLocation {
|
|
2
4
|
file: string;
|
|
3
5
|
beginLine: number;
|
|
@@ -151,12 +153,11 @@ export interface OpApplNode extends LevelFields {
|
|
|
151
153
|
tupleOrs: boolean[] | undefined;
|
|
152
154
|
ranges: ExprNode[];
|
|
153
155
|
location: SanyLocation;
|
|
154
|
-
|
|
155
|
-
isAbsent?: boolean;
|
|
156
|
+
nullKind?: "null" | "absent";
|
|
156
157
|
}
|
|
157
158
|
|
|
158
159
|
export const isAbsent = (node: LevelNode | undefined) =>
|
|
159
|
-
node?.kind === "OpAppl" && node.
|
|
160
|
+
node?.kind === "OpAppl" && node.nullKind === "absent";
|
|
160
161
|
|
|
161
162
|
export interface NumeralNode extends LevelFields {
|
|
162
163
|
kind: "Numeral";
|
|
@@ -343,14 +344,6 @@ interface JavaHashtable {
|
|
|
343
344
|
threshold: number;
|
|
344
345
|
}
|
|
345
346
|
|
|
346
|
-
const getJavaHash = (text: string) => {
|
|
347
|
-
let hash = 0;
|
|
348
|
-
for (let index = 0; index < text.length; index++) {
|
|
349
|
-
hash = (Math.imul(hash, 31) + text.charCodeAt(index)) | 0;
|
|
350
|
-
}
|
|
351
|
-
return hash;
|
|
352
|
-
};
|
|
353
|
-
|
|
354
347
|
const createJavaHashtable = (): JavaHashtable => ({
|
|
355
348
|
buckets: Array.from({ length: 11 }, () => []),
|
|
356
349
|
count: 0,
|
|
@@ -372,12 +365,12 @@ const rehash = (table: JavaHashtable) => {
|
|
|
372
365
|
};
|
|
373
366
|
|
|
374
367
|
const getHashtableValue = (table: JavaHashtable, key: string, hashKey = key) =>
|
|
375
|
-
table.buckets[getBucketIndex(
|
|
368
|
+
table.buckets[getBucketIndex(getJavaHashCode(hashKey), table.buckets.length)].find(
|
|
376
369
|
(entry) => entry.key === key,
|
|
377
370
|
)?.value;
|
|
378
371
|
|
|
379
372
|
const putHashtableValue = (table: JavaHashtable, key: string, value: SymbolNode, hashKey = key) => {
|
|
380
|
-
const hash =
|
|
373
|
+
const hash = getJavaHashCode(hashKey);
|
|
381
374
|
const existing = table.buckets[getBucketIndex(hash, table.buckets.length)].find(
|
|
382
375
|
(entry) => entry.key === key,
|
|
383
376
|
);
|
package/src/sany/report.ts
CHANGED
|
@@ -109,9 +109,8 @@ export const getSanyReport = (
|
|
|
109
109
|
const rootName = basename(rootPath, ".tla");
|
|
110
110
|
const standardModules = getSanyStandardModules(options.version);
|
|
111
111
|
const name = options.fileName ?? rootName;
|
|
112
|
-
const
|
|
113
|
-
|
|
114
|
-
: standardModules.get(rootName);
|
|
112
|
+
const isRootFile = existsSync(rootPath);
|
|
113
|
+
const source = isRootFile ? readFileSync(rootPath, "utf8") : standardModules.get(rootName);
|
|
115
114
|
const lines: string[] = [];
|
|
116
115
|
const write = (text: string) => {
|
|
117
116
|
lines.push(text);
|
|
@@ -124,9 +123,7 @@ export const getSanyReport = (
|
|
|
124
123
|
if (!options.isXmlExport) log(text);
|
|
125
124
|
};
|
|
126
125
|
const describeFile = options.describeFile;
|
|
127
|
-
const origins = new Map<string, SanyModuleOrigin>([
|
|
128
|
-
[rootName, existsSync(rootPath) ? "file" : "standard"],
|
|
129
|
-
]);
|
|
126
|
+
const origins = new Map<string, SanyModuleOrigin>([[rootName, isRootFile ? "file" : "standard"]]);
|
|
130
127
|
let isFailed = false;
|
|
131
128
|
const parseMessages: SanyMessage[] = [];
|
|
132
129
|
let isParseReported = false;
|