tla-ts 0.0.10-dev.f16792fed → 0.0.10-dev.fdc173479
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 +41 -37
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +21 -4
- package/dist/index.d.ts +21 -4
- package/dist/index.js +1 -1
- package/dist/parallel-worker.cjs +1 -1
- package/dist/parallel-worker.js +1 -1
- package/dist/prove-worker.cjs +1 -1
- package/dist/prove-worker.js +1 -1
- package/dist/prove.cjs +2681 -425
- package/dist/prove.js +2681 -425
- package/dist/run.cjs +41 -42
- package/dist/run.js +41 -42
- package/dist/tlapm.cjs +2 -2
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +97 -89
- package/dist/transfer.js +97 -89
- package/dist/worker.cjs +7 -7
- package/dist/worker.js +7 -7
- package/package.json +1 -1
- package/src/ast.ts +72 -39
- package/src/bags.ts +50 -29
- package/src/builtins.ts +8 -16
- package/src/check-failure.ts +118 -0
- package/src/check-trace.ts +321 -0
- package/src/check.ts +828 -770
- package/src/cli/options.ts +6 -31
- package/src/cli/runtime-invariants.ts +20 -56
- package/src/cli/shared.ts +1 -1
- package/src/cli/tlapm.ts +433 -70
- package/src/cli/tlc-arguments.ts +224 -212
- package/src/cli/tlc-output.ts +701 -0
- package/src/cli/tlc-usage.ts +1 -2
- package/src/cli/tlc.ts +65 -712
- package/src/cli/xml-exporter.ts +23 -33
- package/src/codegen.ts +28 -20
- package/src/coverage.ts +255 -20
- package/src/dependencies.ts +96 -27
- package/src/dfid.ts +115 -50
- package/src/environment-config.ts +315 -0
- package/src/environment.ts +175 -373
- package/src/errors.ts +40 -5
- package/src/evaluate.ts +429 -139
- package/src/exit-codes.ts +28 -12
- package/src/fingerprints.ts +65 -1
- package/src/instances.ts +178 -17
- package/src/java-hash.ts +14 -0
- package/src/java-overrides.ts +2 -2
- package/src/json.ts +4 -7
- package/src/levels.ts +708 -272
- package/src/lexer.ts +17 -5
- package/src/liveness-checker.ts +707 -249
- package/src/liveness.ts +148 -95
- 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 +39 -9
- package/src/obligations/levels.ts +24 -11
- package/src/obligations/module.ts +28 -41
- package/src/obligations/normalize.ts +27 -18
- package/src/obligations/operators.ts +0 -2
- package/src/obligations/pragma.ts +53 -16
- package/src/obligations/printer.ts +48 -18
- package/src/obligations/proof.ts +3 -2
- package/src/obligations/regroup.ts +0 -2
- package/src/obligations/simplify.ts +55 -50
- package/src/obligations/source.ts +120 -74
- package/src/obligations/subexpression.ts +45 -18
- package/src/obligations/substitution.ts +1 -3
- package/src/obligations/temporal.ts +5 -7
- package/src/obligations/tuples.ts +0 -2
- package/src/parallel-worker.ts +17 -31
- package/src/parallel.ts +29 -47
- package/src/parser.ts +757 -326
- 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 +226 -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 +1 -3
- package/src/prover/isabelle/provers/classical.ts +45 -20
- package/src/prover/isabelle/provers/hypsubst.ts +19 -30
- 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 +9 -20
- 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 +3 -5
- 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/md5.ts +26 -29
- 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 +1016 -618
- package/src/prover/smt/simplify.ts +441 -0
- package/src/prover/smt/solver/ackermannize-bv-tactic.ts +62 -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 +624 -9
- 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 +319 -0
- package/src/prover/smt/solver/asserted-formulas.ts +240 -56
- package/src/prover/smt/solver/ast-lt.ts +165 -11
- package/src/prover/smt/solver/ast-util.ts +160 -2
- package/src/prover/smt/solver/ast.ts +1483 -45
- package/src/prover/smt/solver/auf-solver.ts +25 -18
- package/src/prover/smt/solver/bit-blast-tactic.ts +608 -0
- package/src/prover/smt/solver/bit-blaster.ts +871 -0
- package/src/prover/smt/solver/blast-term-ite.ts +47 -0
- package/src/prover/smt/solver/bound-manager.ts +196 -0
- package/src/prover/smt/solver/bound-simplifier.ts +598 -0
- package/src/prover/smt/solver/bv-bound-chk.ts +492 -0
- package/src/prover/smt/solver/bv-decl-plugin.ts +341 -0
- package/src/prover/smt/solver/bv-divrem-bounds.ts +95 -0
- package/src/prover/smt/solver/bv-rewriter.ts +1901 -0
- package/src/prover/smt/solver/bv1-blast.ts +214 -0
- package/src/prover/smt/solver/bv2fpa-converter.ts +174 -0
- package/src/prover/smt/solver/bv2int-rewriter.ts +544 -0
- package/src/prover/smt/solver/bv2real-rewriter.ts +533 -0
- package/src/prover/smt/solver/card2bv.ts +127 -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 +293 -0
- package/src/prover/smt/solver/conflict-resolution.ts +78 -2
- package/src/prover/smt/solver/context.ts +598 -128
- package/src/prover/smt/solver/ctx-simplify.ts +29 -14
- package/src/prover/smt/solver/ctx-solver-simplify.ts +122 -0
- package/src/prover/smt/solver/datatype-decl-plugin.ts +580 -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 +93 -0
- package/src/prover/smt/solver/der.ts +38 -10
- package/src/prover/smt/solver/diff-neq.ts +207 -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 +298 -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-bounds.ts +89 -0
- package/src/prover/smt/solver/elim-small-bv-tactic.ts +129 -0
- package/src/prover/smt/solver/elim-term-ite-tactic.ts +48 -0
- package/src/prover/smt/solver/elim-uncnstr.ts +548 -0
- package/src/prover/smt/solver/enode.ts +100 -3
- package/src/prover/smt/solver/eq2bv-tactic.ts +227 -0
- package/src/prover/smt/solver/euf/arith-axioms.ts +403 -0
- package/src/prover/smt/solver/euf/arith-internalize.ts +653 -0
- package/src/prover/smt/solver/euf/arith-solver.ts +889 -0
- package/src/prover/smt/solver/euf/array-axioms.ts +527 -0
- package/src/prover/smt/solver/euf/array-internalize.ts +428 -0
- package/src/prover/smt/solver/euf/array-solver.ts +306 -0
- package/src/prover/smt/solver/euf/bv-ackerman.ts +162 -0
- package/src/prover/smt/solver/euf/bv-internalize.ts +748 -0
- package/src/prover/smt/solver/euf/bv-solver.ts +449 -0
- package/src/prover/smt/solver/euf/dt-solver.ts +618 -0
- package/src/prover/smt/solver/euf/egraph.ts +901 -0
- package/src/prover/smt/solver/euf/euf-solver.ts +1204 -0
- package/src/prover/smt/solver/euf/fpa-solver.ts +317 -0
- package/src/prover/smt/solver/euf/mam.ts +1046 -0
- package/src/prover/smt/solver/euf/q-ematch.ts +829 -0
- package/src/prover/smt/solver/euf/q-mbi.ts +587 -0
- package/src/prover/smt/solver/euf/q-model-fixer.ts +296 -0
- package/src/prover/smt/solver/euf/q-solver.ts +361 -0
- package/src/prover/smt/solver/euf/th-solver.ts +328 -0
- package/src/prover/smt/solver/euf/th-solvers.ts +30 -0
- package/src/prover/smt/solver/expr-ref.ts +0 -1
- package/src/prover/smt/solver/expr-safe-replace.ts +26 -2
- package/src/prover/smt/solver/expr2polynomial.ts +271 -0
- package/src/prover/smt/solver/factor.ts +163 -0
- package/src/prover/smt/solver/fd-solver.ts +734 -0
- package/src/prover/smt/solver/fingerprints.ts +15 -15
- package/src/prover/smt/solver/fix-dl-var.ts +147 -0
- package/src/prover/smt/solver/flat-literals.ts +0 -1
- package/src/prover/smt/solver/fm-tactic.ts +886 -0
- package/src/prover/smt/solver/fpa-decl-plugin.ts +618 -0
- package/src/prover/smt/solver/fpa-rewriter.ts +639 -0
- package/src/prover/smt/solver/fpa2bv-converter.ts +2251 -0
- package/src/prover/smt/solver/fpa2bv-rewriter.ts +349 -0
- package/src/prover/smt/solver/fpa2bv-tactic.ts +73 -0
- package/src/prover/smt/solver/goal.ts +178 -15
- package/src/prover/smt/solver/goal2nlsat.ts +216 -0
- package/src/prover/smt/solver/guard-set.ts +219 -0
- package/src/prover/smt/solver/hash.ts +0 -1
- package/src/prover/smt/solver/hashtable.ts +34 -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 +111 -39
- 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 +355 -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 +30 -11
- 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 +41 -5
- package/src/prover/smt/solver/lp/lar-term.ts +0 -1
- package/src/prover/smt/solver/lp/lp-settings.ts +6 -3
- 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 +68 -17
- package/src/prover/smt/solver/lp/nla-divisions.ts +0 -2
- package/src/prover/smt/solver/lp/nla-emonics.ts +0 -1
- package/src/prover/smt/solver/lp/nla-factorization.ts +0 -1
- package/src/prover/smt/solver/lp/nla-grobner.ts +167 -85
- package/src/prover/smt/solver/lp/nla-horner.ts +0 -2
- package/src/prover/smt/solver/lp/nla-intervals.ts +0 -1
- package/src/prover/smt/solver/lp/nla-monomial-bounds.ts +0 -2
- package/src/prover/smt/solver/lp/nla-monotone.ts +0 -1
- package/src/prover/smt/solver/lp/nla-order.ts +0 -2
- package/src/prover/smt/solver/lp/nla-patcher.ts +0 -1
- package/src/prover/smt/solver/lp/nla-powers.ts +220 -0
- package/src/prover/smt/solver/lp/nla-tangents.ts +0 -2
- package/src/prover/smt/solver/lp/nla-throttle.ts +0 -1
- package/src/prover/smt/solver/lp/nla-transcendentals.ts +324 -0
- package/src/prover/smt/solver/lp/nla-types.ts +0 -2
- package/src/prover/smt/solver/lp/nla-var-eqs.ts +0 -1
- package/src/prover/smt/solver/lp/nra-solver.ts +163 -99
- package/src/prover/smt/solver/lp/numeric-pair.ts +0 -1
- package/src/prover/smt/solver/lp/pdd-interval.ts +6 -3
- package/src/prover/smt/solver/lp/pdd-simplifier.ts +60 -21
- package/src/prover/smt/solver/lp/pdd-solver.ts +72 -41
- package/src/prover/smt/solver/lp/pdd.ts +725 -290
- package/src/prover/smt/solver/lp/random-updater.ts +0 -2
- package/src/prover/smt/solver/lp/static-matrix.ts +0 -1
- package/src/prover/smt/solver/lp/union-find.ts +7 -2
- package/src/prover/smt/solver/macro-finder.ts +530 -0
- package/src/prover/smt/solver/mam-compiler.ts +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 +310 -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 +106 -0
- package/src/prover/smt/solver/maxsmt.ts +92 -0
- package/src/prover/smt/solver/mbp/mbp-arith.ts +467 -0
- package/src/prover/smt/solver/mbp/mbp-basic-tg.ts +101 -0
- package/src/prover/smt/solver/mbp/mbp-plugin.ts +287 -0
- package/src/prover/smt/solver/mbp/mbp-qel.ts +48 -0
- package/src/prover/smt/solver/mbp/mbp-solve-plugin.ts +271 -0
- package/src/prover/smt/solver/mbp/mbp-term-graph.ts +606 -0
- package/src/prover/smt/solver/model-based-opt.ts +844 -0
- package/src/prover/smt/solver/model-checker.ts +19 -28
- package/src/prover/smt/solver/model-evaluator.ts +190 -12
- package/src/prover/smt/solver/model-finder.ts +12 -18
- package/src/prover/smt/solver/model-generator.ts +104 -35
- 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 +709 -0
- package/src/prover/smt/solver/mus.ts +50 -0
- package/src/prover/smt/solver/muz/dl-context.ts +382 -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 +495 -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 +214 -0
- package/src/prover/smt/solver/muz/rule-properties.ts +359 -0
- package/src/prover/smt/solver/muz/spacer-context.ts +1404 -0
- package/src/prover/smt/solver/muz/spacer-dl-interface.ts +52 -0
- package/src/prover/smt/solver/muz/spacer-generalizers.ts +241 -0
- package/src/prover/smt/solver/muz/spacer-manager.ts +127 -0
- package/src/prover/smt/solver/muz/spacer-pdr.ts +219 -0
- package/src/prover/smt/solver/muz/spacer-prop-solver.ts +333 -0
- package/src/prover/smt/solver/muz/spacer-util.ts +282 -0
- package/src/prover/smt/solver/muz/substitution.ts +203 -0
- package/src/prover/smt/solver/nla2bv-tactic.ts +285 -0
- package/src/prover/smt/solver/nlqsat.ts +485 -0
- package/src/prover/smt/solver/nlsat/algebraic.ts +315 -98
- package/src/prover/smt/solver/nlsat/atoms.ts +71 -38
- package/src/prover/smt/solver/nlsat/evaluator.ts +0 -1
- package/src/prover/smt/solver/nlsat/explain.ts +427 -229
- package/src/prover/smt/solver/nlsat/interval-set.ts +1 -2
- package/src/prover/smt/solver/nlsat/levelwise.ts +460 -246
- package/src/prover/smt/solver/nlsat/mpbq.ts +45 -1
- package/src/prover/smt/solver/nlsat/polynomial.ts +2376 -684
- package/src/prover/smt/solver/nlsat/solver.ts +293 -92
- package/src/prover/smt/solver/nlsat/transcendental-eval.ts +310 -0
- package/src/prover/smt/solver/nlsat/transcendentals.ts +391 -0
- package/src/prover/smt/solver/nlsat/types.ts +0 -2
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +9 -8
- package/src/prover/smt/solver/nlsat/upolynomial.ts +41 -20
- package/src/prover/smt/solver/nlsat-tactic.ts +82 -0
- package/src/prover/smt/solver/nnf.ts +110 -24
- 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 +801 -0
- package/src/prover/smt/solver/opt-nlsat.ts +386 -0
- package/src/prover/smt/solver/opt-pareto.ts +301 -0
- package/src/prover/smt/solver/opt-preprocess.ts +101 -0
- package/src/prover/smt/solver/opt-solver.ts +312 -0
- package/src/prover/smt/solver/opt-value.ts +55 -0
- package/src/prover/smt/solver/optsmt.ts +692 -0
- package/src/prover/smt/solver/parallel-tactic.ts +299 -0
- package/src/prover/smt/solver/pattern-inference.ts +19 -11
- package/src/prover/smt/solver/pb-rewriter.ts +281 -0
- package/src/prover/smt/solver/pb2bv-tactic.ts +546 -0
- package/src/prover/smt/solver/poly-rewriter.ts +259 -57
- package/src/prover/smt/solver/probes.ts +577 -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 +634 -0
- package/src/prover/smt/solver/push-app-ite.ts +37 -0
- package/src/prover/smt/solver/qe-arith-plugin.ts +1096 -0
- package/src/prover/smt/solver/qe-lite-der.ts +2 -3
- package/src/prover/smt/solver/qe-lite-fm.ts +3 -4
- package/src/prover/smt/solver/qe-lite.ts +39 -19
- package/src/prover/smt/solver/qe-mbp.ts +270 -0
- package/src/prover/smt/solver/qe.ts +1499 -0
- package/src/prover/smt/solver/qel.ts +25 -0
- package/src/prover/smt/solver/qi-queue.ts +0 -1
- package/src/prover/smt/solver/qsat.ts +829 -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 +22 -25
- package/src/prover/smt/solver/quasi-macros.ts +243 -0
- package/src/prover/smt/solver/random-gen.ts +0 -1
- package/src/prover/smt/solver/rational.ts +45 -1
- package/src/prover/smt/solver/recfun-decl-plugin.ts +262 -0
- package/src/prover/smt/solver/recfun-rewriter.ts +107 -0
- package/src/prover/smt/solver/reduce-args.ts +225 -0
- package/src/prover/smt/solver/reduce-bv-size.ts +119 -0
- package/src/prover/smt/solver/ref-vector.ts +0 -1
- package/src/prover/smt/solver/relevancy.ts +1 -2
- package/src/prover/smt/solver/rewriter-tpl.ts +82 -14
- package/src/prover/smt/solver/rewriter.ts +505 -60
- package/src/prover/smt/solver/rlimit.ts +45 -5
- 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 +589 -0
- package/src/prover/smt/solver/sat/inc-sat-solver.ts +480 -0
- package/src/prover/smt/solver/sat/model-converter.ts +136 -0
- package/src/prover/smt/solver/sat/pb-constraint.ts +268 -0
- package/src/prover/smt/solver/sat/pb-solver.ts +1596 -0
- package/src/prover/smt/solver/sat/probing.ts +170 -0
- package/src/prover/smt/solver/sat/sat-tactic.ts +72 -0
- package/src/prover/smt/solver/sat/sat2goal.ts +190 -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 +2107 -0
- package/src/prover/smt/solver/sat/var-queue.ts +117 -0
- package/src/prover/smt/solver/sat/watch-list.ts +140 -0
- package/src/prover/smt/solver/search-tree.ts +284 -0
- package/src/prover/smt/solver/seq-axioms.ts +995 -0
- package/src/prover/smt/solver/seq-decl-plugin.ts +819 -0
- package/src/prover/smt/solver/seq-derive.ts +1298 -0
- package/src/prover/smt/solver/seq-eq-approx.ts +236 -0
- package/src/prover/smt/solver/seq-eq-solver.ts +439 -0
- package/src/prover/smt/solver/seq-factory.ts +89 -0
- package/src/prover/smt/solver/seq-monadic.ts +730 -0
- package/src/prover/smt/solver/seq-range-predicate.ts +235 -0
- package/src/prover/smt/solver/seq-re-rewriter.ts +1171 -0
- package/src/prover/smt/solver/seq-re-util.ts +758 -0
- package/src/prover/smt/solver/seq-regex-bisim.ts +144 -0
- package/src/prover/smt/solver/seq-regex-live.ts +200 -0
- package/src/prover/smt/solver/seq-rewriter.ts +2404 -0
- package/src/prover/smt/solver/seq-skolem.ts +294 -0
- package/src/prover/smt/solver/seq-subset.ts +165 -0
- package/src/prover/smt/solver/seq-view-witness.ts +353 -0
- package/src/prover/smt/solver/smt-consequences.ts +297 -0
- package/src/prover/smt/solver/smt-kernel.ts +124 -0
- package/src/prover/smt/solver/smt-logics.ts +66 -0
- package/src/prover/smt/solver/smt-setup.ts +589 -0
- package/src/prover/smt/solver/smt2-printer.ts +765 -0
- package/src/prover/smt/solver/smtlib-parser.ts +3535 -360
- package/src/prover/smt/solver/smtlib-script.ts +2136 -0
- package/src/prover/smt/solver/solve-eqs.ts +928 -0
- package/src/prover/smt/solver/solver.ts +128 -23
- 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 +2176 -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 +1210 -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 +57 -70
- package/src/prover/smt/solver/theory-lra-internalize.ts +96 -27
- package/src/prover/smt/solver/theory-lra-model.ts +20 -35
- package/src/prover/smt/solver/theory-lra-propagate.ts +35 -28
- package/src/prover/smt/solver/theory-lra-state.ts +7 -23
- package/src/prover/smt/solver/theory-lra.ts +189 -2
- package/src/prover/smt/solver/theory-pb.ts +951 -0
- package/src/prover/smt/solver/theory-polymorphism.ts +58 -0
- package/src/prover/smt/solver/theory-recfun.ts +307 -0
- package/src/prover/smt/solver/theory-seq-regex.ts +867 -0
- package/src/prover/smt/solver/theory-seq-solve.ts +1373 -0
- package/src/prover/smt/solver/theory-seq-state.ts +852 -0
- package/src/prover/smt/solver/theory-seq.ts +961 -0
- package/src/prover/smt/solver/theory-without-terms.ts +24 -0
- package/src/prover/smt/solver/theory.ts +189 -0
- package/src/prover/smt/solver/tseitin-cnf.ts +495 -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 +57 -26
- 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 +16 -23
- package/src/prover/zenon/isar-case.ts +1 -3
- package/src/prover/zenon/isar.ts +37 -39
- 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 +1 -3
- package/src/prover/zenon/proof.ts +0 -2
- package/src/prover/zenon/propositional-rules.ts +0 -2
- package/src/prover/zenon/rules.ts +2 -3
- package/src/prover/zenon/search.ts +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 +1327 -328
- package/src/runtime.ts +25 -2
- package/src/sany/builtins.ts +10 -10
- package/src/sany/generation.ts +384 -0
- package/src/sany/generator-def-entries.ts +297 -0
- package/src/sany/generator-definitions.ts +688 -0
- package/src/sany/generator-expressions.ts +1123 -0
- package/src/sany/generator-proofs.ts +668 -0
- package/src/sany/generator.ts +161 -2625
- package/src/sany/levels.ts +0 -2
- package/src/sany/lexer.ts +32 -23
- package/src/sany/linter.ts +0 -2
- package/src/sany/modules.ts +4 -2
- package/src/sany/nodes.ts +3 -4
- package/src/sany/report.ts +3 -6
- package/src/sany/selectors.ts +46 -44
- package/src/sany/xml.ts +25 -58
- package/src/search.ts +513 -165
- package/src/simulate.ts +340 -251
- package/src/spec-description.ts +48 -55
- package/src/standard-definitions.ts +5 -0
- package/src/standard-modules.ts +72 -54
- package/src/state-graph.ts +0 -2
- package/src/subexpressions.ts +564 -138
- package/src/substitution-levels.ts +5 -4
- package/src/successors.ts +56 -28
- package/src/symmetry.ts +4 -3
- package/src/tableau.ts +2 -2
- package/src/tlc/fingerprint.ts +81 -9
- package/src/tlc/jar-data.ts +10 -0
- package/src/tlc/messages.ts +23 -18
- package/src/tlc/order.ts +14 -3
- package/src/tlc/random.ts +6 -5
- package/src/tlc/replay.ts +152 -58
- package/src/tlc/summary.ts +29 -14
- package/src/tlc/tlc-operators.ts +12 -11
- package/src/tlc/tlcext-operators.ts +87 -26
- package/src/tlc/trace-spec.ts +27 -60
- package/src/trace-liveness.ts +529 -0
- package/src/typed-tier.ts +6556 -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/typescript/types.ts +2 -2
- package/src/values.ts +208 -227
- 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/liveness.ts
CHANGED
|
@@ -16,6 +16,7 @@ import {
|
|
|
16
16
|
forEachBoundElement,
|
|
17
17
|
getBoundElements,
|
|
18
18
|
getDefinition,
|
|
19
|
+
getReevaluatedDefinitions,
|
|
19
20
|
getStartupValue,
|
|
20
21
|
lookupScope,
|
|
21
22
|
resolveApplyOperator,
|
|
@@ -26,6 +27,7 @@ import {
|
|
|
26
27
|
type Scope,
|
|
27
28
|
type Thunk,
|
|
28
29
|
} from "./evaluate";
|
|
30
|
+
import { letDefinitions } from "./coverage";
|
|
29
31
|
import { mapChildren } from "./instances";
|
|
30
32
|
import { ACTION_LEVEL, CONSTANT_LEVEL, TEMPORAL_LEVEL, VARIABLE_LEVEL } from "./levels";
|
|
31
33
|
import { isEnabled } from "./successors";
|
|
@@ -37,8 +39,10 @@ import {
|
|
|
37
39
|
createPair,
|
|
38
40
|
createUnary,
|
|
39
41
|
getLiveLevel,
|
|
42
|
+
type LiveAction,
|
|
40
43
|
type LiveEnabled,
|
|
41
44
|
type LiveExpression,
|
|
45
|
+
type LiveState,
|
|
42
46
|
} from "./tableau";
|
|
43
47
|
import { isEqualLikeTlc, type Value } from "./values";
|
|
44
48
|
|
|
@@ -56,6 +60,13 @@ export interface TemporalProperty extends ScopedExpression {
|
|
|
56
60
|
name: string;
|
|
57
61
|
}
|
|
58
62
|
|
|
63
|
+
interface Expansion {
|
|
64
|
+
name: string | undefined;
|
|
65
|
+
path: string[];
|
|
66
|
+
expanding: Set<Definition>;
|
|
67
|
+
isSubstituted: boolean;
|
|
68
|
+
}
|
|
69
|
+
|
|
59
70
|
const MAXIMUM_EXPANSION_DEPTH = 100;
|
|
60
71
|
|
|
61
72
|
export const createTautologyError = () =>
|
|
@@ -210,35 +221,31 @@ export const expandTemporal = (
|
|
|
210
221
|
scope: Scope | undefined,
|
|
211
222
|
environment: Environment,
|
|
212
223
|
isProperty: boolean,
|
|
213
|
-
|
|
214
|
-
isSubstituted = false,
|
|
215
|
-
name?: string,
|
|
216
|
-
path: string[] = [],
|
|
224
|
+
expansion: Expansion = { name: undefined, path: [], expanding: new Set(), isSubstituted: false },
|
|
217
225
|
): ExpandedExpression[] => {
|
|
218
226
|
const expand = (
|
|
219
227
|
child: Expression,
|
|
220
228
|
childScope: Scope | undefined,
|
|
221
|
-
childName = name,
|
|
222
|
-
childExpanding = expanding,
|
|
229
|
+
childName = expansion.name,
|
|
230
|
+
childExpanding = expansion.expanding,
|
|
223
231
|
definition?: Definition,
|
|
224
232
|
): ExpandedExpression[] =>
|
|
225
|
-
expandTemporal(
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
233
|
+
expandTemporal(child, childScope, environment, isProperty, {
|
|
234
|
+
name: childName,
|
|
235
|
+
path:
|
|
236
|
+
definition?.kind === "Operator" && definition.params.length === 0
|
|
237
|
+
? [...expansion.path, definition.name]
|
|
238
|
+
: expansion.path,
|
|
239
|
+
expanding: childExpanding,
|
|
240
|
+
isSubstituted:
|
|
241
|
+
expansion.isSubstituted ||
|
|
232
242
|
(definition !== undefined && environment.substitutedDefinitions.has(definition)),
|
|
233
|
-
|
|
234
|
-
definition?.kind === "Operator" && definition.params.length === 0
|
|
235
|
-
? [...path, definition.name]
|
|
236
|
-
: path,
|
|
237
|
-
);
|
|
243
|
+
});
|
|
238
244
|
if (expression.kind === "And") {
|
|
239
245
|
return expression.operands.flatMap((operand) => expand(operand, scope, describeRange(operand)));
|
|
240
246
|
}
|
|
241
247
|
if (expression.kind === "Label") return expand(expression.body, scope);
|
|
248
|
+
if (expression.kind === "Selection") return expand(expression.expression, scope);
|
|
242
249
|
if (expression.kind === "Let") {
|
|
243
250
|
return expand(expression.body, bindLetDefinitions(expression, scope, environment));
|
|
244
251
|
}
|
|
@@ -248,7 +255,7 @@ export const expandTemporal = (
|
|
|
248
255
|
return expand(
|
|
249
256
|
binding.expression,
|
|
250
257
|
binding.scope,
|
|
251
|
-
definitionThunks.has(binding) ? expression.name : name,
|
|
258
|
+
definitionThunks.has(binding) ? expression.name : expansion.name,
|
|
252
259
|
);
|
|
253
260
|
}
|
|
254
261
|
const definition = environment.constants.has(expression.name)
|
|
@@ -261,14 +268,15 @@ export const expandTemporal = (
|
|
|
261
268
|
(getDefinitionLevel(definition, environment) > CONSTANT_LEVEL ||
|
|
262
269
|
getStartupValue(definition, environment) === undefined)
|
|
263
270
|
) {
|
|
264
|
-
if (expanding.has(definition)) {
|
|
271
|
+
if (expansion.expanding.has(definition)) {
|
|
265
272
|
throw createStackOverflowError();
|
|
266
273
|
}
|
|
267
274
|
return expand(
|
|
268
275
|
definition.body,
|
|
269
276
|
undefined,
|
|
270
|
-
(!isSubstituted && environment.instanceNames.get(expression.name)) ||
|
|
271
|
-
|
|
277
|
+
(!expansion.isSubstituted && environment.instanceNames.get(expression.name)) ||
|
|
278
|
+
definition.name,
|
|
279
|
+
new Set([...expansion.expanding, definition]),
|
|
272
280
|
definition,
|
|
273
281
|
);
|
|
274
282
|
}
|
|
@@ -290,13 +298,13 @@ export const expandTemporal = (
|
|
|
290
298
|
operator?.kind === "Closure" &&
|
|
291
299
|
operator.params.length === expression.args.length &&
|
|
292
300
|
!definition?.isRecursive &&
|
|
293
|
-
(!isSubstituted || isOwnArgumentFree);
|
|
301
|
+
(!expansion.isSubstituted || isOwnArgumentFree);
|
|
294
302
|
if (isExpandable) {
|
|
295
303
|
return expand(
|
|
296
304
|
operator.body,
|
|
297
305
|
bindOperatorArguments(operator, expression.args, context),
|
|
298
|
-
isSubstituted && definition ? definition.name : expression.operator,
|
|
299
|
-
expanding,
|
|
306
|
+
expansion.isSubstituted && definition ? definition.name : expression.operator,
|
|
307
|
+
expansion.expanding,
|
|
300
308
|
definition,
|
|
301
309
|
);
|
|
302
310
|
}
|
|
@@ -315,17 +323,25 @@ export const expandTemporal = (
|
|
|
315
323
|
if (expanded.length === 0) throw createTautologyError();
|
|
316
324
|
return expanded;
|
|
317
325
|
}
|
|
318
|
-
return [{ expression, scope, name, path }];
|
|
326
|
+
return [{ expression, scope, name: expansion.name, path: expansion.path }];
|
|
319
327
|
};
|
|
320
328
|
|
|
321
|
-
|
|
329
|
+
// TLC takes a formula apart through a LET without binding its definitions, so it evaluates an impure one again at each reference.
|
|
330
|
+
export const bindLetDefinitions = (
|
|
322
331
|
expression: Expression & { kind: "Let" },
|
|
323
332
|
scope: Scope | undefined,
|
|
324
333
|
environment: Environment,
|
|
325
334
|
) => {
|
|
326
|
-
const bound = bindDefinitions(
|
|
335
|
+
const bound = bindDefinitions(
|
|
336
|
+
expression.definitions,
|
|
337
|
+
getConstantContext(environment, scope),
|
|
338
|
+
getReevaluatedDefinitions(expression.definitions, environment),
|
|
339
|
+
);
|
|
327
340
|
for (let current = bound; current && current !== scope; current = current.parent) {
|
|
328
341
|
if (current.binding.kind === "Thunk") definitionThunks.add(current.binding);
|
|
342
|
+
const name = current.name;
|
|
343
|
+
const definition = expression.definitions.find((item) => item.name === name);
|
|
344
|
+
if (definition) letDefinitions.set(current, definition);
|
|
329
345
|
}
|
|
330
346
|
return bound;
|
|
331
347
|
};
|
|
@@ -483,42 +499,57 @@ export const toLiveExpression = (
|
|
|
483
499
|
return level > ACTION_LEVEL ? parts : toAtom(expression, scope, level);
|
|
484
500
|
};
|
|
485
501
|
|
|
486
|
-
|
|
487
|
-
|
|
488
|
-
expression
|
|
489
|
-
|
|
490
|
-
|
|
491
|
-
|
|
492
|
-
|
|
493
|
-
|
|
494
|
-
(expression.
|
|
495
|
-
|
|
496
|
-
expression
|
|
502
|
+
// SANY parses `a /\ b /\ c` as `(a /\ b) /\ c`, so TLC takes a prefix below the temporal level as one formula.
|
|
503
|
+
const convertJunction = (
|
|
504
|
+
expression: Expression & { kind: "And" | "Or" },
|
|
505
|
+
scope: Scope | undefined,
|
|
506
|
+
) => {
|
|
507
|
+
const operands = expression.operands;
|
|
508
|
+
const range = expression.location.range;
|
|
509
|
+
const prefixEnds = expression.prefixEnds;
|
|
510
|
+
if (expression.isBulleted || !range || !prefixEnds) {
|
|
511
|
+
return toWhole(
|
|
512
|
+
expression,
|
|
513
|
+
scope,
|
|
514
|
+
createJunction(
|
|
515
|
+
expression.kind,
|
|
516
|
+
operands.map((operand) => convert(operand, scope)),
|
|
517
|
+
),
|
|
518
|
+
);
|
|
519
|
+
}
|
|
520
|
+
return operands.slice(1).reduce(
|
|
521
|
+
(prefix, operand, index) => {
|
|
522
|
+
const node =
|
|
523
|
+
index === operands.length - 2
|
|
524
|
+
? expression
|
|
525
|
+
: {
|
|
526
|
+
...expression,
|
|
527
|
+
operands: operands.slice(0, index + 2),
|
|
528
|
+
prefixEnds: prefixEnds.slice(0, index + 1),
|
|
529
|
+
location: { ...expression.location, range: { ...range, end: prefixEnds[index] } },
|
|
530
|
+
};
|
|
531
|
+
return toWhole(
|
|
532
|
+
node,
|
|
533
|
+
scope,
|
|
534
|
+
createJunction(expression.kind, [prefix, convert(operand, scope)]),
|
|
535
|
+
);
|
|
536
|
+
},
|
|
537
|
+
convert(operands[0], scope),
|
|
538
|
+
);
|
|
539
|
+
};
|
|
497
540
|
|
|
541
|
+
// These forms are translated part by part at every level; any other form below the temporal level is an atom.
|
|
498
542
|
const convert = (expression: Expression, scope: Scope | undefined): LiveExpression => {
|
|
499
543
|
const level = getLevel(expression, scope, environment);
|
|
500
|
-
if (level <= ACTION_LEVEL && !isTranslatedWhole(expression)) {
|
|
501
|
-
return toAtom(expression, scope, level);
|
|
502
|
-
}
|
|
503
544
|
switch (expression.kind) {
|
|
504
545
|
case "Label":
|
|
505
546
|
return convert(expression.body, scope);
|
|
547
|
+
case "Selection":
|
|
548
|
+
return convert(expression.expression, scope);
|
|
506
549
|
case "Let":
|
|
507
550
|
return convert(expression.body, bindLetDefinitions(expression, scope, environment));
|
|
508
|
-
case "Identifier":
|
|
509
|
-
return convertCall(expression, scope);
|
|
510
551
|
case "Apply": {
|
|
511
552
|
const args = expression.args;
|
|
512
|
-
if (expression.operator === "~>") {
|
|
513
|
-
return createUnary(
|
|
514
|
-
"Always",
|
|
515
|
-
createPair(
|
|
516
|
-
"Or",
|
|
517
|
-
createUnary("Not", convert(args[0], scope)),
|
|
518
|
-
createUnary("Eventually", convert(args[1], scope)),
|
|
519
|
-
),
|
|
520
|
-
);
|
|
521
|
-
}
|
|
522
553
|
if (expression.operator === "~" && !isLocallyResolved(expression)) {
|
|
523
554
|
return toWhole(expression, scope, createUnary("Not", convert(args[0], scope)));
|
|
524
555
|
}
|
|
@@ -529,18 +560,11 @@ export const toLiveExpression = (
|
|
|
529
560
|
createPair("Or", createUnary("Not", convert(args[0], scope)), convert(args[1], scope)),
|
|
530
561
|
);
|
|
531
562
|
}
|
|
532
|
-
|
|
563
|
+
break;
|
|
533
564
|
}
|
|
534
565
|
case "And":
|
|
535
566
|
case "Or":
|
|
536
|
-
return
|
|
537
|
-
expression,
|
|
538
|
-
scope,
|
|
539
|
-
createJunction(
|
|
540
|
-
expression.kind,
|
|
541
|
-
expression.operands.map((operand) => convert(operand, scope)),
|
|
542
|
-
),
|
|
543
|
-
);
|
|
567
|
+
return convertJunction(expression, scope);
|
|
544
568
|
case "Forall":
|
|
545
569
|
case "Exists":
|
|
546
570
|
return convertQuantifier(expression, scope);
|
|
@@ -566,6 +590,22 @@ export const toLiveExpression = (
|
|
|
566
590
|
),
|
|
567
591
|
);
|
|
568
592
|
}
|
|
593
|
+
}
|
|
594
|
+
if (level <= ACTION_LEVEL) return toAtom(expression, scope, level);
|
|
595
|
+
switch (expression.kind) {
|
|
596
|
+
case "Identifier":
|
|
597
|
+
return convertCall(expression, scope);
|
|
598
|
+
case "Apply":
|
|
599
|
+
return expression.operator === "~>"
|
|
600
|
+
? createUnary(
|
|
601
|
+
"Always",
|
|
602
|
+
createPair(
|
|
603
|
+
"Or",
|
|
604
|
+
createUnary("Not", convert(expression.args[0], scope)),
|
|
605
|
+
createUnary("Eventually", convert(expression.args[1], scope)),
|
|
606
|
+
),
|
|
607
|
+
)
|
|
608
|
+
: convertCall(expression, scope);
|
|
569
609
|
case "Always":
|
|
570
610
|
case "Eventually":
|
|
571
611
|
return createUnary(expression.kind, convert(expression.expression, scope));
|
|
@@ -606,15 +646,50 @@ export const toLiveExpression = (
|
|
|
606
646
|
return convert(root, rootScope);
|
|
607
647
|
};
|
|
608
648
|
|
|
609
|
-
|
|
649
|
+
// Evaluates the atoms of a formula, which the interpreter and the typed tier evaluate differently.
|
|
650
|
+
export interface LiveAtoms<State> {
|
|
651
|
+
holdsState: (atom: LiveState | LiveEnabled, state: State) => boolean;
|
|
652
|
+
holdsAction: (atom: LiveAction, state: State, next: State) => boolean;
|
|
653
|
+
}
|
|
654
|
+
|
|
655
|
+
export const getInterpretedAtoms = (environment: Environment): LiveAtoms<Value[]> => ({
|
|
656
|
+
holdsState: (atom, state) => {
|
|
657
|
+
const context = { environment, scope: atom.scope, state, next: undefined };
|
|
658
|
+
const value =
|
|
659
|
+
atom.kind === "State" ? evaluate(atom.expression, context) : isEnabled(atom.step, context);
|
|
660
|
+
if (typeof value !== "boolean") {
|
|
661
|
+
throw new TlaEvaluationError("A state predicate was evaluated to a non-boolean value.");
|
|
662
|
+
}
|
|
663
|
+
return value;
|
|
664
|
+
},
|
|
665
|
+
holdsAction: (atom, state, next) => {
|
|
666
|
+
const scope = atom.scope;
|
|
667
|
+
const subscript = atom.subscript;
|
|
668
|
+
if (
|
|
669
|
+
subscript &&
|
|
670
|
+
isEqualLikeTlc(
|
|
671
|
+
evaluate(subscript, { environment, scope, state, next: undefined }),
|
|
672
|
+
evaluate(subscript, { environment, scope, state: next, next: undefined }),
|
|
673
|
+
)
|
|
674
|
+
)
|
|
675
|
+
return false;
|
|
676
|
+
const value = evaluate(atom.expression, { environment, scope, state, next });
|
|
677
|
+
if (typeof value !== "boolean") {
|
|
678
|
+
throw new TlaEvaluationError("Encountered an action predicate that's not a boolean.");
|
|
679
|
+
}
|
|
680
|
+
return value;
|
|
681
|
+
},
|
|
682
|
+
});
|
|
683
|
+
|
|
684
|
+
export const evaluateLive = <State>(
|
|
610
685
|
expression: LiveExpression,
|
|
611
|
-
state:
|
|
612
|
-
next:
|
|
613
|
-
|
|
686
|
+
state: State,
|
|
687
|
+
next: State | undefined,
|
|
688
|
+
atoms: LiveAtoms<State>,
|
|
614
689
|
stateCache: Map<LiveExpression, boolean>,
|
|
615
690
|
): boolean => {
|
|
616
691
|
const recurse = (operand: LiveExpression) =>
|
|
617
|
-
evaluateLive(operand, state, next,
|
|
692
|
+
evaluateLive(operand, state, next, atoms, stateCache);
|
|
618
693
|
switch (expression.kind) {
|
|
619
694
|
case "Boolean":
|
|
620
695
|
return expression.value;
|
|
@@ -622,35 +697,13 @@ export const evaluateLive = (
|
|
|
622
697
|
case "Enabled": {
|
|
623
698
|
const cached = stateCache.get(expression);
|
|
624
699
|
if (cached !== undefined) return cached;
|
|
625
|
-
const
|
|
626
|
-
const value =
|
|
627
|
-
expression.kind === "State"
|
|
628
|
-
? evaluate(expression.expression, context)
|
|
629
|
-
: isEnabled(expression.step, context);
|
|
630
|
-
if (typeof value !== "boolean") {
|
|
631
|
-
throw new TlaEvaluationError("A state predicate was evaluated to a non-boolean value.");
|
|
632
|
-
}
|
|
700
|
+
const value = atoms.holdsState(expression, state);
|
|
633
701
|
stateCache.set(expression, value);
|
|
634
702
|
return value;
|
|
635
703
|
}
|
|
636
|
-
case "Action":
|
|
704
|
+
case "Action":
|
|
637
705
|
if (expression.enabled && stateCache.get(expression.enabled) === false) return false;
|
|
638
|
-
|
|
639
|
-
const subscript = expression.subscript;
|
|
640
|
-
if (
|
|
641
|
-
subscript &&
|
|
642
|
-
isEqualLikeTlc(
|
|
643
|
-
evaluate(subscript, { environment, scope, state, next: undefined }),
|
|
644
|
-
evaluate(subscript, { environment, scope, state: next, next: undefined }),
|
|
645
|
-
)
|
|
646
|
-
)
|
|
647
|
-
return false;
|
|
648
|
-
const value = evaluate(expression.expression, { environment, scope, state, next });
|
|
649
|
-
if (typeof value !== "boolean") {
|
|
650
|
-
throw new TlaEvaluationError("Encountered an action predicate that's not a boolean.");
|
|
651
|
-
}
|
|
652
|
-
return value;
|
|
653
|
-
}
|
|
706
|
+
return next !== undefined && atoms.holdsAction(expression, state, next);
|
|
654
707
|
case "Not":
|
|
655
708
|
return !recurse(expression.body);
|
|
656
709
|
case "And":
|
|
@@ -658,7 +711,7 @@ export const evaluateLive = (
|
|
|
658
711
|
case "Or":
|
|
659
712
|
return expression.operands.some(recurse);
|
|
660
713
|
case "Next":
|
|
661
|
-
return evaluateLive(expression.body, next ?? state, undefined,
|
|
714
|
+
return evaluateLive(expression.body, next ?? state, undefined, atoms, new Map());
|
|
662
715
|
case "Always":
|
|
663
716
|
case "Eventually":
|
|
664
717
|
throw new TlaEvaluationError("TLC cannot evaluate a temporal formula in a single step");
|
|
@@ -695,7 +748,7 @@ export const evaluateOnLasso = (
|
|
|
695
748
|
expression,
|
|
696
749
|
path[position],
|
|
697
750
|
path[getNext(position)],
|
|
698
|
-
environment,
|
|
751
|
+
getInterpretedAtoms(environment),
|
|
699
752
|
new Map(),
|
|
700
753
|
);
|
|
701
754
|
}
|
|
@@ -1,6 +1,4 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
import { TlaProofError, TlapmBugError, TlaProverError } from "../errors";
|
|
1
|
+
import { TlapmBugError, TlaProverError } from "../errors";
|
|
4
2
|
import type { Anonymizer } from "./anonymize";
|
|
5
3
|
import { bumpBy, normalizeApply, shift, substituteExpr, type Substitution } from "./substitution";
|
|
6
4
|
import {
|
|
@@ -14,6 +12,7 @@ import {
|
|
|
14
12
|
getParamFresh,
|
|
15
13
|
getScopeAt,
|
|
16
14
|
isBuiltinApply,
|
|
15
|
+
mapChildren,
|
|
17
16
|
mapScoped,
|
|
18
17
|
stripProps,
|
|
19
18
|
type Expr,
|
|
@@ -22,7 +21,7 @@ import {
|
|
|
22
21
|
type Scope,
|
|
23
22
|
} from "./expression";
|
|
24
23
|
import { getLevelInfo, LEVEL_NUMBERS } from "./levels";
|
|
25
|
-
import { rewriteUnchanged } from "./temporal";
|
|
24
|
+
import { expandFairness, rewriteUnchanged } from "./temporal";
|
|
26
25
|
|
|
27
26
|
interface ActionOptions {
|
|
28
27
|
isEnabled: boolean;
|
|
@@ -46,14 +45,6 @@ const NESTED_CDOT =
|
|
|
46
45
|
|
|
47
46
|
const NESTED_CDOT_SPACED = `${NESTED_CDOT} For example, writing \`BY ExpandCdot\`.`;
|
|
48
47
|
|
|
49
|
-
const mapVisibleChildren = (expression: Expr, map: (child: Expr) => Expr) =>
|
|
50
|
-
mapScoped(
|
|
51
|
-
undefined,
|
|
52
|
-
expression,
|
|
53
|
-
(_state, child) => map(child),
|
|
54
|
-
() => undefined,
|
|
55
|
-
);
|
|
56
|
-
|
|
57
48
|
const getHyp = (scope: Scope | undefined, index: number) => {
|
|
58
49
|
const hyp = getScopeAt(scope, index - 1)?.hyp;
|
|
59
50
|
if (!hyp) throw new TlapmBugError();
|
|
@@ -170,7 +161,7 @@ const expandDefinitions = (
|
|
|
170
161
|
if (hyp.kind === "Fresh") {
|
|
171
162
|
const message = `The expression that results from applying the declared operator \`${hyp.name}\` has expression level ${expressionLevel} within the scope of \`ENABLED\` or \`\\cdot\` where soundness requires expanding expressions of level >= ${level}. A declared operator cannot be expanded.\n${getDeclaration(hyp.name)}\n and has level: ${LEVEL_NUMBERS[hyp.level]}\n and arity: ${hyp.shape}`;
|
|
172
163
|
onWarning(getErrorNote(expression.location, message));
|
|
173
|
-
throw new
|
|
164
|
+
throw new TlaProverError(message);
|
|
174
165
|
}
|
|
175
166
|
const definition = hyp.definition;
|
|
176
167
|
if (definition.kind !== "Operator" && definition.kind !== "Bpragma") {
|
|
@@ -392,7 +383,7 @@ const renameParams = (isKeepingNames: boolean, expression: Expr): Expr => {
|
|
|
392
383
|
],
|
|
393
384
|
};
|
|
394
385
|
}
|
|
395
|
-
return
|
|
386
|
+
return mapChildren(expression, (child) => renameParams(isKeepingNames, child), "visible");
|
|
396
387
|
};
|
|
397
388
|
|
|
398
389
|
const checkArity = (expression: Expr): Expr => {
|
|
@@ -403,7 +394,7 @@ const checkArity = (expression: Expr): Expr => {
|
|
|
403
394
|
) {
|
|
404
395
|
throw new TlapmBugError();
|
|
405
396
|
}
|
|
406
|
-
return
|
|
397
|
+
return mapChildren(expression, checkArity, "visible");
|
|
407
398
|
};
|
|
408
399
|
|
|
409
400
|
const lambdifyOperators = (
|
|
@@ -427,7 +418,13 @@ export const lambdify = (
|
|
|
427
418
|
expression: Expr,
|
|
428
419
|
options = LAMBDIFY_ALL,
|
|
429
420
|
) => {
|
|
430
|
-
const expanded = expandDefinitions(
|
|
421
|
+
const expanded = expandDefinitions(
|
|
422
|
+
options,
|
|
423
|
+
onWarning,
|
|
424
|
+
scope,
|
|
425
|
+
options.isEnabled ? expandFairness(expression) : expression,
|
|
426
|
+
undefined,
|
|
427
|
+
);
|
|
431
428
|
return checkArity(lambdifyOperators(anonymizer, onWarning, scope, expanded, options, false));
|
|
432
429
|
};
|
|
433
430
|
|
|
@@ -516,7 +513,7 @@ const commuteExistsDisjunction = (expression: Expr): Expr => {
|
|
|
516
513
|
});
|
|
517
514
|
}
|
|
518
515
|
}
|
|
519
|
-
return
|
|
516
|
+
return mapChildren(expression, commuteExistsDisjunction, "visible");
|
|
520
517
|
};
|
|
521
518
|
|
|
522
519
|
export const expandActionOperators = (
|
|
@@ -1,25 +1,28 @@
|
|
|
1
|
-
// A port of tlapm's anonymization (Expr.Anon, Elab.desugar and Proof.Anon).
|
|
2
|
-
|
|
3
1
|
import { TlapmBugError, TlaProofError } from "../errors";
|
|
4
2
|
import { consSubstitution, normalizeApply, shift, shiftExpr, substituteExpr } from "./substitution";
|
|
5
3
|
import { isEqualExpr } from "./equality";
|
|
6
4
|
import {
|
|
5
|
+
AT_NOWHERE,
|
|
7
6
|
adjoin,
|
|
8
7
|
adjoinAll,
|
|
9
8
|
applyBuiltin,
|
|
10
9
|
at,
|
|
11
10
|
exprifySequent,
|
|
12
11
|
findNamed,
|
|
12
|
+
getScopeHyps,
|
|
13
13
|
getBoundFresh,
|
|
14
14
|
getErrorNote,
|
|
15
|
+
getErrorSetting,
|
|
15
16
|
getFresh,
|
|
16
17
|
getLocalDefn,
|
|
17
18
|
getLocusPrefix,
|
|
18
19
|
getScopeAt,
|
|
20
|
+
getTrue,
|
|
19
21
|
mapAccumulate,
|
|
20
22
|
mapBoundDomains,
|
|
21
23
|
mapScoped,
|
|
22
24
|
mapSelectorArgs,
|
|
25
|
+
warnError,
|
|
23
26
|
type Bound,
|
|
24
27
|
type Defn,
|
|
25
28
|
type ExceptPoint,
|
|
@@ -33,12 +36,12 @@ import {
|
|
|
33
36
|
type Sequent,
|
|
34
37
|
type WhereDefined,
|
|
35
38
|
} from "./expression";
|
|
39
|
+
import { renderDoc } from "./format";
|
|
40
|
+
import { printExpression } from "./printer";
|
|
36
41
|
import { resolveSubexpression } from "./subexpression";
|
|
37
42
|
import { getTime } from "./temporal";
|
|
38
43
|
import {
|
|
39
44
|
getStepName,
|
|
40
|
-
getUnique,
|
|
41
|
-
type Counter,
|
|
42
45
|
type Proof,
|
|
43
46
|
type Step,
|
|
44
47
|
type StepNumber,
|
|
@@ -48,7 +51,7 @@ import {
|
|
|
48
51
|
|
|
49
52
|
const DUMMY_FACT: Hyp = {
|
|
50
53
|
kind: "Fact",
|
|
51
|
-
expression:
|
|
54
|
+
expression: AT_NOWHERE,
|
|
52
55
|
visibility: "Visible",
|
|
53
56
|
time: "Always",
|
|
54
57
|
};
|
|
@@ -73,7 +76,7 @@ interface AnonContext {
|
|
|
73
76
|
}
|
|
74
77
|
|
|
75
78
|
export const createAnonymizer = (
|
|
76
|
-
|
|
79
|
+
getStepLabel: () => string,
|
|
77
80
|
expandInstance: (
|
|
78
81
|
scope: Scope | undefined,
|
|
79
82
|
definition: Extract<Defn, { kind: "Instance" }>,
|
|
@@ -137,7 +140,7 @@ export const createAnonymizer = (
|
|
|
137
140
|
const found = findNamed(context.scope, name);
|
|
138
141
|
if (!found) {
|
|
139
142
|
const message = `Operator "${name}" not found`;
|
|
140
|
-
onWarning
|
|
143
|
+
warnError(onWarning, from.location, message);
|
|
141
144
|
throw new TlaProofError(message, { failure: "Expr.Anon: 4" });
|
|
142
145
|
}
|
|
143
146
|
const index = found.depth + 1;
|
|
@@ -148,15 +151,20 @@ export const createAnonymizer = (
|
|
|
148
151
|
if (definition.kind === "Operator") {
|
|
149
152
|
return createStandardForm(index, hyp.whereDefined, definition.body, args, from);
|
|
150
153
|
}
|
|
151
|
-
if (definition.kind === "Recursive")
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
});
|
|
154
|
+
if (definition.kind === "Recursive") {
|
|
155
|
+
const message = "Recursive operators not supported by TLAPS";
|
|
156
|
+
onWarning(getErrorSetting(hyp.location, message));
|
|
157
|
+
throw new TlaProofError(message, { failure: "Expr.Anon: Recursive" });
|
|
158
|
+
}
|
|
155
159
|
return createAnonApply(index, args, from);
|
|
156
160
|
}
|
|
157
161
|
case "Fresh":
|
|
158
162
|
return createAnonApply(index, args, from);
|
|
159
163
|
case "Flex":
|
|
164
|
+
if (args.length > 0)
|
|
165
|
+
throw new TlapmBugError(
|
|
166
|
+
'File "src/expr/e_anon.ml", line 224, characters 24-30: Assertion failed',
|
|
167
|
+
);
|
|
160
168
|
return at({ kind: "Ix", index }, from);
|
|
161
169
|
case "Fact":
|
|
162
170
|
throw new TlapmBugError(
|
|
@@ -189,6 +197,7 @@ export const createAnonymizer = (
|
|
|
189
197
|
}
|
|
190
198
|
const message = `Operator "${prefix}" not found`;
|
|
191
199
|
if (selector) onWarning(getErrorNote(from.location, message));
|
|
200
|
+
onWarning(getErrorSetting(from.location, message));
|
|
192
201
|
throw new TlaProofError(message, {
|
|
193
202
|
failure: `Expr.Anon: ${selector ? ANON_SELECTOR_FAILURES[selector.kind] : "1EMPTY"}`,
|
|
194
203
|
});
|
|
@@ -198,7 +207,14 @@ export const createAnonymizer = (
|
|
|
198
207
|
hyp.kind !== "Defn" ||
|
|
199
208
|
(hyp.definition.kind !== "Operator" && hyp.definition.kind !== "Bpragma")
|
|
200
209
|
) {
|
|
201
|
-
|
|
210
|
+
onWarning(
|
|
211
|
+
getErrorNote(
|
|
212
|
+
from.location,
|
|
213
|
+
`invalid subexpression reference in: ${renderDoc(printExpression([], from))}`,
|
|
214
|
+
),
|
|
215
|
+
);
|
|
216
|
+
onWarning(getErrorSetting(from.location, "invalid subexpression reference"));
|
|
217
|
+
throw new TlaProofError("invalid subexpression reference", { failure: "Expr.Anon: 3" });
|
|
202
218
|
}
|
|
203
219
|
const index = found.depth + 1;
|
|
204
220
|
if (selectors.length === 0 && isInstance) {
|
|
@@ -207,7 +223,8 @@ export const createAnonymizer = (
|
|
|
207
223
|
: createStandardForm(index, hyp.whereDefined, hyp.definition.body, args, from);
|
|
208
224
|
}
|
|
209
225
|
const body = withLocus(shiftExpr(index, hyp.definition.body), from);
|
|
210
|
-
|
|
226
|
+
const hyps = getScopeHyps(context.scope);
|
|
227
|
+
return withLocus(resolveSubexpression(onWarning, hyps, body, args, selectors), from);
|
|
211
228
|
};
|
|
212
229
|
|
|
213
230
|
const anonymizeCore = (context: AnonContext, expression: Expr): Expr => {
|
|
@@ -235,7 +252,7 @@ export const createAnonymizer = (
|
|
|
235
252
|
text: `${getLocusPrefix(expression.location)}Warning: ${name} does not introduce any assumptions. It does not make sense to use it here.\n`,
|
|
236
253
|
channel: "toolbox",
|
|
237
254
|
});
|
|
238
|
-
return
|
|
255
|
+
return getTrue(expression);
|
|
239
256
|
}
|
|
240
257
|
const args = expression.args.map((arg) => anonymizeExpr(context, arg));
|
|
241
258
|
return resolveName(context, name, args, expression);
|
|
@@ -264,7 +281,11 @@ export const createAnonymizer = (
|
|
|
264
281
|
label: form.label,
|
|
265
282
|
indices: form.names.map((name) => {
|
|
266
283
|
const found = findNamed(context.scope, name);
|
|
267
|
-
if (!found)
|
|
284
|
+
if (!found) {
|
|
285
|
+
const message = `Identifier "${name}" in label parameters not found`;
|
|
286
|
+
warnError(onWarning, form.location, message);
|
|
287
|
+
throw new TlaProofError(message, { failure: "Expr.Anon" });
|
|
288
|
+
}
|
|
268
289
|
return { name, index: found.depth + 1 };
|
|
269
290
|
}),
|
|
270
291
|
};
|
|
@@ -448,7 +469,7 @@ export const createAnonymizer = (
|
|
|
448
469
|
? {
|
|
449
470
|
kind: "Named",
|
|
450
471
|
level: original.step.level,
|
|
451
|
-
label:
|
|
472
|
+
label: getStepLabel(),
|
|
452
473
|
isAnonymous: true,
|
|
453
474
|
}
|
|
454
475
|
: original.step;
|