tla-ts 0.0.9 → 0.0.10-dev.b4a856304
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 +72 -10
- package/dist/index.d.ts +72 -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 +128 -103
- package/dist/transfer.js +128 -103
- package/dist/worker.cjs +7 -7
- package/dist/worker.js +7 -7
- package/package.json +3 -1
- package/src/ast.ts +7 -21
- package/src/bags.ts +99 -99
- package/src/builtins.ts +44 -75
- package/src/bundled-modules.ts +1 -8
- package/src/check.ts +576 -300
- package/src/cli/options.ts +11 -6
- package/src/cli/run.ts +2 -2
- package/src/cli/runtime-invariants.ts +135 -0
- package/src/cli/shared.ts +20 -9
- package/src/cli/tlapm.ts +0 -12
- package/src/cli/tlc-arguments.ts +646 -0
- package/src/cli/tlc-usage.ts +362 -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 +630 -297
- 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 +2 -12
- package/src/json-reader.ts +456 -0
- package/src/json.ts +262 -139
- package/src/levels.ts +2 -3
- package/src/lexer.ts +17 -26
- package/src/liveness-checker.ts +10 -18
- package/src/liveness.ts +121 -49
- 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 +29 -13
- package/src/parser.ts +436 -90
- package/src/pcal/ast.ts +7 -28
- package/src/pcal/parse.ts +11 -39
- package/src/pcal/tokenize.ts +4 -20
- package/src/pcal/translate.ts +10 -42
- package/src/pcal/validate.ts +3 -21
- package/src/pretty-print.ts +1 -2
- 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 +84 -35
- package/src/resolve.ts +18 -60
- package/src/runtime.ts +11 -4
- package/src/sany/builtins.ts +3 -4
- package/src/sany/generator.ts +119 -169
- package/src/sany/levels.ts +6 -30
- package/src/sany/lexer.ts +7 -23
- package/src/sany/linter.ts +1 -8
- 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 +494 -154
- package/src/simulate.ts +694 -0
- package/src/spec-description.ts +166 -48
- package/src/standard-definitions.ts +2 -3
- package/src/standard-modules.ts +264 -68
- package/src/state-graph.ts +51 -18
- package/src/subexpressions.ts +31 -5
- package/src/substitution-levels.ts +2 -3
- package/src/successors.ts +267 -77
- package/src/symmetry.ts +31 -8
- package/src/tableau.ts +27 -24
- package/src/tlc/fingerprint.ts +183 -61
- package/src/tlc/jar-data.ts +113 -6
- package/src/tlc/messages.ts +122 -37
- package/src/tlc/order.ts +33 -38
- package/src/tlc/random.ts +16 -16
- package/src/tlc/replay.ts +563 -211
- package/src/tlc/summary.ts +2 -4
- package/src/tlc/tlc-operators.ts +81 -36
- package/src/tlc/tlcext-operators.ts +138 -117
- package/src/tlc/trace-spec.ts +273 -0
- package/src/tlc/value-stream.ts +143 -0
- package/src/tlc/version.ts +2 -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 +826 -276
- package/src/worker.ts +7 -8
|
@@ -1,7 +1,4 @@
|
|
|
1
1
|
// Ported from Zenon's ext_tla.ml, as shipped in tlapm. Copyright 2008 INRIA, see LICENSE.
|
|
2
|
-
//
|
|
3
|
-
// The TLA+ extension: rules for set theory, functions, records, tuples, CHOOSE, IF and CASE, and
|
|
4
|
-
// rewriting a subterm with an equality on the branch.
|
|
5
2
|
|
|
6
3
|
import {
|
|
7
4
|
FALSE,
|
|
@@ -12,9 +9,9 @@ import {
|
|
|
12
9
|
type NegatedRelationExpr,
|
|
13
10
|
type RelationExpr,
|
|
14
11
|
} from "../expr";
|
|
15
|
-
import type { Node
|
|
12
|
+
import type { Node } from "../node";
|
|
16
13
|
import type { Phrase } from "../parse";
|
|
17
|
-
import { makeRule
|
|
14
|
+
import { makeRule } from "../proof";
|
|
18
15
|
import { getFunctionNodes, getFunctionSetNodes } from "./functions";
|
|
19
16
|
import { getRecordNodes, getTupleNodes } from "./records";
|
|
20
17
|
import { getRewriteNodes } from "./rewrites";
|
|
@@ -50,7 +47,6 @@ const OTHER_SYMBOLS = [
|
|
|
50
47
|
"TLA.box",
|
|
51
48
|
];
|
|
52
49
|
|
|
53
|
-
// The symbols that hypotheses can't define, as Zenon's predef with the tla extension.
|
|
54
50
|
export const PREDEFINED_SYMBOLS = [
|
|
55
51
|
"=",
|
|
56
52
|
...SET_CONSTRUCTORS,
|
|
@@ -58,7 +54,7 @@ export const PREDEFINED_SYMBOLS = [
|
|
|
58
54
|
...OTHER_SYMBOLS,
|
|
59
55
|
];
|
|
60
56
|
|
|
61
|
-
const
|
|
57
|
+
const makeDefinition = (
|
|
62
58
|
exprs: Expressions,
|
|
63
59
|
name: string,
|
|
64
60
|
symbol: string,
|
|
@@ -75,13 +71,12 @@ const definition = (
|
|
|
75
71
|
},
|
|
76
72
|
});
|
|
77
73
|
|
|
78
|
-
// Zenon's built_in_defs. Expressions belong to one run of the prover, so each run builds them.
|
|
79
74
|
export const getBuiltInDefinitions = (exprs: Expressions): Phrase[] => {
|
|
80
75
|
const bound = exprs.evar("x");
|
|
81
|
-
const
|
|
76
|
+
const membership = exprs.eapp("TLA.in", [bound, exprs.evar("S")]);
|
|
82
77
|
const holds = exprs.eapp("P", [bound]);
|
|
83
78
|
return [
|
|
84
|
-
|
|
79
|
+
makeDefinition(
|
|
85
80
|
exprs,
|
|
86
81
|
"subset_def",
|
|
87
82
|
"TLA.subseteq",
|
|
@@ -91,28 +86,28 @@ export const getBuiltInDefinitions = (exprs: Expressions): Phrase[] => {
|
|
|
91
86
|
exprs.elam(bound, "", exprs.eapp("TLA.in", [bound, exprs.evar("B")])),
|
|
92
87
|
]),
|
|
93
88
|
),
|
|
94
|
-
|
|
89
|
+
makeDefinition(
|
|
95
90
|
exprs,
|
|
96
91
|
"bAll_def",
|
|
97
92
|
"TLA.bAll",
|
|
98
93
|
["S", "P"],
|
|
99
|
-
exprs.eall(bound, "", exprs.eimply(
|
|
94
|
+
exprs.eall(bound, "", exprs.eimply(membership, holds)),
|
|
100
95
|
),
|
|
101
|
-
|
|
96
|
+
makeDefinition(
|
|
102
97
|
exprs,
|
|
103
98
|
"bEx_def",
|
|
104
99
|
"TLA.bEx",
|
|
105
100
|
["S", "P"],
|
|
106
|
-
exprs.eex(bound, "", exprs.eand(
|
|
101
|
+
exprs.eex(bound, "", exprs.eand(membership, holds)),
|
|
107
102
|
),
|
|
108
|
-
|
|
103
|
+
makeDefinition(
|
|
109
104
|
exprs,
|
|
110
105
|
"bChoose_def",
|
|
111
106
|
"TLA.bChoice",
|
|
112
107
|
["S", "P"],
|
|
113
|
-
exprs.etau(bound, "", exprs.eand(
|
|
108
|
+
exprs.etau(bound, "", exprs.eand(membership, holds)),
|
|
114
109
|
),
|
|
115
|
-
|
|
110
|
+
makeDefinition(
|
|
116
111
|
exprs,
|
|
117
112
|
"prod_def",
|
|
118
113
|
"TLA.prod",
|
|
@@ -122,7 +117,6 @@ export const getBuiltInDefinitions = (exprs: Expressions): Phrase[] => {
|
|
|
122
117
|
];
|
|
123
118
|
};
|
|
124
119
|
|
|
125
|
-
// The elements of a set given by enumeration, and whether it may hold more.
|
|
126
120
|
const getSetValues = (set: Expr): [Expr[], boolean] => {
|
|
127
121
|
if (isVariable(set, "TLA.emptyset")) return [[], false];
|
|
128
122
|
if (isApp(set, "TLA.upair", 2)) return [set.args, false];
|
|
@@ -145,34 +139,45 @@ const getBooleanNodes = (literal: Literal): Item[] | undefined => {
|
|
|
145
139
|
const isNegated = literal.isNegated;
|
|
146
140
|
const atom = literal.atom;
|
|
147
141
|
const relation = literal.relation;
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
const instance = (priority: Priority, quantified: Expr, term: Expr) =>
|
|
151
|
-
makeInstanceNode(literal, priority, quantified, term);
|
|
152
|
-
if (atom.kind === "meta") return instance("arity", atom.args[0], isNegated ? TRUE : FALSE);
|
|
142
|
+
if (atom.kind === "meta")
|
|
143
|
+
return makeInstanceNode(literal, "arity", atom.args[0], isNegated ? TRUE : FALSE);
|
|
153
144
|
if (relation?.symbol !== "=") return undefined;
|
|
154
145
|
const left = relation.args[0];
|
|
155
146
|
const right = relation.args[1];
|
|
156
147
|
if (right.kind === "true")
|
|
157
148
|
return isNegated
|
|
158
|
-
?
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
149
|
+
? makeExtensionNode(
|
|
150
|
+
literal,
|
|
151
|
+
"prop",
|
|
152
|
+
makeRule("noteq_x_true", [formula, exprs.enot(left), left]),
|
|
153
|
+
[[exprs.enot(left)]],
|
|
154
|
+
)
|
|
155
|
+
: makeExtensionNode(literal, "prop", makeRule("eq_x_true", [formula, left, left]), [[left]]);
|
|
162
156
|
if (left.kind === "true")
|
|
163
157
|
return isNegated
|
|
164
|
-
?
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
158
|
+
? makeExtensionNode(
|
|
159
|
+
literal,
|
|
160
|
+
"prop",
|
|
161
|
+
makeRule("noteq_true_x", [formula, exprs.enot(right), right]),
|
|
162
|
+
[[exprs.enot(right)]],
|
|
163
|
+
)
|
|
164
|
+
: makeExtensionNode(literal, "prop", makeRule("eq_true_x", [formula, right, right]), [
|
|
165
|
+
[right],
|
|
166
|
+
]);
|
|
168
167
|
if (!isNegated && right.kind === "false")
|
|
169
|
-
return
|
|
170
|
-
|
|
171
|
-
|
|
168
|
+
return makeExtensionNode(
|
|
169
|
+
literal,
|
|
170
|
+
"prop",
|
|
171
|
+
makeRule("eq_x_false", [formula, exprs.enot(left), left]),
|
|
172
|
+
[[exprs.enot(left)]],
|
|
173
|
+
);
|
|
172
174
|
if (!isNegated && left.kind === "false")
|
|
173
|
-
return
|
|
174
|
-
|
|
175
|
-
|
|
175
|
+
return makeExtensionNode(
|
|
176
|
+
literal,
|
|
177
|
+
"prop",
|
|
178
|
+
makeRule("eq_false_x", [formula, exprs.enot(right), right]),
|
|
179
|
+
[[exprs.enot(right)]],
|
|
180
|
+
);
|
|
176
181
|
return undefined;
|
|
177
182
|
};
|
|
178
183
|
|
|
@@ -182,8 +187,6 @@ const getChoiceNodes = (literal: Literal): Item[] | undefined => {
|
|
|
182
187
|
const goalness = literal.goalness;
|
|
183
188
|
const isNegated = literal.isNegated;
|
|
184
189
|
const relation = literal.relation;
|
|
185
|
-
const node = (priority: Priority, rule: Rule, branches: Expr[][]) =>
|
|
186
|
-
makeExtensionNode(literal, priority, rule, branches);
|
|
187
190
|
if (relation === undefined) return undefined;
|
|
188
191
|
const left = relation.args[0];
|
|
189
192
|
const right = relation.args[1];
|
|
@@ -200,7 +203,8 @@ const getChoiceNodes = (literal: Literal): Item[] | undefined => {
|
|
|
200
203
|
const leftBody = exprs.substitute([[left.args[0], bound]], left.args[1]);
|
|
201
204
|
const rightBody = exprs.substitute([[right.args[0], bound]], right.args[1]);
|
|
202
205
|
const differ = exprs.eex(bound, left.symbol, exprs.eapp("$notequiv", [leftBody, rightBody]));
|
|
203
|
-
return
|
|
206
|
+
return makeExtensionNode(
|
|
207
|
+
literal,
|
|
204
208
|
{ instance: differ },
|
|
205
209
|
makeRule("choose_diff_choose", [
|
|
206
210
|
formula,
|
|
@@ -212,7 +216,9 @@ const getChoiceNodes = (literal: Literal): Item[] | undefined => {
|
|
|
212
216
|
);
|
|
213
217
|
}
|
|
214
218
|
if (!isNegated && relation.symbol === "$notequiv")
|
|
215
|
-
return
|
|
219
|
+
return makeExtensionNode(literal, "arity", makeRule("notequivdef", []), [
|
|
220
|
+
[exprs.enot(exprs.eequiv(left, right))],
|
|
221
|
+
]);
|
|
216
222
|
const choice = right.kind === "tau" ? right : left.kind === "tau" ? left : undefined;
|
|
217
223
|
if (isNegated && isEquality && choice !== undefined) {
|
|
218
224
|
const term = right.kind === "tau" ? left : right;
|
|
@@ -238,7 +244,6 @@ const getChoiceNodes = (literal: Literal): Item[] | undefined => {
|
|
|
238
244
|
return undefined;
|
|
239
245
|
};
|
|
240
246
|
|
|
241
|
-
// The bounded quantifier over an enumerated set in \A x : x \in S => P or ~\E x : x \in S /\ P.
|
|
242
247
|
const getEnumeratedQuantifier = (formula: Expr) => {
|
|
243
248
|
const isEnumerated = (set: Expr) =>
|
|
244
249
|
isVariable(set, "TLA.emptyset") ||
|
|
@@ -266,14 +271,11 @@ const getEnumeratedQuantifier = (formula: Expr) => {
|
|
|
266
271
|
};
|
|
267
272
|
|
|
268
273
|
const getEnumeratedNodes = (literal: Literal): Item[] | undefined => {
|
|
269
|
-
const
|
|
270
|
-
const instance = (priority: Priority, quantified: Expr, term: Expr) =>
|
|
271
|
-
makeInstanceNode(literal, priority, quantified, term);
|
|
272
|
-
const enumerated = getEnumeratedQuantifier(formula);
|
|
274
|
+
const enumerated = getEnumeratedQuantifier(literal.formula);
|
|
273
275
|
if (enumerated !== undefined) {
|
|
274
276
|
const values = getSetValues(enumerated.set);
|
|
275
277
|
const nodes: Item[] = values[0].flatMap((value) =>
|
|
276
|
-
|
|
278
|
+
makeInstanceNode(literal, "arity", enumerated.quantified, value),
|
|
277
279
|
);
|
|
278
280
|
return values[1] ? nodes : [...nodes, "stop"];
|
|
279
281
|
}
|
|
@@ -285,19 +287,21 @@ const getNaturalNodes = (literal: Literal): Item[] | undefined => {
|
|
|
285
287
|
const formula = literal.formula;
|
|
286
288
|
const isNegated = literal.isNegated;
|
|
287
289
|
const relation = literal.relation;
|
|
288
|
-
const node = (priority: Priority, rule: Rule, branches: Expr[][]) =>
|
|
289
|
-
makeExtensionNode(literal, priority, rule, branches);
|
|
290
|
-
const instance = (priority: Priority, quantified: Expr, term: Expr) =>
|
|
291
|
-
makeInstanceNode(literal, priority, quantified, term);
|
|
292
290
|
if (isNegated && relation?.symbol === "TLA.in" && isVariable(relation.args[1], "arith.N")) {
|
|
293
291
|
const left = relation.args[0];
|
|
294
|
-
if (isVariable(left, "0"))
|
|
292
|
+
if (isVariable(left, "0"))
|
|
293
|
+
return makeExtensionNode(literal, "prop", makeRule("in_nat_0", [formula]), []);
|
|
295
294
|
if (isApp(left, "TLA.fapply", 2) && isVariable(left.args[0], "TLA.Succ")) {
|
|
296
295
|
const previous = exprs.enot(member(exprs, left.args[1], exprs.evar("arith.N")));
|
|
297
|
-
return
|
|
296
|
+
return makeExtensionNode(
|
|
297
|
+
literal,
|
|
298
|
+
"prop",
|
|
299
|
+
makeRule("in_nat_succ", [formula, previous, left.args[1]]),
|
|
300
|
+
[[previous]],
|
|
301
|
+
);
|
|
298
302
|
}
|
|
299
303
|
if (left.kind === "meta")
|
|
300
|
-
return
|
|
304
|
+
return makeInstanceNode(literal, { instance: left.args[0] }, left.args[0], exprs.evar("0"));
|
|
301
305
|
}
|
|
302
306
|
return undefined;
|
|
303
307
|
};
|
|
@@ -326,8 +330,6 @@ const getPropNodes = (context: TlaContext, formula: Expr, goalness: number): Ite
|
|
|
326
330
|
);
|
|
327
331
|
};
|
|
328
332
|
|
|
329
|
-
// Zenon's newnodes_inst_bounded: instantiates \A x \in S : P and ~\E x \in S : P with the terms
|
|
330
|
-
// known to be in S.
|
|
331
333
|
const getBoundedInstances = (context: TlaContext, formula: Expr, goalness: number): Node[] => {
|
|
332
334
|
const exprs = context.exprs;
|
|
333
335
|
const index = context.index;
|
|
@@ -491,8 +493,7 @@ export const getExtensionNodes = (
|
|
|
491
493
|
formula: Expr,
|
|
492
494
|
goalness: number,
|
|
493
495
|
): ExtensionNodes => {
|
|
494
|
-
// OCaml evaluates the operands of @ right to left, so the last rules run first
|
|
495
|
-
// decides the names of fresh variables.
|
|
496
|
+
// OCaml evaluates the operands of @ right to left, so the last rules run first, which decides the names of fresh variables.
|
|
496
497
|
const bounded = getBoundedInstances(context, formula, goalness);
|
|
497
498
|
const right = getEqualityPropositionNodes(context, formula, false);
|
|
498
499
|
const left = getEqualityPropositionNodes(context, formula, true);
|
package/src/randomization.ts
CHANGED
|
@@ -1,18 +1,19 @@
|
|
|
1
|
-
import {
|
|
2
|
-
|
|
3
|
-
createModuleArgumentError,
|
|
4
|
-
defineStateOperator,
|
|
5
|
-
getValue,
|
|
6
|
-
} from "./builtins";
|
|
1
|
+
import { createModuleArgumentError, defineOperator, getValue, overrideWithJava } from "./builtins";
|
|
2
|
+
import { TlaEvaluationError } from "./errors";
|
|
7
3
|
import type { Builtin, BuiltinArgument } from "./evaluate";
|
|
8
4
|
import type { CheckerRuntime } from "./runtime";
|
|
9
5
|
import { getEnumeratedFactors, getRandomSubset, type JavaRandom } from "./tlc/random";
|
|
10
6
|
import {
|
|
11
7
|
createSet,
|
|
12
8
|
createTuple,
|
|
13
|
-
|
|
9
|
+
getCardinality,
|
|
10
|
+
isTlcEnumerable,
|
|
14
11
|
isEnumerable,
|
|
12
|
+
isFiniteSet,
|
|
13
|
+
isOverriddenSet,
|
|
15
14
|
isSetValue,
|
|
15
|
+
getMaximumSetSize,
|
|
16
|
+
getSetBoundMessage,
|
|
16
17
|
toFiniteSet,
|
|
17
18
|
type Value,
|
|
18
19
|
} from "./values";
|
|
@@ -20,9 +21,6 @@ import {
|
|
|
20
21
|
const RANDOM_SUBSET_SIGNATURE =
|
|
21
22
|
"public static tlc2.value.impl.Value tlc2.module.Randomization.RandomSubset(tlc2.value.impl.Value,tlc2.value.impl.Value)";
|
|
22
23
|
|
|
23
|
-
// TLCGlobals.setBound: TLC 1.7.4's ValueVec holds at most this many elements of a set.
|
|
24
|
-
const SET_BOUND_174 = 1000000;
|
|
25
|
-
|
|
26
24
|
const getCount = (value: Value, position: string, name: string) => {
|
|
27
25
|
if (typeof value !== "number" || value < 0) {
|
|
28
26
|
throw createModuleArgumentError(position, name, "nonnegative integer", value);
|
|
@@ -30,7 +28,6 @@ const getCount = (value: Value, position: string, name: string) => {
|
|
|
30
28
|
return value;
|
|
31
29
|
};
|
|
32
30
|
|
|
33
|
-
// SubsetValue.CoinTossingSubsetEnumerator: each pick keeps each element with the probability.
|
|
34
31
|
const tossSubsets = (elements: Value[], picks: number, probability: number, random: JavaRandom) =>
|
|
35
32
|
createSet(
|
|
36
33
|
Array.from({ length: picks }, () =>
|
|
@@ -71,36 +68,88 @@ const getRandomSetOfSubsets = (args: BuiltinArgument[], runtime: CheckerRuntime)
|
|
|
71
68
|
);
|
|
72
69
|
};
|
|
73
70
|
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
71
|
+
const JAVA_DECIMAL = /^[+-]?(?:NaN|Infinity|(?:\d+\.?\d*|\.\d+)(?:[eE][+-]?\d+)?[fFdD]?)$/;
|
|
72
|
+
const JAVA_HEXADECIMAL = /^([+-]?)0[xX]([0-9a-fA-F]*)(?:\.([0-9a-fA-F]*))?[pP]([+-]?\d+)[fFdD]?$/;
|
|
73
|
+
|
|
74
|
+
const parseJavaDouble = (text: string) => {
|
|
75
|
+
const trimmed = text.replace(/^[^!-\uffff]+|[^!-\uffff]+$/g, "");
|
|
76
|
+
if (JAVA_DECIMAL.test(trimmed)) return Number(trimmed.replace(/[fFdD]$/, ""));
|
|
77
|
+
const hexadecimal = JAVA_HEXADECIMAL.exec(trimmed);
|
|
78
|
+
if (!hexadecimal) return undefined;
|
|
79
|
+
const fraction = hexadecimal[3] ?? "";
|
|
80
|
+
const digits = `${hexadecimal[2]}${fraction}`;
|
|
81
|
+
if (digits === "") return undefined;
|
|
82
|
+
const magnitude =
|
|
83
|
+
Number.parseInt(digits, 16) * 2 ** (Number(hexadecimal[4]) - 4 * fraction.length);
|
|
84
|
+
return hexadecimal[1] === "-" ? -magnitude : magnitude;
|
|
85
|
+
};
|
|
86
|
+
|
|
87
|
+
// TLC's Java class names the operator RandomSubsetSetProbability in its errors.
|
|
88
|
+
export const createRandomSubsetSet = (runtime: CheckerRuntime) =>
|
|
89
|
+
defineOperator("RandomSubsetSet", 3, (args) => {
|
|
90
|
+
const name = "RandomSubsetSetProbability";
|
|
91
|
+
const picks = getCount(getValue(args, 0, name), "first", name);
|
|
92
|
+
const text = getValue(args, 1, name);
|
|
93
|
+
if (typeof text !== "string") {
|
|
94
|
+
throw createModuleArgumentError(
|
|
95
|
+
"second",
|
|
96
|
+
name,
|
|
97
|
+
"string literal representing a probability",
|
|
98
|
+
text,
|
|
99
|
+
);
|
|
79
100
|
}
|
|
80
|
-
|
|
81
|
-
|
|
101
|
+
const probability = parseJavaDouble(text);
|
|
102
|
+
if (probability === undefined || probability < 0 || probability > 1) {
|
|
103
|
+
throw createModuleArgumentError(
|
|
104
|
+
"second",
|
|
105
|
+
name,
|
|
106
|
+
"string literal does not represent a parsable probability",
|
|
107
|
+
text,
|
|
108
|
+
);
|
|
82
109
|
}
|
|
83
|
-
const set = getValue(args,
|
|
84
|
-
if (!isSetValue(set) || (
|
|
85
|
-
throw createModuleArgumentError("
|
|
110
|
+
const set = getValue(args, 2, name);
|
|
111
|
+
if (!isSetValue(set) || isOverriddenSet(set) || !isFiniteSet(set)) {
|
|
112
|
+
throw createModuleArgumentError("third", name, "finite set", set);
|
|
86
113
|
}
|
|
87
|
-
const
|
|
88
|
-
if (
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
114
|
+
const size = getCardinality(set);
|
|
115
|
+
if (32 - Math.clz32(picks) > size && picks > 1 << size) {
|
|
116
|
+
throw createModuleArgumentError(
|
|
117
|
+
"first",
|
|
118
|
+
name,
|
|
119
|
+
`nonnegative integer that is smaller than the subset's size of 2^${size}`,
|
|
120
|
+
picks,
|
|
92
121
|
);
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
122
|
+
}
|
|
123
|
+
return tossSubsets(toFiniteSet(set).elements, picks, probability, runtime.getRandom());
|
|
124
|
+
});
|
|
125
|
+
|
|
126
|
+
export const createRandomizationOperators = (runtime: CheckerRuntime): Builtin[] => [
|
|
127
|
+
overrideWithJava(
|
|
128
|
+
defineOperator("RandomSubset", 2, (args) => {
|
|
129
|
+
const count = getValue(args, 0, "RandomSubset");
|
|
130
|
+
if (typeof count !== "number" || count < 0) {
|
|
131
|
+
throw createModuleArgumentError("first", "RandomSubset", "nonnegative integer", count);
|
|
132
|
+
}
|
|
133
|
+
const set = getValue(args, 1, "RandomSubset");
|
|
134
|
+
if (!isTlcEnumerable(set) || !isFiniteSet(set)) {
|
|
135
|
+
throw createModuleArgumentError("second", "RandomSubset", "a finite set", set);
|
|
136
|
+
}
|
|
137
|
+
const factors = getEnumeratedFactors(set, runtime.version);
|
|
138
|
+
if (factors) {
|
|
139
|
+
const size = factors.reduce<number>(
|
|
140
|
+
(total, factor) => total * toFiniteSet(factor).elements.length,
|
|
141
|
+
1,
|
|
97
142
|
);
|
|
143
|
+
if (size > getMaximumSetSize()) {
|
|
144
|
+
throw new TlaEvaluationError(getSetBoundMessage());
|
|
145
|
+
}
|
|
98
146
|
}
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
147
|
+
return createSet(getRandomSubset(count, set, runtime.getRandom(), runtime.version));
|
|
148
|
+
}),
|
|
149
|
+
RANDOM_SUBSET_SIGNATURE,
|
|
150
|
+
),
|
|
151
|
+
defineOperator("RandomSetOfSubsets", 3, (args) => getRandomSetOfSubsets(args, runtime)),
|
|
152
|
+
defineOperator("TestRandomSetOfSubsets", 3, (args) =>
|
|
104
153
|
createTuple(
|
|
105
154
|
Array.from(
|
|
106
155
|
{ length: 5 },
|