tla-ts 0.0.10-dev.f16792fed → 0.0.10-dev.fdc173479
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 +41 -37
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +21 -4
- package/dist/index.d.ts +21 -4
- 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 +2681 -425
- package/dist/prove.js +2681 -425
- package/dist/run.cjs +41 -42
- package/dist/run.js +41 -42
- package/dist/tlapm.cjs +2 -2
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +97 -89
- package/dist/transfer.js +97 -89
- package/dist/worker.cjs +7 -7
- package/dist/worker.js +7 -7
- package/package.json +1 -1
- package/src/ast.ts +72 -39
- package/src/bags.ts +50 -29
- package/src/builtins.ts +8 -16
- package/src/check-failure.ts +118 -0
- package/src/check-trace.ts +321 -0
- package/src/check.ts +828 -770
- package/src/cli/options.ts +6 -31
- package/src/cli/runtime-invariants.ts +20 -56
- package/src/cli/shared.ts +1 -1
- package/src/cli/tlapm.ts +433 -70
- package/src/cli/tlc-arguments.ts +224 -212
- package/src/cli/tlc-output.ts +701 -0
- package/src/cli/tlc-usage.ts +1 -2
- package/src/cli/tlc.ts +65 -712
- package/src/cli/xml-exporter.ts +23 -33
- package/src/codegen.ts +28 -20
- package/src/coverage.ts +255 -20
- package/src/dependencies.ts +96 -27
- package/src/dfid.ts +115 -50
- package/src/environment-config.ts +315 -0
- package/src/environment.ts +175 -373
- package/src/errors.ts +40 -5
- package/src/evaluate.ts +429 -139
- package/src/exit-codes.ts +28 -12
- package/src/fingerprints.ts +65 -1
- package/src/instances.ts +178 -17
- package/src/java-hash.ts +14 -0
- package/src/java-overrides.ts +2 -2
- package/src/json.ts +4 -7
- package/src/levels.ts +708 -272
- package/src/lexer.ts +17 -5
- package/src/liveness-checker.ts +707 -249
- package/src/liveness.ts +148 -95
- 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 +39 -9
- package/src/obligations/levels.ts +24 -11
- package/src/obligations/module.ts +28 -41
- package/src/obligations/normalize.ts +27 -18
- 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 +55 -50
- package/src/obligations/source.ts +120 -74
- package/src/obligations/subexpression.ts +45 -18
- package/src/obligations/substitution.ts +1 -3
- package/src/obligations/temporal.ts +5 -7
- package/src/obligations/tuples.ts +0 -2
- package/src/parallel-worker.ts +17 -31
- package/src/parallel.ts +29 -47
- package/src/parser.ts +757 -326
- package/src/pretty-print.ts +1 -1
- package/src/prover/decide-pool.ts +3 -3
- package/src/prover/deciders.ts +12 -9
- package/src/prover/isabelle/decide.ts +3 -25
- package/src/prover/isabelle/encode.ts +72 -42
- package/src/prover/isabelle/isar/attrib.ts +250 -0
- package/src/prover/isabelle/isar/context.ts +335 -0
- package/src/prover/isabelle/isar/induct.ts +382 -0
- package/src/prover/isabelle/isar/inner-syntax.ts +158 -7
- package/src/prover/isabelle/isar/method.ts +509 -212
- package/src/prover/isabelle/isar/proof.ts +570 -14
- package/src/prover/isabelle/isar/rule-cases.ts +226 -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 +1 -3
- package/src/prover/isabelle/provers/classical.ts +45 -20
- package/src/prover/isabelle/provers/hypsubst.ts +19 -30
- 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 +9 -20
- 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 +3 -5
- 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/md5.ts +26 -29
- 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 +1016 -618
- package/src/prover/smt/simplify.ts +441 -0
- package/src/prover/smt/solver/ackermannize-bv-tactic.ts +62 -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 +624 -9
- 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 +319 -0
- package/src/prover/smt/solver/asserted-formulas.ts +240 -56
- 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 +1483 -45
- package/src/prover/smt/solver/auf-solver.ts +25 -18
- package/src/prover/smt/solver/bit-blast-tactic.ts +608 -0
- package/src/prover/smt/solver/bit-blaster.ts +871 -0
- package/src/prover/smt/solver/blast-term-ite.ts +47 -0
- package/src/prover/smt/solver/bound-manager.ts +196 -0
- package/src/prover/smt/solver/bound-simplifier.ts +598 -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 +127 -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 +293 -0
- package/src/prover/smt/solver/conflict-resolution.ts +78 -2
- package/src/prover/smt/solver/context.ts +598 -128
- package/src/prover/smt/solver/ctx-simplify.ts +29 -14
- package/src/prover/smt/solver/ctx-solver-simplify.ts +122 -0
- package/src/prover/smt/solver/datatype-decl-plugin.ts +580 -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 +93 -0
- package/src/prover/smt/solver/der.ts +38 -10
- package/src/prover/smt/solver/diff-neq.ts +207 -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 +298 -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-bounds.ts +89 -0
- package/src/prover/smt/solver/elim-small-bv-tactic.ts +129 -0
- package/src/prover/smt/solver/elim-term-ite-tactic.ts +48 -0
- package/src/prover/smt/solver/elim-uncnstr.ts +548 -0
- package/src/prover/smt/solver/enode.ts +100 -3
- package/src/prover/smt/solver/eq2bv-tactic.ts +227 -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 +734 -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 +886 -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 +178 -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 +34 -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 +111 -39
- 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 +355 -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 +30 -11
- 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 +41 -5
- package/src/prover/smt/solver/lp/lar-term.ts +0 -1
- package/src/prover/smt/solver/lp/lp-settings.ts +6 -3
- package/src/prover/smt/solver/lp/maximize-term.ts +59 -10
- package/src/prover/smt/solver/lp/nex-creator.ts +3 -3
- package/src/prover/smt/solver/lp/nex.ts +2 -2
- package/src/prover/smt/solver/lp/nla-backoff.ts +0 -2
- package/src/prover/smt/solver/lp/nla-basics.ts +46 -3
- package/src/prover/smt/solver/lp/nla-core.ts +68 -17
- package/src/prover/smt/solver/lp/nla-divisions.ts +0 -2
- package/src/prover/smt/solver/lp/nla-emonics.ts +0 -1
- package/src/prover/smt/solver/lp/nla-factorization.ts +0 -1
- package/src/prover/smt/solver/lp/nla-grobner.ts +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 +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 +310 -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 +106 -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 +19 -28
- package/src/prover/smt/solver/model-evaluator.ts +190 -12
- package/src/prover/smt/solver/model-finder.ts +12 -18
- package/src/prover/smt/solver/model-generator.ts +104 -35
- 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 +709 -0
- package/src/prover/smt/solver/mus.ts +50 -0
- package/src/prover/smt/solver/muz/dl-context.ts +382 -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 +495 -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 +214 -0
- package/src/prover/smt/solver/muz/rule-properties.ts +359 -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 +485 -0
- package/src/prover/smt/solver/nlsat/algebraic.ts +315 -98
- package/src/prover/smt/solver/nlsat/atoms.ts +71 -38
- package/src/prover/smt/solver/nlsat/evaluator.ts +0 -1
- package/src/prover/smt/solver/nlsat/explain.ts +427 -229
- package/src/prover/smt/solver/nlsat/interval-set.ts +1 -2
- package/src/prover/smt/solver/nlsat/levelwise.ts +460 -246
- package/src/prover/smt/solver/nlsat/mpbq.ts +45 -1
- package/src/prover/smt/solver/nlsat/polynomial.ts +2376 -684
- package/src/prover/smt/solver/nlsat/solver.ts +293 -92
- package/src/prover/smt/solver/nlsat/transcendental-eval.ts +310 -0
- package/src/prover/smt/solver/nlsat/transcendentals.ts +391 -0
- package/src/prover/smt/solver/nlsat/types.ts +0 -2
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +9 -8
- package/src/prover/smt/solver/nlsat/upolynomial.ts +41 -20
- package/src/prover/smt/solver/nlsat-tactic.ts +82 -0
- package/src/prover/smt/solver/nnf.ts +110 -24
- 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 +801 -0
- package/src/prover/smt/solver/opt-nlsat.ts +386 -0
- package/src/prover/smt/solver/opt-pareto.ts +301 -0
- package/src/prover/smt/solver/opt-preprocess.ts +101 -0
- package/src/prover/smt/solver/opt-solver.ts +312 -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 +546 -0
- package/src/prover/smt/solver/poly-rewriter.ts +259 -57
- package/src/prover/smt/solver/probes.ts +577 -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 +634 -0
- package/src/prover/smt/solver/push-app-ite.ts +37 -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 +39 -19
- 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 +829 -0
- package/src/prover/smt/solver/quant-hoist.ts +196 -0
- package/src/prover/smt/solver/quant-tactics.ts +16 -56
- package/src/prover/smt/solver/quantifier-analyzer.ts +19 -20
- package/src/prover/smt/solver/quantifier-manager.ts +22 -25
- package/src/prover/smt/solver/quasi-macros.ts +243 -0
- package/src/prover/smt/solver/random-gen.ts +0 -1
- package/src/prover/smt/solver/rational.ts +45 -1
- package/src/prover/smt/solver/recfun-decl-plugin.ts +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 +82 -14
- package/src/prover/smt/solver/rewriter.ts +505 -60
- package/src/prover/smt/solver/rlimit.ts +45 -5
- 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 +589 -0
- package/src/prover/smt/solver/sat/inc-sat-solver.ts +480 -0
- package/src/prover/smt/solver/sat/model-converter.ts +136 -0
- package/src/prover/smt/solver/sat/pb-constraint.ts +268 -0
- package/src/prover/smt/solver/sat/pb-solver.ts +1596 -0
- package/src/prover/smt/solver/sat/probing.ts +170 -0
- package/src/prover/smt/solver/sat/sat-tactic.ts +72 -0
- package/src/prover/smt/solver/sat/sat2goal.ts +190 -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 +2107 -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 +124 -0
- package/src/prover/smt/solver/smt-logics.ts +66 -0
- package/src/prover/smt/solver/smt-setup.ts +589 -0
- package/src/prover/smt/solver/smt2-printer.ts +765 -0
- package/src/prover/smt/solver/smtlib-parser.ts +3535 -360
- package/src/prover/smt/solver/smtlib-script.ts +2136 -0
- package/src/prover/smt/solver/solve-eqs.ts +928 -0
- package/src/prover/smt/solver/solver.ts +128 -23
- 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 +2176 -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 +1210 -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 +57 -70
- package/src/prover/smt/solver/theory-lra-internalize.ts +96 -27
- package/src/prover/smt/solver/theory-lra-model.ts +20 -35
- package/src/prover/smt/solver/theory-lra-propagate.ts +35 -28
- package/src/prover/smt/solver/theory-lra-state.ts +7 -23
- package/src/prover/smt/solver/theory-lra.ts +189 -2
- package/src/prover/smt/solver/theory-pb.ts +951 -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-without-terms.ts +24 -0
- package/src/prover/smt/solver/theory.ts +189 -0
- package/src/prover/smt/solver/tseitin-cnf.ts +495 -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 +57 -26
- 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 +16 -23
- package/src/prover/zenon/isar-case.ts +1 -3
- package/src/prover/zenon/isar.ts +37 -39
- 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 +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 +11 -19
- package/src/prover/zenon/tla/functions.ts +2 -4
- package/src/prover/zenon/tla/llproof.ts +9 -13
- package/src/prover/zenon/tla/records.ts +1 -8
- package/src/prover/zenon/tla/rewrites.ts +0 -2
- package/src/prover/zenon/tla/sets.ts +22 -22
- package/src/prover/zenon/tla/terms.ts +0 -2
- package/src/prover/zenon/tla/tla.ts +7 -8
- package/src/resolve.ts +1327 -328
- package/src/runtime.ts +25 -2
- package/src/sany/builtins.ts +10 -10
- package/src/sany/generation.ts +384 -0
- package/src/sany/generator-def-entries.ts +297 -0
- package/src/sany/generator-definitions.ts +688 -0
- package/src/sany/generator-expressions.ts +1123 -0
- package/src/sany/generator-proofs.ts +668 -0
- package/src/sany/generator.ts +161 -2625
- package/src/sany/levels.ts +0 -2
- package/src/sany/lexer.ts +32 -23
- package/src/sany/linter.ts +0 -2
- package/src/sany/modules.ts +4 -2
- package/src/sany/nodes.ts +3 -4
- package/src/sany/report.ts +3 -6
- package/src/sany/selectors.ts +46 -44
- package/src/sany/xml.ts +25 -58
- package/src/search.ts +513 -165
- package/src/simulate.ts +340 -251
- package/src/spec-description.ts +48 -55
- package/src/standard-definitions.ts +5 -0
- package/src/standard-modules.ts +72 -54
- package/src/state-graph.ts +0 -2
- package/src/subexpressions.ts +564 -138
- package/src/substitution-levels.ts +5 -4
- package/src/successors.ts +56 -28
- package/src/symmetry.ts +4 -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 +23 -18
- package/src/tlc/order.ts +14 -3
- package/src/tlc/random.ts +6 -5
- package/src/tlc/replay.ts +152 -58
- package/src/tlc/summary.ts +29 -14
- package/src/tlc/tlc-operators.ts +12 -11
- package/src/tlc/tlcext-operators.ts +87 -26
- package/src/tlc/trace-spec.ts +27 -60
- package/src/trace-liveness.ts +529 -0
- package/src/typed-tier.ts +6556 -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/typescript/types.ts +2 -2
- package/src/values.ts +208 -227
- 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/values.ts
CHANGED
|
@@ -107,6 +107,7 @@ export interface FilteredSetValue extends LazySet {
|
|
|
107
107
|
kind: "FilteredSet";
|
|
108
108
|
base: Value;
|
|
109
109
|
test: (element: Value, isMember: boolean) => boolean;
|
|
110
|
+
startPass?: (isMaterialized: boolean) => (element: Value) => boolean;
|
|
110
111
|
source?: FilteredSetSource;
|
|
111
112
|
}
|
|
112
113
|
|
|
@@ -231,7 +232,7 @@ export const isModelValue = (value: Value): value is ModelValue =>
|
|
|
231
232
|
export const isEnumeratedSet = (value: Value): value is SetValue | MixedSetValue =>
|
|
232
233
|
typeof value === "object" && (value.kind === "Set" || value.kind === "MixedSet");
|
|
233
234
|
|
|
234
|
-
|
|
235
|
+
const describeKind = (value: Value) => {
|
|
235
236
|
if (typeof value === "boolean") return "boolean";
|
|
236
237
|
if (typeof value === "number") return "integer";
|
|
237
238
|
if (typeof value === "string") return "string";
|
|
@@ -266,8 +267,19 @@ export const getPrintedPairs = (functionValue: FunctionValue): [Value, Value][]
|
|
|
266
267
|
? functionValue.domain.map((key, index) => [key, functionValue.range[index]])
|
|
267
268
|
: getWrittenPairs(functionValue);
|
|
268
269
|
|
|
269
|
-
export const createWrittenRecord = (
|
|
270
|
-
|
|
270
|
+
export const createWrittenRecord = (
|
|
271
|
+
names: Value[],
|
|
272
|
+
writtenIndexes: number[],
|
|
273
|
+
writtenRange: Value[],
|
|
274
|
+
writtenNames: Value[],
|
|
275
|
+
) =>
|
|
276
|
+
setWrittenOrder(
|
|
277
|
+
createSortedRecord(
|
|
278
|
+
names,
|
|
279
|
+
writtenIndexes.map((index) => writtenRange[index]),
|
|
280
|
+
),
|
|
281
|
+
writtenNames,
|
|
282
|
+
);
|
|
271
283
|
|
|
272
284
|
const forgetWrittenOrder = (value: Value): void => {
|
|
273
285
|
if (typeof value !== "object" || (value.kind !== "Function" && value.kind !== "Set")) return;
|
|
@@ -277,6 +289,13 @@ const forgetWrittenOrder = (value: Value): void => {
|
|
|
277
289
|
value.range.forEach(forgetWrittenOrder);
|
|
278
290
|
};
|
|
279
291
|
|
|
292
|
+
// TLC's SetOfRcdsValue#member and SetOfFcnsValue#member normalize the record or function they check in place.
|
|
293
|
+
const forgetOwnWrittenOrder = (value: Value) => {
|
|
294
|
+
if (isWrittenOrderUsed && typeof value === "object" && value.kind === "Function") {
|
|
295
|
+
value.writtenKeys = undefined;
|
|
296
|
+
}
|
|
297
|
+
};
|
|
298
|
+
|
|
280
299
|
const isRecordDomain = (domain: Value[]) => domain.every((key) => typeof key === "string");
|
|
281
300
|
|
|
282
301
|
const isRecordMismatch = (left: Value[], right: Value[]) =>
|
|
@@ -339,16 +358,16 @@ const checkModelValueTypes = (left: Value, right: Value, isEquality: boolean) =>
|
|
|
339
358
|
if (isModelValue(left) && isModelValue(right)) {
|
|
340
359
|
if (leftType === undefined || rightType === undefined || leftType === rightType) return;
|
|
341
360
|
throw new TlaEvaluationError(
|
|
342
|
-
`Attempted to ${action} the differently-typed model values ${formatValue(left)} and ${formatValue(right)}`,
|
|
361
|
+
`Attempted to ${action} the differently-typed model values ${prettyPrint(formatValue(left))} and ${prettyPrint(formatValue(right))}`,
|
|
343
362
|
);
|
|
344
363
|
}
|
|
345
364
|
if (leftType !== undefined) {
|
|
346
365
|
throw new TlaEvaluationError(
|
|
347
|
-
`Attempted to ${action}${isEquality ? "" : " the"} typed model value ${formatValue(left)} and non-model value\n${formatValue(right)}`,
|
|
366
|
+
`Attempted to ${action}${isEquality ? "" : " the"} typed model value ${prettyPrint(formatValue(left))} and non-model value\n${prettyPrint(formatValue(right))}`,
|
|
348
367
|
);
|
|
349
368
|
}
|
|
350
369
|
throw new TlaEvaluationError(
|
|
351
|
-
`Attempted to ${action} the typed model value ${formatValue(right)} and the non-model value\n${formatValue(left)}`,
|
|
370
|
+
`Attempted to ${action} the typed model value ${prettyPrint(formatValue(right))} and the non-model value\n${prettyPrint(formatValue(left))}`,
|
|
352
371
|
);
|
|
353
372
|
};
|
|
354
373
|
|
|
@@ -359,18 +378,17 @@ interface StringOrder {
|
|
|
359
378
|
unorderedString: string | undefined;
|
|
360
379
|
}
|
|
361
380
|
|
|
362
|
-
const
|
|
381
|
+
const createStringOrder = (): StringOrder => ({
|
|
363
382
|
ranks: Object.create(null),
|
|
364
383
|
size: 0,
|
|
365
384
|
searchRank: undefined,
|
|
366
385
|
unorderedString: undefined,
|
|
367
|
-
};
|
|
386
|
+
});
|
|
387
|
+
|
|
388
|
+
const stringOrder = createStringOrder();
|
|
368
389
|
|
|
369
390
|
export const setStringOrder = (texts: Iterable<string>) => {
|
|
370
|
-
|
|
371
|
-
stringOrder.size = 0;
|
|
372
|
-
stringOrder.searchRank = undefined;
|
|
373
|
-
stringOrder.unorderedString = undefined;
|
|
391
|
+
Object.assign(stringOrder, createStringOrder());
|
|
374
392
|
modelValues.clear();
|
|
375
393
|
for (const text of texts) rankString(text);
|
|
376
394
|
};
|
|
@@ -454,7 +472,7 @@ const isOverriddenComparison = (left: Value, right: Value) =>
|
|
|
454
472
|
const createComparisonError = (left: Value, right: Value) =>
|
|
455
473
|
new TlaEvaluationError(
|
|
456
474
|
isOverriddenSet(left)
|
|
457
|
-
? `Attempted to compare overridden value ${formatValue(left, true)} with non-overridden value:\n${formatValue(right)}`
|
|
475
|
+
? `Attempted to compare overridden value ${prettyPrint(formatValue(left, true))} with non-overridden value:\n${prettyPrint(formatValue(right))}`
|
|
458
476
|
: `Attempted to compare ${describeKind(left)} ${formatValue(left)} with ${describeKind(right)} ${formatValue(right)}`,
|
|
459
477
|
);
|
|
460
478
|
|
|
@@ -465,7 +483,7 @@ const compareOverriddenSets = (
|
|
|
465
483
|
) => {
|
|
466
484
|
if (!isOverriddenSet(left)) {
|
|
467
485
|
throw new TlaEvaluationError(
|
|
468
|
-
`Attempted to ${verb} the set ${formatValue(isEnumerable(left) ? toFiniteSet(left) : left, true)} with the value:\n${formatValue(right, true)}`,
|
|
486
|
+
`Attempted to ${verb} the set ${prettyPrint(formatValue(isEnumerable(left) ? toFiniteSet(left) : left, true))} with the value:\n${prettyPrint(formatValue(right, true))}`,
|
|
469
487
|
);
|
|
470
488
|
}
|
|
471
489
|
if (!isOverriddenSet(right)) throw createComparisonError(left, right);
|
|
@@ -476,14 +494,16 @@ const compareOverriddenSets = (
|
|
|
476
494
|
return leftName === "Nat" ? -1 : 1;
|
|
477
495
|
}
|
|
478
496
|
throw new TlaModuleError(
|
|
479
|
-
`Attempted to compare ${formatValue(left, true)} with the value\n${formatValue(right, true)}`,
|
|
497
|
+
`Attempted to compare ${prettyPrint(formatValue(left, true))} with the value\n${prettyPrint(formatValue(right, true))}`,
|
|
480
498
|
);
|
|
481
499
|
};
|
|
482
500
|
|
|
483
501
|
export const ANY_SET: InfiniteSetValue = { kind: "InfiniteSet", name: "Any" };
|
|
484
502
|
|
|
485
503
|
const compareAny = (other: Value): never => {
|
|
486
|
-
throw new TlaModuleError(
|
|
504
|
+
throw new TlaModuleError(
|
|
505
|
+
`Attempted to compare ANY with the value\n${prettyPrint(formatValue(other))}`,
|
|
506
|
+
);
|
|
487
507
|
};
|
|
488
508
|
|
|
489
509
|
const compareWithItself = (value: Value) => {
|
|
@@ -844,26 +864,11 @@ const toTlcRecord = (value: Value) => {
|
|
|
844
864
|
return isRecordDomain(functionValue.domain) ? functionValue : undefined;
|
|
845
865
|
};
|
|
846
866
|
|
|
847
|
-
const compareModelValueWith = (modelValue: ModelValue, other: Value) => {
|
|
848
|
-
checkModelValueTypes(other, modelValue,
|
|
867
|
+
const compareModelValueWith = (modelValue: ModelValue, other: Value, isEquality: boolean) => {
|
|
868
|
+
checkModelValueTypes(other, modelValue, isEquality);
|
|
849
869
|
return 1;
|
|
850
870
|
};
|
|
851
871
|
|
|
852
|
-
const equalsModelValueWith = (modelValue: ModelValue, other: Value) => {
|
|
853
|
-
checkModelValueTypes(other, modelValue, true);
|
|
854
|
-
return false;
|
|
855
|
-
};
|
|
856
|
-
|
|
857
|
-
const compareModelValue = (left: ModelValue, right: Value) => {
|
|
858
|
-
if (left.type !== undefined) checkModelValueTypes(left, right, false);
|
|
859
|
-
return isModelValue(right) ? left.rank - right.rank : -1;
|
|
860
|
-
};
|
|
861
|
-
|
|
862
|
-
const equalsModelValue = (left: ModelValue, right: Value) => {
|
|
863
|
-
if (left.type !== undefined) checkModelValueTypes(left, right, true);
|
|
864
|
-
return isModelValue(right) && left.name === right.name;
|
|
865
|
-
};
|
|
866
|
-
|
|
867
872
|
const SCALAR_KINDS = {
|
|
868
873
|
number: { name: "integer", other: "non-integer", equality: "check equality of" },
|
|
869
874
|
string: { name: "string", other: "non-string", equality: "check equality of" },
|
|
@@ -879,34 +884,43 @@ const describeScalarMismatch = (
|
|
|
879
884
|
SCALAR_KINDS[
|
|
880
885
|
typeof left === "number" ? "number" : typeof left === "string" ? "string" : "boolean"
|
|
881
886
|
];
|
|
882
|
-
return `Attempted to ${isEquality ? kind.equality : "compare"} ${kind.name} ${formatValue(left)} with ${kind.other}:\n${formatValue(right)}`;
|
|
887
|
+
return `Attempted to ${isEquality ? kind.equality : "compare"} ${kind.name} ${prettyPrint(formatValue(left))} with ${kind.other}:\n${prettyPrint(formatValue(right))}`;
|
|
883
888
|
};
|
|
884
889
|
|
|
885
|
-
const
|
|
890
|
+
const getComparisonVerb = (isEquality: boolean) => (isEquality ? "check equality of" : "compare");
|
|
891
|
+
|
|
892
|
+
const compareTlcFunctions = (
|
|
893
|
+
functionValue: TlcFunction,
|
|
894
|
+
left: Value,
|
|
895
|
+
right: Value,
|
|
896
|
+
isEquality: boolean,
|
|
897
|
+
) => {
|
|
886
898
|
const other = toTlcFunction(right);
|
|
887
899
|
if (!other) {
|
|
888
|
-
if (isModelValue(right)) return compareModelValueWith(right, left);
|
|
900
|
+
if (isModelValue(right)) return compareModelValueWith(right, left, isEquality);
|
|
889
901
|
throw new TlaEvaluationError(
|
|
890
|
-
`Attempted to
|
|
902
|
+
`Attempted to ${getComparisonVerb(isEquality)} the function ${prettyPrint(formatValue(left))} with the value:\n${prettyPrint(formatValue(right))}`,
|
|
891
903
|
);
|
|
892
904
|
}
|
|
893
905
|
if (functionValue.range.length !== other.range.length)
|
|
894
906
|
return functionValue.range.length - other.range.length;
|
|
895
|
-
const compareRanges = () => compareElementsLikeTlc(functionValue.range, other.range);
|
|
907
|
+
const compareRanges = () => compareElementsLikeTlc(functionValue.range, other.range, isEquality);
|
|
896
908
|
if (functionValue.low !== undefined && functionValue.range.length === 0) return 0;
|
|
897
909
|
if (functionValue.low !== undefined && other.low !== undefined) {
|
|
898
910
|
return functionValue.low === other.low ? compareRanges() : functionValue.low - other.low;
|
|
899
911
|
}
|
|
900
912
|
const intervalLow = functionValue.low ?? other.low;
|
|
901
913
|
if (intervalLow === undefined) {
|
|
902
|
-
return
|
|
914
|
+
return (
|
|
915
|
+
compareElementsLikeTlc(functionValue.domain, other.domain, isEquality) || compareRanges()
|
|
916
|
+
);
|
|
903
917
|
}
|
|
904
918
|
const keys = functionValue.low === undefined ? functionValue.domain : other.domain;
|
|
905
919
|
for (let index = 0; index < keys.length; index++) {
|
|
906
920
|
const key = keys[index];
|
|
907
921
|
if (typeof key !== "number") {
|
|
908
922
|
throw new TlaEvaluationError(
|
|
909
|
-
`Attempted to compare integer with non-integer${functionValue.low
|
|
923
|
+
`Attempted to compare ${isEquality ? "an " : ""}integer with non-integer${isEquality || functionValue.low !== undefined ? ":" : ""}\n${prettyPrint(formatValue(key))}.`,
|
|
910
924
|
);
|
|
911
925
|
}
|
|
912
926
|
const difference =
|
|
@@ -916,42 +930,47 @@ const compareTlcFunctions = (functionValue: TlcFunction, left: Value, right: Val
|
|
|
916
930
|
return compareRanges();
|
|
917
931
|
};
|
|
918
932
|
|
|
919
|
-
const compareElementsLikeTlc = (left: Value[], right: Value[]) => {
|
|
933
|
+
const compareElementsLikeTlc = (left: Value[], right: Value[], isEquality: boolean) => {
|
|
920
934
|
for (let index = 0; index < left.length; index++) {
|
|
921
|
-
const comparison =
|
|
935
|
+
const comparison = compareOrEqualLikeTlc(left[index], right[index], isEquality);
|
|
922
936
|
if (comparison !== 0) return comparison;
|
|
923
937
|
}
|
|
924
938
|
return 0;
|
|
925
939
|
};
|
|
926
940
|
|
|
927
|
-
const compareFunctionLikeTlc = (
|
|
941
|
+
const compareFunctionLikeTlc = (
|
|
942
|
+
left: FunctionValue | LazyFunctionValue,
|
|
943
|
+
right: Value,
|
|
944
|
+
isEquality: boolean,
|
|
945
|
+
) => {
|
|
928
946
|
const functionValue = toFiniteFunction(left);
|
|
929
947
|
if (getFunctionClass(left) === "tuple") {
|
|
930
948
|
const tuple = isFunctionValue(right) ? getSequenceElements(right) : undefined;
|
|
931
|
-
if (!tuple) return compareTlcFunctions({ ...functionValue, low: 1 }, left, right);
|
|
949
|
+
if (!tuple) return compareTlcFunctions({ ...functionValue, low: 1 }, left, right, isEquality);
|
|
932
950
|
return (
|
|
933
951
|
functionValue.range.length - tuple.length ||
|
|
934
|
-
compareElementsLikeTlc(functionValue.range, tuple)
|
|
952
|
+
compareElementsLikeTlc(functionValue.range, tuple, isEquality)
|
|
935
953
|
);
|
|
936
954
|
}
|
|
937
955
|
if (getFunctionClass(left) === "record") {
|
|
938
956
|
const record = toTlcRecord(right);
|
|
939
957
|
if (!record) {
|
|
940
|
-
if (isModelValue(right)) return compareModelValueWith(right, left);
|
|
958
|
+
if (isModelValue(right)) return compareModelValueWith(right, left, isEquality);
|
|
941
959
|
throw new TlaEvaluationError(
|
|
942
|
-
`Attempted to
|
|
960
|
+
`Attempted to ${getComparisonVerb(isEquality)} record:\n${prettyPrint(formatValue(left))}\nwith non-record\n${prettyPrint(formatValue(right))}`,
|
|
943
961
|
);
|
|
944
962
|
}
|
|
945
963
|
return (
|
|
946
964
|
functionValue.domain.length - record.domain.length ||
|
|
947
|
-
compareElementsLikeTlc(functionValue.domain, record.domain) ||
|
|
948
|
-
compareElementsLikeTlc(functionValue.range, record.range)
|
|
965
|
+
compareElementsLikeTlc(functionValue.domain, record.domain, isEquality) ||
|
|
966
|
+
compareElementsLikeTlc(functionValue.range, record.range, isEquality)
|
|
949
967
|
);
|
|
950
968
|
}
|
|
951
969
|
return compareTlcFunctions(
|
|
952
970
|
{ ...functionValue, low: getIntervalLow(left, functionValue.domain) },
|
|
953
971
|
left,
|
|
954
972
|
right,
|
|
973
|
+
isEquality,
|
|
955
974
|
);
|
|
956
975
|
};
|
|
957
976
|
|
|
@@ -971,128 +990,47 @@ const getSetElementsLikeTlc = (left: SetValue | MixedSetValue, right: Value) =>
|
|
|
971
990
|
return { elements: toFiniteSet(left).elements, otherElements: toFiniteSet(other).elements };
|
|
972
991
|
};
|
|
973
992
|
|
|
974
|
-
const compareSetLikeTlc = (left: ObjectValue, right: Value): number => {
|
|
975
|
-
if (isComparedByClass(left, right))
|
|
976
|
-
|
|
993
|
+
const compareSetLikeTlc = (left: ObjectValue, right: Value, isEquality: boolean): number => {
|
|
994
|
+
if (isComparedByClass(left, right)) {
|
|
995
|
+
if (!isEquality) return compareValues(left, right);
|
|
996
|
+
return valuesEqual(left, right) ? 0 : 1;
|
|
997
|
+
}
|
|
998
|
+
if (!isEnumeratedSet(left)) return compareSetLikeTlc(toFiniteSet(left), right, isEquality);
|
|
977
999
|
if (!isSetValue(right)) {
|
|
978
|
-
if (isModelValue(right)) return compareModelValueWith(right, left);
|
|
1000
|
+
if (isModelValue(right)) return compareModelValueWith(right, left, isEquality);
|
|
979
1001
|
throw new TlaEvaluationError(
|
|
980
|
-
`Attempted to
|
|
1002
|
+
`Attempted to ${getComparisonVerb(isEquality)} the set ${prettyPrint(formatValue(left))} with the value:\n${prettyPrint(formatValue(right))}`,
|
|
981
1003
|
);
|
|
982
1004
|
}
|
|
983
1005
|
const sets = getSetElementsLikeTlc(left, right);
|
|
984
1006
|
return (
|
|
985
1007
|
sets.elements.length - sets.otherElements.length ||
|
|
986
|
-
compareElementsLikeTlc(sets.elements, sets.otherElements)
|
|
1008
|
+
compareElementsLikeTlc(sets.elements, sets.otherElements, isEquality)
|
|
987
1009
|
);
|
|
988
1010
|
};
|
|
989
1011
|
|
|
990
|
-
const
|
|
1012
|
+
const compareOrEqualLikeTlc = (left: Value, right: Value, isEquality: boolean): number => {
|
|
991
1013
|
if (typeof left !== "object") {
|
|
992
|
-
if (typeof right === typeof left)
|
|
993
|
-
|
|
994
|
-
|
|
995
|
-
}
|
|
996
|
-
if (left.kind === "ModelValue") return compareModelValue(left, right);
|
|
997
|
-
if (isFunctionValue(left)) return compareFunctionLikeTlc(left, right);
|
|
998
|
-
return compareSetLikeTlc(left, right);
|
|
999
|
-
};
|
|
1000
|
-
|
|
1001
|
-
const equalsElementsLikeTlc = (left: Value[], right: Value[]) =>
|
|
1002
|
-
left.every((element, index) => equalsLikeTlc(element, right[index]));
|
|
1003
|
-
|
|
1004
|
-
const equalsTlcFunctions = (functionValue: TlcFunction, left: Value, right: Value) => {
|
|
1005
|
-
const other = toTlcFunction(right);
|
|
1006
|
-
if (!other) {
|
|
1007
|
-
if (isModelValue(right)) return equalsModelValueWith(right, left);
|
|
1008
|
-
throw new TlaEvaluationError(
|
|
1009
|
-
`Attempted to check equality of the function ${formatValue(left)} with the value:\n${formatValue(right)}`,
|
|
1010
|
-
);
|
|
1011
|
-
}
|
|
1012
|
-
if (functionValue.range.length !== other.range.length) return false;
|
|
1013
|
-
if (functionValue.low !== undefined && other.low !== undefined) {
|
|
1014
|
-
return (
|
|
1015
|
-
(functionValue.range.length === 0 || functionValue.low === other.low) &&
|
|
1016
|
-
equalsElementsLikeTlc(functionValue.range, other.range)
|
|
1017
|
-
);
|
|
1018
|
-
}
|
|
1019
|
-
const intervalLow = functionValue.low ?? other.low;
|
|
1020
|
-
if (intervalLow === undefined) {
|
|
1021
|
-
return (
|
|
1022
|
-
equalsElementsLikeTlc(functionValue.domain, other.domain) &&
|
|
1023
|
-
equalsElementsLikeTlc(functionValue.range, other.range)
|
|
1024
|
-
);
|
|
1025
|
-
}
|
|
1026
|
-
const keys = functionValue.low === undefined ? functionValue.domain : other.domain;
|
|
1027
|
-
return (
|
|
1028
|
-
keys.every((key, index) => {
|
|
1029
|
-
if (typeof key !== "number") {
|
|
1030
|
-
throw new TlaEvaluationError(
|
|
1031
|
-
`Attempted to compare an integer with non-integer:\n${formatValue(key)}.`,
|
|
1032
|
-
);
|
|
1033
|
-
}
|
|
1034
|
-
return key === intervalLow + index;
|
|
1035
|
-
}) && equalsElementsLikeTlc(functionValue.range, other.range)
|
|
1036
|
-
);
|
|
1037
|
-
};
|
|
1038
|
-
|
|
1039
|
-
const equalsFunctionLikeTlc = (left: FunctionValue | LazyFunctionValue, right: Value) => {
|
|
1040
|
-
const functionValue = toFiniteFunction(left);
|
|
1041
|
-
if (getFunctionClass(left) === "tuple") {
|
|
1042
|
-
const tuple = isFunctionValue(right) ? getSequenceElements(right) : undefined;
|
|
1043
|
-
if (!tuple) return equalsTlcFunctions({ ...functionValue, low: 1 }, left, right);
|
|
1044
|
-
return (
|
|
1045
|
-
functionValue.range.length === tuple.length &&
|
|
1046
|
-
equalsElementsLikeTlc(functionValue.range, tuple)
|
|
1047
|
-
);
|
|
1048
|
-
}
|
|
1049
|
-
if (getFunctionClass(left) === "record") {
|
|
1050
|
-
const record = toTlcRecord(right);
|
|
1051
|
-
if (!record) {
|
|
1052
|
-
if (isModelValue(right)) return equalsModelValueWith(right, left);
|
|
1053
|
-
throw new TlaEvaluationError(
|
|
1054
|
-
`Attempted to check equality of record:\n${formatValue(left)}\nwith non-record\n${formatValue(right)}`,
|
|
1055
|
-
);
|
|
1014
|
+
if (typeof right === typeof left) {
|
|
1015
|
+
if (!isEquality) return compareValues(left, right);
|
|
1016
|
+
return left === right ? 0 : 1;
|
|
1056
1017
|
}
|
|
1057
|
-
return (
|
|
1058
|
-
|
|
1059
|
-
equalsElementsLikeTlc(functionValue.domain, record.domain) &&
|
|
1060
|
-
equalsElementsLikeTlc(functionValue.range, record.range)
|
|
1061
|
-
);
|
|
1018
|
+
if (isModelValue(right)) return compareModelValueWith(right, left, isEquality);
|
|
1019
|
+
throw new TlaEvaluationError(describeScalarMismatch(left, right, isEquality));
|
|
1062
1020
|
}
|
|
1063
|
-
|
|
1064
|
-
|
|
1065
|
-
|
|
1066
|
-
right
|
|
1067
|
-
|
|
1068
|
-
};
|
|
1069
|
-
|
|
1070
|
-
const equalsSetLikeTlc = (left: ObjectValue, right: Value): boolean => {
|
|
1071
|
-
if (isComparedByClass(left, right)) return valuesEqual(left, right);
|
|
1072
|
-
if (!isEnumeratedSet(left)) return equalsSetLikeTlc(toFiniteSet(left), right);
|
|
1073
|
-
if (!isSetValue(right)) {
|
|
1074
|
-
if (isModelValue(right)) return equalsModelValueWith(right, left);
|
|
1075
|
-
throw new TlaEvaluationError(
|
|
1076
|
-
`Attempted to check equality of the set ${formatValue(left)} with the value:\n${formatValue(right)}`,
|
|
1077
|
-
);
|
|
1021
|
+
if (left.kind === "ModelValue") {
|
|
1022
|
+
if (left.type !== undefined) checkModelValueTypes(left, right, isEquality);
|
|
1023
|
+
if (!isModelValue(right)) return -1;
|
|
1024
|
+
if (!isEquality) return left.rank - right.rank;
|
|
1025
|
+
return left.name === right.name ? 0 : 1;
|
|
1078
1026
|
}
|
|
1079
|
-
|
|
1080
|
-
return (
|
|
1081
|
-
sets.elements.length === sets.otherElements.length &&
|
|
1082
|
-
equalsElementsLikeTlc(sets.elements, sets.otherElements)
|
|
1083
|
-
);
|
|
1027
|
+
if (isFunctionValue(left)) return compareFunctionLikeTlc(left, right, isEquality);
|
|
1028
|
+
return compareSetLikeTlc(left, right, isEquality);
|
|
1084
1029
|
};
|
|
1085
1030
|
|
|
1086
|
-
const
|
|
1087
|
-
|
|
1088
|
-
|
|
1089
|
-
if (isModelValue(right)) return equalsModelValueWith(right, left);
|
|
1090
|
-
throw new TlaEvaluationError(describeScalarMismatch(left, right, true));
|
|
1091
|
-
}
|
|
1092
|
-
if (left.kind === "ModelValue") return equalsModelValue(left, right);
|
|
1093
|
-
if (isFunctionValue(left)) return equalsFunctionLikeTlc(left, right);
|
|
1094
|
-
return equalsSetLikeTlc(left, right);
|
|
1095
|
-
};
|
|
1031
|
+
const compareLikeTlc = (left: Value, right: Value) => compareOrEqualLikeTlc(left, right, false);
|
|
1032
|
+
|
|
1033
|
+
const equalsLikeTlc = (left: Value, right: Value) => compareOrEqualLikeTlc(left, right, true) === 0;
|
|
1096
1034
|
|
|
1097
1035
|
const sortLikeTlc = (elements: Value[]) => {
|
|
1098
1036
|
const sorted: Value[] = [];
|
|
@@ -1140,6 +1078,7 @@ export const markNormalized = (value: Value): void => {
|
|
|
1140
1078
|
value.elements.forEach(markNormalized);
|
|
1141
1079
|
}
|
|
1142
1080
|
if (value.kind === "Function") {
|
|
1081
|
+
value.writtenKeys = undefined;
|
|
1143
1082
|
value.domain.forEach(markNormalized);
|
|
1144
1083
|
value.range.forEach(markNormalized);
|
|
1145
1084
|
}
|
|
@@ -1413,7 +1352,7 @@ const getUnionSet = (set: Value, index: number, union: UnionValue) => {
|
|
|
1413
1352
|
throw new TlaEvaluationError(
|
|
1414
1353
|
index === 0
|
|
1415
1354
|
? "Attempted to enumerate UNION(s), but some element of s is nonenumerable."
|
|
1416
|
-
: `Attempted to enumerate the nonenumerable set:\n${formatValue(set)}\nwhen enumerating:\n${formatUnion(union)}`,
|
|
1355
|
+
: `Attempted to enumerate the nonenumerable set:\n${prettyPrint(formatValue(set))}\nwhen enumerating:\n${prettyPrint(formatUnion(union))}`,
|
|
1417
1356
|
);
|
|
1418
1357
|
};
|
|
1419
1358
|
|
|
@@ -1613,13 +1552,13 @@ const enumerateSet = (
|
|
|
1613
1552
|
if (!isVersion174 && isEmptySet(value)) return [];
|
|
1614
1553
|
if (isOverriddenSet(value.domain)) {
|
|
1615
1554
|
throw new TlaEvaluationError(
|
|
1616
|
-
`Attempted to enumerate a set of the form [D -> R],but the domain D:\n${formatValue(value.domain)}\ncannot be enumerated.`,
|
|
1555
|
+
`Attempted to enumerate a set of the form [D -> R],but the domain D:\n${prettyPrint(formatValue(value.domain))}\ncannot be enumerated.`,
|
|
1617
1556
|
);
|
|
1618
1557
|
}
|
|
1619
1558
|
const domain = getFunctionDomain(value.domain);
|
|
1620
1559
|
if ((domain.length > 0 || isVersion174) && isOverriddenSet(value.range)) {
|
|
1621
1560
|
throw new TlaEvaluationError(
|
|
1622
|
-
`Attempted to enumerate a set of the form [D -> R],but the range R:\n${formatValue(value.range)}\ncannot be enumerated.`,
|
|
1561
|
+
`Attempted to enumerate a set of the form [D -> R],but the range R:\n${prettyPrint(formatValue(value.range))}\ncannot be enumerated.`,
|
|
1623
1562
|
);
|
|
1624
1563
|
}
|
|
1625
1564
|
const range = domain.length === 0 ? [] : getElements(value.range);
|
|
@@ -1633,7 +1572,7 @@ const enumerateSet = (
|
|
|
1633
1572
|
value.sets,
|
|
1634
1573
|
getElements,
|
|
1635
1574
|
(set, index) =>
|
|
1636
|
-
`Attempted to enumerate a set of the form [l1 : v1, ..., ln : vn],\nbut can't enumerate the value of the \`${value.names[index]}' field:\n${formatValue(set)}`,
|
|
1575
|
+
`Attempted to enumerate a set of the form [l1 : v1, ..., ln : vn],\nbut can't enumerate the value of the \`${value.names[index]}' field:\n${prettyPrint(formatValue(set))}`,
|
|
1637
1576
|
);
|
|
1638
1577
|
return getCartesianProduct(fields).map((combination) =>
|
|
1639
1578
|
createRecord(value.names.map((name, index): [string, Value] => [name, combination[index]])),
|
|
@@ -1645,19 +1584,21 @@ const enumerateSet = (
|
|
|
1645
1584
|
value.factors,
|
|
1646
1585
|
getElements,
|
|
1647
1586
|
(factor, index) =>
|
|
1648
|
-
`Attempted to enumerate a set of the form s1 \\X s2 ... \\X sn,\nbut can't enumerate s${index}:\n${formatValue(factor)}`,
|
|
1587
|
+
`Attempted to enumerate a set of the form s1 \\X s2 ... \\X sn,\nbut can't enumerate s${index}:\n${prettyPrint(formatValue(factor))}`,
|
|
1649
1588
|
);
|
|
1650
1589
|
return getCartesianProduct(factors).map(createTuple);
|
|
1651
1590
|
}
|
|
1652
1591
|
case "FilteredSet":
|
|
1653
1592
|
if (!isSetValue(value.base) || isOverriddenSet(value.base)) {
|
|
1654
1593
|
throw new TlaEvaluationError(
|
|
1655
|
-
`Attempted to enumerate { x \\in S : p(x) } when S:\n${formatValue(value.base)}\nis not enumerable`,
|
|
1594
|
+
`Attempted to enumerate { x \\in S : p(x) } when S:\n${prettyPrint(formatValue(value.base))}\nis not enumerable`,
|
|
1656
1595
|
);
|
|
1657
1596
|
}
|
|
1658
1597
|
return toFiniteSet(
|
|
1659
1598
|
createEnumeratedSet(
|
|
1660
|
-
getStreamedElements(value.base).filter(
|
|
1599
|
+
getStreamedElements(value.base).filter(
|
|
1600
|
+
value.startPass?.(true) ?? ((element) => value.test(element, false)),
|
|
1601
|
+
),
|
|
1661
1602
|
),
|
|
1662
1603
|
).elements;
|
|
1663
1604
|
case "Union": {
|
|
@@ -1676,12 +1617,12 @@ const enumerateSet = (
|
|
|
1676
1617
|
!isTlcEnumerable(value.right)
|
|
1677
1618
|
) {
|
|
1678
1619
|
throw new TlaEvaluationError(
|
|
1679
|
-
`Attempted to enumerate S \\cap T when neither S:\n${formatValue(value.left)}\nnor T:\n${formatValue(value.right)}\nis enumerable`,
|
|
1620
|
+
`Attempted to enumerate S \\cap T when neither S:\n${prettyPrint(formatValue(value.left))}\nnor T:\n${prettyPrint(formatValue(value.right))}\nis enumerable`,
|
|
1680
1621
|
);
|
|
1681
1622
|
}
|
|
1682
1623
|
if (value.operator === "\\" && !isTlcEnumerable(value.left)) {
|
|
1683
1624
|
throw new TlaEvaluationError(
|
|
1684
|
-
`Attempted to enumerate S \\ T when S:\n${formatValue(value.left)}\nis not enumerable.`,
|
|
1625
|
+
`Attempted to enumerate S \\ T when S:\n${prettyPrint(formatValue(value.left))}\nis not enumerable.`,
|
|
1685
1626
|
);
|
|
1686
1627
|
}
|
|
1687
1628
|
if (value.operator === "\\cup") {
|
|
@@ -1772,7 +1713,7 @@ const openStream = (value: Value): void => {
|
|
|
1772
1713
|
const listUnionLikeTlc = (union: SetOperationValue) => {
|
|
1773
1714
|
if (!isTlcEnumerable(union.left) || !isTlcEnumerable(union.right)) {
|
|
1774
1715
|
throw new TlaEvaluationError(
|
|
1775
|
-
`Attempted to enumerate S \\cup T when S:\n${formatValue(union.left)}\nand T:\n${formatValue(union.right)}\nare not both enumerable`,
|
|
1716
|
+
`Attempted to enumerate S \\cup T when S:\n${prettyPrint(formatValue(union.left))}\nand T:\n${prettyPrint(formatValue(union.right))}\nare not both enumerable`,
|
|
1776
1717
|
);
|
|
1777
1718
|
}
|
|
1778
1719
|
openStream(union.left);
|
|
@@ -1883,6 +1824,8 @@ const someElementOfStream = (value: ObjectValue, visit: (element: Value) => bool
|
|
|
1883
1824
|
);
|
|
1884
1825
|
}
|
|
1885
1826
|
if (value.kind === "FilteredSet" && isTlcEnumerable(value.base)) {
|
|
1827
|
+
const test = value.startPass?.(false);
|
|
1828
|
+
if (test) return someStreamedElement(value.base, (element) => test(element) && visit(element));
|
|
1886
1829
|
return someStreamedElement(
|
|
1887
1830
|
value.base,
|
|
1888
1831
|
(element) => value.test(element, false) && visit(element),
|
|
@@ -1910,6 +1853,7 @@ const someElementOfStream = (value: ObjectValue, visit: (element: Value) => bool
|
|
|
1910
1853
|
|
|
1911
1854
|
export const isEmptySet = (value: Value): boolean => {
|
|
1912
1855
|
if (typeof value !== "object" || !isSetValue(value)) {
|
|
1856
|
+
setTrace.sets?.push(value);
|
|
1913
1857
|
throw new TlaEvaluationError(`Shouldn't call isEmpty() on value ${formatValue(value)}`);
|
|
1914
1858
|
}
|
|
1915
1859
|
switch (value.kind) {
|
|
@@ -1951,18 +1895,18 @@ const getProductCardinality = (
|
|
|
1951
1895
|
}, 1);
|
|
1952
1896
|
|
|
1953
1897
|
const describeOverflow = (value: Value) =>
|
|
1954
|
-
`Overflow when computing the number of elements in:\n${formatValue(value)}`;
|
|
1898
|
+
`Overflow when computing the number of elements in:\n${prettyPrint(formatValue(value))}`;
|
|
1955
1899
|
|
|
1956
1900
|
export const getCardinality = (value: Value, version?: TlcVersion): number => {
|
|
1957
1901
|
if (typeof value !== "object") {
|
|
1958
1902
|
throw new TlaEvaluationError(
|
|
1959
|
-
`Attempted to compute the number of elements in the ${describeKind(value)} ${formatValue(value)}.`,
|
|
1903
|
+
`Attempted to compute the number of elements in the ${describeKind(value)} ${prettyPrint(formatValue(value))}.`,
|
|
1960
1904
|
);
|
|
1961
1905
|
}
|
|
1962
1906
|
switch (value.kind) {
|
|
1963
1907
|
case "ModelValue":
|
|
1964
1908
|
throw new TlaEvaluationError(
|
|
1965
|
-
`Attempted to compute the number of elements in the model value ${formatValue(value)}.`,
|
|
1909
|
+
`Attempted to compute the number of elements in the model value ${prettyPrint(formatValue(value))}.`,
|
|
1966
1910
|
);
|
|
1967
1911
|
case "Function":
|
|
1968
1912
|
return value.domain.length;
|
|
@@ -1980,7 +1924,7 @@ export const getCardinality = (value: Value, version?: TlcVersion): number => {
|
|
|
1980
1924
|
case "InfiniteSet":
|
|
1981
1925
|
case "SequenceSet":
|
|
1982
1926
|
throw new TlaEvaluationError(
|
|
1983
|
-
`Attempted to compute the number of elements in the overridden value ${formatValue(value)}.`,
|
|
1927
|
+
`Attempted to compute the number of elements in the overridden value ${prettyPrint(formatValue(value))}.`,
|
|
1984
1928
|
);
|
|
1985
1929
|
case "Subset": {
|
|
1986
1930
|
const size = getCardinality(value.base, version);
|
|
@@ -2011,7 +1955,8 @@ export const getCardinality = (value: Value, version?: TlcVersion): number => {
|
|
|
2011
1955
|
return getProductCardinality(
|
|
2012
1956
|
value.factors,
|
|
2013
1957
|
version,
|
|
2014
|
-
() =>
|
|
1958
|
+
() =>
|
|
1959
|
+
`Overflow when computing the number of elements in ${prettyPrint(formatValue(value))}`,
|
|
2015
1960
|
);
|
|
2016
1961
|
default:
|
|
2017
1962
|
cacheSet(value);
|
|
@@ -2020,12 +1965,12 @@ export const getCardinality = (value: Value, version?: TlcVersion): number => {
|
|
|
2020
1965
|
};
|
|
2021
1966
|
|
|
2022
1967
|
const describeInfiniteCheck = (value: Value) =>
|
|
2023
|
-
`Attempted to check if the set ${formatValue(value)}is finite.`;
|
|
1968
|
+
`Attempted to check if the set ${prettyPrint(formatValue(value))}is finite.`;
|
|
2024
1969
|
|
|
2025
1970
|
export const isFiniteSet = (value: Value): boolean => {
|
|
2026
1971
|
if (typeof value !== "object" || value.kind === "ModelValue") {
|
|
2027
1972
|
throw new TlaEvaluationError(
|
|
2028
|
-
`Attempted to check if the ${describeKind(value)} ${formatValue(value)} is a finite set.`,
|
|
1973
|
+
`Attempted to check if the ${describeKind(value)} ${prettyPrint(formatValue(value))} is a finite set.`,
|
|
2029
1974
|
);
|
|
2030
1975
|
}
|
|
2031
1976
|
switch (value.kind) {
|
|
@@ -2036,7 +1981,7 @@ export const isFiniteSet = (value: Value): boolean => {
|
|
|
2036
1981
|
return true;
|
|
2037
1982
|
case "LazyFunction":
|
|
2038
1983
|
throw new TlaEvaluationError(
|
|
2039
|
-
`Attempted to check if the function:\n${formatValue(value)}\nis a finite set.`,
|
|
1984
|
+
`Attempted to check if the function:\n${prettyPrint(formatValue(value))}\nis a finite set.`,
|
|
2040
1985
|
);
|
|
2041
1986
|
case "InfiniteSet":
|
|
2042
1987
|
return false;
|
|
@@ -2082,7 +2027,7 @@ export const isFiniteSet = (value: Value): boolean => {
|
|
|
2082
2027
|
case "FilteredSet":
|
|
2083
2028
|
if (!isFiniteSet(value.base)) {
|
|
2084
2029
|
throw new TlaEvaluationError(
|
|
2085
|
-
`Attempted to check if expression of form {x \\in S : p(x)} is a finite set, but cannot check if S:\n${formatValue(value.base)}\nis finite.`,
|
|
2030
|
+
`Attempted to check if expression of form {x \\in S : p(x)} is a finite set, but cannot check if S:\n${prettyPrint(formatValue(value.base))}\nis finite.`,
|
|
2086
2031
|
);
|
|
2087
2032
|
}
|
|
2088
2033
|
return true;
|
|
@@ -2136,14 +2081,15 @@ export const getSequenceElements = (value: Value): Value[] | undefined => {
|
|
|
2136
2081
|
};
|
|
2137
2082
|
|
|
2138
2083
|
const describeNonSetMembership = (element: Value, value: Value) => {
|
|
2139
|
-
const prefix = `Attempted to check if the value:\n${formatValue(element)}\nis an element of the`;
|
|
2140
|
-
if (!isFunctionValue(value))
|
|
2084
|
+
const prefix = `Attempted to check if the value:\n${prettyPrint(formatValue(element))}\nis an element of the`;
|
|
2085
|
+
if (!isFunctionValue(value))
|
|
2086
|
+
return `${prefix} ${describeKind(value)} ${prettyPrint(formatValue(value))}`;
|
|
2141
2087
|
const functionClass = getFunctionClass(value);
|
|
2142
2088
|
if (functionClass === "record") {
|
|
2143
|
-
return `Attempted to check if element:\n${formatValue(element)}\nis in the record:\n${formatValue(value)}`;
|
|
2089
|
+
return `Attempted to check if element:\n${prettyPrint(formatValue(element))}\nis in the record:\n${prettyPrint(formatValue(value))}`;
|
|
2144
2090
|
}
|
|
2145
2091
|
if (functionClass === "tuple") return "Attempted to check set membership in a tuple value.";
|
|
2146
|
-
return `${prefix} function ${formatValue(value)}`;
|
|
2092
|
+
return `${prefix} function ${prettyPrint(formatValue(value))}`;
|
|
2147
2093
|
};
|
|
2148
2094
|
|
|
2149
2095
|
interface TracedCallStack {
|
|
@@ -2249,7 +2195,7 @@ const isElementOfAnySet = (element: Value, set: Value): boolean => {
|
|
|
2249
2195
|
if (typeof element === "number") return element >= set.low && element <= set.high;
|
|
2250
2196
|
if (set.low <= set.high && (!isModelValue(element) || element.type !== undefined)) {
|
|
2251
2197
|
throw new TlaEvaluationError(
|
|
2252
|
-
`Attempted to check if the value:\n${formatValue(element)}\nis in the integer interval ${formatValue(set)}`,
|
|
2198
|
+
`Attempted to check if the value:\n${prettyPrint(formatValue(element))}\nis in the integer interval ${prettyPrint(formatValue(set))}`,
|
|
2253
2199
|
);
|
|
2254
2200
|
}
|
|
2255
2201
|
return false;
|
|
@@ -2260,7 +2206,7 @@ const isElementOfAnySet = (element: Value, set: Value): boolean => {
|
|
|
2260
2206
|
set.name === "STRING" ? typeof element === "string" : typeof element === "number";
|
|
2261
2207
|
if (!isMemberType) {
|
|
2262
2208
|
throw new TlaModuleError(
|
|
2263
|
-
`Attempted to check if the value:\n${formatValue(element)}\nis an element of ${set.name}.`,
|
|
2209
|
+
`Attempted to check if the value:\n${prettyPrint(formatValue(element))}\nis an element of ${set.name}.`,
|
|
2264
2210
|
);
|
|
2265
2211
|
}
|
|
2266
2212
|
return set.name !== "Nat" || (typeof element === "number" && element >= 0);
|
|
@@ -2279,6 +2225,7 @@ const isElementOfAnySet = (element: Value, set: Value): boolean => {
|
|
|
2279
2225
|
`Attempted to check if \n${formatValue(element)}\nwhich is not a TLC function value, is in the set of functions:\n${prettyPrint(formatValue(set))}`,
|
|
2280
2226
|
);
|
|
2281
2227
|
}
|
|
2228
|
+
forgetOwnWrittenOrder(element);
|
|
2282
2229
|
const functionValue = toFiniteFunction(element);
|
|
2283
2230
|
const low = getIntervalLow(element, functionValue.domain);
|
|
2284
2231
|
const isDomain =
|
|
@@ -2291,11 +2238,12 @@ const isElementOfAnySet = (element: Value, set: Value): boolean => {
|
|
|
2291
2238
|
return isDomain && functionValue.range.every((item) => isElementOf(item, set.range));
|
|
2292
2239
|
}
|
|
2293
2240
|
case "RecordSet": {
|
|
2241
|
+
forgetOwnWrittenOrder(element);
|
|
2294
2242
|
const functionValue = isFunctionValue(element) ? toFiniteFunction(element) : undefined;
|
|
2295
2243
|
if (!functionValue || !isRecordDomain(functionValue.domain)) {
|
|
2296
2244
|
if (isModelValue(element)) return isModelValueMember(element, set);
|
|
2297
2245
|
throw new TlaEvaluationError(
|
|
2298
|
-
`Attempted to check if non-record\n${formatValue(element)}\nis in the set of records:\n${formatValue(set)}`,
|
|
2246
|
+
`Attempted to check if non-record\n${formatValue(element)}\nis in the set of records:\n${prettyPrint(formatValue(set))}`,
|
|
2299
2247
|
);
|
|
2300
2248
|
}
|
|
2301
2249
|
return (
|
|
@@ -2315,7 +2263,7 @@ const isElementOfAnySet = (element: Value, set: Value): boolean => {
|
|
|
2315
2263
|
if (isModelValue(element)) return isModelValueMember(element, set);
|
|
2316
2264
|
if (isFunction) return false;
|
|
2317
2265
|
throw new TlaEvaluationError(
|
|
2318
|
-
`Attempted to check if non-tuple\n${formatValue(element)}\nis in the set of tuples:\n${formatValue(set)}`,
|
|
2266
|
+
`Attempted to check if non-tuple\n${prettyPrint(formatValue(element))}\nis in the set of tuples:\n${prettyPrint(formatValue(set))}`,
|
|
2319
2267
|
);
|
|
2320
2268
|
}
|
|
2321
2269
|
return (
|
|
@@ -2335,7 +2283,7 @@ const isElementOfAnySet = (element: Value, set: Value): boolean => {
|
|
|
2335
2283
|
case "Union": {
|
|
2336
2284
|
if (!isTlcEnumerable(set.base)) {
|
|
2337
2285
|
throw new TlaEvaluationError(
|
|
2338
|
-
`Attempted to check if:\n ${formatValue(element)}\nis an element of the non-enumerable set:\n ${formatUnion(set)}`,
|
|
2286
|
+
`Attempted to check if:\n ${prettyPrint(formatValue(element))}\nis an element of the non-enumerable set:\n ${prettyPrint(formatUnion(set))}`,
|
|
2339
2287
|
);
|
|
2340
2288
|
}
|
|
2341
2289
|
const sets = toFiniteSet(set.base).elements;
|
|
@@ -2394,12 +2342,9 @@ export const toFiniteFunction = (value: Value): FunctionValue => {
|
|
|
2394
2342
|
throw new TlaEvaluationError("The domains of formal parameters must be enumerable.");
|
|
2395
2343
|
}
|
|
2396
2344
|
const domain = getFunctionDomain(value.domain);
|
|
2397
|
-
value.enumerated =
|
|
2398
|
-
|
|
2399
|
-
|
|
2400
|
-
domain.map((key) => value.apply(key)),
|
|
2401
|
-
),
|
|
2402
|
-
getFunctionClass(value),
|
|
2345
|
+
value.enumerated = createSortedFunction(
|
|
2346
|
+
domain,
|
|
2347
|
+
domain.map((key) => value.apply(key)),
|
|
2403
2348
|
);
|
|
2404
2349
|
return value.enumerated;
|
|
2405
2350
|
}
|
|
@@ -2508,6 +2453,24 @@ const findKeyIndexLikeTlc = (
|
|
|
2508
2453
|
return computeLikeTlcOnFailure(findDomainIndex, failKeyLikeTlc, functionValue, argument);
|
|
2509
2454
|
};
|
|
2510
2455
|
|
|
2456
|
+
const describeBoundArgument = (
|
|
2457
|
+
functionValue: LazyFunctionValue,
|
|
2458
|
+
position: string,
|
|
2459
|
+
shown: Value,
|
|
2460
|
+
problem: string,
|
|
2461
|
+
) =>
|
|
2462
|
+
`In applying the function\n${prettyPrint(formatValue(functionValue))},\nthe ${position} is:\n${prettyPrint(formatValue(shown))}\nwhich ${problem}.\n`;
|
|
2463
|
+
|
|
2464
|
+
const createArgumentListError = (functionValue: LazyFunctionValue, argument: Value) =>
|
|
2465
|
+
new TlaEvaluationError(
|
|
2466
|
+
describeBoundArgument(
|
|
2467
|
+
functionValue,
|
|
2468
|
+
"argument list",
|
|
2469
|
+
argument,
|
|
2470
|
+
"does not match its formal parameter",
|
|
2471
|
+
),
|
|
2472
|
+
);
|
|
2473
|
+
|
|
2511
2474
|
// Deviation from TLC: FcnLambdaValue#apply indexes past an argument tuple shorter than the bounds and ignores a longer one, where this rejects the list.
|
|
2512
2475
|
const checkBoundArguments = (
|
|
2513
2476
|
functionValue: LazyFunctionValue,
|
|
@@ -2516,25 +2479,20 @@ const checkBoundArguments = (
|
|
|
2516
2479
|
) => {
|
|
2517
2480
|
const domain = functionValue.domain;
|
|
2518
2481
|
const elements = getSequenceElements(argument);
|
|
2519
|
-
|
|
2520
|
-
`In applying the function\n${prettyPrint(formatValue(functionValue))},\nthe ${position} is:\n${prettyPrint(formatValue(shown))}\nwhich ${problem}.\n`;
|
|
2521
|
-
const createListError = () =>
|
|
2522
|
-
new TlaEvaluationError(
|
|
2523
|
-
describe("argument list", argument, "does not match its formal parameter"),
|
|
2524
|
-
);
|
|
2525
|
-
if (elements === undefined) throw createListError();
|
|
2482
|
+
if (elements === undefined) throw createArgumentListError(functionValue, argument);
|
|
2526
2483
|
if (typeof domain !== "object" || domain.kind !== "ProductSet") {
|
|
2527
2484
|
throw new TlaEvaluationError(
|
|
2528
2485
|
`Attempted to apply a function to ${formatValue(argument)}, which is not in its domain`,
|
|
2529
2486
|
);
|
|
2530
2487
|
}
|
|
2531
2488
|
tupleLengths.forEach((tupleLength, index) => {
|
|
2532
|
-
if (index >= elements.length) throw
|
|
2489
|
+
if (index >= elements.length) throw createArgumentListError(functionValue, argument);
|
|
2533
2490
|
const element = elements[index];
|
|
2534
2491
|
const position = `argument number ${index + 1}`;
|
|
2535
2492
|
if (!isElementOf(element, domain.factors[index])) {
|
|
2536
2493
|
throw new TlaEvaluationError(
|
|
2537
|
-
|
|
2494
|
+
describeBoundArgument(
|
|
2495
|
+
functionValue,
|
|
2538
2496
|
position,
|
|
2539
2497
|
element,
|
|
2540
2498
|
tupleLength === undefined
|
|
@@ -2545,11 +2503,18 @@ const checkBoundArguments = (
|
|
|
2545
2503
|
}
|
|
2546
2504
|
if (tupleLength !== undefined && getSequenceElements(element)?.length !== tupleLength) {
|
|
2547
2505
|
throw new TlaEvaluationError(
|
|
2548
|
-
|
|
2506
|
+
describeBoundArgument(
|
|
2507
|
+
functionValue,
|
|
2508
|
+
position,
|
|
2509
|
+
element,
|
|
2510
|
+
"does not match its formal parameter",
|
|
2511
|
+
),
|
|
2549
2512
|
);
|
|
2550
2513
|
}
|
|
2551
2514
|
});
|
|
2552
|
-
if (elements.length > tupleLengths.length)
|
|
2515
|
+
if (elements.length > tupleLengths.length) {
|
|
2516
|
+
throw createArgumentListError(functionValue, argument);
|
|
2517
|
+
}
|
|
2553
2518
|
};
|
|
2554
2519
|
|
|
2555
2520
|
const isOutsideLambdaDomain = (functionValue: FunctionValue, argument: Value) =>
|
|
@@ -2627,6 +2592,12 @@ export const updateFunction = (
|
|
|
2627
2592
|
functionValue.kind === "LazyFunction" &&
|
|
2628
2593
|
(isKeptLazy || functionValue.enumerated === undefined);
|
|
2629
2594
|
if (isLazy) {
|
|
2595
|
+
if (
|
|
2596
|
+
functionValue.boundTupleLengths !== undefined &&
|
|
2597
|
+
getSequenceElements(argument) === undefined
|
|
2598
|
+
) {
|
|
2599
|
+
throw createArgumentListError(functionValue, argument);
|
|
2600
|
+
}
|
|
2630
2601
|
if (!isElementOf(argument, functionValue.domain)) return functionValue;
|
|
2631
2602
|
const updated = update(functionValue.apply(argument));
|
|
2632
2603
|
return setFunctionClass<LazyFunctionValue>(
|
|
@@ -2740,7 +2711,7 @@ const fingerprintValue = (value: Value): void => {
|
|
|
2740
2711
|
if (typeof value !== "object" || value.kind === "ModelValue") return;
|
|
2741
2712
|
if (value.kind === "InfiniteSet" || value.kind === "SequenceSet") {
|
|
2742
2713
|
throw new TlaEvaluationError(
|
|
2743
|
-
`TLC has found a state in which the value of a variable contains ${formatValue(value)}`,
|
|
2714
|
+
`TLC has found a state in which the value of a variable contains ${prettyPrint(formatValue(value))}`,
|
|
2744
2715
|
);
|
|
2745
2716
|
}
|
|
2746
2717
|
if (isSetValue(value)) {
|
|
@@ -2895,14 +2866,7 @@ const PRINTED_ESCAPES: Record<string, string> = {
|
|
|
2895
2866
|
const formatString = (value: string) =>
|
|
2896
2867
|
`"${value.replace(/["\\\t\n\f\r]/g, (character) => PRINTED_ESCAPES[character])}"`;
|
|
2897
2868
|
|
|
2898
|
-
type LazySetValue =
|
|
2899
|
-
| SubsetValue
|
|
2900
|
-
| FunctionSetValue
|
|
2901
|
-
| RecordSetValue
|
|
2902
|
-
| ProductSetValue
|
|
2903
|
-
| SetOperationValue
|
|
2904
|
-
| FilteredSetValue
|
|
2905
|
-
| UnionValue;
|
|
2869
|
+
type LazySetValue = Exclude<ConvertibleSetValue, MixedSetValue | SequenceSetValue>;
|
|
2906
2870
|
|
|
2907
2871
|
const MAXIMUM_EXPANDED_SUBSET_BASE = 6;
|
|
2908
2872
|
const MAXIMUM_EXPANDED_PRODUCT = 1999;
|
|
@@ -2987,56 +2951,73 @@ const toPrintedFunction = (value: LazyFunctionValue) => {
|
|
|
2987
2951
|
|
|
2988
2952
|
export const formatNormalizedCopies = (values: Value[]) => {
|
|
2989
2953
|
const markedSets: SetValue[] = [];
|
|
2990
|
-
const
|
|
2954
|
+
const writtenFunctions: [FunctionValue, Value[]][] = [];
|
|
2955
|
+
const copiedFunctions: LazyFunctionValue[] = [];
|
|
2956
|
+
// TLC prints a deep copy, which copies functions but shares sets, so it caches only the functions inside a set.
|
|
2957
|
+
const normalize = (value: Value, isWrittenOrderKept: boolean, isCopied: boolean): void => {
|
|
2991
2958
|
if (typeof value !== "object") return;
|
|
2959
|
+
const normalizeInner = (inner: Value) => normalize(inner, isWrittenOrderKept, false);
|
|
2992
2960
|
switch (value.kind) {
|
|
2993
2961
|
case "Set":
|
|
2994
|
-
value.elements.forEach(
|
|
2962
|
+
value.elements.forEach(normalizeInner);
|
|
2995
2963
|
if (value.isNormalized) return;
|
|
2996
2964
|
value.isNormalized = true;
|
|
2997
2965
|
markedSets.push(value);
|
|
2998
2966
|
return;
|
|
2999
2967
|
case "MixedSet":
|
|
3000
|
-
value.elements.forEach(
|
|
2968
|
+
value.elements.forEach(normalizeInner);
|
|
3001
2969
|
toFiniteSet(value);
|
|
3002
2970
|
return;
|
|
3003
|
-
case "Function":
|
|
3004
|
-
value
|
|
2971
|
+
case "Function": {
|
|
2972
|
+
const isRangeWrittenOrderKept = isWrittenOrderKept || getFunctionClass(value) === "lambda";
|
|
2973
|
+
value.range.forEach((inner) => normalize(inner, isRangeWrittenOrderKept, isCopied));
|
|
2974
|
+
if (isWrittenOrderKept || value.writtenKeys === undefined) return;
|
|
2975
|
+
writtenFunctions.push([value, value.writtenKeys]);
|
|
2976
|
+
value.writtenKeys = undefined;
|
|
3005
2977
|
return;
|
|
2978
|
+
}
|
|
3006
2979
|
case "LazyFunction":
|
|
3007
|
-
|
|
2980
|
+
if (value.enumerated) return normalize(value.enumerated, true, isCopied);
|
|
2981
|
+
if (isCopied) copiedFunctions.push(value);
|
|
2982
|
+
normalizeInner(value.domain);
|
|
3008
2983
|
return;
|
|
3009
2984
|
case "SetOperation":
|
|
3010
|
-
|
|
3011
|
-
|
|
2985
|
+
normalizeInner(value.left);
|
|
2986
|
+
normalizeInner(value.right);
|
|
3012
2987
|
return;
|
|
3013
2988
|
case "FunctionSet":
|
|
3014
|
-
|
|
3015
|
-
|
|
2989
|
+
normalizeInner(value.domain);
|
|
2990
|
+
normalizeInner(value.range);
|
|
3016
2991
|
return;
|
|
3017
2992
|
case "RecordSet":
|
|
3018
|
-
value.sets.forEach(
|
|
2993
|
+
value.sets.forEach(normalizeInner);
|
|
3019
2994
|
return;
|
|
3020
2995
|
case "ProductSet":
|
|
3021
|
-
value.factors.forEach(
|
|
2996
|
+
value.factors.forEach(normalizeInner);
|
|
3022
2997
|
return;
|
|
3023
2998
|
case "Subset":
|
|
3024
2999
|
case "Union":
|
|
3025
3000
|
case "FilteredSet":
|
|
3026
3001
|
case "SequenceSet":
|
|
3027
|
-
|
|
3002
|
+
normalizeInner(value.base);
|
|
3028
3003
|
return;
|
|
3029
3004
|
default:
|
|
3030
3005
|
return;
|
|
3031
3006
|
}
|
|
3032
3007
|
};
|
|
3033
3008
|
try {
|
|
3034
|
-
values.forEach(normalize);
|
|
3009
|
+
values.forEach((value) => normalize(value, false, true));
|
|
3035
3010
|
return values.map((value) => formatValue(value, true, true));
|
|
3036
3011
|
} finally {
|
|
3037
3012
|
markedSets.forEach((set) => {
|
|
3038
3013
|
set.isNormalized = false;
|
|
3039
3014
|
});
|
|
3015
|
+
copiedFunctions.forEach((copied) => {
|
|
3016
|
+
copied.enumerated = undefined;
|
|
3017
|
+
});
|
|
3018
|
+
writtenFunctions.forEach((entry) => {
|
|
3019
|
+
entry[0].writtenKeys = entry[1];
|
|
3020
|
+
});
|
|
3040
3021
|
}
|
|
3041
3022
|
};
|
|
3042
3023
|
|
|
@@ -3182,10 +3163,10 @@ export const formatState = (state: Record<string, Value>, previous?: Record<stri
|
|
|
3182
3163
|
);
|
|
3183
3164
|
}
|
|
3184
3165
|
return entries
|
|
3185
|
-
.filter((
|
|
3186
|
-
.filter((
|
|
3187
|
-
.map((
|
|
3188
|
-
const text = formatJava(format, [
|
|
3166
|
+
.filter((entry) => !(isFormatted && entry[0] === "_format"))
|
|
3167
|
+
.filter((entry) => !previous || !isUnchanged(previous[entry[0]], entry[1]))
|
|
3168
|
+
.map((entry) => {
|
|
3169
|
+
const text = formatJava(format, [entry[0], prettyPrint(formatValue(entry[1]))]);
|
|
3189
3170
|
if (text === undefined) {
|
|
3190
3171
|
throw new TlaAliasFormatError(
|
|
3191
3172
|
`The _format field of the ALIAS ${alias} is ${formatValue(format)}, but it must format two strings, the name and the value of a field.`,
|