tla-ts 0.0.10-dev.63a6693bd → 0.0.10-dev.6b2a6741a
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 +3 -3
- package/dist/compile.js +1 -1
- package/dist/deciders.cjs +41 -37
- package/dist/deciders.js +45 -41
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +5 -1
- package/dist/index.d.ts +5 -1
- 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 +2682 -426
- package/dist/prove.js +2679 -423
- package/dist/run.cjs +43 -42
- package/dist/run.js +44 -43
- package/dist/tlapm.cjs +1 -1
- package/dist/tlapm.js +1 -1
- package/dist/transfer.cjs +43 -40
- package/dist/transfer.js +43 -40
- package/dist/worker.cjs +7 -7
- package/dist/worker.js +7 -7
- package/package.json +1 -1
- package/src/ast.ts +4 -3
- package/src/bags.ts +46 -28
- package/src/check-trace.ts +2 -16
- package/src/check.ts +349 -91
- package/src/cli/runtime-invariants.ts +20 -56
- package/src/cli/tlapm.ts +424 -62
- package/src/cli/tlc-arguments.ts +2 -2
- package/src/cli/tlc-output.ts +4 -5
- package/src/cli/tlc-usage.ts +0 -1
- package/src/cli/tlc.ts +26 -7
- package/src/cli/xml-exporter.ts +1 -1
- package/src/codegen.ts +9 -5
- package/src/dependencies.ts +72 -11
- package/src/dfid.ts +9 -2
- package/src/environment.ts +65 -36
- package/src/errors.ts +38 -3
- package/src/evaluate.ts +92 -32
- package/src/exit-codes.ts +5 -2
- package/src/instances.ts +5 -5
- package/src/java-overrides.ts +2 -2
- package/src/levels.ts +138 -90
- package/src/lexer.ts +5 -3
- package/src/liveness-checker.ts +572 -204
- package/src/liveness.ts +47 -32
- package/src/obligations/action.ts +10 -6
- package/src/obligations/anonymize.ts +33 -14
- package/src/obligations/enabled-axioms.ts +218 -0
- package/src/obligations/equality.ts +1 -3
- package/src/obligations/expression.ts +18 -6
- package/src/obligations/format.ts +0 -2
- package/src/obligations/generate.ts +22 -17
- package/src/obligations/index.ts +37 -7
- package/src/obligations/levels.ts +24 -11
- package/src/obligations/module.ts +1 -3
- package/src/obligations/normalize.ts +25 -17
- package/src/obligations/operators.ts +0 -2
- package/src/obligations/pragma.ts +53 -16
- package/src/obligations/printer.ts +48 -18
- package/src/obligations/proof.ts +3 -2
- package/src/obligations/regroup.ts +0 -2
- package/src/obligations/simplify.ts +17 -7
- package/src/obligations/source.ts +71 -17
- package/src/obligations/subexpression.ts +45 -18
- package/src/obligations/substitution.ts +1 -3
- package/src/obligations/temporal.ts +0 -2
- package/src/obligations/tuples.ts +0 -2
- package/src/parallel-worker.ts +8 -2
- package/src/parallel.ts +7 -2
- package/src/parser.ts +664 -287
- package/src/pretty-print.ts +1 -1
- package/src/prover/deciders.ts +11 -8
- package/src/prover/isabelle/decide.ts +3 -25
- package/src/prover/isabelle/encode.ts +71 -41
- 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 +149 -3
- package/src/prover/isabelle/isar/method.ts +506 -198
- package/src/prover/isabelle/isar/proof.ts +570 -14
- package/src/prover/isabelle/isar/rule-cases.ts +226 -0
- package/src/prover/isabelle/isar/theory.ts +479 -69
- package/src/prover/isabelle/isar/toplevel.ts +331 -0
- package/src/prover/isabelle/isar/type-check.ts +83 -8
- package/src/prover/isabelle/provers/blast/blast.ts +0 -2
- 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 +1 -3
- package/src/prover/isabelle/provers/classical.ts +45 -20
- package/src/prover/isabelle/provers/hypsubst.ts +2 -4
- package/src/prover/isabelle/pure/bicompose.ts +0 -2
- package/src/prover/isabelle/pure/consts.ts +0 -2
- package/src/prover/isabelle/pure/conv.ts +0 -2
- package/src/prover/isabelle/pure/drule.ts +63 -4
- 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 +0 -2
- 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 +0 -2
- package/src/prover/isabelle/pure/rewriter.ts +4 -11
- 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 +0 -2
- package/src/prover/isabelle/pure/tactic.ts +0 -2
- package/src/prover/isabelle/pure/tactical.ts +0 -2
- package/src/prover/isabelle/pure/term-ord.ts +0 -2
- package/src/prover/isabelle/pure/term.ts +3 -5
- package/src/prover/isabelle/pure/thm.ts +0 -2
- 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 +1 -2
- package/src/prover/isabelle/tla/context.ts +51 -9
- package/src/prover/isabelle/tla/logic-data.ts +1 -1
- package/src/prover/isabelle/tla/logic.ts +40 -1
- package/src/prover/isabelle/tla/simpdata.ts +0 -2
- package/src/prover/isabelle/tools/intuitionistic.ts +28 -12
- package/src/prover/ocaml.ts +4 -1
- package/src/prover/prep/action.ts +19 -12
- package/src/prover/prep/enabled-axioms.ts +11 -2
- package/src/prover/prep/md5.ts +26 -29
- package/src/prover/prep/methods.ts +159 -50
- package/src/prover/prep/normalize.ts +38 -9
- package/src/prover/prove.ts +343 -65
- 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 +42 -6
- package/src/prover/smt/data.ts +191 -84
- package/src/prover/smt/encode.ts +122 -43
- 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 +483 -116
- 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 +93 -15
- package/src/prover/smt/solver/ast-lt.ts +165 -11
- package/src/prover/smt/solver/ast-util.ts +160 -2
- package/src/prover/smt/solver/ast.ts +1449 -41
- package/src/prover/smt/solver/auf-solver.ts +0 -1
- 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 +341 -0
- package/src/prover/smt/solver/bv-divrem-bounds.ts +95 -0
- package/src/prover/smt/solver/bv-rewriter.ts +1901 -0
- package/src/prover/smt/solver/bv1-blast.ts +214 -0
- package/src/prover/smt/solver/bv2fpa-converter.ts +174 -0
- package/src/prover/smt/solver/bv2int-rewriter.ts +544 -0
- package/src/prover/smt/solver/bv2real-rewriter.ts +533 -0
- package/src/prover/smt/solver/card2bv.ts +109 -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 +533 -114
- package/src/prover/smt/solver/ctx-simplify.ts +21 -12
- 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 +205 -0
- package/src/prover/smt/solver/distribute-forall.ts +57 -0
- package/src/prover/smt/solver/dom-simplify.ts +511 -0
- package/src/prover/smt/solver/dt2bv-tactic.ts +260 -0
- package/src/prover/smt/solver/dyn-ack.ts +0 -1
- package/src/prover/smt/solver/e-matching.ts +6 -7
- package/src/prover/smt/solver/elim-small-bv-tactic.ts +129 -0
- package/src/prover/smt/solver/elim-uncnstr.ts +542 -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 +901 -0
- package/src/prover/smt/solver/euf/euf-solver.ts +1204 -0
- package/src/prover/smt/solver/euf/fpa-solver.ts +317 -0
- package/src/prover/smt/solver/euf/mam.ts +1046 -0
- package/src/prover/smt/solver/euf/q-ematch.ts +829 -0
- package/src/prover/smt/solver/euf/q-mbi.ts +587 -0
- package/src/prover/smt/solver/euf/q-model-fixer.ts +296 -0
- package/src/prover/smt/solver/euf/q-solver.ts +361 -0
- package/src/prover/smt/solver/euf/th-solver.ts +328 -0
- package/src/prover/smt/solver/euf/th-solvers.ts +30 -0
- package/src/prover/smt/solver/expr-ref.ts +0 -1
- package/src/prover/smt/solver/expr-safe-replace.ts +26 -2
- package/src/prover/smt/solver/expr2polynomial.ts +271 -0
- package/src/prover/smt/solver/factor.ts +163 -0
- package/src/prover/smt/solver/fd-solver.ts +267 -0
- package/src/prover/smt/solver/fingerprints.ts +15 -15
- package/src/prover/smt/solver/fix-dl-var.ts +147 -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 +639 -0
- package/src/prover/smt/solver/fpa2bv-converter.ts +2251 -0
- package/src/prover/smt/solver/fpa2bv-rewriter.ts +349 -0
- package/src/prover/smt/solver/fpa2bv-tactic.ts +73 -0
- package/src/prover/smt/solver/goal.ts +177 -15
- package/src/prover/smt/solver/goal2nlsat.ts +216 -0
- package/src/prover/smt/solver/guard-set.ts +219 -0
- package/src/prover/smt/solver/hash.ts +0 -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 +109 -36
- 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 +0 -2
- 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 +0 -1
- 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 +66 -11
- 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 +167 -85
- 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 +163 -99
- 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 -290
- 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 +118 -88
- 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 +17 -26
- package/src/prover/smt/solver/model-evaluator.ts +188 -12
- package/src/prover/smt/solver/model-finder.ts +0 -1
- package/src/prover/smt/solver/model-generator.ts +59 -30
- package/src/prover/smt/solver/model-macro-solver.ts +38 -27
- package/src/prover/smt/solver/model-printer.ts +214 -0
- package/src/prover/smt/solver/mpf.ts +709 -0
- package/src/prover/smt/solver/mus.ts +50 -0
- package/src/prover/smt/solver/muz/dl-context.ts +410 -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 +1404 -0
- package/src/prover/smt/solver/muz/spacer-dl-interface.ts +52 -0
- package/src/prover/smt/solver/muz/spacer-generalizers.ts +241 -0
- package/src/prover/smt/solver/muz/spacer-manager.ts +127 -0
- package/src/prover/smt/solver/muz/spacer-pdr.ts +219 -0
- package/src/prover/smt/solver/muz/spacer-prop-solver.ts +333 -0
- package/src/prover/smt/solver/muz/spacer-util.ts +282 -0
- package/src/prover/smt/solver/muz/substitution.ts +203 -0
- package/src/prover/smt/solver/nla2bv-tactic.ts +285 -0
- package/src/prover/smt/solver/nlqsat.ts +484 -0
- package/src/prover/smt/solver/nlsat/algebraic.ts +305 -88
- package/src/prover/smt/solver/nlsat/atoms.ts +52 -35
- package/src/prover/smt/solver/nlsat/evaluator.ts +0 -1
- package/src/prover/smt/solver/nlsat/explain.ts +424 -211
- package/src/prover/smt/solver/nlsat/interval-set.ts +1 -2
- package/src/prover/smt/solver/nlsat/levelwise.ts +460 -241
- package/src/prover/smt/solver/nlsat/mpbq.ts +45 -1
- package/src/prover/smt/solver/nlsat/polynomial.ts +2366 -683
- package/src/prover/smt/solver/nlsat/solver.ts +282 -69
- package/src/prover/smt/solver/nlsat/transcendental-eval.ts +310 -0
- package/src/prover/smt/solver/nlsat/transcendentals.ts +391 -0
- package/src/prover/smt/solver/nlsat/types.ts +0 -2
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +8 -7
- package/src/prover/smt/solver/nlsat/upolynomial.ts +41 -20
- 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 +792 -0
- package/src/prover/smt/solver/opt-nlsat.ts +386 -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 +311 -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 +281 -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 +511 -0
- package/src/prover/smt/solver/propagate-values.ts +37 -21
- package/src/prover/smt/solver/proto-model.ts +650 -17
- 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 +1096 -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 +1499 -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 +9 -10
- package/src/prover/smt/solver/quantifier-manager.ts +25 -24
- 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 +262 -0
- package/src/prover/smt/solver/recfun-rewriter.ts +107 -0
- package/src/prover/smt/solver/reduce-args.ts +225 -0
- package/src/prover/smt/solver/reduce-bv-size.ts +119 -0
- package/src/prover/smt/solver/ref-vector.ts +0 -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 +44 -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 +2105 -0
- package/src/prover/smt/solver/sat/var-queue.ts +117 -0
- package/src/prover/smt/solver/sat/watch-list.ts +140 -0
- package/src/prover/smt/solver/search-tree.ts +284 -0
- package/src/prover/smt/solver/seq-axioms.ts +995 -0
- package/src/prover/smt/solver/seq-decl-plugin.ts +819 -0
- package/src/prover/smt/solver/seq-derive.ts +1298 -0
- package/src/prover/smt/solver/seq-eq-approx.ts +236 -0
- package/src/prover/smt/solver/seq-eq-solver.ts +439 -0
- package/src/prover/smt/solver/seq-factory.ts +89 -0
- package/src/prover/smt/solver/seq-monadic.ts +730 -0
- package/src/prover/smt/solver/seq-range-predicate.ts +235 -0
- package/src/prover/smt/solver/seq-re-rewriter.ts +1171 -0
- package/src/prover/smt/solver/seq-re-util.ts +758 -0
- package/src/prover/smt/solver/seq-regex-bisim.ts +144 -0
- package/src/prover/smt/solver/seq-regex-live.ts +200 -0
- package/src/prover/smt/solver/seq-rewriter.ts +2404 -0
- package/src/prover/smt/solver/seq-skolem.ts +294 -0
- package/src/prover/smt/solver/seq-subset.ts +165 -0
- package/src/prover/smt/solver/seq-view-witness.ts +353 -0
- package/src/prover/smt/solver/smt-consequences.ts +297 -0
- package/src/prover/smt/solver/smt-kernel.ts +90 -0
- package/src/prover/smt/solver/smt-logics.ts +66 -0
- package/src/prover/smt/solver/smt-setup.ts +544 -0
- package/src/prover/smt/solver/smt2-printer.ts +765 -0
- package/src/prover/smt/solver/smtlib-parser.ts +3228 -327
- package/src/prover/smt/solver/smtlib-script.ts +1843 -0
- package/src/prover/smt/solver/solve-eqs.ts +923 -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 +2012 -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 -5
- package/src/prover/smt/solver/theory-lra-final-check.ts +56 -71
- package/src/prover/smt/solver/theory-lra-internalize.ts +89 -11
- package/src/prover/smt/solver/theory-lra-model.ts +20 -35
- package/src/prover/smt/solver/theory-lra-propagate.ts +24 -28
- package/src/prover/smt/solver/theory-lra-state.ts +6 -22
- package/src/prover/smt/solver/theory-lra.ts +188 -2
- package/src/prover/smt/solver/theory-pb.ts +933 -0
- package/src/prover/smt/solver/theory-polymorphism.ts +58 -0
- package/src/prover/smt/solver/theory-recfun.ts +307 -0
- package/src/prover/smt/solver/theory-seq-regex.ts +867 -0
- package/src/prover/smt/solver/theory-seq-solve.ts +1373 -0
- package/src/prover/smt/solver/theory-seq-state.ts +852 -0
- package/src/prover/smt/solver/theory-seq.ts +961 -0
- package/src/prover/smt/solver/theory.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 +37 -16
- package/src/prover/tlapm-library.ts +3208 -0
- package/src/prover/verdict.ts +2 -0
- package/src/prover/zenon/decide.ts +10 -7
- package/src/prover/zenon/encode.ts +0 -2
- package/src/prover/zenon/eqrel.ts +0 -2
- package/src/prover/zenon/equality-rules.ts +24 -2
- package/src/prover/zenon/expr.ts +21 -2
- package/src/prover/zenon/index-table.ts +7 -4
- package/src/prover/zenon/isar-case.ts +1 -3
- package/src/prover/zenon/isar.ts +2 -4
- package/src/prover/zenon/llproof.ts +0 -2
- package/src/prover/zenon/mltoll.ts +0 -2
- package/src/prover/zenon/node.ts +20 -5
- package/src/prover/zenon/parse.ts +6 -2
- package/src/prover/zenon/phrase.ts +1 -3
- 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 +7 -5
- package/src/prover/zenon/tla/functions.ts +0 -2
- package/src/prover/zenon/tla/llproof.ts +0 -2
- package/src/prover/zenon/tla/records.ts +0 -2
- package/src/prover/zenon/tla/rewrites.ts +0 -2
- package/src/prover/zenon/tla/sets.ts +7 -8
- package/src/prover/zenon/tla/terms.ts +0 -2
- package/src/prover/zenon/tla/tla.ts +0 -2
- package/src/resolve.ts +625 -189
- package/src/runtime.ts +7 -1
- package/src/sany/builtins.ts +10 -10
- package/src/sany/generation.ts +2 -13
- package/src/sany/generator-definitions.ts +3 -1
- package/src/sany/generator-expressions.ts +36 -30
- package/src/sany/generator-proofs.ts +5 -3
- package/src/sany/generator.ts +2 -1
- package/src/sany/levels.ts +0 -2
- package/src/sany/lexer.ts +3 -3
- package/src/sany/linter.ts +0 -2
- package/src/sany/modules.ts +4 -2
- package/src/sany/nodes.ts +1 -1
- package/src/sany/selectors.ts +11 -6
- package/src/sany/xml.ts +2 -3
- package/src/search.ts +209 -56
- package/src/simulate.ts +3 -0
- package/src/spec-description.ts +2 -2
- package/src/standard-definitions.ts +4 -0
- package/src/state-graph.ts +0 -2
- package/src/subexpressions.ts +265 -94
- package/src/successors.ts +2 -1
- package/src/symmetry.ts +3 -3
- package/src/tableau.ts +2 -2
- package/src/tlc/fingerprint.ts +81 -9
- package/src/tlc/jar-data.ts +10 -0
- package/src/tlc/messages.ts +3 -3
- package/src/tlc/order.ts +14 -3
- package/src/tlc/summary.ts +29 -14
- package/src/tlc/tlc-operators.ts +3 -1
- package/src/tlc/tlcext-operators.ts +61 -16
- package/src/tlc/trace-spec.ts +5 -5
- package/src/typed-tier.ts +6541 -0
- package/src/typescript/types.ts +2 -2
- package/src/values.ts +46 -27
- 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
|
@@ -1,9 +1,8 @@
|
|
|
1
|
-
// A port of tlapm's Proof.Simplify.
|
|
2
|
-
|
|
3
1
|
import { TlaProofError } from "../errors";
|
|
4
2
|
import { isEqualExpr } from "./equality";
|
|
5
3
|
import {
|
|
6
4
|
AT_NOWHERE,
|
|
5
|
+
adjoinAll,
|
|
7
6
|
applyBuiltin,
|
|
8
7
|
at,
|
|
9
8
|
getDefinitionHyp,
|
|
@@ -18,6 +17,7 @@ import {
|
|
|
18
17
|
type Builtin,
|
|
19
18
|
type Expr,
|
|
20
19
|
type Hyp,
|
|
20
|
+
type Locus,
|
|
21
21
|
type Sequent,
|
|
22
22
|
type Time,
|
|
23
23
|
} from "./expression";
|
|
@@ -33,15 +33,20 @@ import {
|
|
|
33
33
|
substituteBounds,
|
|
34
34
|
substituteExpr,
|
|
35
35
|
} from "./substitution";
|
|
36
|
+
import { getTime } from "./temporal";
|
|
36
37
|
|
|
37
38
|
const getProps = (from: Step) => ({
|
|
38
39
|
location: from.location,
|
|
39
40
|
step: from.step,
|
|
40
41
|
method: from.method,
|
|
42
|
+
isSuppressed: from.isSuppressed,
|
|
41
43
|
});
|
|
42
44
|
|
|
43
45
|
const getLevel = (step: StepNumber | undefined) => step?.level ?? 0;
|
|
44
46
|
|
|
47
|
+
const getVisibleFact = (context: Hyp[], expression: Expr, location: Locus | undefined) =>
|
|
48
|
+
getFact(expression, "Visible", getTime(adjoinAll(undefined, context), expression), location);
|
|
49
|
+
|
|
45
50
|
const isBinary = (
|
|
46
51
|
expression: Expr,
|
|
47
52
|
builtin: Builtin,
|
|
@@ -88,7 +93,7 @@ const getRemainingBounds = (first: Bound, rest: Bound[]): Bound[] => {
|
|
|
88
93
|
};
|
|
89
94
|
|
|
90
95
|
const getWitnessProof = (step: Step, sideFacts: Expr[]): Proof => {
|
|
91
|
-
if (sideFacts.length === 0) return { kind: "Obvious", ...getProps(step) };
|
|
96
|
+
if (sideFacts.length === 0 || step.isSuppressed) return { kind: "Obvious", ...getProps(step) };
|
|
92
97
|
const steps = sideFacts.map((item, index): Step => {
|
|
93
98
|
const active = shiftExpr(2 * index + 2, item);
|
|
94
99
|
return {
|
|
@@ -255,6 +260,7 @@ export const createSimplifier = (counter: Counter) => {
|
|
|
255
260
|
isOnly: false,
|
|
256
261
|
location: fact.location,
|
|
257
262
|
useLocation: proof.location,
|
|
263
|
+
isSuppressed: proof.isSuppressed,
|
|
258
264
|
}));
|
|
259
265
|
const forget: Step[] = proof.isOnly
|
|
260
266
|
? [{ kind: "Forget", count: usable.facts.length, location: proof.location }]
|
|
@@ -269,6 +275,7 @@ export const createSimplifier = (counter: Counter) => {
|
|
|
269
275
|
location: proof.location,
|
|
270
276
|
step: getAnonymous(level),
|
|
271
277
|
method: proof.method,
|
|
278
|
+
isSuppressed: proof.isSuppressed,
|
|
272
279
|
};
|
|
273
280
|
return {
|
|
274
281
|
kind: "Steps",
|
|
@@ -324,6 +331,7 @@ export const createSimplifier = (counter: Counter) => {
|
|
|
324
331
|
location: step.location,
|
|
325
332
|
step: step.step,
|
|
326
333
|
method: step.method,
|
|
334
|
+
isSuppressed: step.isSuppressed,
|
|
327
335
|
};
|
|
328
336
|
const simplified = simplify(context, goal, byProof, time);
|
|
329
337
|
if (simplified.kind !== "Steps")
|
|
@@ -371,7 +379,7 @@ export const createSimplifier = (counter: Counter) => {
|
|
|
371
379
|
const connective = exposeConnective(context, goal);
|
|
372
380
|
const isImplication = isBinary(connective, "Implies");
|
|
373
381
|
const sequent: Sequent = {
|
|
374
|
-
context: [
|
|
382
|
+
context: [getVisibleFact(context, step.expression, step.location)],
|
|
375
383
|
active: isImplication ? shiftExpr(1, connective.args[1]) : connective,
|
|
376
384
|
};
|
|
377
385
|
const proof: Proof = isImplication
|
|
@@ -418,7 +426,7 @@ export const createSimplifier = (counter: Counter) => {
|
|
|
418
426
|
const assertion: Step = {
|
|
419
427
|
kind: "Assert",
|
|
420
428
|
sequent: {
|
|
421
|
-
context: [
|
|
429
|
+
context: [getVisibleFact(context, step.expression, step.location)],
|
|
422
430
|
active: shiftExpr(1, goal),
|
|
423
431
|
},
|
|
424
432
|
proof: step.proof,
|
|
@@ -446,9 +454,10 @@ export const createSimplifier = (counter: Counter) => {
|
|
|
446
454
|
);
|
|
447
455
|
const shifted = shiftExpr(2, existential);
|
|
448
456
|
if (shifted.kind !== "Quant") throw new TlaProofError("Proof.Simplify.simplify_step/PICK");
|
|
457
|
+
const boundHyps = getBoundHyps(shifted.bounds);
|
|
449
458
|
const hyps = [
|
|
450
|
-
...
|
|
451
|
-
|
|
459
|
+
...boundHyps,
|
|
460
|
+
getVisibleFact([...asserted.context, ...boundHyps], shifted.body, shifted.body.location),
|
|
452
461
|
];
|
|
453
462
|
const sufficed = simplifyStep(
|
|
454
463
|
asserted.context,
|
|
@@ -529,6 +538,7 @@ export const createSimplifier = (counter: Counter) => {
|
|
|
529
538
|
kind: "Apply",
|
|
530
539
|
operator: { kind: "Internal", builtin: "Subseteq" },
|
|
531
540
|
args: [goalDomain.expression, domain.expression],
|
|
541
|
+
location: bound.location,
|
|
532
542
|
} satisfies Expr,
|
|
533
543
|
...sideFacts,
|
|
534
544
|
]
|
|
@@ -16,6 +16,7 @@ import { TlaProofError, TlaUnsupportedError } from "../errors";
|
|
|
16
16
|
import {
|
|
17
17
|
at,
|
|
18
18
|
getFact,
|
|
19
|
+
mapChildren,
|
|
19
20
|
type Bound,
|
|
20
21
|
type Builtin,
|
|
21
22
|
type Defn,
|
|
@@ -27,7 +28,7 @@ import {
|
|
|
27
28
|
type Sequent,
|
|
28
29
|
} from "./expression";
|
|
29
30
|
import type { ModuleUnit, Mule } from "./module";
|
|
30
|
-
import { findPragma, readNewMethod, readOldMethod } from "./pragma";
|
|
31
|
+
import { findPragma, findSuppressPragma, readNewMethod, readOldMethod } from "./pragma";
|
|
31
32
|
import {
|
|
32
33
|
expandChoose,
|
|
33
34
|
expandFcn,
|
|
@@ -103,6 +104,7 @@ const mergeLoci = (left: Locus | undefined, right: Locus | undefined): Locus | u
|
|
|
103
104
|
};
|
|
104
105
|
|
|
105
106
|
const TUPLY_FAILURE = "use instead the class`E_visit.iter_concrete`";
|
|
107
|
+
const STEP_TUPLY_FAILURE = "use instead the class `P_visit.map_concrete`";
|
|
106
108
|
|
|
107
109
|
const isDitto = (bounds: QuantifierExpression["bounds"], index: number) =>
|
|
108
110
|
index > 0 && bounds[index - 1].set === bounds[index].set;
|
|
@@ -136,6 +138,11 @@ export const createModuleConverter = (
|
|
|
136
138
|
const getMethod = (range: SourceRange | undefined) =>
|
|
137
139
|
range && readOldMethod(lines, { line: range.end.line - 1, column: range.end.column });
|
|
138
140
|
|
|
141
|
+
const getSuppressPragma = (keyword: SourceRange) =>
|
|
142
|
+
findSuppressPragma(lines, { line: keyword.start.line - 1, column: keyword.start.column - 1 });
|
|
143
|
+
|
|
144
|
+
const isSuppressed = (keyword: SourceRange) => getSuppressPragma(keyword) !== undefined;
|
|
145
|
+
|
|
139
146
|
const withMethod = (range: SourceRange) => {
|
|
140
147
|
const method = getMethod(range);
|
|
141
148
|
const location = getRangeLocus(range);
|
|
@@ -211,12 +218,14 @@ export const createModuleConverter = (
|
|
|
211
218
|
bounds.map((bound, index) => {
|
|
212
219
|
if (bound.pattern.kind === "Tuple")
|
|
213
220
|
throw new TlaProofError("Unexpected tuple declaration", { failure: TUPLY_FAILURE });
|
|
221
|
+
const range = bound.pattern.ranges?.[0];
|
|
214
222
|
return {
|
|
215
223
|
name: bound.pattern.name,
|
|
216
224
|
level: "Constant",
|
|
217
225
|
domain: isDitto(bounds, index)
|
|
218
226
|
? { kind: "Ditto" }
|
|
219
227
|
: { kind: "Domain", expression: convertExpression(bound.set, isExcept) },
|
|
228
|
+
...(range && { location: getRangeLocus(range) }),
|
|
220
229
|
};
|
|
221
230
|
});
|
|
222
231
|
|
|
@@ -235,6 +244,13 @@ export const createModuleConverter = (
|
|
|
235
244
|
};
|
|
236
245
|
});
|
|
237
246
|
|
|
247
|
+
// P_visit.map fails on the tuples a TAKE or PICK declares before the expression visitors do.
|
|
248
|
+
const convertStepBounds = (body: { names: string[]; bounds: QuantifierExpression["bounds"] }) => {
|
|
249
|
+
if (body.bounds.some((bound) => bound.pattern.kind === "Tuple"))
|
|
250
|
+
throw new TlaProofError("Unexpected tuple declaration", { failure: STEP_TUPLY_FAILURE });
|
|
251
|
+
return body.names.length > 0 ? getUnbounded(body.names) : convertBounds(body.bounds, false);
|
|
252
|
+
};
|
|
253
|
+
|
|
238
254
|
const expandTuples = (expanded: Expr, location: Locus) => {
|
|
239
255
|
if (!isExpandingTuples)
|
|
240
256
|
throw new TlaProofError("Unexpected tuple declaration", { failure: TUPLY_FAILURE });
|
|
@@ -295,9 +311,18 @@ export const createModuleConverter = (
|
|
|
295
311
|
const args = expression.args.map(recurse);
|
|
296
312
|
const operator = lookupOperator(expression.operator);
|
|
297
313
|
if (operator.fixity !== "Nonfix") {
|
|
314
|
+
const operatorLocus = getPointLocus(expression.location, 1);
|
|
315
|
+
const first = args[0]?.location;
|
|
316
|
+
const isNonfix =
|
|
317
|
+
args.length === 2 &&
|
|
318
|
+
first !== undefined &&
|
|
319
|
+
(operatorLocus.startLine < first.startLine ||
|
|
320
|
+
(operatorLocus.startLine === first.startLine &&
|
|
321
|
+
operatorLocus.startColumn < first.startColumn));
|
|
322
|
+
const operands = getOperatorLocus(args, operator.fixity);
|
|
298
323
|
return at(
|
|
299
324
|
{ kind: "Apply", operator: convertOperator(expression.operator, undefined), args },
|
|
300
|
-
{ location:
|
|
325
|
+
{ location: isNonfix ? mergeLoci(operatorLocus, operands) : operands },
|
|
301
326
|
);
|
|
302
327
|
}
|
|
303
328
|
return convertName(expression.operator, args, location, expression.argumentCounts);
|
|
@@ -582,22 +607,39 @@ export const createModuleConverter = (
|
|
|
582
607
|
{ location },
|
|
583
608
|
);
|
|
584
609
|
case "WeakFairness":
|
|
585
|
-
case "StrongFairness":
|
|
610
|
+
case "StrongFairness": {
|
|
611
|
+
// tlapm lexes WF_vars as WF_ and vars, both located at the whole word.
|
|
612
|
+
const isGlued = /\w/.test(lines[location.startLine - 1]?.[location.startColumn + 2] ?? "");
|
|
613
|
+
const moveGluedStart = (inner: Expr): Expr =>
|
|
614
|
+
isGlued &&
|
|
615
|
+
inner.location?.startLine === location.startLine &&
|
|
616
|
+
inner.location.startColumn === location.startColumn + 3
|
|
617
|
+
? mapChildren(
|
|
618
|
+
{ ...inner, location: { ...inner.location, startColumn: location.startColumn } },
|
|
619
|
+
moveGluedStart,
|
|
620
|
+
)
|
|
621
|
+
: inner;
|
|
586
622
|
return at(
|
|
587
623
|
{
|
|
588
624
|
kind: "Fair",
|
|
589
625
|
fairness: expression.kind === "WeakFairness" ? "Weak" : "Strong",
|
|
590
|
-
subscript: recurse(expression.subscript),
|
|
626
|
+
subscript: moveGluedStart(recurse(expression.subscript)),
|
|
591
627
|
action: recurse(expression.action),
|
|
592
628
|
},
|
|
593
629
|
{ location },
|
|
594
630
|
);
|
|
631
|
+
}
|
|
595
632
|
case "Label":
|
|
596
633
|
return at(
|
|
597
634
|
{
|
|
598
635
|
kind: "Parens",
|
|
599
636
|
expression: recurse(expression.body),
|
|
600
|
-
form: {
|
|
637
|
+
form: {
|
|
638
|
+
kind: "Nlabel",
|
|
639
|
+
label: expression.name,
|
|
640
|
+
names: expression.params,
|
|
641
|
+
location: expression.head && getRangeLocus(expression.head),
|
|
642
|
+
},
|
|
601
643
|
},
|
|
602
644
|
{ location },
|
|
603
645
|
);
|
|
@@ -642,11 +684,13 @@ export const createModuleConverter = (
|
|
|
642
684
|
|
|
643
685
|
const convertInstance = (instance: Instance): InstanceDefinition => ({
|
|
644
686
|
location: getRangeLocus(instance.definitionRange ?? instance.instanceRange),
|
|
687
|
+
instanceLocation: getRangeLocus(instance.instanceRange),
|
|
645
688
|
args: instance.params.map((param) => param.name),
|
|
646
689
|
module: instance.module,
|
|
647
690
|
substitutions: instance.substitutions.map((substitution) => ({
|
|
648
691
|
name: getCanonicalName(substitution.name),
|
|
649
692
|
expression: convertExpression(substitution.expression, false),
|
|
693
|
+
location: getRangeLocus(substitution.nameRange),
|
|
650
694
|
})),
|
|
651
695
|
});
|
|
652
696
|
|
|
@@ -697,7 +741,7 @@ export const createModuleConverter = (
|
|
|
697
741
|
{ location },
|
|
698
742
|
);
|
|
699
743
|
const end = definition.location.range?.end;
|
|
700
|
-
const methods = end && readNewMethod(lines, { line: end.line - 1, column: end.column });
|
|
744
|
+
const methods = end && readNewMethod(lines, { line: end.line - 1, column: end.column }, file);
|
|
701
745
|
return methods
|
|
702
746
|
? { kind: "Bpragma", name, body: operatorBody, methods, location }
|
|
703
747
|
: { kind: "Operator", name, body: operatorBody, location };
|
|
@@ -788,7 +832,11 @@ export const createModuleConverter = (
|
|
|
788
832
|
if (!proof) return { kind: "Omitted", omission: "Implicit", location: enclosing };
|
|
789
833
|
switch (proof.kind) {
|
|
790
834
|
case "Obvious":
|
|
791
|
-
return {
|
|
835
|
+
return {
|
|
836
|
+
kind: "Obvious",
|
|
837
|
+
...withMethod(proof.keyword),
|
|
838
|
+
isSuppressed: isSuppressed(proof.keyword),
|
|
839
|
+
};
|
|
792
840
|
case "Omitted":
|
|
793
841
|
return {
|
|
794
842
|
kind: "Omitted",
|
|
@@ -803,6 +851,7 @@ export const createModuleConverter = (
|
|
|
803
851
|
location: getRangeLocus(proof.keyword),
|
|
804
852
|
step: { kind: "Unnamed", level, id: 0 },
|
|
805
853
|
method: getMethod(proof.location.range),
|
|
854
|
+
isSuppressed: isSuppressed(proof.keyword),
|
|
806
855
|
};
|
|
807
856
|
case "Steps": {
|
|
808
857
|
const tokens = proof.steps.map((step) => STEP_PATTERN.exec(step.token));
|
|
@@ -844,6 +893,7 @@ export const createModuleConverter = (
|
|
|
844
893
|
...converted,
|
|
845
894
|
...withMethod(step.head),
|
|
846
895
|
step: number,
|
|
896
|
+
isSuppressed: isSuppressed(step.statement),
|
|
847
897
|
});
|
|
848
898
|
switch (body.kind) {
|
|
849
899
|
case "Use":
|
|
@@ -861,6 +911,7 @@ export const createModuleConverter = (
|
|
|
861
911
|
location,
|
|
862
912
|
step: number,
|
|
863
913
|
method: getMethod(body.location.range),
|
|
914
|
+
isSuppressed: isSuppressed(body.keyword),
|
|
864
915
|
}
|
|
865
916
|
: { kind: "Hide", usable, location, step: number };
|
|
866
917
|
}
|
|
@@ -879,19 +930,14 @@ export const createModuleConverter = (
|
|
|
879
930
|
expression: convertExpression(body.expression, false),
|
|
880
931
|
});
|
|
881
932
|
case "Take":
|
|
882
|
-
return withStepMethod({
|
|
883
|
-
kind: "Take",
|
|
884
|
-
bounds:
|
|
885
|
-
body.names.length > 0 ? getUnbounded(body.names) : convertBounds(body.bounds, false),
|
|
886
|
-
});
|
|
933
|
+
return withStepMethod({ kind: "Take", bounds: convertStepBounds(body) });
|
|
887
934
|
case "Witness":
|
|
888
935
|
return withStepMethod({
|
|
889
936
|
kind: "Witness",
|
|
890
937
|
expressions: body.expressions.map((expression) => convertExpression(expression, false)),
|
|
891
938
|
});
|
|
892
939
|
case "Pick": {
|
|
893
|
-
const bounds =
|
|
894
|
-
body.names.length > 0 ? getUnbounded(body.names) : convertBounds(body.bounds, false);
|
|
940
|
+
const bounds = convertStepBounds(body);
|
|
895
941
|
const expression = convertExpression(body.body, false);
|
|
896
942
|
return withProof((proof) => ({ kind: "Pick", bounds, expression, proof }));
|
|
897
943
|
}
|
|
@@ -928,7 +974,9 @@ export const createModuleConverter = (
|
|
|
928
974
|
name: getCanonicalName(declaration.name),
|
|
929
975
|
shape: declaration.arity,
|
|
930
976
|
})),
|
|
931
|
-
location: getLocus(
|
|
977
|
+
location: getLocus(
|
|
978
|
+
unit.kind === "Constants" ? unit.declarations[0].location : unit.location,
|
|
979
|
+
),
|
|
932
980
|
};
|
|
933
981
|
case "Variables":
|
|
934
982
|
return {
|
|
@@ -995,13 +1043,19 @@ export const createModuleConverter = (
|
|
|
995
1043
|
location,
|
|
996
1044
|
};
|
|
997
1045
|
}
|
|
998
|
-
case "Use":
|
|
1046
|
+
case "Use": {
|
|
1047
|
+
// A module unit's locus takes in the suppress pragma that tlapm reads as its first tokens.
|
|
1048
|
+
const pragma = getSuppressPragma(unit.use.keyword);
|
|
999
1049
|
return {
|
|
1000
1050
|
kind: "Mutate",
|
|
1001
1051
|
mode: unit.use.kind,
|
|
1002
1052
|
usable: convertUsable(unit.use),
|
|
1003
|
-
location:
|
|
1053
|
+
location: mergeLoci(
|
|
1054
|
+
pragma && getPointLocus({ line: pragma.line + 1, column: pragma.column + 1 }, 0),
|
|
1055
|
+
getUseLocus(unit.use),
|
|
1056
|
+
),
|
|
1004
1057
|
};
|
|
1058
|
+
}
|
|
1005
1059
|
case "Module":
|
|
1006
1060
|
return { kind: "Submod", module: { ...convertModule(unit.module), isImportant: true } };
|
|
1007
1061
|
}
|
|
@@ -1,16 +1,16 @@
|
|
|
1
|
-
// A port of tlapm's Expr.Deref.
|
|
2
|
-
|
|
3
1
|
import { TlaProofError, TlapmBugError } from "../errors";
|
|
4
2
|
import { consAll, consSubstitution, shift, substituteExpr } from "./substitution";
|
|
5
3
|
import {
|
|
6
4
|
at,
|
|
7
5
|
getErrorNote,
|
|
6
|
+
getErrorSetting,
|
|
8
7
|
getBoundFresh,
|
|
9
8
|
getChildren,
|
|
10
9
|
getFresh,
|
|
11
10
|
getParamFresh,
|
|
12
11
|
mapChildren,
|
|
13
12
|
mapSelectorArgs,
|
|
13
|
+
warnError,
|
|
14
14
|
type Bound,
|
|
15
15
|
type Defn,
|
|
16
16
|
type Expr,
|
|
@@ -19,6 +19,8 @@ import {
|
|
|
19
19
|
type Param,
|
|
20
20
|
type Selector,
|
|
21
21
|
} from "./expression";
|
|
22
|
+
import { renderDoc } from "./format";
|
|
23
|
+
import { printExpression } from "./printer";
|
|
22
24
|
|
|
23
25
|
interface Resolution {
|
|
24
26
|
params: Param[];
|
|
@@ -147,6 +149,8 @@ const instantiate = (onWarning: Warn, expression: Expr, args: Expr[]): Expr => {
|
|
|
147
149
|
const expected = expression.bounds.length;
|
|
148
150
|
const message = `Arity mismatch in subexpression instance.\nExpected ${expected} argument${expected === 1 ? "" : "s"}, but found${args.length < expected ? " only" : ""} ${args.length}.`;
|
|
149
151
|
onWarning(getErrorNote(expression.location, message));
|
|
152
|
+
// Errors.set takes the message from Printf, which keeps the @ of Format's @\n.
|
|
153
|
+
onWarning(getErrorSetting(expression.location, message.replace("\n", "@\n")));
|
|
150
154
|
throw new TlaProofError(message, { failure: "Expr.Deref.deref_inst" });
|
|
151
155
|
}
|
|
152
156
|
const body = expression.kind === "SetOf" ? expression.element : expression.body;
|
|
@@ -193,12 +197,13 @@ const instantiate = (onWarning: Warn, expression: Expr, args: Expr[]): Expr => {
|
|
|
193
197
|
if (args.length !== 1) {
|
|
194
198
|
const message = `Arity mismatch in subexpression instance.\nExpected 1 argument, but found ${args.length}.`;
|
|
195
199
|
onWarning(getErrorNote(expression.location, message));
|
|
200
|
+
onWarning(getErrorSetting(expression.location, message.replace("\n", "@\n")));
|
|
196
201
|
throw new TlaProofError(message, { failure: "Expr.Deref.deref_inst" });
|
|
197
202
|
}
|
|
198
203
|
return substituteExpr(consAll(args, shift(0)), expression.body);
|
|
199
204
|
default: {
|
|
200
205
|
const message = "Cannot instantiate non-binding expression";
|
|
201
|
-
onWarning
|
|
206
|
+
warnError(onWarning, expression.location, message);
|
|
202
207
|
throw new TlaProofError(message, { failure: "Expr.Deref.deref_inst" });
|
|
203
208
|
}
|
|
204
209
|
}
|
|
@@ -220,7 +225,7 @@ const abstract = (onWarning: Warn, definitionCount: number, expression: Expr): [
|
|
|
220
225
|
return [{ name: expression.name, shape: 0 }];
|
|
221
226
|
default: {
|
|
222
227
|
const message = "Cannot abstract over bound variables in a non-binding expression";
|
|
223
|
-
onWarning
|
|
228
|
+
warnError(onWarning, expression.location, message);
|
|
224
229
|
throw new TlaProofError(message, { failure: "Expr.Deref.deref_at" });
|
|
225
230
|
}
|
|
226
231
|
}
|
|
@@ -238,7 +243,7 @@ const getNumbered = (
|
|
|
238
243
|
): [Defn[], Expr] => {
|
|
239
244
|
const checkAtMost = (count: number) => {
|
|
240
245
|
if (position <= count) return;
|
|
241
|
-
onWarning
|
|
246
|
+
warnError(onWarning, origin.location, message);
|
|
242
247
|
throw new TlaProofError(message, { failure: "Expr.Deref.deref_num" });
|
|
243
248
|
};
|
|
244
249
|
const pick = (items: Expr[]) => {
|
|
@@ -256,7 +261,7 @@ const getNumbered = (
|
|
|
256
261
|
const hyp = sequent.context[position - 1];
|
|
257
262
|
if (hyp && hyp.kind !== "Fact") {
|
|
258
263
|
const hypMessage = "subexpression reference does not resolve to an expression";
|
|
259
|
-
onWarning
|
|
264
|
+
warnError(onWarning, expression.location, hypMessage);
|
|
260
265
|
throw new TlaProofError(hypMessage, { failure: "Expr.Deref.deref_num" });
|
|
261
266
|
}
|
|
262
267
|
const shifted = substituteExpr(
|
|
@@ -270,10 +275,10 @@ const getNumbered = (
|
|
|
270
275
|
`subexpression of ASSUME/PROVE uses identifiers declared therein\nTlapm does not handle yet such subexpression namings.`,
|
|
271
276
|
),
|
|
272
277
|
);
|
|
273
|
-
|
|
274
|
-
"Subexpression of ASSUME/PROVE uses identifiers declared therein\n\nTlapm does not handle yet such subexpression namings."
|
|
275
|
-
|
|
276
|
-
);
|
|
278
|
+
const message =
|
|
279
|
+
"Subexpression of ASSUME/PROVE uses identifiers declared therein\n\nTlapm does not handle yet such subexpression namings.";
|
|
280
|
+
onWarning(getErrorSetting(expression.location, message));
|
|
281
|
+
throw new TlaProofError(message, { failure: "Expr.Deref.deref_num" });
|
|
277
282
|
}
|
|
278
283
|
return shifted;
|
|
279
284
|
}
|
|
@@ -338,12 +343,12 @@ const getNumbered = (
|
|
|
338
343
|
]);
|
|
339
344
|
}
|
|
340
345
|
const emptyMessage = "Expression has no subexpressions";
|
|
341
|
-
onWarning
|
|
346
|
+
warnError(onWarning, expression.location, emptyMessage);
|
|
342
347
|
throw new TlaProofError(emptyMessage, { failure: "Expr.Deref.deref_num" });
|
|
343
348
|
})();
|
|
344
349
|
if (isUnresolved(result)) {
|
|
345
350
|
const badMessage = `Cannot resolve subexpression reference !${position}`;
|
|
346
|
-
onWarning
|
|
351
|
+
warnError(onWarning, expression.location, badMessage);
|
|
347
352
|
throw new TlaProofError(badMessage, { failure: "Expr.Deref.deref_num" });
|
|
348
353
|
}
|
|
349
354
|
return [expression.kind === "Let" ? expression.definitions : [], result];
|
|
@@ -375,7 +380,7 @@ const resolveLabel = (
|
|
|
375
380
|
if (indices.length !== labelArgs.length && labelArgs.length > 0) {
|
|
376
381
|
const plural = indices.length === 1 ? "" : "s";
|
|
377
382
|
const message = `Expected ${indices.length} argument${plural} for labelled reference !${label}, but found ${labelArgs.length}`;
|
|
378
|
-
onWarning
|
|
383
|
+
warnError(onWarning, found.expression.location, message);
|
|
379
384
|
throw new TlaProofError(message, { failure: "Expr.Deref.deref_lsub" });
|
|
380
385
|
}
|
|
381
386
|
const params =
|
|
@@ -430,8 +435,9 @@ const resolveLetOperator = (
|
|
|
430
435
|
args: Expr[],
|
|
431
436
|
): Resolution => {
|
|
432
437
|
if (expression.kind !== "Let") {
|
|
433
|
-
|
|
434
|
-
|
|
438
|
+
const message = "not a LET expression";
|
|
439
|
+
warnError(onWarning, expression.location, message);
|
|
440
|
+
throw new TlaProofError(message, { failure: "Expr.Deref.deref_letop" });
|
|
435
441
|
}
|
|
436
442
|
const index = expression.definitions.findIndex(
|
|
437
443
|
(definition) => definition.kind === "Operator" && definition.name === label,
|
|
@@ -439,7 +445,7 @@ const resolveLetOperator = (
|
|
|
439
445
|
const definition = expression.definitions[index];
|
|
440
446
|
if (!definition || definition.kind !== "Operator") {
|
|
441
447
|
const message = `no definition of operator ${label}`;
|
|
442
|
-
onWarning
|
|
448
|
+
warnError(onWarning, expression.location, message);
|
|
443
449
|
throw new TlaProofError(message, { failure: "Expr.Deref.deref_letop" });
|
|
444
450
|
}
|
|
445
451
|
const body = definition.body;
|
|
@@ -481,6 +487,7 @@ const resolveLetOperator = (
|
|
|
481
487
|
|
|
482
488
|
const resolveSelectors = (
|
|
483
489
|
onWarning: Warn,
|
|
490
|
+
hyps: Hyp[],
|
|
484
491
|
isLabel: boolean,
|
|
485
492
|
state: Resolution,
|
|
486
493
|
selectors: Selector[],
|
|
@@ -501,7 +508,7 @@ const resolveSelectors = (
|
|
|
501
508
|
return { ...stripParensAndAtomic(abstracted), isAtomic: true };
|
|
502
509
|
}
|
|
503
510
|
if (state.expression.isAtomic) {
|
|
504
|
-
onWarning
|
|
511
|
+
warnError(onWarning, state.expression.location, "Expression has no subexpressions");
|
|
505
512
|
return UNRESOLVED;
|
|
506
513
|
}
|
|
507
514
|
const expression = isLabel ? state.expression : stripParens(state.expression);
|
|
@@ -525,6 +532,23 @@ const resolveSelectors = (
|
|
|
525
532
|
return { ...result, rest: after, isLabel: true };
|
|
526
533
|
}
|
|
527
534
|
if (isLabel) return { params: [], definitions: [], expression, rest, isLabel: false };
|
|
535
|
+
onWarning(getErrorSetting(expression.location, "!: is forbidden for this expression.\n"));
|
|
536
|
+
const scope = [
|
|
537
|
+
...hyps,
|
|
538
|
+
...state.definitions.map((definition): Hyp => ({
|
|
539
|
+
kind: "Defn",
|
|
540
|
+
definition,
|
|
541
|
+
whereDefined: "User",
|
|
542
|
+
visibility: "Visible",
|
|
543
|
+
isLocal: true,
|
|
544
|
+
})),
|
|
545
|
+
];
|
|
546
|
+
onWarning(
|
|
547
|
+
getErrorNote(
|
|
548
|
+
expression.location,
|
|
549
|
+
`!: is forbidden for this expression:\n${renderDoc(printExpression(scope, expression))}`,
|
|
550
|
+
),
|
|
551
|
+
);
|
|
528
552
|
throw new TlaProofError("!: is forbidden for this expression.\n", {
|
|
529
553
|
failure: "Expr.Deref.deref: !:",
|
|
530
554
|
});
|
|
@@ -558,6 +582,7 @@ const resolveSelectors = (
|
|
|
558
582
|
})();
|
|
559
583
|
return resolveSelectors(
|
|
560
584
|
onWarning,
|
|
585
|
+
hyps,
|
|
561
586
|
next.isLabel,
|
|
562
587
|
{
|
|
563
588
|
params: [...state.params, ...next.params],
|
|
@@ -581,19 +606,21 @@ const getInitialResolution = (onWarning: Warn, operator: Expr, args: Expr[]): Re
|
|
|
581
606
|
|
|
582
607
|
export const resolveSubexpression = (
|
|
583
608
|
onWarning: Warn,
|
|
609
|
+
hyps: Hyp[],
|
|
584
610
|
operator: Expr,
|
|
585
611
|
args: Expr[],
|
|
586
612
|
selectors: Selector[],
|
|
587
613
|
) => {
|
|
588
614
|
const result = resolveSelectors(
|
|
589
615
|
onWarning,
|
|
616
|
+
hyps,
|
|
590
617
|
true,
|
|
591
618
|
getInitialResolution(onWarning, operator, args),
|
|
592
619
|
selectors,
|
|
593
620
|
);
|
|
594
621
|
if (isUnresolved(result)) {
|
|
595
622
|
const message = "Could not resolve subexpression reference";
|
|
596
|
-
onWarning
|
|
623
|
+
warnError(onWarning, operator.location, message);
|
|
597
624
|
throw new TlaProofError(message, { failure: "Expr.Anon: 2" });
|
|
598
625
|
}
|
|
599
626
|
return result;
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// A port of tlapm's E_subst.
|
|
2
|
-
|
|
3
1
|
import { TlaProofError } from "../errors";
|
|
4
2
|
import {
|
|
5
3
|
at,
|
|
@@ -94,7 +92,7 @@ export const substituteDefn = (substitution: Substitution, definition: Defn): De
|
|
|
94
92
|
instance: {
|
|
95
93
|
...definition.instance,
|
|
96
94
|
substitutions: definition.instance.substitutions.map((entry) => ({
|
|
97
|
-
|
|
95
|
+
...entry,
|
|
98
96
|
expression: substituteExpr(inner, entry.expression),
|
|
99
97
|
})),
|
|
100
98
|
},
|
package/src/parallel-worker.ts
CHANGED
|
@@ -41,8 +41,14 @@ const runWorker = (start: StartMessage, parent: Port) => {
|
|
|
41
41
|
);
|
|
42
42
|
const specification = created.specification;
|
|
43
43
|
const environment = specification.environment;
|
|
44
|
-
const search = createSearch(
|
|
45
|
-
|
|
44
|
+
const search = createSearch(
|
|
45
|
+
start.config,
|
|
46
|
+
environment,
|
|
47
|
+
specification.variableLocations,
|
|
48
|
+
() => created.order.getDeclarationOrder("variable"),
|
|
49
|
+
undefined,
|
|
50
|
+
[],
|
|
51
|
+
specification.runtimeInvariants,
|
|
46
52
|
);
|
|
47
53
|
const nextAction = search?.spec.next;
|
|
48
54
|
if (!search || nextAction === undefined)
|
package/src/parallel.ts
CHANGED
|
@@ -8,6 +8,7 @@ import {
|
|
|
8
8
|
} from "./check";
|
|
9
9
|
import { parseConfig, type ModelConfig } from "./config";
|
|
10
10
|
import { TlaEvaluationError } from "./errors";
|
|
11
|
+
import type { RuntimeInvariant } from "./environment";
|
|
11
12
|
import { isImpure } from "./evaluate";
|
|
12
13
|
import {
|
|
13
14
|
createSharedFingerprints,
|
|
@@ -43,6 +44,7 @@ export interface StartMessage extends Pick<
|
|
|
43
44
|
> {
|
|
44
45
|
type: "start";
|
|
45
46
|
config: ModelConfig;
|
|
47
|
+
runtimeInvariants: RuntimeInvariant[];
|
|
46
48
|
modules: [string, string | undefined][];
|
|
47
49
|
classes: [string, Uint8Array | undefined][];
|
|
48
50
|
index: number;
|
|
@@ -146,6 +148,8 @@ export const check = async (options: CheckOptions): Promise<CheckResult> => {
|
|
|
146
148
|
specification.variableLocations,
|
|
147
149
|
() => created.order.getDeclarationOrder("variable"),
|
|
148
150
|
report,
|
|
151
|
+
[],
|
|
152
|
+
specification.runtimeInvariants,
|
|
149
153
|
);
|
|
150
154
|
if (findAssumptionViolation(specification.assumptions, environment)) return fallBack();
|
|
151
155
|
if (
|
|
@@ -179,13 +183,13 @@ export const check = async (options: CheckOptions): Promise<CheckResult> => {
|
|
|
179
183
|
fingerprintDistance: getFingerprintDistance(
|
|
180
184
|
statistics.distinctStates,
|
|
181
185
|
statistics.generatedStates,
|
|
182
|
-
() => {
|
|
186
|
+
(visit) => {
|
|
183
187
|
const fingerprints = new BigInt64Array(statistics.distinctStates);
|
|
184
188
|
tlcFingerprints.reduce((offset, level) => {
|
|
185
189
|
fingerprints.set(level, offset);
|
|
186
190
|
return offset + level.length;
|
|
187
191
|
}, 0);
|
|
188
|
-
|
|
192
|
+
visit(fingerprints);
|
|
189
193
|
},
|
|
190
194
|
),
|
|
191
195
|
});
|
|
@@ -273,6 +277,7 @@ export const check = async (options: CheckOptions): Promise<CheckResult> => {
|
|
|
273
277
|
type: "start",
|
|
274
278
|
source: options.source,
|
|
275
279
|
config,
|
|
280
|
+
runtimeInvariants: specification.runtimeInvariants,
|
|
276
281
|
modules: [...modules],
|
|
277
282
|
classes: [...classes],
|
|
278
283
|
index,
|