tla-ts 0.0.8-dev.d9bffda → 0.0.9-dev.0493be549
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 +30 -0
- 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 +80 -10
- package/dist/index.d.ts +80 -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 +605 -311
- package/src/cli/options.ts +12 -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 +545 -218
- 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 +632 -298
- 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 +31 -38
- package/src/parallel.ts +41 -17
- 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 +128 -176
- package/src/sany/levels.ts +6 -30
- package/src/sany/lexer.ts +7 -23
- package/src/sany/linter.ts +31 -29
- 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 +533 -174
- 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 +832 -255
- package/src/worker.ts +7 -8
|
@@ -1,6 +1,4 @@
|
|
|
1
|
-
// Ported from Z3 (src/smt/theory_lra.cpp), MIT license, see z3-license.txt.
|
|
2
|
-
// propagates: asserted bounds go to the lp solver, the tableau is made feasible, and implied bounds
|
|
3
|
-
// and equalities of fixed columns come back as literals and equalities.
|
|
1
|
+
// Ported from Z3 (src/smt/theory_lra.cpp), MIT license, see z3-license.txt.
|
|
4
2
|
import { OP_ITE, OP_SUB, SORT_BOOL } from "./ast";
|
|
5
3
|
import { TheoryJustification } from "./enode";
|
|
6
4
|
import { getIdentityHash, ObjMap } from "./hashtable";
|
|
@@ -55,7 +53,6 @@ export abstract class TheoryLraPropagate extends TheoryLraBounds {
|
|
|
55
53
|
this.propagateCore();
|
|
56
54
|
}
|
|
57
55
|
|
|
58
|
-
// propagate_core: whether there was anything to propagate.
|
|
59
56
|
protected propagateCore() {
|
|
60
57
|
const context = this.context;
|
|
61
58
|
this.isModelInitialized = false;
|
|
@@ -135,7 +132,6 @@ export abstract class TheoryLraPropagate extends TheoryLraBounds {
|
|
|
135
132
|
return true;
|
|
136
133
|
}
|
|
137
134
|
|
|
138
|
-
// propagate_eqs: a bound that fixes a column, with the opposite bound of the same value.
|
|
139
135
|
private propagateEqs(
|
|
140
136
|
column: number,
|
|
141
137
|
constraint: number,
|
|
@@ -151,7 +147,6 @@ export abstract class TheoryLraPropagate extends TheoryLraBounds {
|
|
|
151
147
|
this.fixedVarEh(bound.thVar, column, mkJoin(mkLeaf(constraint), opposite), value);
|
|
152
148
|
}
|
|
153
149
|
|
|
154
|
-
// set_bound: records the bound of a term column, or checks that a column has the bound.
|
|
155
150
|
private setTermBound(column: number, constraint: number, value: Rational, isLower: boolean) {
|
|
156
151
|
const solver = this.solver;
|
|
157
152
|
if (!solver.hasTerm(column)) {
|
|
@@ -172,7 +167,6 @@ export abstract class TheoryLraPropagate extends TheoryLraBounds {
|
|
|
172
167
|
return true;
|
|
173
168
|
}
|
|
174
169
|
|
|
175
|
-
// has_bound: the dependency of a bound of the column with the value, if it has one.
|
|
176
170
|
private getFixingBound(
|
|
177
171
|
column: number,
|
|
178
172
|
value: Rational,
|
|
@@ -199,7 +193,6 @@ export abstract class TheoryLraPropagate extends TheoryLraBounds {
|
|
|
199
193
|
return this.getEnode(first).root === this.getEnode(second).root;
|
|
200
194
|
}
|
|
201
195
|
|
|
202
|
-
// report_equality_of_fixed_vars: two columns fixed to the same value are equal.
|
|
203
196
|
protected reportEqualityOfFixedVars(first: number, second: number) {
|
|
204
197
|
const solver = this.solver;
|
|
205
198
|
const v1 = solver.getExternal(first);
|
|
@@ -220,8 +213,6 @@ export abstract class TheoryLraPropagate extends TheoryLraBounds {
|
|
|
220
213
|
this.assignEq(v1, v2);
|
|
221
214
|
}
|
|
222
215
|
|
|
223
|
-
// fixed_var_eh: a column fixed to a value is equal to an offset term, or to the variable of the
|
|
224
|
-
// numeral with that value.
|
|
225
216
|
private fixedVarEh(thVar: number, column: number, dep: Dependency, value: Rational) {
|
|
226
217
|
if (this.propagateOffsetEq(column, dep, value)) return;
|
|
227
218
|
const isInt = this.isIntVar(thVar);
|
|
@@ -238,7 +229,6 @@ export abstract class TheoryLraPropagate extends TheoryLraBounds {
|
|
|
238
229
|
this.assignEq(thVar, other);
|
|
239
230
|
}
|
|
240
231
|
|
|
241
|
-
// propagate_offset_eq: x - y fixed to 0 makes x and y equal.
|
|
242
232
|
private propagateOffsetEq(column: number, dep: Dependency, value: Rational) {
|
|
243
233
|
if (!value.isZero() || !this.solver.hasTerm(column)) return false;
|
|
244
234
|
const coeffs = this.getTermCoeffs(this.solver.getTerm(column));
|
|
@@ -254,8 +244,6 @@ export abstract class TheoryLraPropagate extends TheoryLraBounds {
|
|
|
254
244
|
return true;
|
|
255
245
|
}
|
|
256
246
|
|
|
257
|
-
// term2coeffs: the coefficients of the theory variables of a term, with term columns expanded,
|
|
258
|
-
// in the slot order of Z3's u_map.
|
|
259
247
|
protected getTermCoeffs(term: LarTerm) {
|
|
260
248
|
const coeffs = new ObjMap<Rational>(getIdentityHash);
|
|
261
249
|
const visit = (current: LarTerm, coeff: Rational) => {
|
|
@@ -281,7 +269,6 @@ export abstract class TheoryLraPropagate extends TheoryLraBounds {
|
|
|
281
269
|
});
|
|
282
270
|
}
|
|
283
271
|
|
|
284
|
-
// add_eq: an equality that the lp solver implies, with its explanation.
|
|
285
272
|
protected addEq(first: number, second: number, explanation: Explanation, isFixed: boolean) {
|
|
286
273
|
if (this.context.isInconsistent()) return false;
|
|
287
274
|
const v1 = this.solver.getExternal(first);
|
|
@@ -363,7 +350,6 @@ export abstract class TheoryLraPropagate extends TheoryLraBounds {
|
|
|
363
350
|
}
|
|
364
351
|
}
|
|
365
352
|
|
|
366
|
-
// is_bound_implied: the literal of the bound that the implied bound makes true or false.
|
|
367
353
|
private isBoundImplied(kind: ConstraintKind, value: Rational, bound: ApiBound) {
|
|
368
354
|
const literal = getAtomLiteral(bound);
|
|
369
355
|
const comparison = value.compare(bound.value);
|
|
@@ -1,10 +1,7 @@
|
|
|
1
|
-
// Ported from Z3 (src/smt/theory_lra.cpp), MIT license, see z3-license.txt.
|
|
2
|
-
|
|
3
|
-
// atoms, and what the scopes undo. The theory is a chain of classes, one file each, from this state
|
|
4
|
-
// to TheoryLra, so each part reaches the ones before it.
|
|
5
|
-
import { AstManager } from "./ast";
|
|
1
|
+
// Ported from Z3 (src/smt/theory_lra.cpp), MIT license, see z3-license.txt.
|
|
2
|
+
import type { AstManager } from "./ast";
|
|
6
3
|
import type { Context } from "./context";
|
|
7
|
-
import { Enode } from "./enode";
|
|
4
|
+
import type { Enode } from "./enode";
|
|
8
5
|
import { LarSolver } from "./lp/lar-solver";
|
|
9
6
|
|
|
10
7
|
export abstract class TheoryLraState {
|
|
@@ -19,8 +16,6 @@ export abstract class TheoryLraState {
|
|
|
19
16
|
return this.context.manager;
|
|
20
17
|
}
|
|
21
18
|
|
|
22
|
-
// get_enode, get_expr and get_num_vars: the theory reaches enodes only through these and
|
|
23
|
-
// isEqual.
|
|
24
19
|
getEnode(thVar: number) {
|
|
25
20
|
return this.varEnodes[thVar];
|
|
26
21
|
}
|
|
@@ -1,11 +1,4 @@
|
|
|
1
|
-
// Ported from Z3 (src/smt/theory_lra.cpp, src/smt/arith_eq_adapter.cpp, src/math/lp/lp_api.h), MIT
|
|
2
|
-
// license, see z3-license.txt. Linear integer and real arithmetic, as the theory_lra solver that
|
|
3
|
-
// Z3's default configuration uses for UFNIA. Terms become columns of the lp solver, integer or not
|
|
4
|
-
// by their sort, atoms become bounds on them, propagation makes the tableau feasible and propagates
|
|
5
|
-
// implied bounds and equalities, and the final check runs the integer solver and assumes equalities
|
|
6
|
-
// between shared terms with equal values. Nonlinear products and divisions go to nla
|
|
7
|
-
// (src/math/lp/nla_core.cpp), which refines the model with lemmas, and runs nlsat on what they
|
|
8
|
-
// leave open. This class adds the scopes to the chain of classes that theory-lra-state.ts starts.
|
|
1
|
+
// Ported from Z3 (src/smt/theory_lra.cpp, src/smt/arith_eq_adapter.cpp, src/math/lp/lp_api.h), MIT license, see z3-license.txt.
|
|
9
2
|
import { shrink } from "./array";
|
|
10
3
|
import { TheoryLraFinalCheck } from "./theory-lra-final-check";
|
|
11
4
|
|
|
@@ -1,12 +1,8 @@
|
|
|
1
|
-
// Ported from Z3 (src/ast/rewriter/var_subst.cpp), MIT license, see z3-license.txt.
|
|
2
|
-
// shifting of de Bruijn variables.
|
|
1
|
+
// Ported from Z3 (src/ast/rewriter/var_subst.cpp), MIT license, see z3-license.txt.
|
|
3
2
|
import { KIND_APP, KIND_QUANTIFIER, KIND_VAR, type AstManager, type SmtSymbol } from "./ast";
|
|
4
3
|
import { ExprSafeReplace } from "./expr-safe-replace";
|
|
5
4
|
import { BetaReducer } from "./rewriter-tpl";
|
|
6
5
|
|
|
7
|
-
// var_subst: substitutes args for the free variables, args[n - 1 - i] for (:var i) in standard
|
|
8
|
-
// order and args[i] otherwise, where -1 keeps the variable. Each result comes with a reference,
|
|
9
|
-
// which the caller releases.
|
|
10
6
|
export class VarSubst {
|
|
11
7
|
private reducer: BetaReducer;
|
|
12
8
|
|
|
@@ -61,14 +57,11 @@ export class VarSubst {
|
|
|
61
57
|
return this.reducer.rewrite(expr);
|
|
62
58
|
}
|
|
63
59
|
|
|
64
|
-
// ~var_subst.
|
|
65
60
|
release() {
|
|
66
61
|
this.reducer.release();
|
|
67
62
|
}
|
|
68
63
|
}
|
|
69
64
|
|
|
70
|
-
// A term whose children replaceFreeVars is rebuilding: where its children's results start on the
|
|
71
|
-
// result stack, and the next child to visit.
|
|
72
65
|
interface ReplaceFrame {
|
|
73
66
|
expr: number;
|
|
74
67
|
shift: number;
|
|
@@ -76,9 +69,6 @@ interface ReplaceFrame {
|
|
|
76
69
|
next: number;
|
|
77
70
|
}
|
|
78
71
|
|
|
79
|
-
// Rebuilds expr with each free variable replaced. replace gets the variable, its de Bruijn index
|
|
80
|
-
// relative to expr, and the number of binders above it. Like Z3's rewriter_tpl, it keeps its own
|
|
81
|
-
// stack, so deep terms do not exhaust the call stack.
|
|
82
72
|
export const replaceFreeVars = (
|
|
83
73
|
manager: AstManager,
|
|
84
74
|
expr: number,
|
|
@@ -108,7 +98,6 @@ export const replaceFreeVars = (
|
|
|
108
98
|
const frame = frames[frames.length - 1];
|
|
109
99
|
const current = frame.expr;
|
|
110
100
|
const data = manager.kinds[current] === KIND_QUANTIFIER ? manager.getQuantifier(current) : null;
|
|
111
|
-
// A quantifier's children are its body and its patterns, under its binders.
|
|
112
101
|
const numChildren = data === null ? manager.getNumArgs(current) : 1 + data.patterns.length;
|
|
113
102
|
if (frame.next < numChildren) {
|
|
114
103
|
const index = frame.next++;
|
|
@@ -129,9 +118,6 @@ export const replaceFreeVars = (
|
|
|
129
118
|
return results[0];
|
|
130
119
|
};
|
|
131
120
|
|
|
132
|
-
// used_vars::process: the sort of each free variable of expr below count, indexed by de Bruijn
|
|
133
|
-
// index, undefined for a variable that does not occur. Like Z3, it walks the term without rebuilding
|
|
134
|
-
// it, and visits a shared term once for each number of binders above it.
|
|
135
121
|
export const getFreeVarSorts = (manager: AstManager, expr: number, count: number) => {
|
|
136
122
|
const sorts: (number | undefined)[] = Array.from({ length: count }, () => undefined);
|
|
137
123
|
const exprs = [expr];
|
|
@@ -151,8 +137,7 @@ export const getFreeVarSorts = (manager: AstManager, expr: number, count: number
|
|
|
151
137
|
if (index < count && sorts[index] === undefined) sorts[index] = manager.sorts[current];
|
|
152
138
|
} else if (kind === KIND_APP)
|
|
153
139
|
for (let index = 0; index < manager.getNumArgs(current); index++) {
|
|
154
|
-
|
|
155
|
-
exprs.push(arg);
|
|
140
|
+
exprs.push(manager.getArg(current, index));
|
|
156
141
|
deltas.push(delta);
|
|
157
142
|
}
|
|
158
143
|
else {
|
|
@@ -166,12 +151,9 @@ export const getFreeVarSorts = (manager: AstManager, expr: number, count: number
|
|
|
166
151
|
return sorts;
|
|
167
152
|
};
|
|
168
153
|
|
|
169
|
-
// Which variables of a quantifier body occur, indexed by de Bruijn index.
|
|
170
154
|
export const collectUsedVars = (manager: AstManager, expr: number, count: number) =>
|
|
171
155
|
getFreeVarSorts(manager, expr, count).map((sort) => sort !== undefined);
|
|
172
156
|
|
|
173
|
-
// unused_vars_eliminator: drops the variables that neither the body nor a pattern uses. Its
|
|
174
|
-
// var_subst keeps the cache of its last substitution until the next one.
|
|
175
157
|
export class UnusedVarsEliminator {
|
|
176
158
|
private subst: VarSubst;
|
|
177
159
|
|
|
@@ -179,18 +161,15 @@ export class UnusedVarsEliminator {
|
|
|
179
161
|
this.subst = new VarSubst(manager, true);
|
|
180
162
|
}
|
|
181
163
|
|
|
182
|
-
// The result comes with a reference, which the caller releases.
|
|
183
164
|
apply(expr: number) {
|
|
184
165
|
const manager = this.manager;
|
|
185
166
|
return manager.withoutTemporaries(() => {
|
|
186
167
|
const data = manager.kinds[expr] === KIND_QUANTIFIER ? manager.getQuantifier(expr) : null;
|
|
187
|
-
// ignore_patterns_on_ground_qbody: a ground body drops the patterns with the variables.
|
|
188
168
|
const kept = data === null ? expr : manager.isGround(data.body) ? data.body : -1;
|
|
189
169
|
if (kept !== -1 || data === null) {
|
|
190
170
|
manager.incRef(kept);
|
|
191
171
|
return kept;
|
|
192
172
|
}
|
|
193
|
-
// used_vars: the sort of each free variable of the body and the patterns.
|
|
194
173
|
const usedSorts: (number | undefined)[] = [];
|
|
195
174
|
for (const term of [data.body, ...data.patterns])
|
|
196
175
|
getFreeVarSorts(manager, term, manager.freeVarBounds[term]).forEach((sort, index) => {
|
|
@@ -208,7 +187,6 @@ export class UnusedVarsEliminator {
|
|
|
208
187
|
keptSorts.push(sort);
|
|
209
188
|
keptNames.push(data.names[index]);
|
|
210
189
|
});
|
|
211
|
-
// var_mapping: (:var i) becomes the variable it moves to, and an unused variable stays.
|
|
212
190
|
const mapping: number[] = [];
|
|
213
191
|
let numRemoved = 0;
|
|
214
192
|
for (let index = 0; index < Math.max(numDecls, usedSorts.length); index++) {
|
|
@@ -242,13 +220,11 @@ export class UnusedVarsEliminator {
|
|
|
242
220
|
});
|
|
243
221
|
}
|
|
244
222
|
|
|
245
|
-
// ~unused_vars_eliminator.
|
|
246
223
|
release() {
|
|
247
224
|
this.subst.release();
|
|
248
225
|
}
|
|
249
226
|
}
|
|
250
227
|
|
|
251
|
-
// elim_unused_vars: unused_vars_eliminator with a var_subst of its own. The result is a temporary.
|
|
252
228
|
export const elimUnusedVars = (manager: AstManager, expr: number) => {
|
|
253
229
|
const eliminator = new UnusedVarsEliminator(manager);
|
|
254
230
|
const result = eliminator.apply(expr);
|
package/src/prover/smt/table.ts
CHANGED
|
@@ -1,9 +1,5 @@
|
|
|
1
|
-
// encode/n_table.ml: the axioms tlapm's SMT encoding can assert, in the order it prints them.
|
|
2
|
-
|
|
3
1
|
import { compareValues } from "../ocaml";
|
|
4
2
|
|
|
5
|
-
// The order of tlapm's Table.tla_axm constructors. OCaml compares constant constructors before
|
|
6
|
-
// those with arguments, so the axioms of an obligation print in this order.
|
|
7
3
|
const CONSTANT_AXIOMS = [
|
|
8
4
|
"ChooseDef",
|
|
9
5
|
"ChooseExt",
|
|
@@ -124,7 +120,6 @@ const BLOCK_AXIOMS = [
|
|
|
124
120
|
"AssertIsSetOf",
|
|
125
121
|
];
|
|
126
122
|
|
|
127
|
-
// Table.tla_smb's typed constant constructors, which Typing takes, in order.
|
|
128
123
|
export const TYPED_SYMBOLS = [
|
|
129
124
|
"TIntPlus",
|
|
130
125
|
"TIntUminus",
|
|
@@ -137,8 +132,6 @@ export const TYPED_SYMBOLS = [
|
|
|
137
132
|
|
|
138
133
|
export type AxiomArgument = number | string | string[];
|
|
139
134
|
|
|
140
|
-
// An axiom without a formula belongs to a second-order symbol. Flattening instantiates it for
|
|
141
|
-
// each use of the symbol, and otherwise it isn't printed.
|
|
142
135
|
export interface Axiom {
|
|
143
136
|
name: string;
|
|
144
137
|
args: AxiomArgument[];
|
|
@@ -165,6 +158,5 @@ const getAxiomRank = (entry: Axiom) => {
|
|
|
165
158
|
return constant === -1 ? CONSTANT_AXIOMS.length + BLOCK_AXIOMS.indexOf(entry.name) : constant;
|
|
166
159
|
};
|
|
167
160
|
|
|
168
|
-
// N_axiomatize.TlaAxmSet orders axioms as OCaml's compare does.
|
|
169
161
|
export const compareAxioms = (left: Axiom, right: Axiom) =>
|
|
170
162
|
getAxiomRank(left) - getAxiomRank(right) || compareValues(left.args, right.args);
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// tlapm's fingerprints file, ported from src/backend/fpfile.ml.
|
|
2
|
-
|
|
3
1
|
import {
|
|
4
2
|
cpSync,
|
|
5
3
|
existsSync,
|
|
@@ -14,17 +12,21 @@ import {
|
|
|
14
12
|
import { basename, join } from "node:path";
|
|
15
13
|
import { version } from "../../../package.json";
|
|
16
14
|
import { TlaProofError } from "../../errors";
|
|
17
|
-
import {
|
|
15
|
+
import {
|
|
16
|
+
createBlock,
|
|
17
|
+
isBlock,
|
|
18
|
+
readMarshaled,
|
|
19
|
+
writeMarshaled,
|
|
20
|
+
type OcamlValue,
|
|
21
|
+
} from "./ocaml-marshal";
|
|
18
22
|
import type { ProofAttempt } from "../prove";
|
|
19
23
|
|
|
20
|
-
// One optional result per prover, in V13.str's order.
|
|
21
24
|
export type FingerprintTable = Map<string, OcamlValue[]>;
|
|
22
25
|
|
|
23
26
|
const MAGIC_NUMBER = 20210223;
|
|
24
27
|
|
|
25
28
|
const RECORD_SIZE = 23;
|
|
26
29
|
|
|
27
|
-
// Each prover's field in V13.str and constructor in V13.meth.
|
|
28
30
|
const PROVERS: Record<string, { field: number; tag: number }> = {
|
|
29
31
|
zenon: { field: 1, tag: 1 },
|
|
30
32
|
isabelle: { field: 2, tag: 0 },
|
|
@@ -37,7 +39,6 @@ const FAIL_METHOD = 5;
|
|
|
37
39
|
|
|
38
40
|
const REASONS = ["false", "timeout"];
|
|
39
41
|
|
|
40
|
-
// Stored as the tlapm, Zenon and Isabelle versions, which --safefp compares.
|
|
41
42
|
const VERSION = `tla-ts ${version}`;
|
|
42
43
|
|
|
43
44
|
const CHECKED_VERSIONS = new Map([
|
|
@@ -53,13 +54,12 @@ const getField = (value: OcamlValue | undefined, index: number) =>
|
|
|
53
54
|
const getFloat = (value: OcamlValue | undefined) =>
|
|
54
55
|
value !== undefined && typeof value === "object" && "float" in value ? value.float : Infinity;
|
|
55
56
|
|
|
56
|
-
// Hashtbl.hash on a string.
|
|
57
57
|
const hashKey = (key: string) => {
|
|
58
58
|
const bytes = new TextEncoder().encode(key);
|
|
59
59
|
const rotate = (value: number, shift: number) => (value << shift) | (value >>> (32 - shift));
|
|
60
60
|
const mixed = Array.from(
|
|
61
61
|
{ length: Math.ceil(bytes.length / 4) },
|
|
62
|
-
(
|
|
62
|
+
(_value, index) =>
|
|
63
63
|
bytes[index * 4] |
|
|
64
64
|
(bytes[index * 4 + 1] << 8) |
|
|
65
65
|
(bytes[index * 4 + 2] << 16) |
|
|
@@ -78,7 +78,6 @@ const readBucket = (entry: OcamlValue | undefined): [OcamlValue, OcamlValue][] =
|
|
|
78
78
|
? [[entry.fields[0], entry.fields[1]], ...readBucket(entry.fields[2])]
|
|
79
79
|
: [];
|
|
80
80
|
|
|
81
|
-
// Fpfile.load_fingerprints. Each bucket lists the latest fingerprint first.
|
|
82
81
|
export const loadFingerprints = (table: FingerprintTable, path: string, isSafe: boolean) => {
|
|
83
82
|
const bytes = readFileSync(path);
|
|
84
83
|
const magic = readMarshaled(bytes, 0);
|
|
@@ -132,25 +131,25 @@ const encodeResult = (attempt: ProofAttempt) => {
|
|
|
132
131
|
const timeout = { float: method.rlimit ?? method.timeLimitMs / 1000 };
|
|
133
132
|
const argument =
|
|
134
133
|
method.prover === "zenon"
|
|
135
|
-
?
|
|
134
|
+
? createBlock(0, timeout, FAIL_METHOD)
|
|
136
135
|
: method.prover === "isabelle"
|
|
137
|
-
?
|
|
138
|
-
:
|
|
136
|
+
? createBlock(0, createBlock(0, timeout), method.tactic ?? "auto")
|
|
137
|
+
: createBlock(0, timeout);
|
|
139
138
|
const reasonIndex = REASONS.indexOf(attempt.reason ?? "");
|
|
140
139
|
const reason =
|
|
141
140
|
attempt.reason === undefined
|
|
142
141
|
? 0
|
|
143
|
-
:
|
|
144
|
-
return
|
|
142
|
+
: createBlock(0, reasonIndex === -1 ? createBlock(0, attempt.reason) : reasonIndex);
|
|
143
|
+
return createBlock(
|
|
145
144
|
0,
|
|
146
|
-
|
|
145
|
+
createBlock(
|
|
147
146
|
0,
|
|
148
|
-
|
|
147
|
+
createBlock(
|
|
149
148
|
0,
|
|
150
|
-
attempt.isProved ? 0 :
|
|
151
|
-
|
|
149
|
+
attempt.isProved ? 0 : createBlock(0, reason),
|
|
150
|
+
createBlock(PROVERS[method.prover].tag, argument),
|
|
152
151
|
),
|
|
153
|
-
|
|
152
|
+
createBlock(
|
|
154
153
|
0,
|
|
155
154
|
now.getFullYear(),
|
|
156
155
|
now.getMonth(),
|
|
@@ -171,14 +170,13 @@ const encodeTable = (table: FingerprintTable) => {
|
|
|
171
170
|
const buckets: OcamlValue[] = Array.from({ length }, () => 0);
|
|
172
171
|
table.forEach((record, fingerprint) => {
|
|
173
172
|
const index = hashKey(fingerprint) & (length - 1);
|
|
174
|
-
buckets[index] =
|
|
173
|
+
buckets[index] = createBlock(0, fingerprint, createBlock(0, ...record), buckets[index]);
|
|
175
174
|
});
|
|
176
|
-
return
|
|
175
|
+
return createBlock(0, createBlock(0, table.size, createBlock(0, ...buckets), 0, 512));
|
|
177
176
|
};
|
|
178
177
|
|
|
179
178
|
const pad = (value: number) => String(value).padStart(2, "0");
|
|
180
179
|
|
|
181
|
-
// Fpfile.fp_init.
|
|
182
180
|
export const saveHistory = (path: string, sources: string[]) => {
|
|
183
181
|
const now = new Date();
|
|
184
182
|
const history = `${path}.history`;
|
|
@@ -197,9 +195,6 @@ export const saveHistory = (path: string, sources: string[]) => {
|
|
|
197
195
|
.forEach((old) => rmSync(old, { recursive: true, force: true }));
|
|
198
196
|
};
|
|
199
197
|
|
|
200
|
-
// Fpfile.query: what each prover concluded for each fingerprint. Saving them, as fp_writes,
|
|
201
|
-
// add_to_table and fp_close_and_consolidate do, keeps each record and result loaded unchanged, with
|
|
202
|
-
// its date, versions and other provers' results.
|
|
203
198
|
export const getKnownResults = (table: FingerprintTable) => {
|
|
204
199
|
const storedResults = new Map<ProofAttempt, OcamlValue>();
|
|
205
200
|
const storedRecords = new Map<Map<string, ProofAttempt>, OcamlValue[]>();
|
|
@@ -1,6 +1,3 @@
|
|
|
1
|
-
// OCaml's Marshal format, ported from runtime/intern.c and runtime/extern.c, for the values in
|
|
2
|
-
// tlapm's fingerprints file. It writes no sharing, which OCaml reads the same.
|
|
3
|
-
|
|
4
1
|
import { TlaProofError } from "../../errors";
|
|
5
2
|
|
|
6
3
|
interface OcamlBlock {
|
|
@@ -33,23 +30,22 @@ const PREFIX = { smallInt: 0x40, smallString: 0x20, smallBlock: 0x80 };
|
|
|
33
30
|
|
|
34
31
|
const HEADER_SIZE = 20;
|
|
35
32
|
|
|
36
|
-
export const
|
|
33
|
+
export const createBlock = (tag: number, ...fields: OcamlValue[]): OcamlBlock => ({ tag, fields });
|
|
37
34
|
|
|
38
35
|
export const isBlock = (value: OcamlValue): value is OcamlBlock =>
|
|
39
36
|
typeof value === "object" && "tag" in value;
|
|
40
37
|
|
|
41
|
-
// Returns the value marshaled at offset, and where the next one starts.
|
|
42
38
|
export const readMarshaled = (bytes: Uint8Array, offset: number) => {
|
|
43
39
|
const view = new DataView(bytes.buffer, bytes.byteOffset, bytes.byteLength);
|
|
44
40
|
if (bytes.length < offset + HEADER_SIZE || view.getUint32(offset) !== MAGIC_NUMBER_SMALL)
|
|
45
41
|
throw new TlaProofError("corrupted fingerprint file");
|
|
46
42
|
const end = offset + HEADER_SIZE + view.getUint32(offset + 4);
|
|
47
43
|
const objects: OcamlValue[] = [];
|
|
48
|
-
|
|
44
|
+
let position = offset + HEADER_SIZE;
|
|
49
45
|
const take = (length: number) => {
|
|
50
|
-
const start =
|
|
51
|
-
|
|
52
|
-
if (
|
|
46
|
+
const start = position;
|
|
47
|
+
position += length;
|
|
48
|
+
if (position > end) throw new TlaProofError("corrupted fingerprint file");
|
|
53
49
|
return start;
|
|
54
50
|
};
|
|
55
51
|
const decoder = new TextDecoder();
|
|
@@ -60,7 +56,7 @@ export const readMarshaled = (bytes: Uint8Array, offset: number) => {
|
|
|
60
56
|
return value;
|
|
61
57
|
};
|
|
62
58
|
const readBlock = (tag: number, size: number): OcamlBlock => {
|
|
63
|
-
const value =
|
|
59
|
+
const value = createBlock(tag);
|
|
64
60
|
if (size > 0) objects.push(value);
|
|
65
61
|
for (let index = 0; index < size; index++) value.fields.push(read());
|
|
66
62
|
return value;
|
|
@@ -105,7 +101,9 @@ export const readMarshaled = (bytes: Uint8Array, offset: number) => {
|
|
|
105
101
|
|
|
106
102
|
export const writeMarshaled = (value: OcamlValue) => {
|
|
107
103
|
const bytes: number[] = [];
|
|
108
|
-
|
|
104
|
+
let objectCount = 0;
|
|
105
|
+
let words32 = 0;
|
|
106
|
+
let words64 = 0;
|
|
109
107
|
const pushInteger = (integer: number, length: number) => {
|
|
110
108
|
for (let shift = (length - 1) * 8; shift >= 0; shift -= 8)
|
|
111
109
|
bytes.push((integer >>> shift) & 0xff);
|
|
@@ -122,7 +120,7 @@ export const writeMarshaled = (value: OcamlValue) => {
|
|
|
122
120
|
bytes.push(CODE.int32);
|
|
123
121
|
return pushInteger(inner, 4);
|
|
124
122
|
}
|
|
125
|
-
|
|
123
|
+
objectCount++;
|
|
126
124
|
if (typeof inner === "string") {
|
|
127
125
|
const encoded = encoder.encode(inner);
|
|
128
126
|
if (encoded.length < 0x20) bytes.push(PREFIX.smallString + encoded.length);
|
|
@@ -132,23 +130,23 @@ export const writeMarshaled = (value: OcamlValue) => {
|
|
|
132
130
|
pushInteger(encoded.length, 4);
|
|
133
131
|
}
|
|
134
132
|
bytes.push(...encoded);
|
|
135
|
-
|
|
136
|
-
|
|
133
|
+
words32 += 1 + Math.floor((encoded.length + 4) / 4);
|
|
134
|
+
words64 += 1 + Math.floor((encoded.length + 8) / 8);
|
|
137
135
|
return;
|
|
138
136
|
}
|
|
139
137
|
if (!isBlock(inner)) {
|
|
140
138
|
const float = new DataView(new ArrayBuffer(8));
|
|
141
139
|
float.setFloat64(0, inner.float, true);
|
|
142
140
|
bytes.push(CODE.doubleLittle, ...new Uint8Array(float.buffer));
|
|
143
|
-
|
|
144
|
-
|
|
141
|
+
words32 += 3;
|
|
142
|
+
words64 += 2;
|
|
145
143
|
return;
|
|
146
144
|
}
|
|
147
145
|
const size = inner.fields.length;
|
|
148
|
-
if (size === 0)
|
|
146
|
+
if (size === 0) objectCount--;
|
|
149
147
|
else {
|
|
150
|
-
|
|
151
|
-
|
|
148
|
+
words32 += 1 + size;
|
|
149
|
+
words64 += 1 + size;
|
|
152
150
|
}
|
|
153
151
|
if (inner.tag < 16 && size < 8) bytes.push(PREFIX.smallBlock + inner.tag + (size << 4));
|
|
154
152
|
else {
|
|
@@ -159,8 +157,8 @@ export const writeMarshaled = (value: OcamlValue) => {
|
|
|
159
157
|
};
|
|
160
158
|
write(value);
|
|
161
159
|
const header = new DataView(new ArrayBuffer(HEADER_SIZE));
|
|
162
|
-
[MAGIC_NUMBER_SMALL, bytes.length,
|
|
163
|
-
|
|
160
|
+
[MAGIC_NUMBER_SMALL, bytes.length, objectCount, words32, words64].forEach((field, index) =>
|
|
161
|
+
header.setUint32(index * 4, field),
|
|
164
162
|
);
|
|
165
163
|
return new Uint8Array([...new Uint8Array(header.buffer), ...bytes]);
|
|
166
164
|
};
|
|
@@ -1,12 +1,9 @@
|
|
|
1
|
-
// The tlapm backend: runs tlapm on a module and reads each obligation's result from its Toolbox
|
|
2
|
-
// messages.
|
|
3
|
-
|
|
4
1
|
import { TlaUnsupportedError } from "../../errors";
|
|
5
2
|
|
|
6
3
|
// Loaded at runtime so browser bundles leave them out. prove loads this module only in Node and Bun.
|
|
7
4
|
const childProcess = process.getBuiltinModule("node:child_process");
|
|
8
|
-
const
|
|
9
|
-
const
|
|
5
|
+
const fileSystem = process.getBuiltinModule("node:fs");
|
|
6
|
+
const operatingSystem = process.getBuiltinModule("node:os");
|
|
10
7
|
const path = process.getBuiltinModule("node:path");
|
|
11
8
|
|
|
12
9
|
export type TlapmResult =
|
|
@@ -23,9 +20,8 @@ export const getTlapmPaths = () =>
|
|
|
23
20
|
(process.env.PATH ?? "")
|
|
24
21
|
.split(path.delimiter)
|
|
25
22
|
.map((directory) => path.join(directory, "tlapm"))
|
|
26
|
-
.filter((tlapm) =>
|
|
23
|
+
.filter((tlapm) => fileSystem.existsSync(tlapm));
|
|
27
24
|
|
|
28
|
-
// tlapm's Toolbox protocol: each message is @!!BEGIN, then @!!name:value lines, then @!!END.
|
|
29
25
|
const parseToolboxMessages = (text: string) =>
|
|
30
26
|
text
|
|
31
27
|
.split("@!!BEGIN\n")
|
|
@@ -53,8 +49,6 @@ const getResult = (fields: Map<string, string>): TlapmResult | undefined => {
|
|
|
53
49
|
return undefined;
|
|
54
50
|
};
|
|
55
51
|
|
|
56
|
-
// Runs tlapm with --toolbox 0 0 on the module name, which modules holds with each module it
|
|
57
|
-
// extends or instances, and returns the last result tlapm reported for each obligation.
|
|
58
52
|
export const proveWithTlapm = async (
|
|
59
53
|
name: string,
|
|
60
54
|
modules: Map<string, string>,
|
|
@@ -63,9 +57,9 @@ export const proveWithTlapm = async (
|
|
|
63
57
|
const tlapm = getTlapmPaths()[0];
|
|
64
58
|
if (tlapm === undefined)
|
|
65
59
|
throw new TlaUnsupportedError("The tlapm backend needs tlapm on your PATH.");
|
|
66
|
-
const directory =
|
|
60
|
+
const directory = fileSystem.mkdtempSync(path.join(operatingSystem.tmpdir(), "tla-ts-"));
|
|
67
61
|
modules.forEach((source, moduleName) =>
|
|
68
|
-
|
|
62
|
+
fileSystem.writeFileSync(path.join(directory, `${moduleName}.tla`), source),
|
|
69
63
|
);
|
|
70
64
|
const results = new Map<number, TlapmResult>();
|
|
71
65
|
const child = childProcess.spawn(
|
|
@@ -75,22 +69,23 @@ export const proveWithTlapm = async (
|
|
|
75
69
|
);
|
|
76
70
|
const kill = () => child.kill();
|
|
77
71
|
options.signal?.addEventListener("abort", kill);
|
|
78
|
-
|
|
72
|
+
let text = "";
|
|
73
|
+
let parsedCount = 0;
|
|
79
74
|
child.stderr.on("data", (chunk: Buffer) => {
|
|
80
|
-
|
|
81
|
-
const messages = parseToolboxMessages(
|
|
82
|
-
messages.slice(
|
|
75
|
+
text += chunk.toString("utf8");
|
|
76
|
+
const messages = parseToolboxMessages(text);
|
|
77
|
+
messages.slice(parsedCount).forEach((fields) => {
|
|
83
78
|
const result = getResult(fields);
|
|
84
79
|
const id = Number(fields.get("id"));
|
|
85
80
|
if (fields.get("type") !== "obligation" || !result) return;
|
|
86
81
|
results.set(id, result);
|
|
87
82
|
options.onResult?.(id, result);
|
|
88
83
|
});
|
|
89
|
-
|
|
84
|
+
parsedCount = messages.length;
|
|
90
85
|
});
|
|
91
86
|
await new Promise((resolve) => child.on("close", resolve));
|
|
92
87
|
options.signal?.removeEventListener("abort", kill);
|
|
93
|
-
|
|
88
|
+
fileSystem.rmSync(directory, { recursive: true, force: true });
|
|
94
89
|
options.signal?.throwIfAborted();
|
|
95
90
|
return results;
|
|
96
91
|
};
|
package/src/prover/verdict.ts
CHANGED
|
@@ -1,9 +1,3 @@
|
|
|
1
|
-
// An independent check of the proofs that the Zenon port finds. It shares no code with the search:
|
|
2
|
-
// formulas compare by their own alpha-equivalence, substitution and unfolding are rebuilt here, and
|
|
3
|
-
// each rule's branches come from the lemma that justifies the rule in tlapm's Zenon.thy rather than
|
|
4
|
-
// from the prover. The check walks the proof bottom up and computes the formulas each subproof
|
|
5
|
-
// needs. A proof is valid when every rule is one of the lemmas and the root needs only hypotheses.
|
|
6
|
-
|
|
7
1
|
import { getLimitFailure, type Limits } from "../limits";
|
|
8
2
|
import type { PlainRuleName, Proof, RuleArgs } from "../proof";
|
|
9
3
|
import { getDefinitionSpec } from "./definitions";
|
|
@@ -57,8 +51,6 @@ const getRuleSpec = (proof: Proof<Term>, checker: Checker): RuleSpec => {
|
|
|
57
51
|
}
|
|
58
52
|
};
|
|
59
53
|
|
|
60
|
-
// True when the proof refutes the hypotheses.
|
|
61
|
-
// Whether the proof is valid, or false once the limits pass.
|
|
62
54
|
export const checkProof = (root: Proof<Term>, context: CheckContext, limits: Limits) => {
|
|
63
55
|
const keys = createKeys();
|
|
64
56
|
const hasRelation = createRelationProperties(context);
|
|
@@ -79,7 +71,6 @@ export const checkProof = (root: Proof<Term>, context: CheckContext, limits: Lim
|
|
|
79
71
|
return result;
|
|
80
72
|
};
|
|
81
73
|
try {
|
|
82
|
-
// Subproofs before their parents, without recursion: proofs can be deep.
|
|
83
74
|
const stack: [Proof<Term>, boolean][] = [[root, false]];
|
|
84
75
|
while (stack.length > 0) {
|
|
85
76
|
if (getLimitFailure(limits) !== undefined) return false;
|