tla-ts 0.0.9 → 0.0.10-dev.09e53c2a6
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 +30 -1
- package/dist/compile.cjs +23 -0
- package/dist/compile.js +23 -0
- package/dist/deciders.cjs +41 -37
- package/dist/deciders.js +57 -53
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +109 -10
- package/dist/index.d.ts +109 -10
- 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 +2746 -410
- package/dist/prove.js +2745 -409
- package/dist/run.cjs +146 -31
- package/dist/run.js +146 -31
- package/dist/tlapm.cjs +2 -2
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +132 -104
- package/dist/transfer.js +132 -104
- package/dist/worker.cjs +6 -6
- package/dist/worker.js +6 -6
- package/package.json +3 -1
- package/src/ast.ts +45 -59
- package/src/bags.ts +99 -102
- package/src/builtins.ts +28 -75
- package/src/bundled-modules.ts +1 -8
- package/src/check-failure.ts +116 -0
- package/src/check-trace.ts +282 -0
- package/src/check.ts +797 -782
- package/src/cli/options.ts +12 -32
- package/src/cli/run.ts +0 -2
- package/src/cli/runtime-invariants.ts +136 -0
- package/src/cli/shared.ts +19 -12
- package/src/cli/tlapm.ts +433 -82
- package/src/cli/tlc-arguments.ts +652 -0
- package/src/cli/tlc-output.ts +687 -0
- package/src/cli/tlc-usage.ts +360 -0
- package/src/cli/tlc.ts +323 -658
- package/src/cli/typescript.ts +23 -0
- package/src/cli/xml-exporter.ts +27 -49
- package/src/cli.ts +0 -1
- package/src/codegen.ts +196 -74
- package/src/config.ts +140 -109
- package/src/coverage.ts +830 -0
- package/src/dependencies.ts +36 -54
- package/src/dfid.ts +618 -0
- package/src/environment-config.ts +315 -0
- package/src/environment.ts +178 -339
- package/src/errors.ts +100 -57
- package/src/evaluate.ts +598 -340
- package/src/exit-codes.ts +38 -3
- package/src/fingerprints.ts +75 -11
- package/src/index.ts +3 -0
- package/src/instances.ts +126 -21
- package/src/java-hash.ts +7 -0
- package/src/java-overrides.ts +4 -19
- package/src/json-reader.ts +455 -0
- package/src/json.ts +252 -139
- package/src/levels.ts +46 -58
- package/src/lexer.ts +83 -101
- package/src/liveness-checker.ts +590 -311
- package/src/liveness.ts +180 -124
- package/src/obligations/action.ts +17 -44
- package/src/obligations/anonymize.ts +120 -95
- package/src/obligations/enabled-axioms.ts +218 -0
- package/src/obligations/equality.ts +1 -3
- package/src/obligations/expression.ts +37 -26
- package/src/obligations/format.ts +0 -10
- package/src/obligations/generate.ts +66 -64
- package/src/obligations/index.ts +38 -19
- package/src/obligations/levels.ts +27 -18
- package/src/obligations/module.ts +28 -55
- package/src/obligations/normalize.ts +30 -37
- package/src/obligations/operators.ts +0 -3
- package/src/obligations/pragma.ts +52 -24
- package/src/obligations/printer.ts +89 -58
- package/src/obligations/proof.ts +3 -6
- package/src/obligations/regroup.ts +0 -5
- package/src/obligations/simplify.ts +57 -63
- package/src/obligations/source.ts +119 -95
- package/src/obligations/subexpression.ts +49 -28
- package/src/obligations/substitution.ts +1 -5
- package/src/obligations/temporal.ts +12 -20
- package/src/obligations/tuples.ts +2 -10
- package/src/parallel-worker.ts +30 -60
- package/src/parallel.ts +59 -73
- package/src/parser.ts +1082 -399
- package/src/pcal/ast.ts +53 -86
- package/src/pcal/parse.ts +144 -219
- package/src/pcal/tokenize.ts +91 -131
- package/src/pcal/translate.ts +83 -130
- package/src/pcal/validate.ts +48 -68
- package/src/pretty-print.ts +7 -8
- package/src/prover/decide-pool.ts +8 -13
- package/src/prover/deciders.ts +12 -13
- package/src/prover/first-order.ts +0 -11
- package/src/prover/isabelle/decide.ts +3 -31
- package/src/prover/isabelle/encode.ts +82 -64
- 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 +262 -117
- package/src/prover/isabelle/isar/method.ts +510 -226
- package/src/prover/isabelle/isar/proof.ts +570 -23
- package/src/prover/isabelle/isar/rule-cases.ts +224 -0
- package/src/prover/isabelle/isar/theory.ts +488 -88
- package/src/prover/isabelle/isar/toplevel.ts +331 -0
- package/src/prover/isabelle/isar/type-check.ts +99 -38
- package/src/prover/isabelle/provers/blast/blast.ts +16 -105
- package/src/prover/isabelle/provers/blast/branch.ts +0 -33
- package/src/prover/isabelle/provers/blast/prove.ts +0 -36
- package/src/prover/isabelle/provers/blast/rules.ts +5 -45
- package/src/prover/isabelle/provers/blast/state.ts +1 -29
- package/src/prover/isabelle/provers/blast/term.ts +8 -37
- package/src/prover/isabelle/provers/clasimp.ts +0 -14
- package/src/prover/isabelle/provers/classical.ts +58 -61
- package/src/prover/isabelle/provers/hypsubst.ts +27 -52
- package/src/prover/isabelle/pure/bicompose.ts +24 -39
- package/src/prover/isabelle/pure/consts.ts +0 -8
- package/src/prover/isabelle/pure/conv.ts +2 -18
- package/src/prover/isabelle/pure/drule.ts +95 -45
- package/src/prover/isabelle/pure/envir.ts +2 -53
- package/src/prover/isabelle/pure/goal.ts +1 -9
- package/src/prover/isabelle/pure/interrupt.ts +0 -5
- package/src/prover/isabelle/pure/list.ts +0 -3
- package/src/prover/isabelle/pure/logic.ts +1 -16
- package/src/prover/isabelle/pure/name.ts +1 -10
- package/src/prover/isabelle/pure/net.ts +2 -60
- package/src/prover/isabelle/pure/object-logic.ts +15 -16
- package/src/prover/isabelle/pure/pattern.ts +1 -20
- package/src/prover/isabelle/pure/raw-simplifier.ts +16 -63
- package/src/prover/isabelle/pure/rewriter.ts +31 -74
- package/src/prover/isabelle/pure/search.ts +2 -11
- package/src/prover/isabelle/pure/seq.ts +0 -11
- package/src/prover/isabelle/pure/simplifier.ts +27 -16
- package/src/prover/isabelle/pure/table.ts +2 -33
- package/src/prover/isabelle/pure/tactic.ts +11 -23
- package/src/prover/isabelle/pure/tactical.ts +47 -48
- package/src/prover/isabelle/pure/term-ord.ts +1 -7
- package/src/prover/isabelle/pure/term.ts +1 -44
- package/src/prover/isabelle/pure/thm.ts +26 -48
- package/src/prover/isabelle/pure/type.ts +1 -16
- package/src/prover/isabelle/pure/unify.ts +19 -31
- package/src/prover/isabelle/pure/variable.ts +2 -8
- package/src/prover/isabelle/tla/classical-setup.ts +17 -25
- package/src/prover/isabelle/tla/context.ts +65 -26
- package/src/prover/isabelle/tla/logic-data.ts +1 -1
- package/src/prover/isabelle/tla/logic.ts +53 -32
- package/src/prover/isabelle/tla/simpdata.ts +45 -44
- package/src/prover/isabelle/tools/intuitionistic.ts +28 -21
- package/src/prover/ocaml.ts +4 -7
- package/src/prover/prep/action.ts +33 -66
- package/src/prover/prep/enabled-axioms.ts +22 -20
- package/src/prover/prep/fingerprint.ts +2 -21
- package/src/prover/prep/level-comparison.ts +8 -12
- package/src/prover/prep/md5.ts +0 -2
- package/src/prover/prep/methods.ts +189 -86
- package/src/prover/prep/normalize.ts +42 -37
- package/src/prover/prove-worker.ts +0 -2
- package/src/prover/prove.ts +398 -133
- package/src/prover/ptl/decide.ts +96 -56
- package/src/prover/ptl/encode.ts +15 -38
- package/src/prover/ptl/sat.ts +24 -32
- package/src/prover/ptl/tableau.ts +40 -28
- package/src/prover/smt/arithmetic.ts +310 -0
- package/src/prover/smt/axioms.ts +12 -15
- package/src/prover/smt/context.ts +60 -32
- package/src/prover/smt/data.ts +517 -401
- package/src/prover/smt/encode.ts +155 -85
- package/src/prover/smt/extensionality.ts +5 -13
- package/src/prover/smt/flatten.ts +7 -28
- package/src/prover/smt/format.ts +33 -14
- package/src/prover/smt/instances.ts +7 -11
- package/src/prover/smt/layout.ts +91 -0
- package/src/prover/smt/rewrite.ts +1026 -658
- 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 -16
- 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 +615 -53
- 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/array.ts +1 -3
- package/src/prover/smt/solver/asserted-formulas.ts +87 -58
- package/src/prover/smt/solver/ast-lt.ts +166 -22
- package/src/prover/smt/solver/ast-util.ts +160 -7
- package/src/prover/smt/solver/ast.ts +1424 -180
- package/src/prover/smt/solver/auf-solver.ts +7 -44
- 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 -10
- package/src/prover/smt/solver/cg-table.ts +39 -42
- package/src/prover/smt/solver/check-logic.ts +330 -0
- package/src/prover/smt/solver/clause.ts +0 -27
- package/src/prover/smt/solver/cofactor-elim-term-ite.ts +278 -0
- package/src/prover/smt/solver/conflict-resolution.ts +78 -11
- package/src/prover/smt/solver/context.ts +519 -175
- package/src/prover/smt/solver/ctx-simplify.ts +33 -50
- 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 +39 -30
- 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 -11
- package/src/prover/smt/solver/e-matching.ts +9 -41
- 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 -23
- 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 +907 -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 -5
- package/src/prover/smt/solver/expr-safe-replace.ts +26 -7
- 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 -26
- package/src/prover/smt/solver/fix-dl-var.ts +148 -0
- package/src/prover/smt/solver/flat-literals.ts +0 -9
- 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 +176 -28
- 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 -9
- package/src/prover/smt/solver/hashtable.ts +26 -23
- 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 +112 -132
- package/src/prover/smt/solver/lackr.ts +381 -0
- package/src/prover/smt/solver/lbool.ts +0 -2
- 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 -4
- package/src/prover/smt/solver/logic-tactics.ts +345 -0
- package/src/prover/smt/solver/lp/bound-propagator.ts +7 -26
- package/src/prover/smt/solver/lp/constraints.ts +1 -8
- package/src/prover/smt/solver/lp/containers.ts +11 -30
- package/src/prover/smt/solver/lp/core-solver.ts +23 -29
- package/src/prover/smt/solver/lp/cross-nested.ts +5 -20
- package/src/prover/smt/solver/lp/dep-intervals.ts +6 -24
- package/src/prover/smt/solver/lp/dependency.ts +0 -5
- package/src/prover/smt/solver/lp/dioph-eq.ts +8 -103
- package/src/prover/smt/solver/lp/explanation.ts +0 -6
- package/src/prover/smt/solver/lp/gomory.ts +8 -22
- package/src/prover/smt/solver/lp/hnf-cutter.ts +16 -23
- package/src/prover/smt/solver/lp/hnf.ts +10 -28
- package/src/prover/smt/solver/lp/int-cube.ts +17 -39
- package/src/prover/smt/solver/lp/int-solver.ts +3 -35
- package/src/prover/smt/solver/lp/lar-solver.ts +69 -82
- package/src/prover/smt/solver/lp/lar-term.ts +0 -5
- package/src/prover/smt/solver/lp/lp-settings.ts +0 -14
- package/src/prover/smt/solver/lp/maximize-term.ts +76 -52
- package/src/prover/smt/solver/lp/nex-creator.ts +4 -28
- package/src/prover/smt/solver/lp/nex.ts +0 -6
- package/src/prover/smt/solver/lp/nla-backoff.ts +0 -5
- package/src/prover/smt/solver/lp/nla-basics.ts +48 -30
- package/src/prover/smt/solver/lp/nla-core.ts +91 -135
- package/src/prover/smt/solver/lp/nla-divisions.ts +31 -43
- package/src/prover/smt/solver/lp/nla-emonics.ts +3 -21
- package/src/prover/smt/solver/lp/nla-factorization.ts +0 -4
- package/src/prover/smt/solver/lp/nla-grobner.ts +22 -72
- package/src/prover/smt/solver/lp/nla-horner.ts +2 -12
- package/src/prover/smt/solver/lp/nla-intervals.ts +1 -12
- package/src/prover/smt/solver/lp/nla-monomial-bounds.ts +15 -42
- package/src/prover/smt/solver/lp/nla-monotone.ts +1 -6
- package/src/prover/smt/solver/lp/nla-order.ts +0 -13
- package/src/prover/smt/solver/lp/nla-patcher.ts +3 -7
- package/src/prover/smt/solver/lp/nla-powers.ts +220 -0
- package/src/prover/smt/solver/lp/nla-tangents.ts +0 -10
- package/src/prover/smt/solver/lp/nla-throttle.ts +0 -6
- package/src/prover/smt/solver/lp/nla-transcendentals.ts +324 -0
- package/src/prover/smt/solver/lp/nla-types.ts +0 -12
- package/src/prover/smt/solver/lp/nla-var-eqs.ts +4 -26
- package/src/prover/smt/solver/lp/nra-solver.ts +123 -112
- package/src/prover/smt/solver/lp/numeric-pair.ts +0 -4
- package/src/prover/smt/solver/lp/pdd-interval.ts +0 -3
- package/src/prover/smt/solver/lp/pdd-simplifier.ts +1 -14
- package/src/prover/smt/solver/lp/pdd-solver.ts +2 -33
- package/src/prover/smt/solver/lp/pdd.ts +7 -70
- package/src/prover/smt/solver/lp/random-updater.ts +0 -9
- package/src/prover/smt/solver/lp/static-matrix.ts +8 -19
- package/src/prover/smt/solver/lp/union-find.ts +5 -5
- package/src/prover/smt/solver/macro-finder.ts +530 -0
- package/src/prover/smt/solver/mam-compiler.ts +129 -139
- package/src/prover/smt/solver/mam-interpreter.ts +0 -21
- 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 -21
- 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 +19 -62
- package/src/prover/smt/solver/model-evaluator.ts +190 -40
- package/src/prover/smt/solver/model-finder.ts +14 -32
- package/src/prover/smt/solver/model-generator.ts +56 -40
- package/src/prover/smt/solver/model-macro-solver.ts +60 -114
- 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 +177 -160
- package/src/prover/smt/solver/nlsat/atoms.ts +24 -24
- package/src/prover/smt/solver/nlsat/evaluator.ts +16 -22
- package/src/prover/smt/solver/nlsat/explain.ts +65 -69
- package/src/prover/smt/solver/nlsat/interval-set.ts +9 -51
- package/src/prover/smt/solver/nlsat/levelwise.ts +48 -135
- package/src/prover/smt/solver/nlsat/mpbq.ts +47 -14
- package/src/prover/smt/solver/nlsat/polynomial.ts +29 -161
- package/src/prover/smt/solver/nlsat/solver.ts +241 -110
- 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 -9
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +1 -47
- package/src/prover/smt/solver/nlsat/upolynomial.ts +10 -93
- package/src/prover/smt/solver/nlsat-tactic.ts +82 -0
- package/src/prover/smt/solver/nnf.ts +107 -60
- 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 +21 -26
- 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 +204 -79
- package/src/prover/smt/solver/probes.ts +512 -0
- package/src/prover/smt/solver/propagate-values.ts +37 -30
- package/src/prover/smt/solver/proto-model.ts +650 -66
- package/src/prover/smt/solver/pull-quant.ts +28 -23
- 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 -31
- package/src/prover/smt/solver/qe-lite-fm.ts +4 -28
- package/src/prover/smt/solver/qe-lite.ts +39 -49
- 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 -16
- 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 +17 -74
- package/src/prover/smt/solver/quantifier-analyzer.ts +26 -47
- package/src/prover/smt/solver/quantifier-manager.ts +8 -23
- package/src/prover/smt/solver/quasi-macros.ts +243 -0
- package/src/prover/smt/solver/random-gen.ts +0 -2
- package/src/prover/smt/solver/rational.ts +45 -8
- 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 -6
- package/src/prover/smt/solver/relevancy.ts +2 -16
- package/src/prover/smt/solver/rewriter-tpl.ts +52 -129
- package/src/prover/smt/solver/rewriter.ts +477 -120
- package/src/prover/smt/solver/rlimit.ts +39 -21
- 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 +1301 -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 +3140 -365
- 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 +119 -39
- package/src/prover/smt/solver/sort.ts +1 -5
- package/src/prover/smt/solver/static-features.ts +314 -0
- package/src/prover/smt/solver/sticky-generations.ts +0 -6
- 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 +55 -25
- package/src/prover/smt/solver/theory-lra-bounds.ts +31 -11
- package/src/prover/smt/solver/theory-lra-final-check.ts +59 -91
- package/src/prover/smt/solver/theory-lra-internalize.ts +94 -53
- package/src/prover/smt/solver/theory-lra-model.ts +23 -53
- package/src/prover/smt/solver/theory-lra-propagate.ts +24 -40
- package/src/prover/smt/solver/theory-lra-state.ts +6 -27
- package/src/prover/smt/solver/theory-lra.ts +188 -8
- 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 +37 -39
- package/src/prover/smt/table.ts +3 -10
- package/src/prover/smt/types.ts +146 -0
- package/src/prover/tlapm/cache.ts +67 -41
- package/src/prover/tlapm/ocaml-marshal.ts +19 -21
- package/src/prover/tlapm/tlapm.ts +21 -20
- package/src/prover/tlapm-library.ts +3208 -0
- package/src/prover/verdict.ts +9 -2
- package/src/prover/zenon/check/check.ts +1 -11
- package/src/prover/zenon/check/definitions.ts +5 -15
- package/src/prover/zenon/check/equality.ts +0 -8
- package/src/prover/zenon/check/functions.ts +0 -4
- package/src/prover/zenon/check/keys.ts +0 -7
- package/src/prover/zenon/check/propositional.ts +0 -3
- package/src/prover/zenon/check/records.ts +1 -6
- package/src/prover/zenon/check/relations.ts +2 -14
- package/src/prover/zenon/check/rewrites.ts +2 -21
- package/src/prover/zenon/check/sets.ts +40 -61
- package/src/prover/zenon/check/terms.ts +1 -19
- package/src/prover/zenon/check/tla.ts +0 -6
- package/src/prover/zenon/decide.ts +10 -19
- package/src/prover/zenon/encode.ts +0 -9
- package/src/prover/zenon/eqrel.ts +2 -15
- package/src/prover/zenon/equality-rules.ts +0 -6
- package/src/prover/zenon/expr.ts +8 -28
- package/src/prover/zenon/index-table.ts +26 -59
- package/src/prover/zenon/isar-case.ts +8 -20
- package/src/prover/zenon/isar.ts +35 -65
- package/src/prover/zenon/limits.ts +0 -4
- package/src/prover/zenon/llproof.ts +2 -22
- package/src/prover/zenon/mltoll.ts +66 -106
- package/src/prover/zenon/node.ts +20 -15
- package/src/prover/zenon/ocaml.ts +1 -17
- package/src/prover/zenon/parse.ts +9 -13
- package/src/prover/zenon/phrase.ts +1 -13
- package/src/prover/zenon/proof.ts +0 -11
- package/src/prover/zenon/propositional-rules.ts +0 -7
- package/src/prover/zenon/rules.ts +2 -8
- package/src/prover/zenon/search.ts +11 -35
- package/src/prover/zenon/tla/functions.ts +59 -33
- package/src/prover/zenon/tla/llproof.ts +67 -78
- package/src/prover/zenon/tla/records.ts +57 -35
- package/src/prover/zenon/tla/rewrites.ts +12 -21
- package/src/prover/zenon/tla/sets.ts +88 -59
- package/src/prover/zenon/tla/terms.ts +0 -8
- package/src/prover/zenon/tla/tla.ts +66 -66
- package/src/randomization.ts +81 -35
- package/src/resolve.ts +67 -185
- package/src/runtime.ts +26 -22
- package/src/sany/builtins.ts +2 -5
- 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 +191 -2764
- package/src/sany/levels.ts +5 -35
- package/src/sany/lexer.ts +58 -77
- package/src/sany/linter.ts +0 -10
- package/src/sany/modules.ts +1 -5
- package/src/sany/nodes.ts +5 -43
- package/src/sany/parse-error.ts +39 -117
- package/src/sany/report.ts +32 -69
- package/src/sany/selectors.ts +49 -76
- package/src/sany/source.ts +1 -17
- package/src/sany/xml.ts +35 -117
- package/src/search.ts +671 -169
- package/src/simulate.ts +712 -0
- package/src/spec-description.ts +192 -100
- package/src/standard-definitions.ts +4 -4
- package/src/standard-modules.ts +264 -95
- package/src/state-graph.ts +52 -33
- package/src/subexpressions.ts +69 -52
- package/src/substitution-levels.ts +7 -7
- package/src/successors.ts +267 -100
- package/src/symmetry.ts +35 -27
- package/src/tableau.ts +29 -26
- package/src/tlc/fingerprint.ts +267 -79
- package/src/tlc/jar-data.ts +112 -6
- package/src/tlc/messages.ts +125 -54
- package/src/tlc/order.ts +39 -69
- package/src/tlc/random.ts +37 -49
- package/src/tlc/replay.ts +553 -228
- package/src/tlc/summary.ts +64 -60
- package/src/tlc/tlc-operators.ts +78 -44
- package/src/tlc/tlcext-operators.ts +171 -122
- package/src/tlc/trace-spec.ts +249 -0
- package/src/tlc/value-stream.ts +139 -0
- package/src/tlc/version.ts +1 -4
- package/src/transfer.ts +22 -25
- package/src/typed-tier.ts +6535 -0
- package/src/typescript/actions.ts +479 -0
- package/src/typescript/collections.ts +614 -0
- package/src/typescript/compile.ts +63 -0
- package/src/typescript/context.ts +94 -0
- package/src/typescript/emit.ts +121 -0
- package/src/typescript/expressions.ts +496 -0
- package/src/typescript/formula.ts +154 -0
- package/src/typescript/functions.ts +284 -0
- package/src/typescript/model.ts +162 -0
- package/src/typescript/names.ts +114 -0
- package/src/typescript/program.ts +48 -0
- package/src/typescript/properties.ts +139 -0
- package/src/typescript/scope.ts +112 -0
- package/src/typescript/steps.ts +167 -0
- package/src/typescript/types.ts +171 -0
- package/src/values.ts +832 -484
- package/src/worker.ts +7 -8
- package/src/prover/isabelle/isar/statement.ts +0 -57
- 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/smt/encode.ts
CHANGED
|
@@ -1,7 +1,3 @@
|
|
|
1
|
-
// Encodes a prepared proof obligation in SMT-LIB as tlapm's SMT backend does (encode/ and
|
|
2
|
-
// backend/smtlib.ml): TLA+ values share one sort Idv, set membership is the predicate TLA__Mem,
|
|
3
|
-
// and each symbol the obligation uses brings the symbols and axioms encode/n_data.ml lists for it.
|
|
4
|
-
|
|
5
1
|
import {
|
|
6
2
|
applyBuiltin,
|
|
7
3
|
at,
|
|
@@ -12,10 +8,27 @@ import {
|
|
|
12
8
|
} from "../../obligations/expression";
|
|
13
9
|
import { compareStrings } from "../ocaml";
|
|
14
10
|
import { createPrinter } from "./context";
|
|
11
|
+
import { simplifySets } from "./simplify";
|
|
12
|
+
import { layOutCommand } from "./layout";
|
|
15
13
|
import { getSymbolSpec, type CollectState, type SymbolSpec } from "./data";
|
|
16
14
|
import type { Entry } from "./flatten";
|
|
17
|
-
import { declare, getTlaName,
|
|
18
|
-
import {
|
|
15
|
+
import { declare, getTlaName, NATIVE_OPERATORS, replaceTokens } from "./format";
|
|
16
|
+
import { getSort } from "./types";
|
|
17
|
+
import {
|
|
18
|
+
createEncoder,
|
|
19
|
+
declareConstant,
|
|
20
|
+
encodeBool,
|
|
21
|
+
getEntries,
|
|
22
|
+
getUniqueName,
|
|
23
|
+
push,
|
|
24
|
+
searchDeclarationType,
|
|
25
|
+
type Binding,
|
|
26
|
+
type Encoder,
|
|
27
|
+
type EncodingSession,
|
|
28
|
+
type Env,
|
|
29
|
+
type Mode,
|
|
30
|
+
type SmtEncoding,
|
|
31
|
+
} from "./rewrite";
|
|
19
32
|
import { compareAxioms, getAxiomKey, type Axiom } from "./table";
|
|
20
33
|
|
|
21
34
|
type RecordExpr = Extract<Expr, { kind: "Record" }>;
|
|
@@ -25,7 +38,6 @@ const isSameFieldSet = (left: RecordExpr, right: RecordExpr) =>
|
|
|
25
38
|
left.fields.every((field) => right.fields.some((other) => other.name === field.name)) &&
|
|
26
39
|
right.fields.every((field) => left.fields.some((other) => other.name === field.name));
|
|
27
40
|
|
|
28
|
-
// mk_conj: e1 /\ (e2 /\ ...).
|
|
29
41
|
const conjoinRight = (items: Expr[]): Expr =>
|
|
30
42
|
items.length === 1
|
|
31
43
|
? items[0]
|
|
@@ -45,8 +57,6 @@ const decompose = (left: Expr, right: Expr, from: Expr): Expr => {
|
|
|
45
57
|
);
|
|
46
58
|
};
|
|
47
59
|
|
|
48
|
-
// N_rewrite.simpl_receq, before Type.Synthesize: an equality of two record constructors with the same fields is the conjunction of
|
|
49
|
-
// the equalities of their fields, paired by name.
|
|
50
60
|
const simplifyRecordEqualities = (expression: Expr): Expr => {
|
|
51
61
|
const inner = mapChildren(expression, simplifyRecordEqualities);
|
|
52
62
|
if (
|
|
@@ -61,8 +71,7 @@ const simplifyRecordEqualities = (expression: Expr): Expr => {
|
|
|
61
71
|
return at(decompose(inner.args[0], inner.args[1], inner), inner);
|
|
62
72
|
};
|
|
63
73
|
|
|
64
|
-
//
|
|
65
|
-
// field values, so a record inside a record keeps the order it's written in.
|
|
74
|
+
// tlapm doesn't visit the field values, so a record inside a record keeps its written order.
|
|
66
75
|
const sortRecordFields = (expression: Expr): Expr =>
|
|
67
76
|
expression.kind === "Record" || expression.kind === "Rect"
|
|
68
77
|
? {
|
|
@@ -71,12 +80,13 @@ const sortRecordFields = (expression: Expr): Expr =>
|
|
|
71
80
|
}
|
|
72
81
|
: mapChildren(expression, sortRecordFields);
|
|
73
82
|
|
|
74
|
-
// N_axiomatize.collect: each symbol the obligation uses, in the order tlapm visits them, brings
|
|
75
|
-
// the symbols and axioms it depends on, smallest name first.
|
|
76
83
|
const collectSymbols = (entries: Entry[], encoder: Encoder) => {
|
|
77
84
|
const state: CollectState = {
|
|
85
|
+
encoding: encoder.encoding,
|
|
78
86
|
recordFields: encoder.recordFields,
|
|
87
|
+
setTypes: encoder.setTypes,
|
|
79
88
|
strings: [],
|
|
89
|
+
integers: [],
|
|
80
90
|
isFunConstr: false,
|
|
81
91
|
isFunSet: false,
|
|
82
92
|
isExcept: false,
|
|
@@ -98,8 +108,6 @@ const collectSymbols = (entries: Entry[], encoder: Encoder) => {
|
|
|
98
108
|
spec.axioms.forEach((entry) => axioms.set(getAxiomKey(entry), entry));
|
|
99
109
|
}
|
|
100
110
|
};
|
|
101
|
-
// A flattened symbol stands for a builtin applied to its first-order arguments and then its
|
|
102
|
-
// higher-order ones, so its higher-order text is visited after its arguments.
|
|
103
111
|
const visit = (text: string) => {
|
|
104
112
|
const tokens = text.match(/[()]|[^\s()]+/g) ?? [];
|
|
105
113
|
const pending: { depth: number; text: string }[] = [];
|
|
@@ -109,7 +117,7 @@ const collectSymbols = (entries: Entry[], encoder: Encoder) => {
|
|
|
109
117
|
if (pending.at(-1)?.depth === depth) visit(pending.pop()?.text ?? "");
|
|
110
118
|
return depth - 1;
|
|
111
119
|
}
|
|
112
|
-
const flat = encoder.flattened.get(token);
|
|
120
|
+
const flat = encoder.flattener.flattened.get(token);
|
|
113
121
|
if (!flat) {
|
|
114
122
|
const builtin = getTlaName(token);
|
|
115
123
|
if (builtin !== undefined) add(builtin);
|
|
@@ -128,16 +136,12 @@ const collectSymbols = (entries: Entry[], encoder: Encoder) => {
|
|
|
128
136
|
return { symbols, axioms };
|
|
129
137
|
};
|
|
130
138
|
|
|
131
|
-
type Encoder = ReturnType<typeof createEncoder>;
|
|
132
|
-
|
|
133
139
|
const HYPOTHESIS: Mode = { isOmitted: false, polarity: "Negative", at: undefined, depth: 0 };
|
|
134
140
|
|
|
135
|
-
// Prep.expand_defs substitutes visible definitions and pragmas, so they declare nothing.
|
|
136
141
|
const isExpanded = (hyp: Extract<Hyp, { kind: "Defn" }>) =>
|
|
137
142
|
hyp.definition.kind === "Bpragma" ||
|
|
138
143
|
(hyp.definition.kind === "Operator" && hyp.visibility === "Visible");
|
|
139
144
|
|
|
140
|
-
// Smtlib.is_sndord_fact: an ASSUME that declares an operator, which tlapm leaves out.
|
|
141
145
|
const isSecondOrder = (expression: Expr) =>
|
|
142
146
|
expression.kind === "Sequent" &&
|
|
143
147
|
expression.sequent.context.some((hyp) => hyp.kind === "Fresh" && hyp.shape > 0);
|
|
@@ -147,74 +151,114 @@ interface EncodedContext {
|
|
|
147
151
|
entries: Entry[];
|
|
148
152
|
}
|
|
149
153
|
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
env: encoder.push(state.env, binding),
|
|
154
|
+
const encodeContext = (sequent: Sequent, encoder: Encoder) =>
|
|
155
|
+
sequent.context.reduce<EncodedContext>(
|
|
156
|
+
(state, hyp, index) => {
|
|
157
|
+
const extend = (binding: Binding, entries: Entry[] = []) => ({
|
|
158
|
+
env: push(state.env, binding),
|
|
156
159
|
entries: [...state.entries, ...entries],
|
|
157
160
|
});
|
|
161
|
+
const rest: Expr = {
|
|
162
|
+
kind: "Sequent",
|
|
163
|
+
sequent: { context: sequent.context.slice(index + 1), active: sequent.active },
|
|
164
|
+
};
|
|
158
165
|
switch (hyp.kind) {
|
|
159
166
|
case "Fresh": {
|
|
160
|
-
const symbol =
|
|
161
|
-
|
|
162
|
-
hyp.shape
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
const
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
167
|
+
const symbol = getUniqueName(encoder, hyp.name);
|
|
168
|
+
if (hyp.shape > 0)
|
|
169
|
+
return extend({ kind: "operator", symbol, arity: hyp.shape }, [
|
|
170
|
+
declare(symbol, hyp.shape),
|
|
171
|
+
]);
|
|
172
|
+
const declared = declareConstant(
|
|
173
|
+
encoder,
|
|
174
|
+
hyp,
|
|
175
|
+
hyp.domainVisibility === "Visible" ? hyp.domain : undefined,
|
|
176
|
+
rest.sequent,
|
|
177
|
+
state.env,
|
|
178
|
+
HYPOTHESIS,
|
|
179
|
+
);
|
|
180
|
+
const binding: Binding = { kind: "constant", symbol, type: declared.type };
|
|
181
|
+
const declaration = declare(symbol, 0, getSort(declared.type));
|
|
182
|
+
const guard = declared.getGuard(symbol);
|
|
183
|
+
if (guard === undefined) return extend(binding, [declaration]);
|
|
184
|
+
return extend(binding, [declaration, ...getEntries(encoder, `(assert ${guard})`)]);
|
|
170
185
|
}
|
|
171
|
-
// Rewrite.elim_flex
|
|
186
|
+
// Rewrite.elim_flex declares a variable and then its primed copy, so the hypotheses after
|
|
187
|
+
// it type both.
|
|
172
188
|
case "Flex": {
|
|
173
|
-
const symbol =
|
|
174
|
-
const primed =
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
189
|
+
const symbol = getUniqueName(encoder, hyp.name);
|
|
190
|
+
const primed = getUniqueName(encoder, `${hyp.name}_prime`);
|
|
191
|
+
const type = searchDeclarationType(encoder, rest, true, state.env, HYPOTHESIS);
|
|
192
|
+
const variable: Binding = { kind: "variable", name: hyp.name, symbol, primed, type };
|
|
193
|
+
const primedType = searchDeclarationType(
|
|
194
|
+
encoder,
|
|
195
|
+
rest,
|
|
196
|
+
true,
|
|
197
|
+
push(state.env, variable),
|
|
198
|
+
HYPOTHESIS,
|
|
199
|
+
`${hyp.name}#prime`,
|
|
200
|
+
);
|
|
201
|
+
return extend({ ...variable, primedType }, [
|
|
202
|
+
declare(symbol, 0, getSort(type)),
|
|
203
|
+
declare(primed, 0, getSort(primedType)),
|
|
178
204
|
]);
|
|
179
205
|
}
|
|
180
206
|
case "Defn": {
|
|
181
207
|
const definition = hyp.definition;
|
|
182
208
|
if (isExpanded(hyp))
|
|
183
|
-
return
|
|
209
|
+
return extend({ kind: "unsupported", reason: "an expanded definition" });
|
|
184
210
|
if (definition.kind === "Instance")
|
|
185
|
-
return
|
|
211
|
+
return extend({ kind: "unsupported", reason: "an instance" }, [
|
|
212
|
+
`; omitted declaration of '${definition.name}' (missing type)`,
|
|
213
|
+
]);
|
|
186
214
|
if (definition.kind === "Recursive") {
|
|
187
|
-
const symbol =
|
|
188
|
-
return
|
|
215
|
+
const symbol = getUniqueName(encoder, `CONSTANT_${definition.name}_`);
|
|
216
|
+
return extend({ kind: "operator", symbol, arity: definition.shape }, [
|
|
189
217
|
declare(symbol, definition.shape),
|
|
190
218
|
]);
|
|
191
219
|
}
|
|
192
220
|
if (definition.kind !== "Operator")
|
|
193
|
-
return
|
|
221
|
+
return extend({ kind: "unsupported", reason: "a definition" });
|
|
194
222
|
const body = definition.body;
|
|
195
223
|
const params = body.kind === "Lambda" ? body.params : [];
|
|
196
224
|
if (params.some((param) => param.shape > 0))
|
|
197
|
-
return
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
225
|
+
return extend(
|
|
226
|
+
{
|
|
227
|
+
kind: "secondOrder",
|
|
228
|
+
name: definition.name,
|
|
229
|
+
shapes: params.map((param) => param.shape),
|
|
230
|
+
},
|
|
231
|
+
[`; omitted declaration of '${definition.name}' (second-order)`],
|
|
232
|
+
);
|
|
233
|
+
const symbol = getUniqueName(encoder, definition.name);
|
|
234
|
+
// Type.Synthesize types a hidden constant definition as it types a NEW constant.
|
|
235
|
+
const type =
|
|
236
|
+
hyp.visibility === "Hidden" && body.kind !== "Lambda"
|
|
237
|
+
? searchDeclarationType(encoder, rest, true, state.env, HYPOTHESIS)
|
|
238
|
+
: undefined;
|
|
239
|
+
if (type !== undefined)
|
|
240
|
+
return extend({ kind: "constant", symbol, type }, [declare(symbol, 0, getSort(type))]);
|
|
241
|
+
return extend({ kind: "operator", symbol, arity: params.length }, [
|
|
204
242
|
declare(symbol, params.length),
|
|
205
243
|
]);
|
|
206
244
|
}
|
|
207
245
|
case "Fact": {
|
|
208
246
|
const binding: Binding = { kind: "unsupported", reason: "a reference to a fact" };
|
|
209
|
-
if (hyp.visibility === "Hidden") return
|
|
247
|
+
if (hyp.visibility === "Hidden") return extend(binding, ["; hidden fact"]);
|
|
210
248
|
const isOmitted = isSecondOrder(hyp.expression);
|
|
211
|
-
const entries =
|
|
212
|
-
|
|
249
|
+
const entries = getEntries(
|
|
250
|
+
encoder,
|
|
251
|
+
`(assert ${encodeBool(encoder, hyp.expression, state.env, { ...HYPOTHESIS, isOmitted })})`,
|
|
213
252
|
);
|
|
214
|
-
return
|
|
253
|
+
return extend(
|
|
215
254
|
binding,
|
|
216
255
|
isOmitted
|
|
217
|
-
?
|
|
256
|
+
? [
|
|
257
|
+
...entries.map((entry) =>
|
|
258
|
+
typeof entry === "string" ? { omitted: entry } : entry,
|
|
259
|
+
),
|
|
260
|
+
"; omitted fact (second-order)",
|
|
261
|
+
]
|
|
218
262
|
: entries,
|
|
219
263
|
);
|
|
220
264
|
}
|
|
@@ -223,43 +267,54 @@ const encodeContext = (context: Hyp[], encoder: Encoder) =>
|
|
|
223
267
|
{ env: undefined, entries: [] },
|
|
224
268
|
);
|
|
225
269
|
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
270
|
+
interface SmtHeader {
|
|
271
|
+
version: string;
|
|
272
|
+
id: number;
|
|
273
|
+
location: string;
|
|
274
|
+
logic: string;
|
|
275
|
+
}
|
|
276
|
+
|
|
277
|
+
export const encodeSmt = (
|
|
278
|
+
prepared: Sequent,
|
|
279
|
+
session: EncodingSession,
|
|
280
|
+
header: SmtHeader,
|
|
281
|
+
encoding: SmtEncoding,
|
|
282
|
+
) => {
|
|
230
283
|
const simplified = sortRecordFields(
|
|
231
284
|
simplifyRecordEqualities({ kind: "Sequent", sequent: prepared }),
|
|
232
285
|
);
|
|
233
|
-
const sequent =
|
|
234
|
-
|
|
235
|
-
|
|
286
|
+
const sequent = simplifySets(
|
|
287
|
+
simplified.kind === "Sequent" ? simplified.sequent : prepared,
|
|
288
|
+
encoding.rewriteLevel,
|
|
289
|
+
);
|
|
290
|
+
const encoder = createEncoder(session, encoding);
|
|
291
|
+
const context = encodeContext(sequent, encoder);
|
|
236
292
|
const goal = isSecondOrder(sequent.active)
|
|
237
293
|
? []
|
|
238
|
-
:
|
|
239
|
-
|
|
294
|
+
: getEntries(
|
|
295
|
+
encoder,
|
|
296
|
+
`(assert (! (not ${encodeBool(encoder, sequent.active, context.env, { ...HYPOTHESIS, polarity: "Positive" })}) :named |Goal|))`,
|
|
240
297
|
);
|
|
241
|
-
const
|
|
242
|
-
const
|
|
243
|
-
const collected = collectSymbols(entries, encoder);
|
|
298
|
+
const resolve = createPrinter(encoder.declared);
|
|
299
|
+
const collected = collectSymbols([...context.entries, ...goal], encoder);
|
|
244
300
|
const declarations = [...collected.symbols]
|
|
245
301
|
.toSorted((left, right) => compareStrings(left[0], right[0]))
|
|
246
302
|
.flatMap((symbol) => (symbol[1].declaration === undefined ? [] : [symbol[1].declaration]));
|
|
247
303
|
const axioms = [...collected.axioms.values()]
|
|
248
304
|
.toSorted(compareAxioms)
|
|
249
|
-
.
|
|
250
|
-
entry.formula === undefined
|
|
305
|
+
.map((entry) =>
|
|
306
|
+
entry.formula === undefined
|
|
307
|
+
? "; omitted fact (second-order)"
|
|
308
|
+
: `(assert (! ${entry.formula} :named |${entry.label}|))`,
|
|
251
309
|
);
|
|
252
310
|
const keys = new Set(collected.axioms.keys());
|
|
253
|
-
const
|
|
254
|
-
|
|
255
|
-
...axioms,
|
|
256
|
-
...entries.flatMap((entry) => {
|
|
311
|
+
const getLines = (entries: Entry[]) =>
|
|
312
|
+
entries.flatMap((entry) => {
|
|
257
313
|
if (typeof entry === "string") return [entry];
|
|
258
314
|
return "omitted" in entry ? [] : entry.getLines(keys);
|
|
259
|
-
})
|
|
260
|
-
];
|
|
261
|
-
|
|
262
|
-
// Type.Synthesize gives that sort to each definition left in the context, though none is printed.
|
|
315
|
+
});
|
|
316
|
+
const hypotheses = [...declarations, ...axioms, ...getLines(context.entries)];
|
|
317
|
+
const lines = [...hypotheses, ...getLines(goal)];
|
|
263
318
|
const isIdvUsed =
|
|
264
319
|
lines.some((line) => /\bIdv\b/.test(line)) ||
|
|
265
320
|
sequent.context.some(
|
|
@@ -268,8 +323,23 @@ export const encodeSmt = (prepared: Sequent, session: EncodingSession) => {
|
|
|
268
323
|
(hyp.definition.kind === "Operator" || hyp.definition.kind === "Recursive") &&
|
|
269
324
|
!isExpanded(hyp),
|
|
270
325
|
);
|
|
271
|
-
|
|
272
|
-
.
|
|
273
|
-
|
|
274
|
-
|
|
326
|
+
const printCommand = (line: string) => {
|
|
327
|
+
if (line.startsWith(";")) return line;
|
|
328
|
+
const command = layOutCommand(replaceTokens(resolve(line), NATIVE_OPERATORS));
|
|
329
|
+
const name = /:named \|([^|]*)\|\)\)$/.exec(line)?.[1];
|
|
330
|
+
if (name === undefined) return command;
|
|
331
|
+
return `;; ${name === "Goal" ? name : `Axiom: ${name}`}\n${command}`;
|
|
332
|
+
};
|
|
333
|
+
return [
|
|
334
|
+
`;; TLA+ Proof Manager ${header.version}\n`,
|
|
335
|
+
`;; Proof obligation #${header.id}\n`,
|
|
336
|
+
`;; Generated from ${header.location}\n\n`,
|
|
337
|
+
`(set-logic ${header.logic})\n\n`,
|
|
338
|
+
";; Sorts\n\n",
|
|
339
|
+
isIdvUsed ? "(declare-sort Idv 0)\n" : "",
|
|
340
|
+
"\n;; Hypotheses\n\n",
|
|
341
|
+
hypotheses.length === 0 ? "\n" : "",
|
|
342
|
+
...lines.map((line) => `${printCommand(line)}\n\n`),
|
|
343
|
+
"(check-sat)\n(exit)\n",
|
|
344
|
+
].join("");
|
|
275
345
|
};
|
|
@@ -1,6 +1,3 @@
|
|
|
1
|
-
// Standardize.set_extensionality_visitor: an equality of sets where it may need proving triggers
|
|
2
|
-
// the set extensionality axiom, through TrigEq.
|
|
3
|
-
|
|
4
1
|
import {
|
|
5
2
|
CAP,
|
|
6
3
|
CUP,
|
|
@@ -16,14 +13,10 @@ import {
|
|
|
16
13
|
|
|
17
14
|
export type Polarity = "Positive" | "Negative" | "Neither";
|
|
18
15
|
|
|
19
|
-
// The head of a set equality whose polarity keeps it from triggering set extensionality unless a
|
|
20
|
-
// cast encloses it: (?trigger triggered kept).
|
|
21
16
|
const UNRESOLVED_TRIGGER = "?trigger";
|
|
22
17
|
|
|
23
18
|
const SET_HEADS = new Set([UNION, SUBSET, CUP, CAP, SET_MINUS, INT_RANGE, FUN_SET, SEQ]);
|
|
24
19
|
|
|
25
|
-
// Standardize.is_set: the applications of constructors whose values are sets. Standardize leaves
|
|
26
|
-
// BOOLEAN, STRING, Int, and Nat as bare symbols, which is_set doesn't match.
|
|
27
20
|
const isSetTerm = (text: string) => {
|
|
28
21
|
const head = /^\(?([^\s()]+)/.exec(text)?.[1] ?? "";
|
|
29
22
|
return (
|
|
@@ -34,7 +27,6 @@ const isSetTerm = (text: string) => {
|
|
|
34
27
|
);
|
|
35
28
|
};
|
|
36
29
|
|
|
37
|
-
// Picks the triggered or the kept form of each unresolved set equality in text.
|
|
38
30
|
export const resolveTriggers = (text: string, isTriggered: boolean): string => {
|
|
39
31
|
const start = text.indexOf(`(${UNRESOLVED_TRIGGER} `);
|
|
40
32
|
if (start === -1) return text;
|
|
@@ -47,18 +39,18 @@ export const resolveTriggers = (text: string, isTriggered: boolean): string => {
|
|
|
47
39
|
return text.slice(0, start) + chosen + resolveTriggers(text.slice(keptEnd + 1), isTriggered);
|
|
48
40
|
};
|
|
49
41
|
|
|
50
|
-
// The equality, or disequality, of two Idv terms at a polarity.
|
|
51
42
|
export const getEquality = (
|
|
52
43
|
left: string,
|
|
53
44
|
right: string,
|
|
54
|
-
polarity: Polarity,
|
|
45
|
+
polarity: Polarity | undefined,
|
|
55
46
|
isNegated: boolean,
|
|
47
|
+
setTrigger?: string,
|
|
56
48
|
) => {
|
|
57
|
-
const triggered = `(${TRIG_EQ} ${left} ${right})`;
|
|
49
|
+
const triggered = `(${setTrigger ?? TRIG_EQ} ${left} ${right})`;
|
|
58
50
|
const kept = isNegated ? `(distinct ${left} ${right})` : `(= ${left} ${right})`;
|
|
59
|
-
if (!isSetTerm(left) && !isSetTerm(right))
|
|
51
|
+
if (polarity === undefined || (setTrigger === undefined && !isSetTerm(left) && !isSetTerm(right)))
|
|
52
|
+
return kept;
|
|
60
53
|
const text = isNegated ? `(not ${triggered})` : triggered;
|
|
61
|
-
// A cast around the equality may still trigger it, so both forms wait for resolveTriggers.
|
|
62
54
|
return polarity === (isNegated ? "Positive" : "Negative")
|
|
63
55
|
? `(${UNRESOLVED_TRIGGER} ${text} ${kept})`
|
|
64
56
|
: text;
|
|
@@ -1,11 +1,6 @@
|
|
|
1
|
-
|
|
2
|
-
// symbol, declared with its axioms before the fact that uses it.
|
|
3
|
-
|
|
4
|
-
import { declare, formatName, getClosing } from "./format";
|
|
1
|
+
import { formatName, getClosing } from "./format";
|
|
5
2
|
import type { Axiom } from "./table";
|
|
6
3
|
|
|
7
|
-
// A symbol that Flatten introduces, with the text tlapm's collect pass visits for its
|
|
8
|
-
// higher-order arguments.
|
|
9
4
|
export interface Flattened {
|
|
10
5
|
symbol: string;
|
|
11
6
|
kind: string;
|
|
@@ -13,20 +8,14 @@ export interface Flattened {
|
|
|
13
8
|
getLines: (axioms: Set<string>) => string[];
|
|
14
9
|
}
|
|
15
10
|
|
|
16
|
-
// A fact that tlapm encodes, so its symbols bring their axioms, but leaves out of the text.
|
|
17
11
|
interface OmittedFact {
|
|
18
12
|
omitted: string;
|
|
19
13
|
}
|
|
20
14
|
|
|
21
15
|
export type Entry = string | Flattened | OmittedFact;
|
|
22
16
|
|
|
23
|
-
// A bound variable's placeholder: its name and its depth, which the printer names in scope.
|
|
24
|
-
export const getVariable = (name: string, depth: number) => `${name}#${depth}`;
|
|
25
|
-
|
|
26
17
|
export const getDepth = (variable: string) => Number(variable.slice(variable.lastIndexOf("#") + 1));
|
|
27
18
|
|
|
28
|
-
// The head that marks the Unprimable WITNESS wraps around its witness, which Prep never removes:
|
|
29
|
-
// (?unprimable term). Flatten.compare_expr tells it apart, and the printed text drops it.
|
|
30
19
|
export const UNPRIMABLE = "?unprimable";
|
|
31
20
|
|
|
32
21
|
export const removeUnprimable = (text: string): string => {
|
|
@@ -40,30 +29,22 @@ export const removeUnprimable = (text: string): string => {
|
|
|
40
29
|
);
|
|
41
30
|
};
|
|
42
31
|
|
|
43
|
-
// Flatten.compare_expr: an application matches an earlier one with the same higher-order
|
|
44
|
-
// arguments, whatever the variables bound outside them. It can't compare quantifiers or
|
|
45
|
-
// conditionals, so an argument with one matches nothing.
|
|
46
32
|
const getFlatKey = (text: string, depth: number) =>
|
|
47
|
-
/\((forall|exists|ite) /.test(text)
|
|
33
|
+
/\((forall|exists|ite|let) /.test(text)
|
|
48
34
|
? undefined
|
|
49
35
|
: text.replace(/[^\s()]+#(\d+)/g, (_match, found: string) =>
|
|
50
36
|
Number(found) < depth ? "#" : `#${Number(found) - depth}`,
|
|
51
37
|
);
|
|
52
38
|
|
|
53
|
-
// Where an application occurs: its depth of bound variables, and whether it's in a fact that
|
|
54
|
-
// Smtlib leaves out, which Flatten doesn't enter.
|
|
55
39
|
interface Site {
|
|
56
40
|
depth: number;
|
|
57
41
|
isOmitted: boolean;
|
|
58
42
|
}
|
|
59
43
|
|
|
60
|
-
// The state of Flatten.main over one obligation: its blueprint count, which init_bp_count resets
|
|
61
|
-
// for each obligation, and the symbols it introduced.
|
|
62
44
|
export const createFlattener = () => {
|
|
63
45
|
const flattened = new Map<string, Flattened>();
|
|
64
46
|
const flatKeys = new Map<string, Flattened>();
|
|
65
|
-
|
|
66
|
-
// The symbols that the fact being encoded introduces, declared before it.
|
|
47
|
+
let blueprintCount = 0;
|
|
67
48
|
const introduced: Flattened[] = [];
|
|
68
49
|
|
|
69
50
|
const flatten = (
|
|
@@ -71,11 +52,9 @@ export const createFlattener = () => {
|
|
|
71
52
|
visit: string,
|
|
72
53
|
site: Site,
|
|
73
54
|
getAxioms: (symbol: string, axioms: Set<string>) => Axiom[],
|
|
74
|
-
|
|
55
|
+
sorts: string[],
|
|
75
56
|
name = `TLA__${kind}`,
|
|
76
57
|
) => {
|
|
77
|
-
// Flatten.find_hoapp skips a second-order ASSUME, so the application stays and only
|
|
78
|
-
// N_axiomatize.collect, which runs before Flatten, visits it.
|
|
79
58
|
if (site.isOmitted) {
|
|
80
59
|
const symbol = formatName(`${name}_omitted_${flattened.size}`);
|
|
81
60
|
flattened.set(symbol, { symbol, kind, visit: removeUnprimable(visit), getLines: () => [] });
|
|
@@ -83,17 +62,17 @@ export const createFlattener = () => {
|
|
|
83
62
|
}
|
|
84
63
|
const key = getFlatKey(`${name} ${visit}`, site.depth);
|
|
85
64
|
// Flatten.new_bp_id counts every application, even one that reuses an earlier symbol.
|
|
86
|
-
|
|
65
|
+
blueprintCount++;
|
|
87
66
|
const known = key === undefined ? undefined : flatKeys.get(key);
|
|
88
67
|
if (known) return known.symbol;
|
|
89
|
-
const raw = `${name}_flatnd_${
|
|
68
|
+
const raw = `${name}_flatnd_${blueprintCount}`;
|
|
90
69
|
const symbol = formatName(raw);
|
|
91
70
|
const flat: Flattened = {
|
|
92
71
|
symbol,
|
|
93
72
|
kind,
|
|
94
73
|
visit: removeUnprimable(visit),
|
|
95
74
|
getLines: (axioms) => [
|
|
96
|
-
declare
|
|
75
|
+
`(declare-fun ${symbol} (${sorts.join(" ")}) Idv)`,
|
|
97
76
|
...getAxioms(symbol, axioms).map(
|
|
98
77
|
(entry) =>
|
|
99
78
|
`(assert (! ${removeUnprimable(entry.formula ?? "")} :named |${entry.label} ${raw}|))`,
|
package/src/prover/smt/format.ts
CHANGED
|
@@ -1,8 +1,5 @@
|
|
|
1
|
-
// backend/smtlib.ml's names and the SMT-LIB terms the encoding builds.
|
|
2
|
-
|
|
3
1
|
import type { Builtin } from "../../obligations/expression";
|
|
4
2
|
|
|
5
|
-
// Smtlib.format_smt: spells out each special character, then doubles each underscore.
|
|
6
3
|
const SPELLED: Record<string, string> = {
|
|
7
4
|
"\\": "backslash_",
|
|
8
5
|
"+": "plussign_",
|
|
@@ -39,7 +36,6 @@ const SPELLED_WORDS = new RegExp(`(${[...UNSPELLED.keys()].join("|")})`, "g");
|
|
|
39
36
|
|
|
40
37
|
export const tla = (name: string) => formatName(`TLA__${name}`);
|
|
41
38
|
|
|
42
|
-
// The builtin a symbol that tla names stands for, or undefined for any other symbol.
|
|
43
39
|
export const getTlaName = (symbol: string) =>
|
|
44
40
|
symbol.startsWith(TLA_PREFIX)
|
|
45
41
|
? symbol
|
|
@@ -65,6 +61,8 @@ export const NAT_SET = tla("NatSet");
|
|
|
65
61
|
export const CAST_INT = tla("Cast_Int");
|
|
66
62
|
export const PROJ_INT = tla("Proj_Int");
|
|
67
63
|
export const INT_LTEQ = tla("IntLteq");
|
|
64
|
+
export const INT_PLUS = tla("IntPlus");
|
|
65
|
+
export const INT_MINUS = tla("IntMinus");
|
|
68
66
|
export const INT_RANGE = tla("IntRange");
|
|
69
67
|
export const FUN_APP = tla("FunApp");
|
|
70
68
|
export const FUN_DOM = tla("FunDom");
|
|
@@ -82,6 +80,19 @@ export const TAIL = tla("Tail");
|
|
|
82
80
|
export const SUB_SEQ = tla("SubSeq");
|
|
83
81
|
export const TUPLE_0 = tla("Tuple_0");
|
|
84
82
|
|
|
83
|
+
export const NATIVE_OPERATORS = new Map(
|
|
84
|
+
[
|
|
85
|
+
["TIntPlus", "+"],
|
|
86
|
+
["TIntMinus", "-"],
|
|
87
|
+
["TIntTimes", "*"],
|
|
88
|
+
["TIntUminus", "-"],
|
|
89
|
+
["TIntLteq", "<="],
|
|
90
|
+
["TIntLt", "<"],
|
|
91
|
+
["TIntGteq", ">="],
|
|
92
|
+
["TIntGt", ">"],
|
|
93
|
+
].map((entry) => [tla(entry[0]), entry[1]]),
|
|
94
|
+
);
|
|
95
|
+
|
|
85
96
|
export const BUILTIN_SYMBOLS: Partial<Record<Builtin, string>> = {
|
|
86
97
|
Cup: CUP,
|
|
87
98
|
Cap: CAP,
|
|
@@ -89,8 +100,8 @@ export const BUILTIN_SYMBOLS: Partial<Record<Builtin, string>> = {
|
|
|
89
100
|
SUBSET,
|
|
90
101
|
UNION,
|
|
91
102
|
DOMAIN: FUN_DOM,
|
|
92
|
-
Plus:
|
|
93
|
-
Minus:
|
|
103
|
+
Plus: INT_PLUS,
|
|
104
|
+
Minus: INT_MINUS,
|
|
94
105
|
Times: tla("IntTimes"),
|
|
95
106
|
Exp: tla("IntExp"),
|
|
96
107
|
Quotient: tla("IntQuotient"),
|
|
@@ -110,8 +121,14 @@ export const BUILTIN_SYMBOLS: Partial<Record<Builtin, string>> = {
|
|
|
110
121
|
export const getNames = (prefix: string, count: number) =>
|
|
111
122
|
Array.from({ length: count }, (_value, index) => `${prefix}${index + 1}`);
|
|
112
123
|
|
|
124
|
+
// A bound variable is name#depth, or name:Sort#depth when Type.Synthesize sorts it Int or Bool.
|
|
125
|
+
export const getVariable = (name: string, depth: number, sort = "Idv") =>
|
|
126
|
+
`${name}${sort === "Idv" ? "" : `:${sort}`}#${depth}`;
|
|
127
|
+
|
|
128
|
+
export const getVariableSort = (variable: string) => /:(\w+)#\d+$/.exec(variable)?.[1];
|
|
129
|
+
|
|
113
130
|
export const getBinders = (variables: string[], sort = "Idv") =>
|
|
114
|
-
variables.map((variable) => `(${variable} ${sort})`).join(" ");
|
|
131
|
+
variables.map((variable) => `(${variable} ${getVariableSort(variable) ?? sort})`).join(" ");
|
|
115
132
|
|
|
116
133
|
export const forall = (
|
|
117
134
|
variables: string[],
|
|
@@ -139,16 +156,18 @@ export const call = (symbol: string, args: string[]) =>
|
|
|
139
156
|
export const declare = (symbol: string, arity: number, sort = "Idv", argSort = "Idv") =>
|
|
140
157
|
`(declare-fun ${symbol} (${Array.from({ length: arity }, () => argSort).join(" ")}) ${sort})`;
|
|
141
158
|
|
|
142
|
-
// The index of the parenthesis that closes the one at from.
|
|
143
159
|
export const getClosing = (text: string, from: number) => {
|
|
144
|
-
|
|
145
|
-
for (;
|
|
146
|
-
if (text[
|
|
147
|
-
if (text[
|
|
148
|
-
if (
|
|
160
|
+
let depth = 0;
|
|
161
|
+
for (let index = from; index < text.length; index++) {
|
|
162
|
+
if (text[index] === "(") depth++;
|
|
163
|
+
if (text[index] === ")") depth--;
|
|
164
|
+
if (depth === 0) return index;
|
|
149
165
|
}
|
|
150
166
|
return text.length;
|
|
151
167
|
};
|
|
152
168
|
|
|
169
|
+
export const replaceTokens = (text: string, replacements: Map<string, string>) =>
|
|
170
|
+
text.replace(/[^\s()]+/g, (found) => replacements.get(found) ?? found);
|
|
171
|
+
|
|
153
172
|
export const replaceToken = (text: string, token: string, replacement: string) =>
|
|
154
|
-
text
|
|
173
|
+
replaceTokens(text, new Map([[token, replacement]]));
|