tla-ts 0.0.10-dev.b4a856304 → 0.0.10-dev.d618a2d79
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +2 -1
- package/dist/compile.cjs +6 -6
- package/dist/compile.js +10 -10
- package/dist/deciders.cjs +41 -37
- package/dist/deciders.js +57 -53
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +37 -0
- package/dist/index.d.ts +37 -0
- package/dist/index.js +1 -1
- package/dist/parallel-worker.cjs +1 -1
- package/dist/parallel-worker.js +1 -1
- package/dist/prove.cjs +2683 -427
- package/dist/prove.js +2681 -425
- package/dist/run.cjs +47 -44
- package/dist/run.js +47 -44
- package/dist/tlapm.cjs +2 -2
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +44 -41
- package/dist/transfer.js +44 -41
- package/dist/worker.cjs +7 -7
- package/dist/worker.js +7 -7
- package/package.json +1 -1
- package/src/ast.ts +41 -41
- package/src/bags.ts +2 -5
- package/src/builtins.ts +5 -21
- package/src/check-failure.ts +116 -0
- package/src/check-trace.ts +268 -0
- package/src/check.ts +474 -718
- package/src/cli/options.ts +6 -31
- package/src/cli/run.ts +0 -2
- package/src/cli/runtime-invariants.ts +8 -7
- package/src/cli/shared.ts +1 -5
- package/src/cli/tlapm.ts +433 -70
- package/src/cli/tlc-arguments.ts +244 -238
- package/src/cli/tlc-output.ts +687 -0
- package/src/cli/tlc-usage.ts +3 -5
- package/src/cli/tlc.ts +49 -702
- package/src/cli/xml-exporter.ts +23 -33
- package/src/codegen.ts +5 -10
- package/src/coverage.ts +3 -10
- package/src/dependencies.ts +30 -14
- package/src/dfid.ts +16 -16
- package/src/environment-config.ts +315 -0
- package/src/environment.ts +55 -338
- package/src/errors.ts +33 -5
- package/src/evaluate.ts +31 -106
- package/src/exit-codes.ts +2 -0
- package/src/fingerprints.ts +65 -1
- package/src/instances.ts +47 -10
- package/src/java-hash.ts +7 -0
- package/src/java-overrides.ts +4 -9
- package/src/json-reader.ts +1 -2
- package/src/json.ts +8 -18
- package/src/levels.ts +46 -57
- package/src/lexer.ts +76 -85
- package/src/liveness-checker.ts +616 -306
- package/src/liveness.ts +104 -120
- package/src/obligations/action.ts +14 -17
- package/src/obligations/anonymize.ts +37 -16
- package/src/obligations/enabled-axioms.ts +218 -0
- package/src/obligations/equality.ts +1 -3
- package/src/obligations/expression.ts +36 -8
- package/src/obligations/format.ts +0 -2
- package/src/obligations/generate.ts +66 -54
- package/src/obligations/index.ts +38 -8
- package/src/obligations/levels.ts +24 -11
- package/src/obligations/module.ts +28 -41
- package/src/obligations/normalize.ts +26 -14
- package/src/obligations/operators.ts +0 -2
- package/src/obligations/pragma.ts +53 -16
- package/src/obligations/printer.ts +43 -13
- package/src/obligations/proof.ts +3 -2
- package/src/obligations/regroup.ts +0 -2
- package/src/obligations/simplify.ts +55 -50
- package/src/obligations/source.ts +118 -74
- package/src/obligations/subexpression.ts +45 -18
- package/src/obligations/substitution.ts +1 -3
- package/src/obligations/temporal.ts +5 -7
- package/src/obligations/tuples.ts +0 -2
- package/src/parallel-worker.ts +10 -30
- package/src/parallel.ts +50 -80
- package/src/parser.ts +722 -385
- package/src/pcal/ast.ts +53 -65
- package/src/pcal/parse.ts +144 -191
- package/src/pcal/tokenize.ts +91 -115
- package/src/pcal/translate.ts +83 -98
- package/src/pcal/validate.ts +48 -50
- package/src/pretty-print.ts +7 -7
- package/src/prover/decide-pool.ts +3 -3
- package/src/prover/deciders.ts +12 -9
- package/src/prover/isabelle/decide.ts +3 -25
- package/src/prover/isabelle/encode.ts +72 -42
- package/src/prover/isabelle/isar/attrib.ts +250 -0
- package/src/prover/isabelle/isar/context.ts +335 -0
- package/src/prover/isabelle/isar/induct.ts +382 -0
- package/src/prover/isabelle/isar/inner-syntax.ts +158 -7
- package/src/prover/isabelle/isar/method.ts +509 -212
- package/src/prover/isabelle/isar/proof.ts +570 -14
- package/src/prover/isabelle/isar/rule-cases.ts +224 -0
- package/src/prover/isabelle/isar/theory.ts +487 -76
- package/src/prover/isabelle/isar/toplevel.ts +331 -0
- package/src/prover/isabelle/isar/type-check.ts +89 -14
- package/src/prover/isabelle/provers/blast/blast.ts +7 -65
- package/src/prover/isabelle/provers/blast/branch.ts +0 -2
- package/src/prover/isabelle/provers/blast/prove.ts +0 -2
- package/src/prover/isabelle/provers/blast/rules.ts +0 -2
- package/src/prover/isabelle/provers/blast/state.ts +0 -2
- package/src/prover/isabelle/provers/blast/term.ts +0 -2
- package/src/prover/isabelle/provers/clasimp.ts +0 -2
- package/src/prover/isabelle/provers/classical.ts +45 -20
- package/src/prover/isabelle/provers/hypsubst.ts +17 -28
- package/src/prover/isabelle/pure/bicompose.ts +9 -27
- package/src/prover/isabelle/pure/consts.ts +0 -2
- package/src/prover/isabelle/pure/conv.ts +2 -10
- package/src/prover/isabelle/pure/drule.ts +72 -6
- package/src/prover/isabelle/pure/envir.ts +0 -2
- package/src/prover/isabelle/pure/goal.ts +1 -3
- package/src/prover/isabelle/pure/logic.ts +1 -3
- package/src/prover/isabelle/pure/name.ts +0 -2
- package/src/prover/isabelle/pure/net.ts +0 -2
- package/src/prover/isabelle/pure/object-logic.ts +13 -7
- package/src/prover/isabelle/pure/pattern.ts +0 -2
- package/src/prover/isabelle/pure/raw-simplifier.ts +4 -15
- package/src/prover/isabelle/pure/rewriter.ts +6 -17
- package/src/prover/isabelle/pure/search.ts +0 -2
- package/src/prover/isabelle/pure/seq.ts +0 -2
- package/src/prover/isabelle/pure/simplifier.ts +26 -7
- package/src/prover/isabelle/pure/table.ts +2 -3
- package/src/prover/isabelle/pure/tactic.ts +0 -2
- package/src/prover/isabelle/pure/tactical.ts +42 -37
- package/src/prover/isabelle/pure/term-ord.ts +0 -2
- package/src/prover/isabelle/pure/term.ts +0 -2
- package/src/prover/isabelle/pure/thm.ts +14 -13
- package/src/prover/isabelle/pure/type.ts +0 -2
- package/src/prover/isabelle/pure/unify.ts +0 -2
- package/src/prover/isabelle/pure/variable.ts +0 -2
- package/src/prover/isabelle/tla/classical-setup.ts +18 -16
- package/src/prover/isabelle/tla/context.ts +58 -11
- package/src/prover/isabelle/tla/logic-data.ts +1 -1
- package/src/prover/isabelle/tla/logic.ts +49 -21
- package/src/prover/isabelle/tla/simpdata.ts +1 -12
- package/src/prover/isabelle/tools/intuitionistic.ts +28 -12
- package/src/prover/ocaml.ts +4 -1
- package/src/prover/prep/action.ts +30 -31
- package/src/prover/prep/enabled-axioms.ts +11 -2
- package/src/prover/prep/fingerprint.ts +2 -5
- package/src/prover/prep/methods.ts +181 -51
- package/src/prover/prep/normalize.ts +38 -9
- package/src/prover/prove.ts +395 -94
- package/src/prover/ptl/decide.ts +95 -50
- package/src/prover/ptl/encode.ts +2 -3
- package/src/prover/ptl/tableau.ts +28 -2
- package/src/prover/smt/arithmetic.ts +310 -0
- package/src/prover/smt/axioms.ts +12 -8
- package/src/prover/smt/context.ts +43 -8
- package/src/prover/smt/data.ts +498 -379
- package/src/prover/smt/encode.ts +148 -57
- package/src/prover/smt/extensionality.ts +5 -3
- package/src/prover/smt/flatten.ts +4 -6
- package/src/prover/smt/format.ts +28 -4
- package/src/prover/smt/instances.ts +7 -1
- package/src/prover/smt/layout.ts +91 -0
- package/src/prover/smt/rewrite.ts +1021 -618
- package/src/prover/smt/simplify.ts +441 -0
- package/src/prover/smt/solver/ackermannize-bv-tactic.ts +61 -0
- package/src/prover/smt/solver/ackr-helper.ts +179 -0
- package/src/prover/smt/solver/ackr-model-converter.ts +105 -0
- package/src/prover/smt/solver/act-cache.ts +0 -1
- package/src/prover/smt/solver/add-bounds-tactic.ts +59 -0
- package/src/prover/smt/solver/aig-tactic.ts +52 -0
- package/src/prover/smt/solver/aig.ts +889 -0
- package/src/prover/smt/solver/arith-rewriter.ts +613 -6
- package/src/prover/smt/solver/arith-terms.ts +121 -0
- package/src/prover/smt/solver/array-decl-plugin.ts +175 -0
- package/src/prover/smt/solver/array-rewriter.ts +309 -0
- package/src/prover/smt/solver/asserted-formulas.ts +87 -16
- package/src/prover/smt/solver/ast-lt.ts +166 -12
- package/src/prover/smt/solver/ast-util.ts +160 -2
- package/src/prover/smt/solver/ast.ts +1427 -41
- package/src/prover/smt/solver/auf-solver.ts +2 -6
- package/src/prover/smt/solver/bit-blast-tactic.ts +582 -0
- package/src/prover/smt/solver/bit-blaster.ts +871 -0
- package/src/prover/smt/solver/bound-manager.ts +196 -0
- package/src/prover/smt/solver/bound-simplifier.ts +600 -0
- package/src/prover/smt/solver/bv-bound-chk.ts +492 -0
- package/src/prover/smt/solver/bv-decl-plugin.ts +338 -0
- package/src/prover/smt/solver/bv-divrem-bounds.ts +95 -0
- package/src/prover/smt/solver/bv-rewriter.ts +1901 -0
- package/src/prover/smt/solver/bv1-blast.ts +214 -0
- package/src/prover/smt/solver/bv2fpa-converter.ts +174 -0
- package/src/prover/smt/solver/bv2int-rewriter.ts +544 -0
- package/src/prover/smt/solver/bv2real-rewriter.ts +533 -0
- package/src/prover/smt/solver/card2bv.ts +110 -0
- package/src/prover/smt/solver/case-split-queue.ts +0 -2
- package/src/prover/smt/solver/cg-table.ts +39 -25
- package/src/prover/smt/solver/check-logic.ts +330 -0
- package/src/prover/smt/solver/clause.ts +0 -1
- package/src/prover/smt/solver/cofactor-elim-term-ite.ts +278 -0
- package/src/prover/smt/solver/conflict-resolution.ts +78 -2
- package/src/prover/smt/solver/context.ts +516 -115
- package/src/prover/smt/solver/ctx-simplify.ts +20 -10
- package/src/prover/smt/solver/ctx-solver-simplify.ts +122 -0
- package/src/prover/smt/solver/datatype-decl-plugin.ts +572 -0
- package/src/prover/smt/solver/datatype-rewriter.ts +82 -0
- package/src/prover/smt/solver/demodulator.ts +786 -0
- package/src/prover/smt/solver/dependent-expr-state.ts +81 -0
- package/src/prover/smt/solver/der.ts +38 -10
- package/src/prover/smt/solver/diff-neq.ts +206 -0
- package/src/prover/smt/solver/distribute-forall.ts +57 -0
- package/src/prover/smt/solver/dom-simplify.ts +511 -0
- package/src/prover/smt/solver/dt2bv-tactic.ts +260 -0
- package/src/prover/smt/solver/dyn-ack.ts +0 -1
- package/src/prover/smt/solver/e-matching.ts +7 -8
- package/src/prover/smt/solver/elim-small-bv-tactic.ts +129 -0
- package/src/prover/smt/solver/elim-uncnstr.ts +545 -0
- package/src/prover/smt/solver/enode.ts +100 -3
- package/src/prover/smt/solver/eq2bv-tactic.ts +218 -0
- package/src/prover/smt/solver/euf/arith-axioms.ts +403 -0
- package/src/prover/smt/solver/euf/arith-internalize.ts +653 -0
- package/src/prover/smt/solver/euf/arith-solver.ts +889 -0
- package/src/prover/smt/solver/euf/array-axioms.ts +527 -0
- package/src/prover/smt/solver/euf/array-internalize.ts +428 -0
- package/src/prover/smt/solver/euf/array-solver.ts +306 -0
- package/src/prover/smt/solver/euf/bv-ackerman.ts +162 -0
- package/src/prover/smt/solver/euf/bv-internalize.ts +748 -0
- package/src/prover/smt/solver/euf/bv-solver.ts +449 -0
- package/src/prover/smt/solver/euf/dt-solver.ts +618 -0
- package/src/prover/smt/solver/euf/egraph.ts +908 -0
- package/src/prover/smt/solver/euf/euf-solver.ts +1205 -0
- package/src/prover/smt/solver/euf/fpa-solver.ts +317 -0
- package/src/prover/smt/solver/euf/mam.ts +1050 -0
- package/src/prover/smt/solver/euf/q-ematch.ts +830 -0
- package/src/prover/smt/solver/euf/q-mbi.ts +587 -0
- package/src/prover/smt/solver/euf/q-model-fixer.ts +296 -0
- package/src/prover/smt/solver/euf/q-solver.ts +361 -0
- package/src/prover/smt/solver/euf/th-solver.ts +335 -0
- package/src/prover/smt/solver/euf/th-solvers.ts +30 -0
- package/src/prover/smt/solver/expr-ref.ts +0 -1
- package/src/prover/smt/solver/expr-safe-replace.ts +26 -2
- package/src/prover/smt/solver/expr2polynomial.ts +146 -0
- package/src/prover/smt/solver/factor.ts +141 -0
- package/src/prover/smt/solver/fd-solver.ts +265 -0
- package/src/prover/smt/solver/fingerprints.ts +15 -15
- package/src/prover/smt/solver/fix-dl-var.ts +148 -0
- package/src/prover/smt/solver/flat-literals.ts +0 -1
- package/src/prover/smt/solver/fm-tactic.ts +884 -0
- package/src/prover/smt/solver/fpa-decl-plugin.ts +618 -0
- package/src/prover/smt/solver/fpa-rewriter.ts +640 -0
- package/src/prover/smt/solver/fpa2bv-converter.ts +2249 -0
- package/src/prover/smt/solver/fpa2bv-rewriter.ts +348 -0
- package/src/prover/smt/solver/fpa2bv-tactic.ts +73 -0
- package/src/prover/smt/solver/goal.ts +175 -15
- package/src/prover/smt/solver/goal2nlsat.ts +189 -0
- package/src/prover/smt/solver/guard-set.ts +219 -0
- package/src/prover/smt/solver/hash.ts +0 -1
- package/src/prover/smt/solver/hashtable.ts +30 -16
- package/src/prover/smt/solver/inf-eps.ts +63 -0
- package/src/prover/smt/solver/inj-axiom.ts +101 -0
- package/src/prover/smt/solver/internalizer.ts +110 -38
- package/src/prover/smt/solver/lackr.ts +381 -0
- package/src/prover/smt/solver/lbool.ts +0 -1
- package/src/prover/smt/solver/lia2card.ts +268 -0
- package/src/prover/smt/solver/lia2pb.ts +154 -0
- package/src/prover/smt/solver/literal.ts +0 -1
- package/src/prover/smt/solver/logic-tactics.ts +345 -0
- package/src/prover/smt/solver/lp/bound-propagator.ts +0 -1
- package/src/prover/smt/solver/lp/constraints.ts +0 -1
- package/src/prover/smt/solver/lp/containers.ts +7 -2
- package/src/prover/smt/solver/lp/core-solver.ts +18 -3
- package/src/prover/smt/solver/lp/cross-nested.ts +1 -4
- package/src/prover/smt/solver/lp/dep-intervals.ts +0 -3
- package/src/prover/smt/solver/lp/dependency.ts +0 -2
- package/src/prover/smt/solver/lp/dioph-eq.ts +1 -10
- package/src/prover/smt/solver/lp/explanation.ts +0 -1
- package/src/prover/smt/solver/lp/gomory.ts +0 -1
- package/src/prover/smt/solver/lp/hnf-cutter.ts +1 -2
- package/src/prover/smt/solver/lp/hnf.ts +0 -3
- package/src/prover/smt/solver/lp/int-cube.ts +3 -4
- package/src/prover/smt/solver/lp/int-solver.ts +0 -2
- package/src/prover/smt/solver/lp/lar-solver.ts +40 -4
- package/src/prover/smt/solver/lp/lar-term.ts +0 -1
- package/src/prover/smt/solver/lp/lp-settings.ts +0 -1
- package/src/prover/smt/solver/lp/maximize-term.ts +59 -10
- package/src/prover/smt/solver/lp/nex-creator.ts +3 -3
- package/src/prover/smt/solver/lp/nex.ts +2 -2
- package/src/prover/smt/solver/lp/nla-backoff.ts +0 -2
- package/src/prover/smt/solver/lp/nla-basics.ts +46 -3
- package/src/prover/smt/solver/lp/nla-core.ts +67 -16
- package/src/prover/smt/solver/lp/nla-divisions.ts +0 -2
- package/src/prover/smt/solver/lp/nla-emonics.ts +0 -1
- package/src/prover/smt/solver/lp/nla-factorization.ts +0 -1
- package/src/prover/smt/solver/lp/nla-grobner.ts +9 -5
- 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 +122 -64
- package/src/prover/smt/solver/lp/numeric-pair.ts +0 -1
- package/src/prover/smt/solver/lp/pdd-interval.ts +0 -1
- package/src/prover/smt/solver/lp/pdd-simplifier.ts +0 -1
- package/src/prover/smt/solver/lp/pdd-solver.ts +0 -2
- package/src/prover/smt/solver/lp/pdd.ts +2 -2
- package/src/prover/smt/solver/lp/random-updater.ts +0 -2
- package/src/prover/smt/solver/lp/static-matrix.ts +0 -1
- package/src/prover/smt/solver/lp/union-find.ts +7 -2
- package/src/prover/smt/solver/macro-finder.ts +530 -0
- package/src/prover/smt/solver/mam-compiler.ts +122 -90
- package/src/prover/smt/solver/mam-interpreter.ts +0 -1
- package/src/prover/smt/solver/max-bv-sharing-tactic.ts +17 -0
- package/src/prover/smt/solver/max-cliques.ts +105 -0
- package/src/prover/smt/solver/maxcore.ts +309 -0
- package/src/prover/smt/solver/maximize-ac-sharing.ts +8 -6
- package/src/prover/smt/solver/maxlex.ts +115 -0
- package/src/prover/smt/solver/maxsmt-base.ts +105 -0
- package/src/prover/smt/solver/maxsmt.ts +92 -0
- package/src/prover/smt/solver/mbp/mbp-arith.ts +467 -0
- package/src/prover/smt/solver/mbp/mbp-basic-tg.ts +101 -0
- package/src/prover/smt/solver/mbp/mbp-plugin.ts +287 -0
- package/src/prover/smt/solver/mbp/mbp-qel.ts +48 -0
- package/src/prover/smt/solver/mbp/mbp-solve-plugin.ts +271 -0
- package/src/prover/smt/solver/mbp/mbp-term-graph.ts +606 -0
- package/src/prover/smt/solver/model-based-opt.ts +844 -0
- package/src/prover/smt/solver/model-checker.ts +18 -27
- package/src/prover/smt/solver/model-evaluator.ts +188 -12
- package/src/prover/smt/solver/model-finder.ts +12 -18
- package/src/prover/smt/solver/model-generator.ts +56 -29
- package/src/prover/smt/solver/model-macro-solver.ts +49 -46
- package/src/prover/smt/solver/model-printer.ts +214 -0
- package/src/prover/smt/solver/mpf.ts +711 -0
- package/src/prover/smt/solver/mus.ts +51 -0
- package/src/prover/smt/solver/muz/dl-context.ts +404 -0
- package/src/prover/smt/solver/muz/dl-mk-bit-blast.ts +97 -0
- package/src/prover/smt/solver/muz/dl-mk-coi-filter.ts +167 -0
- package/src/prover/smt/solver/muz/dl-mk-elim-term-ite.ts +125 -0
- package/src/prover/smt/solver/muz/dl-mk-interp-tail-simplifier.ts +299 -0
- package/src/prover/smt/solver/muz/dl-mk-rule-inliner.ts +455 -0
- package/src/prover/smt/solver/muz/dl-mk-slice.ts +340 -0
- package/src/prover/smt/solver/muz/dl-mk-subsumption-checker.ts +163 -0
- package/src/prover/smt/solver/muz/dl-rule-set.ts +273 -0
- package/src/prover/smt/solver/muz/dl-rule-transformer.ts +123 -0
- package/src/prover/smt/solver/muz/dl-rule.ts +496 -0
- package/src/prover/smt/solver/muz/hnf.ts +201 -0
- package/src/prover/smt/solver/muz/horn-subsume-model-converter.ts +176 -0
- package/src/prover/smt/solver/muz/horn-tactic.ts +201 -0
- package/src/prover/smt/solver/muz/rule-properties.ts +337 -0
- package/src/prover/smt/solver/muz/spacer-context.ts +1406 -0
- package/src/prover/smt/solver/muz/spacer-dl-interface.ts +52 -0
- package/src/prover/smt/solver/muz/spacer-generalizers.ts +241 -0
- package/src/prover/smt/solver/muz/spacer-manager.ts +127 -0
- package/src/prover/smt/solver/muz/spacer-pdr.ts +218 -0
- package/src/prover/smt/solver/muz/spacer-prop-solver.ts +333 -0
- package/src/prover/smt/solver/muz/spacer-util.ts +282 -0
- package/src/prover/smt/solver/muz/substitution.ts +203 -0
- package/src/prover/smt/solver/nla2bv-tactic.ts +285 -0
- package/src/prover/smt/solver/nlqsat.ts +484 -0
- package/src/prover/smt/solver/nlsat/algebraic.ts +125 -12
- package/src/prover/smt/solver/nlsat/atoms.ts +20 -6
- package/src/prover/smt/solver/nlsat/evaluator.ts +0 -1
- package/src/prover/smt/solver/nlsat/explain.ts +63 -23
- package/src/prover/smt/solver/nlsat/interval-set.ts +1 -2
- package/src/prover/smt/solver/nlsat/levelwise.ts +3 -9
- package/src/prover/smt/solver/nlsat/mpbq.ts +45 -1
- package/src/prover/smt/solver/nlsat/polynomial.ts +13 -6
- package/src/prover/smt/solver/nlsat/solver.ts +236 -45
- package/src/prover/smt/solver/nlsat/transcendental-eval.ts +310 -0
- package/src/prover/smt/solver/nlsat/transcendentals.ts +367 -0
- package/src/prover/smt/solver/nlsat/types.ts +0 -2
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +1 -4
- package/src/prover/smt/solver/nlsat/upolynomial.ts +0 -2
- package/src/prover/smt/solver/nlsat-tactic.ts +82 -0
- package/src/prover/smt/solver/nnf.ts +105 -23
- package/src/prover/smt/solver/normalize-bounds.ts +53 -0
- package/src/prover/smt/solver/occf.ts +97 -0
- package/src/prover/smt/solver/opt-context.ts +787 -0
- package/src/prover/smt/solver/opt-nlsat.ts +375 -0
- package/src/prover/smt/solver/opt-pareto.ts +282 -0
- package/src/prover/smt/solver/opt-preprocess.ts +101 -0
- package/src/prover/smt/solver/opt-solver.ts +308 -0
- package/src/prover/smt/solver/opt-value.ts +55 -0
- package/src/prover/smt/solver/optsmt.ts +692 -0
- package/src/prover/smt/solver/parallel-tactic.ts +299 -0
- package/src/prover/smt/solver/pattern-inference.ts +19 -11
- package/src/prover/smt/solver/pb-rewriter.ts +284 -0
- package/src/prover/smt/solver/pb2bv-tactic.ts +540 -0
- package/src/prover/smt/solver/poly-rewriter.ts +202 -57
- package/src/prover/smt/solver/probes.ts +512 -0
- package/src/prover/smt/solver/propagate-values.ts +37 -21
- package/src/prover/smt/solver/proto-model.ts +648 -19
- package/src/prover/smt/solver/pull-quant.ts +28 -12
- package/src/prover/smt/solver/purify-arith.ts +632 -0
- package/src/prover/smt/solver/qe-arith-plugin.ts +1098 -0
- package/src/prover/smt/solver/qe-lite-der.ts +2 -3
- package/src/prover/smt/solver/qe-lite-fm.ts +3 -4
- package/src/prover/smt/solver/qe-lite.ts +37 -17
- package/src/prover/smt/solver/qe-mbp.ts +270 -0
- package/src/prover/smt/solver/qe.ts +1498 -0
- package/src/prover/smt/solver/qel.ts +25 -0
- package/src/prover/smt/solver/qi-queue.ts +0 -1
- package/src/prover/smt/solver/qsat.ts +814 -0
- package/src/prover/smt/solver/quant-hoist.ts +196 -0
- package/src/prover/smt/solver/quant-tactics.ts +16 -56
- package/src/prover/smt/solver/quantifier-analyzer.ts +19 -20
- package/src/prover/smt/solver/quantifier-manager.ts +8 -16
- package/src/prover/smt/solver/quasi-macros.ts +243 -0
- package/src/prover/smt/solver/random-gen.ts +0 -1
- package/src/prover/smt/solver/rational.ts +45 -1
- package/src/prover/smt/solver/recfun-decl-plugin.ts +261 -0
- package/src/prover/smt/solver/recfun-rewriter.ts +107 -0
- package/src/prover/smt/solver/reduce-args.ts +225 -0
- package/src/prover/smt/solver/reduce-bv-size.ts +119 -0
- package/src/prover/smt/solver/ref-vector.ts +0 -1
- package/src/prover/smt/solver/relevancy.ts +1 -2
- package/src/prover/smt/solver/rewriter-tpl.ts +77 -10
- package/src/prover/smt/solver/rewriter.ts +475 -36
- package/src/prover/smt/solver/rlimit.ts +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 +43 -0
- package/src/prover/smt/solver/sat/sat2goal.ts +165 -0
- package/src/prover/smt/solver/sat/scc.ts +142 -0
- package/src/prover/smt/solver/sat/simplifier.ts +1618 -0
- package/src/prover/smt/solver/sat/solver.ts +2127 -0
- package/src/prover/smt/solver/sat/var-queue.ts +117 -0
- package/src/prover/smt/solver/sat/watch-list.ts +140 -0
- package/src/prover/smt/solver/search-tree.ts +284 -0
- package/src/prover/smt/solver/seq-axioms.ts +1010 -0
- package/src/prover/smt/solver/seq-decl-plugin.ts +819 -0
- package/src/prover/smt/solver/seq-derive.ts +1298 -0
- package/src/prover/smt/solver/seq-eq-approx.ts +236 -0
- package/src/prover/smt/solver/seq-eq-solver.ts +439 -0
- package/src/prover/smt/solver/seq-factory.ts +89 -0
- package/src/prover/smt/solver/seq-monadic.ts +728 -0
- package/src/prover/smt/solver/seq-range-predicate.ts +235 -0
- package/src/prover/smt/solver/seq-re-rewriter.ts +1170 -0
- package/src/prover/smt/solver/seq-re-util.ts +758 -0
- package/src/prover/smt/solver/seq-regex-bisim.ts +144 -0
- package/src/prover/smt/solver/seq-regex-live.ts +200 -0
- package/src/prover/smt/solver/seq-rewriter.ts +2402 -0
- package/src/prover/smt/solver/seq-skolem.ts +317 -0
- package/src/prover/smt/solver/seq-subset.ts +165 -0
- package/src/prover/smt/solver/seq-view-witness.ts +353 -0
- package/src/prover/smt/solver/smt-consequences.ts +297 -0
- package/src/prover/smt/solver/smt-kernel.ts +83 -0
- package/src/prover/smt/solver/smt-logics.ts +66 -0
- package/src/prover/smt/solver/smt-setup.ts +496 -0
- package/src/prover/smt/solver/smt2-printer.ts +765 -0
- package/src/prover/smt/solver/smtlib-parser.ts +3126 -316
- package/src/prover/smt/solver/smtlib-script.ts +1631 -0
- package/src/prover/smt/solver/solve-eqs.ts +929 -0
- package/src/prover/smt/solver/solver.ts +113 -22
- package/src/prover/smt/solver/static-features.ts +314 -0
- package/src/prover/smt/solver/sticky-generations.ts +0 -1
- package/src/prover/smt/solver/tactic.ts +1986 -0
- package/src/prover/smt/solver/term-enumeration.ts +205 -0
- package/src/prover/smt/solver/theory-array.ts +1240 -0
- package/src/prover/smt/solver/theory-bv.ts +1200 -0
- package/src/prover/smt/solver/theory-char.ts +355 -0
- package/src/prover/smt/solver/theory-datatype.ts +598 -0
- package/src/prover/smt/solver/theory-finite-set.ts +30 -0
- package/src/prover/smt/solver/theory-fpa.ts +389 -0
- package/src/prover/smt/solver/theory-lra-axioms.ts +53 -2
- package/src/prover/smt/solver/theory-lra-bounds.ts +31 -6
- package/src/prover/smt/solver/theory-lra-final-check.ts +56 -70
- package/src/prover/smt/solver/theory-lra-internalize.ts +94 -27
- package/src/prover/smt/solver/theory-lra-model.ts +20 -35
- package/src/prover/smt/solver/theory-lra-propagate.ts +24 -26
- package/src/prover/smt/solver/theory-lra-state.ts +6 -22
- package/src/prover/smt/solver/theory-lra.ts +188 -1
- package/src/prover/smt/solver/theory-pb.ts +934 -0
- package/src/prover/smt/solver/theory-polymorphism.ts +58 -0
- package/src/prover/smt/solver/theory-recfun.ts +307 -0
- package/src/prover/smt/solver/theory-seq-regex.ts +867 -0
- package/src/prover/smt/solver/theory-seq-solve.ts +1373 -0
- package/src/prover/smt/solver/theory-seq-state.ts +871 -0
- package/src/prover/smt/solver/theory-seq.ts +961 -0
- package/src/prover/smt/solver/theory.ts +189 -0
- package/src/prover/smt/solver/tseitin-cnf.ts +485 -0
- package/src/prover/smt/solver/var-subst.ts +36 -14
- package/src/prover/smt/table.ts +3 -2
- package/src/prover/smt/types.ts +146 -0
- package/src/prover/tlapm/cache.ts +50 -19
- package/src/prover/tlapm/tlapm.ts +15 -9
- package/src/prover/tlapm-library.ts +3208 -0
- package/src/prover/verdict.ts +9 -0
- package/src/prover/zenon/check/check.ts +1 -2
- package/src/prover/zenon/check/records.ts +1 -1
- package/src/prover/zenon/check/relations.ts +2 -1
- package/src/prover/zenon/check/rewrites.ts +2 -15
- package/src/prover/zenon/check/sets.ts +40 -58
- package/src/prover/zenon/check/terms.ts +1 -2
- package/src/prover/zenon/decide.ts +10 -7
- package/src/prover/zenon/encode.ts +0 -2
- package/src/prover/zenon/eqrel.ts +2 -2
- package/src/prover/zenon/equality-rules.ts +24 -2
- package/src/prover/zenon/expr.ts +28 -2
- package/src/prover/zenon/index-table.ts +11 -21
- package/src/prover/zenon/isar-case.ts +0 -2
- package/src/prover/zenon/isar.ts +35 -37
- package/src/prover/zenon/llproof.ts +2 -13
- package/src/prover/zenon/mltoll.ts +12 -30
- package/src/prover/zenon/node.ts +20 -5
- package/src/prover/zenon/parse.ts +9 -8
- package/src/prover/zenon/phrase.ts +0 -2
- package/src/prover/zenon/proof.ts +0 -2
- package/src/prover/zenon/propositional-rules.ts +0 -2
- package/src/prover/zenon/rules.ts +2 -3
- package/src/prover/zenon/search.ts +11 -19
- package/src/prover/zenon/tla/functions.ts +2 -4
- package/src/prover/zenon/tla/llproof.ts +9 -13
- package/src/prover/zenon/tla/records.ts +1 -8
- package/src/prover/zenon/tla/rewrites.ts +0 -2
- package/src/prover/zenon/tla/sets.ts +22 -22
- package/src/prover/zenon/tla/terms.ts +0 -2
- package/src/prover/zenon/tla/tla.ts +7 -8
- package/src/randomization.ts +1 -4
- package/src/resolve.ts +67 -143
- package/src/runtime.ts +15 -18
- package/src/sany/builtins.ts +1 -3
- package/src/sany/generation.ts +394 -0
- package/src/sany/generator-def-entries.ts +210 -0
- package/src/sany/generator-definitions.ts +686 -0
- package/src/sany/generator-expressions.ts +1100 -0
- package/src/sany/generator-proofs.ts +662 -0
- package/src/sany/generator.ts +160 -2683
- package/src/sany/levels.ts +5 -11
- package/src/sany/lexer.ts +57 -60
- package/src/sany/linter.ts +0 -3
- package/src/sany/nodes.ts +6 -13
- package/src/sany/report.ts +3 -6
- package/src/sany/selectors.ts +35 -38
- package/src/sany/xml.ts +23 -55
- package/src/search.ts +206 -44
- package/src/simulate.ts +202 -184
- package/src/spec-description.ts +56 -82
- package/src/standard-definitions.ts +4 -3
- package/src/standard-modules.ts +17 -44
- package/src/state-graph.ts +3 -17
- package/src/subexpressions.ts +38 -47
- package/src/substitution-levels.ts +5 -4
- package/src/successors.ts +20 -43
- package/src/symmetry.ts +6 -21
- package/src/tableau.ts +2 -2
- package/src/tlc/fingerprint.ts +96 -30
- package/src/tlc/jar-data.ts +0 -1
- package/src/tlc/messages.ts +22 -36
- package/src/tlc/order.ts +22 -47
- package/src/tlc/random.ts +22 -34
- package/src/tlc/replay.ts +21 -48
- package/src/tlc/summary.ts +64 -58
- package/src/tlc/tlc-operators.ts +6 -17
- package/src/tlc/tlcext-operators.ts +54 -26
- package/src/tlc/trace-spec.ts +26 -51
- package/src/tlc/value-stream.ts +9 -13
- package/src/tlc/version.ts +0 -1
- package/src/typed-tier.ts +6535 -0
- package/src/typescript/actions.ts +2 -4
- package/src/typescript/collections.ts +34 -20
- package/src/typescript/compile.ts +1 -3
- package/src/typescript/formula.ts +5 -3
- package/src/typescript/model.ts +4 -5
- package/src/typescript/steps.ts +20 -18
- package/src/values.ts +136 -338
- 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
|
@@ -7,7 +7,13 @@ import {
|
|
|
7
7
|
getThunk,
|
|
8
8
|
getValue,
|
|
9
9
|
} from "../builtins";
|
|
10
|
-
import {
|
|
10
|
+
import {
|
|
11
|
+
formatRange,
|
|
12
|
+
TlaEndOfInputError,
|
|
13
|
+
TlaEvaluationError,
|
|
14
|
+
TlaModuleError,
|
|
15
|
+
TlaUnsupportedError,
|
|
16
|
+
} from "../errors";
|
|
11
17
|
import { getTlcFingerprint } from "./fingerprint";
|
|
12
18
|
import { formatMessage, formatNestedMessage, MESSAGE_CODE, MESSAGE_LEVEL } from "./messages";
|
|
13
19
|
import {
|
|
@@ -31,6 +37,7 @@ import {
|
|
|
31
37
|
createRecord,
|
|
32
38
|
createSet,
|
|
33
39
|
createTuple,
|
|
40
|
+
formatState,
|
|
34
41
|
formatValue,
|
|
35
42
|
getFingerprintError,
|
|
36
43
|
getSequenceElements,
|
|
@@ -54,7 +61,6 @@ export const createActionRecord = (action: string | undefined) =>
|
|
|
54
61
|
],
|
|
55
62
|
]);
|
|
56
63
|
|
|
57
|
-
// TLC's CounterExample is its own class, so ToTrace refuses a record that only looks like one.
|
|
58
64
|
const counterExamples = new WeakSet<Value & object>();
|
|
59
65
|
|
|
60
66
|
const createCounterExampleRecord = (action: Value[], states: Value[]) => {
|
|
@@ -189,16 +195,18 @@ export const createTlcExtOperators = (
|
|
|
189
195
|
}
|
|
190
196
|
return false;
|
|
191
197
|
}),
|
|
192
|
-
defineStateOperator(
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
198
|
+
defineStateOperator(
|
|
199
|
+
"TLCGetOrDefault",
|
|
200
|
+
2,
|
|
201
|
+
(args) =>
|
|
202
|
+
getRegister(runtime, getValue(args, 0, "TLCGetOrDefault")) ??
|
|
203
|
+
getValue(args, 1, "TLCGetOrDefault"),
|
|
204
|
+
),
|
|
205
|
+
defineStateOperator("Trace", 0, (_args, context) => {
|
|
197
206
|
const variables = context?.environment.variables ?? [];
|
|
198
|
-
// TLC evaluates an assumption in an empty state, which assigns none of the variables.
|
|
199
207
|
const state = context?.state ?? variables.map(() => undefined);
|
|
200
208
|
if (!context || !isCompleteState(state)) {
|
|
201
|
-
const unassigned = variables.filter((
|
|
209
|
+
const unassigned = variables.filter((_name, index) => state[index] === undefined);
|
|
202
210
|
throw new TlaEvaluationError(
|
|
203
211
|
`In evaluating TLCExt!Trace, the state is not completely specified yet (variable${unassigned.length > 1 ? "s" : ""} ${unassigned.join(", ")} undefined).`,
|
|
204
212
|
);
|
|
@@ -210,7 +218,6 @@ export const createTlcExtOperators = (
|
|
|
210
218
|
name,
|
|
211
219
|
step[index],
|
|
212
220
|
]);
|
|
213
|
-
// A simulated behavior's states also record their actions.
|
|
214
221
|
const action = runtime.getSimulationValue?.("action", step);
|
|
215
222
|
return createRecord(action === undefined ? fields : [["_action", action], ...fields]);
|
|
216
223
|
}),
|
|
@@ -244,7 +251,6 @@ export const createTlcExtOperators = (
|
|
|
244
251
|
}
|
|
245
252
|
return createModelValue(name);
|
|
246
253
|
}),
|
|
247
|
-
// Only simulation runs the deferred expression, for the successor it chooses.
|
|
248
254
|
defineLazyOperator("TLCDefer", 1, (args, context) => {
|
|
249
255
|
const expression = getOperator(args, 0, "TLCDefer").expression;
|
|
250
256
|
if (context && expression) {
|
|
@@ -257,9 +263,7 @@ export const createTlcExtOperators = (
|
|
|
257
263
|
defineOperator("TLCNoOp", 1, (args) => getValue(args, 0, "TLCNoOp")),
|
|
258
264
|
{
|
|
259
265
|
...defineLazyOperator("PickSuccessor", 1, (args, context) => {
|
|
260
|
-
//
|
|
261
|
-
// TLCExt.tla promises TRUE for a successor not fully determined, where TLCExt#pickSuccessor
|
|
262
|
-
// fingerprints it first and fails.
|
|
266
|
+
// Deviation from TLC: TLCExt#pickSuccessor fingerprints a partial successor and fails, where TLCExt.tla promises TRUE.
|
|
263
267
|
const next = context?.next ?? (context?.environment.variables ?? []).map(() => undefined);
|
|
264
268
|
if (!isCompleteState(next)) return true;
|
|
265
269
|
if (context?.next && runtime.isSeen(next)) return true;
|
|
@@ -273,17 +277,42 @@ export const createTlcExtOperators = (
|
|
|
273
277
|
if (isPicked || !context?.next || !context.state || !isCompleteState(context.state)) {
|
|
274
278
|
return true;
|
|
275
279
|
}
|
|
276
|
-
const
|
|
277
|
-
|
|
278
|
-
|
|
279
|
-
|
|
280
|
-
|
|
281
|
-
|
|
282
|
-
|
|
283
|
-
|
|
284
|
-
|
|
285
|
-
|
|
286
|
-
|
|
280
|
+
const state = context.state;
|
|
281
|
+
const action = runtime.getSuccessorAction(state, next);
|
|
282
|
+
const printOverride = (text: string) =>
|
|
283
|
+
print(
|
|
284
|
+
formatMessage(
|
|
285
|
+
runtime.isTool,
|
|
286
|
+
MESSAGE_CODE.moduleOverrideStdout,
|
|
287
|
+
MESSAGE_LEVEL.none,
|
|
288
|
+
text,
|
|
289
|
+
),
|
|
290
|
+
);
|
|
291
|
+
while (true) {
|
|
292
|
+
printOverride(
|
|
293
|
+
`Extend behavior of length ${runtime.getLevel(state)} with a "${action?.name}" step [<Action ${action?.location.range && formatRange(action.location.range)}>]? (Yes/no/explored/states/diff):`,
|
|
294
|
+
);
|
|
295
|
+
const answer = runtime.readLine?.();
|
|
296
|
+
// Deviation from TLC: at the end of standard input, TLC's Scanner leaks a NoSuchElementException.
|
|
297
|
+
if (answer === undefined) throw new TlaEndOfInputError();
|
|
298
|
+
if (/^[\0-\x20]*$/.test(answer) || answer.toLowerCase().startsWith("y")) return true;
|
|
299
|
+
if (answer[0] === "s") {
|
|
300
|
+
printOverride(
|
|
301
|
+
`${formatState(runtime.toRecord(state)).trimEnd()}\n~>\n${formatState(runtime.toRecord(next)).trimEnd()}`,
|
|
302
|
+
);
|
|
303
|
+
} else if (answer[0] === "d") {
|
|
304
|
+
printOverride(formatState(runtime.toRecord(next), runtime.toRecord(state)));
|
|
305
|
+
} else if (answer[0] === "e") {
|
|
306
|
+
if (runtime.getSimulationValue === undefined) {
|
|
307
|
+
throw new TlaUnsupportedError(
|
|
308
|
+
"tla-ts can't mark a state explored while it checks a model.",
|
|
309
|
+
);
|
|
310
|
+
}
|
|
311
|
+
printOverride(
|
|
312
|
+
"Marking a state explored is unsupported by the current TLC mode. Is TLC running in simulation mode?",
|
|
313
|
+
);
|
|
314
|
+
} else if (answer[0] === "n") return false;
|
|
315
|
+
}
|
|
287
316
|
}),
|
|
288
317
|
isActionLevel: true,
|
|
289
318
|
},
|
|
@@ -323,7 +352,6 @@ export const createTlcExtOperators = (
|
|
|
323
352
|
);
|
|
324
353
|
}
|
|
325
354
|
const definition = context ? getDefinition(name, context.environment) : undefined;
|
|
326
|
-
// A definition that TLC overrides with Java has the Java method's value, not its body's.
|
|
327
355
|
const builtin = definition ? undefined : context?.environment.builtins.get(name);
|
|
328
356
|
if (builtin?.arity === 0) return builtin.evaluate([], context);
|
|
329
357
|
if (!definition || !context) {
|
package/src/tlc/trace-spec.ts
CHANGED
|
@@ -1,4 +1,6 @@
|
|
|
1
|
+
import { getJavaHashCode } from "../java-hash";
|
|
1
2
|
import { formatValue, type Value } from "../values";
|
|
3
|
+
import { zeroPad } from "./messages";
|
|
2
4
|
|
|
3
5
|
interface TraceSpecInput {
|
|
4
6
|
module: string;
|
|
@@ -10,45 +12,33 @@ interface TraceSpecInput {
|
|
|
10
12
|
isDefined: (name: string) => boolean;
|
|
11
13
|
}
|
|
12
14
|
|
|
13
|
-
interface TraceState {
|
|
14
|
-
values: [string, string][];
|
|
15
|
-
number: number;
|
|
16
|
-
isStuttering: boolean;
|
|
17
|
-
isBackToState: boolean;
|
|
18
|
-
}
|
|
19
|
-
|
|
20
15
|
const INDENT = " ";
|
|
21
16
|
const SEPARATOR = "\n----\n";
|
|
22
17
|
const CLOSING_TAG = `${"=".repeat(77)}\n`;
|
|
23
18
|
const LASSO_START = "_TTraceLassoStart";
|
|
24
19
|
const LASSO_END = "_TTraceLassoEnd";
|
|
25
20
|
|
|
26
|
-
const
|
|
27
|
-
const hash = text
|
|
28
|
-
.split("")
|
|
29
|
-
.reduce((current, unit) => (Math.imul(current, 31) + unit.charCodeAt(0)) | 0, 0);
|
|
21
|
+
const getHashMapHash = (text: string) => {
|
|
22
|
+
const hash = getJavaHashCode(text);
|
|
30
23
|
return hash ^ (hash >>> 16);
|
|
31
24
|
};
|
|
32
25
|
|
|
33
|
-
// TLC lists the modules and the variables in the order a Java HashSet or HashMap iterates them.
|
|
34
26
|
const getHashOrder = (names: string[]) => {
|
|
35
27
|
const unique = [...new Set(names)];
|
|
36
28
|
const capacity = 2 ** Math.max(4, Math.ceil(Math.log2(unique.length / 0.75)));
|
|
37
29
|
return unique
|
|
38
|
-
.map((name, index) => ({ name, index, bucket:
|
|
30
|
+
.map((name, index) => ({ name, index, bucket: getHashMapHash(name) & (capacity - 1) }))
|
|
39
31
|
.sort((left, right) => left.bucket - right.bucket || left.index - right.index)
|
|
40
32
|
.map((entry) => entry.name);
|
|
41
33
|
};
|
|
42
34
|
|
|
43
35
|
const formatJavaDate = (date: Date) => {
|
|
44
|
-
const pad = (value: number) => String(value).padStart(2, "0");
|
|
45
36
|
const getPart = (options: Intl.DateTimeFormatOptions, type: Intl.DateTimeFormatPartTypes) =>
|
|
46
37
|
new Intl.DateTimeFormat("en-US", options).formatToParts(date).find((part) => part.type === type)
|
|
47
38
|
?.value;
|
|
48
|
-
return `${getPart({ weekday: "short" }, "weekday")} ${getPart({ month: "short" }, "month")} ${
|
|
39
|
+
return `${getPart({ weekday: "short" }, "weekday")} ${getPart({ month: "short" }, "month")} ${zeroPad(date.getDate())} ${zeroPad(date.getHours())}:${zeroPad(date.getMinutes())}:${zeroPad(date.getSeconds())} ${getPart({ timeZoneName: "short" }, "timeZoneName")} ${date.getFullYear()}`;
|
|
49
40
|
};
|
|
50
41
|
|
|
51
|
-
// Java's String#split drops the empty strings at the end.
|
|
52
42
|
const splitLines = (text: string) => {
|
|
53
43
|
const lines = text.split("\n");
|
|
54
44
|
while (lines.length > 1 && lines[lines.length - 1] === "") lines.pop();
|
|
@@ -63,11 +53,11 @@ const indent = (text: string, depth: number) => {
|
|
|
63
53
|
const getPrimer = (module: string, extendedModules: string[]) =>
|
|
64
54
|
`---- MODULE ${module} ----\nEXTENDS ${extendedModules.join(", ")}\n\n`;
|
|
65
55
|
|
|
66
|
-
const getConjunction = (state:
|
|
56
|
+
const getConjunction = (state: [string, string][], prefix?: string) =>
|
|
67
57
|
indent(
|
|
68
58
|
[
|
|
69
59
|
...(prefix === undefined ? [] : [prefix]),
|
|
70
|
-
...state.
|
|
60
|
+
...state.map(([name, value]) => `${name} = (${value})`),
|
|
71
61
|
].join("\n/\\\n"),
|
|
72
62
|
2,
|
|
73
63
|
);
|
|
@@ -111,26 +101,18 @@ ${examples}`;
|
|
|
111
101
|
|
|
112
102
|
export const writeTraceSpec = (input: TraceSpecInput) => {
|
|
113
103
|
const loopStart = input.loopStart;
|
|
114
|
-
const states = input.states.map((state
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
loopStart === undefined
|
|
122
|
-
? states
|
|
123
|
-
: [
|
|
124
|
-
...states,
|
|
125
|
-
loopStart === states.length - 1
|
|
126
|
-
? { ...states[loopStart], isStuttering: true }
|
|
127
|
-
: { ...states[loopStart], isBackToState: true },
|
|
128
|
-
];
|
|
129
|
-
if (trace.length <= 1) return undefined;
|
|
104
|
+
const states = input.states.map((state) =>
|
|
105
|
+
getHashOrder(Object.keys(state)).map((name): [string, string] => [
|
|
106
|
+
name,
|
|
107
|
+
formatValue(state[name]),
|
|
108
|
+
]),
|
|
109
|
+
);
|
|
110
|
+
if (states.length + (loopStart === undefined ? 0 : 1) <= 1) return undefined;
|
|
130
111
|
const variables = Object.keys(input.states[0]);
|
|
131
112
|
const specName = input.specName;
|
|
132
|
-
const final =
|
|
133
|
-
const
|
|
113
|
+
const final = states[states.length - 1];
|
|
114
|
+
const isStuttering = loopStart === states.length - 1;
|
|
115
|
+
const isLasso = loopStart !== undefined && !isStuttering;
|
|
134
116
|
|
|
135
117
|
const declaredNames = new Set(input.rawConstants.map((line) => line.split(" = ")[0]));
|
|
136
118
|
const constantLines = [
|
|
@@ -138,7 +120,7 @@ export const writeTraceSpec = (input: TraceSpecInput) => {
|
|
|
138
120
|
...input.modelValues
|
|
139
121
|
.filter((name) => !declaredNames.has(name))
|
|
140
122
|
.map((name) => indent(`${name} = ${name}`, 1)),
|
|
141
|
-
...(isLasso ? [`${LASSO_START} = ${
|
|
123
|
+
...(isLasso ? [`${LASSO_START} = ${loopStart + 1}`, `${LASSO_END} = ${states.length}`] : []),
|
|
142
124
|
];
|
|
143
125
|
const teConstants = [
|
|
144
126
|
...input.modelValues.filter((name) => !input.isDefined(name)),
|
|
@@ -160,16 +142,16 @@ export const writeTraceSpec = (input: TraceSpecInput) => {
|
|
|
160
142
|
const expressionModule = `${specName}_TEExpression`;
|
|
161
143
|
const traceModule = `${specName}_TETrace`;
|
|
162
144
|
|
|
163
|
-
const property =
|
|
145
|
+
const property = isStuttering
|
|
164
146
|
? {
|
|
165
147
|
config: "\nPROPERTY\n _prop\n",
|
|
166
|
-
definition: `\n_prop ==\n${INDENT}~<>[](\n${getConjunction(
|
|
148
|
+
definition: `\n_prop ==\n${INDENT}~<>[](\n${getConjunction(final)}\n${INDENT})`,
|
|
167
149
|
}
|
|
168
150
|
: isLasso
|
|
169
151
|
? {
|
|
170
152
|
config: "\nPROPERTY\n _prop\n",
|
|
171
153
|
definition: `\n_prop ==\n${indent(
|
|
172
|
-
`~(([]<>(\n${getConjunction(
|
|
154
|
+
`~(([]<>(\n${getConjunction(final)}\n))/\\([]<>(\n${getConjunction(states[loopStart])}\n)))`,
|
|
173
155
|
1,
|
|
174
156
|
)}`,
|
|
175
157
|
}
|
|
@@ -198,24 +180,17 @@ ${lassoStep}${variables
|
|
|
198
180
|
\\* IN J!JsonSerialize("${input.module}.json", _TETrace)
|
|
199
181
|
|
|
200
182
|
`;
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
// tells the copies apart.
|
|
204
|
-
const isViewed =
|
|
205
|
-
isLasso &&
|
|
206
|
-
new Set(statesWithoutLasso.map((state) => JSON.stringify(state.values))).size <
|
|
207
|
-
statesWithoutLasso.length;
|
|
208
|
-
const view = isViewed
|
|
183
|
+
// MCError#isLassoWithDuplicates counts the state a lasso goes back to, so TLC views every lasso.
|
|
184
|
+
const view = isLasso
|
|
209
185
|
? {
|
|
210
186
|
config: "\nVIEW\n _view\n",
|
|
211
187
|
definition: `\n_view ==\n${INDENT}<<${variables.join(", ")}, IF TLCGet("level") = ${LASSO_END} + 1 THEN ${LASSO_START} ELSE TLCGet("level")>>\n`,
|
|
212
188
|
}
|
|
213
189
|
: { config: "", definition: "" };
|
|
214
190
|
const deserializedTrace = `\n${getPrimer(traceModule, getHashOrder(["IOUtils", ...constantModules, specName]))}trace == IODeserialize("${input.module}.bin", TRUE)\n\n${CLOSING_TAG}`;
|
|
215
|
-
const traceFunction = `${INDENT}<<\n${
|
|
191
|
+
const traceFunction = `${INDENT}<<\n${states
|
|
216
192
|
.map(
|
|
217
|
-
(state) =>
|
|
218
|
-
`${INDENT}([${state.values.map(([name, value]) => `${name} |-> ${value}`).join(",")}])`,
|
|
193
|
+
(state) => `${INDENT}([${state.map(([name, value]) => `${name} |-> ${value}`).join(",")}])`,
|
|
219
194
|
)
|
|
220
195
|
.join(",\n")}\n${INDENT}>>${SEPARATOR}\n`;
|
|
221
196
|
|
package/src/tlc/value-stream.ts
CHANGED
|
@@ -24,14 +24,11 @@ const TAGS = {
|
|
|
24
24
|
handle: 26,
|
|
25
25
|
};
|
|
26
26
|
|
|
27
|
-
|
|
28
|
-
export const serializeValue = (value: Value) => {
|
|
27
|
+
const serializeValue = (value: Value) => {
|
|
29
28
|
const bytes: number[] = [];
|
|
30
|
-
const
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
count: 0,
|
|
34
|
-
};
|
|
29
|
+
const objectHandles = new Map<object, number>();
|
|
30
|
+
const nameHandles = new Map<string, number>();
|
|
31
|
+
let handleCount = 0;
|
|
35
32
|
const modelValues = getModelValues();
|
|
36
33
|
const writeByte = (byte: number) => bytes.push(byte & 0xff);
|
|
37
34
|
const writeShort = (short: number) => {
|
|
@@ -43,7 +40,6 @@ export const serializeValue = (value: Value) => {
|
|
|
43
40
|
writeShort(int);
|
|
44
41
|
};
|
|
45
42
|
const writeNat = (nat: number) => (nat > 0x7fff ? writeInt(-nat) : writeShort(nat));
|
|
46
|
-
// A reader skips the token and the variable location that TLC writes before the characters.
|
|
47
43
|
const writeString = (text: string) => {
|
|
48
44
|
writeByte(TAGS.string);
|
|
49
45
|
writeInt(0);
|
|
@@ -67,7 +63,7 @@ export const serializeValue = (value: Value) => {
|
|
|
67
63
|
return;
|
|
68
64
|
}
|
|
69
65
|
if (typeof inner === "string") {
|
|
70
|
-
|
|
66
|
+
handleCount++;
|
|
71
67
|
writeString(inner);
|
|
72
68
|
return;
|
|
73
69
|
}
|
|
@@ -82,12 +78,12 @@ export const serializeValue = (value: Value) => {
|
|
|
82
78
|
writeInt(inner.high);
|
|
83
79
|
return;
|
|
84
80
|
}
|
|
85
|
-
const handle =
|
|
81
|
+
const handle = objectHandles.get(inner);
|
|
86
82
|
if (handle !== undefined) {
|
|
87
83
|
writeHandle(handle);
|
|
88
84
|
return;
|
|
89
85
|
}
|
|
90
|
-
|
|
86
|
+
objectHandles.set(inner, handleCount++);
|
|
91
87
|
if (isSetValue(inner)) {
|
|
92
88
|
const elements = toFiniteSet(inner).elements;
|
|
93
89
|
writeByte(TAGS.set);
|
|
@@ -108,9 +104,9 @@ export const serializeValue = (value: Value) => {
|
|
|
108
104
|
writeInt(functionValue.domain.length);
|
|
109
105
|
functionValue.domain.forEach((name, index) => {
|
|
110
106
|
const fieldName = String(name);
|
|
111
|
-
const nameHandle =
|
|
107
|
+
const nameHandle = nameHandles.get(fieldName);
|
|
112
108
|
if (nameHandle === undefined) {
|
|
113
|
-
|
|
109
|
+
nameHandles.set(fieldName, handleCount++);
|
|
114
110
|
writeString(fieldName);
|
|
115
111
|
} else {
|
|
116
112
|
writeHandle(nameHandle);
|
package/src/tlc/version.ts
CHANGED