tla-ts 0.0.9 → 0.0.10-dev.63a6693bd
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 +29 -29
- package/dist/deciders.js +42 -42
- 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 +117 -37
- 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 +48 -62
- package/src/bags.ts +99 -102
- package/src/builtins.ts +28 -75
- package/src/bundled-modules.ts +1 -8
- package/src/check-failure.ts +116 -0
- package/src/check-trace.ts +282 -0
- package/src/check.ts +599 -754
- package/src/cli/options.ts +12 -32
- package/src/cli/run.ts +0 -2
- package/src/cli/runtime-invariants.ts +136 -0
- package/src/cli/shared.ts +19 -12
- package/src/cli/tlapm.ts +14 -25
- package/src/cli/tlc-arguments.ts +652 -0
- package/src/cli/tlc-output.ts +687 -0
- package/src/cli/tlc-usage.ts +361 -0
- package/src/cli/tlc.ts +309 -658
- package/src/cli/typescript.ts +23 -0
- package/src/cli/xml-exporter.ts +27 -49
- package/src/cli.ts +0 -1
- package/src/codegen.ts +196 -74
- package/src/config.ts +140 -109
- package/src/coverage.ts +830 -0
- package/src/dependencies.ts +14 -53
- package/src/dfid.ts +618 -0
- package/src/environment-config.ts +315 -0
- package/src/environment.ts +169 -335
- package/src/errors.ts +71 -55
- package/src/evaluate.ts +598 -340
- package/src/exit-codes.ts +37 -3
- package/src/fingerprints.ts +75 -11
- package/src/index.ts +3 -0
- package/src/instances.ts +126 -21
- package/src/java-hash.ts +7 -0
- package/src/java-overrides.ts +4 -19
- package/src/json-reader.ts +455 -0
- package/src/json.ts +252 -139
- package/src/levels.ts +46 -58
- package/src/lexer.ts +80 -100
- package/src/liveness-checker.ts +103 -153
- package/src/liveness.ts +150 -109
- package/src/obligations/action.ts +8 -39
- package/src/obligations/anonymize.ts +88 -82
- package/src/obligations/equality.ts +1 -1
- package/src/obligations/expression.ts +20 -21
- package/src/obligations/format.ts +1 -9
- package/src/obligations/generate.ts +46 -49
- package/src/obligations/index.ts +2 -13
- package/src/obligations/levels.ts +4 -8
- package/src/obligations/module.ts +28 -53
- package/src/obligations/normalize.ts +7 -25
- 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 +42 -58
- package/src/obligations/source.ts +48 -78
- package/src/obligations/subexpression.ts +5 -11
- package/src/obligations/substitution.ts +1 -3
- package/src/obligations/temporal.ts +13 -19
- package/src/obligations/tuples.ts +3 -9
- package/src/parallel-worker.ts +30 -60
- package/src/parallel.ts +57 -71
- package/src/parser.ts +584 -316
- 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 +8 -13
- package/src/prover/deciders.ts +3 -7
- 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 +114 -115
- package/src/prover/isabelle/isar/method.ts +29 -53
- 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 +26 -36
- package/src/prover/isabelle/isar/type-check.ts +17 -31
- package/src/prover/isabelle/provers/blast/blast.ts +17 -104
- 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 +28 -51
- package/src/prover/isabelle/pure/bicompose.ts +25 -38
- package/src/prover/isabelle/pure/consts.ts +1 -7
- package/src/prover/isabelle/pure/conv.ts +3 -17
- package/src/prover/isabelle/pure/drule.ts +33 -42
- 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 +2 -15
- 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 +17 -62
- package/src/prover/isabelle/pure/rewriter.ts +31 -67
- 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 +3 -32
- package/src/prover/isabelle/pure/tactic.ts +12 -22
- package/src/prover/isabelle/pure/tactical.ts +48 -47
- 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 +27 -47
- 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 +17 -24
- package/src/prover/isabelle/tla/context.ts +15 -18
- package/src/prover/isabelle/tla/logic.ts +14 -32
- package/src/prover/isabelle/tla/simpdata.ts +46 -43
- package/src/prover/isabelle/tools/intuitionistic.ts +1 -10
- package/src/prover/ocaml.ts +0 -6
- package/src/prover/prep/action.ts +14 -54
- package/src/prover/prep/enabled-axioms.ts +12 -19
- package/src/prover/prep/fingerprint.ts +2 -21
- package/src/prover/prep/level-comparison.ts +8 -12
- package/src/prover/prep/md5.ts +0 -2
- package/src/prover/prep/methods.ts +33 -39
- package/src/prover/prep/normalize.ts +4 -28
- package/src/prover/prove-worker.ts +0 -2
- package/src/prover/prove.ts +87 -100
- 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 +20 -28
- package/src/prover/smt/data.ts +433 -424
- package/src/prover/smt/encode.ts +43 -52
- 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 +663 -667
- 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 -165
- package/src/prover/smt/solver/auf-solver.ts +8 -44
- 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 +7 -64
- 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 +4 -35
- 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 +1 -6
- 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 +7 -100
- 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 +9 -102
- 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 +36 -135
- 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 +18 -58
- 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 +3 -37
- package/src/prover/smt/solver/model-evaluator.ts +3 -29
- package/src/prover/smt/solver/model-finder.ts +15 -32
- package/src/prover/smt/solver/model-generator.ts +1 -12
- package/src/prover/smt/solver/model-macro-solver.ts +23 -88
- package/src/prover/smt/solver/nlsat/algebraic.ts +63 -159
- package/src/prover/smt/solver/nlsat/atoms.ts +25 -23
- package/src/prover/smt/solver/nlsat/evaluator.ts +17 -22
- package/src/prover/smt/solver/nlsat/explain.ts +10 -69
- package/src/prover/smt/solver/nlsat/interval-set.ts +9 -50
- package/src/prover/smt/solver/nlsat/levelwise.ts +49 -135
- package/src/prover/smt/solver/nlsat/mpbq.ts +3 -14
- package/src/prover/smt/solver/nlsat/polynomial.ts +29 -159
- package/src/prover/smt/solver/nlsat/solver.ts +18 -90
- package/src/prover/smt/solver/nlsat/types.ts +1 -8
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +2 -45
- 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 -52
- 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 +27 -47
- package/src/prover/smt/solver/quantifier-manager.ts +2 -13
- 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 +80 -131
- 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 +1 -7
- package/src/prover/smt/solver/theory-lra-final-check.ts +4 -22
- package/src/prover/smt/solver/theory-lra-internalize.ts +6 -43
- 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 +45 -40
- package/src/prover/tlapm/ocaml-marshal.ts +19 -21
- package/src/prover/tlapm/tlapm.ts +21 -20
- package/src/prover/verdict.ts +7 -2
- package/src/prover/zenon/check/check.ts +1 -11
- 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 +1 -6
- package/src/prover/zenon/check/relations.ts +2 -14
- package/src/prover/zenon/check/rewrites.ts +2 -21
- package/src/prover/zenon/check/sets.ts +40 -61
- package/src/prover/zenon/check/terms.ts +1 -19
- 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 +2 -13
- package/src/prover/zenon/equality-rules.ts +0 -4
- package/src/prover/zenon/expr.ts +8 -26
- package/src/prover/zenon/index-table.ts +26 -57
- package/src/prover/zenon/isar-case.ts +9 -19
- package/src/prover/zenon/isar.ts +36 -64
- package/src/prover/zenon/limits.ts +0 -4
- package/src/prover/zenon/llproof.ts +2 -20
- package/src/prover/zenon/mltoll.ts +66 -104
- package/src/prover/zenon/node.ts +1 -11
- package/src/prover/zenon/ocaml.ts +1 -17
- package/src/prover/zenon/parse.ts +4 -12
- 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 +5 -31
- package/src/prover/zenon/tla/functions.ts +59 -31
- package/src/prover/zenon/tla/llproof.ts +67 -76
- package/src/prover/zenon/tla/records.ts +57 -33
- package/src/prover/zenon/tla/rewrites.ts +12 -19
- package/src/prover/zenon/tla/sets.ts +83 -53
- package/src/prover/zenon/tla/terms.ts +0 -6
- package/src/prover/zenon/tla/tla.ts +66 -64
- package/src/randomization.ts +81 -35
- package/src/resolve.ts +67 -184
- package/src/runtime.ts +22 -22
- package/src/sany/builtins.ts +2 -5
- package/src/sany/generation.ts +394 -0
- package/src/sany/generator-def-entries.ts +210 -0
- package/src/sany/generator-definitions.ts +686 -0
- package/src/sany/generator-expressions.ts +1100 -0
- package/src/sany/generator-proofs.ts +662 -0
- package/src/sany/generator.ts +191 -2764
- package/src/sany/levels.ts +6 -34
- package/src/sany/lexer.ts +58 -77
- package/src/sany/linter.ts +1 -9
- package/src/sany/modules.ts +1 -5
- package/src/sany/nodes.ts +5 -43
- package/src/sany/parse-error.ts +39 -117
- package/src/sany/report.ts +32 -69
- package/src/sany/selectors.ts +49 -76
- package/src/sany/source.ts +1 -17
- package/src/sany/xml.ts +35 -117
- package/src/search.ts +541 -163
- package/src/simulate.ts +709 -0
- package/src/spec-description.ts +192 -100
- package/src/standard-definitions.ts +0 -4
- package/src/standard-modules.ts +264 -95
- package/src/state-graph.ts +52 -31
- package/src/subexpressions.ts +69 -52
- package/src/substitution-levels.ts +7 -7
- package/src/successors.ts +266 -99
- 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 +125 -54
- package/src/tlc/order.ts +39 -69
- package/src/tlc/random.ts +37 -49
- package/src/tlc/replay.ts +553 -228
- package/src/tlc/summary.ts +36 -47
- package/src/tlc/tlc-operators.ts +78 -44
- package/src/tlc/tlcext-operators.ts +139 -122
- package/src/tlc/trace-spec.ts +249 -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 +479 -0
- package/src/typescript/collections.ts +614 -0
- package/src/typescript/compile.ts +63 -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 +154 -0
- package/src/typescript/functions.ts +284 -0
- package/src/typescript/model.ts +162 -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 +167 -0
- package/src/typescript/types.ts +171 -0
- package/src/values.ts +832 -484
- package/src/worker.ts +7 -8
|
@@ -1,8 +1,3 @@
|
|
|
1
|
-
// Decides satisfiability of propositional linear temporal logic over infinite traces, the logic LS4
|
|
2
|
-
// decides. A tableau node is the set of formulas that must hold now. A SAT call per step picks the
|
|
3
|
-
// atoms and the formulas the next node must hold, and the formula is satisfiable when a reachable
|
|
4
|
-
// strongly connected component can fulfill every eventuality it postpones.
|
|
5
|
-
|
|
6
1
|
import type { Verdict } from "../verdict";
|
|
7
2
|
import { createSolver } from "./sat";
|
|
8
3
|
|
|
@@ -11,7 +6,6 @@ export type PtlFormula =
|
|
|
11
6
|
| { kind: "Not" | "Next" | "Always" | "Eventually"; body: PtlFormula }
|
|
12
7
|
| { kind: "And" | "Or" | "Implies" | "Equiv"; left: PtlFormula; right: PtlFormula };
|
|
13
8
|
|
|
14
|
-
// Formulas in negation normal form, numbered so that equal formulas share a number.
|
|
15
9
|
type Normal =
|
|
16
10
|
| { kind: "Constant"; value: boolean }
|
|
17
11
|
| { kind: "Literal"; atom: string; isPositive: boolean }
|
|
@@ -40,19 +34,19 @@ const createTable = () => {
|
|
|
40
34
|
};
|
|
41
35
|
const getConstant = (value: boolean) => intern(String(value), { kind: "Constant", value });
|
|
42
36
|
const getJunction = (kind: "And" | "Or", operands: number[]): number => {
|
|
43
|
-
const
|
|
37
|
+
const isAbsorbing = kind === "Or";
|
|
44
38
|
const children = new Set<number>();
|
|
45
39
|
for (const operand of operands) {
|
|
46
40
|
const normal = normals[operand];
|
|
47
41
|
if (normal.kind === "Constant") {
|
|
48
|
-
if (normal.value ===
|
|
42
|
+
if (normal.value === isAbsorbing) return operand;
|
|
49
43
|
continue;
|
|
50
44
|
}
|
|
51
45
|
if (normal.kind === kind) normal.children.forEach((child) => children.add(child));
|
|
52
46
|
else children.add(operand);
|
|
53
47
|
}
|
|
54
48
|
const sorted = [...children].sort((left, right) => left - right);
|
|
55
|
-
if (sorted.length === 0) return getConstant(!
|
|
49
|
+
if (sorted.length === 0) return getConstant(!isAbsorbing);
|
|
56
50
|
if (sorted.length === 1) return sorted[0];
|
|
57
51
|
return intern(`${kind}(${sorted.join(",")})`, { kind, children: sorted });
|
|
58
52
|
};
|
|
@@ -114,10 +108,6 @@ const createTable = () => {
|
|
|
114
108
|
return { normals, normalize };
|
|
115
109
|
};
|
|
116
110
|
|
|
117
|
-
// Every way to satisfy the formulas now, keeping only the steps that require the fewest next
|
|
118
|
-
// formulas and leave the fewest eventualities pending. A step that requires more of both can only
|
|
119
|
-
// do what a smaller one can, so dropping it keeps the decision complete. Undefined once isExpired
|
|
120
|
-
// turns true.
|
|
121
111
|
const getSteps = (
|
|
122
112
|
normals: Normal[],
|
|
123
113
|
formulas: number[],
|
|
@@ -128,8 +118,8 @@ const getSteps = (
|
|
|
128
118
|
const nexts = new Map<number, number>();
|
|
129
119
|
const pendings = new Map<number, number>();
|
|
130
120
|
const literals = new Map<number, number>();
|
|
131
|
-
|
|
132
|
-
const createVariable = () => ++
|
|
121
|
+
let variableCount = 0;
|
|
122
|
+
const createVariable = () => ++variableCount;
|
|
133
123
|
const getVariable = <Key>(variables: Map<Key, number>, key: Key) => {
|
|
134
124
|
const existing = variables.get(key);
|
|
135
125
|
if (existing !== undefined) return existing;
|
|
@@ -137,7 +127,6 @@ const getSteps = (
|
|
|
137
127
|
variables.set(key, variable);
|
|
138
128
|
return variable;
|
|
139
129
|
};
|
|
140
|
-
// Plaisted-Greenbaum: a formula's literal implies the formula, which suffices in normal form.
|
|
141
130
|
const encode = (formula: number): number => {
|
|
142
131
|
const cached = literals.get(formula);
|
|
143
132
|
if (cached !== undefined) return cached;
|
|
@@ -184,14 +173,12 @@ const getSteps = (
|
|
|
184
173
|
};
|
|
185
174
|
formulas.forEach((formula) => clauses.push([encode(formula)]));
|
|
186
175
|
const choices = [...nexts.values(), ...pendings.values()];
|
|
187
|
-
const solver = createSolver(
|
|
176
|
+
const solver = createSolver(variableCount, isExpired);
|
|
188
177
|
clauses.forEach(solver.addClause);
|
|
189
178
|
const steps: Step[] = [];
|
|
190
179
|
for (;;) {
|
|
191
180
|
const model = solver.solve([]);
|
|
192
181
|
if (typeof model === "string") return model === "unsat" ? steps : undefined;
|
|
193
|
-
// Drops each chosen variable that a model with no other choice can do without. A variable one
|
|
194
|
-
// pass keeps stays needed as the set shrinks, so the set that remains is minimal.
|
|
195
182
|
const minimal = choices.reduce<Int8Array | undefined>((current, choice) => {
|
|
196
183
|
if (current?.[choice] !== 1) return current;
|
|
197
184
|
const unchosen = choices.filter((other) => current[other] !== 1);
|
|
@@ -209,7 +196,6 @@ const getSteps = (
|
|
|
209
196
|
}
|
|
210
197
|
};
|
|
211
198
|
|
|
212
|
-
// Whether the formula is satisfiable, or unknown once isExpired turns true.
|
|
213
199
|
export const getSatisfiability = (formula: PtlFormula, isExpired: () => boolean): Verdict => {
|
|
214
200
|
const table = createTable();
|
|
215
201
|
const nodes: number[][] = [];
|
|
@@ -230,12 +216,12 @@ export const getSatisfiability = (formula: PtlFormula, isExpired: () => boolean)
|
|
|
230
216
|
if (!steps) return "unknown";
|
|
231
217
|
edges.push(steps.map((step) => ({ target: getNode(step.next), pending: step.pending })));
|
|
232
218
|
}
|
|
233
|
-
// Tarjan's algorithm, checking each component as it closes.
|
|
234
219
|
const indices = new Int32Array(nodes.length).fill(-1);
|
|
235
220
|
const lowlinks = new Int32Array(nodes.length);
|
|
236
221
|
const components = new Int32Array(nodes.length).fill(-1);
|
|
237
222
|
const stack: number[] = [];
|
|
238
|
-
|
|
223
|
+
let nextIndex = 0;
|
|
224
|
+
let componentCount = 0;
|
|
239
225
|
const isFair = (component: number) => {
|
|
240
226
|
const inner = edges.flatMap((outgoing, source) =>
|
|
241
227
|
components[source] === component
|
|
@@ -252,9 +238,9 @@ export const getSatisfiability = (formula: PtlFormula, isExpired: () => boolean)
|
|
|
252
238
|
return unfulfilled.length === 0;
|
|
253
239
|
};
|
|
254
240
|
const visit = (node: number): boolean => {
|
|
255
|
-
indices[node] =
|
|
256
|
-
lowlinks[node] =
|
|
257
|
-
|
|
241
|
+
indices[node] = nextIndex;
|
|
242
|
+
lowlinks[node] = nextIndex;
|
|
243
|
+
nextIndex++;
|
|
258
244
|
stack.push(node);
|
|
259
245
|
for (const edge of edges[node]) {
|
|
260
246
|
if (indices[edge.target] === -1) {
|
|
@@ -265,7 +251,7 @@ export const getSatisfiability = (formula: PtlFormula, isExpired: () => boolean)
|
|
|
265
251
|
}
|
|
266
252
|
}
|
|
267
253
|
if (lowlinks[node] !== indices[node]) return false;
|
|
268
|
-
const component =
|
|
254
|
+
const component = componentCount++;
|
|
269
255
|
for (let member = stack.pop(); member !== undefined; member = stack.pop()) {
|
|
270
256
|
components[member] = component;
|
|
271
257
|
if (member === node) break;
|
package/src/prover/smt/axioms.ts
CHANGED
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// encode/n_axioms.ml: the formulas of the axioms that depend on a count or on fields.
|
|
2
|
-
|
|
3
1
|
import {
|
|
4
2
|
call,
|
|
5
3
|
CAST_INT,
|
|
@@ -18,7 +16,6 @@ import {
|
|
|
18
16
|
} from "./format";
|
|
19
17
|
import { axiom, TYPED_SYMBOLS, type AxiomArgument } from "./table";
|
|
20
18
|
|
|
21
|
-
// The arithmetic symbols with a Typing axiom: each one's SMT-LIB operator and arity.
|
|
22
19
|
export const TYPED_OPERATORS: Record<string, [string, number]> = {
|
|
23
20
|
IntPlus: ["+", 2],
|
|
24
21
|
IntMinus: ["-", 2],
|
|
@@ -79,7 +76,6 @@ export const getIntegers = (count: number) =>
|
|
|
79
76
|
|
|
80
77
|
export const getFieldKeys = (fields: string[]) => fields.map((field) => tla(`StrLit_${field}`));
|
|
81
78
|
|
|
82
|
-
// TupExcept and RecExcept: updating one component of a tuple or record.
|
|
83
79
|
const getComponentExcepts = (
|
|
84
80
|
prefix: string,
|
|
85
81
|
args: AxiomArgument[],
|
|
@@ -104,8 +100,6 @@ export const getTupleExcepts = (count: number) =>
|
|
|
104
100
|
export const getRecordExcepts = (fields: string[]) =>
|
|
105
101
|
getComponentExcepts("Rec", [fields], tla(`Record_${fields.join("_")}`), getFieldKeys(fields));
|
|
106
102
|
|
|
107
|
-
// TupIsafcn, TupDomDef and TupAppDef, or their Rec counterparts: a tuple or record is the
|
|
108
|
-
// function from its keys to its components. The empty tuple has no domain or components to define.
|
|
109
103
|
const getComponentFunction = (
|
|
110
104
|
prefix: string,
|
|
111
105
|
args: AxiomArgument[],
|
|
@@ -172,7 +166,6 @@ export const getRecordAxioms = (fields: string[], isExcept: boolean) => [
|
|
|
172
166
|
...(isExcept ? getRecordExcepts(fields) : []),
|
|
173
167
|
];
|
|
174
168
|
|
|
175
|
-
// The set of tuples or records whose components are in the given sets.
|
|
176
169
|
export const getComponentSet = (
|
|
177
170
|
name: string,
|
|
178
171
|
args: AxiomArgument[],
|
|
@@ -1,8 +1,5 @@
|
|
|
1
|
-
// ctx.ml and backend/smtlib.ml's naming: each name is salted past the names in scope.
|
|
2
|
-
|
|
3
1
|
import { formatName } from "./format";
|
|
4
2
|
|
|
5
|
-
// A quantifier's variables, in scope until the quantifier's closing parenthesis.
|
|
6
3
|
interface QuantifierScope {
|
|
7
4
|
depth: number;
|
|
8
5
|
exits: (() => void)[];
|
|
@@ -16,8 +13,6 @@ export interface Identifier {
|
|
|
16
13
|
|
|
17
14
|
const getSaltedName = (base: string, salt: number) => (salt === 0 ? base : `${base}_${salt}`);
|
|
18
15
|
|
|
19
|
-
// Ctx.maybe_adj: a name is its formatted base, salted past the last one with that base and past
|
|
20
|
-
// every name in scope.
|
|
21
16
|
export const createContext = () => {
|
|
22
17
|
const salts = new Map<string, number>();
|
|
23
18
|
const names = new Set<string>();
|
|
@@ -30,7 +25,6 @@ export const createContext = () => {
|
|
|
30
25
|
) ?? start;
|
|
31
26
|
return { base, salt, name: getSaltedName(base, salt) };
|
|
32
27
|
};
|
|
33
|
-
// Brings an identifier into scope and returns how to take it out again.
|
|
34
28
|
const enter = (identifier: Identifier) => {
|
|
35
29
|
const previous = salts.get(identifier.base);
|
|
36
30
|
salts.set(identifier.base, identifier.salt);
|
|
@@ -44,11 +38,9 @@ export const createContext = () => {
|
|
|
44
38
|
return { names, adjoin, enter };
|
|
45
39
|
};
|
|
46
40
|
|
|
47
|
-
// Smtlib.pp_print_obligation names each declaration for the rest of the obligation, and each
|
|
48
|
-
// quantifier's variables within it, so a variable's name depends on the names in scope.
|
|
49
41
|
export const createPrinter = (declared: Map<string, Identifier>) => {
|
|
50
42
|
const context = createContext();
|
|
51
|
-
|
|
43
|
+
return (line: string) => {
|
|
52
44
|
const declaration = /^\(declare-fun (\S+)/.exec(line)?.[1];
|
|
53
45
|
if (declaration !== undefined) {
|
|
54
46
|
const identifier = declared.get(declaration);
|
|
@@ -60,42 +52,43 @@ export const createPrinter = (declared: Map<string, Identifier>) => {
|
|
|
60
52
|
const replacements = new Map<number, string>();
|
|
61
53
|
const renames = new Map<string, string[]>();
|
|
62
54
|
const scopes: QuantifierScope[] = [];
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
55
|
+
let position = 0;
|
|
56
|
+
let depth = 0;
|
|
57
|
+
while (position < tokens.length) {
|
|
58
|
+
const token = tokens[position][0];
|
|
66
59
|
const isQuantifier =
|
|
67
60
|
token === "(" &&
|
|
68
|
-
(tokens[
|
|
69
|
-
tokens[
|
|
61
|
+
(tokens[position + 1]?.[0] === "forall" || tokens[position + 1]?.[0] === "exists") &&
|
|
62
|
+
tokens[position + 2]?.[0] === "(";
|
|
70
63
|
if (isQuantifier) {
|
|
71
|
-
|
|
72
|
-
const scope: QuantifierScope = { depth
|
|
64
|
+
depth++;
|
|
65
|
+
const scope: QuantifierScope = { depth, exits: [] };
|
|
73
66
|
scopes.push(scope);
|
|
74
|
-
|
|
75
|
-
while (tokens[
|
|
76
|
-
const raw = tokens[
|
|
67
|
+
position += 3;
|
|
68
|
+
while (tokens[position]?.[0] === "(") {
|
|
69
|
+
const raw = tokens[position + 1][0];
|
|
77
70
|
const identifier = context.adjoin(raw.replace(/#\d+$/, ""));
|
|
78
71
|
const stack = renames.get(raw) ?? [];
|
|
79
72
|
renames.set(raw, [...stack, identifier.name]);
|
|
80
73
|
scope.exits.push(context.enter(identifier), () => renames.set(raw, stack));
|
|
81
|
-
replacements.set(
|
|
82
|
-
|
|
74
|
+
replacements.set(position + 1, identifier.name);
|
|
75
|
+
position += 4;
|
|
83
76
|
}
|
|
84
|
-
|
|
77
|
+
position++;
|
|
85
78
|
continue;
|
|
86
79
|
}
|
|
87
|
-
if (token === "(")
|
|
80
|
+
if (token === "(") depth++;
|
|
88
81
|
if (token === ")") {
|
|
89
|
-
if (scopes.at(-1)?.depth ===
|
|
82
|
+
if (scopes.at(-1)?.depth === depth)
|
|
90
83
|
scopes
|
|
91
84
|
.pop()
|
|
92
85
|
?.exits.toReversed()
|
|
93
86
|
.forEach((exit) => exit());
|
|
94
|
-
|
|
87
|
+
depth--;
|
|
95
88
|
}
|
|
96
89
|
const name = renames.get(token)?.at(-1);
|
|
97
|
-
if (name !== undefined) replacements.set(
|
|
98
|
-
|
|
90
|
+
if (name !== undefined) replacements.set(position, name);
|
|
91
|
+
position++;
|
|
99
92
|
}
|
|
100
93
|
return tokens
|
|
101
94
|
.map((match, index) => {
|
|
@@ -104,5 +97,4 @@ export const createPrinter = (declared: Map<string, Identifier>) => {
|
|
|
104
97
|
})
|
|
105
98
|
.join("");
|
|
106
99
|
};
|
|
107
|
-
return { resolve };
|
|
108
100
|
};
|