tla-ts 0.0.10-dev.f16792fed → 0.0.10-dev.f57f64938
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +2 -1
- package/dist/compile.cjs +6 -6
- package/dist/compile.js +10 -10
- package/dist/deciders.cjs +41 -37
- package/dist/deciders.js +57 -53
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +3 -0
- package/dist/index.d.ts +3 -0
- package/dist/index.js +1 -1
- package/dist/parallel-worker.cjs +1 -1
- package/dist/parallel-worker.js +1 -1
- package/dist/prove.cjs +2682 -426
- package/dist/prove.js +2681 -425
- package/dist/run.cjs +45 -42
- package/dist/run.js +47 -44
- package/dist/tlapm.cjs +2 -2
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +42 -39
- package/dist/transfer.js +42 -39
- package/dist/worker.cjs +7 -7
- package/dist/worker.js +7 -7
- package/package.json +1 -1
- package/src/ast.ts +41 -36
- package/src/builtins.ts +4 -13
- package/src/check-failure.ts +116 -0
- package/src/check-trace.ts +282 -0
- package/src/check.ts +353 -549
- package/src/cli/options.ts +6 -31
- package/src/cli/shared.ts +1 -1
- package/src/cli/tlapm.ts +433 -70
- package/src/cli/tlc-arguments.ts +222 -210
- package/src/cli/tlc-output.ts +687 -0
- package/src/cli/tlc-usage.ts +1 -2
- package/src/cli/tlc.ts +49 -702
- package/src/cli/xml-exporter.ts +23 -33
- package/src/codegen.ts +5 -10
- package/src/coverage.ts +0 -2
- package/src/dependencies.ts +30 -14
- package/src/dfid.ts +16 -16
- package/src/environment-config.ts +315 -0
- package/src/environment.ts +55 -338
- package/src/errors.ts +33 -5
- package/src/evaluate.ts +5 -4
- package/src/exit-codes.ts +1 -0
- package/src/fingerprints.ts +65 -1
- package/src/instances.ts +47 -10
- package/src/json.ts +4 -7
- package/src/levels.ts +39 -42
- package/src/lexer.ts +5 -3
- package/src/liveness-checker.ts +553 -237
- package/src/liveness.ts +94 -86
- package/src/obligations/action.ts +14 -17
- package/src/obligations/anonymize.ts +37 -16
- package/src/obligations/enabled-axioms.ts +218 -0
- package/src/obligations/equality.ts +1 -3
- package/src/obligations/expression.ts +36 -8
- package/src/obligations/format.ts +0 -2
- package/src/obligations/generate.ts +66 -54
- package/src/obligations/index.ts +38 -8
- package/src/obligations/levels.ts +24 -11
- package/src/obligations/module.ts +28 -41
- package/src/obligations/normalize.ts +26 -14
- package/src/obligations/operators.ts +0 -2
- package/src/obligations/pragma.ts +53 -16
- package/src/obligations/printer.ts +43 -13
- package/src/obligations/proof.ts +3 -2
- package/src/obligations/regroup.ts +0 -2
- package/src/obligations/simplify.ts +55 -50
- package/src/obligations/source.ts +118 -74
- package/src/obligations/subexpression.ts +45 -18
- package/src/obligations/substitution.ts +1 -3
- package/src/obligations/temporal.ts +5 -7
- package/src/obligations/tuples.ts +0 -2
- package/src/parallel-worker.ts +10 -30
- package/src/parallel.ts +24 -47
- package/src/parser.ts +580 -180
- package/src/pretty-print.ts +1 -1
- package/src/prover/decide-pool.ts +3 -3
- package/src/prover/deciders.ts +12 -9
- package/src/prover/isabelle/decide.ts +3 -25
- package/src/prover/isabelle/encode.ts +72 -42
- package/src/prover/isabelle/isar/attrib.ts +250 -0
- package/src/prover/isabelle/isar/context.ts +335 -0
- package/src/prover/isabelle/isar/induct.ts +382 -0
- package/src/prover/isabelle/isar/inner-syntax.ts +158 -7
- package/src/prover/isabelle/isar/method.ts +509 -212
- package/src/prover/isabelle/isar/proof.ts +570 -14
- package/src/prover/isabelle/isar/rule-cases.ts +224 -0
- package/src/prover/isabelle/isar/theory.ts +487 -76
- package/src/prover/isabelle/isar/toplevel.ts +331 -0
- package/src/prover/isabelle/isar/type-check.ts +89 -14
- package/src/prover/isabelle/provers/blast/blast.ts +7 -65
- package/src/prover/isabelle/provers/blast/branch.ts +0 -2
- package/src/prover/isabelle/provers/blast/prove.ts +0 -2
- package/src/prover/isabelle/provers/blast/rules.ts +0 -2
- package/src/prover/isabelle/provers/blast/state.ts +0 -2
- package/src/prover/isabelle/provers/blast/term.ts +0 -2
- package/src/prover/isabelle/provers/clasimp.ts +0 -2
- package/src/prover/isabelle/provers/classical.ts +45 -20
- package/src/prover/isabelle/provers/hypsubst.ts +17 -28
- package/src/prover/isabelle/pure/bicompose.ts +9 -27
- package/src/prover/isabelle/pure/consts.ts +0 -2
- package/src/prover/isabelle/pure/conv.ts +2 -10
- package/src/prover/isabelle/pure/drule.ts +72 -6
- package/src/prover/isabelle/pure/envir.ts +0 -2
- package/src/prover/isabelle/pure/goal.ts +1 -3
- package/src/prover/isabelle/pure/logic.ts +1 -3
- package/src/prover/isabelle/pure/name.ts +0 -2
- package/src/prover/isabelle/pure/net.ts +0 -2
- package/src/prover/isabelle/pure/object-logic.ts +13 -7
- package/src/prover/isabelle/pure/pattern.ts +0 -2
- package/src/prover/isabelle/pure/raw-simplifier.ts +4 -15
- package/src/prover/isabelle/pure/rewriter.ts +6 -17
- package/src/prover/isabelle/pure/search.ts +0 -2
- package/src/prover/isabelle/pure/seq.ts +0 -2
- package/src/prover/isabelle/pure/simplifier.ts +26 -7
- package/src/prover/isabelle/pure/table.ts +2 -3
- package/src/prover/isabelle/pure/tactic.ts +0 -2
- package/src/prover/isabelle/pure/tactical.ts +42 -37
- package/src/prover/isabelle/pure/term-ord.ts +0 -2
- package/src/prover/isabelle/pure/term.ts +0 -2
- package/src/prover/isabelle/pure/thm.ts +14 -13
- package/src/prover/isabelle/pure/type.ts +0 -2
- package/src/prover/isabelle/pure/unify.ts +0 -2
- package/src/prover/isabelle/pure/variable.ts +0 -2
- package/src/prover/isabelle/tla/classical-setup.ts +18 -16
- package/src/prover/isabelle/tla/context.ts +58 -11
- package/src/prover/isabelle/tla/logic-data.ts +1 -1
- package/src/prover/isabelle/tla/logic.ts +49 -21
- package/src/prover/isabelle/tla/simpdata.ts +1 -12
- package/src/prover/isabelle/tools/intuitionistic.ts +28 -12
- package/src/prover/ocaml.ts +4 -1
- package/src/prover/prep/action.ts +30 -31
- package/src/prover/prep/enabled-axioms.ts +11 -2
- package/src/prover/prep/fingerprint.ts +2 -5
- package/src/prover/prep/methods.ts +181 -51
- package/src/prover/prep/normalize.ts +38 -9
- package/src/prover/prove.ts +395 -94
- package/src/prover/ptl/decide.ts +95 -50
- package/src/prover/ptl/encode.ts +2 -3
- package/src/prover/ptl/tableau.ts +28 -2
- package/src/prover/smt/arithmetic.ts +310 -0
- package/src/prover/smt/axioms.ts +12 -8
- package/src/prover/smt/context.ts +43 -8
- package/src/prover/smt/data.ts +498 -379
- package/src/prover/smt/encode.ts +148 -57
- package/src/prover/smt/extensionality.ts +5 -3
- package/src/prover/smt/flatten.ts +4 -6
- package/src/prover/smt/format.ts +28 -4
- package/src/prover/smt/instances.ts +7 -1
- package/src/prover/smt/layout.ts +91 -0
- package/src/prover/smt/rewrite.ts +1021 -618
- package/src/prover/smt/simplify.ts +441 -0
- package/src/prover/smt/solver/ackermannize-bv-tactic.ts +61 -0
- package/src/prover/smt/solver/ackr-helper.ts +179 -0
- package/src/prover/smt/solver/ackr-model-converter.ts +105 -0
- package/src/prover/smt/solver/act-cache.ts +0 -1
- package/src/prover/smt/solver/add-bounds-tactic.ts +59 -0
- package/src/prover/smt/solver/aig-tactic.ts +52 -0
- package/src/prover/smt/solver/aig.ts +889 -0
- package/src/prover/smt/solver/arith-rewriter.ts +613 -6
- package/src/prover/smt/solver/arith-terms.ts +121 -0
- package/src/prover/smt/solver/array-decl-plugin.ts +175 -0
- package/src/prover/smt/solver/array-rewriter.ts +309 -0
- package/src/prover/smt/solver/asserted-formulas.ts +87 -16
- package/src/prover/smt/solver/ast-lt.ts +166 -12
- package/src/prover/smt/solver/ast-util.ts +160 -2
- package/src/prover/smt/solver/ast.ts +1427 -41
- package/src/prover/smt/solver/auf-solver.ts +2 -6
- package/src/prover/smt/solver/bit-blast-tactic.ts +582 -0
- package/src/prover/smt/solver/bit-blaster.ts +871 -0
- package/src/prover/smt/solver/bound-manager.ts +196 -0
- package/src/prover/smt/solver/bound-simplifier.ts +600 -0
- package/src/prover/smt/solver/bv-bound-chk.ts +492 -0
- package/src/prover/smt/solver/bv-decl-plugin.ts +338 -0
- package/src/prover/smt/solver/bv-divrem-bounds.ts +95 -0
- package/src/prover/smt/solver/bv-rewriter.ts +1901 -0
- package/src/prover/smt/solver/bv1-blast.ts +214 -0
- package/src/prover/smt/solver/bv2fpa-converter.ts +174 -0
- package/src/prover/smt/solver/bv2int-rewriter.ts +544 -0
- package/src/prover/smt/solver/bv2real-rewriter.ts +533 -0
- package/src/prover/smt/solver/card2bv.ts +110 -0
- package/src/prover/smt/solver/case-split-queue.ts +0 -2
- package/src/prover/smt/solver/cg-table.ts +39 -25
- package/src/prover/smt/solver/check-logic.ts +330 -0
- package/src/prover/smt/solver/clause.ts +0 -1
- package/src/prover/smt/solver/cofactor-elim-term-ite.ts +278 -0
- package/src/prover/smt/solver/conflict-resolution.ts +78 -2
- package/src/prover/smt/solver/context.ts +516 -115
- package/src/prover/smt/solver/ctx-simplify.ts +20 -10
- package/src/prover/smt/solver/ctx-solver-simplify.ts +122 -0
- package/src/prover/smt/solver/datatype-decl-plugin.ts +572 -0
- package/src/prover/smt/solver/datatype-rewriter.ts +82 -0
- package/src/prover/smt/solver/demodulator.ts +786 -0
- package/src/prover/smt/solver/dependent-expr-state.ts +81 -0
- package/src/prover/smt/solver/der.ts +38 -10
- package/src/prover/smt/solver/diff-neq.ts +206 -0
- package/src/prover/smt/solver/distribute-forall.ts +57 -0
- package/src/prover/smt/solver/dom-simplify.ts +511 -0
- package/src/prover/smt/solver/dt2bv-tactic.ts +260 -0
- package/src/prover/smt/solver/dyn-ack.ts +0 -1
- package/src/prover/smt/solver/e-matching.ts +7 -8
- package/src/prover/smt/solver/elim-small-bv-tactic.ts +129 -0
- package/src/prover/smt/solver/elim-uncnstr.ts +545 -0
- package/src/prover/smt/solver/enode.ts +100 -3
- package/src/prover/smt/solver/eq2bv-tactic.ts +218 -0
- package/src/prover/smt/solver/euf/arith-axioms.ts +403 -0
- package/src/prover/smt/solver/euf/arith-internalize.ts +653 -0
- package/src/prover/smt/solver/euf/arith-solver.ts +889 -0
- package/src/prover/smt/solver/euf/array-axioms.ts +527 -0
- package/src/prover/smt/solver/euf/array-internalize.ts +428 -0
- package/src/prover/smt/solver/euf/array-solver.ts +306 -0
- package/src/prover/smt/solver/euf/bv-ackerman.ts +162 -0
- package/src/prover/smt/solver/euf/bv-internalize.ts +748 -0
- package/src/prover/smt/solver/euf/bv-solver.ts +449 -0
- package/src/prover/smt/solver/euf/dt-solver.ts +618 -0
- package/src/prover/smt/solver/euf/egraph.ts +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 -1
- package/src/prover/smt/solver/expr-safe-replace.ts +26 -2
- package/src/prover/smt/solver/expr2polynomial.ts +146 -0
- package/src/prover/smt/solver/factor.ts +141 -0
- package/src/prover/smt/solver/fd-solver.ts +265 -0
- package/src/prover/smt/solver/fingerprints.ts +15 -15
- package/src/prover/smt/solver/fix-dl-var.ts +148 -0
- package/src/prover/smt/solver/flat-literals.ts +0 -1
- package/src/prover/smt/solver/fm-tactic.ts +884 -0
- package/src/prover/smt/solver/fpa-decl-plugin.ts +618 -0
- package/src/prover/smt/solver/fpa-rewriter.ts +640 -0
- package/src/prover/smt/solver/fpa2bv-converter.ts +2249 -0
- package/src/prover/smt/solver/fpa2bv-rewriter.ts +348 -0
- package/src/prover/smt/solver/fpa2bv-tactic.ts +73 -0
- package/src/prover/smt/solver/goal.ts +175 -15
- package/src/prover/smt/solver/goal2nlsat.ts +189 -0
- package/src/prover/smt/solver/guard-set.ts +219 -0
- package/src/prover/smt/solver/hash.ts +0 -1
- package/src/prover/smt/solver/hashtable.ts +30 -16
- package/src/prover/smt/solver/inf-eps.ts +63 -0
- package/src/prover/smt/solver/inj-axiom.ts +101 -0
- package/src/prover/smt/solver/internalizer.ts +110 -38
- package/src/prover/smt/solver/lackr.ts +381 -0
- package/src/prover/smt/solver/lbool.ts +0 -1
- package/src/prover/smt/solver/lia2card.ts +268 -0
- package/src/prover/smt/solver/lia2pb.ts +154 -0
- package/src/prover/smt/solver/literal.ts +0 -1
- package/src/prover/smt/solver/logic-tactics.ts +345 -0
- package/src/prover/smt/solver/lp/bound-propagator.ts +0 -1
- package/src/prover/smt/solver/lp/constraints.ts +0 -1
- package/src/prover/smt/solver/lp/containers.ts +0 -1
- package/src/prover/smt/solver/lp/core-solver.ts +18 -3
- package/src/prover/smt/solver/lp/cross-nested.ts +0 -1
- package/src/prover/smt/solver/lp/dep-intervals.ts +0 -3
- package/src/prover/smt/solver/lp/dependency.ts +0 -2
- package/src/prover/smt/solver/lp/dioph-eq.ts +1 -10
- package/src/prover/smt/solver/lp/explanation.ts +0 -1
- package/src/prover/smt/solver/lp/gomory.ts +0 -1
- package/src/prover/smt/solver/lp/hnf-cutter.ts +1 -2
- package/src/prover/smt/solver/lp/hnf.ts +0 -3
- package/src/prover/smt/solver/lp/int-cube.ts +3 -4
- package/src/prover/smt/solver/lp/int-solver.ts +0 -2
- package/src/prover/smt/solver/lp/lar-solver.ts +40 -4
- package/src/prover/smt/solver/lp/lar-term.ts +0 -1
- package/src/prover/smt/solver/lp/lp-settings.ts +0 -1
- package/src/prover/smt/solver/lp/maximize-term.ts +59 -10
- package/src/prover/smt/solver/lp/nex-creator.ts +0 -1
- package/src/prover/smt/solver/lp/nex.ts +0 -1
- package/src/prover/smt/solver/lp/nla-backoff.ts +0 -2
- package/src/prover/smt/solver/lp/nla-basics.ts +0 -2
- package/src/prover/smt/solver/lp/nla-core.ts +42 -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 +9 -4
- 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 +25 -4
- package/src/prover/smt/solver/lp/numeric-pair.ts +0 -1
- package/src/prover/smt/solver/lp/pdd-interval.ts +0 -1
- package/src/prover/smt/solver/lp/pdd-simplifier.ts +0 -1
- package/src/prover/smt/solver/lp/pdd-solver.ts +0 -2
- package/src/prover/smt/solver/lp/pdd.ts +2 -2
- package/src/prover/smt/solver/lp/random-updater.ts +0 -2
- package/src/prover/smt/solver/lp/static-matrix.ts +0 -1
- package/src/prover/smt/solver/lp/union-find.ts +7 -2
- package/src/prover/smt/solver/macro-finder.ts +530 -0
- package/src/prover/smt/solver/mam-compiler.ts +122 -90
- package/src/prover/smt/solver/mam-interpreter.ts +0 -1
- package/src/prover/smt/solver/max-bv-sharing-tactic.ts +17 -0
- package/src/prover/smt/solver/max-cliques.ts +105 -0
- package/src/prover/smt/solver/maxcore.ts +309 -0
- package/src/prover/smt/solver/maximize-ac-sharing.ts +8 -6
- package/src/prover/smt/solver/maxlex.ts +115 -0
- package/src/prover/smt/solver/maxsmt-base.ts +105 -0
- package/src/prover/smt/solver/maxsmt.ts +92 -0
- package/src/prover/smt/solver/mbp/mbp-arith.ts +467 -0
- package/src/prover/smt/solver/mbp/mbp-basic-tg.ts +101 -0
- package/src/prover/smt/solver/mbp/mbp-plugin.ts +287 -0
- package/src/prover/smt/solver/mbp/mbp-qel.ts +48 -0
- package/src/prover/smt/solver/mbp/mbp-solve-plugin.ts +271 -0
- package/src/prover/smt/solver/mbp/mbp-term-graph.ts +606 -0
- package/src/prover/smt/solver/model-based-opt.ts +844 -0
- package/src/prover/smt/solver/model-checker.ts +18 -27
- package/src/prover/smt/solver/model-evaluator.ts +188 -12
- package/src/prover/smt/solver/model-finder.ts +12 -18
- package/src/prover/smt/solver/model-generator.ts +56 -29
- package/src/prover/smt/solver/model-macro-solver.ts +49 -46
- package/src/prover/smt/solver/model-printer.ts +214 -0
- package/src/prover/smt/solver/mpf.ts +711 -0
- package/src/prover/smt/solver/mus.ts +51 -0
- package/src/prover/smt/solver/muz/dl-context.ts +404 -0
- package/src/prover/smt/solver/muz/dl-mk-bit-blast.ts +97 -0
- package/src/prover/smt/solver/muz/dl-mk-coi-filter.ts +167 -0
- package/src/prover/smt/solver/muz/dl-mk-elim-term-ite.ts +125 -0
- package/src/prover/smt/solver/muz/dl-mk-interp-tail-simplifier.ts +299 -0
- package/src/prover/smt/solver/muz/dl-mk-rule-inliner.ts +455 -0
- package/src/prover/smt/solver/muz/dl-mk-slice.ts +340 -0
- package/src/prover/smt/solver/muz/dl-mk-subsumption-checker.ts +163 -0
- package/src/prover/smt/solver/muz/dl-rule-set.ts +273 -0
- package/src/prover/smt/solver/muz/dl-rule-transformer.ts +123 -0
- package/src/prover/smt/solver/muz/dl-rule.ts +496 -0
- package/src/prover/smt/solver/muz/hnf.ts +201 -0
- package/src/prover/smt/solver/muz/horn-subsume-model-converter.ts +176 -0
- package/src/prover/smt/solver/muz/horn-tactic.ts +201 -0
- package/src/prover/smt/solver/muz/rule-properties.ts +337 -0
- package/src/prover/smt/solver/muz/spacer-context.ts +1406 -0
- package/src/prover/smt/solver/muz/spacer-dl-interface.ts +52 -0
- package/src/prover/smt/solver/muz/spacer-generalizers.ts +241 -0
- package/src/prover/smt/solver/muz/spacer-manager.ts +127 -0
- package/src/prover/smt/solver/muz/spacer-pdr.ts +218 -0
- package/src/prover/smt/solver/muz/spacer-prop-solver.ts +333 -0
- package/src/prover/smt/solver/muz/spacer-util.ts +282 -0
- package/src/prover/smt/solver/muz/substitution.ts +203 -0
- package/src/prover/smt/solver/nla2bv-tactic.ts +285 -0
- package/src/prover/smt/solver/nlqsat.ts +484 -0
- package/src/prover/smt/solver/nlsat/algebraic.ts +125 -12
- package/src/prover/smt/solver/nlsat/atoms.ts +20 -6
- package/src/prover/smt/solver/nlsat/evaluator.ts +0 -1
- package/src/prover/smt/solver/nlsat/explain.ts +63 -23
- package/src/prover/smt/solver/nlsat/interval-set.ts +1 -2
- package/src/prover/smt/solver/nlsat/levelwise.ts +3 -9
- package/src/prover/smt/solver/nlsat/mpbq.ts +45 -1
- package/src/prover/smt/solver/nlsat/polynomial.ts +13 -6
- package/src/prover/smt/solver/nlsat/solver.ts +234 -36
- package/src/prover/smt/solver/nlsat/transcendental-eval.ts +310 -0
- package/src/prover/smt/solver/nlsat/transcendentals.ts +367 -0
- package/src/prover/smt/solver/nlsat/types.ts +0 -2
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +1 -4
- package/src/prover/smt/solver/nlsat/upolynomial.ts +0 -2
- package/src/prover/smt/solver/nlsat-tactic.ts +82 -0
- package/src/prover/smt/solver/nnf.ts +105 -23
- package/src/prover/smt/solver/normalize-bounds.ts +53 -0
- package/src/prover/smt/solver/occf.ts +97 -0
- package/src/prover/smt/solver/opt-context.ts +787 -0
- package/src/prover/smt/solver/opt-nlsat.ts +375 -0
- package/src/prover/smt/solver/opt-pareto.ts +282 -0
- package/src/prover/smt/solver/opt-preprocess.ts +101 -0
- package/src/prover/smt/solver/opt-solver.ts +308 -0
- package/src/prover/smt/solver/opt-value.ts +55 -0
- package/src/prover/smt/solver/optsmt.ts +692 -0
- package/src/prover/smt/solver/parallel-tactic.ts +299 -0
- package/src/prover/smt/solver/pattern-inference.ts +19 -11
- package/src/prover/smt/solver/pb-rewriter.ts +284 -0
- package/src/prover/smt/solver/pb2bv-tactic.ts +540 -0
- package/src/prover/smt/solver/poly-rewriter.ts +202 -57
- package/src/prover/smt/solver/probes.ts +512 -0
- package/src/prover/smt/solver/propagate-values.ts +37 -21
- package/src/prover/smt/solver/proto-model.ts +648 -19
- package/src/prover/smt/solver/pull-quant.ts +28 -12
- package/src/prover/smt/solver/purify-arith.ts +632 -0
- package/src/prover/smt/solver/qe-arith-plugin.ts +1098 -0
- package/src/prover/smt/solver/qe-lite-der.ts +2 -3
- package/src/prover/smt/solver/qe-lite-fm.ts +3 -4
- package/src/prover/smt/solver/qe-lite.ts +37 -17
- package/src/prover/smt/solver/qe-mbp.ts +270 -0
- package/src/prover/smt/solver/qe.ts +1498 -0
- package/src/prover/smt/solver/qel.ts +25 -0
- package/src/prover/smt/solver/qi-queue.ts +0 -1
- package/src/prover/smt/solver/qsat.ts +814 -0
- package/src/prover/smt/solver/quant-hoist.ts +196 -0
- package/src/prover/smt/solver/quant-tactics.ts +16 -56
- package/src/prover/smt/solver/quantifier-analyzer.ts +19 -20
- package/src/prover/smt/solver/quantifier-manager.ts +8 -16
- package/src/prover/smt/solver/quasi-macros.ts +243 -0
- package/src/prover/smt/solver/random-gen.ts +0 -1
- package/src/prover/smt/solver/rational.ts +45 -1
- package/src/prover/smt/solver/recfun-decl-plugin.ts +261 -0
- package/src/prover/smt/solver/recfun-rewriter.ts +107 -0
- package/src/prover/smt/solver/reduce-args.ts +225 -0
- package/src/prover/smt/solver/reduce-bv-size.ts +119 -0
- package/src/prover/smt/solver/ref-vector.ts +0 -1
- package/src/prover/smt/solver/relevancy.ts +1 -2
- package/src/prover/smt/solver/rewriter-tpl.ts +77 -10
- package/src/prover/smt/solver/rewriter.ts +475 -36
- package/src/prover/smt/solver/rlimit.ts +25 -2
- package/src/prover/smt/solver/sat/asymm-branch.ts +325 -0
- package/src/prover/smt/solver/sat/big.ts +177 -0
- package/src/prover/smt/solver/sat/clause-use-list.ts +71 -0
- package/src/prover/smt/solver/sat/clause.ts +203 -0
- package/src/prover/smt/solver/sat/cleaner.ts +94 -0
- package/src/prover/smt/solver/sat/config.ts +122 -0
- package/src/prover/smt/solver/sat/consequences.ts +203 -0
- package/src/prover/smt/solver/sat/elim-eqs.ts +142 -0
- package/src/prover/smt/solver/sat/goal2sat.ts +526 -0
- package/src/prover/smt/solver/sat/inc-sat-solver.ts +378 -0
- package/src/prover/smt/solver/sat/model-converter.ts +136 -0
- package/src/prover/smt/solver/sat/pb-constraint.ts +261 -0
- package/src/prover/smt/solver/sat/pb-solver.ts +1577 -0
- package/src/prover/smt/solver/sat/probing.ts +170 -0
- package/src/prover/smt/solver/sat/sat-tactic.ts +43 -0
- package/src/prover/smt/solver/sat/sat2goal.ts +165 -0
- package/src/prover/smt/solver/sat/scc.ts +142 -0
- package/src/prover/smt/solver/sat/simplifier.ts +1618 -0
- package/src/prover/smt/solver/sat/solver.ts +2127 -0
- package/src/prover/smt/solver/sat/var-queue.ts +117 -0
- package/src/prover/smt/solver/sat/watch-list.ts +140 -0
- package/src/prover/smt/solver/search-tree.ts +284 -0
- package/src/prover/smt/solver/seq-axioms.ts +1010 -0
- package/src/prover/smt/solver/seq-decl-plugin.ts +819 -0
- package/src/prover/smt/solver/seq-derive.ts +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 +3126 -316
- package/src/prover/smt/solver/smtlib-script.ts +1631 -0
- package/src/prover/smt/solver/solve-eqs.ts +929 -0
- package/src/prover/smt/solver/solver.ts +113 -22
- package/src/prover/smt/solver/static-features.ts +314 -0
- package/src/prover/smt/solver/sticky-generations.ts +0 -1
- package/src/prover/smt/solver/tactic.ts +1986 -0
- package/src/prover/smt/solver/term-enumeration.ts +205 -0
- package/src/prover/smt/solver/theory-array.ts +1240 -0
- package/src/prover/smt/solver/theory-bv.ts +1200 -0
- package/src/prover/smt/solver/theory-char.ts +355 -0
- package/src/prover/smt/solver/theory-datatype.ts +598 -0
- package/src/prover/smt/solver/theory-finite-set.ts +30 -0
- package/src/prover/smt/solver/theory-fpa.ts +389 -0
- package/src/prover/smt/solver/theory-lra-axioms.ts +53 -2
- package/src/prover/smt/solver/theory-lra-bounds.ts +31 -6
- package/src/prover/smt/solver/theory-lra-final-check.ts +56 -70
- package/src/prover/smt/solver/theory-lra-internalize.ts +86 -27
- package/src/prover/smt/solver/theory-lra-model.ts +20 -35
- package/src/prover/smt/solver/theory-lra-propagate.ts +24 -26
- package/src/prover/smt/solver/theory-lra-state.ts +6 -22
- package/src/prover/smt/solver/theory-lra.ts +188 -1
- package/src/prover/smt/solver/theory-pb.ts +934 -0
- package/src/prover/smt/solver/theory-polymorphism.ts +58 -0
- package/src/prover/smt/solver/theory-recfun.ts +307 -0
- package/src/prover/smt/solver/theory-seq-regex.ts +867 -0
- package/src/prover/smt/solver/theory-seq-solve.ts +1373 -0
- package/src/prover/smt/solver/theory-seq-state.ts +871 -0
- package/src/prover/smt/solver/theory-seq.ts +961 -0
- package/src/prover/smt/solver/theory.ts +189 -0
- package/src/prover/smt/solver/tseitin-cnf.ts +485 -0
- package/src/prover/smt/solver/var-subst.ts +36 -14
- package/src/prover/smt/table.ts +3 -2
- package/src/prover/smt/types.ts +146 -0
- package/src/prover/tlapm/cache.ts +50 -19
- package/src/prover/tlapm/tlapm.ts +15 -9
- package/src/prover/tlapm-library.ts +3208 -0
- package/src/prover/verdict.ts +9 -0
- package/src/prover/zenon/check/check.ts +1 -2
- package/src/prover/zenon/check/records.ts +1 -1
- package/src/prover/zenon/check/relations.ts +2 -1
- package/src/prover/zenon/check/rewrites.ts +2 -15
- package/src/prover/zenon/check/sets.ts +40 -58
- package/src/prover/zenon/check/terms.ts +1 -2
- package/src/prover/zenon/decide.ts +10 -7
- package/src/prover/zenon/encode.ts +0 -2
- package/src/prover/zenon/eqrel.ts +2 -2
- package/src/prover/zenon/equality-rules.ts +0 -2
- package/src/prover/zenon/expr.ts +7 -2
- package/src/prover/zenon/index-table.ts +9 -21
- package/src/prover/zenon/isar-case.ts +0 -2
- package/src/prover/zenon/isar.ts +35 -37
- package/src/prover/zenon/llproof.ts +2 -13
- package/src/prover/zenon/mltoll.ts +12 -30
- package/src/prover/zenon/node.ts +20 -5
- package/src/prover/zenon/parse.ts +9 -8
- package/src/prover/zenon/phrase.ts +0 -2
- package/src/prover/zenon/proof.ts +0 -2
- package/src/prover/zenon/propositional-rules.ts +0 -2
- package/src/prover/zenon/rules.ts +0 -2
- package/src/prover/zenon/search.ts +11 -19
- package/src/prover/zenon/tla/functions.ts +2 -4
- package/src/prover/zenon/tla/llproof.ts +9 -13
- package/src/prover/zenon/tla/records.ts +1 -8
- package/src/prover/zenon/tla/rewrites.ts +0 -2
- package/src/prover/zenon/tla/sets.ts +22 -22
- package/src/prover/zenon/tla/terms.ts +0 -2
- package/src/prover/zenon/tla/tla.ts +7 -8
- package/src/resolve.ts +56 -74
- package/src/runtime.ts +4 -0
- 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 +155 -2625
- package/src/sany/levels.ts +0 -2
- package/src/sany/lexer.ts +17 -16
- package/src/sany/linter.ts +0 -2
- package/src/sany/nodes.ts +2 -3
- package/src/sany/report.ts +3 -6
- package/src/sany/selectors.ts +35 -38
- package/src/sany/xml.ts +23 -55
- package/src/search.ts +205 -43
- package/src/simulate.ts +157 -133
- package/src/spec-description.ts +33 -48
- package/src/standard-definitions.ts +4 -0
- package/src/standard-modules.ts +16 -32
- package/src/state-graph.ts +0 -2
- package/src/substitution-levels.ts +5 -4
- package/src/successors.ts +6 -8
- package/src/symmetry.ts +2 -2
- package/src/tableau.ts +2 -2
- package/src/tlc/fingerprint.ts +81 -9
- package/src/tlc/messages.ts +20 -15
- package/src/tlc/random.ts +4 -4
- package/src/tlc/replay.ts +8 -15
- package/src/tlc/summary.ts +29 -14
- package/src/tlc/tlc-operators.ts +2 -3
- package/src/tlc/tlcext-operators.ts +44 -12
- package/src/tlc/trace-spec.ts +21 -40
- package/src/typed-tier.ts +6535 -0
- package/src/typescript/actions.ts +2 -4
- package/src/typescript/collections.ts +34 -20
- package/src/typescript/compile.ts +1 -3
- package/src/typescript/formula.ts +5 -3
- package/src/typescript/model.ts +4 -5
- package/src/typescript/steps.ts +20 -18
- package/src/values.ts +62 -152
- package/src/prover/isabelle/isar/statement.ts +0 -52
- package/src/prover/smt/solver/z3-license.txt +0 -10
- package/src/prover/tlaps-module.ts +0 -510
- package/src/prover/zenon/LICENSE +0 -32
package/src/prover/zenon/node.ts
CHANGED
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Zenon's node.ml and heap.ml, as shipped in tlapm. Copyright 2001-2004 INRIA, see LICENSE.
|
|
2
|
-
|
|
3
1
|
import type { Expr } from "./expr";
|
|
4
2
|
import type { Rule } from "./proof";
|
|
5
3
|
|
|
@@ -95,7 +93,9 @@ export interface Queue {
|
|
|
95
93
|
instSize: List<[number, Heap]>;
|
|
96
94
|
instFront: List<Node>;
|
|
97
95
|
instBack: List<Node>;
|
|
98
|
-
|
|
96
|
+
// The OCaml words of the nodes inserted so far. Removed nodes still count, because the queues of
|
|
97
|
+
// the branches above keep them.
|
|
98
|
+
nodeWords: number;
|
|
99
99
|
}
|
|
100
100
|
|
|
101
101
|
const SMALL_INSTANCES = 16;
|
|
@@ -116,7 +116,7 @@ export const EMPTY_QUEUE: Queue = {
|
|
|
116
116
|
instSize: undefined,
|
|
117
117
|
instFront: undefined,
|
|
118
118
|
instBack: undefined,
|
|
119
|
-
|
|
119
|
+
nodeWords: 0,
|
|
120
120
|
};
|
|
121
121
|
|
|
122
122
|
const insertByGoalness = (list: List<[number, Heap]>, entry: Entry): List<[number, Heap]> => {
|
|
@@ -155,8 +155,23 @@ const canInstantiate = (meta: Expr, expression: Expr): boolean => {
|
|
|
155
155
|
}
|
|
156
156
|
};
|
|
157
157
|
|
|
158
|
+
// A list cell and a node record take 3 and 6 words, and each block has a header word.
|
|
159
|
+
const getNodeWords = (node: Node) => {
|
|
160
|
+
let words =
|
|
161
|
+
3 +
|
|
162
|
+
6 +
|
|
163
|
+
3 * node.conclusions.length +
|
|
164
|
+
1 +
|
|
165
|
+
node.rule.args.length +
|
|
166
|
+
(typeof node.priority === "object" ? 2 : 0) +
|
|
167
|
+
1 +
|
|
168
|
+
node.branches.length;
|
|
169
|
+
for (const branch of node.branches) words += 3 * branch.length;
|
|
170
|
+
return words;
|
|
171
|
+
};
|
|
172
|
+
|
|
158
173
|
export const insertNode = (previous: Queue, node: Node): Queue => {
|
|
159
|
-
const queue = { ...previous,
|
|
174
|
+
const queue = { ...previous, nodeWords: previous.nodeWords + getNodeWords(node) };
|
|
160
175
|
const priority = node.priority;
|
|
161
176
|
if (priority === "prop")
|
|
162
177
|
return node.branches.length < 2
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Zenon's lexzen.mll and parsezen.mly, as shipped in tlapm. Copyright 2005 INRIA, see LICENSE.
|
|
2
|
-
|
|
3
1
|
import { TlaZenonError } from "../../errors";
|
|
4
2
|
import {
|
|
5
3
|
FALSE,
|
|
@@ -123,16 +121,13 @@ export const parseZenon = (exprs: Expressions, text: string): Phrase[] => {
|
|
|
123
121
|
};
|
|
124
122
|
const tokens = tokenize(text);
|
|
125
123
|
let position = 0;
|
|
126
|
-
const peek = () => tokens[position];
|
|
127
124
|
const next = () => tokens[position++];
|
|
128
|
-
const expect = (kind: TokenKind
|
|
125
|
+
const expect = (kind: TokenKind) => {
|
|
129
126
|
const token = next();
|
|
130
|
-
if (token.kind !== kind
|
|
131
|
-
throw new TlaZenonError(`Zenon: line ${token.line}: syntax error`);
|
|
127
|
+
if (token.kind !== kind) throw new TlaZenonError(`Zenon: line ${token.line}: syntax error`);
|
|
132
128
|
return token;
|
|
133
129
|
};
|
|
134
|
-
const isAt = (kind: TokenKind
|
|
135
|
-
peek().kind === kind && (value === undefined || peek().text === value);
|
|
130
|
+
const isAt = (kind: TokenKind) => tokens[position].kind === kind;
|
|
136
131
|
|
|
137
132
|
const parseLambda = () => {
|
|
138
133
|
expect("open");
|
|
@@ -236,6 +231,12 @@ export const parseZenon = (exprs: Expressions, text: string): Phrase[] => {
|
|
|
236
231
|
kind: "def",
|
|
237
232
|
definition: { kind: "real", name, symbol, params, body },
|
|
238
233
|
});
|
|
234
|
+
} else if (token.kind === "keyword" && token.text === "$sig") {
|
|
235
|
+
expect("ident");
|
|
236
|
+
expect("open");
|
|
237
|
+
while (isAt("string")) next();
|
|
238
|
+
expect("close");
|
|
239
|
+
expect("string");
|
|
239
240
|
} else throw new TlaZenonError(`Zenon: line ${token.line}: unsupported phrase ${token.text}`);
|
|
240
241
|
}
|
|
241
242
|
return phrases;
|
|
@@ -1,7 +1,5 @@
|
|
|
1
|
-
// Ported from Zenon's prove.ml, as shipped in tlapm. Copyright 2002 INRIA, see LICENSE.
|
|
2
|
-
|
|
3
1
|
import { TlaZenonError } from "../../errors";
|
|
4
|
-
import { difference, isApp, isDisjoint, isMeta, union, type Expr } from "./expr";
|
|
2
|
+
import { difference, isApp, isDisjoint, isMeta, isRelation, union, type Expr } from "./expr";
|
|
5
3
|
import { getLimitFailure, type Limits } from "./limits";
|
|
6
4
|
import { EMPTY_QUEUE, getQueueHead, removeNode, type Node, type Queue } from "./node";
|
|
7
5
|
import { stableSort } from "./ocaml";
|
|
@@ -13,8 +11,7 @@ import { addNodes, type SearchContext } from "./rules";
|
|
|
13
11
|
const isTrivial = (context: SearchContext, formula: Expr) =>
|
|
14
12
|
formula.kind === "true" ||
|
|
15
13
|
(formula.kind === "not" && formula.args[0].kind === "false") ||
|
|
16
|
-
(formula
|
|
17
|
-
formula.args.length === 2 &&
|
|
14
|
+
(isRelation(formula) &&
|
|
18
15
|
formula.args[0] === formula.args[1] &&
|
|
19
16
|
context.relations.isReflexive(formula.symbol));
|
|
20
17
|
|
|
@@ -26,8 +23,7 @@ const reduceBranch = (context: SearchContext, branch: Expr[]) => {
|
|
|
26
23
|
const isKnown = (formula: Expr) => index.isMember(formula) || kept.includes(formula);
|
|
27
24
|
for (const formula of branch) {
|
|
28
25
|
if (
|
|
29
|
-
formula
|
|
30
|
-
(formula.kind === "not" && formula.args[0].kind === "false") ||
|
|
26
|
+
isTrivial(context, formula) ||
|
|
31
27
|
(formula.kind === "not" &&
|
|
32
28
|
isApp(formula.args[0], "TLA.in", 2) &&
|
|
33
29
|
formula.args[0].args[1].kind === "var" &&
|
|
@@ -35,15 +31,7 @@ const reduceBranch = (context: SearchContext, branch: Expr[]) => {
|
|
|
35
31
|
)
|
|
36
32
|
continue;
|
|
37
33
|
const atom = formula.kind === "not" ? formula.args[0] : formula;
|
|
38
|
-
|
|
39
|
-
if (
|
|
40
|
-
formula.kind === "app" &&
|
|
41
|
-
isRelation &&
|
|
42
|
-
formula.args[0] === formula.args[1] &&
|
|
43
|
-
relations.isReflexive(formula.symbol)
|
|
44
|
-
)
|
|
45
|
-
continue;
|
|
46
|
-
if (isRelation && relations.isSymmetric(atom.symbol)) {
|
|
34
|
+
if (isRelation(atom) && relations.isSymmetric(atom.symbol)) {
|
|
47
35
|
const swapped = exprs.eapp(atom.symbol, [atom.args[1], atom.args[0]]);
|
|
48
36
|
const reversed = formula.kind === "not" ? exprs.enot(swapped) : swapped;
|
|
49
37
|
if (!isKnown(formula) && !isKnown(reversed)) kept.unshift(formula);
|
|
@@ -137,8 +125,12 @@ interface SearchStatistics {
|
|
|
137
125
|
|
|
138
126
|
export type SearchFailure = "exhausted" | "time limit" | "memory limit" | "aborted";
|
|
139
127
|
|
|
140
|
-
//
|
|
141
|
-
|
|
128
|
+
// Zenon gives up once its heap passes 1 GB. Modeled as a 2M-word formula table, 20 words per formula
|
|
129
|
+
// created and 1.1 per word of queued nodes, the heap is within 8% of Zenon's past 600 MB on the corpus.
|
|
130
|
+
const getHeapWords = (context: SearchContext, queue: Queue) =>
|
|
131
|
+
2_000_000 + 20 * context.exprs.getCreatedCount() + 1.1 * queue.nodeWords;
|
|
132
|
+
|
|
133
|
+
const MAX_HEAP_WORDS = 1_000_000_000 / 8;
|
|
142
134
|
|
|
143
135
|
export const search = (
|
|
144
136
|
context: SearchContext,
|
|
@@ -231,7 +223,7 @@ export const search = (
|
|
|
231
223
|
for (;;) {
|
|
232
224
|
const limitFailure = getLimitFailure(limits);
|
|
233
225
|
if (limitFailure !== undefined) return limitFailure;
|
|
234
|
-
if (queue
|
|
226
|
+
if (getHeapWords(context, queue) > MAX_HEAP_WORDS) return "memory limit";
|
|
235
227
|
if (formIndex < forms.length) {
|
|
236
228
|
const entry = forms[formIndex++];
|
|
237
229
|
const formula = entry[0];
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Zenon's ext_tla.ml, as shipped in tlapm. Copyright 2008 INRIA, see LICENSE.
|
|
2
|
-
|
|
3
1
|
import { isApp } from "../expr";
|
|
4
2
|
import type { Priority } from "../node";
|
|
5
3
|
import { makeRule } from "../proof";
|
|
@@ -68,7 +66,7 @@ export const getFunctionSetNodes = (literal: Literal): Item[] | undefined => {
|
|
|
68
66
|
"arity",
|
|
69
67
|
makeRule("except_notin_funcset", [
|
|
70
68
|
formula,
|
|
71
|
-
exprs.enot(member(exprs, fcn.args[0],
|
|
69
|
+
exprs.enot(member(exprs, fcn.args[0], set)),
|
|
72
70
|
exprs.enot(member(exprs, fcn.args[2], target)),
|
|
73
71
|
fcn.args[0],
|
|
74
72
|
fcn.args[1],
|
|
@@ -77,7 +75,7 @@ export const getFunctionSetNodes = (literal: Literal): Item[] | undefined => {
|
|
|
77
75
|
target,
|
|
78
76
|
]),
|
|
79
77
|
[
|
|
80
|
-
[exprs.enot(member(exprs, fcn.args[0],
|
|
78
|
+
[exprs.enot(member(exprs, fcn.args[0], set))],
|
|
81
79
|
[exprs.enot(member(exprs, fcn.args[2], target))],
|
|
82
80
|
],
|
|
83
81
|
)
|
|
@@ -1,8 +1,6 @@
|
|
|
1
|
-
// Ported from Zenon's ext_tla.ml, as shipped in tlapm. Copyright 2008 INRIA, see LICENSE.
|
|
2
|
-
|
|
3
1
|
import { TlaZenonError } from "../../../errors";
|
|
4
2
|
import { difference, union, type Expr, type Expressions } from "../expr";
|
|
5
|
-
import {
|
|
3
|
+
import type { Lemma, LlProof, LlRule } from "../llproof";
|
|
6
4
|
import type { MlProof, Translated } from "../mltoll";
|
|
7
5
|
|
|
8
6
|
type LlArgs = [string, Expr[], Expr[], Expr[][]];
|
|
@@ -121,11 +119,7 @@ const SHAPES: Record<string, Shape> = {
|
|
|
121
119
|
if (third === undefined) throw getShapeError(name);
|
|
122
120
|
return [`zenon_${name}`, rest, [conclusion], [[first, second, third]]];
|
|
123
121
|
},
|
|
124
|
-
except_notin_funcset:
|
|
125
|
-
const [conclusion, first, second, ...rest] = args;
|
|
126
|
-
if (second === undefined) throw getShapeError(name);
|
|
127
|
-
return [`zenon_${name}`, rest, [conclusion], [[first], [second]]];
|
|
128
|
-
},
|
|
122
|
+
except_notin_funcset: beta,
|
|
129
123
|
notin_funcset: (name, args) => {
|
|
130
124
|
const [conclusion, first, second, third, ...rest] = args;
|
|
131
125
|
if (third === undefined) throw getShapeError(name);
|
|
@@ -381,16 +375,18 @@ export const postprocessTla = (exprs: Expressions, lemmas: Lemma[]): Lemma[] =>
|
|
|
381
375
|
case "imply":
|
|
382
376
|
case "equiv": {
|
|
383
377
|
const right = postprocess(expression.args[1]);
|
|
384
|
-
return
|
|
378
|
+
return exprs.binary(expression.kind, postprocess(expression.args[0]), right);
|
|
385
379
|
}
|
|
386
380
|
case "all":
|
|
387
|
-
return exprs.eall(expression.args[0], expression.symbol, postprocess(expression.args[1]));
|
|
388
381
|
case "ex":
|
|
389
|
-
return exprs.eex(expression.args[0], expression.symbol, postprocess(expression.args[1]));
|
|
390
382
|
case "tau":
|
|
391
|
-
return exprs.etau(expression.args[0], expression.symbol, postprocess(expression.args[1]));
|
|
392
383
|
case "lam":
|
|
393
|
-
return exprs.
|
|
384
|
+
return exprs.binder(
|
|
385
|
+
expression.kind,
|
|
386
|
+
expression.args[0],
|
|
387
|
+
expression.symbol,
|
|
388
|
+
postprocess(expression.args[1]),
|
|
389
|
+
);
|
|
394
390
|
}
|
|
395
391
|
})();
|
|
396
392
|
cache.set(expression, result);
|
|
@@ -1,6 +1,4 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
import { compareExprs, isApp, type Expr } from "../expr";
|
|
1
|
+
import { compareExprs, getStringName, isApp, type Expr } from "../expr";
|
|
4
2
|
import { stableSort } from "../ocaml";
|
|
5
3
|
import { makeRule } from "../proof";
|
|
6
4
|
import {
|
|
@@ -17,11 +15,6 @@ import {
|
|
|
17
15
|
type Literal,
|
|
18
16
|
} from "./terms";
|
|
19
17
|
|
|
20
|
-
const getStringName = (expression: Expr) =>
|
|
21
|
-
isApp(expression, "$string", 1) && expression.args[0].kind === "var"
|
|
22
|
-
? expression.args[0].symbol
|
|
23
|
-
: undefined;
|
|
24
|
-
|
|
25
18
|
const hasDistinctLabels = (pairs: [Expr, Expr][]) => {
|
|
26
19
|
for (let index = 0; index + 1 < pairs.length; index++) {
|
|
27
20
|
const left = pairs[index][0];
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Zenon's ext_tla.ml, as shipped in tlapm. Copyright 2008 INRIA, see LICENSE.
|
|
2
|
-
|
|
3
1
|
import { isApp, type Expr } from "../expr";
|
|
4
2
|
import { makeRule } from "../proof";
|
|
5
3
|
import {
|
|
@@ -25,6 +23,20 @@ const decomposeAdd = (set: Expr): [Expr[], Expr] => {
|
|
|
25
23
|
return [elements, rest];
|
|
26
24
|
};
|
|
27
25
|
|
|
26
|
+
const BINARY_SET_RULES = new Map<
|
|
27
|
+
string,
|
|
28
|
+
[
|
|
29
|
+
"in_cup" | "in_cap" | "in_setminus",
|
|
30
|
+
"notin_cup" | "notin_cap" | "notin_setminus",
|
|
31
|
+
boolean,
|
|
32
|
+
boolean,
|
|
33
|
+
]
|
|
34
|
+
>([
|
|
35
|
+
["TLA.cup", ["in_cup", "notin_cup", true, false]],
|
|
36
|
+
["TLA.cap", ["in_cap", "notin_cap", false, true]],
|
|
37
|
+
["TLA.setminus", ["in_setminus", "notin_setminus", false, true]],
|
|
38
|
+
]);
|
|
39
|
+
|
|
28
40
|
export const getMembershipNodes = (literal: Literal): Item[] | undefined => {
|
|
29
41
|
const exprs = literal.context.exprs;
|
|
30
42
|
const formula = literal.formula;
|
|
@@ -137,20 +149,7 @@ export const getMembershipNodes = (literal: Literal): Item[] | undefined => {
|
|
|
137
149
|
[[exists]],
|
|
138
150
|
);
|
|
139
151
|
}
|
|
140
|
-
const
|
|
141
|
-
string,
|
|
142
|
-
[
|
|
143
|
-
"in_cup" | "in_cap" | "in_setminus",
|
|
144
|
-
"notin_cup" | "notin_cap" | "notin_setminus",
|
|
145
|
-
boolean,
|
|
146
|
-
boolean,
|
|
147
|
-
]
|
|
148
|
-
> = {
|
|
149
|
-
"TLA.cup": ["in_cup", "notin_cup", true, false],
|
|
150
|
-
"TLA.cap": ["in_cap", "notin_cap", false, true],
|
|
151
|
-
"TLA.setminus": ["in_setminus", "notin_setminus", false, true],
|
|
152
|
-
};
|
|
153
|
-
const binarySetRule = set.kind === "app" ? binarySetRules[set.symbol] : undefined;
|
|
152
|
+
const binarySetRule = set.kind === "app" ? BINARY_SET_RULES.get(set.symbol) : undefined;
|
|
154
153
|
if (binarySetRule !== undefined && set.args.length === 2) {
|
|
155
154
|
const first = member(exprs, element, set.args[0]);
|
|
156
155
|
const secondPositive = member(exprs, element, set.args[1]);
|
|
@@ -315,17 +314,18 @@ export const getSubsetNodes = (literal: Literal): Item[] | undefined => {
|
|
|
315
314
|
]);
|
|
316
315
|
}
|
|
317
316
|
if (isApp(right, "TLA.cap", 2)) {
|
|
318
|
-
//
|
|
319
|
-
const
|
|
317
|
+
// Deviation from Zenon: ext_tla.ml builds both subsets from the second set, which is unsound.
|
|
318
|
+
const first = exprs.eapp("TLA.subseteq", [left, right.args[0]]);
|
|
319
|
+
const second = exprs.eapp("TLA.subseteq", [left, right.args[1]]);
|
|
320
320
|
return isNegated
|
|
321
321
|
? makeExtensionNode(
|
|
322
322
|
literal,
|
|
323
323
|
"arity",
|
|
324
|
-
makeRule("not_subseteq_cap", [formula, exprs.enot(
|
|
325
|
-
[[exprs.enot(
|
|
324
|
+
makeRule("not_subseteq_cap", [formula, exprs.enot(first), exprs.enot(second)]),
|
|
325
|
+
[[exprs.enot(first)], [exprs.enot(second)]],
|
|
326
326
|
)
|
|
327
|
-
: makeExtensionNode(literal, "arity", makeRule("subseteq_cap", [formula,
|
|
328
|
-
[
|
|
327
|
+
: makeExtensionNode(literal, "arity", makeRule("subseteq_cap", [formula, first, second]), [
|
|
328
|
+
[first, second],
|
|
329
329
|
]);
|
|
330
330
|
}
|
|
331
331
|
}
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Zenon's ext_tla.ml, as shipped in tlapm. Copyright 2008 INRIA, see LICENSE.
|
|
2
|
-
|
|
3
1
|
import { TlaZenonError } from "../../../errors";
|
|
4
2
|
import { isApp, isRelation, type Expr, type Expressions, type RelationExpr } from "../expr";
|
|
5
3
|
import type { Index } from "../index-table";
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Zenon's ext_tla.ml, as shipped in tlapm. Copyright 2008 INRIA, see LICENSE.
|
|
2
|
-
|
|
3
1
|
import {
|
|
4
2
|
FALSE,
|
|
5
3
|
isApp,
|
|
@@ -410,14 +408,13 @@ const getBoundedInstances = (context: TlaContext, formula: Expr, goalness: numbe
|
|
|
410
408
|
|
|
411
409
|
const makePropositionEqualityNode = (
|
|
412
410
|
exprs: Expressions,
|
|
413
|
-
|
|
411
|
+
isNegated: boolean,
|
|
412
|
+
isLeft: boolean,
|
|
414
413
|
formula: Expr,
|
|
415
414
|
left: Expr,
|
|
416
415
|
right: Expr,
|
|
417
416
|
goalness: number,
|
|
418
417
|
): Node => {
|
|
419
|
-
const isNegated = name === "np_eq_l" || name === "np_eq_r";
|
|
420
|
-
const isLeft = name === "p_eq_l" || name === "np_eq_l";
|
|
421
418
|
const proposition = isNegated && formula.kind === "not" ? formula.args[0] : formula;
|
|
422
419
|
const equality = equal(exprs, left, right);
|
|
423
420
|
const differ = exprs.enot(equal(exprs, proposition, isLeft ? left : right));
|
|
@@ -426,7 +423,7 @@ const makePropositionEqualityNode = (
|
|
|
426
423
|
return {
|
|
427
424
|
conclusions: [formula, equality],
|
|
428
425
|
rule: makeRule(
|
|
429
|
-
|
|
426
|
+
isNegated ? (isLeft ? "np_eq_l" : "np_eq_r") : isLeft ? "p_eq_l" : "p_eq_r",
|
|
430
427
|
isNegated
|
|
431
428
|
? [formula, equality, differ, rest, proposition, left, right]
|
|
432
429
|
: [formula, equality, differ, other, formula, left, right],
|
|
@@ -446,7 +443,8 @@ const getPropositionEqualityNodes = (context: TlaContext, formula: Expr, goalnes
|
|
|
446
443
|
const make = (isLeft: boolean) => (entry: [RelationExpr, number]) =>
|
|
447
444
|
makePropositionEqualityNode(
|
|
448
445
|
exprs,
|
|
449
|
-
isNegated
|
|
446
|
+
isNegated,
|
|
447
|
+
isLeft,
|
|
450
448
|
formula,
|
|
451
449
|
entry[0].args[0],
|
|
452
450
|
entry[0].args[1],
|
|
@@ -471,7 +469,8 @@ const getEqualityPropositionNodes = (
|
|
|
471
469
|
const make = (isNegated: boolean) => (entry: [Expr, number]) =>
|
|
472
470
|
makePropositionEqualityNode(
|
|
473
471
|
exprs,
|
|
474
|
-
isNegated
|
|
472
|
+
isNegated,
|
|
473
|
+
isLeft,
|
|
475
474
|
entry[0],
|
|
476
475
|
formula.args[0],
|
|
477
476
|
formula.args[1],
|
package/src/resolve.ts
CHANGED
|
@@ -850,7 +850,7 @@ const resolveDefinitions = (
|
|
|
850
850
|
range: definition.location.range,
|
|
851
851
|
parent: current,
|
|
852
852
|
};
|
|
853
|
-
if (isInstantiated(definition)) return local;
|
|
853
|
+
if (isInstantiated(definition)) return { ...local, params: getParamArities(definition) };
|
|
854
854
|
const isInstanced = instances.some((instance) => instance.location === definition.location);
|
|
855
855
|
const isGenerated = unit.isGenerated || definition.isLocal || isKey(definition.name);
|
|
856
856
|
const inner = isInstanced
|
|
@@ -899,7 +899,6 @@ const isInstanceArityReported = (
|
|
|
899
899
|
return true;
|
|
900
900
|
};
|
|
901
901
|
|
|
902
|
-
// Deviation from SANY: an operator whose parameters tla-ts does not know takes any argument.
|
|
903
902
|
const resolveApply = (
|
|
904
903
|
expression: Expression & { kind: "Apply" },
|
|
905
904
|
scope: LocalName | undefined,
|
|
@@ -1581,41 +1580,44 @@ export const resolveModule = (module: Module, unit: ModuleUnit) => {
|
|
|
1581
1580
|
);
|
|
1582
1581
|
const recursive = new Set<Binding>();
|
|
1583
1582
|
const declarations: { declaration: Declaration; binding: ModuleBinding | undefined }[] = [];
|
|
1584
|
-
const
|
|
1583
|
+
const createCheck = (
|
|
1585
1584
|
location: SourceLocation,
|
|
1586
1585
|
self: Definition | undefined,
|
|
1587
|
-
errors: SanyError[],
|
|
1588
|
-
warnings: SanyError[],
|
|
1589
1586
|
hasLabelScope: boolean,
|
|
1590
|
-
|
|
1591
|
-
|
|
1592
|
-
getInstance: unit.getInstance,
|
|
1593
|
-
definitions: unit.definitions,
|
|
1594
|
-
getKey: unit.getKey,
|
|
1587
|
+
check: (inner: Unit) => void,
|
|
1588
|
+
): SemanticUnit => ({
|
|
1595
1589
|
location,
|
|
1596
|
-
|
|
1597
|
-
|
|
1598
|
-
|
|
1599
|
-
|
|
1600
|
-
|
|
1601
|
-
|
|
1602
|
-
|
|
1603
|
-
|
|
1604
|
-
|
|
1605
|
-
|
|
1606
|
-
|
|
1607
|
-
|
|
1590
|
+
check: (errors, warnings) =>
|
|
1591
|
+
check({
|
|
1592
|
+
imported: symbols,
|
|
1593
|
+
getInstance: unit.getInstance,
|
|
1594
|
+
definitions: unit.definitions,
|
|
1595
|
+
getKey: unit.getKey,
|
|
1596
|
+
location,
|
|
1597
|
+
self,
|
|
1598
|
+
facts,
|
|
1599
|
+
goals,
|
|
1600
|
+
bindings,
|
|
1601
|
+
errors,
|
|
1602
|
+
warnings,
|
|
1603
|
+
hasLabelScope,
|
|
1604
|
+
isLabelForbidden: false,
|
|
1605
|
+
isInExcept: false,
|
|
1606
|
+
labelParams: [],
|
|
1607
|
+
labels: new Set(),
|
|
1608
|
+
isGenerated: false,
|
|
1609
|
+
}),
|
|
1608
1610
|
});
|
|
1609
1611
|
const bindDeclarations = (declarations: Declaration[], kind: "Constant" | "Variable") =>
|
|
1610
|
-
declarations.map((declaration) =>
|
|
1611
|
-
|
|
1612
|
-
check: (errors: SanyError[], warnings: SanyError[]) =>
|
|
1612
|
+
declarations.map((declaration) =>
|
|
1613
|
+
createCheck(declaration.location, undefined, false, (inner) =>
|
|
1613
1614
|
bindModuleName(
|
|
1614
1615
|
declaration.name,
|
|
1615
1616
|
{ kind, arity: declaration.arity, range: declaration.location.range },
|
|
1616
|
-
|
|
1617
|
+
inner,
|
|
1617
1618
|
),
|
|
1618
|
-
|
|
1619
|
+
),
|
|
1620
|
+
);
|
|
1619
1621
|
return collectSemanticErrors(
|
|
1620
1622
|
[
|
|
1621
1623
|
...unit.reports.map((report) => ({
|
|
@@ -1629,9 +1631,8 @@ export const resolveModule = (module: Module, unit: ModuleUnit) => {
|
|
|
1629
1631
|
...bindDeclarations(module.variables, "Variable"),
|
|
1630
1632
|
...module.units
|
|
1631
1633
|
.flatMap((item) => (item.kind === "Recursive" ? item.declarations : []))
|
|
1632
|
-
.map((declaration) =>
|
|
1633
|
-
|
|
1634
|
-
check: (errors: SanyError[], warnings: SanyError[]) => {
|
|
1634
|
+
.map((declaration) =>
|
|
1635
|
+
createCheck(declaration.location, undefined, false, (inner) => {
|
|
1635
1636
|
const binding: ModuleBinding = {
|
|
1636
1637
|
kind: "Definition",
|
|
1637
1638
|
arity: declaration.arity,
|
|
@@ -1643,19 +1644,17 @@ export const resolveModule = (module: Module, unit: ModuleUnit) => {
|
|
|
1643
1644
|
declaration.name,
|
|
1644
1645
|
bindings.get(declaration.name),
|
|
1645
1646
|
binding,
|
|
1646
|
-
|
|
1647
|
+
inner,
|
|
1647
1648
|
);
|
|
1648
1649
|
if (isBound) {
|
|
1649
1650
|
bindings.set(declaration.name, binding);
|
|
1650
1651
|
recursive.add(binding);
|
|
1651
1652
|
}
|
|
1652
1653
|
declarations.push({ declaration, binding: isBound ? binding : undefined });
|
|
1653
|
-
},
|
|
1654
|
-
|
|
1655
|
-
...module.definitions.map((definition) =>
|
|
1656
|
-
|
|
1657
|
-
check: (errors: SanyError[], warnings: SanyError[]) => {
|
|
1658
|
-
const inner = createUnit(definition.location, definition, errors, warnings, true);
|
|
1654
|
+
}),
|
|
1655
|
+
),
|
|
1656
|
+
...module.definitions.map((definition) =>
|
|
1657
|
+
createCheck(definition.location, definition, true, (inner) => {
|
|
1659
1658
|
if (isTheoremDefinition(module, definition)) {
|
|
1660
1659
|
resolveExpression(definition.body, undefined, inner);
|
|
1661
1660
|
} else if (resolveDefinition(definition, undefined, inner, recursive)) {
|
|
@@ -1666,12 +1665,10 @@ export const resolveModule = (module: Module, unit: ModuleUnit) => {
|
|
|
1666
1665
|
position: definition.location,
|
|
1667
1666
|
});
|
|
1668
1667
|
}
|
|
1669
|
-
},
|
|
1670
|
-
|
|
1671
|
-
...module.instances.map((instance) =>
|
|
1672
|
-
|
|
1673
|
-
check: (errors: SanyError[], warnings: SanyError[]) => {
|
|
1674
|
-
const inner = createUnit(instance.location, undefined, errors, warnings, false);
|
|
1668
|
+
}),
|
|
1669
|
+
),
|
|
1670
|
+
...module.instances.map((instance) =>
|
|
1671
|
+
createCheck(instance.location, undefined, false, (inner) => {
|
|
1675
1672
|
bindParams(undefined, instance.params, inner);
|
|
1676
1673
|
unit.instanced
|
|
1677
1674
|
.get(instance)
|
|
@@ -1683,18 +1680,10 @@ export const resolveModule = (module: Module, unit: ModuleUnit) => {
|
|
|
1683
1680
|
inner,
|
|
1684
1681
|
);
|
|
1685
1682
|
}
|
|
1686
|
-
},
|
|
1687
|
-
|
|
1688
|
-
...module.assumptions.map((assumption) =>
|
|
1689
|
-
location
|
|
1690
|
-
check: (errors: SanyError[], warnings: SanyError[]) => {
|
|
1691
|
-
const inner = createUnit(
|
|
1692
|
-
assumption.location,
|
|
1693
|
-
undefined,
|
|
1694
|
-
errors,
|
|
1695
|
-
warnings,
|
|
1696
|
-
assumption.name !== undefined,
|
|
1697
|
-
);
|
|
1683
|
+
}),
|
|
1684
|
+
),
|
|
1685
|
+
...module.assumptions.map((assumption) =>
|
|
1686
|
+
createCheck(assumption.location, undefined, assumption.name !== undefined, (inner) => {
|
|
1698
1687
|
resolveExpression(assumption.expression, undefined, inner);
|
|
1699
1688
|
if (assumption.name !== undefined) {
|
|
1700
1689
|
bindModuleName(
|
|
@@ -1703,25 +1692,18 @@ export const resolveModule = (module: Module, unit: ModuleUnit) => {
|
|
|
1703
1692
|
inner,
|
|
1704
1693
|
);
|
|
1705
1694
|
}
|
|
1706
|
-
},
|
|
1707
|
-
|
|
1708
|
-
...module.theorems.map((theorem) =>
|
|
1709
|
-
location
|
|
1710
|
-
|
|
1711
|
-
|
|
1712
|
-
|
|
1713
|
-
|
|
1714
|
-
|
|
1715
|
-
|
|
1716
|
-
|
|
1717
|
-
|
|
1718
|
-
check: (errors: SanyError[], warnings: SanyError[]) =>
|
|
1719
|
-
checkFacts(
|
|
1720
|
-
use.facts,
|
|
1721
|
-
undefined,
|
|
1722
|
-
createUnit(use.location, undefined, errors, warnings, false),
|
|
1723
|
-
),
|
|
1724
|
-
})),
|
|
1695
|
+
}),
|
|
1696
|
+
),
|
|
1697
|
+
...module.theorems.map((theorem) =>
|
|
1698
|
+
createCheck(theorem.location, undefined, theorem.name !== undefined, (inner) =>
|
|
1699
|
+
resolveTheorem(theorem, inner),
|
|
1700
|
+
),
|
|
1701
|
+
),
|
|
1702
|
+
...module.uses.map((use) =>
|
|
1703
|
+
createCheck(use.location, undefined, false, (inner) =>
|
|
1704
|
+
checkFacts(use.facts, undefined, inner),
|
|
1705
|
+
),
|
|
1706
|
+
),
|
|
1725
1707
|
{
|
|
1726
1708
|
location: module.location.range?.end ?? module.location,
|
|
1727
1709
|
check: (errors: SanyError[]) =>
|
package/src/runtime.ts
CHANGED
|
@@ -19,6 +19,7 @@ export interface CheckerRuntime {
|
|
|
19
19
|
| undefined;
|
|
20
20
|
evaluateAtStartup: <Result>(evaluate: () => Result) => Result;
|
|
21
21
|
pause: (() => void) | undefined;
|
|
22
|
+
readLine: (() => string | undefined) | undefined;
|
|
22
23
|
warn: (code: number, text: string) => void;
|
|
23
24
|
isWarningEnabled: boolean;
|
|
24
25
|
isTool: boolean;
|
|
@@ -26,6 +27,7 @@ export interface CheckerRuntime {
|
|
|
26
27
|
seed: bigint;
|
|
27
28
|
isSeen: (state: Value[]) => boolean;
|
|
28
29
|
getSuccessorAction: (state: Value[], next: Value[]) => SpecAction | undefined;
|
|
30
|
+
toRecord: (state: Value[]) => Record<string, Value>;
|
|
29
31
|
generatedStates: number;
|
|
30
32
|
distinctStates: number;
|
|
31
33
|
initialStates: number;
|
|
@@ -54,6 +56,7 @@ export const createRuntime = (checkDeadlock: boolean, seed = 0n): CheckerRuntime
|
|
|
54
56
|
deferred: undefined,
|
|
55
57
|
isSeen: () => false,
|
|
56
58
|
getSuccessorAction: () => undefined,
|
|
59
|
+
toRecord: () => ({}),
|
|
57
60
|
setLivenessSource: () => {},
|
|
58
61
|
getCurrentState: () => undefined,
|
|
59
62
|
getFingerprint: getTlcFingerprint,
|
|
@@ -77,6 +80,7 @@ export const createRuntime = (checkDeadlock: boolean, seed = 0n): CheckerRuntime
|
|
|
77
80
|
}
|
|
78
81
|
},
|
|
79
82
|
pause: undefined,
|
|
83
|
+
readLine: undefined,
|
|
80
84
|
warn: () => {},
|
|
81
85
|
isWarningEnabled: true,
|
|
82
86
|
isTool: false,
|