tla-ts 0.0.10-dev.b4a856304 → 0.0.10-dev.c92e6a4ea
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +2 -1
- package/dist/compile.cjs +6 -6
- package/dist/compile.js +10 -10
- package/dist/deciders.cjs +41 -37
- package/dist/deciders.js +57 -53
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +37 -0
- package/dist/index.d.ts +37 -0
- package/dist/index.js +1 -1
- package/dist/parallel-worker.cjs +1 -1
- package/dist/parallel-worker.js +1 -1
- package/dist/prove.cjs +2683 -427
- package/dist/prove.js +2681 -425
- package/dist/run.cjs +45 -44
- package/dist/run.js +45 -44
- package/dist/tlapm.cjs +2 -2
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +44 -41
- package/dist/transfer.js +45 -42
- package/dist/worker.cjs +7 -7
- package/dist/worker.js +7 -7
- package/package.json +1 -1
- package/src/ast.ts +41 -41
- package/src/bags.ts +2 -5
- package/src/builtins.ts +5 -21
- package/src/check-failure.ts +116 -0
- package/src/check-trace.ts +268 -0
- package/src/check.ts +578 -757
- package/src/cli/options.ts +6 -31
- package/src/cli/run.ts +0 -2
- package/src/cli/runtime-invariants.ts +27 -62
- package/src/cli/shared.ts +1 -5
- package/src/cli/tlapm.ts +433 -70
- package/src/cli/tlc-arguments.ts +246 -240
- package/src/cli/tlc-output.ts +686 -0
- package/src/cli/tlc-usage.ts +3 -5
- package/src/cli/tlc.ts +59 -707
- package/src/cli/xml-exporter.ts +23 -33
- package/src/codegen.ts +5 -10
- package/src/coverage.ts +3 -10
- package/src/dependencies.ts +30 -14
- package/src/dfid.ts +16 -16
- package/src/environment-config.ts +315 -0
- package/src/environment.ts +73 -338
- package/src/errors.ts +33 -5
- package/src/evaluate.ts +34 -107
- package/src/exit-codes.ts +3 -0
- package/src/fingerprints.ts +65 -1
- package/src/instances.ts +47 -10
- package/src/java-hash.ts +7 -0
- package/src/java-overrides.ts +4 -9
- package/src/json-reader.ts +1 -2
- package/src/json.ts +8 -18
- package/src/levels.ts +46 -57
- package/src/lexer.ts +76 -85
- package/src/liveness-checker.ts +634 -306
- package/src/liveness.ts +104 -120
- package/src/obligations/action.ts +14 -17
- package/src/obligations/anonymize.ts +37 -16
- package/src/obligations/enabled-axioms.ts +218 -0
- package/src/obligations/equality.ts +1 -3
- package/src/obligations/expression.ts +36 -8
- package/src/obligations/format.ts +0 -2
- package/src/obligations/generate.ts +66 -54
- package/src/obligations/index.ts +38 -8
- package/src/obligations/levels.ts +24 -11
- package/src/obligations/module.ts +28 -41
- package/src/obligations/normalize.ts +26 -14
- package/src/obligations/operators.ts +0 -2
- package/src/obligations/pragma.ts +53 -16
- package/src/obligations/printer.ts +43 -13
- package/src/obligations/proof.ts +3 -2
- package/src/obligations/regroup.ts +0 -2
- package/src/obligations/simplify.ts +55 -50
- package/src/obligations/source.ts +118 -74
- package/src/obligations/subexpression.ts +45 -18
- package/src/obligations/substitution.ts +1 -3
- package/src/obligations/temporal.ts +5 -7
- package/src/obligations/tuples.ts +0 -2
- package/src/parallel-worker.ts +17 -31
- package/src/parallel.ts +55 -80
- package/src/parser.ts +722 -385
- package/src/pcal/ast.ts +53 -65
- package/src/pcal/parse.ts +144 -191
- package/src/pcal/tokenize.ts +91 -115
- package/src/pcal/translate.ts +83 -98
- package/src/pcal/validate.ts +48 -50
- package/src/pretty-print.ts +7 -7
- package/src/prover/decide-pool.ts +3 -3
- package/src/prover/deciders.ts +12 -9
- package/src/prover/isabelle/decide.ts +3 -25
- package/src/prover/isabelle/encode.ts +72 -42
- package/src/prover/isabelle/isar/attrib.ts +250 -0
- package/src/prover/isabelle/isar/context.ts +335 -0
- package/src/prover/isabelle/isar/induct.ts +382 -0
- package/src/prover/isabelle/isar/inner-syntax.ts +158 -7
- package/src/prover/isabelle/isar/method.ts +509 -212
- package/src/prover/isabelle/isar/proof.ts +570 -14
- package/src/prover/isabelle/isar/rule-cases.ts +224 -0
- package/src/prover/isabelle/isar/theory.ts +487 -76
- package/src/prover/isabelle/isar/toplevel.ts +331 -0
- package/src/prover/isabelle/isar/type-check.ts +89 -14
- package/src/prover/isabelle/provers/blast/blast.ts +7 -65
- package/src/prover/isabelle/provers/blast/branch.ts +0 -2
- package/src/prover/isabelle/provers/blast/prove.ts +0 -2
- package/src/prover/isabelle/provers/blast/rules.ts +0 -2
- package/src/prover/isabelle/provers/blast/state.ts +0 -2
- package/src/prover/isabelle/provers/blast/term.ts +0 -2
- package/src/prover/isabelle/provers/clasimp.ts +0 -2
- package/src/prover/isabelle/provers/classical.ts +45 -20
- package/src/prover/isabelle/provers/hypsubst.ts +17 -28
- package/src/prover/isabelle/pure/bicompose.ts +9 -27
- package/src/prover/isabelle/pure/consts.ts +0 -2
- package/src/prover/isabelle/pure/conv.ts +2 -10
- package/src/prover/isabelle/pure/drule.ts +72 -6
- package/src/prover/isabelle/pure/envir.ts +0 -2
- package/src/prover/isabelle/pure/goal.ts +1 -3
- package/src/prover/isabelle/pure/logic.ts +1 -3
- package/src/prover/isabelle/pure/name.ts +0 -2
- package/src/prover/isabelle/pure/net.ts +0 -2
- package/src/prover/isabelle/pure/object-logic.ts +13 -7
- package/src/prover/isabelle/pure/pattern.ts +0 -2
- package/src/prover/isabelle/pure/raw-simplifier.ts +4 -15
- package/src/prover/isabelle/pure/rewriter.ts +6 -17
- package/src/prover/isabelle/pure/search.ts +0 -2
- package/src/prover/isabelle/pure/seq.ts +0 -2
- package/src/prover/isabelle/pure/simplifier.ts +26 -7
- package/src/prover/isabelle/pure/table.ts +2 -3
- package/src/prover/isabelle/pure/tactic.ts +0 -2
- package/src/prover/isabelle/pure/tactical.ts +42 -37
- package/src/prover/isabelle/pure/term-ord.ts +0 -2
- package/src/prover/isabelle/pure/term.ts +0 -2
- package/src/prover/isabelle/pure/thm.ts +14 -13
- package/src/prover/isabelle/pure/type.ts +0 -2
- package/src/prover/isabelle/pure/unify.ts +0 -2
- package/src/prover/isabelle/pure/variable.ts +0 -2
- package/src/prover/isabelle/tla/classical-setup.ts +18 -16
- package/src/prover/isabelle/tla/context.ts +58 -11
- package/src/prover/isabelle/tla/logic-data.ts +1 -1
- package/src/prover/isabelle/tla/logic.ts +49 -21
- package/src/prover/isabelle/tla/simpdata.ts +1 -12
- package/src/prover/isabelle/tools/intuitionistic.ts +28 -12
- package/src/prover/ocaml.ts +4 -1
- package/src/prover/prep/action.ts +30 -31
- package/src/prover/prep/enabled-axioms.ts +11 -2
- package/src/prover/prep/fingerprint.ts +2 -5
- package/src/prover/prep/methods.ts +181 -51
- package/src/prover/prep/normalize.ts +38 -9
- package/src/prover/prove.ts +395 -94
- package/src/prover/ptl/decide.ts +95 -50
- package/src/prover/ptl/encode.ts +2 -3
- package/src/prover/ptl/tableau.ts +28 -2
- package/src/prover/smt/arithmetic.ts +310 -0
- package/src/prover/smt/axioms.ts +12 -8
- package/src/prover/smt/context.ts +43 -8
- package/src/prover/smt/data.ts +498 -379
- package/src/prover/smt/encode.ts +148 -57
- package/src/prover/smt/extensionality.ts +5 -3
- package/src/prover/smt/flatten.ts +4 -6
- package/src/prover/smt/format.ts +28 -4
- package/src/prover/smt/instances.ts +7 -1
- package/src/prover/smt/layout.ts +91 -0
- package/src/prover/smt/rewrite.ts +1021 -618
- package/src/prover/smt/simplify.ts +441 -0
- package/src/prover/smt/solver/ackermannize-bv-tactic.ts +61 -0
- package/src/prover/smt/solver/ackr-helper.ts +179 -0
- package/src/prover/smt/solver/ackr-model-converter.ts +105 -0
- package/src/prover/smt/solver/act-cache.ts +0 -1
- package/src/prover/smt/solver/add-bounds-tactic.ts +59 -0
- package/src/prover/smt/solver/aig-tactic.ts +52 -0
- package/src/prover/smt/solver/aig.ts +889 -0
- package/src/prover/smt/solver/arith-rewriter.ts +613 -6
- package/src/prover/smt/solver/arith-terms.ts +121 -0
- package/src/prover/smt/solver/array-decl-plugin.ts +175 -0
- package/src/prover/smt/solver/array-rewriter.ts +309 -0
- package/src/prover/smt/solver/asserted-formulas.ts +87 -16
- package/src/prover/smt/solver/ast-lt.ts +166 -12
- package/src/prover/smt/solver/ast-util.ts +160 -2
- package/src/prover/smt/solver/ast.ts +1427 -41
- package/src/prover/smt/solver/auf-solver.ts +2 -6
- package/src/prover/smt/solver/bit-blast-tactic.ts +582 -0
- package/src/prover/smt/solver/bit-blaster.ts +871 -0
- package/src/prover/smt/solver/bound-manager.ts +196 -0
- package/src/prover/smt/solver/bound-simplifier.ts +600 -0
- package/src/prover/smt/solver/bv-bound-chk.ts +492 -0
- package/src/prover/smt/solver/bv-decl-plugin.ts +338 -0
- package/src/prover/smt/solver/bv-divrem-bounds.ts +95 -0
- package/src/prover/smt/solver/bv-rewriter.ts +1901 -0
- package/src/prover/smt/solver/bv1-blast.ts +214 -0
- package/src/prover/smt/solver/bv2fpa-converter.ts +174 -0
- package/src/prover/smt/solver/bv2int-rewriter.ts +544 -0
- package/src/prover/smt/solver/bv2real-rewriter.ts +533 -0
- package/src/prover/smt/solver/card2bv.ts +110 -0
- package/src/prover/smt/solver/case-split-queue.ts +0 -2
- package/src/prover/smt/solver/cg-table.ts +39 -25
- package/src/prover/smt/solver/check-logic.ts +330 -0
- package/src/prover/smt/solver/clause.ts +0 -1
- package/src/prover/smt/solver/cofactor-elim-term-ite.ts +278 -0
- package/src/prover/smt/solver/conflict-resolution.ts +78 -2
- package/src/prover/smt/solver/context.ts +516 -115
- package/src/prover/smt/solver/ctx-simplify.ts +20 -10
- package/src/prover/smt/solver/ctx-solver-simplify.ts +122 -0
- package/src/prover/smt/solver/datatype-decl-plugin.ts +572 -0
- package/src/prover/smt/solver/datatype-rewriter.ts +82 -0
- package/src/prover/smt/solver/demodulator.ts +786 -0
- package/src/prover/smt/solver/dependent-expr-state.ts +81 -0
- package/src/prover/smt/solver/der.ts +38 -10
- package/src/prover/smt/solver/diff-neq.ts +206 -0
- package/src/prover/smt/solver/distribute-forall.ts +57 -0
- package/src/prover/smt/solver/dom-simplify.ts +511 -0
- package/src/prover/smt/solver/dt2bv-tactic.ts +260 -0
- package/src/prover/smt/solver/dyn-ack.ts +0 -1
- package/src/prover/smt/solver/e-matching.ts +7 -8
- package/src/prover/smt/solver/elim-small-bv-tactic.ts +129 -0
- package/src/prover/smt/solver/elim-uncnstr.ts +545 -0
- package/src/prover/smt/solver/enode.ts +100 -3
- package/src/prover/smt/solver/eq2bv-tactic.ts +218 -0
- package/src/prover/smt/solver/euf/arith-axioms.ts +403 -0
- package/src/prover/smt/solver/euf/arith-internalize.ts +653 -0
- package/src/prover/smt/solver/euf/arith-solver.ts +889 -0
- package/src/prover/smt/solver/euf/array-axioms.ts +527 -0
- package/src/prover/smt/solver/euf/array-internalize.ts +428 -0
- package/src/prover/smt/solver/euf/array-solver.ts +306 -0
- package/src/prover/smt/solver/euf/bv-ackerman.ts +162 -0
- package/src/prover/smt/solver/euf/bv-internalize.ts +748 -0
- package/src/prover/smt/solver/euf/bv-solver.ts +449 -0
- package/src/prover/smt/solver/euf/dt-solver.ts +618 -0
- package/src/prover/smt/solver/euf/egraph.ts +908 -0
- package/src/prover/smt/solver/euf/euf-solver.ts +1205 -0
- package/src/prover/smt/solver/euf/fpa-solver.ts +317 -0
- package/src/prover/smt/solver/euf/mam.ts +1050 -0
- package/src/prover/smt/solver/euf/q-ematch.ts +830 -0
- package/src/prover/smt/solver/euf/q-mbi.ts +587 -0
- package/src/prover/smt/solver/euf/q-model-fixer.ts +296 -0
- package/src/prover/smt/solver/euf/q-solver.ts +361 -0
- package/src/prover/smt/solver/euf/th-solver.ts +335 -0
- package/src/prover/smt/solver/euf/th-solvers.ts +30 -0
- package/src/prover/smt/solver/expr-ref.ts +0 -1
- package/src/prover/smt/solver/expr-safe-replace.ts +26 -2
- package/src/prover/smt/solver/expr2polynomial.ts +146 -0
- package/src/prover/smt/solver/factor.ts +141 -0
- package/src/prover/smt/solver/fd-solver.ts +265 -0
- package/src/prover/smt/solver/fingerprints.ts +15 -15
- package/src/prover/smt/solver/fix-dl-var.ts +148 -0
- package/src/prover/smt/solver/flat-literals.ts +0 -1
- package/src/prover/smt/solver/fm-tactic.ts +884 -0
- package/src/prover/smt/solver/fpa-decl-plugin.ts +618 -0
- package/src/prover/smt/solver/fpa-rewriter.ts +640 -0
- package/src/prover/smt/solver/fpa2bv-converter.ts +2249 -0
- package/src/prover/smt/solver/fpa2bv-rewriter.ts +348 -0
- package/src/prover/smt/solver/fpa2bv-tactic.ts +73 -0
- package/src/prover/smt/solver/goal.ts +175 -15
- package/src/prover/smt/solver/goal2nlsat.ts +189 -0
- package/src/prover/smt/solver/guard-set.ts +219 -0
- package/src/prover/smt/solver/hash.ts +0 -1
- package/src/prover/smt/solver/hashtable.ts +30 -16
- package/src/prover/smt/solver/inf-eps.ts +63 -0
- package/src/prover/smt/solver/inj-axiom.ts +101 -0
- package/src/prover/smt/solver/internalizer.ts +110 -38
- package/src/prover/smt/solver/lackr.ts +381 -0
- package/src/prover/smt/solver/lbool.ts +0 -1
- package/src/prover/smt/solver/lia2card.ts +268 -0
- package/src/prover/smt/solver/lia2pb.ts +154 -0
- package/src/prover/smt/solver/literal.ts +0 -1
- package/src/prover/smt/solver/logic-tactics.ts +345 -0
- package/src/prover/smt/solver/lp/bound-propagator.ts +0 -1
- package/src/prover/smt/solver/lp/constraints.ts +0 -1
- package/src/prover/smt/solver/lp/containers.ts +7 -2
- package/src/prover/smt/solver/lp/core-solver.ts +18 -3
- package/src/prover/smt/solver/lp/cross-nested.ts +1 -4
- package/src/prover/smt/solver/lp/dep-intervals.ts +0 -3
- package/src/prover/smt/solver/lp/dependency.ts +0 -2
- package/src/prover/smt/solver/lp/dioph-eq.ts +1 -10
- package/src/prover/smt/solver/lp/explanation.ts +0 -1
- package/src/prover/smt/solver/lp/gomory.ts +0 -1
- package/src/prover/smt/solver/lp/hnf-cutter.ts +1 -2
- package/src/prover/smt/solver/lp/hnf.ts +0 -3
- package/src/prover/smt/solver/lp/int-cube.ts +3 -4
- package/src/prover/smt/solver/lp/int-solver.ts +0 -2
- package/src/prover/smt/solver/lp/lar-solver.ts +40 -4
- package/src/prover/smt/solver/lp/lar-term.ts +0 -1
- package/src/prover/smt/solver/lp/lp-settings.ts +0 -1
- package/src/prover/smt/solver/lp/maximize-term.ts +59 -10
- package/src/prover/smt/solver/lp/nex-creator.ts +3 -3
- package/src/prover/smt/solver/lp/nex.ts +2 -2
- package/src/prover/smt/solver/lp/nla-backoff.ts +0 -2
- package/src/prover/smt/solver/lp/nla-basics.ts +46 -3
- package/src/prover/smt/solver/lp/nla-core.ts +67 -16
- package/src/prover/smt/solver/lp/nla-divisions.ts +0 -2
- package/src/prover/smt/solver/lp/nla-emonics.ts +0 -1
- package/src/prover/smt/solver/lp/nla-factorization.ts +0 -1
- package/src/prover/smt/solver/lp/nla-grobner.ts +165 -83
- package/src/prover/smt/solver/lp/nla-horner.ts +0 -2
- package/src/prover/smt/solver/lp/nla-intervals.ts +0 -1
- package/src/prover/smt/solver/lp/nla-monomial-bounds.ts +0 -2
- package/src/prover/smt/solver/lp/nla-monotone.ts +0 -1
- package/src/prover/smt/solver/lp/nla-order.ts +0 -2
- package/src/prover/smt/solver/lp/nla-patcher.ts +0 -1
- package/src/prover/smt/solver/lp/nla-powers.ts +220 -0
- package/src/prover/smt/solver/lp/nla-tangents.ts +0 -2
- package/src/prover/smt/solver/lp/nla-throttle.ts +0 -1
- package/src/prover/smt/solver/lp/nla-transcendentals.ts +324 -0
- package/src/prover/smt/solver/lp/nla-types.ts +0 -2
- package/src/prover/smt/solver/lp/nla-var-eqs.ts +0 -1
- package/src/prover/smt/solver/lp/nra-solver.ts +122 -64
- package/src/prover/smt/solver/lp/numeric-pair.ts +0 -1
- package/src/prover/smt/solver/lp/pdd-interval.ts +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 -289
- package/src/prover/smt/solver/lp/random-updater.ts +0 -2
- package/src/prover/smt/solver/lp/static-matrix.ts +0 -1
- package/src/prover/smt/solver/lp/union-find.ts +7 -2
- package/src/prover/smt/solver/macro-finder.ts +530 -0
- package/src/prover/smt/solver/mam-compiler.ts +122 -90
- package/src/prover/smt/solver/mam-interpreter.ts +0 -1
- package/src/prover/smt/solver/max-bv-sharing-tactic.ts +17 -0
- package/src/prover/smt/solver/max-cliques.ts +105 -0
- package/src/prover/smt/solver/maxcore.ts +309 -0
- package/src/prover/smt/solver/maximize-ac-sharing.ts +8 -6
- package/src/prover/smt/solver/maxlex.ts +115 -0
- package/src/prover/smt/solver/maxsmt-base.ts +105 -0
- package/src/prover/smt/solver/maxsmt.ts +92 -0
- package/src/prover/smt/solver/mbp/mbp-arith.ts +467 -0
- package/src/prover/smt/solver/mbp/mbp-basic-tg.ts +101 -0
- package/src/prover/smt/solver/mbp/mbp-plugin.ts +287 -0
- package/src/prover/smt/solver/mbp/mbp-qel.ts +48 -0
- package/src/prover/smt/solver/mbp/mbp-solve-plugin.ts +271 -0
- package/src/prover/smt/solver/mbp/mbp-term-graph.ts +606 -0
- package/src/prover/smt/solver/model-based-opt.ts +844 -0
- package/src/prover/smt/solver/model-checker.ts +18 -27
- package/src/prover/smt/solver/model-evaluator.ts +188 -12
- package/src/prover/smt/solver/model-finder.ts +12 -18
- package/src/prover/smt/solver/model-generator.ts +56 -29
- package/src/prover/smt/solver/model-macro-solver.ts +49 -46
- package/src/prover/smt/solver/model-printer.ts +214 -0
- package/src/prover/smt/solver/mpf.ts +711 -0
- package/src/prover/smt/solver/mus.ts +51 -0
- package/src/prover/smt/solver/muz/dl-context.ts +404 -0
- package/src/prover/smt/solver/muz/dl-mk-bit-blast.ts +97 -0
- package/src/prover/smt/solver/muz/dl-mk-coi-filter.ts +167 -0
- package/src/prover/smt/solver/muz/dl-mk-elim-term-ite.ts +125 -0
- package/src/prover/smt/solver/muz/dl-mk-interp-tail-simplifier.ts +299 -0
- package/src/prover/smt/solver/muz/dl-mk-rule-inliner.ts +455 -0
- package/src/prover/smt/solver/muz/dl-mk-slice.ts +340 -0
- package/src/prover/smt/solver/muz/dl-mk-subsumption-checker.ts +163 -0
- package/src/prover/smt/solver/muz/dl-rule-set.ts +273 -0
- package/src/prover/smt/solver/muz/dl-rule-transformer.ts +123 -0
- package/src/prover/smt/solver/muz/dl-rule.ts +496 -0
- package/src/prover/smt/solver/muz/hnf.ts +201 -0
- package/src/prover/smt/solver/muz/horn-subsume-model-converter.ts +176 -0
- package/src/prover/smt/solver/muz/horn-tactic.ts +201 -0
- package/src/prover/smt/solver/muz/rule-properties.ts +337 -0
- package/src/prover/smt/solver/muz/spacer-context.ts +1406 -0
- package/src/prover/smt/solver/muz/spacer-dl-interface.ts +52 -0
- package/src/prover/smt/solver/muz/spacer-generalizers.ts +241 -0
- package/src/prover/smt/solver/muz/spacer-manager.ts +127 -0
- package/src/prover/smt/solver/muz/spacer-pdr.ts +218 -0
- package/src/prover/smt/solver/muz/spacer-prop-solver.ts +333 -0
- package/src/prover/smt/solver/muz/spacer-util.ts +282 -0
- package/src/prover/smt/solver/muz/substitution.ts +203 -0
- package/src/prover/smt/solver/nla2bv-tactic.ts +285 -0
- package/src/prover/smt/solver/nlqsat.ts +484 -0
- package/src/prover/smt/solver/nlsat/algebraic.ts +125 -12
- package/src/prover/smt/solver/nlsat/atoms.ts +20 -6
- package/src/prover/smt/solver/nlsat/evaluator.ts +0 -1
- package/src/prover/smt/solver/nlsat/explain.ts +63 -23
- package/src/prover/smt/solver/nlsat/interval-set.ts +1 -2
- package/src/prover/smt/solver/nlsat/levelwise.ts +3 -9
- package/src/prover/smt/solver/nlsat/mpbq.ts +45 -1
- package/src/prover/smt/solver/nlsat/polynomial.ts +13 -6
- package/src/prover/smt/solver/nlsat/solver.ts +236 -45
- package/src/prover/smt/solver/nlsat/transcendental-eval.ts +310 -0
- package/src/prover/smt/solver/nlsat/transcendentals.ts +367 -0
- package/src/prover/smt/solver/nlsat/types.ts +0 -2
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +1 -4
- package/src/prover/smt/solver/nlsat/upolynomial.ts +0 -2
- package/src/prover/smt/solver/nlsat-tactic.ts +82 -0
- package/src/prover/smt/solver/nnf.ts +105 -23
- package/src/prover/smt/solver/normalize-bounds.ts +53 -0
- package/src/prover/smt/solver/occf.ts +97 -0
- package/src/prover/smt/solver/opt-context.ts +787 -0
- package/src/prover/smt/solver/opt-nlsat.ts +375 -0
- package/src/prover/smt/solver/opt-pareto.ts +282 -0
- package/src/prover/smt/solver/opt-preprocess.ts +101 -0
- package/src/prover/smt/solver/opt-solver.ts +308 -0
- package/src/prover/smt/solver/opt-value.ts +55 -0
- package/src/prover/smt/solver/optsmt.ts +692 -0
- package/src/prover/smt/solver/parallel-tactic.ts +299 -0
- package/src/prover/smt/solver/pattern-inference.ts +19 -11
- package/src/prover/smt/solver/pb-rewriter.ts +284 -0
- package/src/prover/smt/solver/pb2bv-tactic.ts +540 -0
- package/src/prover/smt/solver/poly-rewriter.ts +202 -57
- package/src/prover/smt/solver/probes.ts +512 -0
- package/src/prover/smt/solver/propagate-values.ts +37 -21
- package/src/prover/smt/solver/proto-model.ts +648 -19
- package/src/prover/smt/solver/pull-quant.ts +28 -12
- package/src/prover/smt/solver/purify-arith.ts +632 -0
- package/src/prover/smt/solver/qe-arith-plugin.ts +1098 -0
- package/src/prover/smt/solver/qe-lite-der.ts +2 -3
- package/src/prover/smt/solver/qe-lite-fm.ts +3 -4
- package/src/prover/smt/solver/qe-lite.ts +37 -17
- package/src/prover/smt/solver/qe-mbp.ts +270 -0
- package/src/prover/smt/solver/qe.ts +1498 -0
- package/src/prover/smt/solver/qel.ts +25 -0
- package/src/prover/smt/solver/qi-queue.ts +0 -1
- package/src/prover/smt/solver/qsat.ts +814 -0
- package/src/prover/smt/solver/quant-hoist.ts +196 -0
- package/src/prover/smt/solver/quant-tactics.ts +16 -56
- package/src/prover/smt/solver/quantifier-analyzer.ts +19 -20
- package/src/prover/smt/solver/quantifier-manager.ts +8 -16
- package/src/prover/smt/solver/quasi-macros.ts +243 -0
- package/src/prover/smt/solver/random-gen.ts +0 -1
- package/src/prover/smt/solver/rational.ts +45 -1
- package/src/prover/smt/solver/recfun-decl-plugin.ts +261 -0
- package/src/prover/smt/solver/recfun-rewriter.ts +107 -0
- package/src/prover/smt/solver/reduce-args.ts +225 -0
- package/src/prover/smt/solver/reduce-bv-size.ts +119 -0
- package/src/prover/smt/solver/ref-vector.ts +0 -1
- package/src/prover/smt/solver/relevancy.ts +1 -2
- package/src/prover/smt/solver/rewriter-tpl.ts +77 -10
- package/src/prover/smt/solver/rewriter.ts +475 -36
- package/src/prover/smt/solver/rlimit.ts +38 -2
- package/src/prover/smt/solver/sat/asymm-branch.ts +325 -0
- package/src/prover/smt/solver/sat/big.ts +177 -0
- package/src/prover/smt/solver/sat/clause-use-list.ts +71 -0
- package/src/prover/smt/solver/sat/clause.ts +203 -0
- package/src/prover/smt/solver/sat/cleaner.ts +94 -0
- package/src/prover/smt/solver/sat/config.ts +122 -0
- package/src/prover/smt/solver/sat/consequences.ts +203 -0
- package/src/prover/smt/solver/sat/elim-eqs.ts +142 -0
- package/src/prover/smt/solver/sat/goal2sat.ts +526 -0
- package/src/prover/smt/solver/sat/inc-sat-solver.ts +378 -0
- package/src/prover/smt/solver/sat/model-converter.ts +136 -0
- package/src/prover/smt/solver/sat/pb-constraint.ts +261 -0
- package/src/prover/smt/solver/sat/pb-solver.ts +1577 -0
- package/src/prover/smt/solver/sat/probing.ts +170 -0
- package/src/prover/smt/solver/sat/sat-tactic.ts +43 -0
- package/src/prover/smt/solver/sat/sat2goal.ts +165 -0
- package/src/prover/smt/solver/sat/scc.ts +142 -0
- package/src/prover/smt/solver/sat/simplifier.ts +1618 -0
- package/src/prover/smt/solver/sat/solver.ts +2127 -0
- package/src/prover/smt/solver/sat/var-queue.ts +117 -0
- package/src/prover/smt/solver/sat/watch-list.ts +140 -0
- package/src/prover/smt/solver/search-tree.ts +284 -0
- package/src/prover/smt/solver/seq-axioms.ts +1010 -0
- package/src/prover/smt/solver/seq-decl-plugin.ts +819 -0
- package/src/prover/smt/solver/seq-derive.ts +1298 -0
- package/src/prover/smt/solver/seq-eq-approx.ts +236 -0
- package/src/prover/smt/solver/seq-eq-solver.ts +439 -0
- package/src/prover/smt/solver/seq-factory.ts +89 -0
- package/src/prover/smt/solver/seq-monadic.ts +728 -0
- package/src/prover/smt/solver/seq-range-predicate.ts +235 -0
- package/src/prover/smt/solver/seq-re-rewriter.ts +1170 -0
- package/src/prover/smt/solver/seq-re-util.ts +758 -0
- package/src/prover/smt/solver/seq-regex-bisim.ts +144 -0
- package/src/prover/smt/solver/seq-regex-live.ts +200 -0
- package/src/prover/smt/solver/seq-rewriter.ts +2402 -0
- package/src/prover/smt/solver/seq-skolem.ts +317 -0
- package/src/prover/smt/solver/seq-subset.ts +165 -0
- package/src/prover/smt/solver/seq-view-witness.ts +353 -0
- package/src/prover/smt/solver/smt-consequences.ts +297 -0
- package/src/prover/smt/solver/smt-kernel.ts +83 -0
- package/src/prover/smt/solver/smt-logics.ts +66 -0
- package/src/prover/smt/solver/smt-setup.ts +496 -0
- package/src/prover/smt/solver/smt2-printer.ts +765 -0
- package/src/prover/smt/solver/smtlib-parser.ts +3126 -316
- package/src/prover/smt/solver/smtlib-script.ts +1631 -0
- package/src/prover/smt/solver/solve-eqs.ts +929 -0
- package/src/prover/smt/solver/solver.ts +113 -22
- package/src/prover/smt/solver/static-features.ts +314 -0
- package/src/prover/smt/solver/sticky-generations.ts +0 -1
- package/src/prover/smt/solver/tactic.ts +1986 -0
- package/src/prover/smt/solver/term-enumeration.ts +205 -0
- package/src/prover/smt/solver/theory-array.ts +1240 -0
- package/src/prover/smt/solver/theory-bv.ts +1200 -0
- package/src/prover/smt/solver/theory-char.ts +355 -0
- package/src/prover/smt/solver/theory-datatype.ts +598 -0
- package/src/prover/smt/solver/theory-finite-set.ts +30 -0
- package/src/prover/smt/solver/theory-fpa.ts +389 -0
- package/src/prover/smt/solver/theory-lra-axioms.ts +53 -2
- package/src/prover/smt/solver/theory-lra-bounds.ts +31 -6
- package/src/prover/smt/solver/theory-lra-final-check.ts +56 -70
- package/src/prover/smt/solver/theory-lra-internalize.ts +94 -27
- package/src/prover/smt/solver/theory-lra-model.ts +20 -35
- package/src/prover/smt/solver/theory-lra-propagate.ts +24 -26
- package/src/prover/smt/solver/theory-lra-state.ts +6 -22
- package/src/prover/smt/solver/theory-lra.ts +188 -1
- package/src/prover/smt/solver/theory-pb.ts +934 -0
- package/src/prover/smt/solver/theory-polymorphism.ts +58 -0
- package/src/prover/smt/solver/theory-recfun.ts +307 -0
- package/src/prover/smt/solver/theory-seq-regex.ts +867 -0
- package/src/prover/smt/solver/theory-seq-solve.ts +1373 -0
- package/src/prover/smt/solver/theory-seq-state.ts +871 -0
- package/src/prover/smt/solver/theory-seq.ts +961 -0
- package/src/prover/smt/solver/theory.ts +189 -0
- package/src/prover/smt/solver/tseitin-cnf.ts +485 -0
- package/src/prover/smt/solver/var-subst.ts +36 -14
- package/src/prover/smt/table.ts +3 -2
- package/src/prover/smt/types.ts +146 -0
- package/src/prover/tlapm/cache.ts +50 -19
- package/src/prover/tlapm/tlapm.ts +15 -9
- package/src/prover/tlapm-library.ts +3208 -0
- package/src/prover/verdict.ts +9 -0
- package/src/prover/zenon/check/check.ts +1 -2
- package/src/prover/zenon/check/records.ts +1 -1
- package/src/prover/zenon/check/relations.ts +2 -1
- package/src/prover/zenon/check/rewrites.ts +2 -15
- package/src/prover/zenon/check/sets.ts +40 -58
- package/src/prover/zenon/check/terms.ts +1 -2
- package/src/prover/zenon/decide.ts +10 -7
- package/src/prover/zenon/encode.ts +0 -2
- package/src/prover/zenon/eqrel.ts +2 -2
- package/src/prover/zenon/equality-rules.ts +24 -2
- package/src/prover/zenon/expr.ts +28 -2
- package/src/prover/zenon/index-table.ts +11 -21
- package/src/prover/zenon/isar-case.ts +0 -2
- package/src/prover/zenon/isar.ts +35 -37
- package/src/prover/zenon/llproof.ts +2 -13
- package/src/prover/zenon/mltoll.ts +12 -30
- package/src/prover/zenon/node.ts +20 -5
- package/src/prover/zenon/parse.ts +9 -8
- package/src/prover/zenon/phrase.ts +0 -2
- package/src/prover/zenon/proof.ts +0 -2
- package/src/prover/zenon/propositional-rules.ts +0 -2
- package/src/prover/zenon/rules.ts +2 -3
- package/src/prover/zenon/search.ts +11 -19
- package/src/prover/zenon/tla/functions.ts +2 -4
- package/src/prover/zenon/tla/llproof.ts +9 -13
- package/src/prover/zenon/tla/records.ts +1 -8
- package/src/prover/zenon/tla/rewrites.ts +0 -2
- package/src/prover/zenon/tla/sets.ts +22 -22
- package/src/prover/zenon/tla/terms.ts +0 -2
- package/src/prover/zenon/tla/tla.ts +7 -8
- package/src/randomization.ts +1 -4
- package/src/resolve.ts +67 -143
- package/src/runtime.ts +17 -18
- package/src/sany/builtins.ts +1 -3
- package/src/sany/generation.ts +394 -0
- package/src/sany/generator-def-entries.ts +210 -0
- package/src/sany/generator-definitions.ts +686 -0
- package/src/sany/generator-expressions.ts +1100 -0
- package/src/sany/generator-proofs.ts +662 -0
- package/src/sany/generator.ts +160 -2683
- package/src/sany/levels.ts +5 -11
- package/src/sany/lexer.ts +57 -60
- package/src/sany/linter.ts +0 -3
- package/src/sany/nodes.ts +6 -13
- package/src/sany/report.ts +3 -6
- package/src/sany/selectors.ts +35 -38
- package/src/sany/xml.ts +23 -55
- package/src/search.ts +244 -53
- package/src/simulate.ts +202 -184
- package/src/spec-description.ts +56 -82
- package/src/standard-definitions.ts +4 -3
- package/src/standard-modules.ts +17 -44
- package/src/state-graph.ts +3 -17
- package/src/subexpressions.ts +38 -47
- package/src/substitution-levels.ts +5 -4
- package/src/successors.ts +20 -43
- package/src/symmetry.ts +6 -21
- package/src/tableau.ts +2 -2
- package/src/tlc/fingerprint.ts +96 -30
- package/src/tlc/jar-data.ts +0 -1
- package/src/tlc/messages.ts +22 -36
- package/src/tlc/order.ts +36 -50
- package/src/tlc/random.ts +22 -34
- package/src/tlc/replay.ts +21 -48
- package/src/tlc/summary.ts +64 -58
- package/src/tlc/tlc-operators.ts +6 -17
- package/src/tlc/tlcext-operators.ts +70 -29
- package/src/tlc/trace-spec.ts +26 -51
- package/src/tlc/value-stream.ts +9 -13
- package/src/tlc/version.ts +0 -1
- package/src/typed-tier.ts +6535 -0
- package/src/typescript/actions.ts +2 -4
- package/src/typescript/collections.ts +34 -20
- package/src/typescript/compile.ts +1 -3
- package/src/typescript/formula.ts +5 -3
- package/src/typescript/model.ts +4 -5
- package/src/typescript/steps.ts +20 -18
- package/src/values.ts +136 -338
- package/src/prover/isabelle/isar/statement.ts +0 -52
- package/src/prover/smt/solver/z3-license.txt +0 -10
- package/src/prover/tlaps-module.ts +0 -510
- package/src/prover/zenon/LICENSE +0 -32
package/src/prover/ptl/decide.ts
CHANGED
|
@@ -1,63 +1,108 @@
|
|
|
1
|
-
import { TlaSyntaxError } from "../../errors";
|
|
2
1
|
import type { DecideOptions, Verdict } from "../verdict";
|
|
3
|
-
import { getSatisfiability, type PtlFormula } from "./tableau";
|
|
2
|
+
import { getSatisfiability, type BinaryKind, type PtlFormula } from "./tableau";
|
|
4
3
|
|
|
5
|
-
|
|
6
|
-
|
|
4
|
+
// ptl_to_trp's binary operators, from the loosest.
|
|
5
|
+
const BINARY_LEVELS = [
|
|
6
|
+
new Map<string, BinaryKind>([["until", "Until"]]),
|
|
7
|
+
new Map<string, BinaryKind>([["unless", "Unless"]]),
|
|
8
|
+
new Map<string, BinaryKind>([
|
|
9
|
+
["<=>", "Equiv"],
|
|
10
|
+
["<->", "Equiv"],
|
|
11
|
+
]),
|
|
12
|
+
new Map<string, BinaryKind>([["|", "Or"]]),
|
|
13
|
+
new Map<string, BinaryKind>([
|
|
14
|
+
["=>", "Implies"],
|
|
15
|
+
["->", "Implies"],
|
|
16
|
+
]),
|
|
17
|
+
new Map<string, BinaryKind>([["&", "And"]]),
|
|
18
|
+
];
|
|
19
|
+
|
|
20
|
+
const PREFIX_OPERATORS = new Map<string, "Not" | "Always" | "Eventually" | "Next" | "Past">([
|
|
21
|
+
["~", "Not"],
|
|
22
|
+
["not", "Not"],
|
|
23
|
+
["always", "Always"],
|
|
24
|
+
["sometime", "Eventually"],
|
|
25
|
+
["next", "Next"],
|
|
26
|
+
["alwaysp", "Past"],
|
|
27
|
+
["sometimep", "Past"],
|
|
28
|
+
]);
|
|
29
|
+
|
|
30
|
+
const KEYWORDS = new Set([
|
|
31
|
+
...PREFIX_OPERATORS.keys(),
|
|
32
|
+
...BINARY_LEVELS.flatMap((operators) => [...operators.keys()]),
|
|
33
|
+
"True",
|
|
34
|
+
"False",
|
|
35
|
+
]);
|
|
36
|
+
|
|
37
|
+
const RESERVED = /^(skolem|hidden|constant|NV_V\w*|NVV\w*)$/;
|
|
38
|
+
|
|
39
|
+
const MAX_LS4_IDENTIFIER = 31;
|
|
40
|
+
|
|
41
|
+
// ptl_to_trp and LS4 reach no verdict on text that this reads as undefined.
|
|
42
|
+
const parseLs4 = (text: string): PtlFormula | undefined => {
|
|
43
|
+
const tokens = text.replace(/;.*/g, "").match(/<=>|<->|=>|->|[A-Za-z]\w*|\S/g) ?? [];
|
|
7
44
|
let position = 0;
|
|
8
|
-
const
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
if (token === "(") {
|
|
19
|
-
const inner = parseEquiv();
|
|
20
|
-
take(")");
|
|
21
|
-
return inner;
|
|
45
|
+
const isIdentifier = (token: string | undefined): token is string =>
|
|
46
|
+
token !== undefined && /^[A-Za-z]/.test(token) && !KEYWORDS.has(token) && !RESERVED.test(token);
|
|
47
|
+
const takeList = () => {
|
|
48
|
+
const items: string[] = [];
|
|
49
|
+
for (;;) {
|
|
50
|
+
const token = tokens[position++];
|
|
51
|
+
if (!isIdentifier(token)) return undefined;
|
|
52
|
+
items.push(token);
|
|
53
|
+
if (tokens[position] !== ",") return items;
|
|
54
|
+
position += 1;
|
|
22
55
|
}
|
|
23
|
-
if (token === "~" || token === "not") return { kind: "Not", body: parseUnary() };
|
|
24
|
-
if (token === "always") return { kind: "Always", body: parseUnary() };
|
|
25
|
-
if (token === "sometime") return { kind: "Eventually", body: parseUnary() };
|
|
26
|
-
if (token === "next") return { kind: "Next", body: parseUnary() };
|
|
27
|
-
if (!/^[\w']+$/.test(token))
|
|
28
|
-
throw new TlaSyntaxError(`Expected a formula in LS4 input, found ${token}`);
|
|
29
|
-
return { kind: "Atom", name: token };
|
|
30
56
|
};
|
|
31
|
-
const
|
|
32
|
-
const
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
57
|
+
const parsePrefix = (): PtlFormula | undefined => {
|
|
58
|
+
const token = tokens[position++];
|
|
59
|
+
if (token === undefined) return undefined;
|
|
60
|
+
const prefix = PREFIX_OPERATORS.get(token);
|
|
61
|
+
if (prefix !== undefined) {
|
|
62
|
+
const body = parsePrefix();
|
|
63
|
+
// ptl_to_trp does not translate the past operators.
|
|
64
|
+
return body === undefined || prefix === "Past" ? undefined : { kind: prefix, body };
|
|
36
65
|
}
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
66
|
+
if (token === "!" || token === "?") {
|
|
67
|
+
if (tokens[position++] !== "[") return undefined;
|
|
68
|
+
const variables = takeList();
|
|
69
|
+
// foyacc.mly checks only that the last variable of the list is uppercase.
|
|
70
|
+
return variables !== undefined &&
|
|
71
|
+
/^[A-Z]/.test(variables[variables.length - 1]) &&
|
|
72
|
+
tokens[position++] === "]"
|
|
73
|
+
? parsePrefix()
|
|
74
|
+
: undefined;
|
|
75
|
+
}
|
|
76
|
+
if (token === "(") {
|
|
77
|
+
const inner = parseBinary(0);
|
|
78
|
+
return tokens[position++] === ")" ? inner : undefined;
|
|
79
|
+
}
|
|
80
|
+
if (token === "True" || token === "False") return { kind: "Constant", value: token === "True" };
|
|
81
|
+
// LS4 reads no predicate with arguments and no identifier longer than 31 characters.
|
|
82
|
+
return isIdentifier(token) && tokens[position] !== "(" && token.length <= MAX_LS4_IDENTIFIER
|
|
83
|
+
? { kind: "Atom", name: token }
|
|
84
|
+
: undefined;
|
|
44
85
|
};
|
|
45
|
-
const
|
|
46
|
-
const
|
|
47
|
-
if (
|
|
48
|
-
|
|
49
|
-
|
|
86
|
+
const parseOperators = (level: number, left: PtlFormula | undefined): PtlFormula | undefined => {
|
|
87
|
+
const kind = BINARY_LEVELS[level].get(tokens[position] ?? "");
|
|
88
|
+
if (left === undefined || kind === undefined) return left;
|
|
89
|
+
position += 1;
|
|
90
|
+
const right = parseBinary(level + 1);
|
|
91
|
+
return right === undefined ? undefined : parseOperators(level, { kind, left, right });
|
|
50
92
|
};
|
|
51
|
-
const
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
return formula;
|
|
93
|
+
const parseBinary = (level: number): PtlFormula | undefined =>
|
|
94
|
+
level === BINARY_LEVELS.length ? parsePrefix() : parseOperators(level, parseBinary(level + 1));
|
|
95
|
+
const formula = parseBinary(0);
|
|
96
|
+
return position < tokens.length ? undefined : formula;
|
|
55
97
|
};
|
|
56
98
|
|
|
57
99
|
export const decidePtl = (text: string, options: DecideOptions): Verdict => {
|
|
58
100
|
const deadline = performance.now() + options.timeLimitMs;
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
101
|
+
const formula = parseLs4(text);
|
|
102
|
+
return formula === undefined
|
|
103
|
+
? "unknown"
|
|
104
|
+
: getSatisfiability(
|
|
105
|
+
formula,
|
|
106
|
+
() => options.signal?.aborted === true || performance.now() > deadline,
|
|
107
|
+
);
|
|
63
108
|
};
|
package/src/prover/ptl/encode.ts
CHANGED
|
@@ -101,7 +101,7 @@ const prepareHyps = (scope: Scope | undefined, expression: Expr): Expr => {
|
|
|
101
101
|
};
|
|
102
102
|
for (const original of expression.sequent.context) {
|
|
103
103
|
const hyp = substituteHyp(substitution, original);
|
|
104
|
-
if (hyp.kind !== "Fresh" || !hyp.domain
|
|
104
|
+
if (hyp.kind !== "Fresh" || !hyp.domain) {
|
|
105
105
|
push(
|
|
106
106
|
hyp.kind === "Fact" ? { ...hyp, expression: prepareHyps(innerScope, hyp.expression) } : hyp,
|
|
107
107
|
);
|
|
@@ -110,7 +110,6 @@ const prepareHyps = (scope: Scope | undefined, expression: Expr): Expr => {
|
|
|
110
110
|
}
|
|
111
111
|
const domain = prepareHyps(innerScope, hyp.domain);
|
|
112
112
|
push({ ...hyp, domain: undefined });
|
|
113
|
-
// tlapm judges the time of the domain as written, one hypothesis too deep.
|
|
114
113
|
push({
|
|
115
114
|
kind: "Fact",
|
|
116
115
|
expression: applyBuiltin(
|
|
@@ -119,7 +118,7 @@ const prepareHyps = (scope: Scope | undefined, expression: Expr): Expr => {
|
|
|
119
118
|
domain,
|
|
120
119
|
),
|
|
121
120
|
visibility: hyp.domainVisibility,
|
|
122
|
-
time: hyp.level === "Constant" ? getTime(innerScope,
|
|
121
|
+
time: hyp.level === "Constant" ? getTime(innerScope, shiftExpr(1, domain)) : "Now",
|
|
123
122
|
location: hyp.location,
|
|
124
123
|
});
|
|
125
124
|
substitution = {
|
|
@@ -1,16 +1,20 @@
|
|
|
1
1
|
import type { Verdict } from "../verdict";
|
|
2
2
|
import { createSolver } from "./sat";
|
|
3
3
|
|
|
4
|
+
export type BinaryKind = "And" | "Or" | "Implies" | "Equiv" | "Until" | "Unless";
|
|
5
|
+
|
|
4
6
|
export type PtlFormula =
|
|
5
7
|
| { kind: "Atom"; name: string }
|
|
8
|
+
| { kind: "Constant"; value: boolean }
|
|
6
9
|
| { kind: "Not" | "Next" | "Always" | "Eventually"; body: PtlFormula }
|
|
7
|
-
| { kind:
|
|
10
|
+
| { kind: BinaryKind; left: PtlFormula; right: PtlFormula };
|
|
8
11
|
|
|
9
12
|
type Normal =
|
|
10
13
|
| { kind: "Constant"; value: boolean }
|
|
11
14
|
| { kind: "Literal"; atom: string; isPositive: boolean }
|
|
12
15
|
| { kind: "And" | "Or"; children: number[] }
|
|
13
|
-
| { kind: "Next" | "Always" | "Eventually"; body: number }
|
|
16
|
+
| { kind: "Next" | "Always" | "Eventually"; body: number }
|
|
17
|
+
| { kind: "Until" | "Unless"; left: number; right: number };
|
|
14
18
|
|
|
15
19
|
interface Step {
|
|
16
20
|
next: number[];
|
|
@@ -55,6 +59,8 @@ const createTable = () => {
|
|
|
55
59
|
if (normal.kind === "Constant" || (kind !== "Next" && normal.kind === kind)) return body;
|
|
56
60
|
return intern(`${kind}(${body})`, { kind, body });
|
|
57
61
|
};
|
|
62
|
+
const getUntil = (kind: "Until" | "Unless", left: number, right: number) =>
|
|
63
|
+
intern(`${kind}(${left},${right})`, { kind, left, right });
|
|
58
64
|
const memo = [new WeakMap<PtlFormula, number>(), new WeakMap<PtlFormula, number>()];
|
|
59
65
|
const normalize = (formula: PtlFormula, isNegated: boolean): number => {
|
|
60
66
|
const cache = memo[isNegated ? 1 : 0];
|
|
@@ -68,6 +74,8 @@ const createTable = () => {
|
|
|
68
74
|
atom: formula.name,
|
|
69
75
|
isPositive: !isNegated,
|
|
70
76
|
});
|
|
77
|
+
case "Constant":
|
|
78
|
+
return getConstant(formula.value !== isNegated);
|
|
71
79
|
case "Not":
|
|
72
80
|
return normalize(formula.body, !isNegated);
|
|
73
81
|
case "Next":
|
|
@@ -100,6 +108,15 @@ const createTable = () => {
|
|
|
100
108
|
normalize(formula.right, !isNegated),
|
|
101
109
|
]),
|
|
102
110
|
]);
|
|
111
|
+
case "Until":
|
|
112
|
+
case "Unless": {
|
|
113
|
+
// translate/fofunctions.ml#negate: ~(f until g) is ~g unless (~f & ~g), and dually.
|
|
114
|
+
const kind = (formula.kind === "Until") === isNegated ? "Unless" : "Until";
|
|
115
|
+
const right = normalize(formula.right, isNegated);
|
|
116
|
+
return isNegated
|
|
117
|
+
? getUntil(kind, right, getJunction("And", [normalize(formula.left, true), right]))
|
|
118
|
+
: getUntil(kind, normalize(formula.left, false), right);
|
|
119
|
+
}
|
|
103
120
|
}
|
|
104
121
|
})();
|
|
105
122
|
cache.set(formula, result);
|
|
@@ -166,6 +183,15 @@ const getSteps = (
|
|
|
166
183
|
clauses.push([-variable, body, next], [-next, body, getVariable(pendings, formula)]);
|
|
167
184
|
return variable;
|
|
168
185
|
}
|
|
186
|
+
case "Until":
|
|
187
|
+
case "Unless": {
|
|
188
|
+
const variable = createVariable();
|
|
189
|
+
const right = encode(normal.right);
|
|
190
|
+
const next = getVariable(nexts, formula);
|
|
191
|
+
clauses.push([-variable, right, encode(normal.left)], [-variable, right, next]);
|
|
192
|
+
if (normal.kind === "Until") clauses.push([-next, right, getVariable(pendings, formula)]);
|
|
193
|
+
return variable;
|
|
194
|
+
}
|
|
169
195
|
}
|
|
170
196
|
})();
|
|
171
197
|
literals.set(formula, literal);
|
|
@@ -0,0 +1,310 @@
|
|
|
1
|
+
// N_data.untyped_deps and N_axioms with disable_arithmetic, where integers are values of sort Idv
|
|
2
|
+
// that only these axioms describe.
|
|
3
|
+
|
|
4
|
+
import {
|
|
5
|
+
APPEND,
|
|
6
|
+
CAT,
|
|
7
|
+
declare,
|
|
8
|
+
FUN_APP,
|
|
9
|
+
FUN_DOM,
|
|
10
|
+
FUN_ISAFCN,
|
|
11
|
+
HEAD,
|
|
12
|
+
INT_LTEQ,
|
|
13
|
+
INT_MINUS,
|
|
14
|
+
INT_PLUS,
|
|
15
|
+
INT_RANGE,
|
|
16
|
+
INT_SET,
|
|
17
|
+
LEN,
|
|
18
|
+
MEM,
|
|
19
|
+
NAT_SET,
|
|
20
|
+
SEQ,
|
|
21
|
+
SUB_SEQ,
|
|
22
|
+
TAIL,
|
|
23
|
+
tla,
|
|
24
|
+
} from "./format";
|
|
25
|
+
import type { SymbolSpec } from "./data";
|
|
26
|
+
import { axiom, type Axiom } from "./table";
|
|
27
|
+
|
|
28
|
+
const ZERO = tla("IntLit_0");
|
|
29
|
+
const ONE = tla("IntLit_1");
|
|
30
|
+
|
|
31
|
+
const SEQUENCE_DEPS = ["Mem", "Seq", "Len", "FunApp", "IntSet", "NatSet", "IntPlus", "IntLteq"];
|
|
32
|
+
|
|
33
|
+
const getTyping = (name: string, operator: string, set: string) =>
|
|
34
|
+
axiom(
|
|
35
|
+
name,
|
|
36
|
+
[],
|
|
37
|
+
`(forall ((x Idv) (y Idv)) (! (=> (and (${MEM} x ${set}) (${MEM} y ${set})) (${MEM} (${operator} x y) ${set})) :pattern ((${operator} x y))))`,
|
|
38
|
+
);
|
|
39
|
+
|
|
40
|
+
export const getUntypedSpec = (name: string): SymbolSpec | undefined => {
|
|
41
|
+
const symbol = tla(name);
|
|
42
|
+
const fixed = (arity: number, deps: string[], axioms: Axiom[], sort = "Idv") => ({
|
|
43
|
+
declaration: declare(symbol, arity, sort),
|
|
44
|
+
deps,
|
|
45
|
+
axioms,
|
|
46
|
+
});
|
|
47
|
+
switch (name) {
|
|
48
|
+
case "NatSet":
|
|
49
|
+
return fixed(
|
|
50
|
+
0,
|
|
51
|
+
["IntSet", "IntLit_0", "IntLteq"],
|
|
52
|
+
[
|
|
53
|
+
axiom(
|
|
54
|
+
"NatSetDef",
|
|
55
|
+
[],
|
|
56
|
+
`(forall ((x Idv)) (! (= (${MEM} x ${NAT_SET}) (and (${MEM} x ${INT_SET}) (${INT_LTEQ} ${ZERO} x))) :pattern ((${MEM} x ${NAT_SET}))))`,
|
|
57
|
+
),
|
|
58
|
+
],
|
|
59
|
+
);
|
|
60
|
+
case "IntPlus":
|
|
61
|
+
case "IntTimes": {
|
|
62
|
+
const typing = name === "IntPlus" ? "Plus" : "Times";
|
|
63
|
+
return fixed(
|
|
64
|
+
2,
|
|
65
|
+
["Mem", "IntSet", "NatSet"],
|
|
66
|
+
[
|
|
67
|
+
getTyping(`Int${typing}Typing`, symbol, INT_SET),
|
|
68
|
+
getTyping(`Nat${typing}Typing`, symbol, NAT_SET),
|
|
69
|
+
],
|
|
70
|
+
);
|
|
71
|
+
}
|
|
72
|
+
case "IntMinus":
|
|
73
|
+
return fixed(2, ["Mem", "IntSet"], [getTyping("IntMinusTyping", symbol, INT_SET)]);
|
|
74
|
+
case "IntUminus":
|
|
75
|
+
return fixed(
|
|
76
|
+
1,
|
|
77
|
+
["Mem", "IntSet"],
|
|
78
|
+
[
|
|
79
|
+
axiom(
|
|
80
|
+
"IntUminusTyping",
|
|
81
|
+
[],
|
|
82
|
+
`(forall ((x Idv)) (! (=> (${MEM} x ${INT_SET}) (${MEM} (${symbol} x) ${INT_SET})) :pattern ((${symbol} x))))`,
|
|
83
|
+
),
|
|
84
|
+
],
|
|
85
|
+
);
|
|
86
|
+
case "IntQuotient":
|
|
87
|
+
case "IntRemainder": {
|
|
88
|
+
const isQuotient = name === "IntQuotient";
|
|
89
|
+
return fixed(
|
|
90
|
+
2,
|
|
91
|
+
isQuotient
|
|
92
|
+
? ["Mem", "IntSet", "NatSet", "IntLteq", "IntLit_0"]
|
|
93
|
+
: ["Mem", "IntSet", "NatSet", "IntLteq", "IntLit_0", "IntLit_1", "IntRange", "IntMinus"],
|
|
94
|
+
[
|
|
95
|
+
axiom(
|
|
96
|
+
`${name}Typing`,
|
|
97
|
+
[],
|
|
98
|
+
`(forall ((x Idv) (y Idv)) (! (=> (and (${MEM} x ${INT_SET}) (${MEM} y ${NAT_SET}) (${INT_LTEQ} ${ZERO} y)) (${MEM} (${symbol} x y) ${isQuotient ? NAT_SET : `(${INT_RANGE} ${ZERO} (${INT_MINUS} y ${ONE}))`})) :pattern ((${symbol} x y))))`,
|
|
99
|
+
),
|
|
100
|
+
],
|
|
101
|
+
);
|
|
102
|
+
}
|
|
103
|
+
case "IntExp":
|
|
104
|
+
return fixed(
|
|
105
|
+
2,
|
|
106
|
+
["Mem", "IntSet", "IntLteq", "IntLit_0", "IntLit_1"],
|
|
107
|
+
[
|
|
108
|
+
axiom(
|
|
109
|
+
"IntExpTyping",
|
|
110
|
+
[],
|
|
111
|
+
`(forall ((x Idv) (y Idv)) (! (=> (and (${MEM} x ${INT_SET}) (${MEM} y ${INT_SET}) (${INT_LTEQ} ${ZERO} y) (or (distinct x ${ZERO}) (${INT_LTEQ} ${ONE} y))) (${MEM} (${symbol} x y) ${INT_SET})) :pattern ((${symbol} x y))))`,
|
|
112
|
+
),
|
|
113
|
+
],
|
|
114
|
+
);
|
|
115
|
+
case "IntLteq":
|
|
116
|
+
return fixed(
|
|
117
|
+
2,
|
|
118
|
+
["Mem", "IntSet"],
|
|
119
|
+
[
|
|
120
|
+
axiom(
|
|
121
|
+
"LteqReflexive",
|
|
122
|
+
[],
|
|
123
|
+
`(forall ((x Idv)) (=> (${MEM} x ${INT_SET}) (${INT_LTEQ} x x)))`,
|
|
124
|
+
),
|
|
125
|
+
axiom(
|
|
126
|
+
"LteqTransitive",
|
|
127
|
+
[],
|
|
128
|
+
`(forall ((x Idv) (y Idv) (z Idv)) (=> (and (${MEM} x ${INT_SET}) (${MEM} y ${INT_SET}) (${MEM} z ${INT_SET}) (${INT_LTEQ} x y) (${INT_LTEQ} y z)) (${INT_LTEQ} x z)))`,
|
|
129
|
+
),
|
|
130
|
+
axiom(
|
|
131
|
+
"LteqAntisym",
|
|
132
|
+
[],
|
|
133
|
+
`(forall ((x Idv) (y Idv)) (=> (and (${MEM} x ${INT_SET}) (${MEM} y ${INT_SET}) (${INT_LTEQ} x y) (${INT_LTEQ} y x)) (= x y)))`,
|
|
134
|
+
),
|
|
135
|
+
],
|
|
136
|
+
"Bool",
|
|
137
|
+
);
|
|
138
|
+
// tlapm labels SeqSetElim1 and SeqSetElim2 SetSetElim1 and SetSetElim2.
|
|
139
|
+
case "Seq":
|
|
140
|
+
return fixed(
|
|
141
|
+
1,
|
|
142
|
+
[
|
|
143
|
+
"Mem",
|
|
144
|
+
"Len",
|
|
145
|
+
"FunIsafcn",
|
|
146
|
+
"FunDom",
|
|
147
|
+
"FunApp",
|
|
148
|
+
"IntSet",
|
|
149
|
+
"NatSet",
|
|
150
|
+
"IntRange",
|
|
151
|
+
"IntLteq",
|
|
152
|
+
"IntLit_1",
|
|
153
|
+
],
|
|
154
|
+
[
|
|
155
|
+
axiom(
|
|
156
|
+
"SeqSetIntro",
|
|
157
|
+
[],
|
|
158
|
+
`(forall ((a Idv) (s Idv)) (! (=> (and (${FUN_ISAFCN} s) (${MEM} (${LEN} s) ${NAT_SET}) (forall ((i Idv)) (= (${MEM} i (${FUN_DOM} s)) (and (${MEM} i ${INT_SET}) (${INT_LTEQ} ${ONE} i) (${INT_LTEQ} i (${LEN} s))))) (forall ((i Idv)) (=> (and (${MEM} i ${INT_SET}) (${INT_LTEQ} ${ONE} i) (${INT_LTEQ} i (${LEN} s))) (${MEM} (${FUN_APP} s i) a)))) (${MEM} s (${SEQ} a))) :pattern ((${MEM} s (${SEQ} a)))))`,
|
|
159
|
+
),
|
|
160
|
+
axiom(
|
|
161
|
+
"SeqSetElim1",
|
|
162
|
+
[],
|
|
163
|
+
`(forall ((a Idv) (s Idv)) (! (=> (${MEM} s (${SEQ} a)) (and (${FUN_ISAFCN} s) (${MEM} (${LEN} s) ${NAT_SET}) (= (${FUN_DOM} s) (${INT_RANGE} ${ONE} (${LEN} s))))) :pattern ((${MEM} s (${SEQ} a)))))`,
|
|
164
|
+
"SetSetElim1",
|
|
165
|
+
),
|
|
166
|
+
axiom(
|
|
167
|
+
"SeqSetElim2",
|
|
168
|
+
[],
|
|
169
|
+
`(forall ((a Idv) (s Idv) (i Idv)) (! (=> (and (${MEM} s (${SEQ} a)) (${MEM} i ${INT_SET}) (${INT_LTEQ} ${ONE} i) (${INT_LTEQ} i (${LEN} s))) (${MEM} (${FUN_APP} s i) a)) :pattern ((${MEM} s (${SEQ} a)) (${FUN_APP} s i))))`,
|
|
170
|
+
"SetSetElim2",
|
|
171
|
+
),
|
|
172
|
+
],
|
|
173
|
+
);
|
|
174
|
+
case "Len":
|
|
175
|
+
return fixed(
|
|
176
|
+
1,
|
|
177
|
+
["Mem", "FunDom", "IntRange", "NatSet", "IntLit_1"],
|
|
178
|
+
[
|
|
179
|
+
axiom(
|
|
180
|
+
"SeqLenDef",
|
|
181
|
+
[],
|
|
182
|
+
`(forall ((s Idv) (z Idv)) (=> (and (${MEM} z ${NAT_SET}) (= (${FUN_DOM} s) (${INT_RANGE} ${ONE} z))) (= (${LEN} s) z)))`,
|
|
183
|
+
),
|
|
184
|
+
],
|
|
185
|
+
);
|
|
186
|
+
case "Cat":
|
|
187
|
+
return fixed(
|
|
188
|
+
2,
|
|
189
|
+
[...SEQUENCE_DEPS, "IntLit_1"],
|
|
190
|
+
[
|
|
191
|
+
axiom(
|
|
192
|
+
"SeqCatTyping",
|
|
193
|
+
[],
|
|
194
|
+
`(forall ((a Idv) (s Idv) (t Idv)) (! (=> (and (${MEM} s (${SEQ} a)) (${MEM} t (${SEQ} a))) (${MEM} (${CAT} s t) (${SEQ} a))) :pattern ((${MEM} s (${SEQ} a)) (${CAT} s t)) :pattern ((${MEM} t (${SEQ} a)) (${CAT} s t))))`,
|
|
195
|
+
),
|
|
196
|
+
axiom(
|
|
197
|
+
"SeqCatLen",
|
|
198
|
+
[],
|
|
199
|
+
`(forall ((s Idv) (t Idv)) (! (=> (and (${MEM} (${LEN} s) ${NAT_SET}) (${MEM} (${LEN} t) ${NAT_SET})) (= (${LEN} (${CAT} s t)) (${INT_PLUS} (${LEN} s) (${LEN} t)))) :pattern ((${CAT} s t))))`,
|
|
200
|
+
),
|
|
201
|
+
axiom(
|
|
202
|
+
"SeqCatApp1",
|
|
203
|
+
[],
|
|
204
|
+
`(forall ((s Idv) (t Idv) (i Idv)) (! (=> (and (${MEM} (${LEN} s) ${NAT_SET}) (${MEM} (${LEN} t) ${NAT_SET}) (${MEM} i ${INT_SET}) (${INT_LTEQ} ${ONE} i) (${INT_LTEQ} i (${LEN} s))) (= (${FUN_APP} (${CAT} s t) i) (${FUN_APP} s i))) :pattern ((${FUN_APP} (${CAT} s t) i)) :pattern ((${CAT} s t) (${FUN_APP} s i))))`,
|
|
205
|
+
),
|
|
206
|
+
axiom(
|
|
207
|
+
"SeqCatApp2",
|
|
208
|
+
[],
|
|
209
|
+
`(forall ((s Idv) (t Idv) (i Idv)) (! (=> (and (${MEM} (${LEN} s) ${NAT_SET}) (${MEM} (${LEN} t) ${NAT_SET}) (${MEM} i ${INT_SET}) (${INT_LTEQ} i (${INT_PLUS} (${LEN} s) (${LEN} t))) (${INT_LTEQ} (${LEN} s) i) (distinct (${LEN} s) i)) (= (${FUN_APP} (${CAT} s t) i) (${FUN_APP} t (${INT_MINUS} i (${LEN} s))))) :pattern ((${FUN_APP} (${CAT} s t) i))))`,
|
|
210
|
+
),
|
|
211
|
+
],
|
|
212
|
+
);
|
|
213
|
+
case "Append":
|
|
214
|
+
return fixed(
|
|
215
|
+
2,
|
|
216
|
+
[...SEQUENCE_DEPS, "IntLit_1"],
|
|
217
|
+
[
|
|
218
|
+
axiom(
|
|
219
|
+
"SeqAppendTyping",
|
|
220
|
+
[],
|
|
221
|
+
`(forall ((a Idv) (s Idv) (x Idv)) (! (=> (and (${MEM} s (${SEQ} a)) (${MEM} x a)) (${MEM} (${APPEND} s x) (${SEQ} a))) :pattern ((${MEM} s (${SEQ} a)) (${APPEND} s x))))`,
|
|
222
|
+
),
|
|
223
|
+
axiom(
|
|
224
|
+
"SeqAppendLen",
|
|
225
|
+
[],
|
|
226
|
+
`(forall ((s Idv) (x Idv)) (! (=> (${MEM} (${LEN} s) ${NAT_SET}) (= (${LEN} (${APPEND} s x)) (${INT_PLUS} (${LEN} s) ${ONE}))) :pattern ((${APPEND} s x))))`,
|
|
227
|
+
),
|
|
228
|
+
axiom(
|
|
229
|
+
"SeqAppendApp1",
|
|
230
|
+
[],
|
|
231
|
+
`(forall ((s Idv) (x Idv) (i Idv)) (! (=> (and (${MEM} (${LEN} s) ${NAT_SET}) (${MEM} i ${INT_SET}) (${INT_LTEQ} ${ONE} i) (${INT_LTEQ} i (${LEN} s))) (= (${FUN_APP} (${APPEND} s x) i) (${FUN_APP} s i))) :pattern ((${FUN_APP} (${APPEND} s x) i)) :pattern ((${APPEND} s x) (${FUN_APP} s i))))`,
|
|
232
|
+
),
|
|
233
|
+
axiom(
|
|
234
|
+
"SeqAppendApp2",
|
|
235
|
+
[],
|
|
236
|
+
`(forall ((s Idv) (x Idv)) (! (=> (${MEM} (${LEN} s) ${NAT_SET}) (= (${FUN_APP} (${APPEND} s x) (${INT_PLUS} (${LEN} s) ${ONE})) x)) :pattern ((${APPEND} s x))))`,
|
|
237
|
+
),
|
|
238
|
+
],
|
|
239
|
+
);
|
|
240
|
+
case "Head":
|
|
241
|
+
return fixed(
|
|
242
|
+
1,
|
|
243
|
+
["FunApp", "IntLit_1"],
|
|
244
|
+
[
|
|
245
|
+
axiom(
|
|
246
|
+
"SeqHeadDef",
|
|
247
|
+
[],
|
|
248
|
+
`(forall ((s Idv)) (! (= (${HEAD} s) (${FUN_APP} s ${ONE})) :pattern ((${HEAD} s))))`,
|
|
249
|
+
),
|
|
250
|
+
],
|
|
251
|
+
);
|
|
252
|
+
case "Tail":
|
|
253
|
+
return fixed(
|
|
254
|
+
1,
|
|
255
|
+
[...SEQUENCE_DEPS, "IntMinus", "IntLit_0", "IntLit_1"],
|
|
256
|
+
[
|
|
257
|
+
axiom(
|
|
258
|
+
"SeqTailTyping",
|
|
259
|
+
[],
|
|
260
|
+
`(forall ((a Idv) (s Idv)) (! (=> (and (${MEM} s (${SEQ} a)) (distinct (${LEN} s) ${ZERO})) (${MEM} (${TAIL} s) (${SEQ} a))) :pattern ((${MEM} s (${SEQ} a)) (${TAIL} s))))`,
|
|
261
|
+
),
|
|
262
|
+
axiom(
|
|
263
|
+
"SeqTailLen",
|
|
264
|
+
[],
|
|
265
|
+
`(forall ((s Idv)) (! (=> (and (${MEM} (${LEN} s) ${NAT_SET}) (distinct (${LEN} s) ${ZERO})) (= (${LEN} (${TAIL} s)) (${INT_MINUS} (${LEN} s) ${ONE}))) :pattern ((${TAIL} s))))`,
|
|
266
|
+
),
|
|
267
|
+
axiom(
|
|
268
|
+
"SeqTailApp",
|
|
269
|
+
[],
|
|
270
|
+
`(forall ((s Idv) (i Idv)) (! (=> (and (${MEM} (${LEN} s) ${NAT_SET}) (distinct (${LEN} s) ${ZERO}) (${MEM} i ${INT_SET}) (${INT_LTEQ} ${ONE} i) (${INT_LTEQ} i (${INT_MINUS} (${LEN} s) ${ONE}))) (= (${FUN_APP} (${TAIL} s) i) (${FUN_APP} s (${INT_PLUS} i ${ONE})))) :pattern ((${FUN_APP} (${TAIL} s) i))))`,
|
|
271
|
+
),
|
|
272
|
+
],
|
|
273
|
+
);
|
|
274
|
+
case "SubSeq":
|
|
275
|
+
return fixed(
|
|
276
|
+
3,
|
|
277
|
+
[
|
|
278
|
+
"Mem",
|
|
279
|
+
"Seq",
|
|
280
|
+
"Len",
|
|
281
|
+
"FunApp",
|
|
282
|
+
"IntSet",
|
|
283
|
+
"IntPlus",
|
|
284
|
+
"IntMinus",
|
|
285
|
+
"IntLteq",
|
|
286
|
+
"IntLit_0",
|
|
287
|
+
"IntLit_1",
|
|
288
|
+
],
|
|
289
|
+
[
|
|
290
|
+
axiom(
|
|
291
|
+
"SeqSubseqTyping",
|
|
292
|
+
[],
|
|
293
|
+
`(forall ((a Idv) (s Idv) (x Idv) (y Idv)) (! (=> (or (and (${MEM} x ${INT_SET}) (${MEM} y ${INT_SET}) (${INT_LTEQ} y x) (distinct y x)) (and (${MEM} s (${SEQ} a)) (${MEM} x ${INT_SET}) (${MEM} y ${INT_SET}) (${INT_LTEQ} ${ONE} x) (${INT_LTEQ} y (${LEN} s)))) (${MEM} (${SUB_SEQ} s x y) (${SEQ} a))) :pattern ((${MEM} s (${SEQ} a)) (${SUB_SEQ} s x y))))`,
|
|
294
|
+
),
|
|
295
|
+
axiom(
|
|
296
|
+
"SeqSubseqLen",
|
|
297
|
+
[],
|
|
298
|
+
`(forall ((s Idv) (x Idv) (y Idv)) (! (=> (and (${MEM} x ${INT_SET}) (${MEM} y ${INT_SET})) (and (=> (${INT_LTEQ} x (${INT_PLUS} y ${ONE})) (= (${LEN} (${SUB_SEQ} s x y)) (${INT_MINUS} (${INT_PLUS} y ${ONE}) x))) (=> (not (${INT_LTEQ} x (${INT_PLUS} y ${ONE}))) (= (${LEN} (${SUB_SEQ} s x y)) ${ZERO})))) :pattern ((${SUB_SEQ} s x y))))`,
|
|
299
|
+
),
|
|
300
|
+
axiom(
|
|
301
|
+
"SeqSubseqApp",
|
|
302
|
+
[],
|
|
303
|
+
`(forall ((s Idv) (x Idv) (y Idv) (z Idv)) (! (=> (and (${MEM} x ${INT_SET}) (${MEM} y ${INT_SET}) (${MEM} z ${INT_SET}) (${INT_LTEQ} ${ONE} x) (${INT_LTEQ} ${ONE} z) (${INT_LTEQ} z (${INT_MINUS} (${INT_PLUS} y ${ONE}) x))) (= (${FUN_APP} (${SUB_SEQ} s x y) z) (${FUN_APP} s (${INT_MINUS} (${INT_PLUS} z x) ${ONE})))) :pattern ((${FUN_APP} (${SUB_SEQ} s x y) z))))`,
|
|
304
|
+
),
|
|
305
|
+
],
|
|
306
|
+
);
|
|
307
|
+
default:
|
|
308
|
+
return undefined;
|
|
309
|
+
}
|
|
310
|
+
};
|
package/src/prover/smt/axioms.ts
CHANGED
|
@@ -71,8 +71,12 @@ export const getEnumeration = (count: number) => {
|
|
|
71
71
|
return [intro, elim];
|
|
72
72
|
};
|
|
73
73
|
|
|
74
|
-
|
|
75
|
-
|
|
74
|
+
// Standardize writes a typed number as a cast and an untyped one as an IntLit.
|
|
75
|
+
export const getNumeral = (value: number, isArithmetic: boolean) =>
|
|
76
|
+
isArithmetic ? `(${CAST_INT} ${value})` : tla(`IntLit_${value}`);
|
|
77
|
+
|
|
78
|
+
export const getIntegers = (count: number, isArithmetic: boolean) =>
|
|
79
|
+
Array.from({ length: count }, (_value, index) => getNumeral(index + 1, isArithmetic));
|
|
76
80
|
|
|
77
81
|
export const getFieldKeys = (fields: string[]) => fields.map((field) => tla(`StrLit_${field}`));
|
|
78
82
|
|
|
@@ -94,8 +98,8 @@ const getComponentExcepts = (
|
|
|
94
98
|
});
|
|
95
99
|
};
|
|
96
100
|
|
|
97
|
-
export const getTupleExcepts = (count: number) =>
|
|
98
|
-
getComponentExcepts("Tup", [count], tla(`Tuple_${count}`), getIntegers(count));
|
|
101
|
+
export const getTupleExcepts = (count: number, isArithmetic: boolean) =>
|
|
102
|
+
getComponentExcepts("Tup", [count], tla(`Tuple_${count}`), getIntegers(count, isArithmetic));
|
|
99
103
|
|
|
100
104
|
export const getRecordExcepts = (fields: string[]) =>
|
|
101
105
|
getComponentExcepts("Rec", [fields], tla(`Record_${fields.join("_")}`), getFieldKeys(fields));
|
|
@@ -135,12 +139,12 @@ const getComponentFunction = (
|
|
|
135
139
|
];
|
|
136
140
|
};
|
|
137
141
|
|
|
138
|
-
export const getTupleAxioms = (count: number, isExcept: boolean) => {
|
|
142
|
+
export const getTupleAxioms = (count: number, isExcept: boolean, isArithmetic: boolean) => {
|
|
139
143
|
const symbol = tla(`Tuple_${count}`);
|
|
140
144
|
const elements = getNames("x", count);
|
|
141
145
|
const value = call(symbol, elements);
|
|
142
146
|
return [
|
|
143
|
-
...getComponentFunction("Tup", [count], symbol, getIntegers(count)),
|
|
147
|
+
...getComponentFunction("Tup", [count], symbol, getIntegers(count, isArithmetic)),
|
|
144
148
|
axiom(
|
|
145
149
|
"SeqTupTyping",
|
|
146
150
|
[count],
|
|
@@ -155,9 +159,9 @@ export const getTupleAxioms = (count: number, isExcept: boolean) => {
|
|
|
155
159
|
axiom(
|
|
156
160
|
"SeqTupLen",
|
|
157
161
|
[count],
|
|
158
|
-
forall(elements, `(= (${LEN} ${value})
|
|
162
|
+
forall(elements, `(= (${LEN} ${value}) ${getNumeral(count, isArithmetic)})`, [[value]]),
|
|
159
163
|
),
|
|
160
|
-
...(isExcept ? getTupleExcepts(count) : []),
|
|
164
|
+
...(isExcept ? getTupleExcepts(count, isArithmetic) : []),
|
|
161
165
|
];
|
|
162
166
|
};
|
|
163
167
|
|