tla-ts 0.0.10-dev.094b9b512 → 0.0.10-dev.1ebc153bd
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/dist/compile.cjs +3 -3
- package/dist/compile.js +1 -1
- package/dist/deciders.cjs +37 -36
- package/dist/deciders.js +38 -37
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +5 -1
- package/dist/index.d.ts +5 -1
- package/dist/index.js +1 -1
- package/dist/parallel-worker.cjs +1 -1
- package/dist/parallel-worker.js +1 -1
- package/dist/prove-worker.cjs +1 -1
- package/dist/prove-worker.js +1 -1
- package/dist/prove.cjs +146 -58
- package/dist/prove.js +145 -57
- package/dist/run.cjs +43 -43
- package/dist/run.js +45 -45
- package/dist/tlapm.cjs +1 -1
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +40 -37
- package/dist/transfer.js +38 -35
- package/dist/worker.cjs +6 -6
- package/dist/worker.js +6 -6
- package/package.json +1 -1
- package/src/ast.ts +4 -3
- package/src/bags.ts +46 -28
- package/src/check-trace.ts +2 -16
- package/src/check.ts +349 -91
- package/src/cli/runtime-invariants.ts +20 -56
- package/src/cli/tlapm.ts +268 -71
- package/src/cli/tlc-arguments.ts +2 -2
- package/src/cli/tlc-output.ts +4 -5
- package/src/cli/tlc-usage.ts +0 -1
- package/src/cli/tlc.ts +26 -7
- package/src/cli/xml-exporter.ts +1 -1
- package/src/codegen.ts +9 -5
- package/src/dependencies.ts +72 -11
- package/src/dfid.ts +9 -2
- package/src/environment.ts +65 -36
- package/src/errors.ts +8 -1
- package/src/evaluate.ts +92 -32
- package/src/exit-codes.ts +5 -2
- package/src/instances.ts +5 -5
- package/src/java-overrides.ts +2 -2
- package/src/levels.ts +138 -90
- package/src/liveness-checker.ts +572 -204
- package/src/liveness.ts +47 -32
- package/src/obligations/action.ts +0 -2
- package/src/obligations/anonymize.ts +2 -6
- package/src/obligations/equality.ts +0 -2
- package/src/obligations/expression.ts +0 -2
- package/src/obligations/format.ts +0 -2
- package/src/obligations/generate.ts +0 -2
- package/src/obligations/index.ts +9 -8
- package/src/obligations/levels.ts +0 -2
- package/src/obligations/module.ts +0 -2
- package/src/obligations/normalize.ts +1 -6
- package/src/obligations/operators.ts +0 -2
- package/src/obligations/pragma.ts +2 -2
- package/src/obligations/printer.ts +5 -7
- package/src/obligations/proof.ts +0 -2
- package/src/obligations/regroup.ts +0 -2
- package/src/obligations/simplify.ts +0 -2
- package/src/obligations/subexpression.ts +1 -4
- package/src/obligations/substitution.ts +0 -2
- package/src/obligations/temporal.ts +0 -2
- package/src/obligations/tuples.ts +0 -2
- package/src/parallel-worker.ts +8 -2
- package/src/parallel.ts +7 -2
- package/src/parser.ts +256 -185
- package/src/pretty-print.ts +1 -1
- package/src/prover/deciders.ts +1 -8
- package/src/prover/isabelle/encode.ts +0 -2
- package/src/prover/isabelle/isar/attrib.ts +86 -55
- package/src/prover/isabelle/isar/context.ts +25 -26
- package/src/prover/isabelle/isar/induct.ts +2 -12
- package/src/prover/isabelle/isar/method.ts +6 -10
- package/src/prover/isabelle/isar/proof.ts +40 -39
- package/src/prover/isabelle/isar/rule-cases.ts +14 -22
- package/src/prover/isabelle/isar/theory.ts +16 -17
- package/src/prover/isabelle/isar/toplevel.ts +46 -56
- package/src/prover/isabelle/isar/type-check.ts +0 -2
- package/src/prover/isabelle/provers/blast/blast.ts +0 -2
- 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 +1 -3
- package/src/prover/isabelle/provers/classical.ts +1 -3
- package/src/prover/isabelle/provers/hypsubst.ts +2 -4
- package/src/prover/isabelle/pure/bicompose.ts +0 -2
- package/src/prover/isabelle/pure/consts.ts +0 -2
- package/src/prover/isabelle/pure/conv.ts +0 -2
- package/src/prover/isabelle/pure/drule.ts +0 -2
- package/src/prover/isabelle/pure/envir.ts +0 -2
- package/src/prover/isabelle/pure/goal.ts +0 -2
- package/src/prover/isabelle/pure/logic.ts +0 -2
- 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 +0 -2
- package/src/prover/isabelle/pure/pattern.ts +0 -2
- package/src/prover/isabelle/pure/raw-simplifier.ts +0 -2
- package/src/prover/isabelle/pure/rewriter.ts +3 -5
- 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 +0 -2
- package/src/prover/isabelle/pure/table.ts +0 -2
- package/src/prover/isabelle/pure/tactic.ts +0 -2
- package/src/prover/isabelle/pure/tactical.ts +0 -2
- package/src/prover/isabelle/pure/term-ord.ts +0 -2
- package/src/prover/isabelle/pure/term.ts +3 -5
- package/src/prover/isabelle/pure/thm.ts +0 -2
- 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 +0 -2
- package/src/prover/isabelle/tla/simpdata.ts +0 -2
- package/src/prover/isabelle/tools/intuitionistic.ts +0 -2
- package/src/prover/ocaml.ts +4 -1
- package/src/prover/prep/action.ts +1 -0
- package/src/prover/prep/md5.ts +26 -29
- package/src/prover/prep/methods.ts +55 -6
- package/src/prover/prep/normalize.ts +4 -1
- package/src/prover/prove.ts +58 -32
- package/src/prover/ptl/decide.ts +43 -63
- package/src/prover/smt/context.ts +10 -14
- package/src/prover/smt/data.ts +51 -45
- package/src/prover/smt/encode.ts +1 -2
- package/src/prover/smt/rewrite.ts +3 -7
- package/src/prover/smt/simplify.ts +1 -1
- package/src/prover/smt/solver/ackermannize-bv-tactic.ts +0 -2
- package/src/prover/smt/solver/ackr-helper.ts +0 -3
- package/src/prover/smt/solver/ackr-model-converter.ts +1 -8
- package/src/prover/smt/solver/act-cache.ts +0 -1
- package/src/prover/smt/solver/add-bounds-tactic.ts +0 -1
- package/src/prover/smt/solver/aig-tactic.ts +25 -16
- package/src/prover/smt/solver/aig.ts +2 -3
- package/src/prover/smt/solver/arith-rewriter.ts +4 -7
- package/src/prover/smt/solver/arith-terms.ts +0 -2
- package/src/prover/smt/solver/array-decl-plugin.ts +0 -1
- package/src/prover/smt/solver/array-rewriter.ts +1 -4
- package/src/prover/smt/solver/asserted-formulas.ts +67 -3
- package/src/prover/smt/solver/ast-lt.ts +2 -3
- package/src/prover/smt/solver/ast-util.ts +4 -5
- package/src/prover/smt/solver/ast.ts +171 -168
- package/src/prover/smt/solver/auf-solver.ts +0 -1
- package/src/prover/smt/solver/bit-blast-tactic.ts +2 -11
- package/src/prover/smt/solver/bit-blaster.ts +0 -3
- package/src/prover/smt/solver/blast-term-ite.ts +47 -0
- package/src/prover/smt/solver/bound-manager.ts +39 -29
- package/src/prover/smt/solver/bound-simplifier.ts +2 -5
- package/src/prover/smt/solver/bv-bound-chk.ts +2 -10
- package/src/prover/smt/solver/bv-decl-plugin.ts +13 -11
- package/src/prover/smt/solver/bv-divrem-bounds.ts +0 -2
- package/src/prover/smt/solver/bv-rewriter.ts +15 -19
- package/src/prover/smt/solver/bv1-blast.ts +1 -11
- package/src/prover/smt/solver/bv2fpa-converter.ts +0 -1
- package/src/prover/smt/solver/bv2int-rewriter.ts +0 -1
- package/src/prover/smt/solver/bv2real-rewriter.ts +0 -1
- package/src/prover/smt/solver/card2bv.ts +3 -7
- package/src/prover/smt/solver/case-split-queue.ts +0 -2
- package/src/prover/smt/solver/cg-table.ts +19 -16
- package/src/prover/smt/solver/check-logic.ts +6 -2
- package/src/prover/smt/solver/clause.ts +0 -1
- package/src/prover/smt/solver/cofactor-elim-term-ite.ts +2 -5
- package/src/prover/smt/solver/conflict-resolution.ts +8 -8
- package/src/prover/smt/solver/context.ts +45 -15
- package/src/prover/smt/solver/ctx-simplify.ts +1 -3
- package/src/prover/smt/solver/ctx-solver-simplify.ts +0 -2
- package/src/prover/smt/solver/datatype-decl-plugin.ts +22 -17
- package/src/prover/smt/solver/datatype-rewriter.ts +0 -1
- package/src/prover/smt/solver/demodulator.ts +2 -5
- package/src/prover/smt/solver/dependent-expr-state.ts +25 -7
- package/src/prover/smt/solver/der.ts +0 -1
- package/src/prover/smt/solver/diff-neq.ts +1 -3
- package/src/prover/smt/solver/distribute-forall.ts +1 -11
- package/src/prover/smt/solver/dom-simplify.ts +1 -3
- package/src/prover/smt/solver/dt2bv-tactic.ts +2 -9
- package/src/prover/smt/solver/dyn-ack.ts +0 -1
- package/src/prover/smt/solver/e-matching.ts +6 -7
- package/src/prover/smt/solver/elim-small-bv-tactic.ts +0 -1
- package/src/prover/smt/solver/elim-term-ite-tactic.ts +48 -0
- package/src/prover/smt/solver/elim-uncnstr.ts +7 -23
- package/src/prover/smt/solver/enode.ts +16 -10
- package/src/prover/smt/solver/eq2bv-tactic.ts +0 -1
- package/src/prover/smt/solver/euf/arith-axioms.ts +0 -1
- package/src/prover/smt/solver/euf/arith-internalize.ts +2 -8
- package/src/prover/smt/solver/euf/arith-solver.ts +0 -6
- package/src/prover/smt/solver/euf/array-axioms.ts +0 -1
- package/src/prover/smt/solver/euf/array-internalize.ts +21 -12
- package/src/prover/smt/solver/euf/array-solver.ts +0 -2
- package/src/prover/smt/solver/euf/bv-ackerman.ts +0 -2
- package/src/prover/smt/solver/euf/bv-internalize.ts +1 -3
- package/src/prover/smt/solver/euf/bv-solver.ts +0 -2
- package/src/prover/smt/solver/euf/dt-solver.ts +19 -21
- package/src/prover/smt/solver/euf/egraph.ts +69 -53
- package/src/prover/smt/solver/euf/euf-solver.ts +38 -37
- package/src/prover/smt/solver/euf/fpa-solver.ts +37 -53
- package/src/prover/smt/solver/euf/mam.ts +7 -55
- package/src/prover/smt/solver/euf/q-ematch.ts +27 -98
- package/src/prover/smt/solver/euf/q-mbi.ts +4 -4
- package/src/prover/smt/solver/euf/q-model-fixer.ts +1 -4
- package/src/prover/smt/solver/euf/q-solver.ts +3 -3
- package/src/prover/smt/solver/euf/th-solver.ts +1 -16
- package/src/prover/smt/solver/euf/th-solvers.ts +0 -1
- package/src/prover/smt/solver/expr-ref.ts +0 -1
- package/src/prover/smt/solver/expr-safe-replace.ts +0 -1
- package/src/prover/smt/solver/expr2polynomial.ts +204 -80
- package/src/prover/smt/solver/factor.ts +37 -26
- package/src/prover/smt/solver/fd-solver.ts +3 -5
- package/src/prover/smt/solver/fingerprints.ts +0 -1
- package/src/prover/smt/solver/fix-dl-var.ts +2 -4
- package/src/prover/smt/solver/flat-literals.ts +0 -1
- package/src/prover/smt/solver/fm-tactic.ts +25 -14
- package/src/prover/smt/solver/fpa-decl-plugin.ts +0 -1
- package/src/prover/smt/solver/fpa-rewriter.ts +12 -14
- package/src/prover/smt/solver/fpa2bv-converter.ts +13 -8
- package/src/prover/smt/solver/fpa2bv-rewriter.ts +1 -1
- package/src/prover/smt/solver/fpa2bv-tactic.ts +1 -3
- package/src/prover/smt/solver/goal.ts +6 -4
- package/src/prover/smt/solver/goal2nlsat.ts +57 -32
- package/src/prover/smt/solver/guard-set.ts +0 -1
- package/src/prover/smt/solver/hash.ts +0 -1
- package/src/prover/smt/solver/hashtable.ts +4 -1
- package/src/prover/smt/solver/inf-eps.ts +1 -2
- package/src/prover/smt/solver/inj-axiom.ts +0 -1
- package/src/prover/smt/solver/internalizer.ts +41 -3
- package/src/prover/smt/solver/lackr.ts +0 -2
- package/src/prover/smt/solver/lbool.ts +0 -1
- package/src/prover/smt/solver/lia2card.ts +1 -2
- package/src/prover/smt/solver/lia2pb.ts +18 -5
- package/src/prover/smt/solver/literal.ts +0 -1
- package/src/prover/smt/solver/logic-tactics.ts +9 -6
- 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 +0 -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 +0 -2
- 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 +0 -1
- package/src/prover/smt/solver/lp/hnf.ts +0 -3
- package/src/prover/smt/solver/lp/int-cube.ts +0 -1
- package/src/prover/smt/solver/lp/int-solver.ts +0 -2
- package/src/prover/smt/solver/lp/lar-solver.ts +1 -2
- package/src/prover/smt/solver/lp/lar-term.ts +0 -1
- package/src/prover/smt/solver/lp/lp-settings.ts +1 -2
- package/src/prover/smt/solver/lp/maximize-term.ts +0 -3
- 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 +26 -7
- 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 +158 -82
- 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 +144 -108
- 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 +50 -19
- 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 +138 -97
- 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 -290
- 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 +1 -2
- package/src/prover/smt/solver/macro-finder.ts +1 -4
- package/src/prover/smt/solver/mam-compiler.ts +14 -15
- package/src/prover/smt/solver/mam-interpreter.ts +0 -1
- package/src/prover/smt/solver/max-bv-sharing-tactic.ts +1 -13
- package/src/prover/smt/solver/max-cliques.ts +0 -2
- package/src/prover/smt/solver/maxcore.ts +6 -15
- package/src/prover/smt/solver/maximize-ac-sharing.ts +0 -2
- package/src/prover/smt/solver/maxlex.ts +0 -8
- package/src/prover/smt/solver/maxsmt-base.ts +7 -1
- package/src/prover/smt/solver/maxsmt.ts +0 -1
- package/src/prover/smt/solver/mbp/mbp-arith.ts +2 -12
- package/src/prover/smt/solver/mbp/mbp-basic-tg.ts +0 -1
- package/src/prover/smt/solver/mbp/mbp-plugin.ts +10 -3
- package/src/prover/smt/solver/mbp/mbp-qel.ts +0 -1
- package/src/prover/smt/solver/mbp/mbp-solve-plugin.ts +1 -10
- package/src/prover/smt/solver/mbp/mbp-term-graph.ts +1 -19
- package/src/prover/smt/solver/model-based-opt.ts +1 -2
- package/src/prover/smt/solver/model-checker.ts +2 -3
- package/src/prover/smt/solver/model-evaluator.ts +9 -6
- package/src/prover/smt/solver/model-finder.ts +0 -1
- package/src/prover/smt/solver/model-generator.ts +3 -2
- package/src/prover/smt/solver/model-macro-solver.ts +3 -4
- package/src/prover/smt/solver/model-printer.ts +0 -1
- package/src/prover/smt/solver/mpf.ts +2 -5
- package/src/prover/smt/solver/mus.ts +2 -4
- package/src/prover/smt/solver/muz/dl-context.ts +67 -19
- package/src/prover/smt/solver/muz/dl-mk-bit-blast.ts +0 -1
- package/src/prover/smt/solver/muz/dl-mk-coi-filter.ts +68 -22
- package/src/prover/smt/solver/muz/dl-mk-elim-term-ite.ts +7 -3
- package/src/prover/smt/solver/muz/dl-mk-interp-tail-simplifier.ts +0 -6
- package/src/prover/smt/solver/muz/dl-mk-rule-inliner.ts +39 -11
- package/src/prover/smt/solver/muz/dl-mk-slice.ts +78 -16
- package/src/prover/smt/solver/muz/dl-mk-subsumption-checker.ts +9 -4
- package/src/prover/smt/solver/muz/dl-rule-set.ts +0 -30
- package/src/prover/smt/solver/muz/dl-rule-transformer.ts +0 -4
- package/src/prover/smt/solver/muz/dl-rule.ts +93 -57
- package/src/prover/smt/solver/muz/hnf.ts +6 -6
- package/src/prover/smt/solver/muz/horn-subsume-model-converter.ts +176 -0
- package/src/prover/smt/solver/muz/horn-tactic.ts +15 -6
- package/src/prover/smt/solver/muz/rule-properties.ts +195 -37
- package/src/prover/smt/solver/muz/spacer-context.ts +111 -102
- package/src/prover/smt/solver/muz/spacer-dl-interface.ts +15 -4
- package/src/prover/smt/solver/muz/spacer-generalizers.ts +0 -3
- package/src/prover/smt/solver/muz/spacer-manager.ts +0 -6
- package/src/prover/smt/solver/muz/spacer-pdr.ts +4 -4
- package/src/prover/smt/solver/muz/spacer-prop-solver.ts +4 -15
- package/src/prover/smt/solver/muz/spacer-util.ts +2 -29
- package/src/prover/smt/solver/muz/substitution.ts +88 -39
- package/src/prover/smt/solver/nla2bv-tactic.ts +0 -1
- package/src/prover/smt/solver/nlqsat.ts +5 -5
- package/src/prover/smt/solver/nlsat/algebraic.ts +197 -96
- package/src/prover/smt/solver/nlsat/atoms.ts +52 -35
- package/src/prover/smt/solver/nlsat/evaluator.ts +0 -1
- package/src/prover/smt/solver/nlsat/explain.ts +379 -217
- package/src/prover/smt/solver/nlsat/interval-set.ts +0 -1
- package/src/prover/smt/solver/nlsat/levelwise.ts +460 -241
- package/src/prover/smt/solver/nlsat/mpbq.ts +0 -1
- package/src/prover/smt/solver/nlsat/polynomial.ts +2366 -683
- package/src/prover/smt/solver/nlsat/solver.ts +118 -105
- package/src/prover/smt/solver/nlsat/transcendental-eval.ts +2 -3
- package/src/prover/smt/solver/nlsat/transcendentals.ts +41 -19
- package/src/prover/smt/solver/nlsat/types.ts +0 -2
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +8 -7
- package/src/prover/smt/solver/nlsat/upolynomial.ts +41 -20
- package/src/prover/smt/solver/nlsat-tactic.ts +1 -2
- package/src/prover/smt/solver/nnf.ts +6 -3
- package/src/prover/smt/solver/normalize-bounds.ts +0 -1
- package/src/prover/smt/solver/occf.ts +0 -1
- package/src/prover/smt/solver/opt-context.ts +19 -13
- package/src/prover/smt/solver/opt-nlsat.ts +97 -77
- package/src/prover/smt/solver/opt-pareto.ts +0 -2
- package/src/prover/smt/solver/opt-preprocess.ts +1 -2
- package/src/prover/smt/solver/opt-solver.ts +22 -11
- package/src/prover/smt/solver/opt-value.ts +0 -1
- package/src/prover/smt/solver/optsmt.ts +13 -12
- package/src/prover/smt/solver/parallel-tactic.ts +0 -2
- package/src/prover/smt/solver/pattern-inference.ts +2 -3
- package/src/prover/smt/solver/pb-rewriter.ts +15 -30
- package/src/prover/smt/solver/pb2bv-tactic.ts +0 -2
- package/src/prover/smt/solver/poly-rewriter.ts +76 -21
- package/src/prover/smt/solver/probes.ts +91 -28
- package/src/prover/smt/solver/propagate-values.ts +4 -1
- package/src/prover/smt/solver/proto-model.ts +9 -12
- package/src/prover/smt/solver/pull-quant.ts +0 -1
- package/src/prover/smt/solver/purify-arith.ts +50 -16
- package/src/prover/smt/solver/qe-arith-plugin.ts +4 -7
- package/src/prover/smt/solver/qe-lite-der.ts +0 -1
- package/src/prover/smt/solver/qe-lite-fm.ts +0 -1
- package/src/prover/smt/solver/qe-lite.ts +2 -3
- package/src/prover/smt/solver/qe-mbp.ts +13 -24
- package/src/prover/smt/solver/qe.ts +48 -57
- package/src/prover/smt/solver/qel.ts +0 -1
- package/src/prover/smt/solver/qi-queue.ts +0 -1
- package/src/prover/smt/solver/qsat.ts +71 -97
- package/src/prover/smt/solver/quant-hoist.ts +2 -1
- package/src/prover/smt/solver/quant-tactics.ts +0 -1
- package/src/prover/smt/solver/quantifier-analyzer.ts +9 -10
- package/src/prover/smt/solver/quantifier-manager.ts +14 -10
- package/src/prover/smt/solver/quasi-macros.ts +9 -20
- package/src/prover/smt/solver/random-gen.ts +0 -1
- package/src/prover/smt/solver/rational.ts +17 -1
- package/src/prover/smt/solver/recfun-decl-plugin.ts +35 -21
- package/src/prover/smt/solver/recfun-rewriter.ts +1 -2
- package/src/prover/smt/solver/reduce-args.ts +0 -1
- package/src/prover/smt/solver/reduce-bv-size.ts +0 -1
- package/src/prover/smt/solver/ref-vector.ts +0 -1
- package/src/prover/smt/solver/relevancy.ts +0 -1
- package/src/prover/smt/solver/rewriter-tpl.ts +6 -3
- package/src/prover/smt/solver/rewriter.ts +1 -2
- package/src/prover/smt/solver/rlimit.ts +17 -1
- package/src/prover/smt/solver/sat/asymm-branch.ts +59 -48
- package/src/prover/smt/solver/sat/big.ts +0 -1
- package/src/prover/smt/solver/sat/clause-use-list.ts +0 -8
- package/src/prover/smt/solver/sat/clause.ts +2 -20
- package/src/prover/smt/solver/sat/cleaner.ts +0 -2
- package/src/prover/smt/solver/sat/config.ts +6 -9
- package/src/prover/smt/solver/sat/consequences.ts +1 -2
- package/src/prover/smt/solver/sat/elim-eqs.ts +0 -2
- package/src/prover/smt/solver/sat/goal2sat.ts +1 -3
- package/src/prover/smt/solver/sat/inc-sat-solver.ts +30 -15
- package/src/prover/smt/solver/sat/model-converter.ts +2 -22
- package/src/prover/smt/solver/sat/pb-constraint.ts +0 -3
- package/src/prover/smt/solver/sat/pb-solver.ts +50 -26
- package/src/prover/smt/solver/sat/probing.ts +22 -21
- package/src/prover/smt/solver/sat/sat-tactic.ts +4 -4
- package/src/prover/smt/solver/sat/sat2goal.ts +9 -15
- package/src/prover/smt/solver/sat/scc.ts +1 -2
- package/src/prover/smt/solver/sat/simplifier.ts +16 -60
- package/src/prover/smt/solver/sat/solver.ts +47 -70
- package/src/prover/smt/solver/sat/var-queue.ts +0 -2
- package/src/prover/smt/solver/sat/watch-list.ts +7 -3
- package/src/prover/smt/solver/search-tree.ts +0 -1
- package/src/prover/smt/solver/seq-axioms.ts +21 -39
- package/src/prover/smt/solver/seq-decl-plugin.ts +10 -14
- package/src/prover/smt/solver/seq-derive.ts +11 -16
- package/src/prover/smt/solver/seq-eq-approx.ts +0 -2
- package/src/prover/smt/solver/seq-eq-solver.ts +9 -10
- package/src/prover/smt/solver/seq-factory.ts +2 -4
- package/src/prover/smt/solver/seq-monadic.ts +7 -7
- package/src/prover/smt/solver/seq-range-predicate.ts +18 -8
- package/src/prover/smt/solver/seq-re-rewriter.ts +5 -130
- package/src/prover/smt/solver/seq-re-util.ts +8 -27
- package/src/prover/smt/solver/seq-regex-bisim.ts +2 -3
- package/src/prover/smt/solver/seq-regex-live.ts +6 -8
- package/src/prover/smt/solver/seq-rewriter.ts +32 -35
- package/src/prover/smt/solver/seq-skolem.ts +0 -24
- package/src/prover/smt/solver/seq-subset.ts +0 -1
- package/src/prover/smt/solver/seq-view-witness.ts +4 -6
- package/src/prover/smt/solver/smt-consequences.ts +0 -2
- package/src/prover/smt/solver/smt-kernel.ts +9 -5
- package/src/prover/smt/solver/smt-logics.ts +0 -1
- package/src/prover/smt/solver/smt-setup.ts +86 -20
- package/src/prover/smt/solver/smt2-printer.ts +0 -2
- package/src/prover/smt/solver/smtlib-parser.ts +1681 -721
- package/src/prover/smt/solver/smtlib-script.ts +1273 -793
- package/src/prover/smt/solver/solve-eqs.ts +13 -23
- package/src/prover/smt/solver/solver.ts +1 -2
- package/src/prover/smt/solver/static-features.ts +0 -5
- package/src/prover/smt/solver/sticky-generations.ts +0 -1
- package/src/prover/smt/solver/tactic.ts +269 -130
- package/src/prover/smt/solver/term-enumeration.ts +0 -1
- package/src/prover/smt/solver/theory-array.ts +25 -60
- package/src/prover/smt/solver/theory-bv.ts +15 -54
- package/src/prover/smt/solver/theory-char.ts +0 -1
- package/src/prover/smt/solver/theory-datatype.ts +0 -1
- package/src/prover/smt/solver/theory-finite-set.ts +2 -2
- package/src/prover/smt/solver/theory-fpa.ts +46 -79
- package/src/prover/smt/solver/theory-lra-axioms.ts +0 -1
- package/src/prover/smt/solver/theory-lra-bounds.ts +0 -1
- package/src/prover/smt/solver/theory-lra-final-check.ts +1 -2
- package/src/prover/smt/solver/theory-lra-internalize.ts +9 -1
- package/src/prover/smt/solver/theory-lra-model.ts +0 -1
- package/src/prover/smt/solver/theory-lra-propagate.ts +6 -5
- package/src/prover/smt/solver/theory-lra-state.ts +0 -1
- package/src/prover/smt/solver/theory-lra.ts +0 -7
- package/src/prover/smt/solver/theory-pb.ts +34 -15
- package/src/prover/smt/solver/theory-polymorphism.ts +3 -4
- package/src/prover/smt/solver/theory-recfun.ts +2 -3
- package/src/prover/smt/solver/theory-seq-regex.ts +3 -7
- package/src/prover/smt/solver/theory-seq-solve.ts +6 -8
- package/src/prover/smt/solver/theory-seq-state.ts +8 -36
- package/src/prover/smt/solver/theory-seq.ts +32 -55
- package/src/prover/smt/solver/theory.ts +16 -2
- package/src/prover/smt/solver/tseitin-cnf.ts +3 -5
- package/src/prover/smt/solver/var-subst.ts +6 -6
- package/src/prover/smt/table.ts +3 -2
- package/src/prover/tlapm/cache.ts +8 -8
- package/src/prover/zenon/decide.ts +9 -13
- package/src/prover/zenon/encode.ts +0 -2
- package/src/prover/zenon/eqrel.ts +0 -2
- package/src/prover/zenon/equality-rules.ts +24 -2
- package/src/prover/zenon/expr.ts +21 -2
- package/src/prover/zenon/index-table.ts +7 -4
- package/src/prover/zenon/isar-case.ts +1 -3
- package/src/prover/zenon/isar.ts +2 -4
- package/src/prover/zenon/llproof.ts +0 -2
- package/src/prover/zenon/mltoll.ts +0 -2
- package/src/prover/zenon/node.ts +12 -13
- package/src/prover/zenon/parse.ts +0 -2
- package/src/prover/zenon/phrase.ts +1 -3
- 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 +0 -2
- package/src/prover/zenon/tla/functions.ts +0 -2
- package/src/prover/zenon/tla/llproof.ts +0 -2
- package/src/prover/zenon/tla/records.ts +0 -2
- package/src/prover/zenon/tla/rewrites.ts +0 -2
- package/src/prover/zenon/tla/sets.ts +1 -3
- package/src/prover/zenon/tla/terms.ts +0 -2
- package/src/prover/zenon/tla/tla.ts +0 -2
- package/src/resolve.ts +625 -189
- package/src/runtime.ts +7 -1
- package/src/sany/builtins.ts +10 -10
- package/src/sany/generation.ts +2 -13
- package/src/sany/generator-definitions.ts +3 -1
- package/src/sany/generator-expressions.ts +36 -30
- package/src/sany/generator-proofs.ts +5 -3
- package/src/sany/generator.ts +2 -1
- package/src/sany/levels.ts +0 -2
- package/src/sany/lexer.ts +3 -3
- package/src/sany/linter.ts +0 -2
- package/src/sany/modules.ts +4 -2
- package/src/sany/nodes.ts +1 -1
- package/src/sany/selectors.ts +11 -6
- package/src/sany/xml.ts +2 -3
- package/src/search.ts +209 -56
- package/src/simulate.ts +3 -0
- package/src/spec-description.ts +2 -2
- package/src/standard-definitions.ts +4 -0
- package/src/state-graph.ts +0 -2
- package/src/subexpressions.ts +265 -94
- package/src/successors.ts +2 -1
- package/src/symmetry.ts +3 -3
- package/src/tableau.ts +2 -2
- package/src/tlc/fingerprint.ts +81 -9
- package/src/tlc/jar-data.ts +10 -0
- package/src/tlc/messages.ts +3 -3
- package/src/tlc/order.ts +14 -3
- package/src/tlc/summary.ts +29 -14
- package/src/tlc/tlc-operators.ts +3 -1
- package/src/tlc/tlcext-operators.ts +61 -16
- package/src/tlc/trace-spec.ts +5 -5
- package/src/typed-tier.ts +6541 -0
- package/src/typescript/types.ts +2 -2
- package/src/values.ts +46 -27
- package/src/prover/smt/solver/seq-regex-witness.ts +0 -100
- package/src/prover/smt/solver/z3-license.txt +0 -10
- package/src/prover/zenon/LICENSE +0 -32
package/src/subexpressions.ts
CHANGED
|
@@ -16,15 +16,21 @@ import {
|
|
|
16
16
|
} from "./ast";
|
|
17
17
|
import { formatRange, TlaSyntaxError } from "./errors";
|
|
18
18
|
import { getSourceName, mapChildren, mapDefinition } from "./instances";
|
|
19
|
+
import { resolveSynonym } from "./tlc/jar-data";
|
|
19
20
|
import {
|
|
20
21
|
getArity,
|
|
21
22
|
getBinder,
|
|
22
23
|
getNameSelectors,
|
|
23
24
|
getOperandIndex,
|
|
24
25
|
getOperands,
|
|
26
|
+
getParamArities,
|
|
27
|
+
isBefore,
|
|
25
28
|
LOCAL_RESOLUTION,
|
|
29
|
+
nullSelections,
|
|
26
30
|
selectionErrors,
|
|
27
31
|
selections,
|
|
32
|
+
type NullSelection,
|
|
33
|
+
type SelectionArguments,
|
|
28
34
|
} from "./resolve";
|
|
29
35
|
|
|
30
36
|
type Lookup = (name: string) => Definition | undefined;
|
|
@@ -49,6 +55,29 @@ interface SelectingName {
|
|
|
49
55
|
|
|
50
56
|
const SELECTION_NAME = "$subexpression";
|
|
51
57
|
|
|
58
|
+
const getSelectorName = (selector: Selector) => {
|
|
59
|
+
switch (selector.kind) {
|
|
60
|
+
case "Name":
|
|
61
|
+
return selector.name;
|
|
62
|
+
case "Operand":
|
|
63
|
+
return typeof selector.operand === "number"
|
|
64
|
+
? `argument selector ${selector.operand}`
|
|
65
|
+
: selector.operand;
|
|
66
|
+
case "Bound":
|
|
67
|
+
return "!(...)";
|
|
68
|
+
case "At":
|
|
69
|
+
return "@";
|
|
70
|
+
case "Colon":
|
|
71
|
+
return ":";
|
|
72
|
+
}
|
|
73
|
+
};
|
|
74
|
+
|
|
75
|
+
const getExpressionArguments = (
|
|
76
|
+
operator: string,
|
|
77
|
+
range: SourceRange | undefined,
|
|
78
|
+
args: Expression[],
|
|
79
|
+
): SelectionArguments => ({ operator, range, args, params: args.map(() => 0) });
|
|
80
|
+
|
|
52
81
|
const createError = (message: string, location: SourceLocation) =>
|
|
53
82
|
new TlaSyntaxError(`${message} at line ${location.line}, column ${location.column}`);
|
|
54
83
|
|
|
@@ -152,21 +181,26 @@ const applyDefinition = (definition: Definition, selection: Selection) => {
|
|
|
152
181
|
const selectSubexpression = (
|
|
153
182
|
selectors: Selector[],
|
|
154
183
|
lookup: Lookup,
|
|
184
|
+
isGoal: (name: string) => boolean,
|
|
155
185
|
reference: Expression & SelectingName,
|
|
156
186
|
isOperator: boolean,
|
|
157
187
|
): Expression => {
|
|
158
188
|
const location = reference.location;
|
|
159
189
|
const selection: Selection = { params: [], args: [], lets: [], location };
|
|
160
190
|
let selectorIndex = 0;
|
|
161
|
-
let current
|
|
191
|
+
let current: Expression | undefined;
|
|
162
192
|
let isFailed = false;
|
|
193
|
+
const nulls: NullSelection[] = [];
|
|
194
|
+
const applications: SelectionArguments[] = [];
|
|
195
|
+
const checkNull = (node: Expression | undefined, message: string) => {
|
|
196
|
+
const range = reference.selectorRanges?.[selectorIndex];
|
|
197
|
+
if (node && range) nulls.push({ node, error: { location: formatRange(range), message } });
|
|
198
|
+
};
|
|
163
199
|
|
|
164
200
|
const report = (range: SourceRange | undefined, message: string) => {
|
|
165
201
|
if (!range) throw createError(message, location);
|
|
166
202
|
selectionErrors.set(reference, {
|
|
167
|
-
|
|
168
|
-
.slice(0, selectorIndex)
|
|
169
|
-
.flatMap((selector) => ("args" in selector ? selector.args : [])),
|
|
203
|
+
applications,
|
|
170
204
|
error: { location: formatRange(range), message },
|
|
171
205
|
});
|
|
172
206
|
isFailed = true;
|
|
@@ -178,6 +212,7 @@ const selectSubexpression = (
|
|
|
178
212
|
const args: Expression[] = [];
|
|
179
213
|
while (selectorIndex < selectors.length) {
|
|
180
214
|
const selector = selectors[selectorIndex];
|
|
215
|
+
if (selector.kind !== "Name" && !local) return undefined;
|
|
181
216
|
if (selector.kind !== "Name") throw createError("Expected an operator name", location);
|
|
182
217
|
names.push(selector.name);
|
|
183
218
|
args.push(...selector.args);
|
|
@@ -194,16 +229,38 @@ const selectSubexpression = (
|
|
|
194
229
|
|
|
195
230
|
const enterDefinition = (local: Definition[] | undefined) => {
|
|
196
231
|
const found = findDefinition(local);
|
|
232
|
+
if (!found) {
|
|
233
|
+
isFailed = true;
|
|
234
|
+
return undefined;
|
|
235
|
+
}
|
|
197
236
|
const definition = found.definition;
|
|
198
237
|
const arity = getArity(definition);
|
|
199
238
|
const isLast = selectorIndex === selectors.length - 1;
|
|
200
239
|
if (found.args.length !== arity && (!isOperator || found.args.length !== 0)) {
|
|
201
240
|
return report(
|
|
202
241
|
reference.argumentRanges?.[selectorIndex] ?? location.range,
|
|
203
|
-
`The operator ${found.name} requires ${arity - found.earlier} arguments.`,
|
|
242
|
+
`The operator ${resolveSynonym(found.name)} requires ${arity - found.earlier} arguments.`,
|
|
204
243
|
);
|
|
205
244
|
}
|
|
206
245
|
if (isLast) return { definition, args: found.args };
|
|
246
|
+
applications.push({
|
|
247
|
+
operator: found.name,
|
|
248
|
+
range: reference.selectorRanges?.[selectorIndex],
|
|
249
|
+
args: found.args,
|
|
250
|
+
params: getParamArities(definition),
|
|
251
|
+
});
|
|
252
|
+
const range = definition.location.range;
|
|
253
|
+
if (
|
|
254
|
+
definition.isRecursive &&
|
|
255
|
+
range &&
|
|
256
|
+
range.module === location.range?.module &&
|
|
257
|
+
isBefore(location, range.end)
|
|
258
|
+
) {
|
|
259
|
+
return report(
|
|
260
|
+
reference.selectorRanges?.[selectorIndex],
|
|
261
|
+
`Subexpression of \`${found.name}' used inside the operator's definition.`,
|
|
262
|
+
);
|
|
263
|
+
}
|
|
207
264
|
if (definition.kind !== "Operator") {
|
|
208
265
|
throw createError(`Cannot select a subexpression of ${definition.name}`, location);
|
|
209
266
|
}
|
|
@@ -228,6 +285,7 @@ const selectSubexpression = (
|
|
|
228
285
|
selection.lets.push(...found.lets);
|
|
229
286
|
selection.params.push(...params.map((name) => ({ name, arity: 0 })));
|
|
230
287
|
selection.args.push(...selector.args);
|
|
288
|
+
applications.push(getExpressionArguments(selector.name, range, selector.args));
|
|
231
289
|
current = found.label.body;
|
|
232
290
|
selectorIndex++;
|
|
233
291
|
}
|
|
@@ -236,14 +294,42 @@ const selectSubexpression = (
|
|
|
236
294
|
const selectOperand = (selector: Selector) => {
|
|
237
295
|
if (!current) throw createError("Subexpression selection failed", location);
|
|
238
296
|
if (selector.kind === "Colon") return;
|
|
297
|
+
const range = reference.selectorRanges?.[selectorIndex];
|
|
298
|
+
const currentRange = current.location.range;
|
|
299
|
+
if (
|
|
300
|
+
(current.kind === "Subexpression" ||
|
|
301
|
+
(current.kind === "Identifier" && current.name.includes("!")) ||
|
|
302
|
+
(current.kind === "Apply" && current.operator.includes("!"))) &&
|
|
303
|
+
(currentRange?.module !== location.range?.module || isBefore(current.location, location))
|
|
304
|
+
) {
|
|
305
|
+
const selected = resolveSubexpressions(current, lookup, isGoal);
|
|
306
|
+
if (selectionErrors.has(selected)) {
|
|
307
|
+
report(
|
|
308
|
+
range,
|
|
309
|
+
`Choosing operand \`${getSelectorName(selector)}' of subexpression with no operands.`,
|
|
310
|
+
);
|
|
311
|
+
return;
|
|
312
|
+
}
|
|
313
|
+
if (selections.has(selected) && selected.kind !== "Lambda") {
|
|
314
|
+
current =
|
|
315
|
+
selected.kind === "Let" &&
|
|
316
|
+
selected.body.kind === "Apply" &&
|
|
317
|
+
selected.body.operator === SELECTION_NAME
|
|
318
|
+
? selected.body
|
|
319
|
+
: // SANY wraps a selection without parameters in $Nop, whose only operand is the selection.
|
|
320
|
+
{ kind: "Tuple", elements: [selected], location: selected.location };
|
|
321
|
+
}
|
|
322
|
+
}
|
|
239
323
|
if (current.kind === "Label") {
|
|
240
324
|
current = current.body;
|
|
241
325
|
selectOperand(selector);
|
|
242
326
|
return;
|
|
243
327
|
}
|
|
328
|
+
const nonexistent = `Nonexistent operand specified by \`${getSelectorName(selector)}'.`;
|
|
244
329
|
if (current.kind === "Let") {
|
|
245
330
|
if (selector.kind !== "Operand" || getOperandIndex(selector.operand, 1) !== 0) {
|
|
246
|
-
|
|
331
|
+
report(range, "A LET/IN expression has only one operand.");
|
|
332
|
+
return;
|
|
247
333
|
}
|
|
248
334
|
selection.lets.push(current.definitions);
|
|
249
335
|
current = current.body;
|
|
@@ -252,32 +338,63 @@ const selectSubexpression = (
|
|
|
252
338
|
const binder = getBinder(current);
|
|
253
339
|
if (binder && (selector.kind === "Bound" || selector.kind === "At")) {
|
|
254
340
|
selection.params.push(...binder.names.map((name) => ({ name, arity: 0 })));
|
|
255
|
-
if (selector.kind === "Bound")
|
|
341
|
+
if (selector.kind === "Bound") {
|
|
342
|
+
selection.args.push(...selector.args);
|
|
343
|
+
applications.push(getExpressionArguments("", range, selector.args));
|
|
344
|
+
}
|
|
256
345
|
current = binder.body;
|
|
257
346
|
return;
|
|
258
347
|
}
|
|
259
|
-
if (current.kind === "Case"
|
|
348
|
+
if (current.kind === "Case") {
|
|
260
349
|
const arms = [
|
|
261
350
|
...current.arms,
|
|
262
351
|
...(current.other ? [{ condition: undefined, body: current.other }] : []),
|
|
263
352
|
];
|
|
264
|
-
|
|
265
|
-
|
|
266
|
-
|
|
267
|
-
|
|
353
|
+
if (selectorIndex === selectors.length - 1) {
|
|
354
|
+
report(range, "Subexpression of CASE must have form !i!j.");
|
|
355
|
+
return;
|
|
356
|
+
}
|
|
357
|
+
const arm =
|
|
358
|
+
selector.kind === "Operand"
|
|
359
|
+
? arms[getOperandIndex(selector.operand, arms.length)]
|
|
360
|
+
: undefined;
|
|
361
|
+
if (!arm) {
|
|
362
|
+
report(range, nonexistent);
|
|
363
|
+
return;
|
|
268
364
|
}
|
|
269
365
|
selectorIndex++;
|
|
270
|
-
const
|
|
271
|
-
const
|
|
272
|
-
|
|
366
|
+
const next = selectors[selectorIndex];
|
|
367
|
+
const part = next.kind === "Operand" ? getOperandIndex(next.operand, 2) : -1;
|
|
368
|
+
const nextRange = reference.selectorRanges?.[selectorIndex];
|
|
369
|
+
if (part === -1) {
|
|
370
|
+
report(
|
|
371
|
+
nextRange,
|
|
372
|
+
"Second selector for CASE subexpression must specify one of two operands.",
|
|
373
|
+
);
|
|
374
|
+
return;
|
|
375
|
+
}
|
|
376
|
+
const chosen = part === 0 ? arm.condition : arm.body;
|
|
377
|
+
if (!chosen) {
|
|
378
|
+
report(nextRange, "Selecting OTHER in a CASE statement.");
|
|
379
|
+
return;
|
|
380
|
+
}
|
|
273
381
|
current = chosen;
|
|
274
382
|
return;
|
|
275
383
|
}
|
|
276
|
-
if (selector.kind !== "Operand")
|
|
277
|
-
throw createError("Unexpected subexpression selector", location);
|
|
278
384
|
const operands = binder ? binder.sets : getOperands(current);
|
|
385
|
+
if (!operands && current.kind !== "Identifier") {
|
|
386
|
+
report(range, "Selecting subexpression of expression that has none.");
|
|
387
|
+
return;
|
|
388
|
+
}
|
|
389
|
+
if (selector.kind !== "Operand") {
|
|
390
|
+
report(range, nonexistent);
|
|
391
|
+
return;
|
|
392
|
+
}
|
|
279
393
|
const operand = operands?.[getOperandIndex(selector.operand, operands.length)];
|
|
280
|
-
if (!operand)
|
|
394
|
+
if (!operand) {
|
|
395
|
+
report(range, nonexistent);
|
|
396
|
+
return;
|
|
397
|
+
}
|
|
281
398
|
current = operand;
|
|
282
399
|
};
|
|
283
400
|
|
|
@@ -304,12 +421,30 @@ const selectSubexpression = (
|
|
|
304
421
|
followLabels();
|
|
305
422
|
continue;
|
|
306
423
|
}
|
|
424
|
+
if (selector.kind !== "Colon") {
|
|
425
|
+
checkNull(
|
|
426
|
+
current,
|
|
427
|
+
"Subexpression selection failed, probably due to an error in the selected expression.",
|
|
428
|
+
);
|
|
429
|
+
}
|
|
307
430
|
selectOperand(selector);
|
|
431
|
+
checkNull(
|
|
432
|
+
current,
|
|
433
|
+
`An unexpected null node specified by '${getSelectorName(selectors[selectorIndex])}'.\nThis is probably due to a previous error.`,
|
|
434
|
+
);
|
|
308
435
|
selectorIndex++;
|
|
309
436
|
}
|
|
310
437
|
if (isFailed) return reference;
|
|
311
438
|
if (!current) throw createError("Subexpression selection failed", location);
|
|
312
|
-
|
|
439
|
+
const params = selection.params.length;
|
|
440
|
+
const args = selection.args.length;
|
|
441
|
+
if (params !== args && (!isOperator || args > 0)) {
|
|
442
|
+
report(location.range, `Expected ${params} arguments but found ${args}.`);
|
|
443
|
+
return reference;
|
|
444
|
+
}
|
|
445
|
+
const selected = createApplication(selection, current);
|
|
446
|
+
nullSelections.set(selected, nulls);
|
|
447
|
+
return selected;
|
|
313
448
|
};
|
|
314
449
|
|
|
315
450
|
const getQualifiedSelectors = (
|
|
@@ -373,7 +508,8 @@ const resolveSubexpressions = (
|
|
|
373
508
|
: undefined;
|
|
374
509
|
const first = selectors?.[0];
|
|
375
510
|
if (!selectors || (first?.kind === "Name" && isGoal(first.name))) return mapped;
|
|
376
|
-
|
|
511
|
+
if (first?.kind === "Name" && selectors[1].kind !== "Name" && !lookup(first.name)) return mapped;
|
|
512
|
+
const selected = selectSubexpression(selectors, lookup, isGoal, mapped, isOperator);
|
|
377
513
|
if (selected !== mapped) selections.add(selected);
|
|
378
514
|
return selected;
|
|
379
515
|
};
|
|
@@ -427,89 +563,122 @@ export const resolveModuleSubexpressions = (module: Module, available: Definitio
|
|
|
427
563
|
},
|
|
428
564
|
];
|
|
429
565
|
});
|
|
430
|
-
const
|
|
566
|
+
const own = new Set([...module.definitions, ...clauses]);
|
|
567
|
+
const recursive = new Map(
|
|
568
|
+
module.units.flatMap((unit): [string, SourceLocation][] =>
|
|
569
|
+
unit.kind === "Recursive"
|
|
570
|
+
? unit.declarations.map((declaration) => [declaration.name, declaration.location])
|
|
571
|
+
: [],
|
|
572
|
+
),
|
|
573
|
+
);
|
|
574
|
+
const isDeclaredBefore = (definition: Definition, location: SourceLocation) => {
|
|
575
|
+
const declared = recursive.get(definition.name);
|
|
576
|
+
return (
|
|
577
|
+
isBefore(definition.location, location) ||
|
|
578
|
+
(definition.isRecursive && declared !== undefined && isBefore(declared, location))
|
|
579
|
+
);
|
|
580
|
+
};
|
|
581
|
+
const getVisibleLookup =
|
|
582
|
+
(lookup: Lookup, location: SourceLocation): Lookup =>
|
|
583
|
+
(name) => {
|
|
584
|
+
const definition = lookup(name);
|
|
585
|
+
return definition && (!own.has(definition) || isDeclaredBefore(definition, location))
|
|
586
|
+
? definition
|
|
587
|
+
: undefined;
|
|
588
|
+
};
|
|
589
|
+
const proofLookup = createLookup([...available, ...module.definitions]);
|
|
431
590
|
const isGoal = (name: string) => goals.has(name);
|
|
432
591
|
const definitionLookup = createLookup([...available, ...module.definitions, ...clauses]);
|
|
433
|
-
const resolve = (expression: Expression) =>
|
|
592
|
+
const resolve = (expression: Expression, location: SourceLocation) =>
|
|
434
593
|
resolveSubexpressions(
|
|
435
594
|
expression,
|
|
436
|
-
definitionLookup,
|
|
595
|
+
getVisibleLookup(definitionLookup, location),
|
|
437
596
|
(name) => isGoal(name) && clauses.every((clause) => clause.name !== name),
|
|
438
597
|
);
|
|
439
|
-
const
|
|
440
|
-
|
|
441
|
-
|
|
442
|
-
|
|
443
|
-
|
|
444
|
-
|
|
445
|
-
|
|
446
|
-
|
|
447
|
-
|
|
448
|
-
|
|
449
|
-
|
|
450
|
-
assumptions: statement.assumptions.map((assumption) =>
|
|
451
|
-
assumption.kind === "NewSymbol"
|
|
452
|
-
? { ...assumption, set: assumption.set && resolveInProof(assumption.set) }
|
|
453
|
-
: resolveStatement(assumption),
|
|
454
|
-
),
|
|
455
|
-
conclusion: resolveInProof(statement.conclusion),
|
|
456
|
-
}
|
|
457
|
-
: resolveInProof(statement);
|
|
458
|
-
const resolveStep = (body: StepBody): StepBody => {
|
|
459
|
-
switch (body.kind) {
|
|
460
|
-
case "Use":
|
|
461
|
-
case "Hide":
|
|
462
|
-
return { ...body, facts: resolveFacts(body.facts) };
|
|
463
|
-
case "Instance":
|
|
464
|
-
return resolveInstance(body, lookup, isProofGoal);
|
|
465
|
-
case "Define":
|
|
466
|
-
return {
|
|
467
|
-
...body,
|
|
468
|
-
definitions: body.definitions.map((definition) =>
|
|
469
|
-
definition.kind === "Instance"
|
|
470
|
-
? resolveInstance(definition, lookup, isProofGoal)
|
|
471
|
-
: mapDefinition(definition, resolveInProof),
|
|
472
|
-
),
|
|
473
|
-
};
|
|
474
|
-
case "Have":
|
|
475
|
-
case "Case":
|
|
476
|
-
return { ...body, expression: resolveInProof(body.expression) };
|
|
477
|
-
case "Witness":
|
|
478
|
-
return { ...body, expressions: body.expressions.map(resolveInProof) };
|
|
479
|
-
case "Take":
|
|
480
|
-
return { ...body, bounds: resolveBounds(body.bounds) };
|
|
481
|
-
case "Pick":
|
|
482
|
-
return { ...body, bounds: resolveBounds(body.bounds), body: resolveInProof(body.body) };
|
|
483
|
-
case "Assert":
|
|
484
|
-
return { ...body, statement: resolveStatement(body.statement) };
|
|
485
|
-
default:
|
|
486
|
-
return body;
|
|
487
|
-
}
|
|
488
|
-
};
|
|
489
|
-
const resolveProof = (proof: Proof | undefined): Proof | undefined =>
|
|
490
|
-
proof?.kind === "By"
|
|
491
|
-
? { ...proof, facts: resolveFacts(proof.facts) }
|
|
492
|
-
: proof?.kind === "Steps"
|
|
598
|
+
const createProofResolver = (location: SourceLocation) => {
|
|
599
|
+
const lookup = getVisibleLookup(proofLookup, location);
|
|
600
|
+
const isProofGoal = (name: string) => isGoal(name) || !lookup(name);
|
|
601
|
+
const resolveInProof = (expression: Expression) =>
|
|
602
|
+
resolveSubexpressions(expression, lookup, isProofGoal);
|
|
603
|
+
const resolveFacts = (facts: Fact[]) =>
|
|
604
|
+
facts.map((fact) => (fact.kind === "ModuleFact" ? fact : resolveInProof(fact)));
|
|
605
|
+
const resolveBounds = (bounds: Bound[]) =>
|
|
606
|
+
bounds.map((bound) => ({ ...bound, set: resolveInProof(bound.set) }));
|
|
607
|
+
const resolveStatement = (statement: Expression | AssumeProve): Expression | AssumeProve =>
|
|
608
|
+
statement.kind === "AssumeProve"
|
|
493
609
|
? {
|
|
494
|
-
...
|
|
495
|
-
|
|
496
|
-
|
|
497
|
-
|
|
498
|
-
|
|
499
|
-
|
|
610
|
+
...statement,
|
|
611
|
+
assumptions: statement.assumptions.map((assumption) =>
|
|
612
|
+
assumption.kind === "NewSymbol"
|
|
613
|
+
? { ...assumption, set: assumption.set && resolveInProof(assumption.set) }
|
|
614
|
+
: resolveStatement(assumption),
|
|
615
|
+
),
|
|
616
|
+
conclusion: resolveInProof(statement.conclusion),
|
|
500
617
|
}
|
|
501
|
-
:
|
|
618
|
+
: resolveInProof(statement);
|
|
619
|
+
const resolveStep = (body: StepBody): StepBody => {
|
|
620
|
+
switch (body.kind) {
|
|
621
|
+
case "Use":
|
|
622
|
+
case "Hide":
|
|
623
|
+
return { ...body, facts: resolveFacts(body.facts) };
|
|
624
|
+
case "Instance":
|
|
625
|
+
return resolveInstance(body, lookup, isProofGoal);
|
|
626
|
+
case "Define":
|
|
627
|
+
return {
|
|
628
|
+
...body,
|
|
629
|
+
definitions: body.definitions.map((definition) =>
|
|
630
|
+
definition.kind === "Instance"
|
|
631
|
+
? resolveInstance(definition, lookup, isProofGoal)
|
|
632
|
+
: mapDefinition(definition, resolveInProof),
|
|
633
|
+
),
|
|
634
|
+
};
|
|
635
|
+
case "Have":
|
|
636
|
+
case "Case":
|
|
637
|
+
return { ...body, expression: resolveInProof(body.expression) };
|
|
638
|
+
case "Witness":
|
|
639
|
+
return { ...body, expressions: body.expressions.map(resolveInProof) };
|
|
640
|
+
case "Take":
|
|
641
|
+
return { ...body, bounds: resolveBounds(body.bounds) };
|
|
642
|
+
case "Pick":
|
|
643
|
+
return { ...body, bounds: resolveBounds(body.bounds), body: resolveInProof(body.body) };
|
|
644
|
+
case "Assert":
|
|
645
|
+
return { ...body, statement: resolveStatement(body.statement) };
|
|
646
|
+
default:
|
|
647
|
+
return body;
|
|
648
|
+
}
|
|
649
|
+
};
|
|
650
|
+
const resolveProof = (proof: Proof | undefined): Proof | undefined =>
|
|
651
|
+
proof?.kind === "By"
|
|
652
|
+
? { ...proof, facts: resolveFacts(proof.facts) }
|
|
653
|
+
: proof?.kind === "Steps"
|
|
654
|
+
? {
|
|
655
|
+
...proof,
|
|
656
|
+
steps: proof.steps.map((step) => ({
|
|
657
|
+
...step,
|
|
658
|
+
body: resolveStep(step.body),
|
|
659
|
+
proof: resolveProof(step.proof),
|
|
660
|
+
})),
|
|
661
|
+
}
|
|
662
|
+
: proof;
|
|
663
|
+
return { resolveFacts, resolveStatement, resolveProof };
|
|
664
|
+
};
|
|
502
665
|
const resolved = {
|
|
503
666
|
...module,
|
|
504
|
-
theorems: module.theorems.map((theorem) =>
|
|
505
|
-
|
|
506
|
-
|
|
507
|
-
theorem
|
|
508
|
-
|
|
509
|
-
|
|
510
|
-
|
|
667
|
+
theorems: module.theorems.map((theorem) => {
|
|
668
|
+
const resolver = createProofResolver(theorem.location);
|
|
669
|
+
return {
|
|
670
|
+
...theorem,
|
|
671
|
+
statement:
|
|
672
|
+
theorem.name !== undefined && theorem.statement.kind !== "AssumeProve"
|
|
673
|
+
? theorem.statement
|
|
674
|
+
: resolver.resolveStatement(theorem.statement),
|
|
675
|
+
proof: resolver.resolveProof(theorem.proof),
|
|
676
|
+
};
|
|
677
|
+
}),
|
|
678
|
+
uses: module.uses.map((use) => ({
|
|
679
|
+
...use,
|
|
680
|
+
facts: createProofResolver(use.location).resolveFacts(use.facts),
|
|
511
681
|
})),
|
|
512
|
-
uses: module.uses.map((use) => ({ ...use, facts: resolveFacts(use.facts) })),
|
|
513
682
|
};
|
|
514
683
|
const hasReferences =
|
|
515
684
|
module.definitions.some((definition) => containsReference(definition.body)) ||
|
|
@@ -517,10 +686,12 @@ export const resolveModuleSubexpressions = (module: Module, available: Definitio
|
|
|
517
686
|
if (!hasReferences) return resolved;
|
|
518
687
|
return {
|
|
519
688
|
...resolved,
|
|
520
|
-
definitions: module.definitions.map((definition) =>
|
|
689
|
+
definitions: module.definitions.map((definition) =>
|
|
690
|
+
mapDefinition(definition, (expression) => resolve(expression, definition.location)),
|
|
691
|
+
),
|
|
521
692
|
assumptions: module.assumptions.map((assumption) => ({
|
|
522
693
|
...assumption,
|
|
523
|
-
expression: resolve(assumption.expression),
|
|
694
|
+
expression: resolve(assumption.expression, assumption.location),
|
|
524
695
|
})),
|
|
525
696
|
};
|
|
526
697
|
};
|
package/src/successors.ts
CHANGED
|
@@ -329,7 +329,7 @@ const getReadLocals = (
|
|
|
329
329
|
return isReadOnly ? names : undefined;
|
|
330
330
|
};
|
|
331
331
|
|
|
332
|
-
const hasBranches = (
|
|
332
|
+
export const hasBranches = (
|
|
333
333
|
expression: Expression,
|
|
334
334
|
environment: Environment,
|
|
335
335
|
visited: Set<Definition>,
|
|
@@ -723,6 +723,7 @@ const compileIdentifier = (
|
|
|
723
723
|
!definition ||
|
|
724
724
|
(expression.location.range && getStartupValue(definition, environment) !== undefined)
|
|
725
725
|
) {
|
|
726
|
+
// Deviation from TLC: Tool#getInitStates prints an unassigned variable's declaration as the non-boolean value it found.
|
|
726
727
|
guard(run, scope, partial, action, isFixed, onComplete);
|
|
727
728
|
return;
|
|
728
729
|
}
|
package/src/symmetry.ts
CHANGED
|
@@ -20,11 +20,11 @@ import {
|
|
|
20
20
|
type Value,
|
|
21
21
|
} from "./values";
|
|
22
22
|
|
|
23
|
-
type Images = Map<string, ModelValue>;
|
|
23
|
+
export type Images = Map<string, ModelValue>;
|
|
24
24
|
|
|
25
25
|
const getPermutationKey = (permutation: Images) =>
|
|
26
26
|
[...permutation]
|
|
27
|
-
.map((
|
|
27
|
+
.map((entry) => `${entry[0]}>${entry[1].name}`)
|
|
28
28
|
.sort()
|
|
29
29
|
.join(",");
|
|
30
30
|
|
|
@@ -222,7 +222,7 @@ const permuteSortedElements = (elements: Value[], images: Images) => {
|
|
|
222
222
|
return merged;
|
|
223
223
|
};
|
|
224
224
|
|
|
225
|
-
const permuteValue = (value: Value, images: Images): Value => {
|
|
225
|
+
export const permuteValue = (value: Value, images: Images): Value => {
|
|
226
226
|
if (typeof value !== "object") return value;
|
|
227
227
|
const kind = value.kind;
|
|
228
228
|
if (kind === "ModelValue") return images.get(value.name) ?? value;
|
package/src/tableau.ts
CHANGED
|
@@ -8,7 +8,7 @@ interface LiveBoolean {
|
|
|
8
8
|
value: boolean;
|
|
9
9
|
}
|
|
10
10
|
|
|
11
|
-
interface LiveState {
|
|
11
|
+
export interface LiveState {
|
|
12
12
|
kind: "State";
|
|
13
13
|
expression: Expression;
|
|
14
14
|
scope: Scope | undefined;
|
|
@@ -20,7 +20,7 @@ export interface LiveEnabled {
|
|
|
20
20
|
scope: Scope | undefined;
|
|
21
21
|
}
|
|
22
22
|
|
|
23
|
-
interface LiveAction {
|
|
23
|
+
export interface LiveAction {
|
|
24
24
|
kind: "Action";
|
|
25
25
|
expression: Expression;
|
|
26
26
|
subscript: Expression | undefined;
|