tla-ts 0.0.9 → 0.0.10-dev.06b481ee0
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 +48 -44
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +122 -12
- package/dist/index.d.ts +122 -12
- 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 +144 -31
- package/dist/run.js +144 -31
- package/dist/tlapm.cjs +2 -2
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +134 -104
- package/dist/transfer.js +134 -104
- package/dist/worker.cjs +7 -7
- package/dist/worker.js +7 -7
- package/package.json +3 -1
- package/src/ast.ts +56 -60
- package/src/bags.ts +128 -110
- package/src/builtins.ts +31 -77
- package/src/bundled-modules.ts +1 -8
- package/src/check-failure.ts +118 -0
- package/src/check-trace.ts +320 -0
- package/src/check.ts +1156 -888
- package/src/cli/options.ts +12 -32
- package/src/cli/run.ts +0 -2
- package/src/cli/runtime-invariants.ts +100 -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 +701 -0
- package/src/cli/tlc-usage.ts +360 -0
- package/src/cli/tlc.ts +330 -659
- 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 +217 -82
- package/src/config.ts +140 -109
- package/src/coverage.ts +1019 -0
- package/src/dependencies.ts +101 -66
- package/src/dfid.ts +683 -0
- package/src/environment-config.ts +315 -0
- package/src/environment.ts +263 -370
- package/src/errors.ts +107 -57
- package/src/evaluate.ts +898 -369
- package/src/exit-codes.ts +63 -13
- package/src/fingerprints.ts +75 -11
- package/src/index.ts +3 -0
- package/src/instances.ts +137 -22
- package/src/java-hash.ts +21 -0
- package/src/java-overrides.ts +6 -21
- package/src/json-reader.ts +455 -0
- package/src/json.ts +252 -139
- package/src/levels.ts +231 -154
- package/src/lexer.ts +83 -101
- package/src/liveness-checker.ts +743 -322
- package/src/liveness.ts +230 -133
- 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 +39 -20
- package/src/obligations/levels.ts +27 -18
- package/src/obligations/module.ts +28 -55
- package/src/obligations/normalize.ts +31 -41
- package/src/obligations/operators.ts +0 -3
- package/src/obligations/pragma.ts +52 -24
- package/src/obligations/printer.ts +94 -63
- 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 +121 -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 +36 -60
- package/src/parallel.ts +64 -73
- package/src/parser.ts +1184 -531
- 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 +226 -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 +1 -15
- package/src/prover/isabelle/provers/classical.ts +58 -61
- package/src/prover/isabelle/provers/hypsubst.ts +29 -54
- 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 +34 -77
- 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 +4 -47
- 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 +26 -31
- 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 +1021 -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 +626 -56
- package/src/prover/smt/solver/arith-terms.ts +121 -0
- package/src/prover/smt/solver/array-decl-plugin.ts +175 -0
- package/src/prover/smt/solver/array-rewriter.ts +319 -0
- package/src/prover/smt/solver/array.ts +1 -3
- package/src/prover/smt/solver/asserted-formulas.ts +241 -99
- package/src/prover/smt/solver/ast-lt.ts +165 -21
- package/src/prover/smt/solver/ast-util.ts +160 -7
- package/src/prover/smt/solver/ast.ts +1480 -184
- package/src/prover/smt/solver/auf-solver.ts +30 -56
- package/src/prover/smt/solver/bit-blast-tactic.ts +608 -0
- package/src/prover/smt/solver/bit-blaster.ts +871 -0
- package/src/prover/smt/solver/blast-term-ite.ts +47 -0
- package/src/prover/smt/solver/bound-manager.ts +196 -0
- package/src/prover/smt/solver/bound-simplifier.ts +598 -0
- package/src/prover/smt/solver/bv-bound-chk.ts +492 -0
- package/src/prover/smt/solver/bv-decl-plugin.ts +341 -0
- package/src/prover/smt/solver/bv-divrem-bounds.ts +95 -0
- package/src/prover/smt/solver/bv-rewriter.ts +1901 -0
- package/src/prover/smt/solver/bv1-blast.ts +214 -0
- package/src/prover/smt/solver/bv2fpa-converter.ts +174 -0
- package/src/prover/smt/solver/bv2int-rewriter.ts +544 -0
- package/src/prover/smt/solver/bv2real-rewriter.ts +533 -0
- package/src/prover/smt/solver/card2bv.ts +127 -0
- package/src/prover/smt/solver/case-split-queue.ts +0 -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 +293 -0
- package/src/prover/smt/solver/conflict-resolution.ts +78 -11
- package/src/prover/smt/solver/context.ts +600 -187
- package/src/prover/smt/solver/ctx-simplify.ts +34 -52
- package/src/prover/smt/solver/ctx-solver-simplify.ts +122 -0
- package/src/prover/smt/solver/datatype-decl-plugin.ts +580 -0
- package/src/prover/smt/solver/datatype-rewriter.ts +82 -0
- package/src/prover/smt/solver/demodulator.ts +786 -0
- package/src/prover/smt/solver/dependent-expr-state.ts +93 -0
- package/src/prover/smt/solver/der.ts +39 -30
- package/src/prover/smt/solver/diff-neq.ts +205 -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 +296 -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-bounds.ts +89 -0
- package/src/prover/smt/solver/elim-small-bv-tactic.ts +129 -0
- package/src/prover/smt/solver/elim-term-ite-tactic.ts +48 -0
- package/src/prover/smt/solver/elim-uncnstr.ts +542 -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 +901 -0
- package/src/prover/smt/solver/euf/euf-solver.ts +1204 -0
- package/src/prover/smt/solver/euf/fpa-solver.ts +317 -0
- package/src/prover/smt/solver/euf/mam.ts +1046 -0
- package/src/prover/smt/solver/euf/q-ematch.ts +829 -0
- package/src/prover/smt/solver/euf/q-mbi.ts +587 -0
- package/src/prover/smt/solver/euf/q-model-fixer.ts +296 -0
- package/src/prover/smt/solver/euf/q-solver.ts +361 -0
- package/src/prover/smt/solver/euf/th-solver.ts +328 -0
- package/src/prover/smt/solver/euf/th-solvers.ts +30 -0
- package/src/prover/smt/solver/expr-ref.ts +0 -5
- package/src/prover/smt/solver/expr-safe-replace.ts +26 -7
- package/src/prover/smt/solver/expr2polynomial.ts +271 -0
- package/src/prover/smt/solver/factor.ts +163 -0
- package/src/prover/smt/solver/fd-solver.ts +734 -0
- package/src/prover/smt/solver/fingerprints.ts +15 -26
- package/src/prover/smt/solver/fix-dl-var.ts +147 -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 +639 -0
- package/src/prover/smt/solver/fpa2bv-converter.ts +2251 -0
- package/src/prover/smt/solver/fpa2bv-rewriter.ts +349 -0
- package/src/prover/smt/solver/fpa2bv-tactic.ts +73 -0
- package/src/prover/smt/solver/goal.ts +179 -28
- package/src/prover/smt/solver/goal2nlsat.ts +216 -0
- package/src/prover/smt/solver/guard-set.ts +219 -0
- package/src/prover/smt/solver/hash.ts +0 -9
- package/src/prover/smt/solver/hashtable.ts +30 -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 +113 -133
- 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 +355 -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 +18 -31
- package/src/prover/smt/solver/lp/core-solver.ts +35 -37
- package/src/prover/smt/solver/lp/cross-nested.ts +4 -21
- 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 +70 -83
- package/src/prover/smt/solver/lp/lar-term.ts +0 -5
- package/src/prover/smt/solver/lp/lp-settings.ts +6 -16
- package/src/prover/smt/solver/lp/maximize-term.ts +76 -52
- package/src/prover/smt/solver/lp/nex-creator.ts +7 -30
- package/src/prover/smt/solver/lp/nex.ts +2 -7
- 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 +92 -136
- 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 +177 -149
- 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 +164 -147
- package/src/prover/smt/solver/lp/numeric-pair.ts +0 -4
- package/src/prover/smt/solver/lp/pdd-interval.ts +6 -5
- package/src/prover/smt/solver/lp/pdd-simplifier.ts +61 -34
- package/src/prover/smt/solver/lp/pdd-solver.ts +74 -72
- package/src/prover/smt/solver/lp/pdd.ts +730 -358
- 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 +310 -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 +106 -0
- package/src/prover/smt/solver/maxsmt.ts +92 -0
- package/src/prover/smt/solver/mbp/mbp-arith.ts +467 -0
- package/src/prover/smt/solver/mbp/mbp-basic-tg.ts +101 -0
- package/src/prover/smt/solver/mbp/mbp-plugin.ts +287 -0
- package/src/prover/smt/solver/mbp/mbp-qel.ts +48 -0
- package/src/prover/smt/solver/mbp/mbp-solve-plugin.ts +271 -0
- package/src/prover/smt/solver/mbp/mbp-term-graph.ts +606 -0
- package/src/prover/smt/solver/model-based-opt.ts +844 -0
- package/src/prover/smt/solver/model-checker.ts +20 -63
- package/src/prover/smt/solver/model-evaluator.ts +192 -40
- package/src/prover/smt/solver/model-finder.ts +14 -32
- package/src/prover/smt/solver/model-generator.ts +104 -46
- 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 +709 -0
- package/src/prover/smt/solver/mus.ts +50 -0
- package/src/prover/smt/solver/muz/dl-context.ts +382 -0
- package/src/prover/smt/solver/muz/dl-mk-bit-blast.ts +97 -0
- package/src/prover/smt/solver/muz/dl-mk-coi-filter.ts +167 -0
- package/src/prover/smt/solver/muz/dl-mk-elim-term-ite.ts +125 -0
- package/src/prover/smt/solver/muz/dl-mk-interp-tail-simplifier.ts +299 -0
- package/src/prover/smt/solver/muz/dl-mk-rule-inliner.ts +455 -0
- package/src/prover/smt/solver/muz/dl-mk-slice.ts +340 -0
- package/src/prover/smt/solver/muz/dl-mk-subsumption-checker.ts +163 -0
- package/src/prover/smt/solver/muz/dl-rule-set.ts +273 -0
- package/src/prover/smt/solver/muz/dl-rule-transformer.ts +123 -0
- package/src/prover/smt/solver/muz/dl-rule.ts +495 -0
- package/src/prover/smt/solver/muz/hnf.ts +201 -0
- package/src/prover/smt/solver/muz/horn-subsume-model-converter.ts +176 -0
- package/src/prover/smt/solver/muz/horn-tactic.ts +214 -0
- package/src/prover/smt/solver/muz/rule-properties.ts +359 -0
- package/src/prover/smt/solver/muz/spacer-context.ts +1404 -0
- package/src/prover/smt/solver/muz/spacer-dl-interface.ts +52 -0
- package/src/prover/smt/solver/muz/spacer-generalizers.ts +241 -0
- package/src/prover/smt/solver/muz/spacer-manager.ts +127 -0
- package/src/prover/smt/solver/muz/spacer-pdr.ts +219 -0
- package/src/prover/smt/solver/muz/spacer-prop-solver.ts +333 -0
- package/src/prover/smt/solver/muz/spacer-util.ts +282 -0
- package/src/prover/smt/solver/muz/substitution.ts +203 -0
- package/src/prover/smt/solver/nla2bv-tactic.ts +285 -0
- package/src/prover/smt/solver/nlqsat.ts +484 -0
- package/src/prover/smt/solver/nlsat/algebraic.ts +357 -236
- package/src/prover/smt/solver/nlsat/atoms.ts +73 -54
- package/src/prover/smt/solver/nlsat/evaluator.ts +16 -22
- package/src/prover/smt/solver/nlsat/explain.ts +429 -275
- package/src/prover/smt/solver/nlsat/interval-set.ts +9 -51
- package/src/prover/smt/solver/nlsat/levelwise.ts +477 -344
- package/src/prover/smt/solver/nlsat/mpbq.ts +47 -14
- package/src/prover/smt/solver/nlsat/polynomial.ts +2385 -832
- package/src/prover/smt/solver/nlsat/solver.ts +297 -156
- package/src/prover/smt/solver/nlsat/transcendental-eval.ts +310 -0
- package/src/prover/smt/solver/nlsat/transcendentals.ts +391 -0
- package/src/prover/smt/solver/nlsat/types.ts +0 -9
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +9 -51
- package/src/prover/smt/solver/nlsat/upolynomial.ts +49 -109
- package/src/prover/smt/solver/nlsat-tactic.ts +82 -0
- package/src/prover/smt/solver/nnf.ts +112 -61
- package/src/prover/smt/solver/normalize-bounds.ts +53 -0
- package/src/prover/smt/solver/occf.ts +97 -0
- package/src/prover/smt/solver/opt-context.ts +801 -0
- package/src/prover/smt/solver/opt-nlsat.ts +386 -0
- package/src/prover/smt/solver/opt-pareto.ts +301 -0
- package/src/prover/smt/solver/opt-preprocess.ts +101 -0
- package/src/prover/smt/solver/opt-solver.ts +312 -0
- package/src/prover/smt/solver/opt-value.ts +55 -0
- package/src/prover/smt/solver/optsmt.ts +692 -0
- package/src/prover/smt/solver/parallel-tactic.ts +299 -0
- package/src/prover/smt/solver/pattern-inference.ts +21 -26
- package/src/prover/smt/solver/pb-rewriter.ts +281 -0
- package/src/prover/smt/solver/pb2bv-tactic.ts +540 -0
- package/src/prover/smt/solver/poly-rewriter.ts +261 -79
- package/src/prover/smt/solver/probes.ts +577 -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/push-app-ite.ts +37 -0
- package/src/prover/smt/solver/qe-arith-plugin.ts +1096 -0
- package/src/prover/smt/solver/qe-lite-der.ts +2 -31
- package/src/prover/smt/solver/qe-lite-fm.ts +4 -28
- package/src/prover/smt/solver/qe-lite.ts +41 -51
- package/src/prover/smt/solver/qe-mbp.ts +270 -0
- package/src/prover/smt/solver/qe.ts +1499 -0
- package/src/prover/smt/solver/qel.ts +25 -0
- package/src/prover/smt/solver/qi-queue.ts +0 -16
- package/src/prover/smt/solver/qsat.ts +829 -0
- package/src/prover/smt/solver/quant-hoist.ts +196 -0
- package/src/prover/smt/solver/quant-tactics.ts +17 -74
- package/src/prover/smt/solver/quantifier-analyzer.ts +26 -47
- package/src/prover/smt/solver/quantifier-manager.ts +22 -32
- 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 +262 -0
- package/src/prover/smt/solver/recfun-rewriter.ts +107 -0
- package/src/prover/smt/solver/reduce-args.ts +225 -0
- package/src/prover/smt/solver/reduce-bv-size.ts +119 -0
- package/src/prover/smt/solver/ref-vector.ts +0 -6
- package/src/prover/smt/solver/relevancy.ts +2 -16
- package/src/prover/smt/solver/rewriter-tpl.ts +59 -135
- package/src/prover/smt/solver/rewriter.ts +507 -144
- package/src/prover/smt/solver/rlimit.ts +46 -24
- 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 +579 -0
- package/src/prover/smt/solver/sat/inc-sat-solver.ts +464 -0
- package/src/prover/smt/solver/sat/model-converter.ts +136 -0
- package/src/prover/smt/solver/sat/pb-constraint.ts +268 -0
- package/src/prover/smt/solver/sat/pb-solver.ts +1596 -0
- package/src/prover/smt/solver/sat/probing.ts +170 -0
- package/src/prover/smt/solver/sat/sat-tactic.ts +53 -0
- package/src/prover/smt/solver/sat/sat2goal.ts +189 -0
- package/src/prover/smt/solver/sat/scc.ts +142 -0
- package/src/prover/smt/solver/sat/simplifier.ts +1618 -0
- package/src/prover/smt/solver/sat/solver.ts +2107 -0
- package/src/prover/smt/solver/sat/var-queue.ts +117 -0
- package/src/prover/smt/solver/sat/watch-list.ts +140 -0
- package/src/prover/smt/solver/search-tree.ts +284 -0
- package/src/prover/smt/solver/seq-axioms.ts +995 -0
- package/src/prover/smt/solver/seq-decl-plugin.ts +819 -0
- package/src/prover/smt/solver/seq-derive.ts +1298 -0
- package/src/prover/smt/solver/seq-eq-approx.ts +236 -0
- package/src/prover/smt/solver/seq-eq-solver.ts +439 -0
- package/src/prover/smt/solver/seq-factory.ts +89 -0
- package/src/prover/smt/solver/seq-monadic.ts +730 -0
- package/src/prover/smt/solver/seq-range-predicate.ts +235 -0
- package/src/prover/smt/solver/seq-re-rewriter.ts +1171 -0
- package/src/prover/smt/solver/seq-re-util.ts +758 -0
- package/src/prover/smt/solver/seq-regex-bisim.ts +144 -0
- package/src/prover/smt/solver/seq-regex-live.ts +200 -0
- package/src/prover/smt/solver/seq-rewriter.ts +2404 -0
- package/src/prover/smt/solver/seq-skolem.ts +294 -0
- package/src/prover/smt/solver/seq-subset.ts +165 -0
- package/src/prover/smt/solver/seq-view-witness.ts +353 -0
- package/src/prover/smt/solver/smt-consequences.ts +297 -0
- package/src/prover/smt/solver/smt-kernel.ts +124 -0
- package/src/prover/smt/solver/smt-logics.ts +66 -0
- package/src/prover/smt/solver/smt-setup.ts +589 -0
- package/src/prover/smt/solver/smt2-printer.ts +765 -0
- package/src/prover/smt/solver/smtlib-parser.ts +3546 -406
- package/src/prover/smt/solver/smtlib-script.ts +2134 -0
- package/src/prover/smt/solver/solve-eqs.ts +928 -0
- package/src/prover/smt/solver/solver.ts +135 -40
- 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 +2141 -0
- package/src/prover/smt/solver/term-enumeration.ts +205 -0
- package/src/prover/smt/solver/theory-array.ts +1240 -0
- package/src/prover/smt/solver/theory-bv.ts +1210 -0
- package/src/prover/smt/solver/theory-char.ts +355 -0
- package/src/prover/smt/solver/theory-datatype.ts +598 -0
- package/src/prover/smt/solver/theory-finite-set.ts +30 -0
- package/src/prover/smt/solver/theory-fpa.ts +389 -0
- package/src/prover/smt/solver/theory-lra-axioms.ts +55 -25
- package/src/prover/smt/solver/theory-lra-bounds.ts +31 -11
- package/src/prover/smt/solver/theory-lra-final-check.ts +60 -91
- package/src/prover/smt/solver/theory-lra-internalize.ts +96 -53
- package/src/prover/smt/solver/theory-lra-model.ts +23 -53
- package/src/prover/smt/solver/theory-lra-propagate.ts +34 -42
- package/src/prover/smt/solver/theory-lra-state.ts +7 -28
- package/src/prover/smt/solver/theory-lra.ts +189 -9
- package/src/prover/smt/solver/theory-pb.ts +951 -0
- package/src/prover/smt/solver/theory-polymorphism.ts +58 -0
- package/src/prover/smt/solver/theory-recfun.ts +307 -0
- package/src/prover/smt/solver/theory-seq-regex.ts +867 -0
- package/src/prover/smt/solver/theory-seq-solve.ts +1373 -0
- package/src/prover/smt/solver/theory-seq-state.ts +852 -0
- package/src/prover/smt/solver/theory-seq.ts +961 -0
- package/src/prover/smt/solver/theory-without-terms.ts +24 -0
- package/src/prover/smt/solver/theory.ts +189 -0
- package/src/prover/smt/solver/tseitin-cnf.ts +486 -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 +74 -48
- 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 +24 -6
- package/src/prover/zenon/expr.ts +29 -28
- package/src/prover/zenon/index-table.ts +33 -61
- package/src/prover/zenon/isar-case.ts +9 -21
- package/src/prover/zenon/isar.ts +37 -67
- 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 +2 -14
- package/src/prover/zenon/proof.ts +0 -11
- package/src/prover/zenon/propositional-rules.ts +0 -7
- package/src/prover/zenon/rules.ts +3 -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 +1132 -430
- package/src/runtime.ts +33 -23
- package/src/sany/builtins.ts +11 -14
- package/src/sany/generation.ts +383 -0
- package/src/sany/generator-def-entries.ts +210 -0
- package/src/sany/generator-definitions.ts +688 -0
- package/src/sany/generator-expressions.ts +1108 -0
- package/src/sany/generator-proofs.ts +665 -0
- package/src/sany/generator.ts +192 -2764
- package/src/sany/levels.ts +5 -35
- package/src/sany/lexer.ts +61 -80
- package/src/sany/linter.ts +0 -10
- package/src/sany/modules.ts +5 -7
- package/src/sany/nodes.ts +6 -44
- package/src/sany/parse-error.ts +39 -117
- package/src/sany/report.ts +32 -69
- package/src/sany/selectors.ts +60 -82
- package/src/sany/source.ts +1 -17
- package/src/sany/xml.ts +37 -120
- package/src/search.ts +913 -227
- package/src/simulate.ts +765 -0
- package/src/spec-description.ts +198 -104
- package/src/standard-definitions.ts +4 -4
- package/src/standard-modules.ts +302 -99
- package/src/state-graph.ts +52 -33
- package/src/subexpressions.ts +578 -166
- package/src/substitution-levels.ts +7 -7
- package/src/successors.ts +299 -108
- package/src/symmetry.ts +37 -28
- package/src/tableau.ts +29 -26
- package/src/tlc/fingerprint.ts +267 -79
- package/src/tlc/jar-data.ts +122 -6
- package/src/tlc/messages.ts +127 -56
- package/src/tlc/order.ts +53 -72
- package/src/tlc/random.ts +38 -49
- package/src/tlc/replay.ts +579 -230
- package/src/tlc/summary.ts +64 -60
- package/src/tlc/tlc-operators.ts +83 -47
- package/src/tlc/tlcext-operators.ts +205 -127
- package/src/tlc/trace-spec.ts +235 -0
- package/src/tlc/value-stream.ts +139 -0
- package/src/tlc/version.ts +1 -4
- package/src/trace-liveness.ts +529 -0
- package/src/transfer.ts +22 -25
- package/src/typed-tier.ts +6556 -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 +945 -526
- 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
|
@@ -1,12 +1,7 @@
|
|
|
1
|
-
// Ported from Z3 (src/ast/rewriter/var_subst.cpp), MIT license, see z3-license.txt. Substitution and
|
|
2
|
-
// shifting of de Bruijn variables.
|
|
3
1
|
import { KIND_APP, KIND_QUANTIFIER, KIND_VAR, type AstManager, type SmtSymbol } from "./ast";
|
|
4
2
|
import { ExprSafeReplace } from "./expr-safe-replace";
|
|
5
3
|
import { BetaReducer } from "./rewriter-tpl";
|
|
6
4
|
|
|
7
|
-
// var_subst: substitutes args for the free variables, args[n - 1 - i] for (:var i) in standard
|
|
8
|
-
// order and args[i] otherwise, where -1 keeps the variable. Each result comes with a reference,
|
|
9
|
-
// which the caller releases.
|
|
10
5
|
export class VarSubst {
|
|
11
6
|
private reducer: BetaReducer;
|
|
12
7
|
|
|
@@ -61,14 +56,11 @@ export class VarSubst {
|
|
|
61
56
|
return this.reducer.rewrite(expr);
|
|
62
57
|
}
|
|
63
58
|
|
|
64
|
-
// ~var_subst.
|
|
65
59
|
release() {
|
|
66
60
|
this.reducer.release();
|
|
67
61
|
}
|
|
68
62
|
}
|
|
69
63
|
|
|
70
|
-
// A term whose children replaceFreeVars is rebuilding: where its children's results start on the
|
|
71
|
-
// result stack, and the next child to visit.
|
|
72
64
|
interface ReplaceFrame {
|
|
73
65
|
expr: number;
|
|
74
66
|
shift: number;
|
|
@@ -76,15 +68,13 @@ interface ReplaceFrame {
|
|
|
76
68
|
next: number;
|
|
77
69
|
}
|
|
78
70
|
|
|
79
|
-
// Rebuilds expr with each free variable replaced. replace gets the variable, its de Bruijn index
|
|
80
|
-
// relative to expr, and the number of binders above it. Like Z3's rewriter_tpl, it keeps its own
|
|
81
|
-
// stack, so deep terms do not exhaust the call stack.
|
|
82
71
|
export const replaceFreeVars = (
|
|
83
72
|
manager: AstManager,
|
|
84
73
|
expr: number,
|
|
85
74
|
replace: (variable: number, index: number, shift: number) => number,
|
|
86
75
|
) => {
|
|
87
76
|
const cache = new Map<number, number>();
|
|
77
|
+
const numNodes = manager.kinds.length;
|
|
88
78
|
const frames: ReplaceFrame[] = [];
|
|
89
79
|
const results: number[] = [];
|
|
90
80
|
const visit = (current: number, shift: number) => {
|
|
@@ -92,7 +82,7 @@ export const replaceFreeVars = (
|
|
|
92
82
|
results.push(current);
|
|
93
83
|
return;
|
|
94
84
|
}
|
|
95
|
-
const key =
|
|
85
|
+
const key = shift * numNodes + current;
|
|
96
86
|
const cached = cache.get(key);
|
|
97
87
|
if (cached !== undefined) results.push(cached);
|
|
98
88
|
else if (manager.kinds[current] !== KIND_VAR)
|
|
@@ -108,30 +98,34 @@ export const replaceFreeVars = (
|
|
|
108
98
|
const frame = frames[frames.length - 1];
|
|
109
99
|
const current = frame.expr;
|
|
110
100
|
const data = manager.kinds[current] === KIND_QUANTIFIER ? manager.getQuantifier(current) : null;
|
|
111
|
-
|
|
112
|
-
|
|
101
|
+
const quantifierChildren =
|
|
102
|
+
data === null ? [] : [data.body, ...data.patterns, ...data.noPatterns];
|
|
103
|
+
const numChildren = data === null ? manager.getNumArgs(current) : quantifierChildren.length;
|
|
113
104
|
if (frame.next < numChildren) {
|
|
114
105
|
const index = frame.next++;
|
|
115
106
|
if (data === null) visit(manager.getArg(current, index), frame.shift);
|
|
116
|
-
else
|
|
117
|
-
visit(index === 0 ? data.body : data.patterns[index - 1], frame.shift + data.sorts.length);
|
|
107
|
+
else visit(quantifierChildren[index], frame.shift + data.sorts.length);
|
|
118
108
|
continue;
|
|
119
109
|
}
|
|
120
110
|
const children = results.splice(frame.start);
|
|
121
111
|
const result =
|
|
122
112
|
data === null
|
|
123
113
|
? manager.mkApp(manager.decls[current], children, manager.sorts[current])
|
|
124
|
-
:
|
|
114
|
+
: children.every((child, index) => child === quantifierChildren[index])
|
|
115
|
+
? current
|
|
116
|
+
: manager.mkQuantifier({
|
|
117
|
+
...data,
|
|
118
|
+
body: children[0],
|
|
119
|
+
patterns: children.slice(1, 1 + data.patterns.length),
|
|
120
|
+
noPatterns: children.slice(1 + data.patterns.length),
|
|
121
|
+
});
|
|
125
122
|
frames.pop();
|
|
126
|
-
cache.set(
|
|
123
|
+
cache.set(frame.shift * numNodes + current, result);
|
|
127
124
|
results.push(result);
|
|
128
125
|
}
|
|
129
126
|
return results[0];
|
|
130
127
|
};
|
|
131
128
|
|
|
132
|
-
// used_vars::process: the sort of each free variable of expr below count, indexed by de Bruijn
|
|
133
|
-
// index, undefined for a variable that does not occur. Like Z3, it walks the term without rebuilding
|
|
134
|
-
// it, and visits a shared term once for each number of binders above it.
|
|
135
129
|
export const getFreeVarSorts = (manager: AstManager, expr: number, count: number) => {
|
|
136
130
|
const sorts: (number | undefined)[] = Array.from({ length: count }, () => undefined);
|
|
137
131
|
const exprs = [expr];
|
|
@@ -141,7 +135,7 @@ export const getFreeVarSorts = (manager: AstManager, expr: number, count: number
|
|
|
141
135
|
const delta = deltas.pop() ?? 0;
|
|
142
136
|
if (manager.freeVarBounds[current] <= delta) continue;
|
|
143
137
|
if (manager.getRefCount(current) > 1) {
|
|
144
|
-
const key =
|
|
138
|
+
const key = delta * manager.kinds.length + current;
|
|
145
139
|
if (visited.has(key)) continue;
|
|
146
140
|
visited.add(key);
|
|
147
141
|
}
|
|
@@ -151,13 +145,12 @@ export const getFreeVarSorts = (manager: AstManager, expr: number, count: number
|
|
|
151
145
|
if (index < count && sorts[index] === undefined) sorts[index] = manager.sorts[current];
|
|
152
146
|
} else if (kind === KIND_APP)
|
|
153
147
|
for (let index = 0; index < manager.getNumArgs(current); index++) {
|
|
154
|
-
|
|
155
|
-
exprs.push(arg);
|
|
148
|
+
exprs.push(manager.getArg(current, index));
|
|
156
149
|
deltas.push(delta);
|
|
157
150
|
}
|
|
158
151
|
else {
|
|
159
152
|
const data = manager.getQuantifier(current);
|
|
160
|
-
for (const child of [data.body, ...data.patterns]) {
|
|
153
|
+
for (const child of [data.body, ...data.patterns, ...data.noPatterns]) {
|
|
161
154
|
exprs.push(child);
|
|
162
155
|
deltas.push(delta + data.sorts.length);
|
|
163
156
|
}
|
|
@@ -166,12 +159,9 @@ export const getFreeVarSorts = (manager: AstManager, expr: number, count: number
|
|
|
166
159
|
return sorts;
|
|
167
160
|
};
|
|
168
161
|
|
|
169
|
-
// Which variables of a quantifier body occur, indexed by de Bruijn index.
|
|
170
162
|
export const collectUsedVars = (manager: AstManager, expr: number, count: number) =>
|
|
171
163
|
getFreeVarSorts(manager, expr, count).map((sort) => sort !== undefined);
|
|
172
164
|
|
|
173
|
-
// unused_vars_eliminator: drops the variables that neither the body nor a pattern uses. Its
|
|
174
|
-
// var_subst keeps the cache of its last substitution until the next one.
|
|
175
165
|
export class UnusedVarsEliminator {
|
|
176
166
|
private subst: VarSubst;
|
|
177
167
|
|
|
@@ -179,20 +169,20 @@ export class UnusedVarsEliminator {
|
|
|
179
169
|
this.subst = new VarSubst(manager, true);
|
|
180
170
|
}
|
|
181
171
|
|
|
182
|
-
// The result comes with a reference, which the caller releases.
|
|
183
172
|
apply(expr: number) {
|
|
184
173
|
const manager = this.manager;
|
|
185
174
|
return manager.withoutTemporaries(() => {
|
|
186
|
-
const data =
|
|
187
|
-
|
|
188
|
-
|
|
175
|
+
const data =
|
|
176
|
+
manager.kinds[expr] === KIND_QUANTIFIER && !manager.isLambda(expr)
|
|
177
|
+
? manager.getQuantifier(expr)
|
|
178
|
+
: null;
|
|
179
|
+
const kept = data === null ? expr : manager.isGroundApp(data.body) ? data.body : -1;
|
|
189
180
|
if (kept !== -1 || data === null) {
|
|
190
181
|
manager.incRef(kept);
|
|
191
182
|
return kept;
|
|
192
183
|
}
|
|
193
|
-
// used_vars: the sort of each free variable of the body and the patterns.
|
|
194
184
|
const usedSorts: (number | undefined)[] = [];
|
|
195
|
-
for (const term of [data.body, ...data.patterns])
|
|
185
|
+
for (const term of [data.body, ...data.patterns, ...data.noPatterns])
|
|
196
186
|
getFreeVarSorts(manager, term, manager.freeVarBounds[term]).forEach((sort, index) => {
|
|
197
187
|
if (sort !== undefined) usedSorts[index] = sort;
|
|
198
188
|
});
|
|
@@ -208,7 +198,6 @@ export class UnusedVarsEliminator {
|
|
|
208
198
|
keptSorts.push(sort);
|
|
209
199
|
keptNames.push(data.names[index]);
|
|
210
200
|
});
|
|
211
|
-
// var_mapping: (:var i) becomes the variable it moves to, and an unused variable stays.
|
|
212
201
|
const mapping: number[] = [];
|
|
213
202
|
let numRemoved = 0;
|
|
214
203
|
for (let index = 0; index < Math.max(numDecls, usedSorts.length); index++) {
|
|
@@ -228,13 +217,24 @@ export class UnusedVarsEliminator {
|
|
|
228
217
|
numRemoved === numDecls
|
|
229
218
|
? []
|
|
230
219
|
: data.patterns.map((pattern) => this.subst.apply(pattern, mapping));
|
|
220
|
+
const noPatterns =
|
|
221
|
+
numRemoved === numDecls
|
|
222
|
+
? []
|
|
223
|
+
: data.noPatterns.map((noPattern) => this.subst.apply(noPattern, mapping));
|
|
231
224
|
const result =
|
|
232
225
|
numRemoved === numDecls
|
|
233
226
|
? body
|
|
234
|
-
: manager.mkQuantifier({
|
|
227
|
+
: manager.mkQuantifier({
|
|
228
|
+
...data,
|
|
229
|
+
sorts: keptSorts,
|
|
230
|
+
names: keptNames,
|
|
231
|
+
body,
|
|
232
|
+
patterns,
|
|
233
|
+
noPatterns,
|
|
234
|
+
});
|
|
235
235
|
if (result !== body) {
|
|
236
236
|
manager.incRef(result);
|
|
237
|
-
for (const pattern of patterns) manager.decRef(pattern);
|
|
237
|
+
for (const pattern of [...patterns, ...noPatterns]) manager.decRef(pattern);
|
|
238
238
|
manager.decRef(body);
|
|
239
239
|
}
|
|
240
240
|
for (const variable of mapping) if (variable !== -1) manager.decRef(variable);
|
|
@@ -242,13 +242,11 @@ export class UnusedVarsEliminator {
|
|
|
242
242
|
});
|
|
243
243
|
}
|
|
244
244
|
|
|
245
|
-
// ~unused_vars_eliminator.
|
|
246
245
|
release() {
|
|
247
246
|
this.subst.release();
|
|
248
247
|
}
|
|
249
248
|
}
|
|
250
249
|
|
|
251
|
-
// elim_unused_vars: unused_vars_eliminator with a var_subst of its own. The result is a temporary.
|
|
252
250
|
export const elimUnusedVars = (manager: AstManager, expr: number) => {
|
|
253
251
|
const eliminator = new UnusedVarsEliminator(manager);
|
|
254
252
|
const result = eliminator.apply(expr);
|
package/src/prover/smt/table.ts
CHANGED
|
@@ -1,9 +1,5 @@
|
|
|
1
|
-
// encode/n_table.ml: the axioms tlapm's SMT encoding can assert, in the order it prints them.
|
|
2
|
-
|
|
3
1
|
import { compareValues } from "../ocaml";
|
|
4
2
|
|
|
5
|
-
// The order of tlapm's Table.tla_axm constructors. OCaml compares constant constructors before
|
|
6
|
-
// those with arguments, so the axioms of an obligation print in this order.
|
|
7
3
|
const CONSTANT_AXIOMS = [
|
|
8
4
|
"ChooseDef",
|
|
9
5
|
"ChooseExt",
|
|
@@ -124,7 +120,6 @@ const BLOCK_AXIOMS = [
|
|
|
124
120
|
"AssertIsSetOf",
|
|
125
121
|
];
|
|
126
122
|
|
|
127
|
-
// Table.tla_smb's typed constant constructors, which Typing takes, in order.
|
|
128
123
|
export const TYPED_SYMBOLS = [
|
|
129
124
|
"TIntPlus",
|
|
130
125
|
"TIntUminus",
|
|
@@ -135,10 +130,8 @@ export const TYPED_SYMBOLS = [
|
|
|
135
130
|
"TIntLteq",
|
|
136
131
|
];
|
|
137
132
|
|
|
138
|
-
export type AxiomArgument = number | string |
|
|
133
|
+
export type AxiomArgument = number | bigint | string | AxiomArgument[];
|
|
139
134
|
|
|
140
|
-
// An axiom without a formula belongs to a second-order symbol. Flattening instantiates it for
|
|
141
|
-
// each use of the symbol, and otherwise it isn't printed.
|
|
142
135
|
export interface Axiom {
|
|
143
136
|
name: string;
|
|
144
137
|
args: AxiomArgument[];
|
|
@@ -158,13 +151,13 @@ export const axiom = (
|
|
|
158
151
|
formula,
|
|
159
152
|
});
|
|
160
153
|
|
|
161
|
-
export const getAxiomKey = (entry: Axiom) =>
|
|
154
|
+
export const getAxiomKey = (entry: Axiom) =>
|
|
155
|
+
`${entry.name} ${JSON.stringify(entry.args, (_key, value: unknown) => (typeof value === "bigint" ? `${value}n` : value))}`;
|
|
162
156
|
|
|
163
157
|
const getAxiomRank = (entry: Axiom) => {
|
|
164
158
|
const constant = CONSTANT_AXIOMS.indexOf(entry.name);
|
|
165
159
|
return constant === -1 ? CONSTANT_AXIOMS.length + BLOCK_AXIOMS.indexOf(entry.name) : constant;
|
|
166
160
|
};
|
|
167
161
|
|
|
168
|
-
// N_axiomatize.TlaAxmSet orders axioms as OCaml's compare does.
|
|
169
162
|
export const compareAxioms = (left: Axiom, right: Axiom) =>
|
|
170
163
|
getAxiomRank(left) - getAxiomRank(right) || compareValues(left.args, right.args);
|
|
@@ -0,0 +1,146 @@
|
|
|
1
|
+
import type { Expr, Sequent } from "../../obligations/expression";
|
|
2
|
+
import type { AxiomArgument } from "./table";
|
|
3
|
+
|
|
4
|
+
export type Type =
|
|
5
|
+
| { kind: "Idv" | "Bool" | "Int" | "Real" | "String" }
|
|
6
|
+
| { kind: "Set"; element: Type }
|
|
7
|
+
| { kind: "Fun"; domain: Type; range: Type }
|
|
8
|
+
| { kind: "Product"; items: Type[] }
|
|
9
|
+
| { kind: "Record"; fields: { name: string; type: Type }[] };
|
|
10
|
+
|
|
11
|
+
export const IDV: Type = { kind: "Idv" };
|
|
12
|
+
export const BOOL: Type = { kind: "Bool" };
|
|
13
|
+
export const INT: Type = { kind: "Int" };
|
|
14
|
+
export const STRING: Type = { kind: "String" };
|
|
15
|
+
|
|
16
|
+
const ATOMS = ["Idv", "Bool", "Int", "Real", "String"];
|
|
17
|
+
|
|
18
|
+
export const getTypeName = (type: Type): string => {
|
|
19
|
+
switch (type.kind) {
|
|
20
|
+
case "Set":
|
|
21
|
+
return `Set$${getTypeName(type.element)}$`;
|
|
22
|
+
case "Fun":
|
|
23
|
+
return `Fun$${getTypeName(type.domain)}${getTypeName(type.range)}$`;
|
|
24
|
+
case "Product":
|
|
25
|
+
return `Prd$${type.items.map(getTypeName).join("")}$`;
|
|
26
|
+
case "Record":
|
|
27
|
+
return `Rec${type.fields.map((field) => `!${field.name}${getTypeName(field.type)}`).join("")}$`;
|
|
28
|
+
default:
|
|
29
|
+
return type.kind;
|
|
30
|
+
}
|
|
31
|
+
};
|
|
32
|
+
|
|
33
|
+
export const isSameType = (left: Type, right: Type) => getTypeName(left) === getTypeName(right);
|
|
34
|
+
|
|
35
|
+
// The order Stdlib.compare gives T_t.ty, whose constructors TVar and TFSet tla-ts never builds.
|
|
36
|
+
export const getTypeKey = (type: Type): AxiomArgument => {
|
|
37
|
+
switch (type.kind) {
|
|
38
|
+
case "Set":
|
|
39
|
+
return [2, getTypeKey(type.element)];
|
|
40
|
+
case "Fun":
|
|
41
|
+
return [4, getTypeKey(type.domain), getTypeKey(type.range)];
|
|
42
|
+
case "Product":
|
|
43
|
+
return [5, type.items.map(getTypeKey)];
|
|
44
|
+
case "Record":
|
|
45
|
+
return [6, type.fields.map((field) => [field.name, getTypeKey(field.type)])];
|
|
46
|
+
default:
|
|
47
|
+
return [1, ATOMS.indexOf(type.kind)];
|
|
48
|
+
}
|
|
49
|
+
};
|
|
50
|
+
|
|
51
|
+
// The SMT sort of a value of this type. tlapm also gives a STRING-bounded variable the sort String,
|
|
52
|
+
// though its membership in StrSet then needs an Idv, so a string stays an Idv here.
|
|
53
|
+
export const getSort = (type: Type | undefined) =>
|
|
54
|
+
type?.kind === "Int" || type?.kind === "Bool" ? type.kind : "Idv";
|
|
55
|
+
|
|
56
|
+
interface Search {
|
|
57
|
+
infer: (expression: Expr, depth: number) => Type | undefined;
|
|
58
|
+
isTarget: (expression: Expr, depth: number) => boolean;
|
|
59
|
+
}
|
|
60
|
+
|
|
61
|
+
const getBuiltin = (expression: Expr) =>
|
|
62
|
+
expression.kind === "Apply" && expression.operator.kind === "Internal"
|
|
63
|
+
? expression.operator.builtin
|
|
64
|
+
: undefined;
|
|
65
|
+
|
|
66
|
+
const getFirst = (items: (() => Type | undefined)[]) =>
|
|
67
|
+
items.reduce<Type | undefined>((found, item) => found ?? item(), undefined);
|
|
68
|
+
|
|
69
|
+
const getAgreed = (left: () => Type | undefined, right: () => Type | undefined) => {
|
|
70
|
+
const found = left();
|
|
71
|
+
if (found === undefined) return undefined;
|
|
72
|
+
const next = right();
|
|
73
|
+
return next !== undefined && isSameType(found, next) ? next : undefined;
|
|
74
|
+
};
|
|
75
|
+
|
|
76
|
+
const visit = (
|
|
77
|
+
search: Search,
|
|
78
|
+
isPositive: boolean,
|
|
79
|
+
depth: number,
|
|
80
|
+
expression: Expr,
|
|
81
|
+
): Type | undefined => {
|
|
82
|
+
const builtin = getBuiltin(expression);
|
|
83
|
+
const args = expression.kind === "Apply" ? expression.args : [];
|
|
84
|
+
const recurse = (inner: Expr, isInnerPositive = isPositive) =>
|
|
85
|
+
visit(search, isInnerPositive, depth, inner);
|
|
86
|
+
switch (builtin) {
|
|
87
|
+
case "Mem":
|
|
88
|
+
case "Notmem":
|
|
89
|
+
if (
|
|
90
|
+
args.length === 2 &&
|
|
91
|
+
search.isTarget(args[0], depth) &&
|
|
92
|
+
(builtin === "Notmem") === isPositive
|
|
93
|
+
) {
|
|
94
|
+
const type = search.infer(args[1], depth);
|
|
95
|
+
return type?.kind === "Set" ? type.element : undefined;
|
|
96
|
+
}
|
|
97
|
+
return undefined;
|
|
98
|
+
case "Eq":
|
|
99
|
+
case "Neq": {
|
|
100
|
+
if (args.length !== 2 || (builtin === "Neq") !== isPositive) return undefined;
|
|
101
|
+
if (search.isTarget(args[0], depth)) return search.infer(args[1], depth);
|
|
102
|
+
return search.isTarget(args[1], depth) ? search.infer(args[0], depth) : undefined;
|
|
103
|
+
}
|
|
104
|
+
case "Conj":
|
|
105
|
+
case "Disj":
|
|
106
|
+
return (builtin === "Disj") === isPositive
|
|
107
|
+
? getFirst(args.map((arg) => () => recurse(arg)))
|
|
108
|
+
: getAgreed(
|
|
109
|
+
() => recurse(args[0]),
|
|
110
|
+
() => recurse(args[1]),
|
|
111
|
+
);
|
|
112
|
+
case "Neg":
|
|
113
|
+
return recurse(args[0], !isPositive);
|
|
114
|
+
case "Implies":
|
|
115
|
+
return getFirst([() => recurse(args[0], !isPositive), () => recurse(args[1])]);
|
|
116
|
+
}
|
|
117
|
+
switch (expression.kind) {
|
|
118
|
+
// T_hyps folds a list that must agree from None, so it never agrees.
|
|
119
|
+
case "List":
|
|
120
|
+
return expression.bullet !== "Refs" && (expression.bullet === "Or") === isPositive
|
|
121
|
+
? getFirst(expression.items.map((item) => () => recurse(item)))
|
|
122
|
+
: undefined;
|
|
123
|
+
case "Quant":
|
|
124
|
+
return (expression.quantifier === "Forall") === isPositive
|
|
125
|
+
? visit(search, isPositive, depth + expression.bounds.length, expression.body)
|
|
126
|
+
: undefined;
|
|
127
|
+
case "Sequent":
|
|
128
|
+
return isPositive ? visitSequent(search, depth, expression.sequent) : undefined;
|
|
129
|
+
default:
|
|
130
|
+
return undefined;
|
|
131
|
+
}
|
|
132
|
+
};
|
|
133
|
+
|
|
134
|
+
const visitSequent = (search: Search, depth: number, sequent: Sequent) =>
|
|
135
|
+
getFirst([
|
|
136
|
+
...sequent.context.map(
|
|
137
|
+
(hyp, index) => () =>
|
|
138
|
+
hyp.kind === "Fact" && hyp.visibility === "Visible"
|
|
139
|
+
? visit(search, false, depth + index, hyp.expression)
|
|
140
|
+
: undefined,
|
|
141
|
+
),
|
|
142
|
+
() => visit(search, true, depth + sequent.context.length, sequent.active),
|
|
143
|
+
]);
|
|
144
|
+
|
|
145
|
+
export const searchType = (search: Search, isPositive: boolean, expression: Expr) =>
|
|
146
|
+
visit(search, isPositive, 0, expression);
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// tlapm's fingerprints file, ported from src/backend/fpfile.ml.
|
|
2
|
-
|
|
3
1
|
import {
|
|
4
2
|
cpSync,
|
|
5
3
|
existsSync,
|
|
@@ -14,30 +12,54 @@ import {
|
|
|
14
12
|
import { basename, join } from "node:path";
|
|
15
13
|
import { version } from "../../../package.json";
|
|
16
14
|
import { TlaProofError } from "../../errors";
|
|
17
|
-
import {
|
|
18
|
-
|
|
15
|
+
import {
|
|
16
|
+
createBlock,
|
|
17
|
+
isBlock,
|
|
18
|
+
readMarshaled,
|
|
19
|
+
writeMarshaled,
|
|
20
|
+
type OcamlValue,
|
|
21
|
+
} from "./ocaml-marshal";
|
|
22
|
+
import { getBudget } from "../prep/methods";
|
|
23
|
+
import { getFailureReason, isProvedAttempt, type ProofAttempt } from "../prove";
|
|
24
|
+
import { BACKENDS } from "../verdict";
|
|
19
25
|
|
|
20
|
-
// One optional result per prover, in V13.str's order.
|
|
21
26
|
export type FingerprintTable = Map<string, OcamlValue[]>;
|
|
22
27
|
|
|
23
28
|
const MAGIC_NUMBER = 20210223;
|
|
24
29
|
|
|
25
30
|
const RECORD_SIZE = 23;
|
|
26
31
|
|
|
27
|
-
|
|
28
|
-
|
|
32
|
+
const STORED_PROVERS = [
|
|
33
|
+
...BACKENDS,
|
|
34
|
+
"cooper",
|
|
35
|
+
"expandenabled",
|
|
36
|
+
"expandcdot",
|
|
37
|
+
"lambdify",
|
|
38
|
+
"enabledaxioms",
|
|
39
|
+
"levelcomparison",
|
|
40
|
+
] as const;
|
|
41
|
+
|
|
42
|
+
type StoredProver = (typeof STORED_PROVERS)[number];
|
|
43
|
+
|
|
44
|
+
// A constant constructor's tag is the value itself.
|
|
45
|
+
const PROVERS: Record<StoredProver, { field: number; tag: number; isConstant?: boolean }> = {
|
|
29
46
|
zenon: { field: 1, tag: 1 },
|
|
30
47
|
isabelle: { field: 2, tag: 0 },
|
|
48
|
+
cooper: { field: 4, tag: 3, isConstant: true },
|
|
31
49
|
smt: { field: 10, tag: 8 },
|
|
32
50
|
z3: { field: 11, tag: 9 },
|
|
33
51
|
ls4: { field: 17, tag: 16 },
|
|
52
|
+
expandenabled: { field: 18, tag: 6, isConstant: true },
|
|
53
|
+
expandcdot: { field: 19, tag: 8, isConstant: true },
|
|
54
|
+
lambdify: { field: 20, tag: 9, isConstant: true },
|
|
55
|
+
enabledaxioms: { field: 21, tag: 10, isConstant: true },
|
|
56
|
+
levelcomparison: { field: 22, tag: 11, isConstant: true },
|
|
34
57
|
};
|
|
35
58
|
|
|
36
59
|
const FAIL_METHOD = 5;
|
|
37
60
|
|
|
38
61
|
const REASONS = ["false", "timeout"];
|
|
39
62
|
|
|
40
|
-
// Stored as the tlapm, Zenon and Isabelle versions, which --safefp compares.
|
|
41
63
|
const VERSION = `tla-ts ${version}`;
|
|
42
64
|
|
|
43
65
|
const CHECKED_VERSIONS = new Map([
|
|
@@ -53,13 +75,12 @@ const getField = (value: OcamlValue | undefined, index: number) =>
|
|
|
53
75
|
const getFloat = (value: OcamlValue | undefined) =>
|
|
54
76
|
value !== undefined && typeof value === "object" && "float" in value ? value.float : Infinity;
|
|
55
77
|
|
|
56
|
-
// Hashtbl.hash on a string.
|
|
57
78
|
const hashKey = (key: string) => {
|
|
58
79
|
const bytes = new TextEncoder().encode(key);
|
|
59
80
|
const rotate = (value: number, shift: number) => (value << shift) | (value >>> (32 - shift));
|
|
60
81
|
const mixed = Array.from(
|
|
61
82
|
{ length: Math.ceil(bytes.length / 4) },
|
|
62
|
-
(
|
|
83
|
+
(_value, index) =>
|
|
63
84
|
bytes[index * 4] |
|
|
64
85
|
(bytes[index * 4 + 1] << 8) |
|
|
65
86
|
(bytes[index * 4 + 2] << 16) |
|
|
@@ -78,7 +99,6 @@ const readBucket = (entry: OcamlValue | undefined): [OcamlValue, OcamlValue][] =
|
|
|
78
99
|
? [[entry.fields[0], entry.fields[1]], ...readBucket(entry.fields[2])]
|
|
79
100
|
: [];
|
|
80
101
|
|
|
81
|
-
// Fpfile.load_fingerprints. Each bucket lists the latest fingerprint first.
|
|
82
102
|
export const loadFingerprints = (table: FingerprintTable, path: string, isSafe: boolean) => {
|
|
83
103
|
const bytes = readFileSync(path);
|
|
84
104
|
const magic = readMarshaled(bytes, 0);
|
|
@@ -93,17 +113,20 @@ export const loadFingerprints = (table: FingerprintTable, path: string, isSafe:
|
|
|
93
113
|
table.clear();
|
|
94
114
|
(buckets !== undefined && isBlock(buckets) ? buckets.fields : [])
|
|
95
115
|
.flatMap((bucket) => readBucket(bucket).toReversed())
|
|
96
|
-
.forEach((
|
|
97
|
-
if (typeof
|
|
116
|
+
.forEach((entry) => {
|
|
117
|
+
if (typeof entry[0] !== "string" || !isBlock(entry[1]))
|
|
98
118
|
throw new TlaProofError("corrupted fingerprint file");
|
|
99
119
|
table.set(
|
|
100
|
-
|
|
101
|
-
|
|
120
|
+
entry[0],
|
|
121
|
+
entry[1].fields.map((result, field) => (isTrusted(result, field) ? result : 0)),
|
|
102
122
|
);
|
|
103
123
|
});
|
|
104
124
|
};
|
|
105
125
|
|
|
106
|
-
const decodeResult = (
|
|
126
|
+
const decodeResult = (
|
|
127
|
+
prover: StoredProver,
|
|
128
|
+
result: OcamlValue | undefined,
|
|
129
|
+
): ProofAttempt | undefined => {
|
|
107
130
|
const status = getField(result, 0);
|
|
108
131
|
const outcome = getField(status, 0);
|
|
109
132
|
const argument = getField(getField(status, 1), 0);
|
|
@@ -112,45 +135,48 @@ const decodeResult = (prover: string, result: OcamlValue | undefined): ProofAtte
|
|
|
112
135
|
const tactic = prover === "isabelle" ? getField(argument, 1) : undefined;
|
|
113
136
|
const reason = getField(getField(outcome, 0), 0);
|
|
114
137
|
return {
|
|
138
|
+
kind: "stored",
|
|
115
139
|
method: {
|
|
116
140
|
prover,
|
|
117
141
|
timeLimitMs: seconds * 1000,
|
|
118
142
|
...(typeof tactic === "string" && { tactic }),
|
|
119
143
|
},
|
|
120
144
|
isProved: outcome === 0,
|
|
121
|
-
isReused: false,
|
|
122
145
|
...(reason !== undefined && {
|
|
123
146
|
reason: typeof reason === "number" ? REASONS[reason] : String(getField(reason, 0)),
|
|
124
147
|
}),
|
|
125
148
|
};
|
|
126
149
|
};
|
|
127
150
|
|
|
128
|
-
// Fpfile.fp_writes
|
|
129
|
-
const encodeResult = (attempt: ProofAttempt) => {
|
|
151
|
+
// Fpfile.fp_writes counts the date's months from 0.
|
|
152
|
+
const encodeResult = (prover: StoredProver, attempt: ProofAttempt) => {
|
|
130
153
|
const now = new Date();
|
|
131
154
|
const method = attempt.method;
|
|
132
|
-
const timeout = { float: method
|
|
155
|
+
const timeout = { float: getBudget(method) };
|
|
133
156
|
const argument =
|
|
134
|
-
|
|
135
|
-
?
|
|
136
|
-
:
|
|
137
|
-
?
|
|
138
|
-
:
|
|
139
|
-
const
|
|
157
|
+
prover === "zenon"
|
|
158
|
+
? createBlock(0, timeout, FAIL_METHOD)
|
|
159
|
+
: prover === "isabelle"
|
|
160
|
+
? createBlock(0, createBlock(0, timeout), method.tactic ?? "auto")
|
|
161
|
+
: createBlock(0, timeout);
|
|
162
|
+
const failure = getFailureReason(attempt);
|
|
163
|
+
const reasonIndex = REASONS.indexOf(failure ?? "");
|
|
140
164
|
const reason =
|
|
141
|
-
|
|
165
|
+
failure === undefined
|
|
142
166
|
? 0
|
|
143
|
-
:
|
|
144
|
-
return
|
|
167
|
+
: createBlock(0, reasonIndex === -1 ? createBlock(0, failure) : reasonIndex);
|
|
168
|
+
return createBlock(
|
|
145
169
|
0,
|
|
146
|
-
|
|
170
|
+
createBlock(
|
|
147
171
|
0,
|
|
148
|
-
|
|
172
|
+
createBlock(
|
|
149
173
|
0,
|
|
150
|
-
attempt
|
|
151
|
-
|
|
174
|
+
isProvedAttempt(attempt) ? 0 : createBlock(0, reason),
|
|
175
|
+
PROVERS[prover].isConstant
|
|
176
|
+
? PROVERS[prover].tag
|
|
177
|
+
: createBlock(PROVERS[prover].tag, argument),
|
|
152
178
|
),
|
|
153
|
-
|
|
179
|
+
createBlock(
|
|
154
180
|
0,
|
|
155
181
|
now.getFullYear(),
|
|
156
182
|
now.getMonth(),
|
|
@@ -171,14 +197,13 @@ const encodeTable = (table: FingerprintTable) => {
|
|
|
171
197
|
const buckets: OcamlValue[] = Array.from({ length }, () => 0);
|
|
172
198
|
table.forEach((record, fingerprint) => {
|
|
173
199
|
const index = hashKey(fingerprint) & (length - 1);
|
|
174
|
-
buckets[index] =
|
|
200
|
+
buckets[index] = createBlock(0, fingerprint, createBlock(0, ...record), buckets[index]);
|
|
175
201
|
});
|
|
176
|
-
return
|
|
202
|
+
return createBlock(0, createBlock(0, table.size, createBlock(0, ...buckets), 0, 512));
|
|
177
203
|
};
|
|
178
204
|
|
|
179
205
|
const pad = (value: number) => String(value).padStart(2, "0");
|
|
180
206
|
|
|
181
|
-
// Fpfile.fp_init.
|
|
182
207
|
export const saveHistory = (path: string, sources: string[]) => {
|
|
183
208
|
const now = new Date();
|
|
184
209
|
const history = `${path}.history`;
|
|
@@ -197,32 +222,33 @@ export const saveHistory = (path: string, sources: string[]) => {
|
|
|
197
222
|
.forEach((old) => rmSync(old, { recursive: true, force: true }));
|
|
198
223
|
};
|
|
199
224
|
|
|
200
|
-
// Fpfile.query: what each prover concluded for each fingerprint. Saving them, as fp_writes,
|
|
201
|
-
// add_to_table and fp_close_and_consolidate do, keeps each record and result loaded unchanged, with
|
|
202
|
-
// its date, versions and other provers' results.
|
|
203
225
|
export const getKnownResults = (table: FingerprintTable) => {
|
|
204
226
|
const storedResults = new Map<ProofAttempt, OcamlValue>();
|
|
205
227
|
const storedRecords = new Map<Map<string, ProofAttempt>, OcamlValue[]>();
|
|
206
228
|
const results = new Map(
|
|
207
|
-
[...table].map((
|
|
229
|
+
[...table].map((entry) => {
|
|
208
230
|
const attempts = new Map(
|
|
209
|
-
|
|
210
|
-
const
|
|
231
|
+
STORED_PROVERS.flatMap((prover) => {
|
|
232
|
+
const stored = entry[1][PROVERS[prover].field];
|
|
233
|
+
const result = decodeResult(prover, getField(stored, 0));
|
|
211
234
|
if (!result) return [];
|
|
212
|
-
storedResults.set(result,
|
|
235
|
+
storedResults.set(result, stored);
|
|
213
236
|
return [[prover, result]];
|
|
214
237
|
}),
|
|
215
238
|
);
|
|
216
|
-
storedRecords.set(attempts,
|
|
217
|
-
return [
|
|
239
|
+
storedRecords.set(attempts, entry[1]);
|
|
240
|
+
return [entry[0], attempts];
|
|
218
241
|
}),
|
|
219
242
|
);
|
|
220
243
|
const save = (path: string) => {
|
|
221
244
|
table.clear();
|
|
222
245
|
results.forEach((attempts, fingerprint) => {
|
|
223
246
|
const record = [...(storedRecords.get(attempts) ?? Array<OcamlValue>(RECORD_SIZE).fill(0))];
|
|
224
|
-
|
|
225
|
-
|
|
247
|
+
STORED_PROVERS.forEach((prover) => {
|
|
248
|
+
const attempt = attempts.get(prover);
|
|
249
|
+
if (attempt)
|
|
250
|
+
record[PROVERS[prover].field] =
|
|
251
|
+
storedResults.get(attempt) ?? encodeResult(prover, attempt);
|
|
226
252
|
});
|
|
227
253
|
table.set(fingerprint, record);
|
|
228
254
|
});
|