tla-ts 0.0.10-dev.f16792fed → 0.0.10-dev.f57f64938
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +2 -1
- package/dist/compile.cjs +6 -6
- package/dist/compile.js +10 -10
- package/dist/deciders.cjs +41 -37
- package/dist/deciders.js +57 -53
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +3 -0
- package/dist/index.d.ts +3 -0
- package/dist/index.js +1 -1
- package/dist/parallel-worker.cjs +1 -1
- package/dist/parallel-worker.js +1 -1
- package/dist/prove.cjs +2682 -426
- package/dist/prove.js +2681 -425
- package/dist/run.cjs +45 -42
- package/dist/run.js +47 -44
- package/dist/tlapm.cjs +2 -2
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +42 -39
- package/dist/transfer.js +42 -39
- package/dist/worker.cjs +7 -7
- package/dist/worker.js +7 -7
- package/package.json +1 -1
- package/src/ast.ts +41 -36
- package/src/builtins.ts +4 -13
- package/src/check-failure.ts +116 -0
- package/src/check-trace.ts +282 -0
- package/src/check.ts +353 -549
- package/src/cli/options.ts +6 -31
- package/src/cli/shared.ts +1 -1
- package/src/cli/tlapm.ts +433 -70
- package/src/cli/tlc-arguments.ts +222 -210
- package/src/cli/tlc-output.ts +687 -0
- package/src/cli/tlc-usage.ts +1 -2
- package/src/cli/tlc.ts +49 -702
- package/src/cli/xml-exporter.ts +23 -33
- package/src/codegen.ts +5 -10
- package/src/coverage.ts +0 -2
- package/src/dependencies.ts +30 -14
- package/src/dfid.ts +16 -16
- package/src/environment-config.ts +315 -0
- package/src/environment.ts +55 -338
- package/src/errors.ts +33 -5
- package/src/evaluate.ts +5 -4
- package/src/exit-codes.ts +1 -0
- package/src/fingerprints.ts +65 -1
- package/src/instances.ts +47 -10
- package/src/json.ts +4 -7
- package/src/levels.ts +39 -42
- package/src/lexer.ts +5 -3
- package/src/liveness-checker.ts +553 -237
- package/src/liveness.ts +94 -86
- package/src/obligations/action.ts +14 -17
- package/src/obligations/anonymize.ts +37 -16
- package/src/obligations/enabled-axioms.ts +218 -0
- package/src/obligations/equality.ts +1 -3
- package/src/obligations/expression.ts +36 -8
- package/src/obligations/format.ts +0 -2
- package/src/obligations/generate.ts +66 -54
- package/src/obligations/index.ts +38 -8
- package/src/obligations/levels.ts +24 -11
- package/src/obligations/module.ts +28 -41
- package/src/obligations/normalize.ts +26 -14
- package/src/obligations/operators.ts +0 -2
- package/src/obligations/pragma.ts +53 -16
- package/src/obligations/printer.ts +43 -13
- package/src/obligations/proof.ts +3 -2
- package/src/obligations/regroup.ts +0 -2
- package/src/obligations/simplify.ts +55 -50
- package/src/obligations/source.ts +118 -74
- package/src/obligations/subexpression.ts +45 -18
- package/src/obligations/substitution.ts +1 -3
- package/src/obligations/temporal.ts +5 -7
- package/src/obligations/tuples.ts +0 -2
- package/src/parallel-worker.ts +10 -30
- package/src/parallel.ts +24 -47
- package/src/parser.ts +580 -180
- package/src/pretty-print.ts +1 -1
- package/src/prover/decide-pool.ts +3 -3
- package/src/prover/deciders.ts +12 -9
- package/src/prover/isabelle/decide.ts +3 -25
- package/src/prover/isabelle/encode.ts +72 -42
- package/src/prover/isabelle/isar/attrib.ts +250 -0
- package/src/prover/isabelle/isar/context.ts +335 -0
- package/src/prover/isabelle/isar/induct.ts +382 -0
- package/src/prover/isabelle/isar/inner-syntax.ts +158 -7
- package/src/prover/isabelle/isar/method.ts +509 -212
- package/src/prover/isabelle/isar/proof.ts +570 -14
- package/src/prover/isabelle/isar/rule-cases.ts +224 -0
- package/src/prover/isabelle/isar/theory.ts +487 -76
- package/src/prover/isabelle/isar/toplevel.ts +331 -0
- package/src/prover/isabelle/isar/type-check.ts +89 -14
- package/src/prover/isabelle/provers/blast/blast.ts +7 -65
- package/src/prover/isabelle/provers/blast/branch.ts +0 -2
- package/src/prover/isabelle/provers/blast/prove.ts +0 -2
- package/src/prover/isabelle/provers/blast/rules.ts +0 -2
- package/src/prover/isabelle/provers/blast/state.ts +0 -2
- package/src/prover/isabelle/provers/blast/term.ts +0 -2
- package/src/prover/isabelle/provers/clasimp.ts +0 -2
- package/src/prover/isabelle/provers/classical.ts +45 -20
- package/src/prover/isabelle/provers/hypsubst.ts +17 -28
- package/src/prover/isabelle/pure/bicompose.ts +9 -27
- package/src/prover/isabelle/pure/consts.ts +0 -2
- package/src/prover/isabelle/pure/conv.ts +2 -10
- package/src/prover/isabelle/pure/drule.ts +72 -6
- package/src/prover/isabelle/pure/envir.ts +0 -2
- package/src/prover/isabelle/pure/goal.ts +1 -3
- package/src/prover/isabelle/pure/logic.ts +1 -3
- package/src/prover/isabelle/pure/name.ts +0 -2
- package/src/prover/isabelle/pure/net.ts +0 -2
- package/src/prover/isabelle/pure/object-logic.ts +13 -7
- package/src/prover/isabelle/pure/pattern.ts +0 -2
- package/src/prover/isabelle/pure/raw-simplifier.ts +4 -15
- package/src/prover/isabelle/pure/rewriter.ts +6 -17
- package/src/prover/isabelle/pure/search.ts +0 -2
- package/src/prover/isabelle/pure/seq.ts +0 -2
- package/src/prover/isabelle/pure/simplifier.ts +26 -7
- package/src/prover/isabelle/pure/table.ts +2 -3
- package/src/prover/isabelle/pure/tactic.ts +0 -2
- package/src/prover/isabelle/pure/tactical.ts +42 -37
- package/src/prover/isabelle/pure/term-ord.ts +0 -2
- package/src/prover/isabelle/pure/term.ts +0 -2
- package/src/prover/isabelle/pure/thm.ts +14 -13
- package/src/prover/isabelle/pure/type.ts +0 -2
- package/src/prover/isabelle/pure/unify.ts +0 -2
- package/src/prover/isabelle/pure/variable.ts +0 -2
- package/src/prover/isabelle/tla/classical-setup.ts +18 -16
- package/src/prover/isabelle/tla/context.ts +58 -11
- package/src/prover/isabelle/tla/logic-data.ts +1 -1
- package/src/prover/isabelle/tla/logic.ts +49 -21
- package/src/prover/isabelle/tla/simpdata.ts +1 -12
- package/src/prover/isabelle/tools/intuitionistic.ts +28 -12
- package/src/prover/ocaml.ts +4 -1
- package/src/prover/prep/action.ts +30 -31
- package/src/prover/prep/enabled-axioms.ts +11 -2
- package/src/prover/prep/fingerprint.ts +2 -5
- package/src/prover/prep/methods.ts +181 -51
- package/src/prover/prep/normalize.ts +38 -9
- package/src/prover/prove.ts +395 -94
- package/src/prover/ptl/decide.ts +95 -50
- package/src/prover/ptl/encode.ts +2 -3
- package/src/prover/ptl/tableau.ts +28 -2
- package/src/prover/smt/arithmetic.ts +310 -0
- package/src/prover/smt/axioms.ts +12 -8
- package/src/prover/smt/context.ts +43 -8
- package/src/prover/smt/data.ts +498 -379
- package/src/prover/smt/encode.ts +148 -57
- package/src/prover/smt/extensionality.ts +5 -3
- package/src/prover/smt/flatten.ts +4 -6
- package/src/prover/smt/format.ts +28 -4
- package/src/prover/smt/instances.ts +7 -1
- package/src/prover/smt/layout.ts +91 -0
- package/src/prover/smt/rewrite.ts +1021 -618
- package/src/prover/smt/simplify.ts +441 -0
- package/src/prover/smt/solver/ackermannize-bv-tactic.ts +61 -0
- package/src/prover/smt/solver/ackr-helper.ts +179 -0
- package/src/prover/smt/solver/ackr-model-converter.ts +105 -0
- package/src/prover/smt/solver/act-cache.ts +0 -1
- package/src/prover/smt/solver/add-bounds-tactic.ts +59 -0
- package/src/prover/smt/solver/aig-tactic.ts +52 -0
- package/src/prover/smt/solver/aig.ts +889 -0
- package/src/prover/smt/solver/arith-rewriter.ts +613 -6
- package/src/prover/smt/solver/arith-terms.ts +121 -0
- package/src/prover/smt/solver/array-decl-plugin.ts +175 -0
- package/src/prover/smt/solver/array-rewriter.ts +309 -0
- package/src/prover/smt/solver/asserted-formulas.ts +87 -16
- package/src/prover/smt/solver/ast-lt.ts +166 -12
- package/src/prover/smt/solver/ast-util.ts +160 -2
- package/src/prover/smt/solver/ast.ts +1427 -41
- package/src/prover/smt/solver/auf-solver.ts +2 -6
- package/src/prover/smt/solver/bit-blast-tactic.ts +582 -0
- package/src/prover/smt/solver/bit-blaster.ts +871 -0
- package/src/prover/smt/solver/bound-manager.ts +196 -0
- package/src/prover/smt/solver/bound-simplifier.ts +600 -0
- package/src/prover/smt/solver/bv-bound-chk.ts +492 -0
- package/src/prover/smt/solver/bv-decl-plugin.ts +338 -0
- package/src/prover/smt/solver/bv-divrem-bounds.ts +95 -0
- package/src/prover/smt/solver/bv-rewriter.ts +1901 -0
- package/src/prover/smt/solver/bv1-blast.ts +214 -0
- package/src/prover/smt/solver/bv2fpa-converter.ts +174 -0
- package/src/prover/smt/solver/bv2int-rewriter.ts +544 -0
- package/src/prover/smt/solver/bv2real-rewriter.ts +533 -0
- package/src/prover/smt/solver/card2bv.ts +110 -0
- package/src/prover/smt/solver/case-split-queue.ts +0 -2
- package/src/prover/smt/solver/cg-table.ts +39 -25
- package/src/prover/smt/solver/check-logic.ts +330 -0
- package/src/prover/smt/solver/clause.ts +0 -1
- package/src/prover/smt/solver/cofactor-elim-term-ite.ts +278 -0
- package/src/prover/smt/solver/conflict-resolution.ts +78 -2
- package/src/prover/smt/solver/context.ts +516 -115
- package/src/prover/smt/solver/ctx-simplify.ts +20 -10
- package/src/prover/smt/solver/ctx-solver-simplify.ts +122 -0
- package/src/prover/smt/solver/datatype-decl-plugin.ts +572 -0
- package/src/prover/smt/solver/datatype-rewriter.ts +82 -0
- package/src/prover/smt/solver/demodulator.ts +786 -0
- package/src/prover/smt/solver/dependent-expr-state.ts +81 -0
- package/src/prover/smt/solver/der.ts +38 -10
- package/src/prover/smt/solver/diff-neq.ts +206 -0
- package/src/prover/smt/solver/distribute-forall.ts +57 -0
- package/src/prover/smt/solver/dom-simplify.ts +511 -0
- package/src/prover/smt/solver/dt2bv-tactic.ts +260 -0
- package/src/prover/smt/solver/dyn-ack.ts +0 -1
- package/src/prover/smt/solver/e-matching.ts +7 -8
- package/src/prover/smt/solver/elim-small-bv-tactic.ts +129 -0
- package/src/prover/smt/solver/elim-uncnstr.ts +545 -0
- package/src/prover/smt/solver/enode.ts +100 -3
- package/src/prover/smt/solver/eq2bv-tactic.ts +218 -0
- package/src/prover/smt/solver/euf/arith-axioms.ts +403 -0
- package/src/prover/smt/solver/euf/arith-internalize.ts +653 -0
- package/src/prover/smt/solver/euf/arith-solver.ts +889 -0
- package/src/prover/smt/solver/euf/array-axioms.ts +527 -0
- package/src/prover/smt/solver/euf/array-internalize.ts +428 -0
- package/src/prover/smt/solver/euf/array-solver.ts +306 -0
- package/src/prover/smt/solver/euf/bv-ackerman.ts +162 -0
- package/src/prover/smt/solver/euf/bv-internalize.ts +748 -0
- package/src/prover/smt/solver/euf/bv-solver.ts +449 -0
- package/src/prover/smt/solver/euf/dt-solver.ts +618 -0
- package/src/prover/smt/solver/euf/egraph.ts +907 -0
- package/src/prover/smt/solver/euf/euf-solver.ts +1205 -0
- package/src/prover/smt/solver/euf/fpa-solver.ts +317 -0
- package/src/prover/smt/solver/euf/mam.ts +1050 -0
- package/src/prover/smt/solver/euf/q-ematch.ts +830 -0
- package/src/prover/smt/solver/euf/q-mbi.ts +587 -0
- package/src/prover/smt/solver/euf/q-model-fixer.ts +296 -0
- package/src/prover/smt/solver/euf/q-solver.ts +361 -0
- package/src/prover/smt/solver/euf/th-solver.ts +335 -0
- package/src/prover/smt/solver/euf/th-solvers.ts +30 -0
- package/src/prover/smt/solver/expr-ref.ts +0 -1
- package/src/prover/smt/solver/expr-safe-replace.ts +26 -2
- package/src/prover/smt/solver/expr2polynomial.ts +146 -0
- package/src/prover/smt/solver/factor.ts +141 -0
- package/src/prover/smt/solver/fd-solver.ts +265 -0
- package/src/prover/smt/solver/fingerprints.ts +15 -15
- package/src/prover/smt/solver/fix-dl-var.ts +148 -0
- package/src/prover/smt/solver/flat-literals.ts +0 -1
- package/src/prover/smt/solver/fm-tactic.ts +884 -0
- package/src/prover/smt/solver/fpa-decl-plugin.ts +618 -0
- package/src/prover/smt/solver/fpa-rewriter.ts +640 -0
- package/src/prover/smt/solver/fpa2bv-converter.ts +2249 -0
- package/src/prover/smt/solver/fpa2bv-rewriter.ts +348 -0
- package/src/prover/smt/solver/fpa2bv-tactic.ts +73 -0
- package/src/prover/smt/solver/goal.ts +175 -15
- package/src/prover/smt/solver/goal2nlsat.ts +189 -0
- package/src/prover/smt/solver/guard-set.ts +219 -0
- package/src/prover/smt/solver/hash.ts +0 -1
- package/src/prover/smt/solver/hashtable.ts +30 -16
- package/src/prover/smt/solver/inf-eps.ts +63 -0
- package/src/prover/smt/solver/inj-axiom.ts +101 -0
- package/src/prover/smt/solver/internalizer.ts +110 -38
- package/src/prover/smt/solver/lackr.ts +381 -0
- package/src/prover/smt/solver/lbool.ts +0 -1
- package/src/prover/smt/solver/lia2card.ts +268 -0
- package/src/prover/smt/solver/lia2pb.ts +154 -0
- package/src/prover/smt/solver/literal.ts +0 -1
- package/src/prover/smt/solver/logic-tactics.ts +345 -0
- package/src/prover/smt/solver/lp/bound-propagator.ts +0 -1
- package/src/prover/smt/solver/lp/constraints.ts +0 -1
- package/src/prover/smt/solver/lp/containers.ts +0 -1
- package/src/prover/smt/solver/lp/core-solver.ts +18 -3
- package/src/prover/smt/solver/lp/cross-nested.ts +0 -1
- package/src/prover/smt/solver/lp/dep-intervals.ts +0 -3
- package/src/prover/smt/solver/lp/dependency.ts +0 -2
- package/src/prover/smt/solver/lp/dioph-eq.ts +1 -10
- package/src/prover/smt/solver/lp/explanation.ts +0 -1
- package/src/prover/smt/solver/lp/gomory.ts +0 -1
- package/src/prover/smt/solver/lp/hnf-cutter.ts +1 -2
- package/src/prover/smt/solver/lp/hnf.ts +0 -3
- package/src/prover/smt/solver/lp/int-cube.ts +3 -4
- package/src/prover/smt/solver/lp/int-solver.ts +0 -2
- package/src/prover/smt/solver/lp/lar-solver.ts +40 -4
- package/src/prover/smt/solver/lp/lar-term.ts +0 -1
- package/src/prover/smt/solver/lp/lp-settings.ts +0 -1
- package/src/prover/smt/solver/lp/maximize-term.ts +59 -10
- package/src/prover/smt/solver/lp/nex-creator.ts +0 -1
- package/src/prover/smt/solver/lp/nex.ts +0 -1
- package/src/prover/smt/solver/lp/nla-backoff.ts +0 -2
- package/src/prover/smt/solver/lp/nla-basics.ts +0 -2
- package/src/prover/smt/solver/lp/nla-core.ts +42 -11
- package/src/prover/smt/solver/lp/nla-divisions.ts +0 -2
- package/src/prover/smt/solver/lp/nla-emonics.ts +0 -1
- package/src/prover/smt/solver/lp/nla-factorization.ts +0 -1
- package/src/prover/smt/solver/lp/nla-grobner.ts +9 -4
- package/src/prover/smt/solver/lp/nla-horner.ts +0 -2
- package/src/prover/smt/solver/lp/nla-intervals.ts +0 -1
- package/src/prover/smt/solver/lp/nla-monomial-bounds.ts +0 -2
- package/src/prover/smt/solver/lp/nla-monotone.ts +0 -1
- package/src/prover/smt/solver/lp/nla-order.ts +0 -2
- package/src/prover/smt/solver/lp/nla-patcher.ts +0 -1
- package/src/prover/smt/solver/lp/nla-powers.ts +220 -0
- package/src/prover/smt/solver/lp/nla-tangents.ts +0 -2
- package/src/prover/smt/solver/lp/nla-throttle.ts +0 -1
- package/src/prover/smt/solver/lp/nla-transcendentals.ts +324 -0
- package/src/prover/smt/solver/lp/nla-types.ts +0 -2
- package/src/prover/smt/solver/lp/nla-var-eqs.ts +0 -1
- package/src/prover/smt/solver/lp/nra-solver.ts +25 -4
- package/src/prover/smt/solver/lp/numeric-pair.ts +0 -1
- package/src/prover/smt/solver/lp/pdd-interval.ts +0 -1
- package/src/prover/smt/solver/lp/pdd-simplifier.ts +0 -1
- package/src/prover/smt/solver/lp/pdd-solver.ts +0 -2
- package/src/prover/smt/solver/lp/pdd.ts +2 -2
- package/src/prover/smt/solver/lp/random-updater.ts +0 -2
- package/src/prover/smt/solver/lp/static-matrix.ts +0 -1
- package/src/prover/smt/solver/lp/union-find.ts +7 -2
- package/src/prover/smt/solver/macro-finder.ts +530 -0
- package/src/prover/smt/solver/mam-compiler.ts +122 -90
- package/src/prover/smt/solver/mam-interpreter.ts +0 -1
- package/src/prover/smt/solver/max-bv-sharing-tactic.ts +17 -0
- package/src/prover/smt/solver/max-cliques.ts +105 -0
- package/src/prover/smt/solver/maxcore.ts +309 -0
- package/src/prover/smt/solver/maximize-ac-sharing.ts +8 -6
- package/src/prover/smt/solver/maxlex.ts +115 -0
- package/src/prover/smt/solver/maxsmt-base.ts +105 -0
- package/src/prover/smt/solver/maxsmt.ts +92 -0
- package/src/prover/smt/solver/mbp/mbp-arith.ts +467 -0
- package/src/prover/smt/solver/mbp/mbp-basic-tg.ts +101 -0
- package/src/prover/smt/solver/mbp/mbp-plugin.ts +287 -0
- package/src/prover/smt/solver/mbp/mbp-qel.ts +48 -0
- package/src/prover/smt/solver/mbp/mbp-solve-plugin.ts +271 -0
- package/src/prover/smt/solver/mbp/mbp-term-graph.ts +606 -0
- package/src/prover/smt/solver/model-based-opt.ts +844 -0
- package/src/prover/smt/solver/model-checker.ts +18 -27
- package/src/prover/smt/solver/model-evaluator.ts +188 -12
- package/src/prover/smt/solver/model-finder.ts +12 -18
- package/src/prover/smt/solver/model-generator.ts +56 -29
- package/src/prover/smt/solver/model-macro-solver.ts +49 -46
- package/src/prover/smt/solver/model-printer.ts +214 -0
- package/src/prover/smt/solver/mpf.ts +711 -0
- package/src/prover/smt/solver/mus.ts +51 -0
- package/src/prover/smt/solver/muz/dl-context.ts +404 -0
- package/src/prover/smt/solver/muz/dl-mk-bit-blast.ts +97 -0
- package/src/prover/smt/solver/muz/dl-mk-coi-filter.ts +167 -0
- package/src/prover/smt/solver/muz/dl-mk-elim-term-ite.ts +125 -0
- package/src/prover/smt/solver/muz/dl-mk-interp-tail-simplifier.ts +299 -0
- package/src/prover/smt/solver/muz/dl-mk-rule-inliner.ts +455 -0
- package/src/prover/smt/solver/muz/dl-mk-slice.ts +340 -0
- package/src/prover/smt/solver/muz/dl-mk-subsumption-checker.ts +163 -0
- package/src/prover/smt/solver/muz/dl-rule-set.ts +273 -0
- package/src/prover/smt/solver/muz/dl-rule-transformer.ts +123 -0
- package/src/prover/smt/solver/muz/dl-rule.ts +496 -0
- package/src/prover/smt/solver/muz/hnf.ts +201 -0
- package/src/prover/smt/solver/muz/horn-subsume-model-converter.ts +176 -0
- package/src/prover/smt/solver/muz/horn-tactic.ts +201 -0
- package/src/prover/smt/solver/muz/rule-properties.ts +337 -0
- package/src/prover/smt/solver/muz/spacer-context.ts +1406 -0
- package/src/prover/smt/solver/muz/spacer-dl-interface.ts +52 -0
- package/src/prover/smt/solver/muz/spacer-generalizers.ts +241 -0
- package/src/prover/smt/solver/muz/spacer-manager.ts +127 -0
- package/src/prover/smt/solver/muz/spacer-pdr.ts +218 -0
- package/src/prover/smt/solver/muz/spacer-prop-solver.ts +333 -0
- package/src/prover/smt/solver/muz/spacer-util.ts +282 -0
- package/src/prover/smt/solver/muz/substitution.ts +203 -0
- package/src/prover/smt/solver/nla2bv-tactic.ts +285 -0
- package/src/prover/smt/solver/nlqsat.ts +484 -0
- package/src/prover/smt/solver/nlsat/algebraic.ts +125 -12
- package/src/prover/smt/solver/nlsat/atoms.ts +20 -6
- package/src/prover/smt/solver/nlsat/evaluator.ts +0 -1
- package/src/prover/smt/solver/nlsat/explain.ts +63 -23
- package/src/prover/smt/solver/nlsat/interval-set.ts +1 -2
- package/src/prover/smt/solver/nlsat/levelwise.ts +3 -9
- package/src/prover/smt/solver/nlsat/mpbq.ts +45 -1
- package/src/prover/smt/solver/nlsat/polynomial.ts +13 -6
- package/src/prover/smt/solver/nlsat/solver.ts +234 -36
- package/src/prover/smt/solver/nlsat/transcendental-eval.ts +310 -0
- package/src/prover/smt/solver/nlsat/transcendentals.ts +367 -0
- package/src/prover/smt/solver/nlsat/types.ts +0 -2
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +1 -4
- package/src/prover/smt/solver/nlsat/upolynomial.ts +0 -2
- package/src/prover/smt/solver/nlsat-tactic.ts +82 -0
- package/src/prover/smt/solver/nnf.ts +105 -23
- package/src/prover/smt/solver/normalize-bounds.ts +53 -0
- package/src/prover/smt/solver/occf.ts +97 -0
- package/src/prover/smt/solver/opt-context.ts +787 -0
- package/src/prover/smt/solver/opt-nlsat.ts +375 -0
- package/src/prover/smt/solver/opt-pareto.ts +282 -0
- package/src/prover/smt/solver/opt-preprocess.ts +101 -0
- package/src/prover/smt/solver/opt-solver.ts +308 -0
- package/src/prover/smt/solver/opt-value.ts +55 -0
- package/src/prover/smt/solver/optsmt.ts +692 -0
- package/src/prover/smt/solver/parallel-tactic.ts +299 -0
- package/src/prover/smt/solver/pattern-inference.ts +19 -11
- package/src/prover/smt/solver/pb-rewriter.ts +284 -0
- package/src/prover/smt/solver/pb2bv-tactic.ts +540 -0
- package/src/prover/smt/solver/poly-rewriter.ts +202 -57
- package/src/prover/smt/solver/probes.ts +512 -0
- package/src/prover/smt/solver/propagate-values.ts +37 -21
- package/src/prover/smt/solver/proto-model.ts +648 -19
- package/src/prover/smt/solver/pull-quant.ts +28 -12
- package/src/prover/smt/solver/purify-arith.ts +632 -0
- package/src/prover/smt/solver/qe-arith-plugin.ts +1098 -0
- package/src/prover/smt/solver/qe-lite-der.ts +2 -3
- package/src/prover/smt/solver/qe-lite-fm.ts +3 -4
- package/src/prover/smt/solver/qe-lite.ts +37 -17
- package/src/prover/smt/solver/qe-mbp.ts +270 -0
- package/src/prover/smt/solver/qe.ts +1498 -0
- package/src/prover/smt/solver/qel.ts +25 -0
- package/src/prover/smt/solver/qi-queue.ts +0 -1
- package/src/prover/smt/solver/qsat.ts +814 -0
- package/src/prover/smt/solver/quant-hoist.ts +196 -0
- package/src/prover/smt/solver/quant-tactics.ts +16 -56
- package/src/prover/smt/solver/quantifier-analyzer.ts +19 -20
- package/src/prover/smt/solver/quantifier-manager.ts +8 -16
- package/src/prover/smt/solver/quasi-macros.ts +243 -0
- package/src/prover/smt/solver/random-gen.ts +0 -1
- package/src/prover/smt/solver/rational.ts +45 -1
- package/src/prover/smt/solver/recfun-decl-plugin.ts +261 -0
- package/src/prover/smt/solver/recfun-rewriter.ts +107 -0
- package/src/prover/smt/solver/reduce-args.ts +225 -0
- package/src/prover/smt/solver/reduce-bv-size.ts +119 -0
- package/src/prover/smt/solver/ref-vector.ts +0 -1
- package/src/prover/smt/solver/relevancy.ts +1 -2
- package/src/prover/smt/solver/rewriter-tpl.ts +77 -10
- package/src/prover/smt/solver/rewriter.ts +475 -36
- package/src/prover/smt/solver/rlimit.ts +25 -2
- package/src/prover/smt/solver/sat/asymm-branch.ts +325 -0
- package/src/prover/smt/solver/sat/big.ts +177 -0
- package/src/prover/smt/solver/sat/clause-use-list.ts +71 -0
- package/src/prover/smt/solver/sat/clause.ts +203 -0
- package/src/prover/smt/solver/sat/cleaner.ts +94 -0
- package/src/prover/smt/solver/sat/config.ts +122 -0
- package/src/prover/smt/solver/sat/consequences.ts +203 -0
- package/src/prover/smt/solver/sat/elim-eqs.ts +142 -0
- package/src/prover/smt/solver/sat/goal2sat.ts +526 -0
- package/src/prover/smt/solver/sat/inc-sat-solver.ts +378 -0
- package/src/prover/smt/solver/sat/model-converter.ts +136 -0
- package/src/prover/smt/solver/sat/pb-constraint.ts +261 -0
- package/src/prover/smt/solver/sat/pb-solver.ts +1577 -0
- package/src/prover/smt/solver/sat/probing.ts +170 -0
- package/src/prover/smt/solver/sat/sat-tactic.ts +43 -0
- package/src/prover/smt/solver/sat/sat2goal.ts +165 -0
- package/src/prover/smt/solver/sat/scc.ts +142 -0
- package/src/prover/smt/solver/sat/simplifier.ts +1618 -0
- package/src/prover/smt/solver/sat/solver.ts +2127 -0
- package/src/prover/smt/solver/sat/var-queue.ts +117 -0
- package/src/prover/smt/solver/sat/watch-list.ts +140 -0
- package/src/prover/smt/solver/search-tree.ts +284 -0
- package/src/prover/smt/solver/seq-axioms.ts +1010 -0
- package/src/prover/smt/solver/seq-decl-plugin.ts +819 -0
- package/src/prover/smt/solver/seq-derive.ts +1301 -0
- package/src/prover/smt/solver/seq-eq-approx.ts +236 -0
- package/src/prover/smt/solver/seq-eq-solver.ts +439 -0
- package/src/prover/smt/solver/seq-factory.ts +89 -0
- package/src/prover/smt/solver/seq-monadic.ts +728 -0
- package/src/prover/smt/solver/seq-range-predicate.ts +235 -0
- package/src/prover/smt/solver/seq-re-rewriter.ts +1170 -0
- package/src/prover/smt/solver/seq-re-util.ts +758 -0
- package/src/prover/smt/solver/seq-regex-bisim.ts +144 -0
- package/src/prover/smt/solver/seq-regex-live.ts +200 -0
- package/src/prover/smt/solver/seq-rewriter.ts +2402 -0
- package/src/prover/smt/solver/seq-skolem.ts +317 -0
- package/src/prover/smt/solver/seq-subset.ts +165 -0
- package/src/prover/smt/solver/seq-view-witness.ts +353 -0
- package/src/prover/smt/solver/smt-consequences.ts +297 -0
- package/src/prover/smt/solver/smt-kernel.ts +83 -0
- package/src/prover/smt/solver/smt-logics.ts +66 -0
- package/src/prover/smt/solver/smt-setup.ts +496 -0
- package/src/prover/smt/solver/smt2-printer.ts +765 -0
- package/src/prover/smt/solver/smtlib-parser.ts +3126 -316
- package/src/prover/smt/solver/smtlib-script.ts +1631 -0
- package/src/prover/smt/solver/solve-eqs.ts +929 -0
- package/src/prover/smt/solver/solver.ts +113 -22
- package/src/prover/smt/solver/static-features.ts +314 -0
- package/src/prover/smt/solver/sticky-generations.ts +0 -1
- package/src/prover/smt/solver/tactic.ts +1986 -0
- package/src/prover/smt/solver/term-enumeration.ts +205 -0
- package/src/prover/smt/solver/theory-array.ts +1240 -0
- package/src/prover/smt/solver/theory-bv.ts +1200 -0
- package/src/prover/smt/solver/theory-char.ts +355 -0
- package/src/prover/smt/solver/theory-datatype.ts +598 -0
- package/src/prover/smt/solver/theory-finite-set.ts +30 -0
- package/src/prover/smt/solver/theory-fpa.ts +389 -0
- package/src/prover/smt/solver/theory-lra-axioms.ts +53 -2
- package/src/prover/smt/solver/theory-lra-bounds.ts +31 -6
- package/src/prover/smt/solver/theory-lra-final-check.ts +56 -70
- package/src/prover/smt/solver/theory-lra-internalize.ts +86 -27
- package/src/prover/smt/solver/theory-lra-model.ts +20 -35
- package/src/prover/smt/solver/theory-lra-propagate.ts +24 -26
- package/src/prover/smt/solver/theory-lra-state.ts +6 -22
- package/src/prover/smt/solver/theory-lra.ts +188 -1
- package/src/prover/smt/solver/theory-pb.ts +934 -0
- package/src/prover/smt/solver/theory-polymorphism.ts +58 -0
- package/src/prover/smt/solver/theory-recfun.ts +307 -0
- package/src/prover/smt/solver/theory-seq-regex.ts +867 -0
- package/src/prover/smt/solver/theory-seq-solve.ts +1373 -0
- package/src/prover/smt/solver/theory-seq-state.ts +871 -0
- package/src/prover/smt/solver/theory-seq.ts +961 -0
- package/src/prover/smt/solver/theory.ts +189 -0
- package/src/prover/smt/solver/tseitin-cnf.ts +485 -0
- package/src/prover/smt/solver/var-subst.ts +36 -14
- package/src/prover/smt/table.ts +3 -2
- package/src/prover/smt/types.ts +146 -0
- package/src/prover/tlapm/cache.ts +50 -19
- package/src/prover/tlapm/tlapm.ts +15 -9
- package/src/prover/tlapm-library.ts +3208 -0
- package/src/prover/verdict.ts +9 -0
- package/src/prover/zenon/check/check.ts +1 -2
- package/src/prover/zenon/check/records.ts +1 -1
- package/src/prover/zenon/check/relations.ts +2 -1
- package/src/prover/zenon/check/rewrites.ts +2 -15
- package/src/prover/zenon/check/sets.ts +40 -58
- package/src/prover/zenon/check/terms.ts +1 -2
- package/src/prover/zenon/decide.ts +10 -7
- package/src/prover/zenon/encode.ts +0 -2
- package/src/prover/zenon/eqrel.ts +2 -2
- package/src/prover/zenon/equality-rules.ts +0 -2
- package/src/prover/zenon/expr.ts +7 -2
- package/src/prover/zenon/index-table.ts +9 -21
- package/src/prover/zenon/isar-case.ts +0 -2
- package/src/prover/zenon/isar.ts +35 -37
- package/src/prover/zenon/llproof.ts +2 -13
- package/src/prover/zenon/mltoll.ts +12 -30
- package/src/prover/zenon/node.ts +20 -5
- package/src/prover/zenon/parse.ts +9 -8
- package/src/prover/zenon/phrase.ts +0 -2
- package/src/prover/zenon/proof.ts +0 -2
- package/src/prover/zenon/propositional-rules.ts +0 -2
- package/src/prover/zenon/rules.ts +0 -2
- package/src/prover/zenon/search.ts +11 -19
- package/src/prover/zenon/tla/functions.ts +2 -4
- package/src/prover/zenon/tla/llproof.ts +9 -13
- package/src/prover/zenon/tla/records.ts +1 -8
- package/src/prover/zenon/tla/rewrites.ts +0 -2
- package/src/prover/zenon/tla/sets.ts +22 -22
- package/src/prover/zenon/tla/terms.ts +0 -2
- package/src/prover/zenon/tla/tla.ts +7 -8
- package/src/resolve.ts +56 -74
- package/src/runtime.ts +4 -0
- package/src/sany/generation.ts +394 -0
- package/src/sany/generator-def-entries.ts +210 -0
- package/src/sany/generator-definitions.ts +686 -0
- package/src/sany/generator-expressions.ts +1100 -0
- package/src/sany/generator-proofs.ts +662 -0
- package/src/sany/generator.ts +155 -2625
- package/src/sany/levels.ts +0 -2
- package/src/sany/lexer.ts +17 -16
- package/src/sany/linter.ts +0 -2
- package/src/sany/nodes.ts +2 -3
- package/src/sany/report.ts +3 -6
- package/src/sany/selectors.ts +35 -38
- package/src/sany/xml.ts +23 -55
- package/src/search.ts +205 -43
- package/src/simulate.ts +157 -133
- package/src/spec-description.ts +33 -48
- package/src/standard-definitions.ts +4 -0
- package/src/standard-modules.ts +16 -32
- package/src/state-graph.ts +0 -2
- package/src/substitution-levels.ts +5 -4
- package/src/successors.ts +6 -8
- package/src/symmetry.ts +2 -2
- package/src/tableau.ts +2 -2
- package/src/tlc/fingerprint.ts +81 -9
- package/src/tlc/messages.ts +20 -15
- package/src/tlc/random.ts +4 -4
- package/src/tlc/replay.ts +8 -15
- package/src/tlc/summary.ts +29 -14
- package/src/tlc/tlc-operators.ts +2 -3
- package/src/tlc/tlcext-operators.ts +44 -12
- package/src/tlc/trace-spec.ts +21 -40
- package/src/typed-tier.ts +6535 -0
- package/src/typescript/actions.ts +2 -4
- package/src/typescript/collections.ts +34 -20
- package/src/typescript/compile.ts +1 -3
- package/src/typescript/formula.ts +5 -3
- package/src/typescript/model.ts +4 -5
- package/src/typescript/steps.ts +20 -18
- package/src/values.ts +62 -152
- package/src/prover/isabelle/isar/statement.ts +0 -52
- package/src/prover/smt/solver/z3-license.txt +0 -10
- package/src/prover/tlaps-module.ts +0 -510
- package/src/prover/zenon/LICENSE +0 -32
package/src/fingerprints.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { getValueFingerprint, getValueHash, type Value } from "./values";
|
|
1
|
+
import { combineHash, getValueFingerprint, getValueHash, isSameValue, type Value } from "./values";
|
|
2
2
|
|
|
3
3
|
const EMPTY = 0;
|
|
4
4
|
const INITIAL_CAPACITY = 1 << 12;
|
|
@@ -59,6 +59,70 @@ export const createFingerprintTable = (): FingerprintTable => {
|
|
|
59
59
|
};
|
|
60
60
|
};
|
|
61
61
|
|
|
62
|
+
export interface StateTable {
|
|
63
|
+
slots: Int32Array;
|
|
64
|
+
size: number;
|
|
65
|
+
shift: number;
|
|
66
|
+
states: Value[][];
|
|
67
|
+
}
|
|
68
|
+
|
|
69
|
+
// A Map holds at most 2^24 entries, so an open-addressing table keeps each hash and index + 1.
|
|
70
|
+
export const createStateTable = (states: Value[][]): StateTable => ({
|
|
71
|
+
slots: new Int32Array(1 << 17),
|
|
72
|
+
size: 0,
|
|
73
|
+
shift: 16,
|
|
74
|
+
states,
|
|
75
|
+
});
|
|
76
|
+
|
|
77
|
+
export const getStateHash = (state: Value[]) => {
|
|
78
|
+
let hash = 0x811c9dc5;
|
|
79
|
+
for (let index = 0; index < state.length; index++)
|
|
80
|
+
hash = combineHash(hash, getValueHash(state[index]));
|
|
81
|
+
return hash & 0x3fffffff;
|
|
82
|
+
};
|
|
83
|
+
|
|
84
|
+
export const isSameState = (stored: Value[], state: Value[]) => {
|
|
85
|
+
for (let position = 0; position < state.length; position++) {
|
|
86
|
+
if (!isSameValue(stored[position], state[position])) return false;
|
|
87
|
+
}
|
|
88
|
+
return true;
|
|
89
|
+
};
|
|
90
|
+
|
|
91
|
+
const getSlot = (table: StateTable, hash: number) =>
|
|
92
|
+
(Math.imul(hash, 0x9e3779b1) >>> table.shift) << 1;
|
|
93
|
+
|
|
94
|
+
export const findStateIndex = (table: StateTable, hash: number, state: Value[]) => {
|
|
95
|
+
const mask = table.slots.length - 1;
|
|
96
|
+
for (let slot = getSlot(table, hash); ; slot = (slot + 2) & mask) {
|
|
97
|
+
const entry = table.slots[slot + 1];
|
|
98
|
+
if (entry === 0) return -1;
|
|
99
|
+
if (table.slots[slot] === hash && isSameState(table.states[entry - 1], state)) {
|
|
100
|
+
return entry - 1;
|
|
101
|
+
}
|
|
102
|
+
}
|
|
103
|
+
};
|
|
104
|
+
|
|
105
|
+
const insertSeenState = (table: StateTable, hash: number, entry: number) => {
|
|
106
|
+
const mask = table.slots.length - 1;
|
|
107
|
+
let slot = getSlot(table, hash);
|
|
108
|
+
while (table.slots[slot + 1] !== 0) slot = (slot + 2) & mask;
|
|
109
|
+
table.slots[slot] = hash;
|
|
110
|
+
table.slots[slot + 1] = entry;
|
|
111
|
+
};
|
|
112
|
+
|
|
113
|
+
export const markSeenState = (table: StateTable, hash: number, index: number) => {
|
|
114
|
+
table.size++;
|
|
115
|
+
if (table.size * 4 > table.slots.length) {
|
|
116
|
+
const slots = table.slots;
|
|
117
|
+
table.slots = new Int32Array(slots.length * 2);
|
|
118
|
+
table.shift--;
|
|
119
|
+
for (let slot = 0; slot < slots.length; slot += 2) {
|
|
120
|
+
if (slots[slot + 1] !== 0) insertSeenState(table, slots[slot], slots[slot + 1]);
|
|
121
|
+
}
|
|
122
|
+
}
|
|
123
|
+
insertSeenState(table, hash, index + 1);
|
|
124
|
+
};
|
|
125
|
+
|
|
62
126
|
export interface SharedFingerprints {
|
|
63
127
|
slots: BigInt64Array;
|
|
64
128
|
used: Int32Array;
|
package/src/instances.ts
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import {
|
|
2
2
|
getChildren,
|
|
3
|
+
getReferencedName,
|
|
3
4
|
isLocallyResolved,
|
|
4
5
|
type Bound,
|
|
5
6
|
type BoundPattern,
|
|
@@ -228,6 +229,16 @@ export const mapChildren = (
|
|
|
228
229
|
}
|
|
229
230
|
};
|
|
230
231
|
|
|
232
|
+
export const forEachChild = (
|
|
233
|
+
expression: Expression,
|
|
234
|
+
visit: (child: Expression, bound: string[]) => void,
|
|
235
|
+
): void => {
|
|
236
|
+
mapChildren(expression, (child, bound) => {
|
|
237
|
+
visit(child, bound);
|
|
238
|
+
return child;
|
|
239
|
+
});
|
|
240
|
+
};
|
|
241
|
+
|
|
231
242
|
interface Instantiation {
|
|
232
243
|
params: OperatorParam[];
|
|
233
244
|
substitutions: Map<string, Expression>;
|
|
@@ -280,19 +291,13 @@ const isBoundOnce = (replacement: Expression, instantiation: Instantiation) => {
|
|
|
280
291
|
};
|
|
281
292
|
|
|
282
293
|
const getFreeNames = (expression: Expression, bound = new Set<string>()): string[] => {
|
|
283
|
-
const name =
|
|
284
|
-
expression.kind === "Identifier"
|
|
285
|
-
? expression.name
|
|
286
|
-
: expression.kind === "Apply" || expression.kind === "OperatorReference"
|
|
287
|
-
? expression.operator
|
|
288
|
-
: undefined;
|
|
294
|
+
const name = getReferencedName(expression);
|
|
289
295
|
const names = name === undefined || bound.has(name) ? [] : [name];
|
|
290
|
-
|
|
296
|
+
forEachChild(expression, (child, childBound) =>
|
|
291
297
|
names.push(
|
|
292
298
|
...getFreeNames(child, childBound.length === 0 ? bound : new Set([...bound, ...childBound])),
|
|
293
|
-
)
|
|
294
|
-
|
|
295
|
-
});
|
|
299
|
+
),
|
|
300
|
+
);
|
|
296
301
|
return names;
|
|
297
302
|
};
|
|
298
303
|
|
|
@@ -487,6 +492,30 @@ export const createLocalIdentifier = (name: string, location: SourceLocation): E
|
|
|
487
492
|
export const createLocalArguments = (params: OperatorParam[], location: SourceLocation) =>
|
|
488
493
|
params.map((param) => createLocalIdentifier(param.name, location));
|
|
489
494
|
|
|
495
|
+
export const createLocalAlias = (
|
|
496
|
+
name: string,
|
|
497
|
+
key: string,
|
|
498
|
+
params: OperatorParam[],
|
|
499
|
+
forwarded: OperatorParam[],
|
|
500
|
+
location: SourceLocation,
|
|
501
|
+
): Definition => ({
|
|
502
|
+
kind: "Operator",
|
|
503
|
+
name,
|
|
504
|
+
params,
|
|
505
|
+
body:
|
|
506
|
+
forwarded.length === 0
|
|
507
|
+
? { kind: "Identifier", name: key, location }
|
|
508
|
+
: {
|
|
509
|
+
kind: "Apply",
|
|
510
|
+
operator: key,
|
|
511
|
+
args: createLocalArguments(forwarded, location),
|
|
512
|
+
location,
|
|
513
|
+
},
|
|
514
|
+
isLocal: true,
|
|
515
|
+
isRecursive: false,
|
|
516
|
+
location,
|
|
517
|
+
});
|
|
518
|
+
|
|
490
519
|
const getInstanceOperator = (
|
|
491
520
|
key: string,
|
|
492
521
|
params: OperatorParam[],
|
|
@@ -640,6 +669,14 @@ const substitute = (
|
|
|
640
669
|
};
|
|
641
670
|
}
|
|
642
671
|
if (expression.kind === "OperatorReference" && isFree(expression.operator)) {
|
|
672
|
+
const replacement = instantiation.substitutions.get(expression.operator);
|
|
673
|
+
if (
|
|
674
|
+
replacement?.kind === "Identifier" ||
|
|
675
|
+
replacement?.kind === "OperatorReference" ||
|
|
676
|
+
replacement?.kind === "Lambda"
|
|
677
|
+
) {
|
|
678
|
+
return withSubstitutionFrames(replacement, [expression]);
|
|
679
|
+
}
|
|
643
680
|
const copy = getCopy(rewrite, expression.operator);
|
|
644
681
|
if (copy === undefined) return expression;
|
|
645
682
|
const definition = instantiation.getDefinition(expression.operator);
|
package/src/json.ts
CHANGED
|
@@ -111,6 +111,8 @@ const toJsonArray = (value: Value) => {
|
|
|
111
111
|
throw createUnsupportedError(value);
|
|
112
112
|
};
|
|
113
113
|
|
|
114
|
+
const toNdJson = (elements: Value[]) => elements.map((element) => `${toJson(element)}\n`).join("");
|
|
115
|
+
|
|
114
116
|
const toJsonObject = (value: Value) => {
|
|
115
117
|
const className = getJavaClassName(value);
|
|
116
118
|
if (className === "RecordValue") return toObjectJson(toFiniteFunction(value));
|
|
@@ -258,7 +260,7 @@ export const createJsonOperators = (files: FileSystem): Builtin[] => [
|
|
|
258
260
|
throw createModuleArgumentError("second", "ndJsonSerialize", "sequence", value);
|
|
259
261
|
}
|
|
260
262
|
makeParentDirectory(files, path);
|
|
261
|
-
files.writeFile?.(path, elements
|
|
263
|
+
files.writeFile?.(path, toNdJson(elements));
|
|
262
264
|
return true;
|
|
263
265
|
}),
|
|
264
266
|
"public static synchronized tlc2.value.impl.BoolValue tlc2.module.Json.ndSerialize(tlc2.value.impl.StringValue,tlc2.value.impl.Value) throws java.io.IOException",
|
|
@@ -313,12 +315,7 @@ export const createIoUtilsOperators = (
|
|
|
313
315
|
return option;
|
|
314
316
|
});
|
|
315
317
|
checkCharset(charset);
|
|
316
|
-
writeWithOptions(
|
|
317
|
-
files,
|
|
318
|
-
path,
|
|
319
|
-
names,
|
|
320
|
-
elements.map((element) => `${toJson(element)}\n`).join(""),
|
|
321
|
-
);
|
|
318
|
+
writeWithOptions(files, path, names, toNdJson(elements));
|
|
322
319
|
return true;
|
|
323
320
|
}),
|
|
324
321
|
"public static synchronized tlc2.value.impl.Value tlc2.module.Json.textSerialize(tlc2.tool.impl.Tool,tla2sany.semantic.ExprOrOpArgNode[],tlc2.util.Context,tlc2.tool.TLCState,tlc2.tool.TLCState,int,tlc2.tool.coverage.CostModel)",
|
package/src/levels.ts
CHANGED
|
@@ -16,7 +16,7 @@ import {
|
|
|
16
16
|
TlaSyntaxError,
|
|
17
17
|
type SanyError,
|
|
18
18
|
} from "./errors";
|
|
19
|
-
import {
|
|
19
|
+
import { forEachChild } from "./instances";
|
|
20
20
|
import { collectSemanticErrors, getBoundNames, getPatternNames } from "./resolve";
|
|
21
21
|
import { STANDARD_LEVELS } from "./standard-definitions";
|
|
22
22
|
|
|
@@ -55,11 +55,10 @@ type Resolved =
|
|
|
55
55
|
| { kind: "Declared"; name: string; level: number; arity: number }
|
|
56
56
|
| { kind: "Defined"; levels: OperatorLevels };
|
|
57
57
|
|
|
58
|
-
|
|
59
|
-
data: LevelData
|
|
60
|
-
|
|
61
|
-
declared
|
|
62
|
-
}
|
|
58
|
+
type Operand =
|
|
59
|
+
| { kind: "Value"; data: LevelData }
|
|
60
|
+
| { kind: "Operator"; data: OperatorLevels }
|
|
61
|
+
| { kind: "Declared"; data: LevelData; declared: OperatorParam };
|
|
63
62
|
|
|
64
63
|
export const CONSTANT_LEVEL = 0;
|
|
65
64
|
export const VARIABLE_LEVEL = 1;
|
|
@@ -96,6 +95,12 @@ export const putConstraint = (constraints: Map<string, number>, name: string, le
|
|
|
96
95
|
export const putArgConstraint = (constraints: Map<string, number>, key: string, level: number) =>
|
|
97
96
|
constraints.set(key, Math.max(level, constraints.get(key) ?? 0));
|
|
98
97
|
|
|
98
|
+
const mergeConstraints = (data: LevelData, part: LevelData) => {
|
|
99
|
+
part.constraints.forEach((value, key) => putConstraint(data.constraints, key, value));
|
|
100
|
+
part.argConstraints.forEach((value, key) => putArgConstraint(data.argConstraints, key, value));
|
|
101
|
+
part.argParams.forEach((key) => data.argParams.add(key));
|
|
102
|
+
};
|
|
103
|
+
|
|
99
104
|
const createSignature = (
|
|
100
105
|
name: string,
|
|
101
106
|
level: number,
|
|
@@ -231,12 +236,8 @@ export const createLevelAnalyzer = (context: LevelContext) => {
|
|
|
231
236
|
data.params.add(param);
|
|
232
237
|
data.argParams.add(getArgumentParamKey(name, index, param));
|
|
233
238
|
});
|
|
234
|
-
operand.data.constraints.forEach((value, key) => putConstraint(data.constraints, key, value));
|
|
235
239
|
putArgConstraint(data.argConstraints, getArgumentKey(name, index), operand.data.level);
|
|
236
|
-
operand.data
|
|
237
|
-
putArgConstraint(data.argConstraints, key, value),
|
|
238
|
-
);
|
|
239
|
-
operand.data.argParams.forEach((key) => data.argParams.add(key));
|
|
240
|
+
mergeConstraints(data, operand.data);
|
|
240
241
|
});
|
|
241
242
|
return data;
|
|
242
243
|
};
|
|
@@ -249,7 +250,7 @@ export const createLevelAnalyzer = (context: LevelContext) => {
|
|
|
249
250
|
) => {
|
|
250
251
|
const isBound = (name: string) => bound.includes(name);
|
|
251
252
|
operands.forEach((operand, index) => {
|
|
252
|
-
if (operand.
|
|
253
|
+
if (operand.kind !== "Value") return;
|
|
253
254
|
if (operand.data.level > getMaxLevel(operator, index)) {
|
|
254
255
|
throw new TlaSyntaxError(
|
|
255
256
|
`Level error in applying operator ${operator.name}:\nThe level of argument ${index + 1} exceeds the maximum level allowed by the operator`,
|
|
@@ -300,8 +301,8 @@ export const createLevelAnalyzer = (context: LevelContext) => {
|
|
|
300
301
|
}),
|
|
301
302
|
);
|
|
302
303
|
operands.forEach((operand, operandIndex) => {
|
|
303
|
-
|
|
304
|
-
|
|
304
|
+
if (operand.kind !== "Operator") return;
|
|
305
|
+
const argument = operand.data;
|
|
305
306
|
operands.forEach((other, otherIndex) =>
|
|
306
307
|
argument.formals.forEach((_formal, argumentIndex) => {
|
|
307
308
|
if (!hasCondition(operandIndex, otherIndex, argumentIndex)) return;
|
|
@@ -313,9 +314,13 @@ export const createLevelAnalyzer = (context: LevelContext) => {
|
|
|
313
314
|
});
|
|
314
315
|
operator.argParams.forEach((key) => {
|
|
315
316
|
const parameter = parseArgumentParamKey(key);
|
|
316
|
-
const argument = getOperand(parameter.operator)
|
|
317
|
-
if (argument) {
|
|
318
|
-
putConstraint(
|
|
317
|
+
const argument = getOperand(parameter.operator);
|
|
318
|
+
if (argument?.kind === "Operator") {
|
|
319
|
+
putConstraint(
|
|
320
|
+
data.constraints,
|
|
321
|
+
parameter.param,
|
|
322
|
+
getMaxLevel(argument.data, parameter.index),
|
|
323
|
+
);
|
|
319
324
|
}
|
|
320
325
|
});
|
|
321
326
|
|
|
@@ -328,8 +333,8 @@ export const createLevelAnalyzer = (context: LevelContext) => {
|
|
|
328
333
|
constraints.forEach((value, key) => putArgConstraint(data.argConstraints, key, value)),
|
|
329
334
|
);
|
|
330
335
|
operands.forEach((operand, operandIndex) => {
|
|
336
|
+
if (operand.kind !== "Declared") return;
|
|
331
337
|
const declared = operand.declared;
|
|
332
|
-
if (!declared) return;
|
|
333
338
|
Array.from({ length: declared.arity }, (_value, argumentIndex) =>
|
|
334
339
|
putArgConstraint(
|
|
335
340
|
data.argConstraints,
|
|
@@ -381,15 +386,15 @@ export const createLevelAnalyzer = (context: LevelContext) => {
|
|
|
381
386
|
);
|
|
382
387
|
return;
|
|
383
388
|
}
|
|
384
|
-
if (argument.
|
|
389
|
+
if (argument.kind === "Declared") {
|
|
385
390
|
data.argParams.add(
|
|
386
391
|
getArgumentParamKey(argument.declared.name, parameter.index, parameter.param),
|
|
387
392
|
);
|
|
388
393
|
}
|
|
389
394
|
});
|
|
390
395
|
operands.forEach((operand, operandIndex) => {
|
|
396
|
+
if (operand.kind !== "Declared") return;
|
|
391
397
|
const declared = operand.declared;
|
|
392
|
-
if (!declared) return;
|
|
393
398
|
operands.forEach((other, otherIndex) =>
|
|
394
399
|
Array.from({ length: declared.arity }, (_value, argumentIndex) => {
|
|
395
400
|
if (!hasCondition(operandIndex, otherIndex, argumentIndex)) return;
|
|
@@ -410,7 +415,7 @@ export const createLevelAnalyzer = (context: LevelContext) => {
|
|
|
410
415
|
expression.body,
|
|
411
416
|
scope,
|
|
412
417
|
);
|
|
413
|
-
return {
|
|
418
|
+
return { kind: "Operator", data: operator };
|
|
414
419
|
}
|
|
415
420
|
const name =
|
|
416
421
|
expression.kind === "OperatorReference"
|
|
@@ -424,16 +429,16 @@ export const createLevelAnalyzer = (context: LevelContext) => {
|
|
|
424
429
|
resolved.kind === "Defined" &&
|
|
425
430
|
(resolved.levels.formals.length > 0 || expression.kind === "OperatorReference")
|
|
426
431
|
) {
|
|
427
|
-
return {
|
|
432
|
+
return { kind: "Operator", data: resolved.levels };
|
|
428
433
|
}
|
|
429
434
|
if (resolved.kind === "Declared" && resolved.arity > 0) {
|
|
430
435
|
const data = createData();
|
|
431
436
|
data.params.add(name);
|
|
432
|
-
return { data, declared: { name, arity: resolved.arity } };
|
|
437
|
+
return { kind: "Declared", data, declared: { name, arity: resolved.arity } };
|
|
433
438
|
}
|
|
434
|
-
if (expression.kind === "OperatorReference") return { data: createData() };
|
|
439
|
+
if (expression.kind === "OperatorReference") return { kind: "Value", data: createData() };
|
|
435
440
|
}
|
|
436
|
-
return { data: analyze(expression, scope) };
|
|
441
|
+
return { kind: "Value", data: analyze(expression, scope) };
|
|
437
442
|
};
|
|
438
443
|
|
|
439
444
|
const toOperands = (expressions: Expression[], scope: Scope) =>
|
|
@@ -509,14 +514,9 @@ export const createLevelAnalyzer = (context: LevelContext) => {
|
|
|
509
514
|
argConstraints: new Map(body.argConstraints),
|
|
510
515
|
argParams: new Set(body.argParams),
|
|
511
516
|
};
|
|
512
|
-
expression.definitions.forEach((definition) =>
|
|
513
|
-
|
|
514
|
-
|
|
515
|
-
levels.argConstraints.forEach((value, key) =>
|
|
516
|
-
putArgConstraint(data.argConstraints, key, value),
|
|
517
|
-
);
|
|
518
|
-
levels.argParams.forEach((key) => data.argParams.add(key));
|
|
519
|
-
});
|
|
517
|
+
expression.definitions.forEach((definition) =>
|
|
518
|
+
mergeConstraints(data, analyzeDefinition(definition, inner)),
|
|
519
|
+
);
|
|
520
520
|
return data;
|
|
521
521
|
};
|
|
522
522
|
|
|
@@ -683,14 +683,14 @@ export const createLevelAnalyzer = (context: LevelContext) => {
|
|
|
683
683
|
toOperand(expression.function, scope),
|
|
684
684
|
expression.args.length === 1
|
|
685
685
|
? toOperand(expression.args[0], scope)
|
|
686
|
-
: { data: applyBuiltin(SET_LEVELS, expression.args, scope) },
|
|
686
|
+
: { kind: "Value", data: applyBuiltin(SET_LEVELS, expression.args, scope) },
|
|
687
687
|
]);
|
|
688
688
|
case "Bracket":
|
|
689
689
|
return createData();
|
|
690
690
|
case "FieldAccess":
|
|
691
691
|
return applyDefined(SELECT_LEVELS, [
|
|
692
692
|
toOperand(expression.record, scope),
|
|
693
|
-
{ data: createData() },
|
|
693
|
+
{ kind: "Value", data: createData() },
|
|
694
694
|
]);
|
|
695
695
|
case "BoxAction":
|
|
696
696
|
case "AngleAction":
|
|
@@ -753,10 +753,9 @@ export const createLevelAnalyzer = (context: LevelContext) => {
|
|
|
753
753
|
);
|
|
754
754
|
return names;
|
|
755
755
|
default:
|
|
756
|
-
|
|
757
|
-
visit(child, isNonLeibniz, bindFormals(scope, toFormals(bound)))
|
|
758
|
-
|
|
759
|
-
});
|
|
756
|
+
forEachChild(expression, (child, bound) =>
|
|
757
|
+
visit(child, isNonLeibniz, bindFormals(scope, toFormals(bound))),
|
|
758
|
+
);
|
|
760
759
|
return names;
|
|
761
760
|
}
|
|
762
761
|
};
|
|
@@ -869,9 +868,7 @@ export const analyzeAssumeProve = (
|
|
|
869
868
|
const data = createData(Math.max(...parts.map((part) => part.level)));
|
|
870
869
|
parts.forEach((part) => {
|
|
871
870
|
part.params.forEach((param) => data.params.add(param));
|
|
872
|
-
|
|
873
|
-
part.argConstraints.forEach((value, key) => putArgConstraint(data.argConstraints, key, value));
|
|
874
|
-
part.argParams.forEach((key) => data.argParams.add(key));
|
|
871
|
+
mergeConstraints(data, part);
|
|
875
872
|
});
|
|
876
873
|
return data;
|
|
877
874
|
};
|
package/src/lexer.ts
CHANGED
|
@@ -467,9 +467,11 @@ const BASED_NUMBER_DIGITS = new Map([
|
|
|
467
467
|
["h", HEX_DIGIT],
|
|
468
468
|
]);
|
|
469
469
|
|
|
470
|
-
|
|
470
|
+
// tlapm's lexer reads only \b, \o and \h, and SANY's their capitals too.
|
|
471
|
+
export const matchBasedNumber = (source: string, index: number, isTlapm = false) => {
|
|
471
472
|
if (source.charCodeAt(index) !== CODE_BACKSLASH) return 0;
|
|
472
|
-
const
|
|
473
|
+
const base = source.charAt(index + 1);
|
|
474
|
+
const digits = BASED_NUMBER_DIGITS.get(isTlapm ? base : base.toLowerCase());
|
|
473
475
|
if (digits === undefined) return 0;
|
|
474
476
|
const end = skipClass(source, index + 2, digits);
|
|
475
477
|
return end === index + 2 ? 0 : end - index;
|
|
@@ -605,7 +607,7 @@ export const tokenize = (source: string, isTlapm = false): Token[] => {
|
|
|
605
607
|
});
|
|
606
608
|
continue;
|
|
607
609
|
}
|
|
608
|
-
const basedLength = matchBasedNumber(source, index);
|
|
610
|
+
const basedLength = matchBasedNumber(source, index, isTlapm);
|
|
609
611
|
if (basedLength > 0) {
|
|
610
612
|
pushToken("Number", source.slice(index, index + basedLength), basedLength);
|
|
611
613
|
continue;
|