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/spec-description.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { isEvaluatedAtStartup } from "./dependencies";
|
|
2
2
|
import {
|
|
3
3
|
isLocallyResolved,
|
|
4
4
|
type Definition,
|
|
@@ -13,7 +13,6 @@ import { substitutionFrames, withSubstitutionFrames } from "./instances";
|
|
|
13
13
|
import type { InstanceAction } from "./environment";
|
|
14
14
|
import { formatRange, TlaError, TlaEvaluationError, UNEXPECTED_EXCEPTION } from "./errors";
|
|
15
15
|
import {
|
|
16
|
-
bindDefinitions,
|
|
17
16
|
bindOperatorArguments,
|
|
18
17
|
describeNode,
|
|
19
18
|
evaluate,
|
|
@@ -26,8 +25,9 @@ import {
|
|
|
26
25
|
type Scope,
|
|
27
26
|
} from "./evaluate";
|
|
28
27
|
import { ACTION_LEVEL, CONSTANT_LEVEL, TEMPORAL_LEVEL, VARIABLE_LEVEL } from "./levels";
|
|
29
|
-
import { getLevel } from "./liveness";
|
|
28
|
+
import { bindLetDefinitions, getLevel } from "./liveness";
|
|
30
29
|
import { createRecord, createSet, createTuple, formatValue, type Value } from "./values";
|
|
30
|
+
import { SELECTION_NAME } from "./resolve";
|
|
31
31
|
import { LITERAL_KINDS } from "./tlc/replay";
|
|
32
32
|
import type { TlcVersion } from "./tlc/version";
|
|
33
33
|
|
|
@@ -39,10 +39,13 @@ export interface SpecAction {
|
|
|
39
39
|
scope: Scope | undefined;
|
|
40
40
|
}
|
|
41
41
|
|
|
42
|
-
interface SpecDescription {
|
|
42
|
+
export interface SpecDescription {
|
|
43
43
|
inits: SpecAction[];
|
|
44
44
|
actions: SpecAction[];
|
|
45
45
|
temporals: SpecAction[];
|
|
46
|
+
}
|
|
47
|
+
|
|
48
|
+
interface PropertyDescription {
|
|
46
49
|
invariants: SpecAction[];
|
|
47
50
|
impliedInits: SpecAction[];
|
|
48
51
|
impliedActions: SpecAction[];
|
|
@@ -145,7 +148,7 @@ const isEvaluable = (expression: Expression, environment: Environment) => {
|
|
|
145
148
|
const isStartupValue = (definition: Definition | undefined, environment: Environment) =>
|
|
146
149
|
definition?.kind === "Operator" &&
|
|
147
150
|
definition.params.length === 0 &&
|
|
148
|
-
|
|
151
|
+
isEvaluatedAtStartup(definition, environment) &&
|
|
149
152
|
isEvaluable(definition.body, environment);
|
|
150
153
|
|
|
151
154
|
const isConstantValue = (definition: Definition | undefined, environment: Environment) =>
|
|
@@ -173,13 +176,23 @@ const unwrapBinding = (
|
|
|
173
176
|
if (expression.kind === "Let") {
|
|
174
177
|
return {
|
|
175
178
|
expression: expression.body,
|
|
176
|
-
scope:
|
|
179
|
+
scope: bindLetDefinitions(expression, scope, environment),
|
|
177
180
|
};
|
|
178
181
|
}
|
|
179
182
|
const thunk = getThunk(expression, scope);
|
|
180
183
|
return thunk && { expression: thunk.expression, scope: thunk.scope };
|
|
181
184
|
};
|
|
182
185
|
|
|
186
|
+
const getCallScope = (
|
|
187
|
+
called: Closure,
|
|
188
|
+
expression: Expression,
|
|
189
|
+
scope: Scope | undefined,
|
|
190
|
+
environment: Environment,
|
|
191
|
+
) =>
|
|
192
|
+
expression.kind === "Apply"
|
|
193
|
+
? bindOperatorArguments(called, expression.args, getConstantContext(environment, scope))
|
|
194
|
+
: called.scope;
|
|
195
|
+
|
|
183
196
|
const getParameters = (closure: Closure | undefined, scope: Scope | undefined) =>
|
|
184
197
|
(closure?.params ?? []).flatMap((param): [string, Value][] => {
|
|
185
198
|
const binding = lookupScope(scope, param.name);
|
|
@@ -255,13 +268,18 @@ const getActions = (
|
|
|
255
268
|
case "Let":
|
|
256
269
|
return getActions(
|
|
257
270
|
expression.body,
|
|
258
|
-
|
|
271
|
+
bindLetDefinitions(expression, scope, environment),
|
|
259
272
|
closure,
|
|
260
273
|
environment,
|
|
261
274
|
instanceActions,
|
|
262
275
|
);
|
|
263
276
|
case "Label":
|
|
264
277
|
return getActions(expression.body, scope, closure, environment, instanceActions);
|
|
278
|
+
case "Selection":
|
|
279
|
+
// TLC's Tool#getActions takes SANY's $Nop as an action of its own.
|
|
280
|
+
return expression.location.range === undefined
|
|
281
|
+
? getActions(expression.expression, scope, closure, environment, instanceActions)
|
|
282
|
+
: [createSplitAction()];
|
|
265
283
|
case "Or":
|
|
266
284
|
return expression.operands.flatMap((operand) =>
|
|
267
285
|
getActions(operand, scope, closure, environment, instanceActions),
|
|
@@ -294,7 +312,9 @@ const getActions = (
|
|
|
294
312
|
if (!called) return [createSplitAction()];
|
|
295
313
|
const args = getArguments(expression);
|
|
296
314
|
const calledName = isLocallyResolved(expression)
|
|
297
|
-
? called.name
|
|
315
|
+
? called.name === SELECTION_NAME
|
|
316
|
+
? "LAMBDA"
|
|
317
|
+
: called.name
|
|
298
318
|
: (environment.instanceNames.get(getOperatorName(expression) ?? "") ?? called.name);
|
|
299
319
|
const callAction = (): SpecAction[] => [
|
|
300
320
|
{ name: calledName, location: expression.location, parameters: [], expression, scope },
|
|
@@ -388,7 +408,7 @@ const describeProperty = (
|
|
|
388
408
|
expression: Expression,
|
|
389
409
|
scope: Scope | undefined,
|
|
390
410
|
environment: Environment,
|
|
391
|
-
description:
|
|
411
|
+
description: PropertyDescription,
|
|
392
412
|
): void => {
|
|
393
413
|
const recurse = (inner: Expression, innerScope: Scope | undefined) =>
|
|
394
414
|
describeProperty(configName, inner, innerScope, environment, description);
|
|
@@ -400,12 +420,7 @@ const describeProperty = (
|
|
|
400
420
|
const called = resolveClosure(expression, scope, environment);
|
|
401
421
|
if (called && isConstantDefinition(called, environment)) return;
|
|
402
422
|
if (called && called.params.length === getArguments(expression).length) {
|
|
403
|
-
recurse(
|
|
404
|
-
called.body,
|
|
405
|
-
expression.kind === "Apply"
|
|
406
|
-
? bindOperatorArguments(called, expression.args, getConstantContext(environment, scope))
|
|
407
|
-
: called.scope,
|
|
408
|
-
);
|
|
423
|
+
recurse(called.body, getCallScope(called, expression, scope, environment));
|
|
409
424
|
return;
|
|
410
425
|
}
|
|
411
426
|
if (expression.kind === "Forall") {
|
|
@@ -451,20 +466,13 @@ const getOperatorDefinition = (name: string, environment: Environment) => {
|
|
|
451
466
|
: undefined;
|
|
452
467
|
};
|
|
453
468
|
|
|
454
|
-
|
|
469
|
+
// Tool's constructor describes the specification once, so a caller keeps the description and never walks it again.
|
|
470
|
+
export const getSpecDescription = (
|
|
455
471
|
config: ModelConfig,
|
|
456
472
|
environment: Environment,
|
|
457
473
|
instanceActions: Map<string, InstanceAction>,
|
|
458
474
|
) => {
|
|
459
|
-
const description: SpecDescription = {
|
|
460
|
-
inits: [],
|
|
461
|
-
actions: [],
|
|
462
|
-
temporals: [],
|
|
463
|
-
invariants: [],
|
|
464
|
-
impliedInits: [],
|
|
465
|
-
impliedActions: [],
|
|
466
|
-
impliedTemporals: [],
|
|
467
|
-
};
|
|
475
|
+
const description: SpecDescription = { inits: [], actions: [], temporals: [] };
|
|
468
476
|
const next: NextItem[] = [];
|
|
469
477
|
const specification =
|
|
470
478
|
config.specification === undefined
|
|
@@ -525,6 +533,7 @@ export const getSubscriptVariables = (
|
|
|
525
533
|
return expression.elements.every((element) => collect(element, innerScope));
|
|
526
534
|
}
|
|
527
535
|
if (expression.kind === "Label") return collect(expression.body, innerScope);
|
|
536
|
+
if (expression.kind === "Selection") return collect(expression.expression, innerScope);
|
|
528
537
|
const unwrapped = unwrapBinding(expression, innerScope, environment);
|
|
529
538
|
if (unwrapped) return collect(unwrapped.expression, unwrapped.scope);
|
|
530
539
|
const argument =
|
|
@@ -546,32 +555,11 @@ export const getSubscriptVariables = (
|
|
|
546
555
|
if (!called || called.params.length !== getArguments(expression).length) return true;
|
|
547
556
|
const definition = getDefinition(called.name, environment);
|
|
548
557
|
if (definition?.body === called.body && isStartupValue(definition, environment)) return true;
|
|
549
|
-
return collect(
|
|
550
|
-
called.body,
|
|
551
|
-
expression.kind === "Apply"
|
|
552
|
-
? bindOperatorArguments(
|
|
553
|
-
called,
|
|
554
|
-
expression.args,
|
|
555
|
-
getConstantContext(environment, innerScope),
|
|
556
|
-
)
|
|
557
|
-
: called.scope,
|
|
558
|
-
);
|
|
558
|
+
return collect(called.body, getCallScope(called, expression, innerScope, environment));
|
|
559
559
|
};
|
|
560
560
|
return collect(subscript, scope) ? variables : undefined;
|
|
561
561
|
};
|
|
562
562
|
|
|
563
|
-
export const getInitActions = (
|
|
564
|
-
config: ModelConfig,
|
|
565
|
-
environment: Environment,
|
|
566
|
-
instanceActions: Map<string, InstanceAction>,
|
|
567
|
-
) => getSpecDescription(config, environment, instanceActions).inits;
|
|
568
|
-
|
|
569
|
-
export const getNextActions = (
|
|
570
|
-
config: ModelConfig,
|
|
571
|
-
environment: Environment,
|
|
572
|
-
instanceActions: Map<string, InstanceAction>,
|
|
573
|
-
) => getSpecDescription(config, environment, instanceActions).actions;
|
|
574
|
-
|
|
575
563
|
const formatParameters = (action: SpecAction) =>
|
|
576
564
|
action.parameters.length === 0
|
|
577
565
|
? ""
|
|
@@ -584,19 +572,24 @@ export const getActionSignature = (action: SpecAction) =>
|
|
|
584
572
|
`${action.name}${formatParameters(action)}`;
|
|
585
573
|
|
|
586
574
|
export const getSpecificationValue = (
|
|
575
|
+
description: SpecDescription,
|
|
587
576
|
config: ModelConfig,
|
|
588
577
|
environment: Environment,
|
|
589
578
|
variableLocations: SourceLocation[],
|
|
590
|
-
instanceActions: Map<string, InstanceAction>,
|
|
591
579
|
): Value => {
|
|
592
|
-
const
|
|
580
|
+
const properties: PropertyDescription = {
|
|
581
|
+
invariants: [],
|
|
582
|
+
impliedInits: [],
|
|
583
|
+
impliedActions: [],
|
|
584
|
+
impliedTemporals: [],
|
|
585
|
+
};
|
|
593
586
|
config.invariants.forEach((name) => {
|
|
594
587
|
const definition = getOperatorDefinition(name, environment);
|
|
595
|
-
if (definition)
|
|
588
|
+
if (definition) properties.invariants.push(createAction(name, definition.body));
|
|
596
589
|
});
|
|
597
590
|
config.properties.forEach((name) => {
|
|
598
591
|
const definition = getOperatorDefinition(name, environment);
|
|
599
|
-
if (definition) describeProperty(name, definition.body, undefined, environment,
|
|
592
|
+
if (definition) describeProperty(name, definition.body, undefined, environment, properties);
|
|
600
593
|
});
|
|
601
594
|
const coverage = environment.coverage;
|
|
602
595
|
const toSet = (actions: SpecAction[], kind?: CoverageKind) =>
|
|
@@ -624,10 +617,10 @@ export const getSpecificationValue = (
|
|
|
624
617
|
["inits", toSet(description.inits, "init")],
|
|
625
618
|
["actions", toSet(description.actions, "next")],
|
|
626
619
|
["temporals", toSet(description.temporals)],
|
|
627
|
-
["invariants", toSet(
|
|
628
|
-
["impliedinits", toSet(
|
|
629
|
-
["impliedactions", toSet(
|
|
630
|
-
["impliedtemporals", toSet(
|
|
620
|
+
["invariants", toSet(properties.invariants, "invariant")],
|
|
621
|
+
["impliedinits", toSet(properties.impliedInits, "implied")],
|
|
622
|
+
["impliedactions", toSet(properties.impliedActions, "implied")],
|
|
623
|
+
["impliedtemporals", toSet(properties.impliedTemporals)],
|
|
631
624
|
[
|
|
632
625
|
"variables",
|
|
633
626
|
createSet(
|
|
@@ -81,6 +81,10 @@ const SIGNATURES: Signature[] = [
|
|
|
81
81
|
["RandomSubset", 0, [0, 0], [2, 2], [1, 1]],
|
|
82
82
|
["RandomSetOfSubsets", 0, [0, 0, 0], [2, 3, 2], [1, 0, 1]],
|
|
83
83
|
["TestRandomSetOfSubsets", 0, [0, 0, 0], [2, 3, 2], [1, 0, 1]],
|
|
84
|
+
["_Track", 0, [0, 0], [3, 2], [0, 0]],
|
|
85
|
+
["_Counts", 0, [], [], []],
|
|
86
|
+
["_CheckName", 0, [0], [2], [1]],
|
|
87
|
+
["_PrintCounts", 0, [], [], []],
|
|
84
88
|
];
|
|
85
89
|
|
|
86
90
|
export const STANDARD_LEVELS = new Map(
|
|
@@ -89,6 +93,7 @@ export const STANDARD_LEVELS = new Map(
|
|
|
89
93
|
{
|
|
90
94
|
name: signature[0],
|
|
91
95
|
level: signature[1],
|
|
96
|
+
isCorrect: true,
|
|
92
97
|
params: new Set(),
|
|
93
98
|
constraints: new Map(),
|
|
94
99
|
argConstraints: new Map(),
|
package/src/standard-modules.ts
CHANGED
|
@@ -18,6 +18,7 @@ import {
|
|
|
18
18
|
overrideWithJava,
|
|
19
19
|
} from "./builtins";
|
|
20
20
|
import type { Builtin, BuiltinArgument, Context } from "./evaluate";
|
|
21
|
+
import { prettyPrint } from "./pretty-print";
|
|
21
22
|
import type { CheckerRuntime } from "./runtime";
|
|
22
23
|
import { createBagsOperators } from "./bags";
|
|
23
24
|
import { createIoUtilsOperators, createJsonOperators, type FileSystem } from "./json";
|
|
@@ -35,12 +36,12 @@ import {
|
|
|
35
36
|
createSet,
|
|
36
37
|
createSortedSet,
|
|
37
38
|
compareValues,
|
|
38
|
-
describeKind,
|
|
39
39
|
createTuple,
|
|
40
40
|
getSortedDifference,
|
|
41
41
|
formatValue,
|
|
42
42
|
getCardinality,
|
|
43
43
|
getDomain,
|
|
44
|
+
getFunctionClass,
|
|
44
45
|
getSortedIntersection,
|
|
45
46
|
someStreamedElement,
|
|
46
47
|
isElementOf,
|
|
@@ -76,11 +77,6 @@ import {
|
|
|
76
77
|
import type { TlcVersion } from "./tlc/version";
|
|
77
78
|
import { getSanyStandardModules } from "./sany/modules";
|
|
78
79
|
|
|
79
|
-
interface StandardModule {
|
|
80
|
-
extends: string[];
|
|
81
|
-
operators: Builtin[];
|
|
82
|
-
}
|
|
83
|
-
|
|
84
80
|
const isSubsetOf = (left: Value[], right: Value) =>
|
|
85
81
|
left.every((element) => isElementOf(element, right));
|
|
86
82
|
|
|
@@ -129,6 +125,43 @@ const combineReducible = (
|
|
|
129
125
|
return createEnumeratedSet(union);
|
|
130
126
|
};
|
|
131
127
|
|
|
128
|
+
const isIntervalInSortedSet = (interval: IntervalValue, set: SetValue) => {
|
|
129
|
+
const elements = set.elements;
|
|
130
|
+
let low = 0;
|
|
131
|
+
let high = elements.length;
|
|
132
|
+
while (low < high) {
|
|
133
|
+
const middle = (low + high) >> 1;
|
|
134
|
+
const probe = elements[middle];
|
|
135
|
+
if (typeof probe !== "number") return undefined;
|
|
136
|
+
if (probe < interval.low) low = middle + 1;
|
|
137
|
+
else high = middle;
|
|
138
|
+
}
|
|
139
|
+
for (let element = interval.low; element <= interval.high; element++, low++) {
|
|
140
|
+
if (low === elements.length) return false;
|
|
141
|
+
const probe = elements[low];
|
|
142
|
+
if (probe !== element) return typeof probe === "number" ? false : undefined;
|
|
143
|
+
}
|
|
144
|
+
return true;
|
|
145
|
+
};
|
|
146
|
+
|
|
147
|
+
const isIntervalSubset = (left: IntervalValue, right: Value) => {
|
|
148
|
+
const isWithin =
|
|
149
|
+
typeof right === "object" &&
|
|
150
|
+
right.kind === "Interval" &&
|
|
151
|
+
right.low <= left.low &&
|
|
152
|
+
right.high >= left.high;
|
|
153
|
+
if (isWithin) return true;
|
|
154
|
+
const isContained =
|
|
155
|
+
typeof right === "object" && right.kind === "Set"
|
|
156
|
+
? isIntervalInSortedSet(left, right)
|
|
157
|
+
: undefined;
|
|
158
|
+
if (isContained !== undefined) return isContained;
|
|
159
|
+
for (let element = left.low; element <= left.high; element++) {
|
|
160
|
+
if (!isElementOf(element, right)) return false;
|
|
161
|
+
}
|
|
162
|
+
return true;
|
|
163
|
+
};
|
|
164
|
+
|
|
132
165
|
const defineShortCircuit = (
|
|
133
166
|
name: string,
|
|
134
167
|
compute: (left: boolean, right: () => boolean) => boolean,
|
|
@@ -163,6 +196,7 @@ export const CORE_OPERATORS: Builtin[] = [
|
|
|
163
196
|
(args) => !isElementOf(getValue(args, 0, "\\notin"), getValue(args, 1, "\\notin")),
|
|
164
197
|
),
|
|
165
198
|
defineBinary("\\subseteq", (left, right) => {
|
|
199
|
+
if (typeof left === "object" && left.kind === "Interval") return isIntervalSubset(left, right);
|
|
166
200
|
if (!isSetValue(left)) {
|
|
167
201
|
throw new TlaEvaluationError(`\\subseteq expects a set but received ${formatValue(left)}`);
|
|
168
202
|
}
|
|
@@ -173,18 +207,6 @@ export const CORE_OPERATORS: Builtin[] = [
|
|
|
173
207
|
right.kind === "Subset" &&
|
|
174
208
|
isEnumerable(left.base);
|
|
175
209
|
if (isPowerSets) return isSubsetOf(toFiniteSet(left.base).elements, right.base);
|
|
176
|
-
if (typeof left === "object" && left.kind === "Interval") {
|
|
177
|
-
const isWithin =
|
|
178
|
-
typeof right === "object" &&
|
|
179
|
-
right.kind === "Interval" &&
|
|
180
|
-
right.low <= left.low &&
|
|
181
|
-
right.high >= left.high;
|
|
182
|
-
if (isWithin) return true;
|
|
183
|
-
for (let element = left.low; element <= left.high; element++) {
|
|
184
|
-
if (!isElementOf(element, right)) return false;
|
|
185
|
-
}
|
|
186
|
-
return true;
|
|
187
|
-
}
|
|
188
210
|
return !someStreamedElement(left, (element) => !isElementOf(element, right));
|
|
189
211
|
}),
|
|
190
212
|
...SET_OPERATORS.map((operator) =>
|
|
@@ -319,11 +341,10 @@ const createArithmeticOperators = (module: string) => {
|
|
|
319
341
|
}
|
|
320
342
|
return ((left % right) + right) % right;
|
|
321
343
|
}),
|
|
322
|
-
|
|
323
|
-
const low = getValue(args, 0, "..");
|
|
344
|
+
defineBinary("..", (low, high) => {
|
|
324
345
|
// TLC's MethodHandle casts the last argument first.
|
|
325
|
-
const
|
|
326
|
-
return { kind: "Interval", low: getJavaInteger(low, dotDotSignature), high };
|
|
346
|
+
const highNumber = getJavaInteger(high, dotDotSignature);
|
|
347
|
+
return { kind: "Interval", low: getJavaInteger(low, dotDotSignature), high: highNumber };
|
|
327
348
|
}),
|
|
328
349
|
];
|
|
329
350
|
};
|
|
@@ -382,7 +403,7 @@ const INTEGERS_OPERATORS = [
|
|
|
382
403
|
const getSequenceArgument = (args: BuiltinArgument[], index: number, message: string) => {
|
|
383
404
|
const value = getValue(args, index, message);
|
|
384
405
|
const elements = getSequenceElements(value);
|
|
385
|
-
if (!elements) throw new TlaModuleError(`${message}\n${formatValue(value)}`);
|
|
406
|
+
if (!elements) throw new TlaModuleError(`${message}\n${prettyPrint(formatValue(value))}`);
|
|
386
407
|
return elements;
|
|
387
408
|
};
|
|
388
409
|
|
|
@@ -431,12 +452,19 @@ const createSequencesOperators = (version: TlcVersion) =>
|
|
|
431
452
|
const left = getSequenceOrString(args, 0, getEvaluatingMessage("s \\o t", "sequence"));
|
|
432
453
|
if (typeof left !== "string") {
|
|
433
454
|
const right = getSequenceArgument(args, 1, getEvaluatingMessage("t \\o s", "sequence"));
|
|
455
|
+
const kept =
|
|
456
|
+
left.length === 0
|
|
457
|
+
? getValue(args, 1, "\\o")
|
|
458
|
+
: right.length === 0
|
|
459
|
+
? getValue(args, 0, "\\o")
|
|
460
|
+
: undefined;
|
|
461
|
+
if (kept !== undefined && getFunctionClass(kept) === "tuple") return kept;
|
|
434
462
|
return createTuple([...left, ...right]);
|
|
435
463
|
}
|
|
436
464
|
const right = getValue(args, 1, "\\o");
|
|
437
465
|
if (typeof right !== "string") {
|
|
438
466
|
throw new TlaModuleError(
|
|
439
|
-
`${getEvaluatingMessage("t \\o s", "string")}\n${formatValue(right)}`,
|
|
467
|
+
`${getEvaluatingMessage("t \\o s", "string")}\n${prettyPrint(formatValue(right))}`,
|
|
440
468
|
);
|
|
441
469
|
}
|
|
442
470
|
return rankString(left + right);
|
|
@@ -476,7 +504,7 @@ const createSequencesOperators = (version: TlcVersion) =>
|
|
|
476
504
|
: undefined;
|
|
477
505
|
if (outOfDomain) {
|
|
478
506
|
throw new TlaModuleError(
|
|
479
|
-
`The ${outOfDomain.position} argument of SubSeq must be in the domain of its first argument:\n${formatValue(getValue(args, 0, "SubSeq"))}\n, but instead it is\n${outOfDomain.value}`,
|
|
507
|
+
`The ${outOfDomain.position} argument of SubSeq must be in the domain of its first argument:\n${prettyPrint(formatValue(getValue(args, 0, "SubSeq")))}\n, but instead it is\n${outOfDomain.value}`,
|
|
480
508
|
);
|
|
481
509
|
}
|
|
482
510
|
return sliceSequence(sequence, start - 1, end);
|
|
@@ -501,16 +529,7 @@ const createSequencesOperators = (version: TlcVersion) =>
|
|
|
501
529
|
|
|
502
530
|
const createFiniteSetsOperators = (version: TlcVersion) =>
|
|
503
531
|
withJavaMethods("FiniteSets", [
|
|
504
|
-
defineOperator("IsFiniteSet", 1, (args) =>
|
|
505
|
-
const value = getValue(args, 0, "IsFiniteSet");
|
|
506
|
-
if (isSetValue(value)) return isFiniteSet(value);
|
|
507
|
-
if (typeof value === "object" && value.kind === "Function") return true;
|
|
508
|
-
throw new TlaEvaluationError(
|
|
509
|
-
typeof value === "object" && value.kind === "LazyFunction"
|
|
510
|
-
? `Attempted to check if the function:\n${formatValue(value)}\nis a finite set.`
|
|
511
|
-
: `Attempted to check if the ${describeKind(value)} ${formatValue(value)} is a finite set.`,
|
|
512
|
-
);
|
|
513
|
-
}),
|
|
532
|
+
defineOperator("IsFiniteSet", 1, (args) => isFiniteSet(getValue(args, 0, "IsFiniteSet"))),
|
|
514
533
|
defineOperator("Cardinality", 1, (args) => {
|
|
515
534
|
const set = getValue(args, 0, "Cardinality");
|
|
516
535
|
if (
|
|
@@ -518,7 +537,7 @@ const createFiniteSetsOperators = (version: TlcVersion) =>
|
|
|
518
537
|
(typeof set === "object" && (set.kind === "InfiniteSet" || set.kind === "SequenceSet"))
|
|
519
538
|
) {
|
|
520
539
|
throw new TlaModuleError(
|
|
521
|
-
`Attempted to compute cardinality of the value\n${formatValue(set)}`,
|
|
540
|
+
`Attempted to compute cardinality of the value\n${prettyPrint(formatValue(set))}`,
|
|
522
541
|
);
|
|
523
542
|
}
|
|
524
543
|
return getCardinality(set, version);
|
|
@@ -531,7 +550,7 @@ const TRANSITIVE_CLOSURE_OPERATORS = [
|
|
|
531
550
|
const relation = getValue(args, 0, "Warshall");
|
|
532
551
|
if (!isSetValue(relation) || isOverriddenSet(relation)) {
|
|
533
552
|
throw new TlaModuleError(
|
|
534
|
-
`Applying TransitiveClosure to the following value,\nwhich is not an enumerable set:\n${formatValue(relation)}`,
|
|
553
|
+
`Applying TransitiveClosure to the following value,\nwhich is not an enumerable set:\n${prettyPrint(formatValue(relation))}`,
|
|
535
554
|
);
|
|
536
555
|
}
|
|
537
556
|
// TLC sizes the relation, which normalizes it.
|
|
@@ -551,7 +570,7 @@ const TRANSITIVE_CLOSURE_OPERATORS = [
|
|
|
551
570
|
const ends = getSequenceElements(edge);
|
|
552
571
|
if (ends?.length !== 2) {
|
|
553
572
|
throw new TlaModuleError(
|
|
554
|
-
`Attempted to apply TransitiveClosure to a set containing\nthe following value:\n${formatValue(edge)}`,
|
|
573
|
+
`Attempted to apply TransitiveClosure to a set containing\nthe following value:\n${prettyPrint(formatValue(edge))}`,
|
|
555
574
|
);
|
|
556
575
|
}
|
|
557
576
|
return [getNodeIndex(ends[0]), getNodeIndex(ends[1])];
|
|
@@ -593,7 +612,7 @@ export const getJavaOverrides = (
|
|
|
593
612
|
if (name === "IOUtils") return createIoUtilsOperators(files, evaluateReplaced);
|
|
594
613
|
if (name === "_TLCTrace") return createTlcTraceOperators(files);
|
|
595
614
|
if (!getSanyStandardModules(runtime.version).has(name)) return undefined;
|
|
596
|
-
const operators =
|
|
615
|
+
const operators = getStandardOperators(name, print, runtime, files, builtins);
|
|
597
616
|
return name === "Randomization" && operators
|
|
598
617
|
? [...operators, createRandomSubsetSet(runtime)]
|
|
599
618
|
: operators;
|
|
@@ -611,37 +630,36 @@ export const STANDARD_DEPENDENCIES = new Map([
|
|
|
611
630
|
["TLCExt", ["TLC", "Integers", "Naturals", "Sequences", "FiniteSets"]],
|
|
612
631
|
]);
|
|
613
632
|
|
|
614
|
-
export const
|
|
633
|
+
export const STANDARD_EXTENDS = new Map([["Integers", ["Naturals"]]]);
|
|
634
|
+
|
|
635
|
+
export const getStandardOperators = (
|
|
615
636
|
name: string,
|
|
616
637
|
print: (text: string) => void,
|
|
617
638
|
runtime: CheckerRuntime,
|
|
618
639
|
files: FileSystem,
|
|
619
640
|
builtins: ReadonlyMap<string, Builtin>,
|
|
620
|
-
):
|
|
641
|
+
): Builtin[] | undefined => {
|
|
621
642
|
switch (name) {
|
|
622
643
|
case "Naturals":
|
|
623
|
-
return
|
|
644
|
+
return NATURALS_OPERATORS;
|
|
624
645
|
case "Integers":
|
|
625
|
-
return
|
|
646
|
+
return INTEGERS_OPERATORS;
|
|
626
647
|
case "Sequences":
|
|
627
|
-
return
|
|
648
|
+
return createSequencesOperators(runtime.version);
|
|
628
649
|
case "FiniteSets":
|
|
629
|
-
return
|
|
650
|
+
return createFiniteSetsOperators(runtime.version);
|
|
630
651
|
case "TLC":
|
|
631
|
-
return
|
|
652
|
+
return withJavaMethods("TLC", createTlcOperators(print, runtime));
|
|
632
653
|
case "Randomization":
|
|
633
|
-
return
|
|
654
|
+
return createRandomizationOperators(runtime);
|
|
634
655
|
case "_Possible":
|
|
635
|
-
return
|
|
656
|
+
return createPossibleOperators(print, runtime);
|
|
636
657
|
case "Json":
|
|
637
|
-
return
|
|
658
|
+
return createJsonOperators(files);
|
|
638
659
|
case "Bags":
|
|
639
|
-
return
|
|
660
|
+
return withJavaMethods("Bags", createBagsOperators(builtins));
|
|
640
661
|
case "TLCExt":
|
|
641
|
-
return
|
|
642
|
-
extends: [],
|
|
643
|
-
operators: withJavaMethods("TLCExt", createTlcExtOperators(print, runtime)),
|
|
644
|
-
};
|
|
662
|
+
return withJavaMethods("TLCExt", createTlcExtOperators(print, runtime));
|
|
645
663
|
default:
|
|
646
664
|
return undefined;
|
|
647
665
|
}
|