tla-ts 0.0.10-dev.b4a856304 → 0.0.10-dev.d618a2d79
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +2 -1
- package/dist/compile.cjs +6 -6
- package/dist/compile.js +10 -10
- package/dist/deciders.cjs +41 -37
- package/dist/deciders.js +57 -53
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +37 -0
- package/dist/index.d.ts +37 -0
- package/dist/index.js +1 -1
- package/dist/parallel-worker.cjs +1 -1
- package/dist/parallel-worker.js +1 -1
- package/dist/prove.cjs +2683 -427
- package/dist/prove.js +2681 -425
- package/dist/run.cjs +47 -44
- package/dist/run.js +47 -44
- package/dist/tlapm.cjs +2 -2
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +44 -41
- package/dist/transfer.js +44 -41
- package/dist/worker.cjs +7 -7
- package/dist/worker.js +7 -7
- package/package.json +1 -1
- package/src/ast.ts +41 -41
- package/src/bags.ts +2 -5
- package/src/builtins.ts +5 -21
- package/src/check-failure.ts +116 -0
- package/src/check-trace.ts +268 -0
- package/src/check.ts +474 -718
- package/src/cli/options.ts +6 -31
- package/src/cli/run.ts +0 -2
- package/src/cli/runtime-invariants.ts +8 -7
- package/src/cli/shared.ts +1 -5
- package/src/cli/tlapm.ts +433 -70
- package/src/cli/tlc-arguments.ts +244 -238
- package/src/cli/tlc-output.ts +687 -0
- package/src/cli/tlc-usage.ts +3 -5
- 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 +3 -10
- package/src/dependencies.ts +30 -14
- package/src/dfid.ts +16 -16
- package/src/environment-config.ts +315 -0
- package/src/environment.ts +55 -338
- package/src/errors.ts +33 -5
- package/src/evaluate.ts +31 -106
- package/src/exit-codes.ts +2 -0
- package/src/fingerprints.ts +65 -1
- package/src/instances.ts +47 -10
- package/src/java-hash.ts +7 -0
- package/src/java-overrides.ts +4 -9
- package/src/json-reader.ts +1 -2
- package/src/json.ts +8 -18
- package/src/levels.ts +46 -57
- package/src/lexer.ts +76 -85
- package/src/liveness-checker.ts +616 -306
- package/src/liveness.ts +104 -120
- package/src/obligations/action.ts +14 -17
- package/src/obligations/anonymize.ts +37 -16
- package/src/obligations/enabled-axioms.ts +218 -0
- package/src/obligations/equality.ts +1 -3
- package/src/obligations/expression.ts +36 -8
- package/src/obligations/format.ts +0 -2
- package/src/obligations/generate.ts +66 -54
- package/src/obligations/index.ts +38 -8
- package/src/obligations/levels.ts +24 -11
- package/src/obligations/module.ts +28 -41
- package/src/obligations/normalize.ts +26 -14
- package/src/obligations/operators.ts +0 -2
- package/src/obligations/pragma.ts +53 -16
- package/src/obligations/printer.ts +43 -13
- package/src/obligations/proof.ts +3 -2
- package/src/obligations/regroup.ts +0 -2
- package/src/obligations/simplify.ts +55 -50
- package/src/obligations/source.ts +118 -74
- package/src/obligations/subexpression.ts +45 -18
- package/src/obligations/substitution.ts +1 -3
- package/src/obligations/temporal.ts +5 -7
- package/src/obligations/tuples.ts +0 -2
- package/src/parallel-worker.ts +10 -30
- package/src/parallel.ts +50 -80
- package/src/parser.ts +722 -385
- package/src/pcal/ast.ts +53 -65
- package/src/pcal/parse.ts +144 -191
- package/src/pcal/tokenize.ts +91 -115
- package/src/pcal/translate.ts +83 -98
- package/src/pcal/validate.ts +48 -50
- package/src/pretty-print.ts +7 -7
- package/src/prover/decide-pool.ts +3 -3
- package/src/prover/deciders.ts +12 -9
- package/src/prover/isabelle/decide.ts +3 -25
- package/src/prover/isabelle/encode.ts +72 -42
- package/src/prover/isabelle/isar/attrib.ts +250 -0
- package/src/prover/isabelle/isar/context.ts +335 -0
- package/src/prover/isabelle/isar/induct.ts +382 -0
- package/src/prover/isabelle/isar/inner-syntax.ts +158 -7
- package/src/prover/isabelle/isar/method.ts +509 -212
- package/src/prover/isabelle/isar/proof.ts +570 -14
- package/src/prover/isabelle/isar/rule-cases.ts +224 -0
- package/src/prover/isabelle/isar/theory.ts +487 -76
- package/src/prover/isabelle/isar/toplevel.ts +331 -0
- package/src/prover/isabelle/isar/type-check.ts +89 -14
- package/src/prover/isabelle/provers/blast/blast.ts +7 -65
- package/src/prover/isabelle/provers/blast/branch.ts +0 -2
- package/src/prover/isabelle/provers/blast/prove.ts +0 -2
- package/src/prover/isabelle/provers/blast/rules.ts +0 -2
- package/src/prover/isabelle/provers/blast/state.ts +0 -2
- package/src/prover/isabelle/provers/blast/term.ts +0 -2
- package/src/prover/isabelle/provers/clasimp.ts +0 -2
- package/src/prover/isabelle/provers/classical.ts +45 -20
- package/src/prover/isabelle/provers/hypsubst.ts +17 -28
- package/src/prover/isabelle/pure/bicompose.ts +9 -27
- package/src/prover/isabelle/pure/consts.ts +0 -2
- package/src/prover/isabelle/pure/conv.ts +2 -10
- package/src/prover/isabelle/pure/drule.ts +72 -6
- package/src/prover/isabelle/pure/envir.ts +0 -2
- package/src/prover/isabelle/pure/goal.ts +1 -3
- package/src/prover/isabelle/pure/logic.ts +1 -3
- package/src/prover/isabelle/pure/name.ts +0 -2
- package/src/prover/isabelle/pure/net.ts +0 -2
- package/src/prover/isabelle/pure/object-logic.ts +13 -7
- package/src/prover/isabelle/pure/pattern.ts +0 -2
- package/src/prover/isabelle/pure/raw-simplifier.ts +4 -15
- package/src/prover/isabelle/pure/rewriter.ts +6 -17
- package/src/prover/isabelle/pure/search.ts +0 -2
- package/src/prover/isabelle/pure/seq.ts +0 -2
- package/src/prover/isabelle/pure/simplifier.ts +26 -7
- package/src/prover/isabelle/pure/table.ts +2 -3
- package/src/prover/isabelle/pure/tactic.ts +0 -2
- package/src/prover/isabelle/pure/tactical.ts +42 -37
- package/src/prover/isabelle/pure/term-ord.ts +0 -2
- package/src/prover/isabelle/pure/term.ts +0 -2
- package/src/prover/isabelle/pure/thm.ts +14 -13
- package/src/prover/isabelle/pure/type.ts +0 -2
- package/src/prover/isabelle/pure/unify.ts +0 -2
- package/src/prover/isabelle/pure/variable.ts +0 -2
- package/src/prover/isabelle/tla/classical-setup.ts +18 -16
- package/src/prover/isabelle/tla/context.ts +58 -11
- package/src/prover/isabelle/tla/logic-data.ts +1 -1
- package/src/prover/isabelle/tla/logic.ts +49 -21
- package/src/prover/isabelle/tla/simpdata.ts +1 -12
- package/src/prover/isabelle/tools/intuitionistic.ts +28 -12
- package/src/prover/ocaml.ts +4 -1
- package/src/prover/prep/action.ts +30 -31
- package/src/prover/prep/enabled-axioms.ts +11 -2
- package/src/prover/prep/fingerprint.ts +2 -5
- package/src/prover/prep/methods.ts +181 -51
- package/src/prover/prep/normalize.ts +38 -9
- package/src/prover/prove.ts +395 -94
- package/src/prover/ptl/decide.ts +95 -50
- package/src/prover/ptl/encode.ts +2 -3
- package/src/prover/ptl/tableau.ts +28 -2
- package/src/prover/smt/arithmetic.ts +310 -0
- package/src/prover/smt/axioms.ts +12 -8
- package/src/prover/smt/context.ts +43 -8
- package/src/prover/smt/data.ts +498 -379
- package/src/prover/smt/encode.ts +148 -57
- package/src/prover/smt/extensionality.ts +5 -3
- package/src/prover/smt/flatten.ts +4 -6
- package/src/prover/smt/format.ts +28 -4
- package/src/prover/smt/instances.ts +7 -1
- package/src/prover/smt/layout.ts +91 -0
- package/src/prover/smt/rewrite.ts +1021 -618
- package/src/prover/smt/simplify.ts +441 -0
- package/src/prover/smt/solver/ackermannize-bv-tactic.ts +61 -0
- package/src/prover/smt/solver/ackr-helper.ts +179 -0
- package/src/prover/smt/solver/ackr-model-converter.ts +105 -0
- package/src/prover/smt/solver/act-cache.ts +0 -1
- package/src/prover/smt/solver/add-bounds-tactic.ts +59 -0
- package/src/prover/smt/solver/aig-tactic.ts +52 -0
- package/src/prover/smt/solver/aig.ts +889 -0
- package/src/prover/smt/solver/arith-rewriter.ts +613 -6
- package/src/prover/smt/solver/arith-terms.ts +121 -0
- package/src/prover/smt/solver/array-decl-plugin.ts +175 -0
- package/src/prover/smt/solver/array-rewriter.ts +309 -0
- package/src/prover/smt/solver/asserted-formulas.ts +87 -16
- package/src/prover/smt/solver/ast-lt.ts +166 -12
- package/src/prover/smt/solver/ast-util.ts +160 -2
- package/src/prover/smt/solver/ast.ts +1427 -41
- package/src/prover/smt/solver/auf-solver.ts +2 -6
- package/src/prover/smt/solver/bit-blast-tactic.ts +582 -0
- package/src/prover/smt/solver/bit-blaster.ts +871 -0
- package/src/prover/smt/solver/bound-manager.ts +196 -0
- package/src/prover/smt/solver/bound-simplifier.ts +600 -0
- package/src/prover/smt/solver/bv-bound-chk.ts +492 -0
- package/src/prover/smt/solver/bv-decl-plugin.ts +338 -0
- package/src/prover/smt/solver/bv-divrem-bounds.ts +95 -0
- package/src/prover/smt/solver/bv-rewriter.ts +1901 -0
- package/src/prover/smt/solver/bv1-blast.ts +214 -0
- package/src/prover/smt/solver/bv2fpa-converter.ts +174 -0
- package/src/prover/smt/solver/bv2int-rewriter.ts +544 -0
- package/src/prover/smt/solver/bv2real-rewriter.ts +533 -0
- package/src/prover/smt/solver/card2bv.ts +110 -0
- package/src/prover/smt/solver/case-split-queue.ts +0 -2
- package/src/prover/smt/solver/cg-table.ts +39 -25
- package/src/prover/smt/solver/check-logic.ts +330 -0
- package/src/prover/smt/solver/clause.ts +0 -1
- package/src/prover/smt/solver/cofactor-elim-term-ite.ts +278 -0
- package/src/prover/smt/solver/conflict-resolution.ts +78 -2
- package/src/prover/smt/solver/context.ts +516 -115
- package/src/prover/smt/solver/ctx-simplify.ts +20 -10
- package/src/prover/smt/solver/ctx-solver-simplify.ts +122 -0
- package/src/prover/smt/solver/datatype-decl-plugin.ts +572 -0
- package/src/prover/smt/solver/datatype-rewriter.ts +82 -0
- package/src/prover/smt/solver/demodulator.ts +786 -0
- package/src/prover/smt/solver/dependent-expr-state.ts +81 -0
- package/src/prover/smt/solver/der.ts +38 -10
- package/src/prover/smt/solver/diff-neq.ts +206 -0
- package/src/prover/smt/solver/distribute-forall.ts +57 -0
- package/src/prover/smt/solver/dom-simplify.ts +511 -0
- package/src/prover/smt/solver/dt2bv-tactic.ts +260 -0
- package/src/prover/smt/solver/dyn-ack.ts +0 -1
- package/src/prover/smt/solver/e-matching.ts +7 -8
- package/src/prover/smt/solver/elim-small-bv-tactic.ts +129 -0
- package/src/prover/smt/solver/elim-uncnstr.ts +545 -0
- package/src/prover/smt/solver/enode.ts +100 -3
- package/src/prover/smt/solver/eq2bv-tactic.ts +218 -0
- package/src/prover/smt/solver/euf/arith-axioms.ts +403 -0
- package/src/prover/smt/solver/euf/arith-internalize.ts +653 -0
- package/src/prover/smt/solver/euf/arith-solver.ts +889 -0
- package/src/prover/smt/solver/euf/array-axioms.ts +527 -0
- package/src/prover/smt/solver/euf/array-internalize.ts +428 -0
- package/src/prover/smt/solver/euf/array-solver.ts +306 -0
- package/src/prover/smt/solver/euf/bv-ackerman.ts +162 -0
- package/src/prover/smt/solver/euf/bv-internalize.ts +748 -0
- package/src/prover/smt/solver/euf/bv-solver.ts +449 -0
- package/src/prover/smt/solver/euf/dt-solver.ts +618 -0
- package/src/prover/smt/solver/euf/egraph.ts +908 -0
- package/src/prover/smt/solver/euf/euf-solver.ts +1205 -0
- package/src/prover/smt/solver/euf/fpa-solver.ts +317 -0
- package/src/prover/smt/solver/euf/mam.ts +1050 -0
- package/src/prover/smt/solver/euf/q-ematch.ts +830 -0
- package/src/prover/smt/solver/euf/q-mbi.ts +587 -0
- package/src/prover/smt/solver/euf/q-model-fixer.ts +296 -0
- package/src/prover/smt/solver/euf/q-solver.ts +361 -0
- package/src/prover/smt/solver/euf/th-solver.ts +335 -0
- package/src/prover/smt/solver/euf/th-solvers.ts +30 -0
- package/src/prover/smt/solver/expr-ref.ts +0 -1
- package/src/prover/smt/solver/expr-safe-replace.ts +26 -2
- package/src/prover/smt/solver/expr2polynomial.ts +146 -0
- package/src/prover/smt/solver/factor.ts +141 -0
- package/src/prover/smt/solver/fd-solver.ts +265 -0
- package/src/prover/smt/solver/fingerprints.ts +15 -15
- package/src/prover/smt/solver/fix-dl-var.ts +148 -0
- package/src/prover/smt/solver/flat-literals.ts +0 -1
- package/src/prover/smt/solver/fm-tactic.ts +884 -0
- package/src/prover/smt/solver/fpa-decl-plugin.ts +618 -0
- package/src/prover/smt/solver/fpa-rewriter.ts +640 -0
- package/src/prover/smt/solver/fpa2bv-converter.ts +2249 -0
- package/src/prover/smt/solver/fpa2bv-rewriter.ts +348 -0
- package/src/prover/smt/solver/fpa2bv-tactic.ts +73 -0
- package/src/prover/smt/solver/goal.ts +175 -15
- package/src/prover/smt/solver/goal2nlsat.ts +189 -0
- package/src/prover/smt/solver/guard-set.ts +219 -0
- package/src/prover/smt/solver/hash.ts +0 -1
- package/src/prover/smt/solver/hashtable.ts +30 -16
- package/src/prover/smt/solver/inf-eps.ts +63 -0
- package/src/prover/smt/solver/inj-axiom.ts +101 -0
- package/src/prover/smt/solver/internalizer.ts +110 -38
- package/src/prover/smt/solver/lackr.ts +381 -0
- package/src/prover/smt/solver/lbool.ts +0 -1
- package/src/prover/smt/solver/lia2card.ts +268 -0
- package/src/prover/smt/solver/lia2pb.ts +154 -0
- package/src/prover/smt/solver/literal.ts +0 -1
- package/src/prover/smt/solver/logic-tactics.ts +345 -0
- package/src/prover/smt/solver/lp/bound-propagator.ts +0 -1
- package/src/prover/smt/solver/lp/constraints.ts +0 -1
- package/src/prover/smt/solver/lp/containers.ts +7 -2
- package/src/prover/smt/solver/lp/core-solver.ts +18 -3
- package/src/prover/smt/solver/lp/cross-nested.ts +1 -4
- package/src/prover/smt/solver/lp/dep-intervals.ts +0 -3
- package/src/prover/smt/solver/lp/dependency.ts +0 -2
- package/src/prover/smt/solver/lp/dioph-eq.ts +1 -10
- package/src/prover/smt/solver/lp/explanation.ts +0 -1
- package/src/prover/smt/solver/lp/gomory.ts +0 -1
- package/src/prover/smt/solver/lp/hnf-cutter.ts +1 -2
- package/src/prover/smt/solver/lp/hnf.ts +0 -3
- package/src/prover/smt/solver/lp/int-cube.ts +3 -4
- package/src/prover/smt/solver/lp/int-solver.ts +0 -2
- package/src/prover/smt/solver/lp/lar-solver.ts +40 -4
- package/src/prover/smt/solver/lp/lar-term.ts +0 -1
- package/src/prover/smt/solver/lp/lp-settings.ts +0 -1
- package/src/prover/smt/solver/lp/maximize-term.ts +59 -10
- package/src/prover/smt/solver/lp/nex-creator.ts +3 -3
- package/src/prover/smt/solver/lp/nex.ts +2 -2
- package/src/prover/smt/solver/lp/nla-backoff.ts +0 -2
- package/src/prover/smt/solver/lp/nla-basics.ts +46 -3
- package/src/prover/smt/solver/lp/nla-core.ts +67 -16
- package/src/prover/smt/solver/lp/nla-divisions.ts +0 -2
- package/src/prover/smt/solver/lp/nla-emonics.ts +0 -1
- package/src/prover/smt/solver/lp/nla-factorization.ts +0 -1
- package/src/prover/smt/solver/lp/nla-grobner.ts +9 -5
- package/src/prover/smt/solver/lp/nla-horner.ts +0 -2
- package/src/prover/smt/solver/lp/nla-intervals.ts +0 -1
- package/src/prover/smt/solver/lp/nla-monomial-bounds.ts +0 -2
- package/src/prover/smt/solver/lp/nla-monotone.ts +0 -1
- package/src/prover/smt/solver/lp/nla-order.ts +0 -2
- package/src/prover/smt/solver/lp/nla-patcher.ts +0 -1
- package/src/prover/smt/solver/lp/nla-powers.ts +220 -0
- package/src/prover/smt/solver/lp/nla-tangents.ts +0 -2
- package/src/prover/smt/solver/lp/nla-throttle.ts +0 -1
- package/src/prover/smt/solver/lp/nla-transcendentals.ts +324 -0
- package/src/prover/smt/solver/lp/nla-types.ts +0 -2
- package/src/prover/smt/solver/lp/nla-var-eqs.ts +0 -1
- package/src/prover/smt/solver/lp/nra-solver.ts +122 -64
- package/src/prover/smt/solver/lp/numeric-pair.ts +0 -1
- package/src/prover/smt/solver/lp/pdd-interval.ts +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 +236 -45
- package/src/prover/smt/solver/nlsat/transcendental-eval.ts +310 -0
- package/src/prover/smt/solver/nlsat/transcendentals.ts +367 -0
- package/src/prover/smt/solver/nlsat/types.ts +0 -2
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +1 -4
- package/src/prover/smt/solver/nlsat/upolynomial.ts +0 -2
- package/src/prover/smt/solver/nlsat-tactic.ts +82 -0
- package/src/prover/smt/solver/nnf.ts +105 -23
- package/src/prover/smt/solver/normalize-bounds.ts +53 -0
- package/src/prover/smt/solver/occf.ts +97 -0
- package/src/prover/smt/solver/opt-context.ts +787 -0
- package/src/prover/smt/solver/opt-nlsat.ts +375 -0
- package/src/prover/smt/solver/opt-pareto.ts +282 -0
- package/src/prover/smt/solver/opt-preprocess.ts +101 -0
- package/src/prover/smt/solver/opt-solver.ts +308 -0
- package/src/prover/smt/solver/opt-value.ts +55 -0
- package/src/prover/smt/solver/optsmt.ts +692 -0
- package/src/prover/smt/solver/parallel-tactic.ts +299 -0
- package/src/prover/smt/solver/pattern-inference.ts +19 -11
- package/src/prover/smt/solver/pb-rewriter.ts +284 -0
- package/src/prover/smt/solver/pb2bv-tactic.ts +540 -0
- package/src/prover/smt/solver/poly-rewriter.ts +202 -57
- package/src/prover/smt/solver/probes.ts +512 -0
- package/src/prover/smt/solver/propagate-values.ts +37 -21
- package/src/prover/smt/solver/proto-model.ts +648 -19
- package/src/prover/smt/solver/pull-quant.ts +28 -12
- package/src/prover/smt/solver/purify-arith.ts +632 -0
- package/src/prover/smt/solver/qe-arith-plugin.ts +1098 -0
- package/src/prover/smt/solver/qe-lite-der.ts +2 -3
- package/src/prover/smt/solver/qe-lite-fm.ts +3 -4
- package/src/prover/smt/solver/qe-lite.ts +37 -17
- package/src/prover/smt/solver/qe-mbp.ts +270 -0
- package/src/prover/smt/solver/qe.ts +1498 -0
- package/src/prover/smt/solver/qel.ts +25 -0
- package/src/prover/smt/solver/qi-queue.ts +0 -1
- package/src/prover/smt/solver/qsat.ts +814 -0
- package/src/prover/smt/solver/quant-hoist.ts +196 -0
- package/src/prover/smt/solver/quant-tactics.ts +16 -56
- package/src/prover/smt/solver/quantifier-analyzer.ts +19 -20
- package/src/prover/smt/solver/quantifier-manager.ts +8 -16
- package/src/prover/smt/solver/quasi-macros.ts +243 -0
- package/src/prover/smt/solver/random-gen.ts +0 -1
- package/src/prover/smt/solver/rational.ts +45 -1
- package/src/prover/smt/solver/recfun-decl-plugin.ts +261 -0
- package/src/prover/smt/solver/recfun-rewriter.ts +107 -0
- package/src/prover/smt/solver/reduce-args.ts +225 -0
- package/src/prover/smt/solver/reduce-bv-size.ts +119 -0
- package/src/prover/smt/solver/ref-vector.ts +0 -1
- package/src/prover/smt/solver/relevancy.ts +1 -2
- package/src/prover/smt/solver/rewriter-tpl.ts +77 -10
- package/src/prover/smt/solver/rewriter.ts +475 -36
- package/src/prover/smt/solver/rlimit.ts +38 -2
- package/src/prover/smt/solver/sat/asymm-branch.ts +325 -0
- package/src/prover/smt/solver/sat/big.ts +177 -0
- package/src/prover/smt/solver/sat/clause-use-list.ts +71 -0
- package/src/prover/smt/solver/sat/clause.ts +203 -0
- package/src/prover/smt/solver/sat/cleaner.ts +94 -0
- package/src/prover/smt/solver/sat/config.ts +122 -0
- package/src/prover/smt/solver/sat/consequences.ts +203 -0
- package/src/prover/smt/solver/sat/elim-eqs.ts +142 -0
- package/src/prover/smt/solver/sat/goal2sat.ts +526 -0
- package/src/prover/smt/solver/sat/inc-sat-solver.ts +378 -0
- package/src/prover/smt/solver/sat/model-converter.ts +136 -0
- package/src/prover/smt/solver/sat/pb-constraint.ts +261 -0
- package/src/prover/smt/solver/sat/pb-solver.ts +1577 -0
- package/src/prover/smt/solver/sat/probing.ts +170 -0
- package/src/prover/smt/solver/sat/sat-tactic.ts +43 -0
- package/src/prover/smt/solver/sat/sat2goal.ts +165 -0
- package/src/prover/smt/solver/sat/scc.ts +142 -0
- package/src/prover/smt/solver/sat/simplifier.ts +1618 -0
- package/src/prover/smt/solver/sat/solver.ts +2127 -0
- package/src/prover/smt/solver/sat/var-queue.ts +117 -0
- package/src/prover/smt/solver/sat/watch-list.ts +140 -0
- package/src/prover/smt/solver/search-tree.ts +284 -0
- package/src/prover/smt/solver/seq-axioms.ts +1010 -0
- package/src/prover/smt/solver/seq-decl-plugin.ts +819 -0
- package/src/prover/smt/solver/seq-derive.ts +1298 -0
- package/src/prover/smt/solver/seq-eq-approx.ts +236 -0
- package/src/prover/smt/solver/seq-eq-solver.ts +439 -0
- package/src/prover/smt/solver/seq-factory.ts +89 -0
- package/src/prover/smt/solver/seq-monadic.ts +728 -0
- package/src/prover/smt/solver/seq-range-predicate.ts +235 -0
- package/src/prover/smt/solver/seq-re-rewriter.ts +1170 -0
- package/src/prover/smt/solver/seq-re-util.ts +758 -0
- package/src/prover/smt/solver/seq-regex-bisim.ts +144 -0
- package/src/prover/smt/solver/seq-regex-live.ts +200 -0
- package/src/prover/smt/solver/seq-rewriter.ts +2402 -0
- package/src/prover/smt/solver/seq-skolem.ts +317 -0
- package/src/prover/smt/solver/seq-subset.ts +165 -0
- package/src/prover/smt/solver/seq-view-witness.ts +353 -0
- package/src/prover/smt/solver/smt-consequences.ts +297 -0
- package/src/prover/smt/solver/smt-kernel.ts +83 -0
- package/src/prover/smt/solver/smt-logics.ts +66 -0
- package/src/prover/smt/solver/smt-setup.ts +496 -0
- package/src/prover/smt/solver/smt2-printer.ts +765 -0
- package/src/prover/smt/solver/smtlib-parser.ts +3126 -316
- package/src/prover/smt/solver/smtlib-script.ts +1631 -0
- package/src/prover/smt/solver/solve-eqs.ts +929 -0
- package/src/prover/smt/solver/solver.ts +113 -22
- package/src/prover/smt/solver/static-features.ts +314 -0
- package/src/prover/smt/solver/sticky-generations.ts +0 -1
- package/src/prover/smt/solver/tactic.ts +1986 -0
- package/src/prover/smt/solver/term-enumeration.ts +205 -0
- package/src/prover/smt/solver/theory-array.ts +1240 -0
- package/src/prover/smt/solver/theory-bv.ts +1200 -0
- package/src/prover/smt/solver/theory-char.ts +355 -0
- package/src/prover/smt/solver/theory-datatype.ts +598 -0
- package/src/prover/smt/solver/theory-finite-set.ts +30 -0
- package/src/prover/smt/solver/theory-fpa.ts +389 -0
- package/src/prover/smt/solver/theory-lra-axioms.ts +53 -2
- package/src/prover/smt/solver/theory-lra-bounds.ts +31 -6
- package/src/prover/smt/solver/theory-lra-final-check.ts +56 -70
- package/src/prover/smt/solver/theory-lra-internalize.ts +94 -27
- package/src/prover/smt/solver/theory-lra-model.ts +20 -35
- package/src/prover/smt/solver/theory-lra-propagate.ts +24 -26
- package/src/prover/smt/solver/theory-lra-state.ts +6 -22
- package/src/prover/smt/solver/theory-lra.ts +188 -1
- package/src/prover/smt/solver/theory-pb.ts +934 -0
- package/src/prover/smt/solver/theory-polymorphism.ts +58 -0
- package/src/prover/smt/solver/theory-recfun.ts +307 -0
- package/src/prover/smt/solver/theory-seq-regex.ts +867 -0
- package/src/prover/smt/solver/theory-seq-solve.ts +1373 -0
- package/src/prover/smt/solver/theory-seq-state.ts +871 -0
- package/src/prover/smt/solver/theory-seq.ts +961 -0
- package/src/prover/smt/solver/theory.ts +189 -0
- package/src/prover/smt/solver/tseitin-cnf.ts +485 -0
- package/src/prover/smt/solver/var-subst.ts +36 -14
- package/src/prover/smt/table.ts +3 -2
- package/src/prover/smt/types.ts +146 -0
- package/src/prover/tlapm/cache.ts +50 -19
- package/src/prover/tlapm/tlapm.ts +15 -9
- package/src/prover/tlapm-library.ts +3208 -0
- package/src/prover/verdict.ts +9 -0
- package/src/prover/zenon/check/check.ts +1 -2
- package/src/prover/zenon/check/records.ts +1 -1
- package/src/prover/zenon/check/relations.ts +2 -1
- package/src/prover/zenon/check/rewrites.ts +2 -15
- package/src/prover/zenon/check/sets.ts +40 -58
- package/src/prover/zenon/check/terms.ts +1 -2
- package/src/prover/zenon/decide.ts +10 -7
- package/src/prover/zenon/encode.ts +0 -2
- package/src/prover/zenon/eqrel.ts +2 -2
- package/src/prover/zenon/equality-rules.ts +24 -2
- package/src/prover/zenon/expr.ts +28 -2
- package/src/prover/zenon/index-table.ts +11 -21
- package/src/prover/zenon/isar-case.ts +0 -2
- package/src/prover/zenon/isar.ts +35 -37
- package/src/prover/zenon/llproof.ts +2 -13
- package/src/prover/zenon/mltoll.ts +12 -30
- package/src/prover/zenon/node.ts +20 -5
- package/src/prover/zenon/parse.ts +9 -8
- package/src/prover/zenon/phrase.ts +0 -2
- package/src/prover/zenon/proof.ts +0 -2
- package/src/prover/zenon/propositional-rules.ts +0 -2
- package/src/prover/zenon/rules.ts +2 -3
- package/src/prover/zenon/search.ts +11 -19
- package/src/prover/zenon/tla/functions.ts +2 -4
- package/src/prover/zenon/tla/llproof.ts +9 -13
- package/src/prover/zenon/tla/records.ts +1 -8
- package/src/prover/zenon/tla/rewrites.ts +0 -2
- package/src/prover/zenon/tla/sets.ts +22 -22
- package/src/prover/zenon/tla/terms.ts +0 -2
- package/src/prover/zenon/tla/tla.ts +7 -8
- package/src/randomization.ts +1 -4
- package/src/resolve.ts +67 -143
- package/src/runtime.ts +15 -18
- package/src/sany/builtins.ts +1 -3
- package/src/sany/generation.ts +394 -0
- package/src/sany/generator-def-entries.ts +210 -0
- package/src/sany/generator-definitions.ts +686 -0
- package/src/sany/generator-expressions.ts +1100 -0
- package/src/sany/generator-proofs.ts +662 -0
- package/src/sany/generator.ts +160 -2683
- package/src/sany/levels.ts +5 -11
- package/src/sany/lexer.ts +57 -60
- package/src/sany/linter.ts +0 -3
- package/src/sany/nodes.ts +6 -13
- package/src/sany/report.ts +3 -6
- package/src/sany/selectors.ts +35 -38
- package/src/sany/xml.ts +23 -55
- package/src/search.ts +206 -44
- package/src/simulate.ts +202 -184
- package/src/spec-description.ts +56 -82
- package/src/standard-definitions.ts +4 -3
- package/src/standard-modules.ts +17 -44
- package/src/state-graph.ts +3 -17
- package/src/subexpressions.ts +38 -47
- package/src/substitution-levels.ts +5 -4
- package/src/successors.ts +20 -43
- package/src/symmetry.ts +6 -21
- package/src/tableau.ts +2 -2
- package/src/tlc/fingerprint.ts +96 -30
- package/src/tlc/jar-data.ts +0 -1
- package/src/tlc/messages.ts +22 -36
- package/src/tlc/order.ts +22 -47
- package/src/tlc/random.ts +22 -34
- package/src/tlc/replay.ts +21 -48
- package/src/tlc/summary.ts +64 -58
- package/src/tlc/tlc-operators.ts +6 -17
- package/src/tlc/tlcext-operators.ts +54 -26
- package/src/tlc/trace-spec.ts +26 -51
- package/src/tlc/value-stream.ts +9 -13
- package/src/tlc/version.ts +0 -1
- package/src/typed-tier.ts +6535 -0
- package/src/typescript/actions.ts +2 -4
- package/src/typescript/collections.ts +34 -20
- package/src/typescript/compile.ts +1 -3
- package/src/typescript/formula.ts +5 -3
- package/src/typescript/model.ts +4 -5
- package/src/typescript/steps.ts +20 -18
- package/src/values.ts +136 -338
- package/src/prover/isabelle/isar/statement.ts +0 -52
- package/src/prover/smt/solver/z3-license.txt +0 -10
- package/src/prover/tlaps-module.ts +0 -510
- package/src/prover/zenon/LICENSE +0 -32
package/src/pcal/validate.ts
CHANGED
|
@@ -23,13 +23,10 @@ type PcalValidationResult =
|
|
|
23
23
|
// Java's \s, which unlike JavaScript's matches no Unicode spaces.
|
|
24
24
|
const SPACE = "[ \\t\\n\\x0B\\f\\r]";
|
|
25
25
|
|
|
26
|
-
// Validator.CHECKSUM_PATTERN, whose (?i) groups become character classes.
|
|
27
26
|
const CHECKSUM_PATTERN = new RegExp(
|
|
28
27
|
`\\\\\\* BEGIN TRANSLATION${SPACE}+\\(${SPACE}*([cC][hH]([eE][cC])?[kK][sS][uU][mM]\\([pP]([lL][uU][sS])?[cC][aA][lL]\\))${SPACE}*(=${SPACE}*"(?<pcal>[0-9A-Fa-f]*)"|\\\\in${SPACE}*STRING)${SPACE}*\\/\\\\${SPACE}*([cC][hH]([eE][cC])?[kK][sS][uU][mM]\\([tT][lL][aA]\\+?\\))${SPACE}*(=${SPACE}*"(?<tla>[0-9A-Fa-f]*)"|\\\\in${SPACE}*STRING)${SPACE}*\\)`,
|
|
29
28
|
);
|
|
30
29
|
|
|
31
|
-
// CRC32 in Long.toHexString's unpadded lowercase hex. Only a spec with PlusCal needs node:zlib,
|
|
32
|
-
// so it loads then rather than at startup.
|
|
33
30
|
const getChecksum = (text: string) =>
|
|
34
31
|
process.getBuiltinModule("node:zlib").crc32(Buffer.from(text, "utf8")).toString(16);
|
|
35
32
|
|
|
@@ -44,7 +41,6 @@ const reportPcalError = (session: PcalSession, error: PcalError) =>
|
|
|
44
41
|
: `${error.message}\n at ${getPcalLocation(error.node)}`,
|
|
45
42
|
);
|
|
46
43
|
|
|
47
|
-
// trans.removeTabs: tabs reach the next multiple of 8, and every line gets a trailing space.
|
|
48
44
|
const removeTabs = (lines: string[]) =>
|
|
49
45
|
lines.map(
|
|
50
46
|
(line) =>
|
|
@@ -108,14 +104,14 @@ const findToken = (lines: string[], location: PcalSearchLocation, token: string)
|
|
|
108
104
|
const reportCommandLineError = (session: PcalSession, message: string) =>
|
|
109
105
|
reportUnrecoverableError(session, `Command-line error: ${message}`);
|
|
110
106
|
|
|
111
|
-
// These options set the translator's options for the rest of SANY's run.
|
|
112
107
|
const processOptionArguments = (session: PcalSession, args: string[]) => {
|
|
113
108
|
const params = session.params;
|
|
114
|
-
|
|
109
|
+
let isFirstFairness = true;
|
|
110
|
+
let isExplicitNof = false;
|
|
115
111
|
const setFairness = (option: string) => {
|
|
116
|
-
if (
|
|
112
|
+
if (isFirstFairness) {
|
|
117
113
|
params.fairnessOption = "";
|
|
118
|
-
|
|
114
|
+
isFirstFairness = false;
|
|
119
115
|
}
|
|
120
116
|
if (params.fairnessOption !== "") {
|
|
121
117
|
reportCommandLineError(session, "Can only have one of -wf, -sf, -wfNext, and -nof options");
|
|
@@ -169,7 +165,7 @@ const processOptionArguments = (session: PcalSession, args: string[]) => {
|
|
|
169
165
|
case "-nof":
|
|
170
166
|
case "nof":
|
|
171
167
|
if (!setFairness(option.replace(/^-/, ""))) return;
|
|
172
|
-
if (option.endsWith("nof"))
|
|
168
|
+
if (option.endsWith("nof")) isExplicitNof = true;
|
|
173
169
|
continue;
|
|
174
170
|
case "-label":
|
|
175
171
|
case "label":
|
|
@@ -213,7 +209,6 @@ const processOptionArguments = (session: PcalSession, args: string[]) => {
|
|
|
213
209
|
continue;
|
|
214
210
|
}
|
|
215
211
|
case "-lineWidth":
|
|
216
|
-
// PcalTLAGen's line width only shapes the translation's text.
|
|
217
212
|
if (!/^[+-]?\d+$/.test(argument ?? "") || Number(argument) < 60) {
|
|
218
213
|
reportCommandLineError(
|
|
219
214
|
session,
|
|
@@ -231,7 +226,7 @@ const processOptionArguments = (session: PcalSession, args: string[]) => {
|
|
|
231
226
|
return;
|
|
232
227
|
}
|
|
233
228
|
}
|
|
234
|
-
if (params.checkTermination && params.fairnessOption === "" && !
|
|
229
|
+
if (params.checkTermination && params.fairnessOption === "" && !isExplicitNof) {
|
|
235
230
|
params.fairnessOption = "wf";
|
|
236
231
|
}
|
|
237
232
|
};
|
|
@@ -265,56 +260,56 @@ const processOptions = (session: PcalSession, lines: string[], location: PcalSea
|
|
|
265
260
|
};
|
|
266
261
|
|
|
267
262
|
const uncomment = (lines: string[], startLine: number, startColumn: number) => {
|
|
268
|
-
|
|
269
|
-
|
|
263
|
+
let depth = 0;
|
|
264
|
+
let isDone = false;
|
|
265
|
+
let isInString = false;
|
|
266
|
+
for (let index = startLine; !isDone && index < lines.length; index++) {
|
|
270
267
|
const line = lines[index];
|
|
271
268
|
const start = index === startLine ? startColumn : 0;
|
|
272
269
|
const output = [line.slice(0, start)];
|
|
273
|
-
|
|
274
|
-
for (let column = start; !
|
|
270
|
+
isInString = false;
|
|
271
|
+
for (let column = start; !isDone && column < line.length; column++) {
|
|
275
272
|
const char = line[column];
|
|
276
273
|
const pair = line.slice(column, column + 2);
|
|
277
|
-
if (pair === "(*" && !
|
|
278
|
-
|
|
274
|
+
if (pair === "(*" && !isInString) {
|
|
275
|
+
depth += 1;
|
|
279
276
|
output.push(" ");
|
|
280
277
|
column += 1;
|
|
281
278
|
continue;
|
|
282
279
|
}
|
|
283
|
-
if (pair === "*)" && !
|
|
280
|
+
if (pair === "*)" && !isInString && depth === 0) {
|
|
284
281
|
output.push(pair);
|
|
285
|
-
|
|
282
|
+
isDone = true;
|
|
286
283
|
continue;
|
|
287
284
|
}
|
|
288
|
-
if (pair === "*)" && !
|
|
289
|
-
|
|
285
|
+
if (pair === "*)" && !isInString) {
|
|
286
|
+
depth -= 1;
|
|
290
287
|
output.push(" ");
|
|
291
288
|
column += 1;
|
|
292
289
|
continue;
|
|
293
290
|
}
|
|
294
|
-
if (
|
|
291
|
+
if (depth > 0) {
|
|
295
292
|
output.push(" ");
|
|
296
293
|
continue;
|
|
297
294
|
}
|
|
298
|
-
if (
|
|
295
|
+
if (isInString && char === "\\" && pair.length === 2) {
|
|
299
296
|
output.push(pair);
|
|
300
297
|
column += 1;
|
|
301
298
|
continue;
|
|
302
299
|
}
|
|
303
|
-
if (!
|
|
300
|
+
if (!isInString && pair === "\\*") {
|
|
304
301
|
output.push(" ");
|
|
305
302
|
break;
|
|
306
303
|
}
|
|
307
|
-
if (char === '"')
|
|
304
|
+
if (char === '"') isInString = !isInString;
|
|
308
305
|
output.push(char);
|
|
309
306
|
}
|
|
310
|
-
if (
|
|
307
|
+
if (isInString) return new PcalError(`Unterminated string in line ${index + 1}`);
|
|
311
308
|
lines[index] = output.join("");
|
|
312
309
|
}
|
|
313
310
|
return undefined;
|
|
314
311
|
};
|
|
315
312
|
|
|
316
|
-
// Vector.get on an index out of its range, whose message names the vector's capacity: the 10 it
|
|
317
|
-
// starts with, doubled as it grows.
|
|
318
313
|
const throwIndexOutOfBounds = (index: number, size: number): never => {
|
|
319
314
|
const capacity = 10 * 2 ** Math.max(0, Math.ceil(Math.log2(size / 10)));
|
|
320
315
|
throw new PcalRuntimeError(
|
|
@@ -341,23 +336,22 @@ export const validatePcalModule = (
|
|
|
341
336
|
break;
|
|
342
337
|
}
|
|
343
338
|
}
|
|
344
|
-
|
|
345
|
-
|
|
346
|
-
|
|
347
|
-
|
|
348
|
-
|
|
339
|
+
let beginLine = 0;
|
|
340
|
+
let beginColumn = -1;
|
|
341
|
+
let isFair = false;
|
|
342
|
+
for (; beginLine < lines.length; beginLine++) {
|
|
343
|
+
const line = lines[beginLine];
|
|
344
|
+
// TLAConstants.MODULE_CLOSING_REGEX never matches: removeTabs adds a trailing space.
|
|
349
345
|
if (/^=+$/.test(line)) break;
|
|
350
346
|
const algorithmColumn = line.indexOf("--algorithm");
|
|
351
347
|
const fairColumn = line.indexOf("--fair");
|
|
352
348
|
if (algorithmColumn !== -1) {
|
|
353
|
-
|
|
354
|
-
begin.isFound = true;
|
|
349
|
+
beginColumn = algorithmColumn + "--algorithm".length;
|
|
355
350
|
break;
|
|
356
351
|
}
|
|
357
352
|
if (fairColumn !== -1) {
|
|
358
|
-
|
|
359
|
-
|
|
360
|
-
begin.isFair = true;
|
|
353
|
+
beginColumn = fairColumn + "--fair".length;
|
|
354
|
+
isFair = true;
|
|
361
355
|
break;
|
|
362
356
|
}
|
|
363
357
|
}
|
|
@@ -367,26 +361,31 @@ export const validatePcalModule = (
|
|
|
367
361
|
const endTranslationLine = findTokenPair(lines, translationLine + 1, "END", "TRANSLATION");
|
|
368
362
|
if (endTranslationLine === -1) results.add("NO_TRANSLATION_EXISTS");
|
|
369
363
|
if (translationLine === -1 && endTranslationLine === -1) return results;
|
|
370
|
-
if (
|
|
364
|
+
if (beginColumn === -1) {
|
|
371
365
|
results.add("NO_PLUSCAL_EXISTS");
|
|
372
366
|
return results;
|
|
373
367
|
}
|
|
374
|
-
const uncommentError = uncomment(lines,
|
|
368
|
+
const uncommentError = uncomment(lines, beginLine, beginColumn);
|
|
375
369
|
if (uncommentError !== undefined) {
|
|
376
370
|
reportPcalError(session, uncommentError);
|
|
377
371
|
return new Set(["ERROR_ENCOUNTERED"]);
|
|
378
372
|
}
|
|
379
|
-
|
|
373
|
+
let ast: PcalAlgorithm | undefined;
|
|
380
374
|
// HACK: Validator reports the exceptions of ParseAlgorithm.getAlgorithm and PCalTLAGenerator
|
|
381
375
|
// and goes on to compare the checksums.
|
|
382
376
|
try {
|
|
383
377
|
const result = parsePcalAlgorithm(
|
|
384
378
|
session,
|
|
385
|
-
createPcalCharReader(lines,
|
|
386
|
-
|
|
379
|
+
createPcalCharReader(lines, beginLine, beginColumn),
|
|
380
|
+
isFair,
|
|
381
|
+
);
|
|
382
|
+
ast = result.ast;
|
|
383
|
+
translatePcalAlgorithm(
|
|
384
|
+
result.ast,
|
|
385
|
+
result.shouldOmitPC,
|
|
386
|
+
result.hasDefaultInitialization,
|
|
387
|
+
session.log,
|
|
387
388
|
);
|
|
388
|
-
parsed.ast = result.ast;
|
|
389
|
-
translatePcalAlgorithm(result.ast, result.omitPC, result.hasDefaultInitialization, session.log);
|
|
390
389
|
} catch (error) {
|
|
391
390
|
if (!(error instanceof PcalError)) throw error;
|
|
392
391
|
reportPcalError(session, error);
|
|
@@ -398,14 +397,13 @@ export const validatePcalModule = (
|
|
|
398
397
|
return results;
|
|
399
398
|
}
|
|
400
399
|
const pcalChecksum = match.groups?.pcal;
|
|
401
|
-
// The Java checksums the string "fair" for a --fair algorithm, unlike TLC 1.7.4's
|
|
402
|
-
// parse leaves an AST whose text, Object.toString's class name and hash code, matches no checksum.
|
|
400
|
+
// The Java checksums the string "fair" for a --fair algorithm, unlike TLC 1.7.4's.
|
|
403
401
|
const algorithmText =
|
|
404
|
-
|
|
402
|
+
isFair && version !== "1.7.4"
|
|
405
403
|
? "fair"
|
|
406
|
-
:
|
|
404
|
+
: ast === undefined
|
|
407
405
|
? undefined
|
|
408
|
-
: formatPcalNode(
|
|
406
|
+
: formatPcalNode(ast, session.params.inputVersionNumber, version);
|
|
409
407
|
if (
|
|
410
408
|
pcalChecksum !== undefined &&
|
|
411
409
|
(algorithmText === undefined || pcalChecksum !== getChecksum(algorithmText))
|
package/src/pretty-print.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
//
|
|
1
|
+
// TLC prints the original text whenever the parse fails.
|
|
2
2
|
|
|
3
3
|
import { skipWhile } from "./lexer";
|
|
4
4
|
|
|
@@ -78,9 +78,9 @@ const parsePrinted = (text: string) => {
|
|
|
78
78
|
separator: string,
|
|
79
79
|
) => {
|
|
80
80
|
const node: PrintedNode = { kind, first, last: first, children: [] };
|
|
81
|
-
|
|
82
|
-
while (position
|
|
83
|
-
const item = parseItem(position
|
|
81
|
+
let position = skipWhitespace(start);
|
|
82
|
+
while (position !== undefined && text[position] !== close) {
|
|
83
|
+
const item = parseItem(position);
|
|
84
84
|
if (!item) return undefined;
|
|
85
85
|
node.children.push(item);
|
|
86
86
|
const afterItem = skipWhitespace(item.last + 1);
|
|
@@ -88,10 +88,10 @@ const parsePrinted = (text: string) => {
|
|
|
88
88
|
const afterSeparator = text.startsWith(separator, afterItem)
|
|
89
89
|
? afterItem + separator.length
|
|
90
90
|
: afterItem;
|
|
91
|
-
position
|
|
91
|
+
position = skipWhitespace(afterSeparator);
|
|
92
92
|
}
|
|
93
|
-
if (position
|
|
94
|
-
node.last = position
|
|
93
|
+
if (position === undefined) return undefined;
|
|
94
|
+
node.last = position;
|
|
95
95
|
return node;
|
|
96
96
|
};
|
|
97
97
|
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import { TlaProverError } from "../errors";
|
|
2
2
|
import { spawnWorker, type WorkerHandle } from "../worker";
|
|
3
|
-
import type { DecideOptions, Decision } from "./verdict";
|
|
3
|
+
import type { Backend, DecideOptions, Decision } from "./verdict";
|
|
4
4
|
|
|
5
5
|
export interface DecideRequest {
|
|
6
|
-
prover:
|
|
6
|
+
prover: Backend;
|
|
7
7
|
text: string;
|
|
8
8
|
timeLimitMs: number;
|
|
9
9
|
}
|
|
@@ -19,7 +19,7 @@ interface PendingDecision {
|
|
|
19
19
|
|
|
20
20
|
export interface DecidePool {
|
|
21
21
|
decide: (
|
|
22
|
-
prover:
|
|
22
|
+
prover: Backend,
|
|
23
23
|
text: string,
|
|
24
24
|
options: DecideOptions,
|
|
25
25
|
priority: number,
|
package/src/prover/deciders.ts
CHANGED
|
@@ -2,28 +2,31 @@ import { SmtParseError, TlaProverError } from "../errors";
|
|
|
2
2
|
import { decideIsabelle } from "./isabelle/decide";
|
|
3
3
|
import { decidePtl } from "./ptl/decide";
|
|
4
4
|
import { decideSmt } from "./smt/solver/solver";
|
|
5
|
-
import type { DecideOptions, Decision
|
|
5
|
+
import type { Backend, DecideOptions, Decision } from "./verdict";
|
|
6
6
|
import { decideZenon } from "./zenon/decide";
|
|
7
7
|
|
|
8
8
|
const decideZ3 = (text: string, options: DecideOptions) => {
|
|
9
9
|
try {
|
|
10
|
-
|
|
10
|
+
const verdict = decideSmt(text, options);
|
|
11
|
+
return { verdict, output: `${verdict}\n` };
|
|
11
12
|
} catch (error) {
|
|
12
13
|
if (error instanceof SmtParseError) throw new TlaProverError(error.message, error);
|
|
13
14
|
throw error;
|
|
14
15
|
}
|
|
15
16
|
};
|
|
16
17
|
|
|
17
|
-
|
|
18
|
+
const DECIDERS: Record<
|
|
19
|
+
Backend,
|
|
20
|
+
(text: string, options: DecideOptions) => Omit<Decision, "timeUsedMs">
|
|
21
|
+
> = {
|
|
18
22
|
smt: decideZ3,
|
|
19
23
|
z3: decideZ3,
|
|
20
|
-
zenon:
|
|
21
|
-
isabelle: decideIsabelle,
|
|
22
|
-
ls4: decidePtl,
|
|
24
|
+
zenon: decideZenon,
|
|
25
|
+
isabelle: (text, options) => ({ verdict: decideIsabelle(text, options) }),
|
|
26
|
+
ls4: (text, options) => ({ verdict: decidePtl(text, options) }),
|
|
23
27
|
};
|
|
24
28
|
|
|
25
|
-
export const decide = (prover:
|
|
29
|
+
export const decide = (prover: Backend, text: string, options: DecideOptions): Decision => {
|
|
26
30
|
const start = performance.now();
|
|
27
|
-
|
|
28
|
-
return { verdict, timeUsedMs: performance.now() - start };
|
|
31
|
+
return { ...DECIDERS[prover](text, options), timeUsedMs: performance.now() - start };
|
|
29
32
|
};
|
|
@@ -1,36 +1,14 @@
|
|
|
1
1
|
import { isStackOverflow, TlaIsabelleError } from "../../errors";
|
|
2
2
|
import type { DecideOptions, Verdict } from "../verdict";
|
|
3
|
-
import { parseProofText, terminalProof } from "./isar/method";
|
|
4
|
-
import { getFacts, initGoal } from "./isar/proof";
|
|
5
|
-
import { readStatement } from "./isar/statement";
|
|
6
3
|
import { parseTheory } from "./isar/theory";
|
|
7
|
-
import {
|
|
8
|
-
import { seqHead } from "./pure/seq";
|
|
9
|
-
import { aconv } from "./pure/term";
|
|
10
|
-
import { getProofContext } from "./tla/context";
|
|
4
|
+
import { runTheory } from "./isar/toplevel";
|
|
11
5
|
import { loadLogic } from "./tla/logic";
|
|
12
6
|
|
|
13
7
|
export const decideIsabelle = (text: string, options: DecideOptions): Exclude<Verdict, "sat"> => {
|
|
14
8
|
const limits = { deadline: Date.now() + options.timeLimitMs, signal: options.signal };
|
|
15
9
|
try {
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
const statement = readStatement(logic, theory);
|
|
19
|
-
const facts = theory.isUsingAssms ? getFacts(limits, statement) : [];
|
|
20
|
-
const result = seqHead(
|
|
21
|
-
terminalProof(
|
|
22
|
-
getProofContext(logic, limits),
|
|
23
|
-
parseProofText(theory.method),
|
|
24
|
-
facts,
|
|
25
|
-
initGoal(statement),
|
|
26
|
-
),
|
|
27
|
-
);
|
|
28
|
-
return result !== undefined &&
|
|
29
|
-
result.tpairs.length === 0 &&
|
|
30
|
-
aconv(result.prop, protect(statement.conclusion)) &&
|
|
31
|
-
result.hyps.every((hyp) => statement.assumptions.some((assumption) => aconv(hyp, assumption)))
|
|
32
|
-
? "unsat"
|
|
33
|
-
: "unknown";
|
|
10
|
+
runTheory(loadLogic(), parseTheory(text), limits);
|
|
11
|
+
return "unsat";
|
|
34
12
|
} catch (error) {
|
|
35
13
|
if (error instanceof TlaIsabelleError || isStackOverflow(error)) return "unknown";
|
|
36
14
|
throw error;
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from tlapm's src/backend/isabelle.ml (BSD licensed, see LICENSE-tlapm).
|
|
2
|
-
|
|
3
1
|
import { TlapmBugError, TlaProverError, TlaUnsupportedError } from "../../errors";
|
|
4
2
|
import { createContext, getBoundName, popNames, pushName } from "../../obligations/printer";
|
|
5
3
|
import type { Bound, Builtin, Expr, Sequent } from "../../obligations/expression";
|
|
@@ -145,7 +143,7 @@ const printLemma = (sequent: Sequent) => {
|
|
|
145
143
|
case "Ix": {
|
|
146
144
|
const name = getBoundName(context, operator.index);
|
|
147
145
|
if (operator.index <= 0 || name === undefined) throw new TlapmBugError();
|
|
148
|
-
return args.length === 0 ? name :
|
|
146
|
+
return args.length === 0 ? name : printNonfix(name, args);
|
|
149
147
|
}
|
|
150
148
|
case "Opaque": {
|
|
151
149
|
const name = pickle(operator.name);
|
|
@@ -340,8 +338,9 @@ const printLemma = (sequent: Sequent) => {
|
|
|
340
338
|
}
|
|
341
339
|
};
|
|
342
340
|
|
|
341
|
+
// A pragma's definition ends the lemma with an empty line in place of the goal.
|
|
342
|
+
const lines: string[] = [];
|
|
343
343
|
const printSequent = (sequent: Sequent) => {
|
|
344
|
-
const lines: string[] = [];
|
|
345
344
|
for (const hyp of sequent.context) {
|
|
346
345
|
switch (hyp.kind) {
|
|
347
346
|
case "Flex": {
|
|
@@ -374,60 +373,91 @@ const printLemma = (sequent: Sequent) => {
|
|
|
374
373
|
break;
|
|
375
374
|
}
|
|
376
375
|
case "Defn":
|
|
377
|
-
if (hyp.definition.kind === "Bpragma")
|
|
376
|
+
if (hyp.definition.kind === "Bpragma") {
|
|
377
|
+
lines.push("");
|
|
378
|
+
return;
|
|
379
|
+
}
|
|
378
380
|
lines.push(`(* usable definition ${hyp.definition.name} suppressed *)`);
|
|
379
381
|
adjoin(hyp.definition.name);
|
|
380
382
|
break;
|
|
381
383
|
}
|
|
382
384
|
}
|
|
383
|
-
|
|
385
|
+
lines.push(`shows "${printExpr(sequent.active)}"`);
|
|
384
386
|
};
|
|
385
387
|
|
|
386
|
-
|
|
387
|
-
|
|
388
|
-
|
|
389
|
-
|
|
390
|
-
|
|
391
|
-
|
|
392
|
-
|
|
393
|
-
|
|
394
|
-
|
|
395
|
-
}
|
|
388
|
+
const failure = (() => {
|
|
389
|
+
try {
|
|
390
|
+
printSequent(sequent);
|
|
391
|
+
return undefined;
|
|
392
|
+
} catch (error) {
|
|
393
|
+
if (error instanceof TlaProverError) return error;
|
|
394
|
+
if (!(error instanceof TlaUnsupportedError)) throw error;
|
|
395
|
+
return new TlaProverError(`isabelle : unsupported operator ${error.message}`);
|
|
396
|
+
}
|
|
397
|
+
})();
|
|
398
|
+
return {
|
|
399
|
+
text: lines.join("\n"),
|
|
400
|
+
isAssumed: lines.some((line) => line.startsWith("assumes ")),
|
|
401
|
+
failure,
|
|
402
|
+
};
|
|
396
403
|
};
|
|
397
404
|
|
|
398
|
-
|
|
405
|
+
interface ObligationSource {
|
|
406
|
+
location: string;
|
|
407
|
+
fingerprint: string;
|
|
408
|
+
}
|
|
409
|
+
|
|
410
|
+
export const encodeIsabelle = (
|
|
411
|
+
id: number,
|
|
412
|
+
sequent: Sequent,
|
|
413
|
+
tactic: string,
|
|
414
|
+
name: string,
|
|
415
|
+
source: ObligationSource,
|
|
416
|
+
write: (text: string) => void,
|
|
417
|
+
) => {
|
|
399
418
|
const lemma = printLemma(sequent);
|
|
400
|
-
|
|
401
|
-
|
|
402
|
-
|
|
403
|
-
|
|
404
|
-
|
|
405
|
-
|
|
406
|
-
|
|
407
|
-
|
|
408
|
-
|
|
409
|
-
|
|
410
|
-
|
|
419
|
+
write(
|
|
420
|
+
[
|
|
421
|
+
...getTheoryHeader(name, false),
|
|
422
|
+
`(* Generated from ${source.location} *)`,
|
|
423
|
+
`lemma ob'${id}: (* ${source.fingerprint} *)`,
|
|
424
|
+
lemma.text,
|
|
425
|
+
].join("\n"),
|
|
426
|
+
);
|
|
427
|
+
if (lemma.failure) throw lemma.failure;
|
|
428
|
+
write(
|
|
429
|
+
[
|
|
430
|
+
`(is "PROP ?ob'${id}")`,
|
|
431
|
+
"proof -",
|
|
432
|
+
`show "PROP ?ob'${id}"`,
|
|
433
|
+
`${lemma.isAssumed ? "using assms " : ""}by ${tactic}`,
|
|
434
|
+
"qed",
|
|
435
|
+
"end",
|
|
436
|
+
"",
|
|
437
|
+
].join("\n"),
|
|
438
|
+
);
|
|
411
439
|
};
|
|
412
440
|
|
|
413
441
|
interface IsabelleProof {
|
|
414
442
|
id: number;
|
|
415
443
|
sequent: Sequent;
|
|
416
|
-
|
|
444
|
+
proof: string;
|
|
417
445
|
}
|
|
418
446
|
|
|
419
447
|
export const encodeIsabelleTheory = (name: string, proofs: IsabelleProof[]) =>
|
|
420
448
|
[
|
|
421
|
-
|
|
422
|
-
...proofs.flatMap((proof) =>
|
|
423
|
-
|
|
424
|
-
|
|
425
|
-
|
|
426
|
-
|
|
427
|
-
|
|
428
|
-
|
|
429
|
-
|
|
430
|
-
|
|
431
|
-
|
|
432
|
-
|
|
433
|
-
|
|
449
|
+
`${getTheoryHeader(name, true).join("\n")}\n`,
|
|
450
|
+
...proofs.flatMap((proof) => {
|
|
451
|
+
const lemma = printLemma(proof.sequent);
|
|
452
|
+
if (lemma.failure) return [];
|
|
453
|
+
return [
|
|
454
|
+
`lemma ob'${proof.id}:`,
|
|
455
|
+
`${lemma.text}(is "PROP ?ob'${proof.id}")`,
|
|
456
|
+
"proof -",
|
|
457
|
+
`ML_command \\<open> writeln "*** TLAPS ENTER ${proof.id}"; \\<close>`,
|
|
458
|
+
`show "PROP ?ob'${proof.id}"`,
|
|
459
|
+
`${proof.proof}ML_command \\<open> writeln "*** TLAPS EXIT ${proof.id}"; \\<close> qed\n`,
|
|
460
|
+
].join("\n");
|
|
461
|
+
}),
|
|
462
|
+
"end\n",
|
|
463
|
+
].join("");
|