tla-ts 0.0.9 → 0.0.10-dev.28c823e4b
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 +29 -1
- package/dist/compile.cjs +23 -0
- package/dist/compile.js +23 -0
- package/dist/deciders.cjs +28 -28
- package/dist/deciders.js +43 -43
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +106 -10
- package/dist/index.d.ts +106 -10
- 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 +116 -36
- package/dist/prove.js +116 -36
- package/dist/run.cjs +143 -31
- package/dist/run.js +143 -31
- package/dist/tlapm.cjs +2 -2
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +129 -104
- package/dist/transfer.js +129 -104
- package/dist/worker.cjs +7 -7
- package/dist/worker.js +7 -7
- package/package.json +3 -1
- package/src/ast.ts +4 -23
- package/src/bags.ts +99 -102
- package/src/builtins.ts +40 -78
- package/src/bundled-modules.ts +1 -8
- package/src/check.ts +599 -388
- package/src/cli/options.ts +11 -6
- package/src/cli/run.ts +0 -2
- package/src/cli/runtime-invariants.ts +136 -0
- package/src/cli/shared.ts +18 -11
- package/src/cli/tlapm.ts +0 -12
- package/src/cli/tlc-arguments.ts +640 -0
- package/src/cli/tlc-usage.ts +361 -0
- package/src/cli/tlc.ts +538 -220
- package/src/cli/typescript.ts +23 -0
- package/src/cli/xml-exporter.ts +4 -16
- package/src/cli.ts +0 -1
- package/src/codegen.ts +191 -64
- package/src/config.ts +140 -109
- package/src/coverage.ts +837 -0
- package/src/dependencies.ts +6 -40
- package/src/dfid.ts +618 -0
- package/src/environment.ts +240 -118
- package/src/errors.ts +70 -55
- package/src/evaluate.ts +596 -339
- package/src/exit-codes.ts +37 -3
- package/src/fingerprints.ts +10 -10
- package/src/index.ts +3 -0
- package/src/instances.ts +79 -11
- package/src/java-overrides.ts +4 -19
- package/src/json-reader.ts +455 -0
- package/src/json.ts +255 -139
- package/src/levels.ts +8 -17
- package/src/lexer.ts +80 -100
- package/src/liveness-checker.ts +82 -119
- package/src/liveness.ts +112 -64
- package/src/obligations/action.ts +4 -28
- package/src/obligations/anonymize.ts +84 -80
- package/src/obligations/equality.ts +1 -1
- package/src/obligations/expression.ts +2 -19
- package/src/obligations/format.ts +1 -9
- package/src/obligations/generate.ts +1 -11
- package/src/obligations/index.ts +0 -11
- package/src/obligations/levels.ts +4 -8
- package/src/obligations/module.ts +1 -15
- package/src/obligations/normalize.ts +5 -24
- package/src/obligations/operators.ts +1 -2
- package/src/obligations/pragma.ts +1 -10
- package/src/obligations/printer.ts +47 -46
- package/src/obligations/proof.ts +1 -5
- package/src/obligations/regroup.ts +1 -4
- package/src/obligations/simplify.ts +3 -14
- package/src/obligations/source.ts +1 -21
- package/src/obligations/subexpression.ts +5 -11
- package/src/obligations/substitution.ts +1 -3
- package/src/obligations/temporal.ts +8 -14
- package/src/obligations/tuples.ts +3 -9
- package/src/parallel-worker.ts +29 -39
- package/src/parallel.ts +53 -44
- package/src/parser.ts +565 -282
- package/src/pcal/ast.ts +53 -86
- package/src/pcal/parse.ts +144 -219
- package/src/pcal/tokenize.ts +91 -131
- package/src/pcal/translate.ts +83 -130
- package/src/pcal/validate.ts +48 -68
- package/src/pretty-print.ts +7 -8
- package/src/prover/decide-pool.ts +5 -10
- package/src/prover/deciders.ts +0 -4
- package/src/prover/first-order.ts +0 -11
- package/src/prover/isabelle/decide.ts +0 -6
- package/src/prover/isabelle/encode.ts +11 -23
- package/src/prover/isabelle/isar/inner-syntax.ts +108 -114
- package/src/prover/isabelle/isar/method.ts +25 -38
- package/src/prover/isabelle/isar/proof.ts +1 -10
- package/src/prover/isabelle/isar/statement.ts +1 -6
- package/src/prover/isabelle/isar/theory.ts +15 -26
- package/src/prover/isabelle/isar/type-check.ts +11 -25
- package/src/prover/isabelle/provers/blast/blast.ts +10 -41
- package/src/prover/isabelle/provers/blast/branch.ts +1 -32
- package/src/prover/isabelle/provers/blast/prove.ts +1 -35
- package/src/prover/isabelle/provers/blast/rules.ts +6 -44
- package/src/prover/isabelle/provers/blast/state.ts +2 -28
- package/src/prover/isabelle/provers/blast/term.ts +9 -36
- package/src/prover/isabelle/provers/clasimp.ts +1 -13
- package/src/prover/isabelle/provers/classical.ts +14 -42
- package/src/prover/isabelle/provers/hypsubst.ts +11 -25
- package/src/prover/isabelle/pure/bicompose.ts +16 -13
- package/src/prover/isabelle/pure/consts.ts +1 -7
- package/src/prover/isabelle/pure/conv.ts +1 -9
- package/src/prover/isabelle/pure/drule.ts +24 -40
- package/src/prover/isabelle/pure/envir.ts +3 -52
- package/src/prover/isabelle/pure/goal.ts +1 -7
- package/src/prover/isabelle/pure/interrupt.ts +0 -5
- package/src/prover/isabelle/pure/list.ts +0 -3
- package/src/prover/isabelle/pure/logic.ts +1 -14
- package/src/prover/isabelle/pure/name.ts +2 -9
- package/src/prover/isabelle/pure/net.ts +3 -59
- package/src/prover/isabelle/pure/object-logic.ts +3 -10
- package/src/prover/isabelle/pure/pattern.ts +2 -19
- package/src/prover/isabelle/pure/raw-simplifier.ts +13 -49
- package/src/prover/isabelle/pure/rewriter.ts +26 -58
- package/src/prover/isabelle/pure/search.ts +3 -10
- package/src/prover/isabelle/pure/seq.ts +1 -10
- package/src/prover/isabelle/pure/simplifier.ts +4 -12
- package/src/prover/isabelle/pure/table.ts +1 -31
- package/src/prover/isabelle/pure/tactic.ts +12 -22
- package/src/prover/isabelle/pure/tactical.ts +6 -12
- package/src/prover/isabelle/pure/term-ord.ts +2 -6
- package/src/prover/isabelle/pure/term.ts +2 -43
- package/src/prover/isabelle/pure/thm.ts +13 -36
- package/src/prover/isabelle/pure/type.ts +2 -15
- package/src/prover/isabelle/pure/unify.ts +20 -30
- package/src/prover/isabelle/pure/variable.ts +3 -7
- package/src/prover/isabelle/tla/classical-setup.ts +9 -19
- package/src/prover/isabelle/tla/context.ts +8 -16
- package/src/prover/isabelle/tla/logic.ts +4 -11
- package/src/prover/isabelle/tla/simpdata.ts +46 -34
- package/src/prover/isabelle/tools/intuitionistic.ts +1 -10
- package/src/prover/ocaml.ts +0 -6
- package/src/prover/prep/action.ts +4 -36
- package/src/prover/prep/enabled-axioms.ts +12 -19
- package/src/prover/prep/fingerprint.ts +0 -16
- package/src/prover/prep/level-comparison.ts +8 -12
- package/src/prover/prep/md5.ts +0 -2
- package/src/prover/prep/methods.ts +9 -36
- package/src/prover/prep/normalize.ts +4 -28
- package/src/prover/prove-worker.ts +0 -2
- package/src/prover/prove.ts +0 -36
- package/src/prover/ptl/decide.ts +7 -12
- package/src/prover/ptl/encode.ts +14 -36
- package/src/prover/ptl/sat.ts +24 -32
- package/src/prover/ptl/tableau.ts +12 -26
- package/src/prover/smt/axioms.ts +0 -7
- package/src/prover/smt/context.ts +19 -26
- package/src/prover/smt/data.ts +51 -54
- package/src/prover/smt/encode.ts +14 -35
- package/src/prover/smt/extensionality.ts +0 -10
- package/src/prover/smt/flatten.ts +3 -22
- package/src/prover/smt/format.ts +5 -10
- package/src/prover/smt/instances.ts +0 -10
- package/src/prover/smt/rewrite.ts +66 -101
- package/src/prover/smt/solver/act-cache.ts +0 -15
- package/src/prover/smt/solver/arith-rewriter.ts +3 -48
- package/src/prover/smt/solver/array.ts +1 -3
- package/src/prover/smt/solver/asserted-formulas.ts +1 -43
- package/src/prover/smt/solver/ast-lt.ts +1 -11
- package/src/prover/smt/solver/ast-util.ts +1 -6
- package/src/prover/smt/solver/ast.ts +1 -143
- package/src/prover/smt/solver/auf-solver.ts +6 -39
- package/src/prover/smt/solver/case-split-queue.ts +1 -9
- package/src/prover/smt/solver/cg-table.ts +1 -18
- package/src/prover/smt/solver/clause.ts +1 -27
- package/src/prover/smt/solver/conflict-resolution.ts +0 -9
- package/src/prover/smt/solver/context.ts +4 -61
- package/src/prover/smt/solver/ctx-simplify.ts +14 -41
- package/src/prover/smt/solver/der.ts +2 -21
- package/src/prover/smt/solver/dyn-ack.ts +1 -11
- package/src/prover/smt/solver/e-matching.ts +3 -34
- package/src/prover/smt/solver/enode.ts +1 -21
- package/src/prover/smt/solver/expr-ref.ts +1 -5
- package/src/prover/smt/solver/expr-safe-replace.ts +0 -5
- package/src/prover/smt/solver/fingerprints.ts +1 -12
- package/src/prover/smt/solver/flat-literals.ts +1 -9
- package/src/prover/smt/solver/goal.ts +2 -14
- package/src/prover/smt/solver/hash.ts +0 -8
- package/src/prover/smt/solver/hashtable.ts +1 -12
- package/src/prover/smt/solver/internalizer.ts +6 -98
- package/src/prover/smt/solver/lbool.ts +1 -2
- package/src/prover/smt/solver/literal.ts +0 -3
- package/src/prover/smt/solver/lp/bound-propagator.ts +8 -26
- package/src/prover/smt/solver/lp/constraints.ts +2 -8
- package/src/prover/smt/solver/lp/containers.ts +12 -30
- package/src/prover/smt/solver/lp/core-solver.ts +10 -31
- package/src/prover/smt/solver/lp/cross-nested.ts +6 -20
- package/src/prover/smt/solver/lp/dep-intervals.ts +7 -22
- package/src/prover/smt/solver/lp/dependency.ts +1 -4
- package/src/prover/smt/solver/lp/dioph-eq.ts +12 -98
- package/src/prover/smt/solver/lp/explanation.ts +1 -6
- package/src/prover/smt/solver/lp/gomory.ts +9 -22
- package/src/prover/smt/solver/lp/hnf-cutter.ts +17 -23
- package/src/prover/smt/solver/lp/hnf.ts +11 -26
- package/src/prover/smt/solver/lp/int-cube.ts +15 -36
- package/src/prover/smt/solver/lp/int-solver.ts +4 -34
- package/src/prover/smt/solver/lp/lar-solver.ts +32 -81
- package/src/prover/smt/solver/lp/lar-term.ts +1 -5
- package/src/prover/smt/solver/lp/lp-settings.ts +1 -14
- package/src/prover/smt/solver/lp/maximize-term.ts +20 -45
- package/src/prover/smt/solver/lp/nex-creator.ts +5 -28
- package/src/prover/smt/solver/lp/nex.ts +1 -6
- package/src/prover/smt/solver/lp/nla-backoff.ts +1 -4
- package/src/prover/smt/solver/lp/nla-basics.ts +5 -30
- package/src/prover/smt/solver/lp/nla-core.ts +35 -130
- package/src/prover/smt/solver/lp/nla-divisions.ts +32 -42
- package/src/prover/smt/solver/lp/nla-emonics.ts +4 -21
- package/src/prover/smt/solver/lp/nla-factorization.ts +1 -4
- package/src/prover/smt/solver/lp/nla-grobner.ts +15 -69
- package/src/prover/smt/solver/lp/nla-horner.ts +3 -11
- package/src/prover/smt/solver/lp/nla-intervals.ts +2 -12
- package/src/prover/smt/solver/lp/nla-monomial-bounds.ts +16 -41
- package/src/prover/smt/solver/lp/nla-monotone.ts +2 -6
- package/src/prover/smt/solver/lp/nla-order.ts +2 -13
- package/src/prover/smt/solver/lp/nla-patcher.ts +4 -7
- package/src/prover/smt/solver/lp/nla-tangents.ts +1 -9
- package/src/prover/smt/solver/lp/nla-throttle.ts +1 -6
- package/src/prover/smt/solver/lp/nla-types.ts +1 -11
- package/src/prover/smt/solver/lp/nla-var-eqs.ts +4 -25
- package/src/prover/smt/solver/lp/nra-solver.ts +5 -52
- package/src/prover/smt/solver/lp/numeric-pair.ts +1 -4
- package/src/prover/smt/solver/lp/pdd-interval.ts +1 -3
- package/src/prover/smt/solver/lp/pdd-simplifier.ts +2 -14
- package/src/prover/smt/solver/lp/pdd-solver.ts +4 -33
- package/src/prover/smt/solver/lp/pdd.ts +7 -70
- package/src/prover/smt/solver/lp/random-updater.ts +1 -8
- package/src/prover/smt/solver/lp/static-matrix.ts +9 -19
- package/src/prover/smt/solver/lp/union-find.ts +1 -6
- package/src/prover/smt/solver/mam-compiler.ts +14 -56
- package/src/prover/smt/solver/mam-interpreter.ts +1 -21
- package/src/prover/smt/solver/maximize-ac-sharing.ts +2 -17
- package/src/prover/smt/solver/model-checker.ts +2 -36
- package/src/prover/smt/solver/model-evaluator.ts +3 -29
- package/src/prover/smt/solver/model-finder.ts +3 -15
- package/src/prover/smt/solver/model-generator.ts +1 -12
- package/src/prover/smt/solver/model-macro-solver.ts +12 -69
- package/src/prover/smt/solver/nlsat/algebraic.ts +55 -151
- package/src/prover/smt/solver/nlsat/atoms.ts +5 -19
- package/src/prover/smt/solver/nlsat/evaluator.ts +17 -22
- package/src/prover/smt/solver/nlsat/explain.ts +3 -47
- package/src/prover/smt/solver/nlsat/interval-set.ts +9 -50
- package/src/prover/smt/solver/nlsat/levelwise.ts +48 -129
- package/src/prover/smt/solver/nlsat/mpbq.ts +3 -14
- package/src/prover/smt/solver/nlsat/polynomial.ts +17 -156
- package/src/prover/smt/solver/nlsat/solver.ts +7 -67
- package/src/prover/smt/solver/nlsat/types.ts +1 -8
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +1 -44
- package/src/prover/smt/solver/nlsat/upolynomial.ts +11 -92
- package/src/prover/smt/solver/nnf.ts +3 -38
- package/src/prover/smt/solver/pattern-inference.ts +2 -15
- package/src/prover/smt/solver/poly-rewriter.ts +3 -23
- package/src/prover/smt/solver/propagate-values.ts +1 -10
- package/src/prover/smt/solver/proto-model.ts +3 -48
- package/src/prover/smt/solver/pull-quant.ts +1 -12
- package/src/prover/smt/solver/qe-lite-der.ts +1 -29
- package/src/prover/smt/solver/qe-lite-fm.ts +2 -25
- package/src/prover/smt/solver/qe-lite.ts +3 -33
- package/src/prover/smt/solver/qi-queue.ts +1 -16
- package/src/prover/smt/solver/quant-tactics.ts +5 -22
- package/src/prover/smt/solver/quantifier-analyzer.ts +17 -37
- package/src/prover/smt/solver/quantifier-manager.ts +1 -8
- package/src/prover/smt/solver/random-gen.ts +1 -2
- package/src/prover/smt/solver/rational.ts +1 -8
- package/src/prover/smt/solver/ref-vector.ts +1 -6
- package/src/prover/smt/solver/relevancy.ts +2 -15
- package/src/prover/smt/solver/rewriter-tpl.ts +3 -147
- package/src/prover/smt/solver/rewriter.ts +3 -85
- package/src/prover/smt/solver/rlimit.ts +2 -20
- package/src/prover/smt/solver/smtlib-parser.ts +2 -37
- package/src/prover/smt/solver/solver.ts +23 -34
- package/src/prover/smt/solver/sort.ts +1 -5
- package/src/prover/smt/solver/sticky-generations.ts +0 -5
- package/src/prover/smt/solver/theory-lra-axioms.ts +3 -24
- package/src/prover/smt/solver/theory-lra-bounds.ts +0 -5
- package/src/prover/smt/solver/theory-lra-final-check.ts +4 -22
- package/src/prover/smt/solver/theory-lra-internalize.ts +1 -27
- package/src/prover/smt/solver/theory-lra-model.ts +4 -19
- package/src/prover/smt/solver/theory-lra-propagate.ts +1 -15
- package/src/prover/smt/solver/theory-lra-state.ts +3 -8
- package/src/prover/smt/solver/theory-lra.ts +1 -8
- package/src/prover/smt/solver/var-subst.ts +2 -26
- package/src/prover/smt/table.ts +0 -8
- package/src/prover/tlapm/cache.ts +20 -25
- package/src/prover/tlapm/ocaml-marshal.ts +19 -21
- package/src/prover/tlapm/tlapm.ts +12 -17
- package/src/prover/verdict.ts +0 -2
- package/src/prover/zenon/check/check.ts +0 -9
- package/src/prover/zenon/check/definitions.ts +5 -15
- package/src/prover/zenon/check/equality.ts +0 -8
- package/src/prover/zenon/check/functions.ts +0 -4
- package/src/prover/zenon/check/keys.ts +0 -7
- package/src/prover/zenon/check/propositional.ts +0 -3
- package/src/prover/zenon/check/records.ts +0 -5
- package/src/prover/zenon/check/relations.ts +0 -13
- package/src/prover/zenon/check/rewrites.ts +0 -6
- package/src/prover/zenon/check/sets.ts +0 -3
- package/src/prover/zenon/check/terms.ts +0 -17
- package/src/prover/zenon/check/tla.ts +0 -6
- package/src/prover/zenon/decide.ts +0 -12
- package/src/prover/zenon/encode.ts +1 -8
- package/src/prover/zenon/eqrel.ts +0 -13
- package/src/prover/zenon/equality-rules.ts +0 -4
- package/src/prover/zenon/expr.ts +1 -26
- package/src/prover/zenon/index-table.ts +17 -38
- package/src/prover/zenon/isar-case.ts +9 -19
- package/src/prover/zenon/isar.ts +1 -29
- package/src/prover/zenon/limits.ts +0 -4
- package/src/prover/zenon/llproof.ts +0 -9
- package/src/prover/zenon/mltoll.ts +54 -76
- package/src/prover/zenon/node.ts +1 -11
- package/src/prover/zenon/ocaml.ts +1 -17
- package/src/prover/zenon/parse.ts +2 -7
- package/src/prover/zenon/phrase.ts +1 -11
- package/src/prover/zenon/proof.ts +0 -9
- package/src/prover/zenon/propositional-rules.ts +0 -5
- package/src/prover/zenon/rules.ts +2 -6
- package/src/prover/zenon/search.ts +1 -17
- package/src/prover/zenon/tla/functions.ts +57 -29
- package/src/prover/zenon/tla/llproof.ts +63 -70
- package/src/prover/zenon/tla/records.ts +56 -27
- package/src/prover/zenon/tla/rewrites.ts +12 -19
- package/src/prover/zenon/tla/sets.ts +68 -39
- package/src/prover/zenon/tla/terms.ts +0 -6
- package/src/prover/zenon/tla/tla.ts +59 -58
- package/src/randomization.ts +81 -35
- package/src/resolve.ts +12 -112
- package/src/runtime.ts +22 -22
- package/src/sany/builtins.ts +2 -5
- package/src/sany/generator.ts +149 -252
- package/src/sany/levels.ts +6 -34
- package/src/sany/lexer.ts +41 -61
- package/src/sany/linter.ts +1 -9
- package/src/sany/modules.ts +1 -5
- package/src/sany/nodes.ts +0 -31
- package/src/sany/parse-error.ts +39 -117
- package/src/sany/report.ts +29 -63
- package/src/sany/selectors.ts +15 -39
- package/src/sany/source.ts +1 -17
- package/src/sany/xml.ts +13 -63
- package/src/search.ts +495 -155
- package/src/simulate.ts +685 -0
- package/src/spec-description.ts +176 -69
- package/src/standard-definitions.ts +0 -4
- package/src/standard-modules.ts +254 -69
- package/src/state-graph.ts +50 -24
- package/src/subexpressions.ts +69 -52
- package/src/substitution-levels.ts +2 -3
- package/src/successors.ts +263 -94
- package/src/symmetry.ts +33 -25
- package/src/tableau.ts +27 -24
- package/src/tlc/fingerprint.ts +183 -67
- package/src/tlc/jar-data.ts +112 -6
- package/src/tlc/messages.ts +110 -44
- package/src/tlc/order.ts +37 -60
- package/src/tlc/random.ts +33 -45
- package/src/tlc/replay.ts +549 -217
- package/src/tlc/summary.ts +36 -47
- package/src/tlc/tlc-operators.ts +76 -41
- package/src/tlc/tlcext-operators.ts +139 -122
- package/src/tlc/trace-spec.ts +269 -0
- package/src/tlc/value-stream.ts +139 -0
- package/src/tlc/version.ts +1 -4
- package/src/transfer.ts +22 -25
- package/src/typescript/actions.ts +481 -0
- package/src/typescript/collections.ts +600 -0
- package/src/typescript/compile.ts +65 -0
- package/src/typescript/context.ts +94 -0
- package/src/typescript/emit.ts +121 -0
- package/src/typescript/expressions.ts +496 -0
- package/src/typescript/formula.ts +152 -0
- package/src/typescript/functions.ts +284 -0
- package/src/typescript/model.ts +163 -0
- package/src/typescript/names.ts +114 -0
- package/src/typescript/program.ts +48 -0
- package/src/typescript/properties.ts +139 -0
- package/src/typescript/scope.ts +112 -0
- package/src/typescript/steps.ts +165 -0
- package/src/typescript/types.ts +171 -0
- package/src/values.ts +780 -337
- package/src/worker.ts +7 -8
package/src/liveness.ts
CHANGED
|
@@ -12,11 +12,11 @@ import {
|
|
|
12
12
|
bindDefinitions,
|
|
13
13
|
bindOperatorArguments,
|
|
14
14
|
evaluate,
|
|
15
|
-
expectBoolean,
|
|
16
15
|
forEachBinding,
|
|
17
16
|
forEachBoundElement,
|
|
18
17
|
getBoundElements,
|
|
19
18
|
getDefinition,
|
|
19
|
+
getStartupValue,
|
|
20
20
|
lookupScope,
|
|
21
21
|
resolveApplyOperator,
|
|
22
22
|
resolveGlobalOperator,
|
|
@@ -40,17 +40,16 @@ import {
|
|
|
40
40
|
type LiveEnabled,
|
|
41
41
|
type LiveExpression,
|
|
42
42
|
} from "./tableau";
|
|
43
|
-
import type
|
|
43
|
+
import { isEqualLikeTlc, type Value } from "./values";
|
|
44
44
|
|
|
45
45
|
export interface ScopedExpression {
|
|
46
46
|
expression: Expression;
|
|
47
47
|
scope: Scope | undefined;
|
|
48
48
|
}
|
|
49
49
|
|
|
50
|
-
// A part of a temporal formula, with the name TLC gives the part when the formula is a property:
|
|
51
|
-
// a conjunct's location, or the name of the definition the part is the body of.
|
|
52
50
|
interface ExpandedExpression extends ScopedExpression {
|
|
53
51
|
name: string | undefined;
|
|
52
|
+
path: string[];
|
|
54
53
|
}
|
|
55
54
|
|
|
56
55
|
export interface TemporalProperty extends ScopedExpression {
|
|
@@ -69,6 +68,11 @@ const TEMPORAL_OPERATORS = new Set(["~>", "-+->"]);
|
|
|
69
68
|
|
|
70
69
|
const definitionThunks = new WeakSet<Thunk>();
|
|
71
70
|
|
|
71
|
+
const JUNCTIONS = new Map<string, "And" | "Or">([
|
|
72
|
+
["/\\", "And"],
|
|
73
|
+
["\\/", "Or"],
|
|
74
|
+
]);
|
|
75
|
+
|
|
72
76
|
const getConstantContext = (environment: Environment, scope: Scope | undefined): Context => ({
|
|
73
77
|
environment,
|
|
74
78
|
scope,
|
|
@@ -76,7 +80,6 @@ const getConstantContext = (environment: Environment, scope: Scope | undefined):
|
|
|
76
80
|
next: undefined,
|
|
77
81
|
});
|
|
78
82
|
|
|
79
|
-
// TLC adds the message of the error that stopped it, when it has one.
|
|
80
83
|
const createCannotHandleError = (expression: Expression, inner?: string) =>
|
|
81
84
|
new TlaEvaluationError(
|
|
82
85
|
`TLC cannot handle the temporal formula ${describeRange(expression)}${inner === undefined ? "" : `:\n${inner}`}`,
|
|
@@ -87,15 +90,27 @@ export const getLevel = (
|
|
|
87
90
|
scope: Scope | undefined,
|
|
88
91
|
environment: Environment,
|
|
89
92
|
shadowed = new Set<string>(),
|
|
93
|
+
visiting = new Set<object>(),
|
|
90
94
|
): number => {
|
|
95
|
+
const getBodyLevel = (binding: object, body: Expression, bodyScope: Scope | undefined) => {
|
|
96
|
+
if (visiting.has(binding)) return CONSTANT_LEVEL;
|
|
97
|
+
visiting.add(binding);
|
|
98
|
+
const level = getLevel(body, bodyScope, environment, new Set(), visiting);
|
|
99
|
+
visiting.delete(binding);
|
|
100
|
+
return level;
|
|
101
|
+
};
|
|
91
102
|
const getBindingLevel = (name: string) => {
|
|
92
103
|
const binding = lookupScope(scope, name);
|
|
93
104
|
if (!binding) return undefined;
|
|
94
105
|
if (binding.kind === "Value") return CONSTANT_LEVEL;
|
|
95
|
-
if (binding.kind === "Thunk")
|
|
106
|
+
if (binding.kind === "Thunk") {
|
|
107
|
+
return binding.isReleased
|
|
108
|
+
? CONSTANT_LEVEL
|
|
109
|
+
: getBodyLevel(binding, binding.expression, binding.scope);
|
|
110
|
+
}
|
|
96
111
|
const operator = binding.operator;
|
|
97
112
|
return operator.kind === "Closure"
|
|
98
|
-
?
|
|
113
|
+
? getBodyLevel(operator, operator.body, operator.scope)
|
|
99
114
|
: CONSTANT_LEVEL;
|
|
100
115
|
};
|
|
101
116
|
const getGlobalLevel = (name: string) => {
|
|
@@ -105,6 +120,7 @@ export const getLevel = (
|
|
|
105
120
|
if (definition) return getDefinitionLevel(definition, environment);
|
|
106
121
|
const builtin = environment.builtins.get(environment.substitutions.get(name) ?? name);
|
|
107
122
|
if (!builtin) return undefined;
|
|
123
|
+
if (builtin.isActionLevel) return ACTION_LEVEL;
|
|
108
124
|
return builtin.isStateLevel && !builtin.isLevelConstant ? VARIABLE_LEVEL : CONSTANT_LEVEL;
|
|
109
125
|
};
|
|
110
126
|
const getNameLevel = (name: string, node: Expression) => {
|
|
@@ -115,20 +131,21 @@ export const getLevel = (
|
|
|
115
131
|
return getGlobalLevel(name) ?? getBindingLevel(name) ?? CONSTANT_LEVEL;
|
|
116
132
|
};
|
|
117
133
|
const getChildrenLevel = (node: Expression) => {
|
|
118
|
-
|
|
134
|
+
let level = CONSTANT_LEVEL;
|
|
119
135
|
mapChildren(node, (child, bound) => {
|
|
120
|
-
level
|
|
121
|
-
level
|
|
136
|
+
level = Math.max(
|
|
137
|
+
level,
|
|
122
138
|
getLevel(
|
|
123
139
|
child,
|
|
124
140
|
scope,
|
|
125
141
|
environment,
|
|
126
142
|
bound.length === 0 ? shadowed : new Set([...shadowed, ...bound]),
|
|
143
|
+
visiting,
|
|
127
144
|
),
|
|
128
145
|
);
|
|
129
146
|
return child;
|
|
130
147
|
});
|
|
131
|
-
return level
|
|
148
|
+
return level;
|
|
132
149
|
};
|
|
133
150
|
switch (expression.kind) {
|
|
134
151
|
case "Prime":
|
|
@@ -149,16 +166,32 @@ export const getLevel = (
|
|
|
149
166
|
return getNameLevel(expression.name, expression);
|
|
150
167
|
case "OperatorReference":
|
|
151
168
|
return getNameLevel(expression.operator, expression);
|
|
152
|
-
case "Apply":
|
|
169
|
+
case "Apply": {
|
|
153
170
|
if (TEMPORAL_OPERATORS.has(expression.operator)) return TEMPORAL_LEVEL;
|
|
154
171
|
if (expression.operator === "\\cdot") return ACTION_LEVEL;
|
|
155
|
-
|
|
172
|
+
const operatorLevel = getNameLevel(expression.operator, expression);
|
|
173
|
+
const level = Math.max(operatorLevel, getChildrenLevel(expression));
|
|
174
|
+
const operator = isLocallyResolved(expression)
|
|
175
|
+
? undefined
|
|
176
|
+
: resolveGlobalOperator(expression.operator, environment);
|
|
177
|
+
if (
|
|
178
|
+
level === operatorLevel ||
|
|
179
|
+
operator?.kind !== "Closure" ||
|
|
180
|
+
operator.params.length !== expression.args.length
|
|
181
|
+
) {
|
|
182
|
+
return level;
|
|
183
|
+
}
|
|
184
|
+
return getBodyLevel(
|
|
185
|
+
operator,
|
|
186
|
+
operator.body,
|
|
187
|
+
bindOperatorArguments(operator, expression.args, getConstantContext(environment, scope)),
|
|
188
|
+
);
|
|
189
|
+
}
|
|
156
190
|
default:
|
|
157
191
|
return getChildrenLevel(expression);
|
|
158
192
|
}
|
|
159
193
|
};
|
|
160
194
|
|
|
161
|
-
// TLC leaves a formula whose sets it fails to enumerate, and doesn't expect an EvalException.
|
|
162
195
|
const getUnrolledElements = (bounds: Bound[], context: Context) => {
|
|
163
196
|
try {
|
|
164
197
|
return getBoundElements(bounds, context);
|
|
@@ -176,13 +209,11 @@ export const expandTemporal = (
|
|
|
176
209
|
expression: Expression,
|
|
177
210
|
scope: Scope | undefined,
|
|
178
211
|
environment: Environment,
|
|
179
|
-
// Whether TLC expands the formula as a property, which unrolls each \A over a constant set.
|
|
180
212
|
isProperty: boolean,
|
|
181
213
|
expanding = new Set<Definition>(),
|
|
182
|
-
// Whether the expansion entered the body of an instance's definition. Like TLC, it then no
|
|
183
|
-
// longer expands an operator applied to arguments.
|
|
184
214
|
isSubstituted = false,
|
|
185
215
|
name?: string,
|
|
216
|
+
path: string[] = [],
|
|
186
217
|
): ExpandedExpression[] => {
|
|
187
218
|
const expand = (
|
|
188
219
|
child: Expression,
|
|
@@ -200,6 +231,9 @@ export const expandTemporal = (
|
|
|
200
231
|
isSubstituted ||
|
|
201
232
|
(definition !== undefined && environment.substitutedDefinitions.has(definition)),
|
|
202
233
|
childName,
|
|
234
|
+
definition?.kind === "Operator" && definition.params.length === 0
|
|
235
|
+
? [...path, definition.name]
|
|
236
|
+
: path,
|
|
203
237
|
);
|
|
204
238
|
if (expression.kind === "And") {
|
|
205
239
|
return expression.operands.flatMap((operand) => expand(operand, scope, describeRange(operand)));
|
|
@@ -210,8 +244,12 @@ export const expandTemporal = (
|
|
|
210
244
|
}
|
|
211
245
|
if (expression.kind === "Identifier") {
|
|
212
246
|
const binding = isLocallyResolved(expression) ? lookupScope(scope, expression.name) : undefined;
|
|
213
|
-
if (binding?.kind === "Thunk") {
|
|
214
|
-
return expand(
|
|
247
|
+
if (binding?.kind === "Thunk" && !binding.isReleased) {
|
|
248
|
+
return expand(
|
|
249
|
+
binding.expression,
|
|
250
|
+
binding.scope,
|
|
251
|
+
definitionThunks.has(binding) ? expression.name : name,
|
|
252
|
+
);
|
|
215
253
|
}
|
|
216
254
|
const definition = environment.constants.has(expression.name)
|
|
217
255
|
? undefined
|
|
@@ -220,7 +258,8 @@ export const expandTemporal = (
|
|
|
220
258
|
!binding &&
|
|
221
259
|
definition?.kind === "Operator" &&
|
|
222
260
|
definition.params.length === 0 &&
|
|
223
|
-
getDefinitionLevel(definition, environment) > CONSTANT_LEVEL
|
|
261
|
+
(getDefinitionLevel(definition, environment) > CONSTANT_LEVEL ||
|
|
262
|
+
getStartupValue(definition, environment) === undefined)
|
|
224
263
|
) {
|
|
225
264
|
if (expanding.has(definition)) {
|
|
226
265
|
throw createStackOverflowError();
|
|
@@ -228,15 +267,13 @@ export const expandTemporal = (
|
|
|
228
267
|
return expand(
|
|
229
268
|
definition.body,
|
|
230
269
|
undefined,
|
|
231
|
-
definition.name,
|
|
270
|
+
(!isSubstituted && environment.instanceNames.get(expression.name)) || definition.name,
|
|
232
271
|
new Set([...expanding, definition]),
|
|
233
272
|
definition,
|
|
234
273
|
);
|
|
235
274
|
}
|
|
236
275
|
}
|
|
237
276
|
const context = getConstantContext(environment, scope);
|
|
238
|
-
// TLC 1.7.4 never expands an operator applied to arguments. A property expands every one it
|
|
239
|
-
// applies, but a specification only the temporal ones.
|
|
240
277
|
if (
|
|
241
278
|
expression.kind === "Apply" &&
|
|
242
279
|
environment.runtime.version !== "1.7.4" &&
|
|
@@ -246,16 +283,19 @@ export const expandTemporal = (
|
|
|
246
283
|
const definition = isLocallyResolved(expression)
|
|
247
284
|
? undefined
|
|
248
285
|
: getDefinition(expression.operator, environment);
|
|
286
|
+
const isOwnArgumentFree =
|
|
287
|
+
operator?.kind === "Closure" &&
|
|
288
|
+
operator.params.every((param) => environment.instanceParams.has(param));
|
|
249
289
|
const isExpandable =
|
|
250
290
|
operator?.kind === "Closure" &&
|
|
251
291
|
operator.params.length === expression.args.length &&
|
|
252
292
|
!definition?.isRecursive &&
|
|
253
|
-
!isSubstituted;
|
|
293
|
+
(!isSubstituted || isOwnArgumentFree);
|
|
254
294
|
if (isExpandable) {
|
|
255
295
|
return expand(
|
|
256
296
|
operator.body,
|
|
257
297
|
bindOperatorArguments(operator, expression.args, context),
|
|
258
|
-
expression.operator,
|
|
298
|
+
isSubstituted && definition ? definition.name : expression.operator,
|
|
259
299
|
expanding,
|
|
260
300
|
definition,
|
|
261
301
|
);
|
|
@@ -275,7 +315,7 @@ export const expandTemporal = (
|
|
|
275
315
|
if (expanded.length === 0) throw createTautologyError();
|
|
276
316
|
return expanded;
|
|
277
317
|
}
|
|
278
|
-
return [{ expression, scope, name }];
|
|
318
|
+
return [{ expression, scope, name, path }];
|
|
279
319
|
};
|
|
280
320
|
|
|
281
321
|
const bindLetDefinitions = (
|
|
@@ -301,7 +341,6 @@ export const toLiveExpression = (
|
|
|
301
341
|
scope: Scope | undefined,
|
|
302
342
|
level: number,
|
|
303
343
|
): LiveExpression => {
|
|
304
|
-
// TLC after 1.7.4 bounds the level of a formula whose parts are constant by the formula's own.
|
|
305
344
|
const atomLevel =
|
|
306
345
|
level === CONSTANT_LEVEL && !is174 ? getLevel(expression, scope, environment) : level;
|
|
307
346
|
if (atomLevel === CONSTANT_LEVEL) {
|
|
@@ -314,10 +353,18 @@ export const toLiveExpression = (
|
|
|
314
353
|
return createBoolean(value);
|
|
315
354
|
}
|
|
316
355
|
if (atomLevel === VARIABLE_LEVEL) return { kind: "State", expression, scope };
|
|
317
|
-
|
|
356
|
+
if (expression.kind === "AngleAction") {
|
|
357
|
+
return {
|
|
358
|
+
kind: "Action",
|
|
359
|
+
expression: expression.action,
|
|
360
|
+
subscript: expression.subscript,
|
|
361
|
+
scope,
|
|
362
|
+
};
|
|
363
|
+
}
|
|
364
|
+
return { kind: "Action", expression, subscript: undefined, scope };
|
|
318
365
|
};
|
|
319
366
|
|
|
320
|
-
|
|
367
|
+
let expansionDepth = 0;
|
|
321
368
|
|
|
322
369
|
const expand = (
|
|
323
370
|
body: Expression,
|
|
@@ -325,14 +372,17 @@ export const toLiveExpression = (
|
|
|
325
372
|
expression: Expression,
|
|
326
373
|
scope: Scope | undefined,
|
|
327
374
|
) => {
|
|
328
|
-
if (
|
|
375
|
+
if (expansionDepth >= MAXIMUM_EXPANSION_DEPTH) {
|
|
329
376
|
throw createStackOverflowError();
|
|
330
377
|
}
|
|
331
|
-
|
|
378
|
+
expansionDepth++;
|
|
332
379
|
const result = convert(body, bodyScope);
|
|
333
|
-
|
|
380
|
+
expansionDepth--;
|
|
334
381
|
const level = getLiveLevel(result);
|
|
335
|
-
|
|
382
|
+
// Deviation from TLC: Liveness#astToLive takes a temporal call with a constant body for an action, which classifyExpr rejects.
|
|
383
|
+
const isConstantTemporal =
|
|
384
|
+
level === CONSTANT_LEVEL && getLevel(expression, scope, environment) > ACTION_LEVEL;
|
|
385
|
+
return level > ACTION_LEVEL || isConstantTemporal ? result : toAtom(expression, scope, level);
|
|
336
386
|
};
|
|
337
387
|
|
|
338
388
|
const convertCall = (
|
|
@@ -345,7 +395,7 @@ export const toLiveExpression = (
|
|
|
345
395
|
isLocallyResolved(expression) || getDefinition(name, environment) === undefined
|
|
346
396
|
? lookupScope(scope, name)
|
|
347
397
|
: undefined;
|
|
348
|
-
if (binding?.kind === "Thunk" && definitionThunks.has(binding)) {
|
|
398
|
+
if (binding?.kind === "Thunk" && !binding.isReleased && definitionThunks.has(binding)) {
|
|
349
399
|
return expandCall(expression, () =>
|
|
350
400
|
expand(binding.expression, binding.scope, expression, scope),
|
|
351
401
|
);
|
|
@@ -358,8 +408,14 @@ export const toLiveExpression = (
|
|
|
358
408
|
: isLocallyResolved(expression)
|
|
359
409
|
? resolveOperator(name, context)
|
|
360
410
|
: resolveGlobalOperator(name, environment);
|
|
361
|
-
if (operator?.kind !== "Closure") throw createCannotHandleError(expression);
|
|
362
411
|
const args = expression.kind === "Apply" ? expression.args : [];
|
|
412
|
+
const junction =
|
|
413
|
+
operator?.kind === "Builtin" && args.length === 2 ? JUNCTIONS.get(operator.name) : undefined;
|
|
414
|
+
if (junction) {
|
|
415
|
+
const operands = args.map((arg) => convert(arg, scope));
|
|
416
|
+
return toWhole(expression, scope, createJunction(junction, operands));
|
|
417
|
+
}
|
|
418
|
+
if (operator?.kind !== "Closure") throw createCannotHandleError(expression);
|
|
363
419
|
const isRecursive =
|
|
364
420
|
!isLocallyResolved(expression) && getDefinition(name, environment)?.isRecursive === true;
|
|
365
421
|
return expandCall(
|
|
@@ -382,8 +438,6 @@ export const toLiveExpression = (
|
|
|
382
438
|
);
|
|
383
439
|
};
|
|
384
440
|
|
|
385
|
-
// TLC takes an application of an operator whose expansion fails for a formula it can't handle,
|
|
386
|
-
// except that TLC after 1.7.4 fails as the expansion of a recursive operator does.
|
|
387
441
|
const expandCall = (
|
|
388
442
|
expression: Expression,
|
|
389
443
|
expandBody: () => LiveExpression,
|
|
@@ -403,17 +457,8 @@ export const toLiveExpression = (
|
|
|
403
457
|
scope: Scope | undefined,
|
|
404
458
|
) => {
|
|
405
459
|
const level = getLevel(expression, scope, environment);
|
|
406
|
-
const isConstant = expression.bounds.every(
|
|
407
|
-
(bound) => getLevel(bound.set, scope, environment) === CONSTANT_LEVEL,
|
|
408
|
-
);
|
|
409
|
-
if (!isConstant) {
|
|
410
|
-
if (level <= ACTION_LEVEL) return toAtom(expression, scope, level);
|
|
411
|
-
throw createCannotHandleError(expression);
|
|
412
|
-
}
|
|
413
460
|
const operands: LiveExpression[] = [];
|
|
414
461
|
const isForall = expression.kind === "Forall";
|
|
415
|
-
// TLC takes a quantified formula whose body fails for one it can't handle, and under \A it adds
|
|
416
|
-
// the message of a failure that isn't an EvalException.
|
|
417
462
|
try {
|
|
418
463
|
forEachBinding(expression.bounds, getConstantContext(environment, scope), (boundScope) => {
|
|
419
464
|
operands.push(convert(expression.body, boundScope));
|
|
@@ -433,14 +478,11 @@ export const toLiveExpression = (
|
|
|
433
478
|
return toWhole(expression, scope, createJunction(isForall ? "And" : "Or", operands));
|
|
434
479
|
};
|
|
435
480
|
|
|
436
|
-
// TLC takes a formula whose translated parts are below temporal level whole, at their level.
|
|
437
481
|
const toWhole = (expression: Expression, scope: Scope | undefined, parts: LiveExpression) => {
|
|
438
482
|
const level = getLiveLevel(parts);
|
|
439
483
|
return level > ACTION_LEVEL ? parts : toAtom(expression, scope, level);
|
|
440
484
|
};
|
|
441
485
|
|
|
442
|
-
// The formulas below temporal level whose parts TLC's Liveness.astToLive translates, as one
|
|
443
|
-
// that is constant, such as a quantifier over the empty set, can make the formula constant.
|
|
444
486
|
const isTranslatedWhole = (expression: Expression) =>
|
|
445
487
|
expression.kind === "Label" ||
|
|
446
488
|
expression.kind === "Let" ||
|
|
@@ -503,7 +545,6 @@ export const toLiveExpression = (
|
|
|
503
545
|
case "Exists":
|
|
504
546
|
return convertQuantifier(expression, scope);
|
|
505
547
|
case "If": {
|
|
506
|
-
// TLC 1.7.4 translates both branches whatever the guard.
|
|
507
548
|
if (!is174 && getLevel(expression.condition, scope, environment) === CONSTANT_LEVEL) {
|
|
508
549
|
const condition = evaluate(expression.condition, getConstantContext(environment, scope));
|
|
509
550
|
if (typeof condition === "boolean") {
|
|
@@ -541,11 +582,7 @@ export const toLiveExpression = (
|
|
|
541
582
|
const taken: LiveExpression = {
|
|
542
583
|
kind: "Action",
|
|
543
584
|
expression: expression.action,
|
|
544
|
-
|
|
545
|
-
kind: "Unchanged",
|
|
546
|
-
expression: expression.subscript,
|
|
547
|
-
location: step.location,
|
|
548
|
-
},
|
|
585
|
+
subscript: expression.subscript,
|
|
549
586
|
scope,
|
|
550
587
|
enabled,
|
|
551
588
|
};
|
|
@@ -586,22 +623,33 @@ export const evaluateLive = (
|
|
|
586
623
|
const cached = stateCache.get(expression);
|
|
587
624
|
if (cached !== undefined) return cached;
|
|
588
625
|
const context = { environment, scope: expression.scope, state, next: undefined };
|
|
589
|
-
const
|
|
626
|
+
const value =
|
|
590
627
|
expression.kind === "State"
|
|
591
|
-
?
|
|
628
|
+
? evaluate(expression.expression, context)
|
|
592
629
|
: isEnabled(expression.step, context);
|
|
593
|
-
|
|
594
|
-
|
|
630
|
+
if (typeof value !== "boolean") {
|
|
631
|
+
throw new TlaEvaluationError("A state predicate was evaluated to a non-boolean value.");
|
|
632
|
+
}
|
|
633
|
+
stateCache.set(expression, value);
|
|
634
|
+
return value;
|
|
595
635
|
}
|
|
596
636
|
case "Action": {
|
|
597
637
|
if (expression.enabled && stateCache.get(expression.enabled) === false) return false;
|
|
598
|
-
const
|
|
638
|
+
const scope = expression.scope;
|
|
639
|
+
const subscript = expression.subscript;
|
|
599
640
|
if (
|
|
600
|
-
|
|
601
|
-
|
|
641
|
+
subscript &&
|
|
642
|
+
isEqualLikeTlc(
|
|
643
|
+
evaluate(subscript, { environment, scope, state, next: undefined }),
|
|
644
|
+
evaluate(subscript, { environment, scope, state: next, next: undefined }),
|
|
645
|
+
)
|
|
602
646
|
)
|
|
603
647
|
return false;
|
|
604
|
-
|
|
648
|
+
const value = evaluate(expression.expression, { environment, scope, state, next });
|
|
649
|
+
if (typeof value !== "boolean") {
|
|
650
|
+
throw new TlaEvaluationError("Encountered an action predicate that's not a boolean.");
|
|
651
|
+
}
|
|
652
|
+
return value;
|
|
605
653
|
}
|
|
606
654
|
case "Not":
|
|
607
655
|
return !recurse(expression.body);
|
|
@@ -626,7 +674,7 @@ export const evaluateOnLasso = (
|
|
|
626
674
|
): boolean => {
|
|
627
675
|
const getNext = (index: number) => (index + 1 < path.length ? index + 1 : cycleStart);
|
|
628
676
|
const getFuture = (index: number) =>
|
|
629
|
-
path.map((
|
|
677
|
+
path.map((_state, offset) => offset).filter((offset) => offset >= Math.min(index, cycleStart));
|
|
630
678
|
const recurse = (operand: LiveExpression, index = position) =>
|
|
631
679
|
evaluateOnLasso(operand, path, cycleStart, index, environment);
|
|
632
680
|
switch (expression.kind) {
|
|
@@ -1,6 +1,4 @@
|
|
|
1
|
-
// A port of tlapm's Expr.Action.
|
|
2
|
-
// variables it binds, after expanding the definitions soundness needs expanded. The ExpandENABLED
|
|
3
|
-
// and ExpandCdot frontends then replace each LAMBDA with an existential quantifier.
|
|
1
|
+
// A port of tlapm's Expr.Action.
|
|
4
2
|
|
|
5
3
|
import { TlaProofError, TlapmBugError, TlaProverError } from "../errors";
|
|
6
4
|
import type { Anonymizer } from "./anonymize";
|
|
@@ -26,8 +24,6 @@ import {
|
|
|
26
24
|
import { getLevelInfo, LEVEL_NUMBERS } from "./levels";
|
|
27
25
|
import { rewriteUnchanged } from "./temporal";
|
|
28
26
|
|
|
29
|
-
// Which of ENABLED and \cdot a pass handles, and whether it may expand the definitions that
|
|
30
|
-
// soundness needs expanded, as the AutoUSE directive allows.
|
|
31
27
|
interface ActionOptions {
|
|
32
28
|
isEnabled: boolean;
|
|
33
29
|
isCdot: boolean;
|
|
@@ -48,10 +44,8 @@ const NESTED_ENABLED =
|
|
|
48
44
|
const NESTED_CDOT =
|
|
49
45
|
"Nested occurrence of the operator `\\cdot` found in scope of `ENABLED` when expanding `ENABLED`. Using the proof directive `ExpandCdot` from the module `TLAPS` is expected to avoid this error.";
|
|
50
46
|
|
|
51
|
-
// Unlike auto_expansion_of_defs, tlapm puts a space before "For example" here.
|
|
52
47
|
const NESTED_CDOT_SPACED = `${NESTED_CDOT} For example, writing \`BY ExpandCdot\`.`;
|
|
53
48
|
|
|
54
|
-
// Visit.map_visible_hyp with no state.
|
|
55
49
|
const mapVisibleChildren = (expression: Expr, map: (child: Expr) => Expr) =>
|
|
56
50
|
mapScoped(
|
|
57
51
|
undefined,
|
|
@@ -88,8 +82,6 @@ const getInitialLevel = (level: number | undefined) =>
|
|
|
88
82
|
const getDecrementedLevel = (level: number | undefined) =>
|
|
89
83
|
level === undefined ? undefined : Math.max(1, level - 1);
|
|
90
84
|
|
|
91
|
-
// auto_expansion_of_defs. ENABLED and the first argument of \cdot need every definition of action
|
|
92
|
-
// level expanded, a prime lowers that bound to 1, and so does the second argument of \cdot.
|
|
93
85
|
const expandDefinitions = (
|
|
94
86
|
options: ActionOptions,
|
|
95
87
|
onWarning: Warn,
|
|
@@ -209,7 +201,6 @@ const expandDefinitions = (
|
|
|
209
201
|
);
|
|
210
202
|
};
|
|
211
203
|
|
|
212
|
-
// expand_propositional_action_operators: UNCHANGED v, [A]_v and <<A>>_v in terms of primes.
|
|
213
204
|
const expandPropositional = (expression: Expr): Expr => {
|
|
214
205
|
if (expression.kind === "Apply" && expression.args.length === 1) {
|
|
215
206
|
return rewriteUnchanged(expression.args[0]);
|
|
@@ -225,8 +216,7 @@ const expandPropositional = (expression: Expr): Expr => {
|
|
|
225
216
|
);
|
|
226
217
|
};
|
|
227
218
|
|
|
228
|
-
|
|
229
|
-
const getHash = (text: string) => {
|
|
219
|
+
const getOcamlHash = (text: string) => {
|
|
230
220
|
const rotate = (value: number, amount: number) => (value << amount) | (value >>> (32 - amount));
|
|
231
221
|
const mix = (hash: number, data: number) => {
|
|
232
222
|
const word = Math.imul(rotate(Math.imul(data, 0xcc9e2d51), 15), 0x1b873593);
|
|
@@ -249,23 +239,18 @@ const getHash = (text: string) => {
|
|
|
249
239
|
return (hash ^ (hash >>> 16)) & 0x3fffffff;
|
|
250
240
|
};
|
|
251
241
|
|
|
252
|
-
// The keys of an OCaml Hashtbl.create 16 in Hashtbl.to_seq_keys order. Hashtbl.add prepends to a
|
|
253
|
-
// bucket and doubles the buckets once the table holds more than twice their count.
|
|
254
242
|
const getHashtblKeys = (names: string[]) => {
|
|
255
243
|
let buckets: string[][] = Array.from({ length: 16 }, () => []);
|
|
256
244
|
names.forEach((name, index) => {
|
|
257
|
-
buckets[
|
|
245
|
+
buckets[getOcamlHash(name) & (buckets.length - 1)].unshift(name);
|
|
258
246
|
if (index + 1 <= buckets.length * 2) return;
|
|
259
247
|
const resized: string[][] = Array.from({ length: buckets.length * 2 }, () => []);
|
|
260
|
-
buckets.flat().forEach((key) => resized[
|
|
248
|
+
buckets.flat().forEach((key) => resized[getOcamlHash(key) & (resized.length - 1)].push(key));
|
|
261
249
|
buckets = resized;
|
|
262
250
|
});
|
|
263
251
|
return buckets.flat();
|
|
264
252
|
};
|
|
265
253
|
|
|
266
|
-
// lambdify_action_operators. A variable met directly binds into current, and one met under a prime
|
|
267
|
-
// into primed. ENABLED A binds the primes of A, and A \cdot B binds those of A and the unprimed
|
|
268
|
-
// variables of B, each as an opaque name such as x#enabled#prime1.
|
|
269
254
|
const bindVariables = (
|
|
270
255
|
options: ActionOptions,
|
|
271
256
|
onWarning: Warn,
|
|
@@ -354,8 +339,6 @@ const bindVariables = (
|
|
|
354
339
|
);
|
|
355
340
|
};
|
|
356
341
|
|
|
357
|
-
// shift_indices_after_lambdify, a Subst.map_visible_hyp that makes room in each new LAMBDA body
|
|
358
|
-
// for its parameters and drops the placeholder parameter.
|
|
359
342
|
const shiftIndices = (substitution: Substitution, expression: Expr): Expr => {
|
|
360
343
|
if (expression.kind === "Apply" && isActionOperator(expression.operator)) {
|
|
361
344
|
const [lambda] = expression.args;
|
|
@@ -387,7 +370,6 @@ const shiftIndices = (substitution: Substitution, expression: Expr): Expr => {
|
|
|
387
370
|
return mapScoped(substitution, expression, shiftIndices, (current) => bumpBy(1, current));
|
|
388
371
|
};
|
|
389
372
|
|
|
390
|
-
// normalize_lambda_param_names.
|
|
391
373
|
const renameParams = (isKeepingNames: boolean, expression: Expr): Expr => {
|
|
392
374
|
if (expression.kind === "Apply" && isActionOperator(expression.operator)) {
|
|
393
375
|
const [lambda] = expression.args;
|
|
@@ -413,7 +395,6 @@ const renameParams = (isKeepingNames: boolean, expression: Expr): Expr => {
|
|
|
413
395
|
return mapVisibleChildren(expression, (child) => renameParams(isKeepingNames, child));
|
|
414
396
|
};
|
|
415
397
|
|
|
416
|
-
// check_arity.
|
|
417
398
|
const checkArity = (expression: Expr): Expr => {
|
|
418
399
|
if (
|
|
419
400
|
isBuiltinApply(expression, "Cdot") &&
|
|
@@ -425,7 +406,6 @@ const checkArity = (expression: Expr): Expr => {
|
|
|
425
406
|
return mapVisibleChildren(expression, checkArity);
|
|
426
407
|
};
|
|
427
408
|
|
|
428
|
-
// lambdify_action_operators#expand.
|
|
429
409
|
const lambdifyOperators = (
|
|
430
410
|
anonymizer: Anonymizer,
|
|
431
411
|
onWarning: Warn,
|
|
@@ -451,8 +431,6 @@ export const lambdify = (
|
|
|
451
431
|
return checkArity(lambdifyOperators(anonymizer, onWarning, scope, expanded, options, false));
|
|
452
432
|
};
|
|
453
433
|
|
|
454
|
-
// replace_action_operators_with_quantifiers: each lambdified ENABLED or \cdot that the frontend
|
|
455
|
-
// expands becomes \E over the parameters of its LAMBDA.
|
|
456
434
|
const replaceWithQuantifiers = (
|
|
457
435
|
options: ActionOptions,
|
|
458
436
|
onWarning: Warn,
|
|
@@ -521,7 +499,6 @@ const replaceWithQuantifiers = (
|
|
|
521
499
|
);
|
|
522
500
|
};
|
|
523
501
|
|
|
524
|
-
// commute_exists_disjunction: \E x : A \/ B as (\E x : A) \/ (\E x : B), everywhere.
|
|
525
502
|
const commuteExistsDisjunction = (expression: Expr): Expr => {
|
|
526
503
|
if (expression.kind === "Quant" && expression.quantifier === "Exists") {
|
|
527
504
|
const body = expression.body;
|
|
@@ -542,7 +519,6 @@ const commuteExistsDisjunction = (expression: Expr): Expr => {
|
|
|
542
519
|
return mapVisibleChildren(expression, commuteExistsDisjunction);
|
|
543
520
|
};
|
|
544
521
|
|
|
545
|
-
// expand_action_operators, the ExpandENABLED and ExpandCdot frontends.
|
|
546
522
|
export const expandActionOperators = (
|
|
547
523
|
anonymizer: Anonymizer,
|
|
548
524
|
onWarning: Warn,
|