tla-ts 0.0.10-dev.63a6693bd → 0.0.10-dev.6b2a6741a
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 +3 -3
- package/dist/compile.js +1 -1
- package/dist/deciders.cjs +41 -37
- package/dist/deciders.js +45 -41
- 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 +2682 -426
- package/dist/prove.js +2679 -423
- package/dist/run.cjs +43 -42
- package/dist/run.js +44 -43
- package/dist/tlapm.cjs +1 -1
- package/dist/tlapm.js +1 -1
- package/dist/transfer.cjs +43 -40
- package/dist/transfer.js +43 -40
- package/dist/worker.cjs +7 -7
- package/dist/worker.js +7 -7
- 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 +424 -62
- 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 +38 -3
- 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/lexer.ts +5 -3
- package/src/liveness-checker.ts +572 -204
- package/src/liveness.ts +47 -32
- package/src/obligations/action.ts +10 -6
- package/src/obligations/anonymize.ts +33 -14
- package/src/obligations/enabled-axioms.ts +218 -0
- package/src/obligations/equality.ts +1 -3
- package/src/obligations/expression.ts +18 -6
- package/src/obligations/format.ts +0 -2
- package/src/obligations/generate.ts +22 -17
- package/src/obligations/index.ts +37 -7
- package/src/obligations/levels.ts +24 -11
- package/src/obligations/module.ts +1 -3
- package/src/obligations/normalize.ts +25 -17
- package/src/obligations/operators.ts +0 -2
- package/src/obligations/pragma.ts +53 -16
- package/src/obligations/printer.ts +48 -18
- package/src/obligations/proof.ts +3 -2
- package/src/obligations/regroup.ts +0 -2
- package/src/obligations/simplify.ts +17 -7
- package/src/obligations/source.ts +71 -17
- package/src/obligations/subexpression.ts +45 -18
- package/src/obligations/substitution.ts +1 -3
- 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 +664 -287
- package/src/pretty-print.ts +1 -1
- package/src/prover/deciders.ts +11 -8
- package/src/prover/isabelle/decide.ts +3 -25
- package/src/prover/isabelle/encode.ts +71 -41
- 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 +149 -3
- package/src/prover/isabelle/isar/method.ts +506 -198
- package/src/prover/isabelle/isar/proof.ts +570 -14
- package/src/prover/isabelle/isar/rule-cases.ts +226 -0
- package/src/prover/isabelle/isar/theory.ts +479 -69
- package/src/prover/isabelle/isar/toplevel.ts +331 -0
- package/src/prover/isabelle/isar/type-check.ts +83 -8
- 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 +45 -20
- 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 +63 -4
- 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 +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 +13 -7
- 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 +4 -11
- 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 +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 +1 -2
- package/src/prover/isabelle/tla/context.ts +51 -9
- package/src/prover/isabelle/tla/logic-data.ts +1 -1
- package/src/prover/isabelle/tla/logic.ts +40 -1
- package/src/prover/isabelle/tla/simpdata.ts +0 -2
- package/src/prover/isabelle/tools/intuitionistic.ts +28 -12
- package/src/prover/ocaml.ts +4 -1
- package/src/prover/prep/action.ts +19 -12
- package/src/prover/prep/enabled-axioms.ts +11 -2
- package/src/prover/prep/md5.ts +26 -29
- package/src/prover/prep/methods.ts +159 -50
- package/src/prover/prep/normalize.ts +38 -9
- package/src/prover/prove.ts +343 -65
- 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 +42 -6
- package/src/prover/smt/data.ts +191 -84
- package/src/prover/smt/encode.ts +122 -43
- 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 +483 -116
- 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 +165 -11
- package/src/prover/smt/solver/ast-util.ts +160 -2
- package/src/prover/smt/solver/ast.ts +1449 -41
- package/src/prover/smt/solver/auf-solver.ts +0 -1
- 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 +341 -0
- package/src/prover/smt/solver/bv-divrem-bounds.ts +95 -0
- package/src/prover/smt/solver/bv-rewriter.ts +1901 -0
- package/src/prover/smt/solver/bv1-blast.ts +214 -0
- package/src/prover/smt/solver/bv2fpa-converter.ts +174 -0
- package/src/prover/smt/solver/bv2int-rewriter.ts +544 -0
- package/src/prover/smt/solver/bv2real-rewriter.ts +533 -0
- package/src/prover/smt/solver/card2bv.ts +109 -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 +533 -114
- package/src/prover/smt/solver/ctx-simplify.ts +21 -12
- 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 +205 -0
- package/src/prover/smt/solver/distribute-forall.ts +57 -0
- package/src/prover/smt/solver/dom-simplify.ts +511 -0
- package/src/prover/smt/solver/dt2bv-tactic.ts +260 -0
- 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 +129 -0
- package/src/prover/smt/solver/elim-uncnstr.ts +542 -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 +901 -0
- package/src/prover/smt/solver/euf/euf-solver.ts +1204 -0
- package/src/prover/smt/solver/euf/fpa-solver.ts +317 -0
- package/src/prover/smt/solver/euf/mam.ts +1046 -0
- package/src/prover/smt/solver/euf/q-ematch.ts +829 -0
- package/src/prover/smt/solver/euf/q-mbi.ts +587 -0
- package/src/prover/smt/solver/euf/q-model-fixer.ts +296 -0
- package/src/prover/smt/solver/euf/q-solver.ts +361 -0
- package/src/prover/smt/solver/euf/th-solver.ts +328 -0
- package/src/prover/smt/solver/euf/th-solvers.ts +30 -0
- package/src/prover/smt/solver/expr-ref.ts +0 -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 +147 -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 +349 -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 +109 -36
- 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 +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 +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 +66 -11
- package/src/prover/smt/solver/lp/nla-divisions.ts +0 -2
- package/src/prover/smt/solver/lp/nla-emonics.ts +0 -1
- package/src/prover/smt/solver/lp/nla-factorization.ts +0 -1
- package/src/prover/smt/solver/lp/nla-grobner.ts +167 -85
- 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 -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 +7 -2
- package/src/prover/smt/solver/macro-finder.ts +530 -0
- package/src/prover/smt/solver/mam-compiler.ts +118 -88
- 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 +17 -26
- package/src/prover/smt/solver/model-evaluator.ts +188 -12
- package/src/prover/smt/solver/model-finder.ts +0 -1
- package/src/prover/smt/solver/model-generator.ts +59 -30
- package/src/prover/smt/solver/model-macro-solver.ts +38 -27
- package/src/prover/smt/solver/model-printer.ts +214 -0
- package/src/prover/smt/solver/mpf.ts +709 -0
- package/src/prover/smt/solver/mus.ts +50 -0
- package/src/prover/smt/solver/muz/dl-context.ts +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 +1404 -0
- package/src/prover/smt/solver/muz/spacer-dl-interface.ts +52 -0
- package/src/prover/smt/solver/muz/spacer-generalizers.ts +241 -0
- package/src/prover/smt/solver/muz/spacer-manager.ts +127 -0
- package/src/prover/smt/solver/muz/spacer-pdr.ts +219 -0
- package/src/prover/smt/solver/muz/spacer-prop-solver.ts +333 -0
- package/src/prover/smt/solver/muz/spacer-util.ts +282 -0
- package/src/prover/smt/solver/muz/substitution.ts +203 -0
- package/src/prover/smt/solver/nla2bv-tactic.ts +285 -0
- package/src/prover/smt/solver/nlqsat.ts +484 -0
- package/src/prover/smt/solver/nlsat/algebraic.ts +305 -88
- 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 +424 -211
- package/src/prover/smt/solver/nlsat/interval-set.ts +1 -2
- package/src/prover/smt/solver/nlsat/levelwise.ts +460 -241
- package/src/prover/smt/solver/nlsat/mpbq.ts +45 -1
- package/src/prover/smt/solver/nlsat/polynomial.ts +2366 -683
- package/src/prover/smt/solver/nlsat/solver.ts +282 -69
- 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 +8 -7
- package/src/prover/smt/solver/nlsat/upolynomial.ts +41 -20
- 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 +281 -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 +511 -0
- package/src/prover/smt/solver/propagate-values.ts +37 -21
- package/src/prover/smt/solver/proto-model.ts +650 -17
- 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 +1096 -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 +1499 -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 +9 -10
- package/src/prover/smt/solver/quantifier-manager.ts +25 -24
- 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 +262 -0
- package/src/prover/smt/solver/recfun-rewriter.ts +107 -0
- package/src/prover/smt/solver/reduce-args.ts +225 -0
- package/src/prover/smt/solver/reduce-bv-size.ts +119 -0
- package/src/prover/smt/solver/ref-vector.ts +0 -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 +2105 -0
- package/src/prover/smt/solver/sat/var-queue.ts +117 -0
- package/src/prover/smt/solver/sat/watch-list.ts +140 -0
- package/src/prover/smt/solver/search-tree.ts +284 -0
- package/src/prover/smt/solver/seq-axioms.ts +995 -0
- package/src/prover/smt/solver/seq-decl-plugin.ts +819 -0
- package/src/prover/smt/solver/seq-derive.ts +1298 -0
- package/src/prover/smt/solver/seq-eq-approx.ts +236 -0
- package/src/prover/smt/solver/seq-eq-solver.ts +439 -0
- package/src/prover/smt/solver/seq-factory.ts +89 -0
- package/src/prover/smt/solver/seq-monadic.ts +730 -0
- package/src/prover/smt/solver/seq-range-predicate.ts +235 -0
- package/src/prover/smt/solver/seq-re-rewriter.ts +1171 -0
- package/src/prover/smt/solver/seq-re-util.ts +758 -0
- package/src/prover/smt/solver/seq-regex-bisim.ts +144 -0
- package/src/prover/smt/solver/seq-regex-live.ts +200 -0
- package/src/prover/smt/solver/seq-rewriter.ts +2404 -0
- package/src/prover/smt/solver/seq-skolem.ts +294 -0
- package/src/prover/smt/solver/seq-subset.ts +165 -0
- package/src/prover/smt/solver/seq-view-witness.ts +353 -0
- package/src/prover/smt/solver/smt-consequences.ts +297 -0
- package/src/prover/smt/solver/smt-kernel.ts +90 -0
- package/src/prover/smt/solver/smt-logics.ts +66 -0
- package/src/prover/smt/solver/smt-setup.ts +544 -0
- package/src/prover/smt/solver/smt2-printer.ts +765 -0
- package/src/prover/smt/solver/smtlib-parser.ts +3228 -327
- package/src/prover/smt/solver/smtlib-script.ts +1843 -0
- package/src/prover/smt/solver/solve-eqs.ts +923 -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 +2012 -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 -5
- package/src/prover/smt/solver/theory-lra-final-check.ts +56 -71
- package/src/prover/smt/solver/theory-lra-internalize.ts +89 -11
- package/src/prover/smt/solver/theory-lra-model.ts +20 -35
- package/src/prover/smt/solver/theory-lra-propagate.ts +24 -28
- package/src/prover/smt/solver/theory-lra-state.ts +6 -22
- package/src/prover/smt/solver/theory-lra.ts +188 -2
- package/src/prover/smt/solver/theory-pb.ts +933 -0
- package/src/prover/smt/solver/theory-polymorphism.ts +58 -0
- package/src/prover/smt/solver/theory-recfun.ts +307 -0
- package/src/prover/smt/solver/theory-seq-regex.ts +867 -0
- package/src/prover/smt/solver/theory-seq-solve.ts +1373 -0
- package/src/prover/smt/solver/theory-seq-state.ts +852 -0
- package/src/prover/smt/solver/theory-seq.ts +961 -0
- package/src/prover/smt/solver/theory.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 +37 -16
- package/src/prover/tlapm-library.ts +3208 -0
- package/src/prover/verdict.ts +2 -0
- package/src/prover/zenon/decide.ts +10 -7
- 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 +20 -5
- package/src/prover/zenon/parse.ts +6 -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 +7 -5
- 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 +7 -8
- 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/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/errors.ts
CHANGED
|
@@ -28,7 +28,7 @@ export interface SyntaxFailure {
|
|
|
28
28
|
line: number;
|
|
29
29
|
column: number;
|
|
30
30
|
isEnd: boolean;
|
|
31
|
-
proof?: { stop: { line: number; column: number }; exception: string };
|
|
31
|
+
proof?: { stop: { line: number; column: number }; exception: string; printed: string };
|
|
32
32
|
}
|
|
33
33
|
|
|
34
34
|
export interface SanyError {
|
|
@@ -258,6 +258,16 @@ export class TlaProverError extends TlaError {
|
|
|
258
258
|
}
|
|
259
259
|
}
|
|
260
260
|
|
|
261
|
+
export class TlaMethodError extends TlaProverError {
|
|
262
|
+
readonly locus: Locus | undefined;
|
|
263
|
+
|
|
264
|
+
constructor(message: string, locus: Locus | undefined) {
|
|
265
|
+
super(message);
|
|
266
|
+
this.name = "TlaMethodError";
|
|
267
|
+
this.locus = locus;
|
|
268
|
+
}
|
|
269
|
+
}
|
|
270
|
+
|
|
261
271
|
export class TlaZenonError extends TlaError {
|
|
262
272
|
constructor(message: string, cause?: unknown) {
|
|
263
273
|
super(message, cause);
|
|
@@ -303,6 +313,21 @@ export class SmtCanceledError extends TlaError {
|
|
|
303
313
|
}
|
|
304
314
|
}
|
|
305
315
|
|
|
316
|
+
export class SmtTacticError extends TlaError {
|
|
317
|
+
constructor(message: string) {
|
|
318
|
+
super(message);
|
|
319
|
+
this.name = "SmtTacticError";
|
|
320
|
+
}
|
|
321
|
+
}
|
|
322
|
+
|
|
323
|
+
// Z3's setup throws a default_exception, which or-else doesn't catch and a check reports as unknown.
|
|
324
|
+
export class SmtSetupError extends TlaError {
|
|
325
|
+
constructor(message: string) {
|
|
326
|
+
super(message);
|
|
327
|
+
this.name = "SmtSetupError";
|
|
328
|
+
}
|
|
329
|
+
}
|
|
330
|
+
|
|
306
331
|
export class SmtInvariantError extends TlaError {
|
|
307
332
|
constructor(message: string) {
|
|
308
333
|
super(message);
|
|
@@ -324,10 +349,20 @@ export class PddMemoryOutError extends TlaError {
|
|
|
324
349
|
}
|
|
325
350
|
}
|
|
326
351
|
|
|
352
|
+
export interface SmtPosition {
|
|
353
|
+
line: number;
|
|
354
|
+
column: number;
|
|
355
|
+
}
|
|
356
|
+
|
|
327
357
|
export class SmtParseError extends TlaError {
|
|
328
|
-
|
|
329
|
-
|
|
358
|
+
line: number;
|
|
359
|
+
column: number;
|
|
360
|
+
|
|
361
|
+
constructor(message: string, position: SmtPosition) {
|
|
362
|
+
super(message);
|
|
330
363
|
this.name = "SmtParseError";
|
|
364
|
+
this.line = position.line;
|
|
365
|
+
this.column = position.column;
|
|
331
366
|
}
|
|
332
367
|
}
|
|
333
368
|
|
package/src/evaluate.ts
CHANGED
|
@@ -26,7 +26,7 @@ import { countCoverage, getCoverageNode, runAtCoverageNode, type Coverage } from
|
|
|
26
26
|
import { MESSAGE_CODE } from "./tlc/messages";
|
|
27
27
|
import type { CheckerRuntime } from "./runtime";
|
|
28
28
|
import {
|
|
29
|
-
|
|
29
|
+
isEvaluatedAtStartup,
|
|
30
30
|
isImpureDefinition,
|
|
31
31
|
isNonconstant,
|
|
32
32
|
type DefinitionFacts,
|
|
@@ -615,12 +615,16 @@ export const bindLazyArguments = (
|
|
|
615
615
|
typeof value.domain === "object" && value.domain.kind === "ProductSet"
|
|
616
616
|
? value.domain.factors
|
|
617
617
|
: [];
|
|
618
|
-
|
|
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.
|
|
619
624
|
const createListError = () =>
|
|
620
625
|
new TlaEvaluationError(
|
|
621
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`,
|
|
622
627
|
);
|
|
623
|
-
if (elements === undefined) throw createListError();
|
|
624
628
|
bounds.forEach((bound, index) => {
|
|
625
629
|
if (index >= elements.length) throw createListError();
|
|
626
630
|
const element = elements[index];
|
|
@@ -669,7 +673,7 @@ const getLazyFunctionTemplate = (bounds: Bound[], body: Expression) => {
|
|
|
669
673
|
},
|
|
670
674
|
],
|
|
671
675
|
),
|
|
672
|
-
body:
|
|
676
|
+
body: describeNode(body),
|
|
673
677
|
};
|
|
674
678
|
};
|
|
675
679
|
|
|
@@ -817,7 +821,7 @@ export const evaluateStartupDefinitions = (definitions: Definition[], environmen
|
|
|
817
821
|
if (definition.kind === "Operator" && definition.params.length > 0) return;
|
|
818
822
|
const name = definition.name;
|
|
819
823
|
if (environment.constants.has(name) || environment.substitutions.has(name)) return;
|
|
820
|
-
if (!
|
|
824
|
+
if (!isEvaluatedAtStartup(definition, environment)) return;
|
|
821
825
|
const definitionId = environment.facts.ids.get(definition);
|
|
822
826
|
if (definitionId === undefined || environment.startupValues[definitionId] !== undefined) return;
|
|
823
827
|
const context = { environment, scope: undefined, state: undefined, next: undefined };
|
|
@@ -969,6 +973,7 @@ const isOperatorArgument = (expression: Expression, context: Context) => {
|
|
|
969
973
|
return operator !== undefined && getArity(operator) > 0;
|
|
970
974
|
};
|
|
971
975
|
|
|
976
|
+
// Deviation from TLC: SymbolNodeValueLookupProvider#lookup takes an operator whose body is a literal for that literal, so a Java override rejects it as an argument.
|
|
972
977
|
const evaluateBuiltinArguments = (args: Expression[], context: Context) =>
|
|
973
978
|
args.map((arg) =>
|
|
974
979
|
isOperatorArgument(arg, context)
|
|
@@ -1177,7 +1182,9 @@ const evaluateLocalIdentifier = (name: string, expression: Expression, context:
|
|
|
1177
1182
|
}
|
|
1178
1183
|
const builtin = context.environment.builtins.get(name);
|
|
1179
1184
|
if (builtin?.arity === 0) return builtin.evaluate([], context);
|
|
1180
|
-
throw new TlaEvaluationError(
|
|
1185
|
+
throw new TlaEvaluationError(
|
|
1186
|
+
`In evaluation, the identifier ${name} is either undefined or not an operator.\n${describeRange(expression)}`,
|
|
1187
|
+
);
|
|
1181
1188
|
};
|
|
1182
1189
|
|
|
1183
1190
|
export const getReevaluatedDefinitions = (
|
|
@@ -1329,6 +1336,41 @@ export const createTracingEnvironment = (environment: Environment): Environment
|
|
|
1329
1336
|
},
|
|
1330
1337
|
});
|
|
1331
1338
|
|
|
1339
|
+
// TLC evaluates `a /\ b /\ c` as `(a /\ b) /\ c`, so its call stack holds each prefix.
|
|
1340
|
+
const compileTracedJunction = (
|
|
1341
|
+
expression: Expression & { kind: "And" | "Or" },
|
|
1342
|
+
operands: Evaluator[],
|
|
1343
|
+
callStack: CallStack | undefined,
|
|
1344
|
+
): Evaluator | undefined => {
|
|
1345
|
+
const range = expression.location.range;
|
|
1346
|
+
const prefixEnds = expression.prefixEnds;
|
|
1347
|
+
if (!callStack || expression.isBulleted || !range || !prefixEnds || operands.length < 3) {
|
|
1348
|
+
return undefined;
|
|
1349
|
+
}
|
|
1350
|
+
const prefixes = prefixEnds
|
|
1351
|
+
.slice(0, operands.length - 2)
|
|
1352
|
+
.map((end) => ({
|
|
1353
|
+
...expression,
|
|
1354
|
+
location: { ...expression.location, range: { ...range, end } },
|
|
1355
|
+
}))
|
|
1356
|
+
.reverse();
|
|
1357
|
+
const isAnd = expression.kind === "And";
|
|
1358
|
+
return (context) => {
|
|
1359
|
+
callStack.expressions.push(...prefixes);
|
|
1360
|
+
for (let index = 0; index < operands.length; index++) {
|
|
1361
|
+
if (index >= 2 && !callStack.isFrozen) callStack.expressions.pop();
|
|
1362
|
+
const value = operands[index](context);
|
|
1363
|
+
if (typeof value !== "boolean") throw createJunctionError(expression, index, value);
|
|
1364
|
+
if (value !== isAnd) {
|
|
1365
|
+
if (!callStack.isFrozen)
|
|
1366
|
+
callStack.expressions.length -= prefixes.length - Math.max(index - 1, 0);
|
|
1367
|
+
return value;
|
|
1368
|
+
}
|
|
1369
|
+
}
|
|
1370
|
+
return isAnd;
|
|
1371
|
+
};
|
|
1372
|
+
};
|
|
1373
|
+
|
|
1332
1374
|
const traceFrames =
|
|
1333
1375
|
(
|
|
1334
1376
|
expression: Expression,
|
|
@@ -1547,6 +1589,7 @@ const compileApply = (
|
|
|
1547
1589
|
return (context) => domain(operand(context));
|
|
1548
1590
|
}
|
|
1549
1591
|
if (global?.kind === "Builtin" && global.name === "TLCEval" && args.length === 1) {
|
|
1592
|
+
// Deviation from TLC: TLCEval#tlcEval evaluates an argument SANY takes for constant, such as Print(v, TRUE), in an empty state.
|
|
1550
1593
|
const isCached =
|
|
1551
1594
|
!contextualApplications.has(expression) && !isNonconstant(args[0], environment);
|
|
1552
1595
|
return (context) =>
|
|
@@ -1864,12 +1907,11 @@ export const getLazyFilter = (
|
|
|
1864
1907
|
) => {
|
|
1865
1908
|
const predicate = getEvaluator(expression.predicate, environment);
|
|
1866
1909
|
const pattern = expression.bound.pattern;
|
|
1867
|
-
const
|
|
1868
|
-
const source = range && {
|
|
1910
|
+
const predicateNode = describeNode(expression.predicate);
|
|
1911
|
+
const source = expression.predicate.location.range && {
|
|
1869
1912
|
names: pattern.kind === "Name" ? pattern.name : pattern.names.join(", "),
|
|
1870
|
-
predicate:
|
|
1913
|
+
predicate: predicateNode,
|
|
1871
1914
|
};
|
|
1872
|
-
const predicateNode = describeNode(expression.predicate);
|
|
1873
1915
|
const coverage = environment.coverage;
|
|
1874
1916
|
const testCovered = (node: number, isMember: boolean, test: () => Value) => {
|
|
1875
1917
|
if (!coverage || node === -1) return test();
|
|
@@ -2035,20 +2077,21 @@ export const hasDuplicateFields = (sortedFields: RecordField[]) =>
|
|
|
2035
2077
|
|
|
2036
2078
|
const compileRecord = (recordFields: RecordField[], environment: Environment): Evaluator => {
|
|
2037
2079
|
const fields = getSortedFields(recordFields);
|
|
2038
|
-
const
|
|
2039
|
-
|
|
2040
|
-
if (hasDuplicates) {
|
|
2080
|
+
const values = recordFields.map((field) => getEvaluator(field.value, environment));
|
|
2081
|
+
if (hasDuplicateFields(fields)) {
|
|
2041
2082
|
return (context) =>
|
|
2042
2083
|
createRecord(
|
|
2043
|
-
|
|
2084
|
+
recordFields.map((field, index): [string, Value] => [field.name, values[index](context)]),
|
|
2044
2085
|
);
|
|
2045
2086
|
}
|
|
2046
2087
|
const names = fields.map((field) => field.name);
|
|
2047
2088
|
const writtenNames = recordFields.map((field) => field.name);
|
|
2048
2089
|
if (writtenNames.some((name, index) => name !== names[index])) {
|
|
2090
|
+
const writtenIndexes = fields.map((field) => recordFields.indexOf(field));
|
|
2049
2091
|
return (context) =>
|
|
2050
2092
|
createWrittenRecord(
|
|
2051
2093
|
names,
|
|
2094
|
+
writtenIndexes,
|
|
2052
2095
|
values.map((value) => value(context)),
|
|
2053
2096
|
writtenNames,
|
|
2054
2097
|
);
|
|
@@ -2098,25 +2141,31 @@ const compile = (expression: Expression, environment: Environment): Evaluator =>
|
|
|
2098
2141
|
};
|
|
2099
2142
|
case "And": {
|
|
2100
2143
|
const operands = expression.operands.map(getChildEvaluator);
|
|
2101
|
-
return (
|
|
2102
|
-
|
|
2103
|
-
|
|
2104
|
-
|
|
2105
|
-
|
|
2106
|
-
|
|
2107
|
-
|
|
2108
|
-
|
|
2144
|
+
return (
|
|
2145
|
+
compileTracedJunction(expression, operands, environment.callStack) ??
|
|
2146
|
+
((context) => {
|
|
2147
|
+
for (let index = 0; index < operands.length; index++) {
|
|
2148
|
+
const value = operands[index](context);
|
|
2149
|
+
if (typeof value !== "boolean") throw createJunctionError(expression, index, value);
|
|
2150
|
+
if (!value) return false;
|
|
2151
|
+
}
|
|
2152
|
+
return true;
|
|
2153
|
+
})
|
|
2154
|
+
);
|
|
2109
2155
|
}
|
|
2110
2156
|
case "Or": {
|
|
2111
2157
|
const operands = expression.operands.map(getChildEvaluator);
|
|
2112
|
-
return (
|
|
2113
|
-
|
|
2114
|
-
|
|
2115
|
-
|
|
2116
|
-
|
|
2117
|
-
|
|
2118
|
-
|
|
2119
|
-
|
|
2158
|
+
return (
|
|
2159
|
+
compileTracedJunction(expression, operands, environment.callStack) ??
|
|
2160
|
+
((context) => {
|
|
2161
|
+
for (let index = 0; index < operands.length; index++) {
|
|
2162
|
+
const value = operands[index](context);
|
|
2163
|
+
if (typeof value !== "boolean") throw createJunctionError(expression, index, value);
|
|
2164
|
+
if (value) return true;
|
|
2165
|
+
}
|
|
2166
|
+
return false;
|
|
2167
|
+
})
|
|
2168
|
+
);
|
|
2120
2169
|
}
|
|
2121
2170
|
case "Prime": {
|
|
2122
2171
|
const inner = getChildEvaluator(expression.expression);
|
|
@@ -2202,8 +2251,19 @@ const compile = (expression: Expression, environment: Environment): Evaluator =>
|
|
|
2202
2251
|
case "RecordSet": {
|
|
2203
2252
|
const fields = getSortedFields(expression.fields);
|
|
2204
2253
|
const names = fields.map((field) => field.name);
|
|
2205
|
-
const
|
|
2206
|
-
|
|
2254
|
+
const writtenIndexes = fields.map((field) => expression.fields.indexOf(field));
|
|
2255
|
+
const sets = expression.fields.map((field) => getChildEvaluator(field.value));
|
|
2256
|
+
if (writtenIndexes.every((writtenIndex, index) => writtenIndex === index)) {
|
|
2257
|
+
return (context) => ({ kind: "RecordSet", names, sets: sets.map((set) => set(context)) });
|
|
2258
|
+
}
|
|
2259
|
+
return (context) => {
|
|
2260
|
+
const writtenSets = sets.map((set) => set(context));
|
|
2261
|
+
return {
|
|
2262
|
+
kind: "RecordSet",
|
|
2263
|
+
names,
|
|
2264
|
+
sets: writtenIndexes.map((index) => writtenSets[index]),
|
|
2265
|
+
};
|
|
2266
|
+
};
|
|
2207
2267
|
}
|
|
2208
2268
|
case "Except":
|
|
2209
2269
|
return compileExcept(expression, environment);
|
package/src/exit-codes.ts
CHANGED
|
@@ -17,13 +17,13 @@ export const EXIT_STATUS = {
|
|
|
17
17
|
|
|
18
18
|
const MESSAGE_EXIT_STATUSES = new Map<number, number>([
|
|
19
19
|
...[
|
|
20
|
-
...Array.from({ length: 24 }, (
|
|
20
|
+
...Array.from({ length: 24 }, (_value, index) => 2222 + index),
|
|
21
21
|
2272,
|
|
22
22
|
2273,
|
|
23
23
|
2274,
|
|
24
24
|
2280,
|
|
25
25
|
2281,
|
|
26
|
-
...Array.from({ length: 7 }, (
|
|
26
|
+
...Array.from({ length: 7 }, (_value, index) => 5001 + index),
|
|
27
27
|
].map((code): [number, number] => [code, EXIT_STATUS.configParseError]),
|
|
28
28
|
[2253, EXIT_STATUS.livenessEvaluationFailure],
|
|
29
29
|
[2109, EXIT_STATUS.specEvaluationFailure],
|
|
@@ -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/instances.ts
CHANGED
|
@@ -522,7 +522,7 @@ const getInstanceOperator = (
|
|
|
522
522
|
arity: number,
|
|
523
523
|
location: SourceLocation,
|
|
524
524
|
): Expression => {
|
|
525
|
-
const names = Array.from({ length: arity }, (
|
|
525
|
+
const names = Array.from({ length: arity }, (_value, index) => `argument${index}`);
|
|
526
526
|
return {
|
|
527
527
|
kind: "Lambda",
|
|
528
528
|
params: names,
|
|
@@ -744,14 +744,14 @@ const copyDefinition = (rewrite: Rewrite, key: string): string => {
|
|
|
744
744
|
? mapped.body
|
|
745
745
|
: {
|
|
746
746
|
kind: "Let",
|
|
747
|
-
definitions: [...bindings].map((
|
|
747
|
+
definitions: [...bindings].map((entry): Definition => ({
|
|
748
748
|
kind: "Operator",
|
|
749
|
-
name,
|
|
749
|
+
name: entry[0],
|
|
750
750
|
params: [],
|
|
751
|
-
body:
|
|
751
|
+
body: entry[1],
|
|
752
752
|
isLocal: true,
|
|
753
753
|
isRecursive: false,
|
|
754
|
-
location:
|
|
754
|
+
location: entry[1].location,
|
|
755
755
|
})),
|
|
756
756
|
body: mapped.body,
|
|
757
757
|
// TLC has no such LET, so the call stack it prints has no position for it.
|
package/src/java-overrides.ts
CHANGED
|
@@ -184,8 +184,8 @@ const readClassFile = (bytes: Uint8Array) => {
|
|
|
184
184
|
getJavaClassName(pool, thrown.readUint16()),
|
|
185
185
|
)
|
|
186
186
|
: [];
|
|
187
|
-
const modifiers = METHOD_MODIFIERS.filter((
|
|
188
|
-
(
|
|
187
|
+
const modifiers = METHOD_MODIFIERS.filter((entry) => (access & entry[0]) !== 0).map(
|
|
188
|
+
(entry) => entry[1],
|
|
189
189
|
);
|
|
190
190
|
const returnType = getTypeNames(descriptor.slice(parametersEnd + 1))[0];
|
|
191
191
|
const throwsClause = exceptions.length === 0 ? "" : ` throws ${exceptions.join(",")}`;
|