tla-ts 0.0.10-dev.28c823e4b → 0.0.10-dev.37a75eb5b
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 +4 -1
- package/dist/index.d.ts +4 -1
- package/dist/index.js +1 -1
- package/dist/parallel-worker.cjs +1 -1
- package/dist/parallel-worker.js +1 -1
- package/dist/prove.cjs +2683 -427
- package/dist/prove.js +2681 -425
- package/dist/run.cjs +43 -42
- package/dist/run.js +45 -44
- package/dist/tlapm.cjs +2 -2
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +43 -40
- 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/bags.ts +47 -28
- package/src/builtins.ts +4 -13
- package/src/check-failure.ts +116 -0
- package/src/check-trace.ts +268 -0
- package/src/check.ts +476 -590
- package/src/cli/options.ts +6 -31
- package/src/cli/runtime-invariants.ts +20 -56
- package/src/cli/shared.ts +1 -1
- package/src/cli/tlapm.ts +433 -70
- package/src/cli/tlc-arguments.ts +224 -212
- package/src/cli/tlc-output.ts +686 -0
- package/src/cli/tlc-usage.ts +1 -2
- package/src/cli/tlc.ts +60 -708
- package/src/cli/xml-exporter.ts +23 -33
- package/src/codegen.ts +5 -10
- package/src/coverage.ts +3 -10
- package/src/dependencies.ts +30 -14
- package/src/dfid.ts +25 -18
- package/src/environment-config.ts +315 -0
- package/src/environment.ts +73 -338
- package/src/errors.ts +33 -5
- package/src/evaluate.ts +14 -7
- package/src/exit-codes.ts +3 -0
- package/src/fingerprints.ts +65 -1
- package/src/instances.ts +47 -10
- package/src/java-hash.ts +7 -0
- package/src/json.ts +4 -7
- package/src/levels.ts +42 -44
- package/src/lexer.ts +5 -3
- package/src/liveness-checker.ts +597 -240
- 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 +17 -31
- package/src/parallel.ts +29 -47
- package/src/parser.ts +652 -220
- 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 +93 -15
- 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 +536 -117
- 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 +271 -0
- package/src/prover/smt/solver/factor.ts +163 -0
- package/src/prover/smt/solver/fd-solver.ts +267 -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 +639 -0
- package/src/prover/smt/solver/fpa2bv-converter.ts +2251 -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 +177 -15
- 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 -1
- package/src/prover/smt/solver/hashtable.ts +30 -16
- package/src/prover/smt/solver/inf-eps.ts +63 -0
- package/src/prover/smt/solver/inj-axiom.ts +101 -0
- package/src/prover/smt/solver/internalizer.ts +110 -38
- package/src/prover/smt/solver/lackr.ts +381 -0
- package/src/prover/smt/solver/lbool.ts +0 -1
- package/src/prover/smt/solver/lia2card.ts +268 -0
- package/src/prover/smt/solver/lia2pb.ts +154 -0
- package/src/prover/smt/solver/literal.ts +0 -1
- package/src/prover/smt/solver/logic-tactics.ts +345 -0
- package/src/prover/smt/solver/lp/bound-propagator.ts +0 -1
- package/src/prover/smt/solver/lp/constraints.ts +0 -1
- package/src/prover/smt/solver/lp/containers.ts +7 -2
- package/src/prover/smt/solver/lp/core-solver.ts +18 -3
- package/src/prover/smt/solver/lp/cross-nested.ts +1 -4
- package/src/prover/smt/solver/lp/dep-intervals.ts +0 -3
- package/src/prover/smt/solver/lp/dependency.ts +0 -2
- package/src/prover/smt/solver/lp/dioph-eq.ts +1 -10
- package/src/prover/smt/solver/lp/explanation.ts +0 -1
- package/src/prover/smt/solver/lp/gomory.ts +0 -1
- package/src/prover/smt/solver/lp/hnf-cutter.ts +1 -2
- package/src/prover/smt/solver/lp/hnf.ts +0 -3
- package/src/prover/smt/solver/lp/int-cube.ts +3 -4
- package/src/prover/smt/solver/lp/int-solver.ts +0 -2
- package/src/prover/smt/solver/lp/lar-solver.ts +40 -4
- package/src/prover/smt/solver/lp/lar-term.ts +0 -1
- package/src/prover/smt/solver/lp/lp-settings.ts +0 -1
- package/src/prover/smt/solver/lp/maximize-term.ts +59 -10
- package/src/prover/smt/solver/lp/nex-creator.ts +3 -3
- package/src/prover/smt/solver/lp/nex.ts +2 -2
- package/src/prover/smt/solver/lp/nla-backoff.ts +0 -2
- package/src/prover/smt/solver/lp/nla-basics.ts +46 -3
- package/src/prover/smt/solver/lp/nla-core.ts +68 -17
- package/src/prover/smt/solver/lp/nla-divisions.ts +0 -2
- package/src/prover/smt/solver/lp/nla-emonics.ts +0 -1
- package/src/prover/smt/solver/lp/nla-factorization.ts +0 -1
- package/src/prover/smt/solver/lp/nla-grobner.ts +165 -83
- package/src/prover/smt/solver/lp/nla-horner.ts +0 -2
- package/src/prover/smt/solver/lp/nla-intervals.ts +0 -1
- package/src/prover/smt/solver/lp/nla-monomial-bounds.ts +0 -2
- package/src/prover/smt/solver/lp/nla-monotone.ts +0 -1
- package/src/prover/smt/solver/lp/nla-order.ts +0 -2
- package/src/prover/smt/solver/lp/nla-patcher.ts +0 -1
- package/src/prover/smt/solver/lp/nla-powers.ts +220 -0
- package/src/prover/smt/solver/lp/nla-tangents.ts +0 -2
- package/src/prover/smt/solver/lp/nla-throttle.ts +0 -1
- package/src/prover/smt/solver/lp/nla-transcendentals.ts +324 -0
- package/src/prover/smt/solver/lp/nla-types.ts +0 -2
- package/src/prover/smt/solver/lp/nla-var-eqs.ts +0 -1
- package/src/prover/smt/solver/lp/nra-solver.ts +163 -99
- package/src/prover/smt/solver/lp/numeric-pair.ts +0 -1
- package/src/prover/smt/solver/lp/pdd-interval.ts +6 -3
- package/src/prover/smt/solver/lp/pdd-simplifier.ts +60 -21
- package/src/prover/smt/solver/lp/pdd-solver.ts +72 -41
- package/src/prover/smt/solver/lp/pdd.ts +725 -289
- package/src/prover/smt/solver/lp/random-updater.ts +0 -2
- package/src/prover/smt/solver/lp/static-matrix.ts +0 -1
- package/src/prover/smt/solver/lp/union-find.ts +7 -2
- package/src/prover/smt/solver/macro-finder.ts +530 -0
- package/src/prover/smt/solver/mam-compiler.ts +122 -90
- package/src/prover/smt/solver/mam-interpreter.ts +0 -1
- package/src/prover/smt/solver/max-bv-sharing-tactic.ts +17 -0
- package/src/prover/smt/solver/max-cliques.ts +105 -0
- package/src/prover/smt/solver/maxcore.ts +309 -0
- package/src/prover/smt/solver/maximize-ac-sharing.ts +8 -6
- package/src/prover/smt/solver/maxlex.ts +115 -0
- package/src/prover/smt/solver/maxsmt-base.ts +105 -0
- package/src/prover/smt/solver/maxsmt.ts +92 -0
- package/src/prover/smt/solver/mbp/mbp-arith.ts +467 -0
- package/src/prover/smt/solver/mbp/mbp-basic-tg.ts +101 -0
- package/src/prover/smt/solver/mbp/mbp-plugin.ts +287 -0
- package/src/prover/smt/solver/mbp/mbp-qel.ts +48 -0
- package/src/prover/smt/solver/mbp/mbp-solve-plugin.ts +271 -0
- package/src/prover/smt/solver/mbp/mbp-term-graph.ts +606 -0
- package/src/prover/smt/solver/model-based-opt.ts +844 -0
- package/src/prover/smt/solver/model-checker.ts +18 -27
- package/src/prover/smt/solver/model-evaluator.ts +188 -12
- package/src/prover/smt/solver/model-finder.ts +12 -18
- package/src/prover/smt/solver/model-generator.ts +56 -29
- package/src/prover/smt/solver/model-macro-solver.ts +49 -46
- package/src/prover/smt/solver/model-printer.ts +214 -0
- package/src/prover/smt/solver/mpf.ts +711 -0
- package/src/prover/smt/solver/mus.ts +51 -0
- package/src/prover/smt/solver/muz/dl-context.ts +410 -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 +1407 -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 +315 -97
- package/src/prover/smt/solver/nlsat/atoms.ts +71 -38
- package/src/prover/smt/solver/nlsat/evaluator.ts +0 -1
- package/src/prover/smt/solver/nlsat/explain.ts +427 -229
- package/src/prover/smt/solver/nlsat/interval-set.ts +1 -2
- package/src/prover/smt/solver/nlsat/levelwise.ts +464 -246
- package/src/prover/smt/solver/nlsat/mpbq.ts +45 -1
- package/src/prover/smt/solver/nlsat/polynomial.ts +2410 -683
- package/src/prover/smt/solver/nlsat/solver.ts +293 -92
- 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 -2
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +9 -8
- package/src/prover/smt/solver/nlsat/upolynomial.ts +40 -19
- 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 +792 -0
- package/src/prover/smt/solver/opt-nlsat.ts +386 -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 +311 -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 +22 -25
- package/src/prover/smt/solver/quasi-macros.ts +243 -0
- package/src/prover/smt/solver/random-gen.ts +0 -1
- package/src/prover/smt/solver/rational.ts +45 -1
- package/src/prover/smt/solver/recfun-decl-plugin.ts +261 -0
- package/src/prover/smt/solver/recfun-rewriter.ts +107 -0
- package/src/prover/smt/solver/reduce-args.ts +225 -0
- package/src/prover/smt/solver/reduce-bv-size.ts +119 -0
- package/src/prover/smt/solver/ref-vector.ts +0 -1
- package/src/prover/smt/solver/relevancy.ts +1 -2
- package/src/prover/smt/solver/rewriter-tpl.ts +77 -10
- package/src/prover/smt/solver/rewriter.ts +475 -36
- package/src/prover/smt/solver/rlimit.ts +38 -2
- package/src/prover/smt/solver/sat/asymm-branch.ts +325 -0
- package/src/prover/smt/solver/sat/big.ts +177 -0
- package/src/prover/smt/solver/sat/clause-use-list.ts +71 -0
- package/src/prover/smt/solver/sat/clause.ts +203 -0
- package/src/prover/smt/solver/sat/cleaner.ts +94 -0
- package/src/prover/smt/solver/sat/config.ts +122 -0
- package/src/prover/smt/solver/sat/consequences.ts +203 -0
- package/src/prover/smt/solver/sat/elim-eqs.ts +142 -0
- package/src/prover/smt/solver/sat/goal2sat.ts +526 -0
- package/src/prover/smt/solver/sat/inc-sat-solver.ts +378 -0
- package/src/prover/smt/solver/sat/model-converter.ts +136 -0
- package/src/prover/smt/solver/sat/pb-constraint.ts +261 -0
- package/src/prover/smt/solver/sat/pb-solver.ts +1577 -0
- package/src/prover/smt/solver/sat/probing.ts +170 -0
- package/src/prover/smt/solver/sat/sat-tactic.ts +44 -0
- package/src/prover/smt/solver/sat/sat2goal.ts +165 -0
- package/src/prover/smt/solver/sat/scc.ts +142 -0
- package/src/prover/smt/solver/sat/simplifier.ts +1618 -0
- package/src/prover/smt/solver/sat/solver.ts +2127 -0
- package/src/prover/smt/solver/sat/var-queue.ts +117 -0
- package/src/prover/smt/solver/sat/watch-list.ts +140 -0
- package/src/prover/smt/solver/search-tree.ts +284 -0
- package/src/prover/smt/solver/seq-axioms.ts +1010 -0
- package/src/prover/smt/solver/seq-decl-plugin.ts +819 -0
- package/src/prover/smt/solver/seq-derive.ts +1298 -0
- package/src/prover/smt/solver/seq-eq-approx.ts +236 -0
- package/src/prover/smt/solver/seq-eq-solver.ts +439 -0
- package/src/prover/smt/solver/seq-factory.ts +89 -0
- package/src/prover/smt/solver/seq-monadic.ts +728 -0
- package/src/prover/smt/solver/seq-range-predicate.ts +235 -0
- package/src/prover/smt/solver/seq-re-rewriter.ts +1170 -0
- package/src/prover/smt/solver/seq-re-util.ts +758 -0
- package/src/prover/smt/solver/seq-regex-bisim.ts +144 -0
- package/src/prover/smt/solver/seq-regex-live.ts +200 -0
- package/src/prover/smt/solver/seq-rewriter.ts +2402 -0
- package/src/prover/smt/solver/seq-skolem.ts +317 -0
- package/src/prover/smt/solver/seq-subset.ts +165 -0
- package/src/prover/smt/solver/seq-view-witness.ts +353 -0
- package/src/prover/smt/solver/smt-consequences.ts +297 -0
- package/src/prover/smt/solver/smt-kernel.ts +90 -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 +1704 -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 +1995 -0
- package/src/prover/smt/solver/term-enumeration.ts +205 -0
- package/src/prover/smt/solver/theory-array.ts +1240 -0
- package/src/prover/smt/solver/theory-bv.ts +1200 -0
- package/src/prover/smt/solver/theory-char.ts +355 -0
- package/src/prover/smt/solver/theory-datatype.ts +598 -0
- package/src/prover/smt/solver/theory-finite-set.ts +30 -0
- package/src/prover/smt/solver/theory-fpa.ts +389 -0
- package/src/prover/smt/solver/theory-lra-axioms.ts +53 -2
- package/src/prover/smt/solver/theory-lra-bounds.ts +31 -6
- package/src/prover/smt/solver/theory-lra-final-check.ts +56 -70
- package/src/prover/smt/solver/theory-lra-internalize.ts +94 -27
- package/src/prover/smt/solver/theory-lra-model.ts +20 -35
- package/src/prover/smt/solver/theory-lra-propagate.ts +24 -26
- package/src/prover/smt/solver/theory-lra-state.ts +6 -22
- package/src/prover/smt/solver/theory-lra.ts +188 -1
- package/src/prover/smt/solver/theory-pb.ts +934 -0
- package/src/prover/smt/solver/theory-polymorphism.ts +58 -0
- package/src/prover/smt/solver/theory-recfun.ts +307 -0
- package/src/prover/smt/solver/theory-seq-regex.ts +867 -0
- package/src/prover/smt/solver/theory-seq-solve.ts +1373 -0
- package/src/prover/smt/solver/theory-seq-state.ts +871 -0
- package/src/prover/smt/solver/theory-seq.ts +961 -0
- package/src/prover/smt/solver/theory.ts +189 -0
- package/src/prover/smt/solver/tseitin-cnf.ts +485 -0
- package/src/prover/smt/solver/var-subst.ts +36 -14
- package/src/prover/smt/table.ts +3 -2
- package/src/prover/smt/types.ts +146 -0
- package/src/prover/tlapm/cache.ts +50 -19
- package/src/prover/tlapm/tlapm.ts +15 -9
- package/src/prover/tlapm-library.ts +3208 -0
- package/src/prover/verdict.ts +9 -0
- package/src/prover/zenon/check/check.ts +1 -2
- package/src/prover/zenon/check/records.ts +1 -1
- package/src/prover/zenon/check/relations.ts +2 -1
- package/src/prover/zenon/check/rewrites.ts +2 -15
- package/src/prover/zenon/check/sets.ts +40 -58
- package/src/prover/zenon/check/terms.ts +1 -2
- package/src/prover/zenon/decide.ts +10 -7
- package/src/prover/zenon/encode.ts +0 -2
- package/src/prover/zenon/eqrel.ts +2 -2
- package/src/prover/zenon/equality-rules.ts +24 -2
- package/src/prover/zenon/expr.ts +28 -2
- package/src/prover/zenon/index-table.ts +11 -21
- package/src/prover/zenon/isar-case.ts +0 -2
- package/src/prover/zenon/isar.ts +35 -37
- package/src/prover/zenon/llproof.ts +2 -13
- package/src/prover/zenon/mltoll.ts +12 -30
- package/src/prover/zenon/node.ts +20 -5
- package/src/prover/zenon/parse.ts +9 -8
- package/src/prover/zenon/phrase.ts +0 -2
- package/src/prover/zenon/proof.ts +0 -2
- package/src/prover/zenon/propositional-rules.ts +0 -2
- package/src/prover/zenon/rules.ts +2 -3
- package/src/prover/zenon/search.ts +11 -19
- package/src/prover/zenon/tla/functions.ts +2 -4
- package/src/prover/zenon/tla/llproof.ts +9 -13
- package/src/prover/zenon/tla/records.ts +1 -8
- package/src/prover/zenon/tla/rewrites.ts +0 -2
- package/src/prover/zenon/tla/sets.ts +22 -22
- package/src/prover/zenon/tla/terms.ts +0 -2
- package/src/prover/zenon/tla/tla.ts +7 -8
- package/src/resolve.ts +127 -108
- package/src/runtime.ts +6 -0
- package/src/sany/generation.ts +382 -0
- package/src/sany/generator-def-entries.ts +210 -0
- package/src/sany/generator-definitions.ts +686 -0
- package/src/sany/generator-expressions.ts +1092 -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 +6 -13
- package/src/sany/report.ts +3 -6
- package/src/sany/selectors.ts +35 -38
- package/src/sany/xml.ts +23 -55
- package/src/search.ts +243 -52
- package/src/simulate.ts +160 -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 +2 -9
- package/src/subexpressions.ts +3 -1
- 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/jar-data.ts +12 -0
- package/src/tlc/messages.ts +20 -15
- package/src/tlc/order.ts +16 -12
- 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 +61 -16
- package/src/tlc/trace-spec.ts +26 -47
- 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 +63 -158
- 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/evaluate.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,
|
|
@@ -614,12 +615,16 @@ export const bindLazyArguments = (
|
|
|
614
615
|
typeof value.domain === "object" && value.domain.kind === "ProductSet"
|
|
615
616
|
? value.domain.factors
|
|
616
617
|
: [];
|
|
617
|
-
|
|
618
|
+
if (elements === undefined) {
|
|
619
|
+
throw new TlaEvaluationError(
|
|
620
|
+
`Attempted to apply a function to an argument not in its domain.\n${describeRange(expression.function)}`,
|
|
621
|
+
);
|
|
622
|
+
}
|
|
623
|
+
// Deviation from TLC: Tool#getFcnContext indexes past an argument tuple shorter than the bounds and ignores a longer one.
|
|
618
624
|
const createListError = () =>
|
|
619
625
|
new TlaEvaluationError(
|
|
620
626
|
`In applying the function\n${prettyPrint(formatValue(value))},\nthe argument list is:\n${prettyPrint(formatValue(argument))}\nwhich does not match its formal parameter.\n`,
|
|
621
627
|
);
|
|
622
|
-
if (elements === undefined) throw createListError();
|
|
623
628
|
bounds.forEach((bound, index) => {
|
|
624
629
|
if (index >= elements.length) throw createListError();
|
|
625
630
|
const element = elements[index];
|
|
@@ -872,7 +877,7 @@ const forceThunk = (thunk: Thunk, context: Context) => {
|
|
|
872
877
|
return value;
|
|
873
878
|
};
|
|
874
879
|
|
|
875
|
-
const getDefinitionClosure = (definition: Definition & { kind: "Operator" }): Closure => ({
|
|
880
|
+
export const getDefinitionClosure = (definition: Definition & { kind: "Operator" }): Closure => ({
|
|
876
881
|
kind: "Closure",
|
|
877
882
|
name: definition.name,
|
|
878
883
|
params: definition.params,
|
|
@@ -1176,7 +1181,9 @@ const evaluateLocalIdentifier = (name: string, expression: Expression, context:
|
|
|
1176
1181
|
}
|
|
1177
1182
|
const builtin = context.environment.builtins.get(name);
|
|
1178
1183
|
if (builtin?.arity === 0) return builtin.evaluate([], context);
|
|
1179
|
-
throw new TlaEvaluationError(
|
|
1184
|
+
throw new TlaEvaluationError(
|
|
1185
|
+
`In evaluation, the identifier ${name} is either undefined or not an operator.\n${describeRange(expression)}`,
|
|
1186
|
+
);
|
|
1180
1187
|
};
|
|
1181
1188
|
|
|
1182
1189
|
export const getReevaluatedDefinitions = (
|
|
@@ -1212,7 +1219,7 @@ const isRebindable = (value: Value): value is RebindableFilteredSet | Rebindable
|
|
|
1212
1219
|
(value.kind === "FilteredSet" || value.kind === "LazyFunction") &&
|
|
1213
1220
|
"rebind" in value;
|
|
1214
1221
|
|
|
1215
|
-
const toNextContext = (context: Context): Context => ({
|
|
1222
|
+
export const toNextContext = (context: Context): Context => ({
|
|
1216
1223
|
environment: context.environment,
|
|
1217
1224
|
scope: context.scope,
|
|
1218
1225
|
state: context.next,
|
|
@@ -1666,8 +1673,8 @@ const getScopeNames = (expression: Expression) => {
|
|
|
1666
1673
|
const names = new Set<string>();
|
|
1667
1674
|
const visit = (node: Expression): boolean => {
|
|
1668
1675
|
if (node.kind === "Subexpression") return false;
|
|
1669
|
-
|
|
1670
|
-
if (
|
|
1676
|
+
const name = getReferencedName(node);
|
|
1677
|
+
if (name !== undefined) names.add(name);
|
|
1671
1678
|
if (node.kind === "ExceptAt") names.add(EXCEPT_AT);
|
|
1672
1679
|
return getChildren(node).every(visit);
|
|
1673
1680
|
};
|
package/src/exit-codes.ts
CHANGED
|
@@ -76,10 +76,13 @@ export const withLivenessExitCode = (
|
|
|
76
76
|
return (
|
|
77
77
|
checker && {
|
|
78
78
|
branches: checker.branches,
|
|
79
|
+
solutions: checker.solutions,
|
|
79
80
|
addInitialState: (index, state, tracing) =>
|
|
80
81
|
withErrorExitCode(() => checker.addInitialState(index, state, tracing)),
|
|
81
82
|
addState: (index, state, successors, tracing) =>
|
|
82
83
|
withErrorExitCode(() => checker.addState(index, state, successors, tracing)),
|
|
84
|
+
storeState: checker.storeState,
|
|
85
|
+
getStateCounts: checker.getStateCounts,
|
|
83
86
|
findViolation: () => withErrorExitCode(() => checker.findViolation()),
|
|
84
87
|
getViolatedProperties: (path, cycleStart) =>
|
|
85
88
|
withErrorExitCode(() => checker.getViolatedProperties(path, cycleStart)),
|
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/java-hash.ts
ADDED
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,8 +16,9 @@ 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
|
+
import { resolveSynonym } from "./tlc/jar-data";
|
|
21
22
|
import { STANDARD_LEVELS } from "./standard-definitions";
|
|
22
23
|
|
|
23
24
|
interface LevelData {
|
|
@@ -55,11 +56,10 @@ type Resolved =
|
|
|
55
56
|
| { kind: "Declared"; name: string; level: number; arity: number }
|
|
56
57
|
| { kind: "Defined"; levels: OperatorLevels };
|
|
57
58
|
|
|
58
|
-
|
|
59
|
-
data: LevelData
|
|
60
|
-
|
|
61
|
-
declared
|
|
62
|
-
}
|
|
59
|
+
type Operand =
|
|
60
|
+
| { kind: "Value"; data: LevelData }
|
|
61
|
+
| { kind: "Operator"; data: OperatorLevels }
|
|
62
|
+
| { kind: "Declared"; data: LevelData; declared: OperatorParam };
|
|
63
63
|
|
|
64
64
|
export const CONSTANT_LEVEL = 0;
|
|
65
65
|
export const VARIABLE_LEVEL = 1;
|
|
@@ -96,6 +96,12 @@ export const putConstraint = (constraints: Map<string, number>, name: string, le
|
|
|
96
96
|
export const putArgConstraint = (constraints: Map<string, number>, key: string, level: number) =>
|
|
97
97
|
constraints.set(key, Math.max(level, constraints.get(key) ?? 0));
|
|
98
98
|
|
|
99
|
+
const mergeConstraints = (data: LevelData, part: LevelData) => {
|
|
100
|
+
part.constraints.forEach((value, key) => putConstraint(data.constraints, key, value));
|
|
101
|
+
part.argConstraints.forEach((value, key) => putArgConstraint(data.argConstraints, key, value));
|
|
102
|
+
part.argParams.forEach((key) => data.argParams.add(key));
|
|
103
|
+
};
|
|
104
|
+
|
|
99
105
|
const createSignature = (
|
|
100
106
|
name: string,
|
|
101
107
|
level: number,
|
|
@@ -231,12 +237,8 @@ export const createLevelAnalyzer = (context: LevelContext) => {
|
|
|
231
237
|
data.params.add(param);
|
|
232
238
|
data.argParams.add(getArgumentParamKey(name, index, param));
|
|
233
239
|
});
|
|
234
|
-
operand.data.constraints.forEach((value, key) => putConstraint(data.constraints, key, value));
|
|
235
240
|
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));
|
|
241
|
+
mergeConstraints(data, operand.data);
|
|
240
242
|
});
|
|
241
243
|
return data;
|
|
242
244
|
};
|
|
@@ -249,16 +251,16 @@ export const createLevelAnalyzer = (context: LevelContext) => {
|
|
|
249
251
|
) => {
|
|
250
252
|
const isBound = (name: string) => bound.includes(name);
|
|
251
253
|
operands.forEach((operand, index) => {
|
|
252
|
-
if (operand.
|
|
254
|
+
if (operand.kind !== "Value") return;
|
|
253
255
|
if (operand.data.level > getMaxLevel(operator, index)) {
|
|
254
256
|
throw new TlaSyntaxError(
|
|
255
|
-
`Level error in applying operator ${operator.name}:\nThe level of argument ${index + 1} exceeds the maximum level allowed by the operator`,
|
|
257
|
+
`Level error in applying operator ${resolveSynonym(operator.name)}:\nThe level of argument ${index + 1} exceeds the maximum level allowed by the operator`,
|
|
256
258
|
);
|
|
257
259
|
}
|
|
258
260
|
});
|
|
259
261
|
if (ranges.some((range) => range.level > ACTION_LEVEL)) {
|
|
260
262
|
throw new TlaSyntaxError(
|
|
261
|
-
`Level error in applying operator ${operator.name}:\nThe level of the range for a bounded variable exceeds the maximum level allowed by the operator`,
|
|
263
|
+
`Level error in applying operator ${resolveSynonym(operator.name)}:\nThe level of the range for a bounded variable exceeds the maximum level allowed by the operator`,
|
|
262
264
|
);
|
|
263
265
|
}
|
|
264
266
|
const getOperand = (formal: string) => {
|
|
@@ -300,8 +302,8 @@ export const createLevelAnalyzer = (context: LevelContext) => {
|
|
|
300
302
|
}),
|
|
301
303
|
);
|
|
302
304
|
operands.forEach((operand, operandIndex) => {
|
|
303
|
-
|
|
304
|
-
|
|
305
|
+
if (operand.kind !== "Operator") return;
|
|
306
|
+
const argument = operand.data;
|
|
305
307
|
operands.forEach((other, otherIndex) =>
|
|
306
308
|
argument.formals.forEach((_formal, argumentIndex) => {
|
|
307
309
|
if (!hasCondition(operandIndex, otherIndex, argumentIndex)) return;
|
|
@@ -313,9 +315,13 @@ export const createLevelAnalyzer = (context: LevelContext) => {
|
|
|
313
315
|
});
|
|
314
316
|
operator.argParams.forEach((key) => {
|
|
315
317
|
const parameter = parseArgumentParamKey(key);
|
|
316
|
-
const argument = getOperand(parameter.operator)
|
|
317
|
-
if (argument) {
|
|
318
|
-
putConstraint(
|
|
318
|
+
const argument = getOperand(parameter.operator);
|
|
319
|
+
if (argument?.kind === "Operator") {
|
|
320
|
+
putConstraint(
|
|
321
|
+
data.constraints,
|
|
322
|
+
parameter.param,
|
|
323
|
+
getMaxLevel(argument.data, parameter.index),
|
|
324
|
+
);
|
|
319
325
|
}
|
|
320
326
|
});
|
|
321
327
|
|
|
@@ -328,8 +334,8 @@ export const createLevelAnalyzer = (context: LevelContext) => {
|
|
|
328
334
|
constraints.forEach((value, key) => putArgConstraint(data.argConstraints, key, value)),
|
|
329
335
|
);
|
|
330
336
|
operands.forEach((operand, operandIndex) => {
|
|
337
|
+
if (operand.kind !== "Declared") return;
|
|
331
338
|
const declared = operand.declared;
|
|
332
|
-
if (!declared) return;
|
|
333
339
|
Array.from({ length: declared.arity }, (_value, argumentIndex) =>
|
|
334
340
|
putArgConstraint(
|
|
335
341
|
data.argConstraints,
|
|
@@ -381,15 +387,15 @@ export const createLevelAnalyzer = (context: LevelContext) => {
|
|
|
381
387
|
);
|
|
382
388
|
return;
|
|
383
389
|
}
|
|
384
|
-
if (argument.
|
|
390
|
+
if (argument.kind === "Declared") {
|
|
385
391
|
data.argParams.add(
|
|
386
392
|
getArgumentParamKey(argument.declared.name, parameter.index, parameter.param),
|
|
387
393
|
);
|
|
388
394
|
}
|
|
389
395
|
});
|
|
390
396
|
operands.forEach((operand, operandIndex) => {
|
|
397
|
+
if (operand.kind !== "Declared") return;
|
|
391
398
|
const declared = operand.declared;
|
|
392
|
-
if (!declared) return;
|
|
393
399
|
operands.forEach((other, otherIndex) =>
|
|
394
400
|
Array.from({ length: declared.arity }, (_value, argumentIndex) => {
|
|
395
401
|
if (!hasCondition(operandIndex, otherIndex, argumentIndex)) return;
|
|
@@ -410,7 +416,7 @@ export const createLevelAnalyzer = (context: LevelContext) => {
|
|
|
410
416
|
expression.body,
|
|
411
417
|
scope,
|
|
412
418
|
);
|
|
413
|
-
return {
|
|
419
|
+
return { kind: "Operator", data: operator };
|
|
414
420
|
}
|
|
415
421
|
const name =
|
|
416
422
|
expression.kind === "OperatorReference"
|
|
@@ -424,16 +430,16 @@ export const createLevelAnalyzer = (context: LevelContext) => {
|
|
|
424
430
|
resolved.kind === "Defined" &&
|
|
425
431
|
(resolved.levels.formals.length > 0 || expression.kind === "OperatorReference")
|
|
426
432
|
) {
|
|
427
|
-
return {
|
|
433
|
+
return { kind: "Operator", data: resolved.levels };
|
|
428
434
|
}
|
|
429
435
|
if (resolved.kind === "Declared" && resolved.arity > 0) {
|
|
430
436
|
const data = createData();
|
|
431
437
|
data.params.add(name);
|
|
432
|
-
return { data, declared: { name, arity: resolved.arity } };
|
|
438
|
+
return { kind: "Declared", data, declared: { name, arity: resolved.arity } };
|
|
433
439
|
}
|
|
434
|
-
if (expression.kind === "OperatorReference") return { data: createData() };
|
|
440
|
+
if (expression.kind === "OperatorReference") return { kind: "Value", data: createData() };
|
|
435
441
|
}
|
|
436
|
-
return { data: analyze(expression, scope) };
|
|
442
|
+
return { kind: "Value", data: analyze(expression, scope) };
|
|
437
443
|
};
|
|
438
444
|
|
|
439
445
|
const toOperands = (expressions: Expression[], scope: Scope) =>
|
|
@@ -509,14 +515,9 @@ export const createLevelAnalyzer = (context: LevelContext) => {
|
|
|
509
515
|
argConstraints: new Map(body.argConstraints),
|
|
510
516
|
argParams: new Set(body.argParams),
|
|
511
517
|
};
|
|
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
|
-
});
|
|
518
|
+
expression.definitions.forEach((definition) =>
|
|
519
|
+
mergeConstraints(data, analyzeDefinition(definition, inner)),
|
|
520
|
+
);
|
|
520
521
|
return data;
|
|
521
522
|
};
|
|
522
523
|
|
|
@@ -683,14 +684,14 @@ export const createLevelAnalyzer = (context: LevelContext) => {
|
|
|
683
684
|
toOperand(expression.function, scope),
|
|
684
685
|
expression.args.length === 1
|
|
685
686
|
? toOperand(expression.args[0], scope)
|
|
686
|
-
: { data: applyBuiltin(SET_LEVELS, expression.args, scope) },
|
|
687
|
+
: { kind: "Value", data: applyBuiltin(SET_LEVELS, expression.args, scope) },
|
|
687
688
|
]);
|
|
688
689
|
case "Bracket":
|
|
689
690
|
return createData();
|
|
690
691
|
case "FieldAccess":
|
|
691
692
|
return applyDefined(SELECT_LEVELS, [
|
|
692
693
|
toOperand(expression.record, scope),
|
|
693
|
-
{ data: createData() },
|
|
694
|
+
{ kind: "Value", data: createData() },
|
|
694
695
|
]);
|
|
695
696
|
case "BoxAction":
|
|
696
697
|
case "AngleAction":
|
|
@@ -753,10 +754,9 @@ export const createLevelAnalyzer = (context: LevelContext) => {
|
|
|
753
754
|
);
|
|
754
755
|
return names;
|
|
755
756
|
default:
|
|
756
|
-
|
|
757
|
-
visit(child, isNonLeibniz, bindFormals(scope, toFormals(bound)))
|
|
758
|
-
|
|
759
|
-
});
|
|
757
|
+
forEachChild(expression, (child, bound) =>
|
|
758
|
+
visit(child, isNonLeibniz, bindFormals(scope, toFormals(bound))),
|
|
759
|
+
);
|
|
760
760
|
return names;
|
|
761
761
|
}
|
|
762
762
|
};
|
|
@@ -869,9 +869,7 @@ export const analyzeAssumeProve = (
|
|
|
869
869
|
const data = createData(Math.max(...parts.map((part) => part.level)));
|
|
870
870
|
parts.forEach((part) => {
|
|
871
871
|
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));
|
|
872
|
+
mergeConstraints(data, part);
|
|
875
873
|
});
|
|
876
874
|
return data;
|
|
877
875
|
};
|
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;
|