tla-ts 0.0.9 → 0.0.10-dev.09e53c2a6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +30 -1
- package/dist/compile.cjs +23 -0
- package/dist/compile.js +23 -0
- package/dist/deciders.cjs +41 -37
- package/dist/deciders.js +57 -53
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +109 -10
- package/dist/index.d.ts +109 -10
- package/dist/index.js +1 -1
- package/dist/parallel-worker.cjs +1 -1
- package/dist/parallel-worker.js +1 -1
- package/dist/prove-worker.cjs +1 -1
- package/dist/prove-worker.js +1 -1
- package/dist/prove.cjs +2746 -410
- package/dist/prove.js +2745 -409
- package/dist/run.cjs +146 -31
- package/dist/run.js +146 -31
- package/dist/tlapm.cjs +2 -2
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +132 -104
- package/dist/transfer.js +132 -104
- package/dist/worker.cjs +6 -6
- package/dist/worker.js +6 -6
- package/package.json +3 -1
- package/src/ast.ts +45 -59
- package/src/bags.ts +99 -102
- package/src/builtins.ts +28 -75
- package/src/bundled-modules.ts +1 -8
- package/src/check-failure.ts +116 -0
- package/src/check-trace.ts +282 -0
- package/src/check.ts +797 -782
- package/src/cli/options.ts +12 -32
- package/src/cli/run.ts +0 -2
- package/src/cli/runtime-invariants.ts +136 -0
- package/src/cli/shared.ts +19 -12
- package/src/cli/tlapm.ts +433 -82
- package/src/cli/tlc-arguments.ts +652 -0
- package/src/cli/tlc-output.ts +687 -0
- package/src/cli/tlc-usage.ts +360 -0
- package/src/cli/tlc.ts +323 -658
- package/src/cli/typescript.ts +23 -0
- package/src/cli/xml-exporter.ts +27 -49
- package/src/cli.ts +0 -1
- package/src/codegen.ts +196 -74
- package/src/config.ts +140 -109
- package/src/coverage.ts +830 -0
- package/src/dependencies.ts +36 -54
- package/src/dfid.ts +618 -0
- package/src/environment-config.ts +315 -0
- package/src/environment.ts +178 -339
- package/src/errors.ts +100 -57
- package/src/evaluate.ts +598 -340
- package/src/exit-codes.ts +38 -3
- package/src/fingerprints.ts +75 -11
- package/src/index.ts +3 -0
- package/src/instances.ts +126 -21
- package/src/java-hash.ts +7 -0
- package/src/java-overrides.ts +4 -19
- package/src/json-reader.ts +455 -0
- package/src/json.ts +252 -139
- package/src/levels.ts +46 -58
- package/src/lexer.ts +83 -101
- package/src/liveness-checker.ts +590 -311
- package/src/liveness.ts +180 -124
- package/src/obligations/action.ts +17 -44
- package/src/obligations/anonymize.ts +120 -95
- package/src/obligations/enabled-axioms.ts +218 -0
- package/src/obligations/equality.ts +1 -3
- package/src/obligations/expression.ts +37 -26
- package/src/obligations/format.ts +0 -10
- package/src/obligations/generate.ts +66 -64
- package/src/obligations/index.ts +38 -19
- package/src/obligations/levels.ts +27 -18
- package/src/obligations/module.ts +28 -55
- package/src/obligations/normalize.ts +30 -37
- package/src/obligations/operators.ts +0 -3
- package/src/obligations/pragma.ts +52 -24
- package/src/obligations/printer.ts +89 -58
- package/src/obligations/proof.ts +3 -6
- package/src/obligations/regroup.ts +0 -5
- package/src/obligations/simplify.ts +57 -63
- package/src/obligations/source.ts +119 -95
- package/src/obligations/subexpression.ts +49 -28
- package/src/obligations/substitution.ts +1 -5
- package/src/obligations/temporal.ts +12 -20
- package/src/obligations/tuples.ts +2 -10
- package/src/parallel-worker.ts +30 -60
- package/src/parallel.ts +59 -73
- package/src/parser.ts +1082 -399
- package/src/pcal/ast.ts +53 -86
- package/src/pcal/parse.ts +144 -219
- package/src/pcal/tokenize.ts +91 -131
- package/src/pcal/translate.ts +83 -130
- package/src/pcal/validate.ts +48 -68
- package/src/pretty-print.ts +7 -8
- package/src/prover/decide-pool.ts +8 -13
- package/src/prover/deciders.ts +12 -13
- package/src/prover/first-order.ts +0 -11
- package/src/prover/isabelle/decide.ts +3 -31
- package/src/prover/isabelle/encode.ts +82 -64
- package/src/prover/isabelle/isar/attrib.ts +250 -0
- package/src/prover/isabelle/isar/context.ts +335 -0
- package/src/prover/isabelle/isar/induct.ts +382 -0
- package/src/prover/isabelle/isar/inner-syntax.ts +262 -117
- package/src/prover/isabelle/isar/method.ts +510 -226
- package/src/prover/isabelle/isar/proof.ts +570 -23
- package/src/prover/isabelle/isar/rule-cases.ts +224 -0
- package/src/prover/isabelle/isar/theory.ts +488 -88
- package/src/prover/isabelle/isar/toplevel.ts +331 -0
- package/src/prover/isabelle/isar/type-check.ts +99 -38
- package/src/prover/isabelle/provers/blast/blast.ts +16 -105
- package/src/prover/isabelle/provers/blast/branch.ts +0 -33
- package/src/prover/isabelle/provers/blast/prove.ts +0 -36
- package/src/prover/isabelle/provers/blast/rules.ts +5 -45
- package/src/prover/isabelle/provers/blast/state.ts +1 -29
- package/src/prover/isabelle/provers/blast/term.ts +8 -37
- package/src/prover/isabelle/provers/clasimp.ts +0 -14
- package/src/prover/isabelle/provers/classical.ts +58 -61
- package/src/prover/isabelle/provers/hypsubst.ts +27 -52
- package/src/prover/isabelle/pure/bicompose.ts +24 -39
- package/src/prover/isabelle/pure/consts.ts +0 -8
- package/src/prover/isabelle/pure/conv.ts +2 -18
- package/src/prover/isabelle/pure/drule.ts +95 -45
- package/src/prover/isabelle/pure/envir.ts +2 -53
- package/src/prover/isabelle/pure/goal.ts +1 -9
- package/src/prover/isabelle/pure/interrupt.ts +0 -5
- package/src/prover/isabelle/pure/list.ts +0 -3
- package/src/prover/isabelle/pure/logic.ts +1 -16
- package/src/prover/isabelle/pure/name.ts +1 -10
- package/src/prover/isabelle/pure/net.ts +2 -60
- package/src/prover/isabelle/pure/object-logic.ts +15 -16
- package/src/prover/isabelle/pure/pattern.ts +1 -20
- package/src/prover/isabelle/pure/raw-simplifier.ts +16 -63
- package/src/prover/isabelle/pure/rewriter.ts +31 -74
- package/src/prover/isabelle/pure/search.ts +2 -11
- package/src/prover/isabelle/pure/seq.ts +0 -11
- package/src/prover/isabelle/pure/simplifier.ts +27 -16
- package/src/prover/isabelle/pure/table.ts +2 -33
- package/src/prover/isabelle/pure/tactic.ts +11 -23
- package/src/prover/isabelle/pure/tactical.ts +47 -48
- package/src/prover/isabelle/pure/term-ord.ts +1 -7
- package/src/prover/isabelle/pure/term.ts +1 -44
- package/src/prover/isabelle/pure/thm.ts +26 -48
- package/src/prover/isabelle/pure/type.ts +1 -16
- package/src/prover/isabelle/pure/unify.ts +19 -31
- package/src/prover/isabelle/pure/variable.ts +2 -8
- package/src/prover/isabelle/tla/classical-setup.ts +17 -25
- package/src/prover/isabelle/tla/context.ts +65 -26
- package/src/prover/isabelle/tla/logic-data.ts +1 -1
- package/src/prover/isabelle/tla/logic.ts +53 -32
- package/src/prover/isabelle/tla/simpdata.ts +45 -44
- package/src/prover/isabelle/tools/intuitionistic.ts +28 -21
- package/src/prover/ocaml.ts +4 -7
- package/src/prover/prep/action.ts +33 -66
- package/src/prover/prep/enabled-axioms.ts +22 -20
- package/src/prover/prep/fingerprint.ts +2 -21
- package/src/prover/prep/level-comparison.ts +8 -12
- package/src/prover/prep/md5.ts +0 -2
- package/src/prover/prep/methods.ts +189 -86
- package/src/prover/prep/normalize.ts +42 -37
- package/src/prover/prove-worker.ts +0 -2
- package/src/prover/prove.ts +398 -133
- package/src/prover/ptl/decide.ts +96 -56
- package/src/prover/ptl/encode.ts +15 -38
- package/src/prover/ptl/sat.ts +24 -32
- package/src/prover/ptl/tableau.ts +40 -28
- package/src/prover/smt/arithmetic.ts +310 -0
- package/src/prover/smt/axioms.ts +12 -15
- package/src/prover/smt/context.ts +60 -32
- package/src/prover/smt/data.ts +517 -401
- package/src/prover/smt/encode.ts +155 -85
- package/src/prover/smt/extensionality.ts +5 -13
- package/src/prover/smt/flatten.ts +7 -28
- package/src/prover/smt/format.ts +33 -14
- package/src/prover/smt/instances.ts +7 -11
- package/src/prover/smt/layout.ts +91 -0
- package/src/prover/smt/rewrite.ts +1026 -658
- package/src/prover/smt/simplify.ts +441 -0
- package/src/prover/smt/solver/ackermannize-bv-tactic.ts +61 -0
- package/src/prover/smt/solver/ackr-helper.ts +179 -0
- package/src/prover/smt/solver/ackr-model-converter.ts +105 -0
- package/src/prover/smt/solver/act-cache.ts +0 -16
- package/src/prover/smt/solver/add-bounds-tactic.ts +59 -0
- package/src/prover/smt/solver/aig-tactic.ts +52 -0
- package/src/prover/smt/solver/aig.ts +889 -0
- package/src/prover/smt/solver/arith-rewriter.ts +615 -53
- package/src/prover/smt/solver/arith-terms.ts +121 -0
- package/src/prover/smt/solver/array-decl-plugin.ts +175 -0
- package/src/prover/smt/solver/array-rewriter.ts +309 -0
- package/src/prover/smt/solver/array.ts +1 -3
- package/src/prover/smt/solver/asserted-formulas.ts +87 -58
- package/src/prover/smt/solver/ast-lt.ts +166 -22
- package/src/prover/smt/solver/ast-util.ts +160 -7
- package/src/prover/smt/solver/ast.ts +1424 -180
- package/src/prover/smt/solver/auf-solver.ts +7 -44
- package/src/prover/smt/solver/bit-blast-tactic.ts +582 -0
- package/src/prover/smt/solver/bit-blaster.ts +871 -0
- package/src/prover/smt/solver/bound-manager.ts +196 -0
- package/src/prover/smt/solver/bound-simplifier.ts +600 -0
- package/src/prover/smt/solver/bv-bound-chk.ts +492 -0
- package/src/prover/smt/solver/bv-decl-plugin.ts +338 -0
- package/src/prover/smt/solver/bv-divrem-bounds.ts +95 -0
- package/src/prover/smt/solver/bv-rewriter.ts +1901 -0
- package/src/prover/smt/solver/bv1-blast.ts +214 -0
- package/src/prover/smt/solver/bv2fpa-converter.ts +174 -0
- package/src/prover/smt/solver/bv2int-rewriter.ts +544 -0
- package/src/prover/smt/solver/bv2real-rewriter.ts +533 -0
- package/src/prover/smt/solver/card2bv.ts +110 -0
- package/src/prover/smt/solver/case-split-queue.ts +0 -10
- package/src/prover/smt/solver/cg-table.ts +39 -42
- package/src/prover/smt/solver/check-logic.ts +330 -0
- package/src/prover/smt/solver/clause.ts +0 -27
- package/src/prover/smt/solver/cofactor-elim-term-ite.ts +278 -0
- package/src/prover/smt/solver/conflict-resolution.ts +78 -11
- package/src/prover/smt/solver/context.ts +519 -175
- package/src/prover/smt/solver/ctx-simplify.ts +33 -50
- package/src/prover/smt/solver/ctx-solver-simplify.ts +122 -0
- package/src/prover/smt/solver/datatype-decl-plugin.ts +572 -0
- package/src/prover/smt/solver/datatype-rewriter.ts +82 -0
- package/src/prover/smt/solver/demodulator.ts +786 -0
- package/src/prover/smt/solver/dependent-expr-state.ts +81 -0
- package/src/prover/smt/solver/der.ts +39 -30
- package/src/prover/smt/solver/diff-neq.ts +206 -0
- package/src/prover/smt/solver/distribute-forall.ts +57 -0
- package/src/prover/smt/solver/dom-simplify.ts +511 -0
- package/src/prover/smt/solver/dt2bv-tactic.ts +260 -0
- package/src/prover/smt/solver/dyn-ack.ts +0 -11
- package/src/prover/smt/solver/e-matching.ts +9 -41
- package/src/prover/smt/solver/elim-small-bv-tactic.ts +129 -0
- package/src/prover/smt/solver/elim-uncnstr.ts +545 -0
- package/src/prover/smt/solver/enode.ts +100 -23
- package/src/prover/smt/solver/eq2bv-tactic.ts +218 -0
- package/src/prover/smt/solver/euf/arith-axioms.ts +403 -0
- package/src/prover/smt/solver/euf/arith-internalize.ts +653 -0
- package/src/prover/smt/solver/euf/arith-solver.ts +889 -0
- package/src/prover/smt/solver/euf/array-axioms.ts +527 -0
- package/src/prover/smt/solver/euf/array-internalize.ts +428 -0
- package/src/prover/smt/solver/euf/array-solver.ts +306 -0
- package/src/prover/smt/solver/euf/bv-ackerman.ts +162 -0
- package/src/prover/smt/solver/euf/bv-internalize.ts +748 -0
- package/src/prover/smt/solver/euf/bv-solver.ts +449 -0
- package/src/prover/smt/solver/euf/dt-solver.ts +618 -0
- package/src/prover/smt/solver/euf/egraph.ts +907 -0
- package/src/prover/smt/solver/euf/euf-solver.ts +1205 -0
- package/src/prover/smt/solver/euf/fpa-solver.ts +317 -0
- package/src/prover/smt/solver/euf/mam.ts +1050 -0
- package/src/prover/smt/solver/euf/q-ematch.ts +830 -0
- package/src/prover/smt/solver/euf/q-mbi.ts +587 -0
- package/src/prover/smt/solver/euf/q-model-fixer.ts +296 -0
- package/src/prover/smt/solver/euf/q-solver.ts +361 -0
- package/src/prover/smt/solver/euf/th-solver.ts +335 -0
- package/src/prover/smt/solver/euf/th-solvers.ts +30 -0
- package/src/prover/smt/solver/expr-ref.ts +0 -5
- package/src/prover/smt/solver/expr-safe-replace.ts +26 -7
- package/src/prover/smt/solver/expr2polynomial.ts +146 -0
- package/src/prover/smt/solver/factor.ts +141 -0
- package/src/prover/smt/solver/fd-solver.ts +265 -0
- package/src/prover/smt/solver/fingerprints.ts +15 -26
- package/src/prover/smt/solver/fix-dl-var.ts +148 -0
- package/src/prover/smt/solver/flat-literals.ts +0 -9
- package/src/prover/smt/solver/fm-tactic.ts +884 -0
- package/src/prover/smt/solver/fpa-decl-plugin.ts +618 -0
- package/src/prover/smt/solver/fpa-rewriter.ts +640 -0
- package/src/prover/smt/solver/fpa2bv-converter.ts +2249 -0
- package/src/prover/smt/solver/fpa2bv-rewriter.ts +348 -0
- package/src/prover/smt/solver/fpa2bv-tactic.ts +73 -0
- package/src/prover/smt/solver/goal.ts +176 -28
- package/src/prover/smt/solver/goal2nlsat.ts +189 -0
- package/src/prover/smt/solver/guard-set.ts +219 -0
- package/src/prover/smt/solver/hash.ts +0 -9
- package/src/prover/smt/solver/hashtable.ts +26 -23
- package/src/prover/smt/solver/inf-eps.ts +63 -0
- package/src/prover/smt/solver/inj-axiom.ts +101 -0
- package/src/prover/smt/solver/internalizer.ts +112 -132
- package/src/prover/smt/solver/lackr.ts +381 -0
- package/src/prover/smt/solver/lbool.ts +0 -2
- package/src/prover/smt/solver/lia2card.ts +268 -0
- package/src/prover/smt/solver/lia2pb.ts +154 -0
- package/src/prover/smt/solver/literal.ts +0 -4
- package/src/prover/smt/solver/logic-tactics.ts +345 -0
- package/src/prover/smt/solver/lp/bound-propagator.ts +7 -26
- package/src/prover/smt/solver/lp/constraints.ts +1 -8
- package/src/prover/smt/solver/lp/containers.ts +11 -30
- package/src/prover/smt/solver/lp/core-solver.ts +23 -29
- package/src/prover/smt/solver/lp/cross-nested.ts +5 -20
- package/src/prover/smt/solver/lp/dep-intervals.ts +6 -24
- package/src/prover/smt/solver/lp/dependency.ts +0 -5
- package/src/prover/smt/solver/lp/dioph-eq.ts +8 -103
- package/src/prover/smt/solver/lp/explanation.ts +0 -6
- package/src/prover/smt/solver/lp/gomory.ts +8 -22
- package/src/prover/smt/solver/lp/hnf-cutter.ts +16 -23
- package/src/prover/smt/solver/lp/hnf.ts +10 -28
- package/src/prover/smt/solver/lp/int-cube.ts +17 -39
- package/src/prover/smt/solver/lp/int-solver.ts +3 -35
- package/src/prover/smt/solver/lp/lar-solver.ts +69 -82
- package/src/prover/smt/solver/lp/lar-term.ts +0 -5
- package/src/prover/smt/solver/lp/lp-settings.ts +0 -14
- package/src/prover/smt/solver/lp/maximize-term.ts +76 -52
- package/src/prover/smt/solver/lp/nex-creator.ts +4 -28
- package/src/prover/smt/solver/lp/nex.ts +0 -6
- package/src/prover/smt/solver/lp/nla-backoff.ts +0 -5
- package/src/prover/smt/solver/lp/nla-basics.ts +48 -30
- package/src/prover/smt/solver/lp/nla-core.ts +91 -135
- package/src/prover/smt/solver/lp/nla-divisions.ts +31 -43
- package/src/prover/smt/solver/lp/nla-emonics.ts +3 -21
- package/src/prover/smt/solver/lp/nla-factorization.ts +0 -4
- package/src/prover/smt/solver/lp/nla-grobner.ts +22 -72
- package/src/prover/smt/solver/lp/nla-horner.ts +2 -12
- package/src/prover/smt/solver/lp/nla-intervals.ts +1 -12
- package/src/prover/smt/solver/lp/nla-monomial-bounds.ts +15 -42
- package/src/prover/smt/solver/lp/nla-monotone.ts +1 -6
- package/src/prover/smt/solver/lp/nla-order.ts +0 -13
- package/src/prover/smt/solver/lp/nla-patcher.ts +3 -7
- package/src/prover/smt/solver/lp/nla-powers.ts +220 -0
- package/src/prover/smt/solver/lp/nla-tangents.ts +0 -10
- package/src/prover/smt/solver/lp/nla-throttle.ts +0 -6
- package/src/prover/smt/solver/lp/nla-transcendentals.ts +324 -0
- package/src/prover/smt/solver/lp/nla-types.ts +0 -12
- package/src/prover/smt/solver/lp/nla-var-eqs.ts +4 -26
- package/src/prover/smt/solver/lp/nra-solver.ts +123 -112
- package/src/prover/smt/solver/lp/numeric-pair.ts +0 -4
- package/src/prover/smt/solver/lp/pdd-interval.ts +0 -3
- package/src/prover/smt/solver/lp/pdd-simplifier.ts +1 -14
- package/src/prover/smt/solver/lp/pdd-solver.ts +2 -33
- package/src/prover/smt/solver/lp/pdd.ts +7 -70
- package/src/prover/smt/solver/lp/random-updater.ts +0 -9
- package/src/prover/smt/solver/lp/static-matrix.ts +8 -19
- package/src/prover/smt/solver/lp/union-find.ts +5 -5
- package/src/prover/smt/solver/macro-finder.ts +530 -0
- package/src/prover/smt/solver/mam-compiler.ts +129 -139
- package/src/prover/smt/solver/mam-interpreter.ts +0 -21
- package/src/prover/smt/solver/max-bv-sharing-tactic.ts +17 -0
- package/src/prover/smt/solver/max-cliques.ts +105 -0
- package/src/prover/smt/solver/maxcore.ts +309 -0
- package/src/prover/smt/solver/maximize-ac-sharing.ts +8 -21
- package/src/prover/smt/solver/maxlex.ts +115 -0
- package/src/prover/smt/solver/maxsmt-base.ts +105 -0
- package/src/prover/smt/solver/maxsmt.ts +92 -0
- package/src/prover/smt/solver/mbp/mbp-arith.ts +467 -0
- package/src/prover/smt/solver/mbp/mbp-basic-tg.ts +101 -0
- package/src/prover/smt/solver/mbp/mbp-plugin.ts +287 -0
- package/src/prover/smt/solver/mbp/mbp-qel.ts +48 -0
- package/src/prover/smt/solver/mbp/mbp-solve-plugin.ts +271 -0
- package/src/prover/smt/solver/mbp/mbp-term-graph.ts +606 -0
- package/src/prover/smt/solver/model-based-opt.ts +844 -0
- package/src/prover/smt/solver/model-checker.ts +19 -62
- package/src/prover/smt/solver/model-evaluator.ts +190 -40
- package/src/prover/smt/solver/model-finder.ts +14 -32
- package/src/prover/smt/solver/model-generator.ts +56 -40
- package/src/prover/smt/solver/model-macro-solver.ts +60 -114
- package/src/prover/smt/solver/model-printer.ts +214 -0
- package/src/prover/smt/solver/mpf.ts +711 -0
- package/src/prover/smt/solver/mus.ts +51 -0
- package/src/prover/smt/solver/muz/dl-context.ts +404 -0
- package/src/prover/smt/solver/muz/dl-mk-bit-blast.ts +97 -0
- package/src/prover/smt/solver/muz/dl-mk-coi-filter.ts +167 -0
- package/src/prover/smt/solver/muz/dl-mk-elim-term-ite.ts +125 -0
- package/src/prover/smt/solver/muz/dl-mk-interp-tail-simplifier.ts +299 -0
- package/src/prover/smt/solver/muz/dl-mk-rule-inliner.ts +455 -0
- package/src/prover/smt/solver/muz/dl-mk-slice.ts +340 -0
- package/src/prover/smt/solver/muz/dl-mk-subsumption-checker.ts +163 -0
- package/src/prover/smt/solver/muz/dl-rule-set.ts +273 -0
- package/src/prover/smt/solver/muz/dl-rule-transformer.ts +123 -0
- package/src/prover/smt/solver/muz/dl-rule.ts +496 -0
- package/src/prover/smt/solver/muz/hnf.ts +201 -0
- package/src/prover/smt/solver/muz/horn-subsume-model-converter.ts +176 -0
- package/src/prover/smt/solver/muz/horn-tactic.ts +201 -0
- package/src/prover/smt/solver/muz/rule-properties.ts +337 -0
- package/src/prover/smt/solver/muz/spacer-context.ts +1406 -0
- package/src/prover/smt/solver/muz/spacer-dl-interface.ts +52 -0
- package/src/prover/smt/solver/muz/spacer-generalizers.ts +241 -0
- package/src/prover/smt/solver/muz/spacer-manager.ts +127 -0
- package/src/prover/smt/solver/muz/spacer-pdr.ts +218 -0
- package/src/prover/smt/solver/muz/spacer-prop-solver.ts +333 -0
- package/src/prover/smt/solver/muz/spacer-util.ts +282 -0
- package/src/prover/smt/solver/muz/substitution.ts +203 -0
- package/src/prover/smt/solver/nla2bv-tactic.ts +285 -0
- package/src/prover/smt/solver/nlqsat.ts +484 -0
- package/src/prover/smt/solver/nlsat/algebraic.ts +177 -160
- package/src/prover/smt/solver/nlsat/atoms.ts +24 -24
- package/src/prover/smt/solver/nlsat/evaluator.ts +16 -22
- package/src/prover/smt/solver/nlsat/explain.ts +65 -69
- package/src/prover/smt/solver/nlsat/interval-set.ts +9 -51
- package/src/prover/smt/solver/nlsat/levelwise.ts +48 -135
- package/src/prover/smt/solver/nlsat/mpbq.ts +47 -14
- package/src/prover/smt/solver/nlsat/polynomial.ts +29 -161
- package/src/prover/smt/solver/nlsat/solver.ts +241 -110
- package/src/prover/smt/solver/nlsat/transcendental-eval.ts +310 -0
- package/src/prover/smt/solver/nlsat/transcendentals.ts +367 -0
- package/src/prover/smt/solver/nlsat/types.ts +0 -9
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +1 -47
- package/src/prover/smt/solver/nlsat/upolynomial.ts +10 -93
- package/src/prover/smt/solver/nlsat-tactic.ts +82 -0
- package/src/prover/smt/solver/nnf.ts +107 -60
- package/src/prover/smt/solver/normalize-bounds.ts +53 -0
- package/src/prover/smt/solver/occf.ts +97 -0
- package/src/prover/smt/solver/opt-context.ts +787 -0
- package/src/prover/smt/solver/opt-nlsat.ts +375 -0
- package/src/prover/smt/solver/opt-pareto.ts +282 -0
- package/src/prover/smt/solver/opt-preprocess.ts +101 -0
- package/src/prover/smt/solver/opt-solver.ts +308 -0
- package/src/prover/smt/solver/opt-value.ts +55 -0
- package/src/prover/smt/solver/optsmt.ts +692 -0
- package/src/prover/smt/solver/parallel-tactic.ts +299 -0
- package/src/prover/smt/solver/pattern-inference.ts +21 -26
- package/src/prover/smt/solver/pb-rewriter.ts +284 -0
- package/src/prover/smt/solver/pb2bv-tactic.ts +540 -0
- package/src/prover/smt/solver/poly-rewriter.ts +204 -79
- package/src/prover/smt/solver/probes.ts +512 -0
- package/src/prover/smt/solver/propagate-values.ts +37 -30
- package/src/prover/smt/solver/proto-model.ts +650 -66
- package/src/prover/smt/solver/pull-quant.ts +28 -23
- package/src/prover/smt/solver/purify-arith.ts +632 -0
- package/src/prover/smt/solver/qe-arith-plugin.ts +1098 -0
- package/src/prover/smt/solver/qe-lite-der.ts +2 -31
- package/src/prover/smt/solver/qe-lite-fm.ts +4 -28
- package/src/prover/smt/solver/qe-lite.ts +39 -49
- package/src/prover/smt/solver/qe-mbp.ts +270 -0
- package/src/prover/smt/solver/qe.ts +1498 -0
- package/src/prover/smt/solver/qel.ts +25 -0
- package/src/prover/smt/solver/qi-queue.ts +0 -16
- package/src/prover/smt/solver/qsat.ts +814 -0
- package/src/prover/smt/solver/quant-hoist.ts +196 -0
- package/src/prover/smt/solver/quant-tactics.ts +17 -74
- package/src/prover/smt/solver/quantifier-analyzer.ts +26 -47
- package/src/prover/smt/solver/quantifier-manager.ts +8 -23
- package/src/prover/smt/solver/quasi-macros.ts +243 -0
- package/src/prover/smt/solver/random-gen.ts +0 -2
- package/src/prover/smt/solver/rational.ts +45 -8
- package/src/prover/smt/solver/recfun-decl-plugin.ts +261 -0
- package/src/prover/smt/solver/recfun-rewriter.ts +107 -0
- package/src/prover/smt/solver/reduce-args.ts +225 -0
- package/src/prover/smt/solver/reduce-bv-size.ts +119 -0
- package/src/prover/smt/solver/ref-vector.ts +0 -6
- package/src/prover/smt/solver/relevancy.ts +2 -16
- package/src/prover/smt/solver/rewriter-tpl.ts +52 -129
- package/src/prover/smt/solver/rewriter.ts +477 -120
- package/src/prover/smt/solver/rlimit.ts +39 -21
- package/src/prover/smt/solver/sat/asymm-branch.ts +325 -0
- package/src/prover/smt/solver/sat/big.ts +177 -0
- package/src/prover/smt/solver/sat/clause-use-list.ts +71 -0
- package/src/prover/smt/solver/sat/clause.ts +203 -0
- package/src/prover/smt/solver/sat/cleaner.ts +94 -0
- package/src/prover/smt/solver/sat/config.ts +122 -0
- package/src/prover/smt/solver/sat/consequences.ts +203 -0
- package/src/prover/smt/solver/sat/elim-eqs.ts +142 -0
- package/src/prover/smt/solver/sat/goal2sat.ts +526 -0
- package/src/prover/smt/solver/sat/inc-sat-solver.ts +378 -0
- package/src/prover/smt/solver/sat/model-converter.ts +136 -0
- package/src/prover/smt/solver/sat/pb-constraint.ts +261 -0
- package/src/prover/smt/solver/sat/pb-solver.ts +1577 -0
- package/src/prover/smt/solver/sat/probing.ts +170 -0
- package/src/prover/smt/solver/sat/sat-tactic.ts +43 -0
- package/src/prover/smt/solver/sat/sat2goal.ts +165 -0
- package/src/prover/smt/solver/sat/scc.ts +142 -0
- package/src/prover/smt/solver/sat/simplifier.ts +1618 -0
- package/src/prover/smt/solver/sat/solver.ts +2127 -0
- package/src/prover/smt/solver/sat/var-queue.ts +117 -0
- package/src/prover/smt/solver/sat/watch-list.ts +140 -0
- package/src/prover/smt/solver/search-tree.ts +284 -0
- package/src/prover/smt/solver/seq-axioms.ts +1010 -0
- package/src/prover/smt/solver/seq-decl-plugin.ts +819 -0
- package/src/prover/smt/solver/seq-derive.ts +1301 -0
- package/src/prover/smt/solver/seq-eq-approx.ts +236 -0
- package/src/prover/smt/solver/seq-eq-solver.ts +439 -0
- package/src/prover/smt/solver/seq-factory.ts +89 -0
- package/src/prover/smt/solver/seq-monadic.ts +728 -0
- package/src/prover/smt/solver/seq-range-predicate.ts +235 -0
- package/src/prover/smt/solver/seq-re-rewriter.ts +1170 -0
- package/src/prover/smt/solver/seq-re-util.ts +758 -0
- package/src/prover/smt/solver/seq-regex-bisim.ts +144 -0
- package/src/prover/smt/solver/seq-regex-live.ts +200 -0
- package/src/prover/smt/solver/seq-rewriter.ts +2402 -0
- package/src/prover/smt/solver/seq-skolem.ts +317 -0
- package/src/prover/smt/solver/seq-subset.ts +165 -0
- package/src/prover/smt/solver/seq-view-witness.ts +353 -0
- package/src/prover/smt/solver/smt-consequences.ts +297 -0
- package/src/prover/smt/solver/smt-kernel.ts +83 -0
- package/src/prover/smt/solver/smt-logics.ts +66 -0
- package/src/prover/smt/solver/smt-setup.ts +496 -0
- package/src/prover/smt/solver/smt2-printer.ts +765 -0
- package/src/prover/smt/solver/smtlib-parser.ts +3140 -365
- package/src/prover/smt/solver/smtlib-script.ts +1631 -0
- package/src/prover/smt/solver/solve-eqs.ts +929 -0
- package/src/prover/smt/solver/solver.ts +119 -39
- package/src/prover/smt/solver/sort.ts +1 -5
- package/src/prover/smt/solver/static-features.ts +314 -0
- package/src/prover/smt/solver/sticky-generations.ts +0 -6
- package/src/prover/smt/solver/tactic.ts +1986 -0
- package/src/prover/smt/solver/term-enumeration.ts +205 -0
- package/src/prover/smt/solver/theory-array.ts +1240 -0
- package/src/prover/smt/solver/theory-bv.ts +1200 -0
- package/src/prover/smt/solver/theory-char.ts +355 -0
- package/src/prover/smt/solver/theory-datatype.ts +598 -0
- package/src/prover/smt/solver/theory-finite-set.ts +30 -0
- package/src/prover/smt/solver/theory-fpa.ts +389 -0
- package/src/prover/smt/solver/theory-lra-axioms.ts +55 -25
- package/src/prover/smt/solver/theory-lra-bounds.ts +31 -11
- package/src/prover/smt/solver/theory-lra-final-check.ts +59 -91
- package/src/prover/smt/solver/theory-lra-internalize.ts +94 -53
- package/src/prover/smt/solver/theory-lra-model.ts +23 -53
- package/src/prover/smt/solver/theory-lra-propagate.ts +24 -40
- package/src/prover/smt/solver/theory-lra-state.ts +6 -27
- package/src/prover/smt/solver/theory-lra.ts +188 -8
- package/src/prover/smt/solver/theory-pb.ts +934 -0
- package/src/prover/smt/solver/theory-polymorphism.ts +58 -0
- package/src/prover/smt/solver/theory-recfun.ts +307 -0
- package/src/prover/smt/solver/theory-seq-regex.ts +867 -0
- package/src/prover/smt/solver/theory-seq-solve.ts +1373 -0
- package/src/prover/smt/solver/theory-seq-state.ts +871 -0
- package/src/prover/smt/solver/theory-seq.ts +961 -0
- package/src/prover/smt/solver/theory.ts +189 -0
- package/src/prover/smt/solver/tseitin-cnf.ts +485 -0
- package/src/prover/smt/solver/var-subst.ts +37 -39
- package/src/prover/smt/table.ts +3 -10
- package/src/prover/smt/types.ts +146 -0
- package/src/prover/tlapm/cache.ts +67 -41
- package/src/prover/tlapm/ocaml-marshal.ts +19 -21
- package/src/prover/tlapm/tlapm.ts +21 -20
- package/src/prover/tlapm-library.ts +3208 -0
- package/src/prover/verdict.ts +9 -2
- package/src/prover/zenon/check/check.ts +1 -11
- package/src/prover/zenon/check/definitions.ts +5 -15
- package/src/prover/zenon/check/equality.ts +0 -8
- package/src/prover/zenon/check/functions.ts +0 -4
- package/src/prover/zenon/check/keys.ts +0 -7
- package/src/prover/zenon/check/propositional.ts +0 -3
- package/src/prover/zenon/check/records.ts +1 -6
- package/src/prover/zenon/check/relations.ts +2 -14
- package/src/prover/zenon/check/rewrites.ts +2 -21
- package/src/prover/zenon/check/sets.ts +40 -61
- package/src/prover/zenon/check/terms.ts +1 -19
- package/src/prover/zenon/check/tla.ts +0 -6
- package/src/prover/zenon/decide.ts +10 -19
- package/src/prover/zenon/encode.ts +0 -9
- package/src/prover/zenon/eqrel.ts +2 -15
- package/src/prover/zenon/equality-rules.ts +0 -6
- package/src/prover/zenon/expr.ts +8 -28
- package/src/prover/zenon/index-table.ts +26 -59
- package/src/prover/zenon/isar-case.ts +8 -20
- package/src/prover/zenon/isar.ts +35 -65
- package/src/prover/zenon/limits.ts +0 -4
- package/src/prover/zenon/llproof.ts +2 -22
- package/src/prover/zenon/mltoll.ts +66 -106
- package/src/prover/zenon/node.ts +20 -15
- package/src/prover/zenon/ocaml.ts +1 -17
- package/src/prover/zenon/parse.ts +9 -13
- package/src/prover/zenon/phrase.ts +1 -13
- package/src/prover/zenon/proof.ts +0 -11
- package/src/prover/zenon/propositional-rules.ts +0 -7
- package/src/prover/zenon/rules.ts +2 -8
- package/src/prover/zenon/search.ts +11 -35
- package/src/prover/zenon/tla/functions.ts +59 -33
- package/src/prover/zenon/tla/llproof.ts +67 -78
- package/src/prover/zenon/tla/records.ts +57 -35
- package/src/prover/zenon/tla/rewrites.ts +12 -21
- package/src/prover/zenon/tla/sets.ts +88 -59
- package/src/prover/zenon/tla/terms.ts +0 -8
- package/src/prover/zenon/tla/tla.ts +66 -66
- package/src/randomization.ts +81 -35
- package/src/resolve.ts +67 -185
- package/src/runtime.ts +26 -22
- package/src/sany/builtins.ts +2 -5
- package/src/sany/generation.ts +394 -0
- package/src/sany/generator-def-entries.ts +210 -0
- package/src/sany/generator-definitions.ts +686 -0
- package/src/sany/generator-expressions.ts +1100 -0
- package/src/sany/generator-proofs.ts +662 -0
- package/src/sany/generator.ts +191 -2764
- package/src/sany/levels.ts +5 -35
- package/src/sany/lexer.ts +58 -77
- package/src/sany/linter.ts +0 -10
- package/src/sany/modules.ts +1 -5
- package/src/sany/nodes.ts +5 -43
- package/src/sany/parse-error.ts +39 -117
- package/src/sany/report.ts +32 -69
- package/src/sany/selectors.ts +49 -76
- package/src/sany/source.ts +1 -17
- package/src/sany/xml.ts +35 -117
- package/src/search.ts +671 -169
- package/src/simulate.ts +712 -0
- package/src/spec-description.ts +192 -100
- package/src/standard-definitions.ts +4 -4
- package/src/standard-modules.ts +264 -95
- package/src/state-graph.ts +52 -33
- package/src/subexpressions.ts +69 -52
- package/src/substitution-levels.ts +7 -7
- package/src/successors.ts +267 -100
- package/src/symmetry.ts +35 -27
- package/src/tableau.ts +29 -26
- package/src/tlc/fingerprint.ts +267 -79
- package/src/tlc/jar-data.ts +112 -6
- package/src/tlc/messages.ts +125 -54
- package/src/tlc/order.ts +39 -69
- package/src/tlc/random.ts +37 -49
- package/src/tlc/replay.ts +553 -228
- package/src/tlc/summary.ts +64 -60
- package/src/tlc/tlc-operators.ts +78 -44
- package/src/tlc/tlcext-operators.ts +171 -122
- package/src/tlc/trace-spec.ts +249 -0
- package/src/tlc/value-stream.ts +139 -0
- package/src/tlc/version.ts +1 -4
- package/src/transfer.ts +22 -25
- package/src/typed-tier.ts +6535 -0
- package/src/typescript/actions.ts +479 -0
- package/src/typescript/collections.ts +614 -0
- package/src/typescript/compile.ts +63 -0
- package/src/typescript/context.ts +94 -0
- package/src/typescript/emit.ts +121 -0
- package/src/typescript/expressions.ts +496 -0
- package/src/typescript/formula.ts +154 -0
- package/src/typescript/functions.ts +284 -0
- package/src/typescript/model.ts +162 -0
- package/src/typescript/names.ts +114 -0
- package/src/typescript/program.ts +48 -0
- package/src/typescript/properties.ts +139 -0
- package/src/typescript/scope.ts +112 -0
- package/src/typescript/steps.ts +167 -0
- package/src/typescript/types.ts +171 -0
- package/src/values.ts +832 -484
- package/src/worker.ts +7 -8
- package/src/prover/isabelle/isar/statement.ts +0 -57
- package/src/prover/smt/solver/z3-license.txt +0 -10
- package/src/prover/tlaps-module.ts +0 -510
- package/src/prover/zenon/LICENSE +0 -32
package/src/sany/report.ts
CHANGED
|
@@ -18,29 +18,20 @@ import type { TlcVersion } from "../tlc/version";
|
|
|
18
18
|
interface SanyReport {
|
|
19
19
|
text: string;
|
|
20
20
|
isFailed: boolean;
|
|
21
|
-
// The specification SANY analyzes, which has errors when SANY rejects it.
|
|
22
21
|
specification?: SanySpecification;
|
|
23
22
|
}
|
|
24
23
|
|
|
25
|
-
// Where SANY reads a module from: a file of its own, the file of the root module, which holds the
|
|
26
|
-
// root module's inner modules too, or the files of its standard modules.
|
|
27
24
|
export type SanyModuleOrigin = "file" | "root file" | "standard";
|
|
28
25
|
|
|
29
26
|
export interface SanyReportOptions {
|
|
30
|
-
// The file name SANY's caller gives it, which it prints in its messages about the specification.
|
|
31
27
|
fileName?: string;
|
|
32
|
-
// TLC runs SANY to print the file it parses each module from, as describeFile names it, and each
|
|
33
|
-
// module it analyzes and lints.
|
|
34
28
|
describeFile?: (moduleName: string, origin: SanyModuleOrigin) => string;
|
|
35
|
-
// tla2sany.xml.XMLExporter runs SANY with its validAstSettings, which neither lint the modules
|
|
36
|
-
// nor validate their PlusCal, and prints only SANY's errors.
|
|
37
29
|
isXmlExport?: boolean;
|
|
38
30
|
version?: TlcVersion;
|
|
39
|
-
// The modules TLC adds to the root module's EXTENDS for its post conditions.
|
|
40
31
|
rootExtendees?: string[];
|
|
41
|
-
|
|
32
|
+
suppressedCodes?: number[];
|
|
33
|
+
errorCodes?: number[];
|
|
42
34
|
onPrint?: (text: string) => void;
|
|
43
|
-
// Prints what TLC 1.7.4's SANY prints to its error stream as it goes.
|
|
44
35
|
onPrintError?: (text: string) => void;
|
|
45
36
|
}
|
|
46
37
|
|
|
@@ -54,11 +45,9 @@ interface Validation {
|
|
|
54
45
|
isError: boolean;
|
|
55
46
|
}
|
|
56
47
|
|
|
57
|
-
// ErrorDetails.toString.
|
|
58
48
|
const formatMessage = (message: SanyMessage) =>
|
|
59
49
|
`${formatSanyLocation(message.location)}\n\n${message.text}`;
|
|
60
50
|
|
|
61
|
-
// Errors.toString: the errors and then the warnings of a phase of SANY.
|
|
62
51
|
const formatErrors = (messages: SanyMessage[]) => {
|
|
63
52
|
const errors = messages.filter((message) => !message.isWarning);
|
|
64
53
|
const warnings = messages.filter((message) => message.isWarning);
|
|
@@ -70,7 +59,8 @@ const formatErrors = (messages: SanyMessage[]) => {
|
|
|
70
59
|
].join("");
|
|
71
60
|
};
|
|
72
61
|
|
|
73
|
-
|
|
62
|
+
const RECORD_FIELD_CLASH = 4802;
|
|
63
|
+
|
|
74
64
|
const UNLINTED_MODULES = new Set([
|
|
75
65
|
"FiniteSets",
|
|
76
66
|
"Sequences",
|
|
@@ -83,7 +73,6 @@ const UNLINTED_MODULES = new Set([
|
|
|
83
73
|
"TLC",
|
|
84
74
|
]);
|
|
85
75
|
|
|
86
|
-
// The modules a module and its inner modules extend, other than its inner modules.
|
|
87
76
|
const getExtendees = (module: Module) => {
|
|
88
77
|
const innerNames = new Set<string>();
|
|
89
78
|
const extendees: string[] = [];
|
|
@@ -107,15 +96,11 @@ const parseValidatedModule = (text: string) => {
|
|
|
107
96
|
}
|
|
108
97
|
};
|
|
109
98
|
|
|
110
|
-
// ParseUnit.parseFile: SANY names the specification by the root module once it parses it.
|
|
111
99
|
export const getSanyModuleName = (text: string, version?: TlcVersion) =>
|
|
112
100
|
version === "1.7.4" && getSany174LexicalError(text) !== undefined
|
|
113
101
|
? undefined
|
|
114
102
|
: parseValidatedModule(text)?.name;
|
|
115
103
|
|
|
116
|
-
// What SANY prints while TLC runs it on the specification in rootPath, and whether SANY rejects the
|
|
117
|
-
// specification. loadModule finds the source of the other modules, and SANY's standard modules fill
|
|
118
|
-
// in the rest.
|
|
119
104
|
export const getSanyReport = (
|
|
120
105
|
rootPath: string,
|
|
121
106
|
loadModule: (name: string) => string | undefined,
|
|
@@ -124,10 +109,8 @@ export const getSanyReport = (
|
|
|
124
109
|
const rootName = basename(rootPath, ".tla");
|
|
125
110
|
const standardModules = getSanyStandardModules(options.version);
|
|
126
111
|
const name = options.fileName ?? rootName;
|
|
127
|
-
|
|
128
|
-
const source =
|
|
129
|
-
? readFileSync(rootPath, "utf8")
|
|
130
|
-
: standardModules.get(rootName);
|
|
112
|
+
const isRootFile = existsSync(rootPath);
|
|
113
|
+
const source = isRootFile ? readFileSync(rootPath, "utf8") : standardModules.get(rootName);
|
|
131
114
|
const lines: string[] = [];
|
|
132
115
|
const write = (text: string) => {
|
|
133
116
|
lines.push(text);
|
|
@@ -135,24 +118,18 @@ export const getSanyReport = (
|
|
|
135
118
|
};
|
|
136
119
|
const log = (text: string) => write(`${text}\n`);
|
|
137
120
|
const isTlc174 = options.version === "1.7.4";
|
|
138
|
-
// TLC 1.7.4's XMLExporter discards what SANY prints to ToolIO.out rather than its error stream.
|
|
139
121
|
const isToolOutputDiscarded = isTlc174 && options.isXmlExport;
|
|
140
122
|
const warn = (text: string) => {
|
|
141
123
|
if (!options.isXmlExport) log(text);
|
|
142
124
|
};
|
|
143
125
|
const describeFile = options.describeFile;
|
|
144
|
-
const origins = new Map<string, SanyModuleOrigin>([
|
|
145
|
-
|
|
146
|
-
]);
|
|
147
|
-
const isFailed = { value: false };
|
|
148
|
-
// The messages of SANY's parsing phase, which come from its validation of PlusCal, and whether
|
|
149
|
-
// SANY has printed them and whether one is an error that ends its run before semantic analysis.
|
|
126
|
+
const origins = new Map<string, SanyModuleOrigin>([[rootName, isRootFile ? "file" : "standard"]]);
|
|
127
|
+
let isFailed = false;
|
|
150
128
|
const parseMessages: SanyMessage[] = [];
|
|
151
|
-
|
|
129
|
+
let isParseReported = false;
|
|
130
|
+
let isParseAborted = false;
|
|
152
131
|
const session = createPcalSession(createPcalParams(), log);
|
|
153
132
|
const loadedModules = new Map<string, LoadedModule>();
|
|
154
|
-
// TLC 1.7.4's SpecObj.validateParseUnit prints what it finds, which follows the file SANY parses
|
|
155
|
-
// next, as SANY validates a module once it parses the module or one that extends it.
|
|
156
133
|
const validations: Validation[] = [];
|
|
157
134
|
const printValidations = () =>
|
|
158
135
|
validations
|
|
@@ -160,7 +137,6 @@ export const getSanyReport = (
|
|
|
160
137
|
.forEach((validation) =>
|
|
161
138
|
validation.isError ? options.onPrintError?.(`${validation.text}\n`) : log(validation.text),
|
|
162
139
|
);
|
|
163
|
-
// SpecObj.validateParseUnit: Errors.addMessage drops a message it already has.
|
|
164
140
|
const validate = (moduleName: string) => {
|
|
165
141
|
const loaded = loadedModules.get(moduleName);
|
|
166
142
|
const range = loaded?.module.location.range;
|
|
@@ -173,7 +149,6 @@ export const getSanyReport = (
|
|
|
173
149
|
);
|
|
174
150
|
const isTlaChanged = results.has("TLA_DIVERGENCE_EXISTS");
|
|
175
151
|
const isPcalChanged = results.has("PCAL_DIVERGENCE_EXISTS");
|
|
176
|
-
// Both versions word a change to just one of the algorithm and its translation alike.
|
|
177
152
|
const oneChange =
|
|
178
153
|
isTlaChanged === isPcalChanged
|
|
179
154
|
? undefined
|
|
@@ -205,9 +180,6 @@ export const getSanyReport = (
|
|
|
205
180
|
if (parseMessages.some((message) => message.text === text)) return;
|
|
206
181
|
parseMessages.push({ location: moduleName, text, isWarning });
|
|
207
182
|
};
|
|
208
|
-
// SpecObj.loadSpec validates the root module once it parses, and a module each time SANY
|
|
209
|
-
// resolves another module's EXTENDS of it, which the report does when the generator loads it,
|
|
210
|
-
// and for a module loaded earlier, when the generator loads a module that extends it.
|
|
211
183
|
const loadValidatedModule = (moduleName: string, text: string) => {
|
|
212
184
|
if (options.isXmlExport || loadedModules.has(moduleName)) return;
|
|
213
185
|
const module = parseValidatedModule(text);
|
|
@@ -221,12 +193,10 @@ export const getSanyReport = (
|
|
|
221
193
|
.filter((extendee) => extendee !== moduleName && loadedModules.has(extendee))
|
|
222
194
|
.forEach(validate);
|
|
223
195
|
};
|
|
224
|
-
// SANY.frontEndParse: once SANY has loaded the specification, it prints the warnings of its
|
|
225
|
-
// parsing phase, and when there are errors, every message, and stops.
|
|
226
196
|
const reportParseMessages = () => {
|
|
227
197
|
printValidations();
|
|
228
|
-
if (
|
|
229
|
-
|
|
198
|
+
if (isParseReported) return;
|
|
199
|
+
isParseReported = true;
|
|
230
200
|
const warnings = parseMessages.filter((message) => message.isWarning);
|
|
231
201
|
if (warnings.length > 0) {
|
|
232
202
|
warn(`Warnings (${warnings.length}) during syntax parsing of ${name}:\n\n`);
|
|
@@ -234,13 +204,12 @@ export const getSanyReport = (
|
|
|
234
204
|
}
|
|
235
205
|
if (warnings.length === parseMessages.length) return;
|
|
236
206
|
log(formatErrors(parseMessages));
|
|
237
|
-
isFailed
|
|
238
|
-
|
|
207
|
+
isFailed = true;
|
|
208
|
+
isParseAborted = true;
|
|
239
209
|
};
|
|
240
210
|
const loadSource = (moduleName: string) => {
|
|
241
211
|
const standard = standardModules.get(moduleName);
|
|
242
212
|
const file = loadModule(moduleName);
|
|
243
|
-
// TLC 1.7.4's SANY reads a module only from a file of its own.
|
|
244
213
|
const extracted =
|
|
245
214
|
file === undefined && standard === undefined && source !== undefined && !isTlc174
|
|
246
215
|
? extractModule(source, moduleName)
|
|
@@ -250,13 +219,12 @@ export const getSanyReport = (
|
|
|
250
219
|
moduleName,
|
|
251
220
|
file !== undefined ? "file" : extracted !== undefined ? "root file" : "standard",
|
|
252
221
|
);
|
|
253
|
-
// The standard modules have no PlusCal, and SANY validates an extracted module's own text.
|
|
254
222
|
if (text !== undefined) loadValidatedModule(moduleName, text);
|
|
255
223
|
return text ?? standard;
|
|
256
224
|
};
|
|
257
225
|
const generate = () => {
|
|
258
|
-
// HACK: SANY reports a fatal
|
|
259
|
-
//
|
|
226
|
+
// HACK: SANY reports a fatal parsing error by the exception it throws, so the report catches the
|
|
227
|
+
// TlaSyntaxError the generator throws for one.
|
|
260
228
|
try {
|
|
261
229
|
if (source === undefined) {
|
|
262
230
|
throw new TlaSanyFatalError(`Cannot find source file for module ${name}`, undefined);
|
|
@@ -264,7 +232,6 @@ export const getSanyReport = (
|
|
|
264
232
|
loadValidatedModule(rootName, source);
|
|
265
233
|
return generateSanySpecification(source, loadSource, {
|
|
266
234
|
rootFileName: rootName,
|
|
267
|
-
// XMLExporter gives SANY the file it is asked for, and TLC the name of the module.
|
|
268
235
|
rootFilePath: options.isXmlExport ? `${name.replace(/\.tla$/, "")}.tla` : undefined,
|
|
269
236
|
version: options.version,
|
|
270
237
|
rootExtendees: options.rootExtendees,
|
|
@@ -277,20 +244,16 @@ export const getSanyReport = (
|
|
|
277
244
|
},
|
|
278
245
|
onAnalyze: (moduleName) => {
|
|
279
246
|
reportParseMessages();
|
|
280
|
-
|
|
281
|
-
if ((describeFile || isToolOutputDiscarded) && !parsePhase.isAborted) {
|
|
247
|
+
if ((describeFile || isToolOutputDiscarded) && !isParseAborted) {
|
|
282
248
|
log(`Semantic processing of module ${moduleName}`);
|
|
283
249
|
}
|
|
284
250
|
},
|
|
285
|
-
// SANY.frontEndSemanticAnalysis: after each module, SANY level-checks it if there are no
|
|
286
|
-
// errors yet, then prints every message so far.
|
|
287
251
|
onModule: (module, messages) => {
|
|
288
|
-
if (
|
|
252
|
+
if (isParseAborted) return;
|
|
289
253
|
if (messages.every((message) => message.isWarning))
|
|
290
254
|
checkModuleLevels(module, { messages, isTlc174 });
|
|
291
255
|
if (messages.length === 0) return;
|
|
292
|
-
if (messages.some((message) => !message.isWarning)) isFailed
|
|
293
|
-
// TLC 1.7.4's SANY prints the errors and warnings together.
|
|
256
|
+
if (messages.some((message) => !message.isWarning)) isFailed = true;
|
|
294
257
|
if (isTlc174) return log(`Semantic errors:\n\n${formatErrors(messages)}`);
|
|
295
258
|
const warnings = messages.filter((message) => message.isWarning);
|
|
296
259
|
if (warnings.length > 0) {
|
|
@@ -304,9 +267,7 @@ export const getSanyReport = (
|
|
|
304
267
|
},
|
|
305
268
|
});
|
|
306
269
|
} catch (error) {
|
|
307
|
-
isFailed
|
|
308
|
-
// SANY.frontEndParse turns a Java exception of its validation of PlusCal into a fatal
|
|
309
|
-
// error, printing the exception and its messages so far.
|
|
270
|
+
isFailed = true;
|
|
310
271
|
if (error instanceof PcalRuntimeError) {
|
|
311
272
|
log(`\nFatal errors while parsing TLA+ spec in file ${name}\n`);
|
|
312
273
|
log(error.message);
|
|
@@ -315,8 +276,6 @@ export const getSanyReport = (
|
|
|
315
276
|
}
|
|
316
277
|
if (!(error instanceof TlaSanyFatalError)) throw error;
|
|
317
278
|
const fatal = { location: error.location, text: error.message, isWarning: false };
|
|
318
|
-
// TLC 1.7.4's ParseException.getShortMessage fails on an error at the first token, which has
|
|
319
|
-
// no image.
|
|
320
279
|
const isImageless = isTlc174 && error.parseError?.includes(' and token "" ');
|
|
321
280
|
if (error.parseError !== undefined && !isImageless && !isToolOutputDiscarded) {
|
|
322
281
|
log(error.parseError);
|
|
@@ -328,28 +287,32 @@ export const getSanyReport = (
|
|
|
328
287
|
);
|
|
329
288
|
return;
|
|
330
289
|
}
|
|
331
|
-
// TLC 1.7.4's SANY aborts with an AbortException, and keeps the message as an abort.
|
|
332
290
|
if (isTlc174) {
|
|
333
291
|
log("tla2sany.semantic.AbortException");
|
|
334
292
|
write(`*** Abort messages: 1\n\n${formatMessage(fatal)}\n\n\n`);
|
|
335
293
|
return;
|
|
336
294
|
}
|
|
337
295
|
log(formatMessage(fatal));
|
|
338
|
-
log(formatErrors(
|
|
296
|
+
log(formatErrors(isParseReported ? [fatal] : [...parseMessages, fatal]));
|
|
339
297
|
}
|
|
340
298
|
};
|
|
341
299
|
const specification = generate();
|
|
342
300
|
if (specification !== undefined) reportParseMessages();
|
|
343
|
-
|
|
344
|
-
// its standard modules, then prints the warnings. TLC 1.7.4's SANY has no linter.
|
|
345
|
-
if (specification !== undefined && !isFailed.value && !options.isXmlExport && !isTlc174) {
|
|
301
|
+
if (specification !== undefined && !isFailed && !options.isXmlExport && !isTlc174) {
|
|
346
302
|
const linted = specification.modules.filter((module) => !UNLINTED_MODULES.has(module.name));
|
|
347
303
|
if (describeFile) linted.forEach((module) => log(`Linting of module ${module.name}`));
|
|
348
|
-
|
|
304
|
+
const warnings = options.suppressedCodes?.includes(RECORD_FIELD_CLASH)
|
|
305
|
+
? []
|
|
306
|
+
: linted.flatMap(lintSanyModule);
|
|
307
|
+
const prefix = options.errorCodes?.includes(RECORD_FIELD_CLASH)
|
|
308
|
+
? "Warning treated as error: "
|
|
309
|
+
: "";
|
|
310
|
+
warnings.forEach((warning) => log(`${prefix}${formatMessage(warning)}\n\n\n`));
|
|
311
|
+
if (prefix && warnings.length > 0) isFailed = true;
|
|
349
312
|
}
|
|
350
313
|
return {
|
|
351
314
|
text: lines.join(""),
|
|
352
|
-
isFailed
|
|
353
|
-
specification:
|
|
315
|
+
isFailed,
|
|
316
|
+
specification: isParseAborted ? undefined : specification,
|
|
354
317
|
};
|
|
355
318
|
};
|