tla-ts 0.0.9-dev.8298a52 → 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 +8 -0
- package/dist/compile.cjs +6 -6
- package/dist/compile.js +10 -10
- package/dist/deciders.cjs +41 -37
- package/dist/deciders.js +57 -53
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +121 -12
- package/dist/index.d.ts +121 -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 +1 -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 +1155 -900
- 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 +318 -656
- package/src/cli/typescript.ts +0 -3
- 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 +260 -371
- package/src/errors.ts +93 -58
- package/src/evaluate.ts +848 -374
- package/src/exit-codes.ts +63 -13
- package/src/fingerprints.ts +75 -11
- package/src/index.ts +3 -0
- package/src/instances.ts +97 -43
- 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 -325
- package/src/liveness.ts +224 -131
- 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 +34 -57
- package/src/parallel.ts +62 -72
- 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 +129 -38
- 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 +296 -105
- 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 +10 -25
- package/src/typescript/collections.ts +34 -35
- package/src/typescript/compile.ts +1 -8
- package/src/typescript/context.ts +0 -12
- package/src/typescript/emit.ts +0 -1
- package/src/typescript/expressions.ts +0 -12
- package/src/typescript/formula.ts +9 -15
- package/src/typescript/functions.ts +6 -17
- package/src/typescript/model.ts +14 -16
- package/src/typescript/names.ts +0 -2
- package/src/typescript/program.ts +0 -3
- package/src/typescript/properties.ts +6 -8
- package/src/typescript/scope.ts +0 -5
- package/src/typescript/steps.ts +20 -28
- package/src/typescript/types.ts +3 -10
- package/src/values.ts +917 -522
- 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,15 +1,9 @@
|
|
|
1
|
-
// Ported from Zenon's eqrel.ml, as shipped in tlapm. Copyright 2004 INRIA, see LICENSE.
|
|
2
|
-
//
|
|
3
|
-
// Finds the hypotheses that make a relation reflexive, symmetric or transitive. The prover then
|
|
4
|
-
// reasons with those properties directly, and drops the hypotheses that only state them. The
|
|
5
|
-
// translation to Isar proves the properties again from the hypotheses that stated them.
|
|
6
|
-
|
|
7
1
|
import { TRUE, type Expr, type Expressions } from "./expr";
|
|
8
2
|
|
|
9
3
|
export type Direction = "left" | "right";
|
|
10
4
|
|
|
11
|
-
|
|
12
|
-
|
|
5
|
+
export type RelationProperty = "reflexive" | "symmetric" | "transitive";
|
|
6
|
+
|
|
13
7
|
export interface Origin {
|
|
14
8
|
formula: Expr;
|
|
15
9
|
directions: Direction[];
|
|
@@ -21,7 +15,6 @@ interface RelationInfo {
|
|
|
21
15
|
symmetric: Origin | undefined;
|
|
22
16
|
transitive: Origin | undefined;
|
|
23
17
|
transitiveSymmetric: Origin | undefined;
|
|
24
|
-
// The type of the relation's arguments.
|
|
25
18
|
type: string;
|
|
26
19
|
}
|
|
27
20
|
|
|
@@ -30,8 +23,6 @@ interface Bound {
|
|
|
30
23
|
type: string;
|
|
31
24
|
}
|
|
32
25
|
|
|
33
|
-
// A conjunct of a hypothesis: the variables quantified around it and the literals of its
|
|
34
|
-
// disjunction, when they all relate two of those variables by the same symbol.
|
|
35
26
|
interface Leaves {
|
|
36
27
|
directions: Direction[];
|
|
37
28
|
env: Bound[];
|
|
@@ -125,7 +116,6 @@ const getPair = (leaf: Expr) => {
|
|
|
125
116
|
return [args[0].symbol, args[1].symbol];
|
|
126
117
|
};
|
|
127
118
|
|
|
128
|
-
// The leaves as Zenon's partition returns them: positive and negative, each reversed.
|
|
129
119
|
const partition = (leaves: Expr[]) => ({
|
|
130
120
|
positive: leaves
|
|
131
121
|
.filter((leaf) => leaf.kind !== "not")
|
|
@@ -137,8 +127,6 @@ const partition = (leaves: Expr[]) => ({
|
|
|
137
127
|
.map(getPair),
|
|
138
128
|
});
|
|
139
129
|
|
|
140
|
-
// Each check returns the variables that the translation instantiates to prove the property, or
|
|
141
|
-
// undefined when the conjunct doesn't state it.
|
|
142
130
|
const getReflexive = (leaves: Expr[]) => {
|
|
143
131
|
if (leaves.length !== 1 || leaves[0].kind === "not") return undefined;
|
|
144
132
|
const pair = getPair(leaves[0]);
|
|
@@ -292,7 +280,6 @@ export const createRelations = (exprs: Expressions) => {
|
|
|
292
280
|
record.transitive !== undefined)
|
|
293
281
|
);
|
|
294
282
|
},
|
|
295
|
-
// Where the hypotheses state a relation's properties, for the translation to Isar.
|
|
296
283
|
get,
|
|
297
284
|
};
|
|
298
285
|
};
|
|
@@ -1,14 +1,10 @@
|
|
|
1
|
-
// Ported from Zenon's prove.ml, as shipped in tlapm. Copyright 2002 INRIA, see LICENSE.
|
|
2
|
-
//
|
|
3
|
-
// The rules for equality and other relations: instances that unify a metavariable, matching a
|
|
4
|
-
// literal against its negation, congruence, reflexivity, symmetry and transitivity.
|
|
5
|
-
|
|
6
1
|
import { TlaZenonError } from "../../errors";
|
|
7
2
|
import {
|
|
8
3
|
isApp,
|
|
9
4
|
isNegatedRelation,
|
|
10
5
|
isRelation,
|
|
11
6
|
isMeta,
|
|
7
|
+
preunify,
|
|
12
8
|
type Expr,
|
|
13
9
|
type NegatedRelationExpr,
|
|
14
10
|
type NotExpr,
|
|
@@ -50,7 +46,6 @@ const makeInstance = (
|
|
|
50
46
|
]),
|
|
51
47
|
);
|
|
52
48
|
}
|
|
53
|
-
// Zenon hands applications to the extension named by the symbol's prefix, and tla has none.
|
|
54
49
|
if (quantified.kind === "app") return queue;
|
|
55
50
|
throw new TlaZenonError("Zenon: make_inst on a formula that isn't quantified");
|
|
56
51
|
};
|
|
@@ -210,6 +205,29 @@ export const addReflexivity: SearchRule = (context, queue, formula, goalness) =>
|
|
|
210
205
|
return [queue, false];
|
|
211
206
|
};
|
|
212
207
|
|
|
208
|
+
export const addPreunification: SearchRule = (context, queue, formula, goalness) => {
|
|
209
|
+
const matches =
|
|
210
|
+
formula.kind === "not" && formula.args[0].kind === "app"
|
|
211
|
+
? context.index.getPositive(formula.args[0].symbol)
|
|
212
|
+
: formula.kind === "app"
|
|
213
|
+
? context.index.getNegative(formula.symbol)
|
|
214
|
+
: undefined;
|
|
215
|
+
if (matches === undefined) return [queue, false];
|
|
216
|
+
let current = queue;
|
|
217
|
+
for (let matchIndex = matches.length - 1; matchIndex >= 0; matchIndex--) {
|
|
218
|
+
const pairs = preunify(matches[matchIndex], formula);
|
|
219
|
+
for (let pairIndex = 0; pairIndex < pairs.length; pairIndex++)
|
|
220
|
+
current = makeInstance(
|
|
221
|
+
context.exprs,
|
|
222
|
+
current,
|
|
223
|
+
pairs[pairIndex][0],
|
|
224
|
+
pairs[pairIndex][1],
|
|
225
|
+
Math.min(goalness, context.index.getGoalness(matches[matchIndex])),
|
|
226
|
+
);
|
|
227
|
+
}
|
|
228
|
+
return [current, false];
|
|
229
|
+
};
|
|
230
|
+
|
|
213
231
|
export const addCongruence: SearchRule = (context, queue, formula, goalness) => {
|
|
214
232
|
const exprs = context.exprs;
|
|
215
233
|
if (formula.kind !== "not" || !isApp(formula.args[0], "=", 2)) return [queue, false];
|
package/src/prover/zenon/expr.ts
CHANGED
|
@@ -1,13 +1,6 @@
|
|
|
1
|
-
// Ported from Zenon's expr.ml, as shipped in tlapm. Copyright 2002 INRIA, see LICENSE.
|
|
2
|
-
//
|
|
3
|
-
// Formulas and terms, hash-consed so that equal expressions are the same object. Like Zenon,
|
|
4
|
-
// equality treats bound variables up to renaming, and a hash ignores the names of bound variables.
|
|
5
|
-
// Each run builds its expressions in its own store, so that fresh names and hashes start over.
|
|
6
|
-
|
|
7
1
|
import { TlaZenonError } from "../../errors";
|
|
8
2
|
import { combine, createHasher, toInt63, type Int63 } from "./ocaml";
|
|
9
3
|
|
|
10
|
-
// What every expression caches about itself.
|
|
11
4
|
interface ExprData {
|
|
12
5
|
id: number;
|
|
13
6
|
hash: number;
|
|
@@ -24,7 +17,6 @@ export interface VarExpr extends ExprData {
|
|
|
24
17
|
args: [];
|
|
25
18
|
}
|
|
26
19
|
|
|
27
|
-
// A metavariable stands for a term that instantiates its quantifier.
|
|
28
20
|
export interface MetaExpr extends ExprData {
|
|
29
21
|
kind: "meta";
|
|
30
22
|
symbol: "";
|
|
@@ -55,7 +47,6 @@ export interface ConstantExpr extends ExprData {
|
|
|
55
47
|
args: [];
|
|
56
48
|
}
|
|
57
49
|
|
|
58
|
-
// `symbol` is the type of the bound variable.
|
|
59
50
|
export interface BinderExpr extends ExprData {
|
|
60
51
|
kind: "all" | "ex" | "tau" | "lam";
|
|
61
52
|
symbol: string;
|
|
@@ -66,7 +57,6 @@ export type Expr = VarExpr | MetaExpr | AppExpr | NotExpr | BinaryExpr | Constan
|
|
|
66
57
|
|
|
67
58
|
export type ExprKind = Expr["kind"];
|
|
68
59
|
|
|
69
|
-
// An application to two arguments, such as an equality or another relation between two terms.
|
|
70
60
|
export type RelationExpr = AppExpr & { args: [Expr, Expr] };
|
|
71
61
|
|
|
72
62
|
export type NegatedRelationExpr = NotExpr & { args: [RelationExpr] };
|
|
@@ -121,8 +111,6 @@ const isBinder = (expression: Expr): expression is BinderExpr =>
|
|
|
121
111
|
expression.kind === "tau" ||
|
|
122
112
|
expression.kind === "lam";
|
|
123
113
|
|
|
124
|
-
// Zenon's str_union: the names of the first list missing from the second, in reverse, then the
|
|
125
|
-
// second. Hashes depend on this order.
|
|
126
114
|
const unionNames = (left: string[], right: string[]) => {
|
|
127
115
|
if (left.length === 0) return right;
|
|
128
116
|
if (right.length === 0) return left;
|
|
@@ -139,7 +127,6 @@ const removeName = (name: string, names: string[]) => {
|
|
|
139
127
|
export const difference = (left: Expr[], right: Expr[]) =>
|
|
140
128
|
left.filter((inner) => !right.includes(inner));
|
|
141
129
|
|
|
142
|
-
// Zenon's union on small sets: the first list's new elements in reverse, then the second list.
|
|
143
130
|
export const union = (left: Expr[], right: Expr[]) => {
|
|
144
131
|
const added = difference(left, right);
|
|
145
132
|
return added.length === 0 ? right : [...added.reverse(), ...right];
|
|
@@ -212,7 +199,6 @@ const isEqualBody = (leftVar: Expr, rightVar: Expr, left: Expr, right: Expr) =>
|
|
|
212
199
|
);
|
|
213
200
|
};
|
|
214
201
|
|
|
215
|
-
// Zenon's HashedExpr.equal on two binders whose children are already hash-consed.
|
|
216
202
|
const isSameBinder = (left: BinderExpr, right: BinderExpr) =>
|
|
217
203
|
left.kind === right.kind &&
|
|
218
204
|
left.symbol === right.symbol &&
|
|
@@ -220,8 +206,6 @@ const isSameBinder = (left: BinderExpr, right: BinderExpr) =>
|
|
|
220
206
|
? left.args[1] === right.args[1]
|
|
221
207
|
: isEqualBody(left.args[0], right.args[0], left.args[1], right.args[1]));
|
|
222
208
|
|
|
223
|
-
// The symbol is part of the narrowed type, so a failed test for one symbol keeps the expression an
|
|
224
|
-
// application for the next test.
|
|
225
209
|
export const isApp = <Symbol extends string>(
|
|
226
210
|
expression: Expr,
|
|
227
211
|
symbol: Symbol,
|
|
@@ -231,6 +215,11 @@ export const isApp = <Symbol extends string>(
|
|
|
231
215
|
expression.symbol === symbol &&
|
|
232
216
|
(arity === undefined || expression.args.length === arity);
|
|
233
217
|
|
|
218
|
+
export const getStringName = (expression: Expr) =>
|
|
219
|
+
isApp(expression, "$string", 1) && expression.args[0].kind === "var"
|
|
220
|
+
? expression.args[0].symbol
|
|
221
|
+
: undefined;
|
|
222
|
+
|
|
234
223
|
export const isMeta = (expression: Expr): expression is MetaExpr => expression.kind === "meta";
|
|
235
224
|
|
|
236
225
|
export const isRelation = (expression: Expr): expression is RelationExpr =>
|
|
@@ -239,7 +228,6 @@ export const isRelation = (expression: Expr): expression is RelationExpr =>
|
|
|
239
228
|
export const isNegatedRelation = (expression: Expr): expression is NegatedRelationExpr =>
|
|
240
229
|
expression.kind === "not" && isRelation(expression.args[0]);
|
|
241
230
|
|
|
242
|
-
// Zenon orders by hash, and only breaks ties structurally.
|
|
243
231
|
export const compareExprs = (left: Expr, right: Expr): number => {
|
|
244
232
|
if (left.hash !== right.hash) return left.hash < right.hash ? -1 : 1;
|
|
245
233
|
if (left === right) return 0;
|
|
@@ -253,6 +241,27 @@ export const compareExprs = (left: Expr, right: Expr): number => {
|
|
|
253
241
|
return 0;
|
|
254
242
|
};
|
|
255
243
|
|
|
244
|
+
const NO_PAIRS: readonly [Expr, Expr][] = [];
|
|
245
|
+
|
|
246
|
+
const xpreunify = (
|
|
247
|
+
accu: readonly [Expr, Expr][],
|
|
248
|
+
left: Expr,
|
|
249
|
+
right: Expr,
|
|
250
|
+
): readonly [Expr, Expr][] | undefined => {
|
|
251
|
+
if (left === right) return accu;
|
|
252
|
+
if (left.kind === "app" && right.kind === "app" && left.symbol === right.symbol) {
|
|
253
|
+
let current: readonly [Expr, Expr][] | undefined = accu;
|
|
254
|
+
for (let index = 0; index < left.args.length && current !== undefined; index++)
|
|
255
|
+
current = xpreunify(current, left.args[index], right.args[index]);
|
|
256
|
+
return current;
|
|
257
|
+
}
|
|
258
|
+
if (left.kind === "meta") return [[left.args[0], right], ...accu];
|
|
259
|
+
if (right.kind === "meta") return [[right.args[0], left], ...accu];
|
|
260
|
+
return undefined;
|
|
261
|
+
};
|
|
262
|
+
|
|
263
|
+
export const preunify = (left: Expr, right: Expr) => xpreunify(NO_PAIRS, left, right) ?? NO_PAIRS;
|
|
264
|
+
|
|
256
265
|
type Substitution = [Expr, Expr][];
|
|
257
266
|
|
|
258
267
|
const lookup = (map: Substitution, variable: Expr) => map.find((pair) => pair[0] === variable)?.[1];
|
|
@@ -263,20 +272,14 @@ const isIrrelevant = (names: string[], map: Substitution) =>
|
|
|
263
272
|
const hasConflict = (variable: Expr, map: Substitution) =>
|
|
264
273
|
map.some((pair) => pair[1].freeVars.includes(variable.symbol));
|
|
265
274
|
|
|
266
|
-
// The store of one run's expressions, and the operations that build expressions in it.
|
|
267
275
|
export const createExpressions = () => {
|
|
268
276
|
const hasher = createHasher();
|
|
269
|
-
// Binders are hash-consed by hash, since they're equal up to the names of their variables. Other
|
|
270
|
-
// expressions are equal exactly when their kind, symbol and children are, so they're found by
|
|
271
|
-
// those before their hash is computed.
|
|
272
277
|
const binders = new Map<number, BinderExpr[]>();
|
|
273
278
|
const interned = new Map<number, Expr[]>();
|
|
274
|
-
// Numbers for the symbols, so an expression hashes by its symbol and children without strings.
|
|
275
279
|
const symbolIds = new Map<string, number>();
|
|
276
280
|
let nextId = FALSE.id + 1;
|
|
277
281
|
let createdCount = 0;
|
|
278
|
-
// Zenon's Ext_focal takes the first five fresh names
|
|
279
|
-
// definitions, so the first name Zenon gives out is zenon_Vf.
|
|
282
|
+
// Zenon's Ext_focal takes the first five fresh names at startup, so the first name Zenon gives out is zenon_Vf.
|
|
280
283
|
let nameCounter = "e";
|
|
281
284
|
|
|
282
285
|
const create = <Shape extends Pick<Expr, "kind" | "symbol" | "args">>(
|
|
@@ -437,8 +440,6 @@ export const createExpressions = () => {
|
|
|
437
440
|
return evar(VAR_PREFIX + nameCounter);
|
|
438
441
|
};
|
|
439
442
|
|
|
440
|
-
// A binder's variable for a substitution, renamed when the substituted values capture it, and
|
|
441
|
-
// the substitution to apply to its body.
|
|
442
443
|
const enterBinder = (expression: BinderExpr, map: Substitution): [VarExpr, Substitution] => {
|
|
443
444
|
const variable = expression.args[0];
|
|
444
445
|
const rest = map.filter((pair) => pair[0] !== variable);
|
|
@@ -486,8 +487,6 @@ export const createExpressions = () => {
|
|
|
486
487
|
return results;
|
|
487
488
|
};
|
|
488
489
|
|
|
489
|
-
// Zenon's substitute_2nd: also replaces applied symbols bound in the map, for definitions with
|
|
490
|
-
// operator parameters. Undefined stands for Zenon's Higher_order exception.
|
|
491
490
|
const substituteSecondOrder = (map: Substitution, expression: Expr): Expr | undefined => {
|
|
492
491
|
switch (expression.kind) {
|
|
493
492
|
case "var":
|
|
@@ -529,6 +528,8 @@ export const createExpressions = () => {
|
|
|
529
528
|
emeta,
|
|
530
529
|
eapp,
|
|
531
530
|
enot,
|
|
531
|
+
binary,
|
|
532
|
+
binder,
|
|
532
533
|
eand: (left: Expr, right: Expr) => binary("and", left, right),
|
|
533
534
|
eor: (left: Expr, right: Expr) => binary("or", left, right),
|
|
534
535
|
eimply: (left: Expr, right: Expr) => binary("imply", left, right),
|
|
@@ -1,10 +1,6 @@
|
|
|
1
|
-
// Ported from Zenon's index.ml, as shipped in tlapm. Copyright 2004 INRIA, see LICENSE.
|
|
2
|
-
//
|
|
3
|
-
// The formulas on the current branch, indexed by head symbol, by the sides of equalities and
|
|
4
|
-
// transitive relations, and the cache of proved lemmas. Formulas are added and removed in LIFO
|
|
5
|
-
// order as the search descends and backtracks. Lists keep Zenon's order, latest first.
|
|
6
|
-
|
|
7
1
|
import {
|
|
2
|
+
getStringName,
|
|
3
|
+
isApp,
|
|
8
4
|
isNegatedRelation,
|
|
9
5
|
isRelation,
|
|
10
6
|
type Expr,
|
|
@@ -27,7 +23,6 @@ interface Suspect {
|
|
|
27
23
|
records: LemmaRecord[];
|
|
28
24
|
}
|
|
29
25
|
|
|
30
|
-
// A stack of values per key, as a Hashtbl with Hashtbl.add and Hashtbl.remove.
|
|
31
26
|
const pushValue = <Key, Value>(table: Map<Key, Value[]>, key: Key, value: Value) => {
|
|
32
27
|
const values = table.get(key);
|
|
33
28
|
if (values === undefined) table.set(key, [value]);
|
|
@@ -44,7 +39,6 @@ const popValue = <Key, Value>(table: Map<Key, Value[]>, key: Key) => {
|
|
|
44
39
|
const getLatestFirst = <Key, Value>(table: Map<Key, Value[]>, key: Key) =>
|
|
45
40
|
[...(table.get(key) ?? [])].reverse();
|
|
46
41
|
|
|
47
|
-
// Zenon's head of a term, or undefined for No_head. Taus and metavariables are heads by identity.
|
|
48
42
|
type Head = string | Expr;
|
|
49
43
|
|
|
50
44
|
export const getHead = (expression: Expr): Head | undefined => {
|
|
@@ -68,19 +62,10 @@ export const getHead = (expression: Expr): Head | undefined => {
|
|
|
68
62
|
}
|
|
69
63
|
};
|
|
70
64
|
|
|
71
|
-
// Zenon indexes formulas by head under a string; every tau shares "t." and every metavariable "".
|
|
72
65
|
const getHeadKey = (head: Head) =>
|
|
73
66
|
typeof head === "string" ? head : head.kind === "tau" ? "t." : "";
|
|
74
67
|
|
|
75
|
-
//
|
|
76
|
-
// drops the key whatever the element, as Zenon does.
|
|
77
|
-
const addElement = <Key, Value>(table: Map<Key, Value[]>, key: Key, value: Value) => {
|
|
78
|
-
const values = table.get(key);
|
|
79
|
-
if (values === undefined) table.set(key, [value]);
|
|
80
|
-
else values.push(value);
|
|
81
|
-
};
|
|
82
|
-
|
|
83
|
-
// False stands for Zenon's Not_found.
|
|
68
|
+
// Removing from a one-element list drops the key whatever the element, as Zenon does.
|
|
84
69
|
const removeElement = <Key, Value>(table: Map<Key, Value[]>, key: Key, value: Value) => {
|
|
85
70
|
const values = table.get(key);
|
|
86
71
|
if (values === undefined) return false;
|
|
@@ -89,9 +74,6 @@ const removeElement = <Key, Value>(table: Map<Key, Value[]>, key: Key, value: Va
|
|
|
89
74
|
return true;
|
|
90
75
|
};
|
|
91
76
|
|
|
92
|
-
const getValues = <Key, Value>(table: Map<Key, Value[]>, key: Key) => getLatestFirst(table, key);
|
|
93
|
-
|
|
94
|
-
// Keys pair a relation with a head. Heads that are expressions are told apart by identity.
|
|
95
77
|
const getHeadId = (head: Head) => (typeof head === "string" ? `s${head}` : `e${head.id}`);
|
|
96
78
|
|
|
97
79
|
const getRelationKey = (relation: string, head: Head) => `${relation}\u0000${getHeadId(head)}`;
|
|
@@ -129,7 +111,6 @@ export const createIndex = (exprs: Expressions) => {
|
|
|
129
111
|
const withGoalness = <Formula extends Expr>(list: Formula[]): [Formula, number][] =>
|
|
130
112
|
list.map((formula) => [formula, getGoalness(formula)]);
|
|
131
113
|
|
|
132
|
-
// Zenon's negpos: a negation under the head of its operand, anything else under its own head.
|
|
133
114
|
const actOnHead = (
|
|
134
115
|
formula: Expr,
|
|
135
116
|
action: <Formula extends Expr>(
|
|
@@ -147,35 +128,23 @@ export const createIndex = (exprs: Expressions) => {
|
|
|
147
128
|
if (head !== undefined) action(positive, getHeadKey(head), formula);
|
|
148
129
|
};
|
|
149
130
|
|
|
150
|
-
const getStringLiteral = (expression: Expr) =>
|
|
151
|
-
expression.kind === "app" &&
|
|
152
|
-
expression.symbol === "$string" &&
|
|
153
|
-
expression.args.length === 1 &&
|
|
154
|
-
expression.args[0].kind === "var"
|
|
155
|
-
? expression.args[0].symbol
|
|
156
|
-
: undefined;
|
|
157
|
-
|
|
158
131
|
const getStringEquality = (formula: Expr) => {
|
|
159
|
-
if (formula
|
|
160
|
-
|
|
161
|
-
const rightString = getStringLiteral(formula.args[1]);
|
|
132
|
+
if (!isApp(formula, "=", 2)) return undefined;
|
|
133
|
+
const rightString = getStringName(formula.args[1]);
|
|
162
134
|
if (rightString !== undefined)
|
|
163
135
|
return { isReversed: false, term: formula.args[0], value: rightString };
|
|
164
|
-
const leftString =
|
|
136
|
+
const leftString = getStringName(formula.args[0]);
|
|
165
137
|
return leftString === undefined
|
|
166
138
|
? undefined
|
|
167
139
|
: { isReversed: true, term: formula.args[1], value: leftString };
|
|
168
140
|
};
|
|
169
141
|
|
|
170
|
-
const isEquality = (formula: Expr) =>
|
|
171
|
-
formula.kind === "app" && formula.symbol === "=" && formula.args.length === 2;
|
|
172
|
-
|
|
173
142
|
const add = (formula: Expr, goalness: number) => {
|
|
174
143
|
pushValue(formulas, formula, goalness);
|
|
175
|
-
if (
|
|
144
|
+
if (isApp(formula, "=", 2)) {
|
|
176
145
|
pushValue(equalLeftRight, formula.args[0], formula.args[1]);
|
|
177
146
|
pushValue(equalRightLeft, formula.args[1], formula.args[0]);
|
|
178
|
-
} else if (formula.kind === "not" &&
|
|
147
|
+
} else if (formula.kind === "not" && isApp(formula.args[0], "=", 2)) {
|
|
179
148
|
pushValue(unequalLeftRight, formula.args[0].args[0], formula.args[0].args[1]);
|
|
180
149
|
pushValue(unequalRightLeft, formula.args[0].args[1], formula.args[0].args[0]);
|
|
181
150
|
}
|
|
@@ -187,7 +156,7 @@ export const createIndex = (exprs: Expressions) => {
|
|
|
187
156
|
]);
|
|
188
157
|
formulaCount++;
|
|
189
158
|
topFormulaCount = Math.max(topFormulaCount, formulaCount);
|
|
190
|
-
actOnHead(formula,
|
|
159
|
+
actOnHead(formula, pushValue);
|
|
191
160
|
const lemma = lemmas.get(formula);
|
|
192
161
|
if (lemma !== undefined) lemma.isPresent = true;
|
|
193
162
|
newFormulas.unshift(formula);
|
|
@@ -228,10 +197,10 @@ export const createIndex = (exprs: Expressions) => {
|
|
|
228
197
|
const stringEquality = getStringEquality(formula);
|
|
229
198
|
if (stringEquality !== undefined)
|
|
230
199
|
(stringEquality.isReversed ? reversedStringEqualities : stringEqualities).shift();
|
|
231
|
-
if (
|
|
200
|
+
if (isApp(formula, "=", 2)) {
|
|
232
201
|
popValue(equalLeftRight, formula.args[0]);
|
|
233
202
|
popValue(equalRightLeft, formula.args[1]);
|
|
234
|
-
} else if (formula.kind === "not" &&
|
|
203
|
+
} else if (formula.kind === "not" && isApp(formula.args[0], "=", 2)) {
|
|
235
204
|
popValue(unequalLeftRight, formula.args[0].args[0]);
|
|
236
205
|
popValue(unequalRightLeft, formula.args[0].args[1]);
|
|
237
206
|
}
|
|
@@ -240,14 +209,13 @@ export const createIndex = (exprs: Expressions) => {
|
|
|
240
209
|
if (lemma !== undefined) lemma.isPresent = false;
|
|
241
210
|
};
|
|
242
211
|
|
|
243
|
-
// Zenon's add_trans, which stops at the first side without a head. False means No_head.
|
|
244
212
|
const addTrans = (formula: RelationExpr) => {
|
|
245
213
|
const leftHead = getHead(formula.args[0]);
|
|
246
214
|
if (leftHead === undefined) return false;
|
|
247
|
-
|
|
215
|
+
pushValue(transLeft, getRelationKey(formula.symbol, leftHead), formula);
|
|
248
216
|
const rightHead = getHead(formula.args[1]);
|
|
249
217
|
if (rightHead === undefined) return false;
|
|
250
|
-
|
|
218
|
+
pushValue(transRight, getRelationKey(formula.symbol, rightHead), formula);
|
|
251
219
|
return true;
|
|
252
220
|
};
|
|
253
221
|
|
|
@@ -255,13 +223,13 @@ export const createIndex = (exprs: Expressions) => {
|
|
|
255
223
|
const relation = formula.args[0];
|
|
256
224
|
const leftHead = getHead(relation.args[0]);
|
|
257
225
|
if (leftHead !== undefined) {
|
|
258
|
-
|
|
259
|
-
|
|
226
|
+
pushValue(negTransLeft, getRelationKey(relation.symbol, leftHead), formula);
|
|
227
|
+
pushValue(allNegTransLeft, getHeadId(leftHead), formula);
|
|
260
228
|
}
|
|
261
229
|
const rightHead = getHead(relation.args[1]);
|
|
262
230
|
if (rightHead !== undefined) {
|
|
263
|
-
|
|
264
|
-
|
|
231
|
+
pushValue(negTransRight, getRelationKey(relation.symbol, rightHead), formula);
|
|
232
|
+
pushValue(allNegTransRight, getHeadId(rightHead), formula);
|
|
265
233
|
}
|
|
266
234
|
};
|
|
267
235
|
|
|
@@ -276,8 +244,6 @@ export const createIndex = (exprs: Expressions) => {
|
|
|
276
244
|
suspects.unshift([{ proof, cursor: 0, records }]);
|
|
277
245
|
};
|
|
278
246
|
|
|
279
|
-
// A cached lemma whose conclusions are all on the branch. A lemma waits on the first conclusion
|
|
280
|
-
// that is missing, and is checked again when that formula comes back.
|
|
281
247
|
const searchLemma = (): Proof | undefined => {
|
|
282
248
|
for (const formula of newFormulas) {
|
|
283
249
|
const record = lemmas.get(formula);
|
|
@@ -296,8 +262,11 @@ export const createIndex = (exprs: Expressions) => {
|
|
|
296
262
|
const suspect = group[0];
|
|
297
263
|
const count = suspect.records.length;
|
|
298
264
|
const missing = [
|
|
299
|
-
...Array.from(
|
|
300
|
-
|
|
265
|
+
...Array.from(
|
|
266
|
+
{ length: count - suspect.cursor },
|
|
267
|
+
(_value, offset) => suspect.cursor + offset,
|
|
268
|
+
),
|
|
269
|
+
...Array.from({ length: suspect.cursor }, (_value, offset) => offset),
|
|
301
270
|
].find((index) => !suspect.records[index].isPresent);
|
|
302
271
|
if (missing === undefined) return suspect.proof;
|
|
303
272
|
suspects = [group.slice(1), ...suspects.slice(1)];
|
|
@@ -312,8 +281,10 @@ export const createIndex = (exprs: Expressions) => {
|
|
|
312
281
|
remove,
|
|
313
282
|
isMember,
|
|
314
283
|
getGoalness,
|
|
315
|
-
findPositive: (symbol: string) => withGoalness(
|
|
316
|
-
findNegative: (symbol: string) => withGoalness(
|
|
284
|
+
findPositive: (symbol: string) => withGoalness(getLatestFirst(positive, symbol)),
|
|
285
|
+
findNegative: (symbol: string) => withGoalness(getLatestFirst(negative, symbol)),
|
|
286
|
+
getPositive: (symbol: string) => positive.get(symbol),
|
|
287
|
+
getNegative: (symbol: string) => negative.get(symbol),
|
|
317
288
|
findEqualRight: (term: Expr) => getLatestFirst(equalLeftRight, term),
|
|
318
289
|
findEqualLeft: (term: Expr) => getLatestFirst(equalRightLeft, term),
|
|
319
290
|
findDisequalities: (term: Expr) => [
|
|
@@ -329,16 +300,17 @@ export const createIndex = (exprs: Expressions) => {
|
|
|
329
300
|
addTrans,
|
|
330
301
|
addNegTrans,
|
|
331
302
|
findTransLeft: (relation: string, head: Head) =>
|
|
332
|
-
withGoalness(
|
|
303
|
+
withGoalness(getLatestFirst(transLeft, getRelationKey(relation, head))),
|
|
333
304
|
findTransRight: (relation: string, head: Head) =>
|
|
334
|
-
withGoalness(
|
|
305
|
+
withGoalness(getLatestFirst(transRight, getRelationKey(relation, head))),
|
|
335
306
|
findNegTransLeft: (relation: string, head: Head) =>
|
|
336
|
-
withGoalness(
|
|
307
|
+
withGoalness(getLatestFirst(negTransLeft, getRelationKey(relation, head))),
|
|
337
308
|
findNegTransRight: (relation: string, head: Head) =>
|
|
338
|
-
withGoalness(
|
|
339
|
-
findAllNegTransLeft: (head: Head) =>
|
|
309
|
+
withGoalness(getLatestFirst(negTransRight, getRelationKey(relation, head))),
|
|
310
|
+
findAllNegTransLeft: (head: Head) =>
|
|
311
|
+
withGoalness(getLatestFirst(allNegTransLeft, getHeadId(head))),
|
|
340
312
|
findAllNegTransRight: (head: Head) =>
|
|
341
|
-
withGoalness(
|
|
313
|
+
withGoalness(getLatestFirst(allNegTransRight, getHeadId(head))),
|
|
342
314
|
addLemma,
|
|
343
315
|
searchLemma,
|
|
344
316
|
addDefinition: (definition: Definition) => definitions.set(definition.symbol, definition),
|
|
@@ -1,20 +1,16 @@
|
|
|
1
|
-
// Ported from Zenon's isar_case.ml and enum.ml, as shipped in tlapm. Copyright 2009 INRIA, see
|
|
2
|
-
// LICENSE.
|
|
3
|
-
//
|
|
4
|
-
// The lemmas for CASE expressions and record sets with more arms or fields than Zenon.thy covers.
|
|
5
|
-
// Each one is a template that Zenon's Enum expands for the arity: the text between @@@ and ...
|
|
6
|
-
// repeats counting up, the text between ... and @@@ repeats counting down.
|
|
7
|
-
|
|
8
1
|
import { TlaZenonError } from "../../errors";
|
|
9
2
|
|
|
10
|
-
// A run of digits or of other characters.
|
|
11
3
|
interface Lexeme {
|
|
12
4
|
isNumber: boolean;
|
|
13
5
|
text: string;
|
|
14
6
|
}
|
|
15
7
|
|
|
16
|
-
|
|
17
|
-
|
|
8
|
+
interface Progression {
|
|
9
|
+
base: number;
|
|
10
|
+
step: number;
|
|
11
|
+
}
|
|
12
|
+
|
|
13
|
+
type Piece = string | Progression;
|
|
18
14
|
|
|
19
15
|
interface Pattern {
|
|
20
16
|
pieces: Piece[];
|
|
@@ -26,7 +22,6 @@ const isDigit = (char: string | undefined) => char !== undefined && char >= "0"
|
|
|
26
22
|
const lex = (text: string): Lexeme[] =>
|
|
27
23
|
text.match(/[0-9]+|[^0-9]+/g)?.map((run) => ({ isNumber: isDigit(run[0]), text: run })) ?? [];
|
|
28
24
|
|
|
29
|
-
// The repeated text and the separator of a pattern without numbers: its two equal halves.
|
|
30
25
|
const splitText = (text: string): Pattern => {
|
|
31
26
|
const half = Math.floor(text.length / 2);
|
|
32
27
|
const odd = text.length % 2;
|
|
@@ -50,8 +45,6 @@ const correlate = (first: Lexeme[], second: Lexeme[]): Piece[] | undefined => {
|
|
|
50
45
|
return pieces.every((piece) => piece !== undefined) ? pieces : undefined;
|
|
51
46
|
};
|
|
52
47
|
|
|
53
|
-
// Zenon's split_sep: the separator inside the middle text, after the end of the first instance's
|
|
54
|
-
// last lexeme and before the start of the second instance's first.
|
|
55
48
|
const splitSeparator = (
|
|
56
49
|
before: Lexeme,
|
|
57
50
|
middle: string,
|
|
@@ -69,7 +62,6 @@ const splitSeparator = (
|
|
|
69
62
|
];
|
|
70
63
|
};
|
|
71
64
|
|
|
72
|
-
// Zenon's split_sep2, for two instances that meet between two numbers.
|
|
73
65
|
const splitSeparatorBetween = (
|
|
74
66
|
before: Lexeme,
|
|
75
67
|
first: Lexeme,
|
|
@@ -95,7 +87,6 @@ const splitSeparatorBetween = (
|
|
|
95
87
|
throw new TlaZenonError("Zenon: a template whose instances don't meet");
|
|
96
88
|
};
|
|
97
89
|
|
|
98
|
-
// Zenon's Enum.parse: a template's text holds two instances of the pattern and the separator.
|
|
99
90
|
const parsePattern = (text: string): Pattern | undefined => {
|
|
100
91
|
const lexemes = lex(text);
|
|
101
92
|
const length = lexemes.length;
|
|
@@ -132,14 +123,13 @@ const parsePattern = (text: string): Pattern | undefined => {
|
|
|
132
123
|
return pieces === undefined ? undefined : { pieces, separator: split[1] };
|
|
133
124
|
};
|
|
134
125
|
|
|
135
|
-
const getInstance = (pieces: Piece[],
|
|
136
|
-
pieces.map((piece) => (typeof piece === "string" ? piece : String(
|
|
126
|
+
const getInstance = (pieces: Piece[], getValue: (piece: Progression) => number) =>
|
|
127
|
+
pieces.map((piece) => (typeof piece === "string" ? piece : String(getValue(piece)))).join("");
|
|
137
128
|
|
|
138
|
-
// Zenon's expand_string and expand_string_rev: the pattern repeated count times.
|
|
139
129
|
const expandPattern = (count: number, text: string, isReversed: boolean) => {
|
|
140
130
|
const pattern = parsePattern(text);
|
|
141
131
|
if (pattern === undefined) return undefined;
|
|
142
|
-
const positions = Array.from({ length: count }, (
|
|
132
|
+
const positions = Array.from({ length: count }, (_value, position) =>
|
|
143
133
|
isReversed ? count - 1 - position : position,
|
|
144
134
|
);
|
|
145
135
|
return positions
|
|
@@ -153,7 +143,6 @@ const expandPattern = (count: number, text: string, isReversed: boolean) => {
|
|
|
153
143
|
.join(pattern.separator);
|
|
154
144
|
};
|
|
155
145
|
|
|
156
|
-
// Zenon's read_suffix: a count adjustment such as [n-1] after the end marker.
|
|
157
146
|
const readAdjustment = (text: string, position: number): [number, number] => {
|
|
158
147
|
const match = /^\[n(?:\]|([+-])([0-9]*)\])/.exec(text.slice(position));
|
|
159
148
|
if (match === null) return [0, position];
|
|
@@ -168,7 +157,6 @@ const trimNewlines = (text: string) => {
|
|
|
168
157
|
throw new TlaZenonError("Zenon: a bad template");
|
|
169
158
|
};
|
|
170
159
|
|
|
171
|
-
// Zenon's Enum.expand_text.
|
|
172
160
|
const expandTemplate = (count: number, template: string) => {
|
|
173
161
|
const parts: string[] = [];
|
|
174
162
|
let position = 0;
|