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/cli/xml-exporter.ts
CHANGED
|
@@ -13,9 +13,9 @@ import {
|
|
|
13
13
|
reportMissingModules174,
|
|
14
14
|
toLibraryPath,
|
|
15
15
|
} from "./shared";
|
|
16
|
+
import { getBold } from "./tlc-usage";
|
|
16
17
|
|
|
17
18
|
const XML_EXPORT_USAGE = (() => {
|
|
18
|
-
const bold = (text: string) => `\x1b[1m${text}\x1b[0m`;
|
|
19
19
|
const options = [
|
|
20
20
|
["-I", "Include; use given directory path to resolve module dependencies."],
|
|
21
21
|
["-help", "Print this usage information."],
|
|
@@ -37,24 +37,24 @@ const XML_EXPORT_USAGE = (() => {
|
|
|
37
37
|
];
|
|
38
38
|
return [
|
|
39
39
|
"",
|
|
40
|
-
|
|
40
|
+
getBold("NAME"),
|
|
41
41
|
"",
|
|
42
42
|
"\ttla2sany.xml.XMLExporter - Emit SANY's parse tree as XML - Version 2.2 created 08 July 2020",
|
|
43
43
|
"",
|
|
44
44
|
"",
|
|
45
|
-
|
|
45
|
+
getBold("SYNOPSIS"),
|
|
46
46
|
"",
|
|
47
|
-
`\t${
|
|
47
|
+
`\t${getBold("tla2sany.xml.XMLExporter")} [${getBold("-Iortu")}] [${getBold("-help")}] FILE`,
|
|
48
48
|
"",
|
|
49
|
-
|
|
49
|
+
getBold("DESCRIPTION"),
|
|
50
50
|
"",
|
|
51
51
|
"\tGiven a TLA+ file, parse that file with SANY then translate the module's semantic parse tree to XML, including all the modules depended on. The XML is printed to stdout and its output format is given by an XML Schema file (.xsd) found at https://proofs.tlapl.us/doc/web/sany.xsd.",
|
|
52
52
|
"",
|
|
53
|
-
|
|
53
|
+
getBold("OPTIONS"),
|
|
54
54
|
"",
|
|
55
|
-
...options.map((
|
|
55
|
+
...options.map((option) => `\t${getBold(option[0])}\n\t\t${option[1]}`),
|
|
56
56
|
"",
|
|
57
|
-
|
|
57
|
+
getBold("TIPS"),
|
|
58
58
|
"",
|
|
59
59
|
...tips.flatMap((tip) => [`\t${tip}`, ""]),
|
|
60
60
|
"",
|
|
@@ -83,14 +83,24 @@ const writeXml = (specification: SanySpecification, options: XmlExportOptions) =
|
|
|
83
83
|
}
|
|
84
84
|
};
|
|
85
85
|
|
|
86
|
+
const ARGUMENT_ERRORS = {
|
|
87
|
+
"no-file": { message: "at least one .tla file must be given", line174: 59 },
|
|
88
|
+
"missing-include": {
|
|
89
|
+
message: "the -I flag must be followed by a directory and at least one .tla file",
|
|
90
|
+
line174: 71,
|
|
91
|
+
},
|
|
92
|
+
"several-files": { message: "Only one TLA file to check allowed!", line174: 83 },
|
|
93
|
+
};
|
|
94
|
+
|
|
86
95
|
interface XmlExportArgs {
|
|
87
96
|
flags: Set<string>;
|
|
88
97
|
includes: string[];
|
|
89
|
-
error:
|
|
98
|
+
error: keyof typeof ARGUMENT_ERRORS | undefined;
|
|
90
99
|
}
|
|
91
100
|
|
|
92
101
|
const parseXmlExportArgs = (args: string[], flagNames: Set<string>): XmlExportArgs => {
|
|
93
102
|
const parsed: XmlExportArgs = { flags: new Set(), includes: [], error: undefined };
|
|
103
|
+
if (args.length === 0) return { ...parsed, error: "no-file" };
|
|
94
104
|
let lastFlagIndex = -1;
|
|
95
105
|
for (let index = 0; index < args.length - 1; index++) {
|
|
96
106
|
if (flagNames.has(args[index])) {
|
|
@@ -108,16 +118,8 @@ const parseXmlExportArgs = (args: string[], flagNames: Set<string>): XmlExportAr
|
|
|
108
118
|
};
|
|
109
119
|
|
|
110
120
|
export const exportXml = (args: string[]) => {
|
|
111
|
-
if (args.length === 0) return printXmlExportUsageError("at least one .tla file must be given");
|
|
112
121
|
const parsed = parseXmlExportArgs(args, new Set(["-o", "-t", "-r", "-u"]));
|
|
113
|
-
if (parsed.error
|
|
114
|
-
return printXmlExportUsageError(
|
|
115
|
-
"the -I flag must be followed by a directory and at least one .tla file",
|
|
116
|
-
);
|
|
117
|
-
}
|
|
118
|
-
if (parsed.error === "several-files") {
|
|
119
|
-
return printXmlExportUsageError("Only one TLA file to check allowed!");
|
|
120
|
-
}
|
|
122
|
+
if (parsed.error) return printXmlExportUsageError(ARGUMENT_ERRORS[parsed.error].message);
|
|
121
123
|
const name = args[args.length - 1];
|
|
122
124
|
if (name === "-help") {
|
|
123
125
|
process.stdout.write(XML_EXPORT_USAGE);
|
|
@@ -154,23 +156,11 @@ const printXmlExporterException = (exception: string, line: number) => {
|
|
|
154
156
|
};
|
|
155
157
|
|
|
156
158
|
export const exportXml174 = (args: string[], jar: string | undefined) => {
|
|
157
|
-
if (args.length === 0) {
|
|
158
|
-
return printXmlExporterException(
|
|
159
|
-
"java.lang.IllegalArgumentException: at least one .tla file must be given",
|
|
160
|
-
59,
|
|
161
|
-
);
|
|
162
|
-
}
|
|
163
159
|
const parsed = parseXmlExportArgs(args, new Set(["-o"]));
|
|
164
|
-
if (parsed.error
|
|
165
|
-
return printXmlExporterException(
|
|
166
|
-
"java.lang.IllegalArgumentException: the -I flag must be followed by a directory and at least one .tla file",
|
|
167
|
-
71,
|
|
168
|
-
);
|
|
169
|
-
}
|
|
170
|
-
if (parsed.error === "several-files") {
|
|
160
|
+
if (parsed.error) {
|
|
171
161
|
return printXmlExporterException(
|
|
172
|
-
|
|
173
|
-
|
|
162
|
+
`java.lang.IllegalArgumentException: ${ARGUMENT_ERRORS[parsed.error].message}`,
|
|
163
|
+
ARGUMENT_ERRORS[parsed.error].line174,
|
|
174
164
|
);
|
|
175
165
|
}
|
|
176
166
|
const name = args[args.length - 1];
|
package/src/codegen.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import { getChildren, isLocallyResolved, type Expression } from "./ast";
|
|
1
|
+
import { getChildren, getReferencedName, isLocallyResolved, type Expression } from "./ast";
|
|
2
|
+
import { isTlcEvalReached } from "./dependencies";
|
|
2
3
|
import {
|
|
3
4
|
bindValue,
|
|
4
5
|
expectBooleanBody,
|
|
@@ -14,6 +15,7 @@ import {
|
|
|
14
15
|
getFunctionBuilder,
|
|
15
16
|
getLazyFilter,
|
|
16
17
|
isKeptLazy,
|
|
18
|
+
isUniformPredicate,
|
|
17
19
|
getDomainOperator,
|
|
18
20
|
getSubsetOperator,
|
|
19
21
|
getEvaluator,
|
|
@@ -25,6 +27,7 @@ import {
|
|
|
25
27
|
resolveGlobalOperator,
|
|
26
28
|
expectFunction,
|
|
27
29
|
toKeepLazyContext,
|
|
30
|
+
toNextContext,
|
|
28
31
|
createUnassignedError,
|
|
29
32
|
getSortedFields,
|
|
30
33
|
hasDuplicateFields,
|
|
@@ -122,13 +125,7 @@ const createGeneratedHelpers = () => ({
|
|
|
122
125
|
unassigned: (name: string, expression: Expression): never => {
|
|
123
126
|
throw createUnassignedError(name, expression);
|
|
124
127
|
},
|
|
125
|
-
prime:
|
|
126
|
-
environment: context.environment,
|
|
127
|
-
scope: context.scope,
|
|
128
|
-
state: context.next,
|
|
129
|
-
next: undefined,
|
|
130
|
-
isKeepLazy: context.isKeepLazy,
|
|
131
|
-
}),
|
|
128
|
+
prime: toNextContext,
|
|
132
129
|
keepLazyContext: toKeepLazyContext,
|
|
133
130
|
extend: (context: Context, names: string[], values: Value[]): Context => ({
|
|
134
131
|
environment: context.environment,
|
|
@@ -164,21 +161,28 @@ const addReference = (generator: Generator, value: unknown) => {
|
|
|
164
161
|
const createLocal = (generator: Generator) => `local${generator.counter++}`;
|
|
165
162
|
|
|
166
163
|
const getFreeNames = (expression: Expression, names = new Set<string>()) => {
|
|
167
|
-
|
|
168
|
-
if (
|
|
169
|
-
|
|
164
|
+
const name = getReferencedName(expression);
|
|
165
|
+
if (name !== undefined) names.add(name);
|
|
166
|
+
if (expression.kind !== "Selection") {
|
|
167
|
+
getChildren(expression).forEach((child) => getFreeNames(child, names));
|
|
168
|
+
}
|
|
170
169
|
return names;
|
|
171
170
|
};
|
|
172
171
|
|
|
173
172
|
const getDelegateContext = (generator: Generator, expression: Expression, frame: Frame) => {
|
|
173
|
+
if (frame.locals.size === 0) return frame.context;
|
|
174
|
+
// TLC caches a constant TLCEval only where no name is bound, so a delegate that reaches one sees every local.
|
|
175
|
+
const isEveryLocalCaptured = isTlcEvalReached(expression, generator.environment);
|
|
174
176
|
const freeNames = getFreeNames(expression);
|
|
175
|
-
const captured = [...frame.locals].filter(
|
|
177
|
+
const captured = [...frame.locals].filter(
|
|
178
|
+
(entry) => isEveryLocalCaptured || freeNames.has(entry[0]),
|
|
179
|
+
);
|
|
176
180
|
if (captured.length === 0) return frame.context;
|
|
177
181
|
const names = addReference(
|
|
178
182
|
generator,
|
|
179
|
-
captured.map((
|
|
183
|
+
captured.map((entry) => entry[0]),
|
|
180
184
|
);
|
|
181
|
-
return `extend(${frame.context}, ${names}, [${captured.map((
|
|
185
|
+
return `extend(${frame.context}, ${names}, [${captured.map((entry) => entry[1]).join(", ")}])`;
|
|
182
186
|
};
|
|
183
187
|
|
|
184
188
|
const generateDelegate = (generator: Generator, expression: Expression, frame: Frame) =>
|
|
@@ -272,7 +276,8 @@ const generateSetFilter = (
|
|
|
272
276
|
const lazy = `if (!isReducible(${base})) return ${filterLazily}(${base}, ${getDelegateContext(generator, expression, bodyFrame)});`;
|
|
273
277
|
const set = generateExpression(generator, expression.bound.set, bodyFrame);
|
|
274
278
|
bodyFrame.locals.set(name, element);
|
|
275
|
-
const
|
|
279
|
+
const stop = isUniformPredicate(expression, generator.environment) ? " else break;" : "";
|
|
280
|
+
const test = `if (filterPredicate(${generateExpression(generator, expression.predicate, bodyFrame)}, ${node})) addBounded(${kept}, ${element});${stop}`;
|
|
276
281
|
return `const ${base} = ${set}; ${lazy} const ${list} = ${base}.kind === "Interval" ? ${base} : finiteElements(${base}); const ${kept} = []; ${generateLoop(generator, list, element, test)} return normalizedSet(${kept});`;
|
|
277
282
|
});
|
|
278
283
|
|
|
@@ -323,9 +328,8 @@ const generateApply = (
|
|
|
323
328
|
const domain = addReference(generator, getDomainOperator(expression));
|
|
324
329
|
return `${domain}(${generateExpression(generator, args[0], frame)})`;
|
|
325
330
|
}
|
|
326
|
-
if (builtin.name === "
|
|
327
|
-
|
|
328
|
-
const subset = addReference(generator, getSubsetOperator(expression, builtin));
|
|
331
|
+
if (builtin.name === "\\subseteq" && builtin.evaluateBinary && args.length === 2) {
|
|
332
|
+
const subset = addReference(generator, getSubsetOperator(expression, builtin.evaluateBinary));
|
|
329
333
|
return `${subset}(${generateExpression(generator, args[0], frame)}, ${generateExpression(generator, args[1], frame)})`;
|
|
330
334
|
}
|
|
331
335
|
const environment = generator.environment;
|
|
@@ -445,12 +449,16 @@ const generateExpression = (generator: Generator, expression: Expression, frame:
|
|
|
445
449
|
generator,
|
|
446
450
|
fields.map((field) => field.name),
|
|
447
451
|
);
|
|
448
|
-
const values = `[${fields.map((field) => generate(field.value)).join(", ")}]`;
|
|
452
|
+
const values = `[${expression.fields.map((field) => generate(field.value)).join(", ")}]`;
|
|
449
453
|
const writtenNames = expression.fields.map((field) => field.name);
|
|
450
454
|
if (writtenNames.every((name, index) => name === fields[index].name)) {
|
|
451
455
|
return `record(${names}, ${values})`;
|
|
452
456
|
}
|
|
453
|
-
|
|
457
|
+
const writtenIndexes = addReference(
|
|
458
|
+
generator,
|
|
459
|
+
fields.map((field) => expression.fields.indexOf(field)),
|
|
460
|
+
);
|
|
461
|
+
return `writtenRecord(${names}, ${writtenIndexes}, ${values}, ${addReference(generator, writtenNames)})`;
|
|
454
462
|
}
|
|
455
463
|
case "Tuple":
|
|
456
464
|
return `tuple([${expression.elements.map((element) => generate(element)).join(", ")}])`;
|
package/src/coverage.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import {
|
|
2
|
+
getFunctionConstruction,
|
|
2
3
|
isLocallyResolved,
|
|
3
4
|
type Bound,
|
|
4
5
|
type Definition,
|
|
@@ -7,10 +8,17 @@ import {
|
|
|
7
8
|
type SourceRange,
|
|
8
9
|
} from "./ast";
|
|
9
10
|
import { formatRange } from "./errors";
|
|
11
|
+
import { SELECTION_NAME } from "./resolve";
|
|
10
12
|
import type { Environment, Scope } from "./evaluate";
|
|
11
13
|
import { getJavaHashCode } from "./java-hash";
|
|
12
14
|
import { getTlcFingerprint } from "./tlc/fingerprint";
|
|
13
|
-
import
|
|
15
|
+
import {
|
|
16
|
+
getCardinality,
|
|
17
|
+
isEmptySet,
|
|
18
|
+
isReducibleSet,
|
|
19
|
+
type IntervalValue,
|
|
20
|
+
type Value,
|
|
21
|
+
} from "./values";
|
|
14
22
|
|
|
15
23
|
export type CoverageKind = "init" | "next" | "invariant" | "constraint" | "implied";
|
|
16
24
|
|
|
@@ -49,6 +57,11 @@ export interface CoverageReport {
|
|
|
49
57
|
relations: CoverageRelationReport[];
|
|
50
58
|
}
|
|
51
59
|
|
|
60
|
+
export interface CoverageOutput {
|
|
61
|
+
kind: "coverage";
|
|
62
|
+
coverage: CoverageReport;
|
|
63
|
+
}
|
|
64
|
+
|
|
52
65
|
interface CoverageVariable {
|
|
53
66
|
label: string;
|
|
54
67
|
distinct: number;
|
|
@@ -81,6 +94,8 @@ interface Resolved {
|
|
|
81
94
|
scope: Local | undefined;
|
|
82
95
|
}
|
|
83
96
|
|
|
97
|
+
export const letDefinitions = new WeakMap<Scope, Definition>();
|
|
98
|
+
|
|
84
99
|
const STANDARD_MODULES = new Set([
|
|
85
100
|
"FiniteSets",
|
|
86
101
|
"Sequences",
|
|
@@ -118,6 +133,17 @@ export const createCoverage = (variableCount: number): Coverage => ({
|
|
|
118
133
|
relations: [],
|
|
119
134
|
});
|
|
120
135
|
|
|
136
|
+
export const createCoverageEnvironment = (
|
|
137
|
+
environment: Environment,
|
|
138
|
+
coverage: Coverage,
|
|
139
|
+
): Environment => ({
|
|
140
|
+
...environment,
|
|
141
|
+
evaluators: new WeakMap(),
|
|
142
|
+
entryEvaluators: new WeakMap(),
|
|
143
|
+
definitionEvaluators: new WeakMap(),
|
|
144
|
+
coverage,
|
|
145
|
+
});
|
|
146
|
+
|
|
121
147
|
const addNode = (
|
|
122
148
|
coverage: Coverage,
|
|
123
149
|
expression: Expression | undefined,
|
|
@@ -154,6 +180,10 @@ const findCoverageRelation = (coverage: Coverage, kind: CoverageKind, expression
|
|
|
154
180
|
(relation) => relation.kind === kind && relation.expression === expression,
|
|
155
181
|
)?.node;
|
|
156
182
|
|
|
183
|
+
const getRelationRange = (expression: Expression) =>
|
|
184
|
+
expression.location.range ??
|
|
185
|
+
(expression.kind === "Let" ? expression.body.location.range : undefined);
|
|
186
|
+
|
|
157
187
|
export const addCoverageRelation = (
|
|
158
188
|
coverage: Coverage,
|
|
159
189
|
kind: CoverageKind,
|
|
@@ -163,7 +193,7 @@ export const addCoverageRelation = (
|
|
|
163
193
|
) => {
|
|
164
194
|
const shared = kind === "next" ? findCoverageRelation(coverage, kind, expression) : undefined;
|
|
165
195
|
if (shared !== undefined) return shared;
|
|
166
|
-
const node = addNode(coverage, undefined, expression
|
|
196
|
+
const node = addNode(coverage, undefined, getRelationRange(expression), -1, false);
|
|
167
197
|
coverage.relations.push({ kind, label, expression, scope, node });
|
|
168
198
|
return node;
|
|
169
199
|
};
|
|
@@ -184,9 +214,9 @@ export const getCoverageLabel = (
|
|
|
184
214
|
) => {
|
|
185
215
|
const definition = name === undefined ? undefined : environment.definitions.get(name);
|
|
186
216
|
const head = definition?.kind === "Operator" ? definition.head : undefined;
|
|
187
|
-
const range = expression
|
|
217
|
+
const range = getRelationRange(expression);
|
|
188
218
|
if (!definition || !head) return `Action ${range ? formatRange(range) : "Unknown location"}`;
|
|
189
|
-
if (isSameRange(definition.body
|
|
219
|
+
if (isSameRange(getRelationRange(definition.body), range) || !range) {
|
|
190
220
|
return `${definition.name} ${formatRange(head)}`;
|
|
191
221
|
}
|
|
192
222
|
return `${definition.name} ${formatRange(head)} (${range.start.line} ${range.start.column} ${range.end.line} ${range.end.column})`;
|
|
@@ -233,6 +263,15 @@ const bindNames = (names: string[], locals: Local | undefined) =>
|
|
|
233
263
|
locals,
|
|
234
264
|
);
|
|
235
265
|
|
|
266
|
+
const bindLocalDefinitions = (definitions: Definition[], locals: Local | undefined) => {
|
|
267
|
+
const inner = definitions.reduce<Local | undefined>(
|
|
268
|
+
(parent, definition) => ({ name: definition.name, definition, scope: undefined, parent }),
|
|
269
|
+
locals,
|
|
270
|
+
);
|
|
271
|
+
for (let local = inner; local !== locals && local; local = local.parent) local.scope = inner;
|
|
272
|
+
return inner;
|
|
273
|
+
};
|
|
274
|
+
|
|
236
275
|
const getBoundNames = (bounds: Bound[]) =>
|
|
237
276
|
bounds.flatMap((bound) =>
|
|
238
277
|
bound.pattern.kind === "Name" ? [bound.pattern.name] : bound.pattern.names,
|
|
@@ -302,10 +341,13 @@ export const buildCoverage = (
|
|
|
302
341
|
definition.kind === "Function"
|
|
303
342
|
? getBoundNames(definition.bounds)
|
|
304
343
|
: definition.params.map((param) => param.name);
|
|
305
|
-
walk(definition.body, bindNames(names, resolved.scope));
|
|
306
344
|
if (definition.kind === "Function") {
|
|
307
|
-
|
|
308
|
-
|
|
345
|
+
const isLet = resolved.scope !== undefined;
|
|
346
|
+
enter(getFunctionConstruction(definition, isLet), definition.location.range, () => {
|
|
347
|
+
walk(definition.body, bindNames(names, resolved.scope));
|
|
348
|
+
getBoundSets(definition.bounds).forEach((set) => walk(set, resolved.scope));
|
|
349
|
+
});
|
|
350
|
+
} else walk(definition.body, bindNames(names, resolved.scope));
|
|
309
351
|
walking.pop();
|
|
310
352
|
};
|
|
311
353
|
|
|
@@ -377,25 +419,21 @@ export const buildCoverage = (
|
|
|
377
419
|
case "OperatorReference":
|
|
378
420
|
return;
|
|
379
421
|
case "Label":
|
|
380
|
-
walk(expression.body, bindNames(expression.params, locals));
|
|
381
|
-
return;
|
|
382
422
|
case "Lambda":
|
|
383
423
|
walk(expression.body, bindNames(expression.params, locals));
|
|
384
424
|
return;
|
|
425
|
+
case "Selection":
|
|
426
|
+
if (range === undefined) walk(expression.expression, locals);
|
|
427
|
+
else enter(expression, range, () => walk(expression.expression, locals));
|
|
428
|
+
return;
|
|
385
429
|
case "Let": {
|
|
386
|
-
const inner = expression.definitions
|
|
387
|
-
(parent, definition) => ({ name: definition.name, definition, scope: undefined, parent }),
|
|
388
|
-
locals,
|
|
389
|
-
);
|
|
390
|
-
for (let local = inner; local !== locals && local; local = local.parent) {
|
|
391
|
-
local.scope = inner;
|
|
392
|
-
}
|
|
430
|
+
const inner = bindLocalDefinitions(expression.definitions, locals);
|
|
393
431
|
expression.definitions.forEach((definition) => {
|
|
394
432
|
if (definition.kind === "Operator") letBodies.set(definition.body, expression.body);
|
|
395
433
|
});
|
|
396
|
-
getHashtableOrder(expression.definitions).forEach((definition) =>
|
|
397
|
-
walkDefinition({ definition, scope: inner })
|
|
398
|
-
);
|
|
434
|
+
getHashtableOrder(expression.definitions).forEach((definition) => {
|
|
435
|
+
if (definition.name !== SELECTION_NAME) walkDefinition({ definition, scope: inner });
|
|
436
|
+
});
|
|
399
437
|
walk(expression.body, inner);
|
|
400
438
|
return;
|
|
401
439
|
}
|
|
@@ -553,9 +591,18 @@ export const buildCoverage = (
|
|
|
553
591
|
}
|
|
554
592
|
};
|
|
555
593
|
|
|
594
|
+
const getScopeLocals = (scope: Scope | undefined) => {
|
|
595
|
+
const scoped: Definition[] = [];
|
|
596
|
+
for (let node = scope; node; node = node.parent) {
|
|
597
|
+
const definition = letDefinitions.get(node);
|
|
598
|
+
if (definition) scoped.unshift(definition);
|
|
599
|
+
}
|
|
600
|
+
return bindLocalDefinitions(scoped, undefined);
|
|
601
|
+
};
|
|
602
|
+
|
|
556
603
|
coverage.relations.forEach((relation) => {
|
|
557
604
|
stack.push(relation.node);
|
|
558
|
-
walk(relation.expression,
|
|
605
|
+
walk(relation.expression, getScopeLocals(relation.scope));
|
|
559
606
|
stack.pop();
|
|
560
607
|
});
|
|
561
608
|
};
|
|
@@ -604,6 +651,194 @@ export const costCoverage = (coverage: Coverage, value: Value, cost: number) =>
|
|
|
604
651
|
if (node !== undefined) coverage.secondary[node] += cost;
|
|
605
652
|
};
|
|
606
653
|
|
|
654
|
+
export const chargeSetOperation = (
|
|
655
|
+
coverage: Coverage,
|
|
656
|
+
operator: string,
|
|
657
|
+
left: Value,
|
|
658
|
+
right: Value,
|
|
659
|
+
result: Value,
|
|
660
|
+
): Value => {
|
|
661
|
+
const receiver = isReducibleSet(left)
|
|
662
|
+
? left
|
|
663
|
+
: operator !== "\\" && isReducibleSet(right)
|
|
664
|
+
? right
|
|
665
|
+
: undefined;
|
|
666
|
+
if (receiver === undefined || typeof result !== "object") return result;
|
|
667
|
+
const other = receiver === left ? right : left;
|
|
668
|
+
if (operator === "\\cup") {
|
|
669
|
+
if (isEmptySet(receiver) || !isReducibleSet(other)) return result;
|
|
670
|
+
const otherNode = coverage.values.get(other);
|
|
671
|
+
if (otherNode !== undefined) coverage.secondary[otherNode] += getCardinality(other) + 1;
|
|
672
|
+
}
|
|
673
|
+
const node = operator === "\\cup" ? undefined : coverage.values.get(receiver);
|
|
674
|
+
if (coverage.values.get(result) === node) return result;
|
|
675
|
+
const isShared = result === left || result === right || coverage.values.has(result);
|
|
676
|
+
const charged = isShared ? { ...result } : result;
|
|
677
|
+
if (node !== undefined) coverage.values.set(charged, node);
|
|
678
|
+
return charged;
|
|
679
|
+
};
|
|
680
|
+
|
|
681
|
+
interface ChargedEnumerator {
|
|
682
|
+
next: () => boolean;
|
|
683
|
+
reset: () => void;
|
|
684
|
+
}
|
|
685
|
+
|
|
686
|
+
const createListEnumerator = (coverage: Coverage, node: number | undefined, size: number) => {
|
|
687
|
+
let position = 0;
|
|
688
|
+
return {
|
|
689
|
+
next: () => {
|
|
690
|
+
if (node !== undefined) coverage.secondary[node]++;
|
|
691
|
+
return position++ < size;
|
|
692
|
+
},
|
|
693
|
+
reset: () => {
|
|
694
|
+
position = 0;
|
|
695
|
+
},
|
|
696
|
+
};
|
|
697
|
+
};
|
|
698
|
+
|
|
699
|
+
const createProductEnumerator = (
|
|
700
|
+
coverage: Coverage,
|
|
701
|
+
node: number,
|
|
702
|
+
sets: Value[],
|
|
703
|
+
): ChargedEnumerator => {
|
|
704
|
+
if (sets.some((set) => isEmptySet(set))) return { next: () => false, reset: () => undefined };
|
|
705
|
+
const enumerators = sets.map((set) =>
|
|
706
|
+
createEnumerator(coverage, set, getCardinality(set), false),
|
|
707
|
+
);
|
|
708
|
+
const advance = () => {
|
|
709
|
+
for (let index = enumerators.length - 1; index > 0; index--) {
|
|
710
|
+
if (enumerators[index].next()) return true;
|
|
711
|
+
enumerators[index].reset();
|
|
712
|
+
enumerators[index].next();
|
|
713
|
+
}
|
|
714
|
+
return enumerators.length > 0 && enumerators[0].next();
|
|
715
|
+
};
|
|
716
|
+
let isDone = !enumerators.every((enumerator) => enumerator.next());
|
|
717
|
+
return {
|
|
718
|
+
next: () => {
|
|
719
|
+
if (isDone) return false;
|
|
720
|
+
coverage.secondary[node] += Math.max(enumerators.length, 1);
|
|
721
|
+
isDone = !advance();
|
|
722
|
+
return true;
|
|
723
|
+
},
|
|
724
|
+
reset: () => {
|
|
725
|
+
enumerators.forEach((enumerator) => {
|
|
726
|
+
enumerator.reset();
|
|
727
|
+
enumerator.next();
|
|
728
|
+
});
|
|
729
|
+
isDone = false;
|
|
730
|
+
},
|
|
731
|
+
};
|
|
732
|
+
};
|
|
733
|
+
|
|
734
|
+
export const createProductSetEnumerator = (coverage: Coverage, set: Value) => {
|
|
735
|
+
const node = typeof set === "object" ? coverage.values.get(set) : undefined;
|
|
736
|
+
if (node === undefined || typeof set !== "object") return undefined;
|
|
737
|
+
if (set.kind === "RecordSet") return createProductEnumerator(coverage, node, set.sets);
|
|
738
|
+
if (set.kind !== "FunctionSet") return undefined;
|
|
739
|
+
return createProductEnumerator(
|
|
740
|
+
coverage,
|
|
741
|
+
node,
|
|
742
|
+
Array.from({ length: getCardinality(set.domain) }, () => set.range),
|
|
743
|
+
);
|
|
744
|
+
};
|
|
745
|
+
|
|
746
|
+
const createEnumerator = (
|
|
747
|
+
coverage: Coverage,
|
|
748
|
+
set: Value,
|
|
749
|
+
size: number,
|
|
750
|
+
isNormalized: boolean,
|
|
751
|
+
): ChargedEnumerator => {
|
|
752
|
+
const node = typeof set === "object" ? coverage.values.get(set) : undefined;
|
|
753
|
+
if (
|
|
754
|
+
typeof set === "object" &&
|
|
755
|
+
(set.kind === "Subset" || (!isNormalized && set.kind === "FilteredSet"))
|
|
756
|
+
) {
|
|
757
|
+
return createListEnumerator(coverage, undefined, size);
|
|
758
|
+
}
|
|
759
|
+
const elements = createProductSetEnumerator(coverage, set);
|
|
760
|
+
if (!elements || node === undefined) return createListEnumerator(coverage, node, size);
|
|
761
|
+
if (!isNormalized) return elements;
|
|
762
|
+
let count = 0;
|
|
763
|
+
while (elements.next()) count++;
|
|
764
|
+
coverage.secondary[node] += count;
|
|
765
|
+
return createListEnumerator(coverage, node, count);
|
|
766
|
+
};
|
|
767
|
+
|
|
768
|
+
export const tagSubset = (coverage: Coverage, set: Value, subset: Value) => {
|
|
769
|
+
const node =
|
|
770
|
+
typeof set === "object" && set.kind === "Subset" ? coverage.values.get(set) : undefined;
|
|
771
|
+
if (node !== undefined && typeof subset === "object") coverage.values.set(subset, node);
|
|
772
|
+
};
|
|
773
|
+
|
|
774
|
+
const RANDOMLY_INDEXED_KINDS = new Set<string>([
|
|
775
|
+
"Set",
|
|
776
|
+
"MixedSet",
|
|
777
|
+
"Interval",
|
|
778
|
+
"FunctionSet",
|
|
779
|
+
"RecordSet",
|
|
780
|
+
"ProductSet",
|
|
781
|
+
]);
|
|
782
|
+
|
|
783
|
+
// TLC's EnumerableValue#elements(Ordering.RANDOMIZED) draws indices, but a value class without its own k-out-of-n enumerator draws the whole set first, and SubsetValue converts itself to a SetEnumValue.
|
|
784
|
+
export const chargeRandomOrder = (coverage: Coverage, set: Value, size: number, order: Value[]) => {
|
|
785
|
+
if (typeof set !== "object" || RANDOMLY_INDEXED_KINDS.has(set.kind)) return;
|
|
786
|
+
if (set.kind !== "Subset") {
|
|
787
|
+
const enumerator = createEnumerator(coverage, set, size, false);
|
|
788
|
+
for (let position = 0; position <= size; position++) enumerator.next();
|
|
789
|
+
return;
|
|
790
|
+
}
|
|
791
|
+
const node = coverage.values.get(set);
|
|
792
|
+
if (node !== undefined) coverage.secondary[node] += size;
|
|
793
|
+
for (let position = 0; position < order.length; position++) {
|
|
794
|
+
tagSubset(coverage, set, order[position]);
|
|
795
|
+
}
|
|
796
|
+
};
|
|
797
|
+
|
|
798
|
+
export const createChargedEnumerator = (
|
|
799
|
+
coverage: Coverage,
|
|
800
|
+
set: Value,
|
|
801
|
+
list: Value[] | IntervalValue,
|
|
802
|
+
isNormalized: boolean,
|
|
803
|
+
) => {
|
|
804
|
+
const size = Array.isArray(list) ? list.length : list.high - list.low + 1;
|
|
805
|
+
if (typeof set !== "object" || set.kind !== "Subset" || !Array.isArray(list)) {
|
|
806
|
+
return createEnumerator(coverage, set, size, isNormalized);
|
|
807
|
+
}
|
|
808
|
+
list.forEach((subset) => tagSubset(coverage, set, subset));
|
|
809
|
+
return createListEnumerator(coverage, undefined, size);
|
|
810
|
+
};
|
|
811
|
+
|
|
812
|
+
const chargeBindings = (enumerators: ChargedEnumerator[]) => {
|
|
813
|
+
enumerators.every((enumerator) => enumerator.next());
|
|
814
|
+
return () => {
|
|
815
|
+
for (let index = 0; index < enumerators.length; index++) {
|
|
816
|
+
if (enumerators[index].next() || index === enumerators.length - 1) return;
|
|
817
|
+
enumerators[index].reset();
|
|
818
|
+
enumerators[index].next();
|
|
819
|
+
}
|
|
820
|
+
};
|
|
821
|
+
};
|
|
822
|
+
|
|
823
|
+
export const chargeContexts = (
|
|
824
|
+
coverage: Coverage,
|
|
825
|
+
sets: Value[],
|
|
826
|
+
lists: (Value[] | IntervalValue)[],
|
|
827
|
+
) =>
|
|
828
|
+
chargeBindings(
|
|
829
|
+
sets.map((set, index) => createChargedEnumerator(coverage, set, lists[index], true)),
|
|
830
|
+
);
|
|
831
|
+
|
|
832
|
+
export const chargeFunctionConstruction = (coverage: Coverage, node: number, sets: Value[]) => {
|
|
833
|
+
const sizes = sets.map((set) => getCardinality(set));
|
|
834
|
+
const advance = chargeBindings(
|
|
835
|
+
sets.map((set, index) => createEnumerator(coverage, set, sizes[index], false)),
|
|
836
|
+
);
|
|
837
|
+
const size = sizes.reduce((product, setSize) => product * setSize, 1);
|
|
838
|
+
for (let index = 0; index < size; index++) advance();
|
|
839
|
+
coverage.secondary[node] += size;
|
|
840
|
+
};
|
|
841
|
+
|
|
607
842
|
const getLeadingZeros = (value: bigint) => {
|
|
608
843
|
const high = Number(value >> 32n);
|
|
609
844
|
return high === 0 ? 32 + Math.clz32(Number(value & 0xffffffffn)) : Math.clz32(high);
|