tla-ts 0.0.3 → 0.0.4-dev.1a3acf6
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 +46 -115
- package/dist/cli.cjs +1 -1
- package/dist/cli.js +1 -1
- package/dist/deciders.cjs +366 -0
- package/dist/deciders.js +366 -0
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +194 -8
- package/dist/index.d.ts +194 -8
- package/dist/index.js +1 -1
- package/dist/parallel-worker.cjs +1 -4
- package/dist/parallel-worker.js +1 -4
- package/dist/prove-worker.cjs +9 -0
- package/dist/prove-worker.d.cts +9 -0
- package/dist/prove-worker.d.ts +9 -0
- package/dist/prove-worker.js +9 -0
- package/dist/prove.cjs +1006 -0
- package/dist/prove.js +1006 -0
- package/dist/run.cjs +45 -0
- package/dist/run.js +45 -0
- package/dist/tlapm.cjs +10 -0
- package/dist/tlapm.js +10 -0
- package/dist/transfer.cjs +1377 -18
- package/dist/transfer.js +1377 -18
- package/dist/worker.cjs +21 -0
- package/dist/worker.js +21 -0
- package/package.json +24 -11
- package/src/ast.ts +149 -8
- package/src/bags.ts +26 -30
- package/src/builtins.ts +45 -19
- package/src/bundled-modules.ts +3 -3
- package/src/check.ts +1182 -900
- package/src/cli/options.ts +109 -0
- package/src/cli/run.ts +63 -0
- package/src/cli/shared.ts +106 -0
- package/src/cli/tlapm.ts +374 -0
- package/src/cli/tlc.ts +941 -0
- package/src/cli/xml-exporter.ts +221 -0
- package/src/cli.ts +9 -2
- package/src/codegen.ts +112 -51
- package/src/config.ts +254 -181
- package/src/dependencies.ts +5 -7
- package/src/environment.ts +579 -184
- package/src/errors.ts +287 -4
- package/src/evaluate.ts +1095 -365
- package/src/exit-codes.ts +22 -43
- package/src/fingerprints.ts +49 -14
- package/src/index.ts +11 -0
- package/src/instances.ts +73 -60
- package/src/java-overrides.ts +183 -66
- package/src/json.ts +31 -36
- package/src/levels.ts +197 -54
- package/src/lexer.ts +127 -30
- package/src/liveness-checker.ts +894 -0
- package/src/liveness.ts +246 -596
- package/src/{obligation-action.ts → obligations/action.ts} +248 -74
- package/src/{obligation-anon.ts → obligations/anonymize.ts} +55 -57
- package/src/obligations/equality.ts +260 -0
- package/src/obligations/expression.ts +618 -0
- package/src/{obligation-format.ts → obligations/format.ts} +7 -8
- package/src/obligations/generate.ts +457 -0
- package/src/{obligations.ts → obligations/index.ts} +46 -32
- package/src/{obligation-levels.ts → obligations/levels.ts} +44 -40
- package/src/obligations/module.ts +445 -0
- package/src/obligations/normalize.ts +554 -0
- package/src/obligations/operators.ts +176 -0
- package/src/obligations/pragma.ts +195 -0
- package/src/{obligation-printer.ts → obligations/printer.ts} +65 -230
- package/src/{obligation-proof.ts → obligations/proof.ts} +7 -2
- package/src/obligations/regroup.ts +100 -0
- package/src/{obligation-generate.ts → obligations/simplify.ts} +130 -536
- package/src/{obligation-source.ts → obligations/source.ts} +174 -216
- package/src/{obligation-deref.ts → obligations/subexpression.ts} +84 -115
- package/src/obligations/substitution.ts +261 -0
- package/src/obligations/temporal.ts +321 -0
- package/src/{obligation-tuples.ts → obligations/tuples.ts} +38 -54
- package/src/parallel-worker.ts +184 -235
- package/src/parallel.ts +156 -91
- package/src/parser.ts +490 -188
- package/src/pcal/ast.ts +755 -0
- package/src/pcal/parse.ts +1487 -0
- package/src/pcal/tokenize.ts +487 -0
- package/src/pcal/translate.ts +1151 -0
- package/src/pcal/validate.ts +444 -0
- package/src/prover/decide-pool.ts +95 -0
- package/src/prover/deciders.ts +33 -0
- package/src/prover/first-order.ts +175 -0
- package/src/prover/isabelle/LICENSE +36 -0
- package/src/prover/isabelle/LICENSE-tlapm +26 -0
- package/src/prover/isabelle/decide.ts +44 -0
- package/src/prover/isabelle/encode.ts +445 -0
- package/src/prover/isabelle/isar/inner-syntax.ts +579 -0
- package/src/prover/isabelle/isar/method.ts +367 -0
- package/src/prover/isabelle/isar/proof.ts +28 -0
- package/src/prover/isabelle/isar/statement.ts +57 -0
- package/src/prover/isabelle/isar/theory.ts +192 -0
- package/src/prover/isabelle/isar/type-check.ts +278 -0
- package/src/prover/isabelle/provers/blast/blast.ts +258 -0
- package/src/prover/isabelle/provers/blast/branch.ts +322 -0
- package/src/prover/isabelle/provers/blast/prove.ts +347 -0
- package/src/prover/isabelle/provers/blast/rules.ts +330 -0
- package/src/prover/isabelle/provers/blast/state.ts +180 -0
- package/src/prover/isabelle/provers/blast/term.ts +546 -0
- package/src/prover/isabelle/provers/clasimp.ts +150 -0
- package/src/prover/isabelle/provers/classical.ts +389 -0
- package/src/prover/isabelle/provers/hypsubst.ts +433 -0
- package/src/prover/isabelle/pure/bicompose.ts +174 -0
- package/src/prover/isabelle/pure/consts.ts +32 -0
- package/src/prover/isabelle/pure/conv.ts +79 -0
- package/src/prover/isabelle/pure/drule.ts +264 -0
- package/src/prover/isabelle/pure/envir.ts +331 -0
- package/src/prover/isabelle/pure/goal.ts +53 -0
- package/src/prover/isabelle/pure/interrupt.ts +16 -0
- package/src/prover/isabelle/pure/list.ts +12 -0
- package/src/prover/isabelle/pure/logic.ts +330 -0
- package/src/prover/isabelle/pure/name.ts +98 -0
- package/src/prover/isabelle/pure/net.ts +215 -0
- package/src/prover/isabelle/pure/object-logic.ts +41 -0
- package/src/prover/isabelle/pure/pattern.ts +631 -0
- package/src/prover/isabelle/pure/raw-simplifier.ts +338 -0
- package/src/prover/isabelle/pure/rewriter.ts +602 -0
- package/src/prover/isabelle/pure/search.ts +68 -0
- package/src/prover/isabelle/pure/seq.ts +133 -0
- package/src/prover/isabelle/pure/simplifier.ts +106 -0
- package/src/prover/isabelle/pure/table.ts +201 -0
- package/src/prover/isabelle/pure/tactic.ts +168 -0
- package/src/prover/isabelle/pure/tactical.ts +264 -0
- package/src/prover/isabelle/pure/term-ord.ts +105 -0
- package/src/prover/isabelle/pure/term.ts +688 -0
- package/src/prover/isabelle/pure/thm.ts +783 -0
- package/src/prover/isabelle/pure/type.ts +121 -0
- package/src/prover/isabelle/pure/unify.ts +753 -0
- package/src/prover/isabelle/pure/variable.ts +25 -0
- package/src/prover/isabelle/tla/classical-setup.ts +101 -0
- package/src/prover/isabelle/tla/context.ts +74 -0
- package/src/prover/isabelle/tla/logic-data.ts +5 -0
- package/src/prover/isabelle/tla/logic.ts +215 -0
- package/src/prover/isabelle/tla/simpdata.ts +241 -0
- package/src/prover/isabelle/tools/intuitionistic.ts +132 -0
- package/src/prover/ocaml.ts +22 -0
- package/src/prover/prep/action.ts +508 -0
- package/src/prover/prep/enabled-axioms.ts +189 -0
- package/src/prover/prep/fingerprint.ts +388 -0
- package/src/prover/prep/level-comparison.ts +529 -0
- package/src/prover/prep/md5.ts +60 -0
- package/src/prover/prep/methods.ts +221 -0
- package/src/prover/prep/normalize.ts +309 -0
- package/src/prover/prove-worker.ts +22 -0
- package/src/prover/prove.ts +492 -0
- package/src/prover/ptl/decide.ts +68 -0
- package/src/prover/ptl/encode.ts +244 -0
- package/src/prover/ptl/sat.ts +151 -0
- package/src/prover/ptl/tableau.ts +276 -0
- package/src/prover/smt/axioms.ts +209 -0
- package/src/prover/smt/context.ts +108 -0
- package/src/prover/smt/data.ts +636 -0
- package/src/prover/smt/encode.ts +275 -0
- package/src/prover/smt/extensionality.ts +65 -0
- package/src/prover/smt/flatten.ts +112 -0
- package/src/prover/smt/format.ts +154 -0
- package/src/prover/smt/instances.ts +181 -0
- package/src/prover/smt/rewrite.ts +766 -0
- package/src/prover/smt/solver/act-cache.ts +265 -0
- package/src/prover/smt/solver/arith-rewriter.ts +962 -0
- package/src/prover/smt/solver/array.ts +22 -0
- package/src/prover/smt/solver/asserted-formulas.ts +469 -0
- package/src/prover/smt/solver/ast-lt.ts +157 -0
- package/src/prover/smt/solver/ast-util.ts +91 -0
- package/src/prover/smt/solver/ast.ts +1315 -0
- package/src/prover/smt/solver/auf-solver.ts +572 -0
- package/src/prover/smt/solver/case-split-queue.ts +178 -0
- package/src/prover/smt/solver/cg-table.ts +175 -0
- package/src/prover/smt/solver/clause.ts +276 -0
- package/src/prover/smt/solver/conflict-resolution.ts +343 -0
- package/src/prover/smt/solver/context.ts +1292 -0
- package/src/prover/smt/solver/ctx-simplify.ts +334 -0
- package/src/prover/smt/solver/der.ts +224 -0
- package/src/prover/smt/solver/dyn-ack.ts +141 -0
- package/src/prover/smt/solver/e-matching.ts +659 -0
- package/src/prover/smt/solver/enode.ts +259 -0
- package/src/prover/smt/solver/expr-ref.ts +21 -0
- package/src/prover/smt/solver/expr-safe-replace.ts +172 -0
- package/src/prover/smt/solver/fingerprints.ts +92 -0
- package/src/prover/smt/solver/flat-literals.ts +51 -0
- package/src/prover/smt/solver/goal.ts +138 -0
- package/src/prover/smt/solver/hash.ts +173 -0
- package/src/prover/smt/solver/hashtable.ts +166 -0
- package/src/prover/smt/solver/internalizer.ts +1381 -0
- package/src/prover/smt/solver/lbool.ts +5 -0
- package/src/prover/smt/solver/literal.ts +24 -0
- package/src/prover/smt/solver/lp/bound-propagator.ts +391 -0
- package/src/prover/smt/solver/lp/constraints.ts +78 -0
- package/src/prover/smt/solver/lp/containers.ts +296 -0
- package/src/prover/smt/solver/lp/core-solver.ts +504 -0
- package/src/prover/smt/solver/lp/cross-nested.ts +224 -0
- package/src/prover/smt/solver/lp/dep-intervals.ts +642 -0
- package/src/prover/smt/solver/lp/dependency.ts +51 -0
- package/src/prover/smt/solver/lp/dioph-eq.ts +1181 -0
- package/src/prover/smt/solver/lp/explanation.ts +46 -0
- package/src/prover/smt/solver/lp/gomory.ts +255 -0
- package/src/prover/smt/solver/lp/hnf-cutter.ts +125 -0
- package/src/prover/smt/solver/lp/hnf.ts +281 -0
- package/src/prover/smt/solver/lp/int-cube.ts +295 -0
- package/src/prover/smt/solver/lp/int-solver.ts +514 -0
- package/src/prover/smt/solver/lp/lar-solver.ts +816 -0
- package/src/prover/smt/solver/lp/lar-term.ts +62 -0
- package/src/prover/smt/solver/lp/lp-settings.ts +91 -0
- package/src/prover/smt/solver/lp/maximize-term.ts +347 -0
- package/src/prover/smt/solver/lp/nex-creator.ts +381 -0
- package/src/prover/smt/solver/lp/nex.ts +120 -0
- package/src/prover/smt/solver/lp/nla-backoff.ts +43 -0
- package/src/prover/smt/solver/lp/nla-basics.ts +398 -0
- package/src/prover/smt/solver/lp/nla-core.ts +968 -0
- package/src/prover/smt/solver/lp/nla-divisions.ts +332 -0
- package/src/prover/smt/solver/lp/nla-emonics.ts +373 -0
- package/src/prover/smt/solver/lp/nla-factorization.ts +30 -0
- package/src/prover/smt/solver/lp/nla-grobner.ts +904 -0
- package/src/prover/smt/solver/lp/nla-horner.ts +126 -0
- package/src/prover/smt/solver/lp/nla-intervals.ts +265 -0
- package/src/prover/smt/solver/lp/nla-monomial-bounds.ts +715 -0
- package/src/prover/smt/solver/lp/nla-monotone.ts +59 -0
- package/src/prover/smt/solver/lp/nla-order.ts +307 -0
- package/src/prover/smt/solver/lp/nla-patcher.ts +112 -0
- package/src/prover/smt/solver/lp/nla-tangents.ts +251 -0
- package/src/prover/smt/solver/lp/nla-throttle.ts +85 -0
- package/src/prover/smt/solver/lp/nla-types.ts +124 -0
- package/src/prover/smt/solver/lp/nla-var-eqs.ts +141 -0
- package/src/prover/smt/solver/lp/nra-solver.ts +440 -0
- package/src/prover/smt/solver/lp/numeric-pair.ts +65 -0
- package/src/prover/smt/solver/lp/pdd-interval.ts +31 -0
- package/src/prover/smt/solver/lp/pdd-simplifier.ts +184 -0
- package/src/prover/smt/solver/lp/pdd-solver.ts +408 -0
- package/src/prover/smt/solver/lp/pdd.ts +971 -0
- package/src/prover/smt/solver/lp/random-updater.ts +138 -0
- package/src/prover/smt/solver/lp/static-matrix.ts +246 -0
- package/src/prover/smt/solver/lp/union-find.ts +96 -0
- package/src/prover/smt/solver/mam-compiler.ts +847 -0
- package/src/prover/smt/solver/mam-interpreter.ts +400 -0
- package/src/prover/smt/solver/maximize-ac-sharing.ts +118 -0
- package/src/prover/smt/solver/model-checker.ts +347 -0
- package/src/prover/smt/solver/model-evaluator.ts +262 -0
- package/src/prover/smt/solver/model-finder.ts +155 -0
- package/src/prover/smt/solver/model-generator.ts +97 -0
- package/src/prover/smt/solver/model-macro-solver.ts +728 -0
- package/src/prover/smt/solver/nlsat/algebraic.ts +1161 -0
- package/src/prover/smt/solver/nlsat/atoms.ts +238 -0
- package/src/prover/smt/solver/nlsat/evaluator.ts +303 -0
- package/src/prover/smt/solver/nlsat/explain.ts +607 -0
- package/src/prover/smt/solver/nlsat/interval-set.ts +351 -0
- package/src/prover/smt/solver/nlsat/levelwise.ts +737 -0
- package/src/prover/smt/solver/nlsat/mpbq.ts +161 -0
- package/src/prover/smt/solver/nlsat/polynomial.ts +1722 -0
- package/src/prover/smt/solver/nlsat/solver.ts +911 -0
- package/src/prover/smt/solver/nlsat/types.ts +43 -0
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +648 -0
- package/src/prover/smt/solver/nlsat/upolynomial.ts +996 -0
- package/src/prover/smt/solver/nnf.ts +469 -0
- package/src/prover/smt/solver/pattern-inference.ts +351 -0
- package/src/prover/smt/solver/poly-rewriter.ts +477 -0
- package/src/prover/smt/solver/propagate-values.ts +83 -0
- package/src/prover/smt/solver/proto-model.ts +551 -0
- package/src/prover/smt/solver/pull-quant.ts +139 -0
- package/src/prover/smt/solver/qe-lite-der.ts +526 -0
- package/src/prover/smt/solver/qe-lite-fm.ts +576 -0
- package/src/prover/smt/solver/qe-lite.ts +381 -0
- package/src/prover/smt/solver/qi-queue.ts +362 -0
- package/src/prover/smt/solver/quant-tactics.ts +117 -0
- package/src/prover/smt/solver/quantifier-analyzer.ts +562 -0
- package/src/prover/smt/solver/quantifier-manager.ts +186 -0
- package/src/prover/smt/solver/random-gen.ts +10 -0
- package/src/prover/smt/solver/rational.ts +165 -0
- package/src/prover/smt/solver/ref-vector.ts +62 -0
- package/src/prover/smt/solver/relevancy.ts +247 -0
- package/src/prover/smt/solver/rewriter-tpl.ts +1159 -0
- package/src/prover/smt/solver/rewriter.ts +843 -0
- package/src/prover/smt/solver/rlimit.ts +79 -0
- package/src/prover/smt/solver/smtlib-parser.ts +526 -0
- package/src/prover/smt/solver/solver.ts +71 -0
- package/src/prover/smt/solver/sort.ts +35 -0
- package/src/prover/smt/solver/sticky-generations.ts +69 -0
- package/src/prover/smt/solver/theory-lra-axioms.ts +340 -0
- package/src/prover/smt/solver/theory-lra-bounds.ts +226 -0
- package/src/prover/smt/solver/theory-lra-final-check.ts +252 -0
- package/src/prover/smt/solver/theory-lra-internalize.ts +476 -0
- package/src/prover/smt/solver/theory-lra-model.ts +243 -0
- package/src/prover/smt/solver/theory-lra-propagate.ts +405 -0
- package/src/prover/smt/solver/theory-lra-state.ts +43 -0
- package/src/prover/smt/solver/theory-lra.ts +56 -0
- package/src/prover/smt/solver/var-subst.ts +258 -0
- package/src/prover/smt/solver/z3-license.txt +10 -0
- package/src/prover/smt/table.ts +170 -0
- package/src/prover/tlapm/cache.ts +236 -0
- package/src/prover/tlapm/ocaml-marshal.ts +166 -0
- package/src/prover/tlapm/tlapm.ts +96 -0
- package/src/prover/tlaps-module.ts +510 -0
- package/src/prover/verdict.ts +13 -0
- package/src/prover/zenon/LICENSE +32 -0
- package/src/prover/zenon/check/check.ts +105 -0
- package/src/prover/zenon/check/definitions.ts +144 -0
- package/src/prover/zenon/check/equality.ts +182 -0
- package/src/prover/zenon/check/functions.ts +62 -0
- package/src/prover/zenon/check/keys.ts +125 -0
- package/src/prover/zenon/check/propositional.ts +104 -0
- package/src/prover/zenon/check/records.ts +188 -0
- package/src/prover/zenon/check/relations.ts +121 -0
- package/src/prover/zenon/check/rewrites.ts +224 -0
- package/src/prover/zenon/check/sets.ts +302 -0
- package/src/prover/zenon/check/terms.ts +127 -0
- package/src/prover/zenon/check/tla.ts +126 -0
- package/src/prover/zenon/decide.ts +107 -0
- package/src/prover/zenon/encode.ts +378 -0
- package/src/prover/zenon/eqrel.ts +300 -0
- package/src/prover/zenon/equality-rules.ts +435 -0
- package/src/prover/zenon/expr.ts +551 -0
- package/src/prover/zenon/index-table.ts +350 -0
- package/src/prover/zenon/isar-case.ts +513 -0
- package/src/prover/zenon/isar.ts +1249 -0
- package/src/prover/zenon/limits.ts +15 -0
- package/src/prover/zenon/llproof.ts +173 -0
- package/src/prover/zenon/mltoll.ts +1566 -0
- package/src/prover/zenon/node.ts +297 -0
- package/src/prover/zenon/ocaml.ts +169 -0
- package/src/prover/zenon/parse.ts +247 -0
- package/src/prover/zenon/phrase.ts +191 -0
- package/src/prover/zenon/proof.ts +198 -0
- package/src/prover/zenon/propositional-rules.ts +387 -0
- package/src/prover/zenon/rules.ts +94 -0
- package/src/prover/zenon/search.ts +288 -0
- package/src/prover/zenon/tla/functions.ts +151 -0
- package/src/prover/zenon/tla/llproof.ts +480 -0
- package/src/prover/zenon/tla/records.ts +225 -0
- package/src/prover/zenon/tla/rewrites.ts +447 -0
- package/src/prover/zenon/tla/sets.ts +304 -0
- package/src/prover/zenon/tla/terms.ts +162 -0
- package/src/prover/zenon/tla/tla.ts +506 -0
- package/src/randomization.ts +39 -27
- package/src/resolve.ts +1474 -426
- package/src/runtime.ts +25 -7
- package/src/sany/builtins.ts +147 -0
- package/src/sany/generator.ts +3111 -0
- package/src/sany/levels.ts +1205 -0
- package/src/sany/lexer.ts +544 -0
- package/src/sany/linter.ts +122 -0
- package/src/sany/modules.ts +1398 -0
- package/src/sany/nodes.ts +463 -0
- package/src/sany/parse-error.ts +2161 -0
- package/src/sany/report.ts +355 -0
- package/src/sany/selectors.ts +736 -0
- package/src/sany/source.ts +247 -0
- package/src/sany/xml.ts +1016 -0
- package/src/search.ts +969 -0
- package/src/spec-description.ts +66 -29
- package/src/{standard-levels.ts → standard-definitions.ts} +118 -2
- package/src/standard-modules.ts +215 -164
- package/src/state-graph.ts +181 -0
- package/src/subexpressions.ts +231 -171
- package/src/substitution-levels.ts +40 -19
- package/src/successors.ts +253 -125
- package/src/symmetry.ts +194 -54
- package/src/tableau.ts +60 -32
- package/src/tlc/fingerprint.ts +214 -0
- package/src/{tlc-modules.ts → tlc/jar-data.ts} +4 -0
- package/src/tlc/messages.ts +441 -0
- package/src/{tlc-order.ts → tlc/order.ts} +84 -16
- package/src/{tlc-random.ts → tlc/random.ts} +30 -189
- package/src/tlc/replay.ts +659 -0
- package/src/{tlc-summary.ts → tlc/summary.ts} +20 -5
- package/src/{tlc-module.ts → tlc/tlc-operators.ts} +59 -50
- package/src/{tlc-ext.ts → tlc/tlcext-operators.ts} +63 -45
- package/src/tlc/version.ts +19 -0
- package/src/transfer.ts +44 -32
- package/src/values.ts +843 -241
- package/src/worker.ts +62 -0
- package/dist/parallel.cjs +0 -12
- package/dist/parallel.js +0 -12
- package/dist/run-cli.cjs +0 -28
- package/dist/run-cli.js +0 -28
- package/src/canonical.ts +0 -39
- package/src/cli-options.ts +0 -58
- package/src/obligation-expression.ts +0 -1060
- package/src/obligation-module.ts +0 -1042
- package/src/run-cli.ts +0 -478
|
@@ -1,69 +1,52 @@
|
|
|
1
|
-
// A port of tlapm's
|
|
2
|
-
//
|
|
1
|
+
// A port of tlapm's Proof.Simplify, which rewrites each proof into the steps Proof.Gen handles:
|
|
2
|
+
// BY becomes USE steps and an OBVIOUS QED, and HAVE, TAKE, WITNESS, CASE and PICK become
|
|
3
|
+
// assertions.
|
|
3
4
|
|
|
4
|
-
import {
|
|
5
|
+
import { TlaProofError } from "../errors";
|
|
6
|
+
import { isEqualExpr } from "./equality";
|
|
5
7
|
import {
|
|
6
8
|
applyBuiltin,
|
|
7
9
|
at,
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
getErrorNote,
|
|
11
|
-
isEqualExpr,
|
|
10
|
+
getFact,
|
|
11
|
+
isBuiltinApply,
|
|
12
12
|
mapAccumulate,
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
substituteBounds,
|
|
17
|
-
substituteExpr,
|
|
13
|
+
mapBoundDomains,
|
|
14
|
+
mapChildren,
|
|
15
|
+
stripProps,
|
|
18
16
|
type Bound,
|
|
19
17
|
type Builtin,
|
|
20
18
|
type Expr,
|
|
21
19
|
type Hyp,
|
|
22
|
-
type Locus,
|
|
23
|
-
type ObligationWarning,
|
|
24
20
|
type Sequent,
|
|
25
|
-
type
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
} from "./
|
|
29
|
-
import {
|
|
30
|
-
import {
|
|
21
|
+
type Time,
|
|
22
|
+
} from "./expression";
|
|
23
|
+
import { format, renderDoc, type Doc } from "./format";
|
|
24
|
+
import { AT_NOWHERE, getTrue, proveAssertion, useAssertion } from "./generate";
|
|
25
|
+
import { printExpression } from "./printer";
|
|
26
|
+
import { getUnique, type Counter, type Proof, type Step, type StepNumber } from "./proof";
|
|
31
27
|
import {
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
type StepNumber,
|
|
40
|
-
type UseDef,
|
|
41
|
-
type Usable,
|
|
42
|
-
} from "./obligation-proof";
|
|
43
|
-
|
|
44
|
-
const AT_NOWHERE: Expr = { kind: "At", isExcept: false };
|
|
28
|
+
consSubstitution,
|
|
29
|
+
normalizeApply,
|
|
30
|
+
shift,
|
|
31
|
+
shiftExpr,
|
|
32
|
+
substituteBounds,
|
|
33
|
+
substituteExpr,
|
|
34
|
+
} from "./substitution";
|
|
45
35
|
|
|
46
36
|
// tlapm builds nodes with x @@ step, which copies all of the step's properties.
|
|
47
37
|
const getProps = (from: Step) => ({
|
|
48
38
|
location: from.location,
|
|
49
39
|
step: from.step,
|
|
50
|
-
|
|
40
|
+
method: from.method,
|
|
51
41
|
});
|
|
52
42
|
|
|
53
|
-
const isAnonymous = (step: StepNumber | undefined) => step?.kind === "Named" && step.isAnonymous;
|
|
54
|
-
|
|
55
43
|
const getLevel = (step: StepNumber | undefined) => step?.level ?? 0;
|
|
56
44
|
|
|
57
|
-
const getTrue = (from: { location?: Locus }) => at({ kind: "Internal", builtin: "TRUE" }, from);
|
|
58
|
-
|
|
59
45
|
const isBinary = (
|
|
60
46
|
expression: Expr,
|
|
61
47
|
builtin: Builtin,
|
|
62
48
|
): expression is Extract<Expr, { kind: "Apply" }> =>
|
|
63
|
-
expression.
|
|
64
|
-
expression.operator.kind === "Internal" &&
|
|
65
|
-
expression.operator.builtin === builtin &&
|
|
66
|
-
expression.args.length === 2;
|
|
49
|
+
isBuiltinApply(expression, builtin) && expression.args.length === 2;
|
|
67
50
|
|
|
68
51
|
const getMessage = (pattern: string, ...args: (string | Doc)[]) =>
|
|
69
52
|
renderDoc(format(pattern, ...args));
|
|
@@ -93,140 +76,6 @@ const expandDittoes = (bounds: Bound[]): Bound[] => {
|
|
|
93
76
|
});
|
|
94
77
|
};
|
|
95
78
|
|
|
96
|
-
// Each visible fact of the sequent, shifted past the hypotheses after it.
|
|
97
|
-
const getAssumedFacts = (offset: number, sequent: Sequent) =>
|
|
98
|
-
sequent.context.flatMap((hyp, index) =>
|
|
99
|
-
hyp.kind === "Fact" && hyp.visibility === "Visible"
|
|
100
|
-
? [shiftExpr(offset + sequent.context.length - 1 - index, hyp.expression)]
|
|
101
|
-
: [],
|
|
102
|
-
);
|
|
103
|
-
|
|
104
|
-
const getStepDefinition = (step: Step, body: Expr): Hyp => {
|
|
105
|
-
if (!step.step) throw new TlapmBugError();
|
|
106
|
-
return {
|
|
107
|
-
kind: "Defn",
|
|
108
|
-
definition: { kind: "Operator", name: getStepName(step.step), body, location: step.location },
|
|
109
|
-
whereDefined: "Proof",
|
|
110
|
-
visibility: "Visible",
|
|
111
|
-
isLocal: true,
|
|
112
|
-
location: step.location,
|
|
113
|
-
};
|
|
114
|
-
};
|
|
115
|
-
|
|
116
|
-
const proveAssertion = (context: Hyp[], sequent: Sequent, step: Step) => {
|
|
117
|
-
const visibility: Visibility = isAnonymous(step.step) ? "Visible" : "Hidden";
|
|
118
|
-
const hyps = sequent.context.map((hyp): Hyp =>
|
|
119
|
-
hyp.kind === "Fact" ? { ...hyp, visibility } : hyp,
|
|
120
|
-
);
|
|
121
|
-
const body = at({ kind: "List", bullet: "Refs", items: getAssumedFacts(2, sequent) }, step);
|
|
122
|
-
return {
|
|
123
|
-
context: [
|
|
124
|
-
...context,
|
|
125
|
-
...hyps,
|
|
126
|
-
{
|
|
127
|
-
kind: "Fact",
|
|
128
|
-
expression: getTrue(step),
|
|
129
|
-
visibility: "Hidden",
|
|
130
|
-
location: step.location,
|
|
131
|
-
},
|
|
132
|
-
getStepDefinition(step, body),
|
|
133
|
-
{
|
|
134
|
-
kind: "Fact",
|
|
135
|
-
expression: at({ kind: "Ix", index: 1 }, step),
|
|
136
|
-
visibility: "Hidden",
|
|
137
|
-
location: step.location,
|
|
138
|
-
},
|
|
139
|
-
] satisfies Hyp[],
|
|
140
|
-
active: shiftExpr(3, sequent.active),
|
|
141
|
-
};
|
|
142
|
-
};
|
|
143
|
-
|
|
144
|
-
const useAssertion = (
|
|
145
|
-
isSuffices: boolean,
|
|
146
|
-
context: Hyp[],
|
|
147
|
-
goal: Expr,
|
|
148
|
-
sequent: Sequent,
|
|
149
|
-
step: Step,
|
|
150
|
-
) => {
|
|
151
|
-
const visibility: Visibility = isSuffices || isAnonymous(step.step) ? "Visible" : "Hidden";
|
|
152
|
-
return {
|
|
153
|
-
context: [
|
|
154
|
-
...context,
|
|
155
|
-
getStepDefinition(step, at(exprifySequent(sequent), step)),
|
|
156
|
-
{
|
|
157
|
-
kind: "Fact",
|
|
158
|
-
expression: at({ kind: "Ix", index: 1 }, step),
|
|
159
|
-
visibility,
|
|
160
|
-
location: step.location,
|
|
161
|
-
},
|
|
162
|
-
] satisfies Hyp[],
|
|
163
|
-
active: shiftExpr(2, goal),
|
|
164
|
-
};
|
|
165
|
-
};
|
|
166
|
-
|
|
167
|
-
const setDefinition = (visibility: Visibility, context: Hyp[], def: UseDef): Hyp[] => {
|
|
168
|
-
if (def.kind !== "Dx") throw new TlaProofError(`Unknown definition ${def.name}`);
|
|
169
|
-
const index = context.length - def.index;
|
|
170
|
-
const hyp = context[index];
|
|
171
|
-
if (!hyp) return context;
|
|
172
|
-
if (hyp.kind !== "Defn") throw new TlaProofError("Indicated point is not a definition");
|
|
173
|
-
return context.map((entry, position) => (position === index ? { ...hyp, visibility } : entry));
|
|
174
|
-
};
|
|
175
|
-
|
|
176
|
-
const isDomainMatch = (fact: Expr, domain: Expr) =>
|
|
177
|
-
fact.kind === "Apply" &&
|
|
178
|
-
fact.operator.kind === "Internal" &&
|
|
179
|
-
fact.operator.builtin === "Mem" &&
|
|
180
|
-
fact.args[0]?.kind === "Ix" &&
|
|
181
|
-
fact.args[0].index === 0 &&
|
|
182
|
-
isEqualExpr(domain, fact.args[1]);
|
|
183
|
-
|
|
184
|
-
const setExpression = (
|
|
185
|
-
onWarning: (warning: ObligationWarning) => void,
|
|
186
|
-
visibility: Visibility,
|
|
187
|
-
fact: Expr,
|
|
188
|
-
context: Hyp[],
|
|
189
|
-
): Hyp[] => {
|
|
190
|
-
let isFound = false;
|
|
191
|
-
let current = fact;
|
|
192
|
-
const result = [...context];
|
|
193
|
-
for (let index = context.length - 1; index >= 0; index--) {
|
|
194
|
-
current = shiftExpr(-1, current);
|
|
195
|
-
const hyp = context[index];
|
|
196
|
-
if (hyp.kind === "Fact" && isEqualExpr(hyp.expression, current)) {
|
|
197
|
-
isFound = true;
|
|
198
|
-
result[index] = { ...hyp, visibility };
|
|
199
|
-
} else if (hyp.kind === "Fresh" && hyp.domain && isDomainMatch(current, hyp.domain)) {
|
|
200
|
-
isFound = true;
|
|
201
|
-
result[index] = { ...hyp, domainVisibility: visibility };
|
|
202
|
-
}
|
|
203
|
-
}
|
|
204
|
-
if (!isFound) {
|
|
205
|
-
const message = "This expression does not appear in the context and cannot be hidden.";
|
|
206
|
-
onWarning(getErrorNote(fact.location, `${message}\n`));
|
|
207
|
-
throw new TlaProofError(message, { failure: "proof.Gen.set_expr" });
|
|
208
|
-
}
|
|
209
|
-
return result;
|
|
210
|
-
};
|
|
211
|
-
|
|
212
|
-
// The lines of tlapm's --toolbox and --line options, which select the proofs to generate.
|
|
213
|
-
export interface LineRange {
|
|
214
|
-
start: number;
|
|
215
|
-
end: number;
|
|
216
|
-
}
|
|
217
|
-
|
|
218
|
-
export interface Generator {
|
|
219
|
-
generate: (sequent: Sequent, proof: Proof) => Proof;
|
|
220
|
-
collect: (proof: Proof) => Obligation[];
|
|
221
|
-
mutate: (
|
|
222
|
-
context: Hyp[],
|
|
223
|
-
mode: "Use" | "Hide",
|
|
224
|
-
usable: Usable,
|
|
225
|
-
location: Locus | undefined,
|
|
226
|
-
) => [Hyp[], Obligation[]];
|
|
227
|
-
simplify: (context: Hyp[], goal: Expr, proof: Proof) => Proof;
|
|
228
|
-
}
|
|
229
|
-
|
|
230
79
|
// The bounds after a witnessed one, where a ditto takes the witnessed domain.
|
|
231
80
|
const getRemainingBounds = (first: Bound, rest: Bound[]): Bound[] => {
|
|
232
81
|
const shifted = substituteBounds(shift(1), rest)[1];
|
|
@@ -242,9 +91,9 @@ const getRemainingBounds = (first: Bound, rest: Bound[]): Bound[] => {
|
|
|
242
91
|
};
|
|
243
92
|
|
|
244
93
|
// A WITNESS proves each membership and subset it relies on, then the goal from them.
|
|
245
|
-
const getWitnessProof = (step: Step,
|
|
246
|
-
if (
|
|
247
|
-
const steps =
|
|
94
|
+
const getWitnessProof = (step: Step, sideFacts: Expr[]): Proof => {
|
|
95
|
+
if (sideFacts.length === 0) return { kind: "Obvious", ...getProps(step) };
|
|
96
|
+
const steps = sideFacts.map((item, index): Step => {
|
|
248
97
|
const active = shiftExpr(2 * index + 2, item);
|
|
249
98
|
return {
|
|
250
99
|
kind: "Assert",
|
|
@@ -254,19 +103,24 @@ const getWitnessProof = (step: Step, aux: Expr[]): Proof => {
|
|
|
254
103
|
usable: { facts: [shiftExpr(3, active)], defs: [] },
|
|
255
104
|
isOnly: false,
|
|
256
105
|
location: item.location,
|
|
106
|
+
method: step.method,
|
|
257
107
|
},
|
|
258
108
|
location: item.location,
|
|
259
109
|
};
|
|
260
110
|
});
|
|
261
111
|
const facts = [
|
|
262
|
-
at({ kind: "Ix", index: 2 *
|
|
263
|
-
...
|
|
112
|
+
at({ kind: "Ix", index: 2 * sideFacts.length + 2 }, step),
|
|
113
|
+
...sideFacts.map((_item, index) =>
|
|
114
|
+
at({ kind: "Ix", index: 2 * (sideFacts.length - index) }, step),
|
|
115
|
+
),
|
|
264
116
|
];
|
|
117
|
+
// tlapm removes the method from the QED.
|
|
265
118
|
const qedProof: Proof = {
|
|
266
119
|
kind: "By",
|
|
267
120
|
usable: { facts, defs: [] },
|
|
268
121
|
isOnly: true,
|
|
269
122
|
...getProps(step),
|
|
123
|
+
method: undefined,
|
|
270
124
|
};
|
|
271
125
|
return {
|
|
272
126
|
kind: "Steps",
|
|
@@ -276,247 +130,12 @@ const getWitnessProof = (step: Step, aux: Expr[]): Proof => {
|
|
|
276
130
|
};
|
|
277
131
|
};
|
|
278
132
|
|
|
279
|
-
const obligate = (
|
|
280
|
-
sequent: Sequent,
|
|
281
|
-
from: { location?: Locus },
|
|
282
|
-
kind: ObligationKind,
|
|
283
|
-
): Obligation => ({ sequent, location: from.location, kind });
|
|
284
|
-
|
|
285
|
-
export interface ProofSummary {
|
|
286
|
-
total: number;
|
|
287
|
-
absent: Locus[];
|
|
288
|
-
omitted: Locus[];
|
|
289
|
-
}
|
|
290
|
-
|
|
291
|
-
export const EMPTY_SUMMARY: ProofSummary = { total: 0, absent: [], omitted: [] };
|
|
292
|
-
|
|
293
|
-
export const joinSummaries = (left: ProofSummary, right: ProofSummary): ProofSummary => ({
|
|
294
|
-
total: left.total + right.total,
|
|
295
|
-
absent: [...left.absent, ...right.absent],
|
|
296
|
-
omitted: [...left.omitted, ...right.omitted],
|
|
297
|
-
});
|
|
298
|
-
|
|
299
|
-
const getStepSummary = (step: Step): ProofSummary => {
|
|
300
|
-
switch (step.kind) {
|
|
301
|
-
case "Use":
|
|
302
|
-
return { ...EMPTY_SUMMARY, total: step.obligations?.length ?? 0 };
|
|
303
|
-
case "Assert":
|
|
304
|
-
case "Suffices":
|
|
305
|
-
case "Pcase":
|
|
306
|
-
case "Pick":
|
|
307
|
-
return getProofSummary(step.proof);
|
|
308
|
-
default:
|
|
309
|
-
return EMPTY_SUMMARY;
|
|
310
|
-
}
|
|
311
|
-
};
|
|
312
|
-
|
|
313
|
-
export const getProofSummary = (proof: Proof): ProofSummary => {
|
|
314
|
-
if (proof.kind === "Steps") {
|
|
315
|
-
return [...proof.steps.map(getStepSummary), getProofSummary(proof.qed.proof)].reduce(
|
|
316
|
-
joinSummaries,
|
|
317
|
-
);
|
|
318
|
-
}
|
|
319
|
-
if (proof.kind !== "Omitted" || !proof.obligations || !proof.location)
|
|
320
|
-
return { ...EMPTY_SUMMARY, total: proof.obligations?.length ?? 0 };
|
|
321
|
-
return {
|
|
322
|
-
total: proof.obligations.length,
|
|
323
|
-
absent: proof.omission === "Implicit" ? [proof.location] : [],
|
|
324
|
-
omitted: proof.omission === "Explicit" ? [proof.location] : [],
|
|
325
|
-
};
|
|
326
|
-
};
|
|
327
|
-
|
|
328
133
|
const replaceAt = (expression: Expr, replacement: Expr): Expr =>
|
|
329
134
|
expression.kind === "At" && !expression.isExcept
|
|
330
135
|
? at(stripProps(replacement), expression)
|
|
331
136
|
: mapChildren(expression, (inner) => replaceAt(inner, replacement));
|
|
332
137
|
|
|
333
|
-
export const
|
|
334
|
-
counter: Counter,
|
|
335
|
-
inputFiles: Set<string>,
|
|
336
|
-
lines: LineRange,
|
|
337
|
-
onWarning: (warning: ObligationWarning) => void,
|
|
338
|
-
): Generator => {
|
|
339
|
-
const generate = (sequent: Sequent, proof: Proof): Proof => {
|
|
340
|
-
const location = proof.location;
|
|
341
|
-
if (
|
|
342
|
-
!location ||
|
|
343
|
-
!inputFiles.has(location.file) ||
|
|
344
|
-
location.endLine < lines.start ||
|
|
345
|
-
location.startLine > lines.end
|
|
346
|
-
)
|
|
347
|
-
return proof;
|
|
348
|
-
switch (proof.kind) {
|
|
349
|
-
case "Obvious":
|
|
350
|
-
return { ...proof, obligations: [obligate(sequent, proof, { kind: "Main" })] };
|
|
351
|
-
case "Omitted":
|
|
352
|
-
return {
|
|
353
|
-
...proof,
|
|
354
|
-
obligations: [obligate(sequent, proof, { kind: "Omitted", omission: proof.omission })],
|
|
355
|
-
};
|
|
356
|
-
case "Error":
|
|
357
|
-
return {
|
|
358
|
-
...proof,
|
|
359
|
-
obligations: [obligate(sequent, proof, { kind: "Error", message: proof.message })],
|
|
360
|
-
};
|
|
361
|
-
case "By":
|
|
362
|
-
throw new TlaProofError("Proof.Gen.generate");
|
|
363
|
-
case "Steps": {
|
|
364
|
-
const [inner, steps] = mapAccumulate(sequent, proof.steps, generateStep);
|
|
365
|
-
const qedProof = generate(inner, proof.qed.proof);
|
|
366
|
-
return { ...proof, steps, qed: { ...proof.qed, proof: qedProof } };
|
|
367
|
-
}
|
|
368
|
-
}
|
|
369
|
-
};
|
|
370
|
-
|
|
371
|
-
const generateStep = (sequent: Sequent, step: Step): [Sequent, Step] => {
|
|
372
|
-
switch (step.kind) {
|
|
373
|
-
case "Forget": {
|
|
374
|
-
const count = sequent.context.length;
|
|
375
|
-
const context = sequent.context.map((hyp, index): Hyp =>
|
|
376
|
-
hyp.kind === "Fact" && hyp.visibility === "Visible" && step.count + index < count
|
|
377
|
-
? { ...hyp, visibility: "Hidden" }
|
|
378
|
-
: hyp,
|
|
379
|
-
);
|
|
380
|
-
return [{ ...sequent, context }, step];
|
|
381
|
-
}
|
|
382
|
-
case "Use": {
|
|
383
|
-
const usable = step.usable;
|
|
384
|
-
if (usable.defs.length === 0 && usable.facts.length === 1) {
|
|
385
|
-
const fact = usable.facts[0];
|
|
386
|
-
const obligation = obligate({ ...sequent, active: fact }, step, { kind: "Support" });
|
|
387
|
-
return [
|
|
388
|
-
{
|
|
389
|
-
context: [
|
|
390
|
-
...sequent.context,
|
|
391
|
-
{ kind: "Fact", expression: fact, visibility: "Visible", location: fact.location },
|
|
392
|
-
],
|
|
393
|
-
active: shiftExpr(1, sequent.active),
|
|
394
|
-
},
|
|
395
|
-
{ ...step, obligations: [obligation] },
|
|
396
|
-
];
|
|
397
|
-
}
|
|
398
|
-
if (usable.facts.length > 0)
|
|
399
|
-
throw new TlaProofError("Proof.Gen.gen_step: USE with facts and definitions");
|
|
400
|
-
const context = usable.defs.reduce(
|
|
401
|
-
(current, def) => setDefinition("Visible", current, def),
|
|
402
|
-
sequent.context,
|
|
403
|
-
);
|
|
404
|
-
return [{ ...sequent, context }, step];
|
|
405
|
-
}
|
|
406
|
-
case "Hide": {
|
|
407
|
-
const hidden = step.usable.defs.reduce(
|
|
408
|
-
(current, def) => setDefinition("Hidden", current, def),
|
|
409
|
-
sequent.context,
|
|
410
|
-
);
|
|
411
|
-
const context = step.usable.facts.reduceRight(
|
|
412
|
-
(current, fact) => setExpression(onWarning, "Hidden", fact, current),
|
|
413
|
-
hidden,
|
|
414
|
-
);
|
|
415
|
-
return [{ ...sequent, context }, step];
|
|
416
|
-
}
|
|
417
|
-
case "Define":
|
|
418
|
-
return [
|
|
419
|
-
{
|
|
420
|
-
context: [
|
|
421
|
-
...sequent.context,
|
|
422
|
-
...step.definitions.map((definition): Hyp => ({
|
|
423
|
-
kind: "Defn",
|
|
424
|
-
definition,
|
|
425
|
-
whereDefined: "User",
|
|
426
|
-
visibility: "Visible",
|
|
427
|
-
isLocal: true,
|
|
428
|
-
location: definition.location,
|
|
429
|
-
})),
|
|
430
|
-
],
|
|
431
|
-
active: shiftExpr(step.definitions.length, sequent.active),
|
|
432
|
-
},
|
|
433
|
-
step,
|
|
434
|
-
];
|
|
435
|
-
case "Assert": {
|
|
436
|
-
const proof = generate(proveAssertion(sequent.context, step.sequent, step), step.proof);
|
|
437
|
-
const generated: Step = { ...step, proof };
|
|
438
|
-
return [
|
|
439
|
-
useAssertion(false, sequent.context, sequent.active, step.sequent, generated),
|
|
440
|
-
generated,
|
|
441
|
-
];
|
|
442
|
-
}
|
|
443
|
-
case "Suffices": {
|
|
444
|
-
const proof = generate(
|
|
445
|
-
useAssertion(true, sequent.context, sequent.active, step.sequent, step),
|
|
446
|
-
step.proof,
|
|
447
|
-
);
|
|
448
|
-
const generated: Step = { ...step, proof };
|
|
449
|
-
return [proveAssertion(sequent.context, step.sequent, generated), generated];
|
|
450
|
-
}
|
|
451
|
-
default:
|
|
452
|
-
throw new TlaProofError("Proof.Gen.gen_step");
|
|
453
|
-
}
|
|
454
|
-
};
|
|
455
|
-
|
|
456
|
-
const mutateOne = (
|
|
457
|
-
context: Hyp[],
|
|
458
|
-
mode: "Use" | "Hide",
|
|
459
|
-
usable: Usable,
|
|
460
|
-
location: Locus | undefined,
|
|
461
|
-
): [Hyp[], Obligation[]] => {
|
|
462
|
-
const step: StepNumber = { kind: "Unnamed", level: 0, id: 0 };
|
|
463
|
-
const [sequent, generated] = generateStep(
|
|
464
|
-
{ context, active: { ...AT_NOWHERE, location } },
|
|
465
|
-
mode === "Use"
|
|
466
|
-
? { kind: "Use", usable, isOnly: false, location, step }
|
|
467
|
-
: { kind: "Hide", usable, location, step },
|
|
468
|
-
);
|
|
469
|
-
return [sequent.context, generated.obligations ?? []];
|
|
470
|
-
};
|
|
471
|
-
|
|
472
|
-
// The definitions go first, then each fact on its own, shifting the facts after it.
|
|
473
|
-
const mutate = (
|
|
474
|
-
context: Hyp[],
|
|
475
|
-
mode: "Use" | "Hide",
|
|
476
|
-
usable: Usable,
|
|
477
|
-
location: Locus | undefined,
|
|
478
|
-
): [Hyp[], Obligation[]] => {
|
|
479
|
-
if (usable.defs.length === 0 && usable.facts.length === 0) return [context, []];
|
|
480
|
-
const isDefs = usable.defs.length > 0;
|
|
481
|
-
const [fact, ...facts] = usable.facts;
|
|
482
|
-
const [next, first] = mutateOne(
|
|
483
|
-
context,
|
|
484
|
-
mode,
|
|
485
|
-
isDefs ? { defs: usable.defs, facts: [] } : { defs: [], facts: [fact] },
|
|
486
|
-
location,
|
|
487
|
-
);
|
|
488
|
-
const rest = isDefs ? usable.facts : facts.map((inner) => shiftExpr(1, inner));
|
|
489
|
-
const [last, others] = mutate(next, mode, { defs: [], facts: rest }, location);
|
|
490
|
-
return [last, [...first, ...others]];
|
|
491
|
-
};
|
|
492
|
-
|
|
493
|
-
// collect: a QED's obligations come before its sibling steps', and a step's own before its proof's.
|
|
494
|
-
const collect = (proof: Proof): Obligation[] => {
|
|
495
|
-
const obligations: Obligation[] = [];
|
|
496
|
-
const visitProof = (item: Proof) => {
|
|
497
|
-
if (item.kind === "Steps") {
|
|
498
|
-
visitProof(item.qed.proof);
|
|
499
|
-
item.steps.forEach(visitStep);
|
|
500
|
-
return;
|
|
501
|
-
}
|
|
502
|
-
if (item.obligations && !item.isSuppressed) obligations.push(...item.obligations);
|
|
503
|
-
};
|
|
504
|
-
const visitStep = (step: Step) => {
|
|
505
|
-
if (step.kind === "Use" && step.obligations && !step.isSuppressed)
|
|
506
|
-
obligations.push(...step.obligations);
|
|
507
|
-
if (
|
|
508
|
-
step.kind === "Assert" ||
|
|
509
|
-
step.kind === "Suffices" ||
|
|
510
|
-
step.kind === "Pcase" ||
|
|
511
|
-
step.kind === "Pick"
|
|
512
|
-
) {
|
|
513
|
-
visitProof(step.proof);
|
|
514
|
-
}
|
|
515
|
-
};
|
|
516
|
-
visitProof(proof);
|
|
517
|
-
return obligations;
|
|
518
|
-
};
|
|
519
|
-
|
|
138
|
+
export const createSimplifier = (counter: Counter) => {
|
|
520
139
|
const getAnonymous = (level: number): StepNumber => ({
|
|
521
140
|
kind: "Named",
|
|
522
141
|
level,
|
|
@@ -540,15 +159,9 @@ export const createGenerator = (
|
|
|
540
159
|
|
|
541
160
|
const renumberStep = (level: number, step: Step): Step => {
|
|
542
161
|
const renumbered: Step = { ...step, step: renumberNumber(level, step.step) };
|
|
543
|
-
|
|
544
|
-
|
|
545
|
-
|
|
546
|
-
case "Pcase":
|
|
547
|
-
case "Pick":
|
|
548
|
-
return { ...renumbered, proof: renumber(level + 1, renumbered.proof) };
|
|
549
|
-
default:
|
|
550
|
-
return renumbered;
|
|
551
|
-
}
|
|
162
|
+
return "proof" in renumbered
|
|
163
|
+
? { ...renumbered, proof: renumber(level + 1, renumbered.proof) }
|
|
164
|
+
: renumbered;
|
|
552
165
|
};
|
|
553
166
|
|
|
554
167
|
const exposeConnective = (context: Hyp[], goal: Expr): Expr => {
|
|
@@ -562,11 +175,7 @@ export const createGenerator = (
|
|
|
562
175
|
const operator: Expr = { ...body, location: goal.location };
|
|
563
176
|
return exposeConnective(context, at(normalizeApply(operator, goal.args), operator));
|
|
564
177
|
}
|
|
565
|
-
if (
|
|
566
|
-
goal.kind === "Apply" &&
|
|
567
|
-
goal.operator.kind === "Internal" &&
|
|
568
|
-
goal.operator.builtin === "Prime"
|
|
569
|
-
) {
|
|
178
|
+
if (isBuiltinApply(goal, "Prime")) {
|
|
570
179
|
const inner = exposeConnective(context, goal.args[0]);
|
|
571
180
|
const prime = (expression: Expr) => applyBuiltin("Prime", [expression], expression);
|
|
572
181
|
if (inner.kind === "Quant") {
|
|
@@ -574,14 +183,7 @@ export const createGenerator = (
|
|
|
574
183
|
{
|
|
575
184
|
kind: "Quant",
|
|
576
185
|
quantifier: inner.quantifier,
|
|
577
|
-
bounds: inner.bounds
|
|
578
|
-
bound.domain.kind === "Domain"
|
|
579
|
-
? {
|
|
580
|
-
...bound,
|
|
581
|
-
domain: { kind: "Domain", expression: prime(bound.domain.expression) },
|
|
582
|
-
}
|
|
583
|
-
: bound,
|
|
584
|
-
),
|
|
186
|
+
bounds: mapBoundDomains(inner.bounds, prime),
|
|
585
187
|
body: prime(inner.body),
|
|
586
188
|
},
|
|
587
189
|
goal,
|
|
@@ -626,7 +228,7 @@ export const createGenerator = (
|
|
|
626
228
|
return { ...proof, steps };
|
|
627
229
|
};
|
|
628
230
|
|
|
629
|
-
const simplify = (context: Hyp[], goal: Expr, original: Proof): Proof => {
|
|
231
|
+
const simplify = (context: Hyp[], goal: Expr, original: Proof, time: Time): Proof => {
|
|
630
232
|
const proof = expandAt(original);
|
|
631
233
|
switch (proof.kind) {
|
|
632
234
|
case "Obvious":
|
|
@@ -651,7 +253,7 @@ export const createGenerator = (
|
|
|
651
253
|
usable: { facts: [shiftExpr(index, fact)], defs: [] },
|
|
652
254
|
isOnly: false,
|
|
653
255
|
location: fact.location,
|
|
654
|
-
|
|
256
|
+
useLocation: proof.location,
|
|
655
257
|
}));
|
|
656
258
|
const forget: Step[] = proof.isOnly
|
|
657
259
|
? [{ kind: "Forget", count: usable.facts.length, location: proof.location }]
|
|
@@ -665,7 +267,7 @@ export const createGenerator = (
|
|
|
665
267
|
kind: "Obvious",
|
|
666
268
|
location: proof.location,
|
|
667
269
|
step: getAnonymous(level),
|
|
668
|
-
|
|
270
|
+
method: proof.method,
|
|
669
271
|
};
|
|
670
272
|
return {
|
|
671
273
|
kind: "Steps",
|
|
@@ -673,50 +275,55 @@ export const createGenerator = (
|
|
|
673
275
|
qed: { proof: qedProof, location: qedProof.location, step: qedProof.step },
|
|
674
276
|
location: proof.location,
|
|
675
277
|
step: proof.step,
|
|
676
|
-
isSuppressed: proof.isSuppressed,
|
|
677
278
|
};
|
|
678
279
|
}
|
|
679
280
|
case "Steps": {
|
|
680
|
-
|
|
681
|
-
|
|
682
|
-
|
|
683
|
-
|
|
684
|
-
|
|
685
|
-
|
|
686
|
-
|
|
687
|
-
|
|
688
|
-
|
|
689
|
-
|
|
690
|
-
|
|
691
|
-
|
|
692
|
-
|
|
693
|
-
|
|
281
|
+
const [inner, steps] = mapAccumulate(
|
|
282
|
+
{ context, goal, time },
|
|
283
|
+
proof.steps,
|
|
284
|
+
(state, step) => {
|
|
285
|
+
const [nextContext, nextGoal, simplified, nextTime] = simplifyStep(
|
|
286
|
+
state.context,
|
|
287
|
+
state.goal,
|
|
288
|
+
step,
|
|
289
|
+
state.time,
|
|
290
|
+
);
|
|
291
|
+
return [{ context: nextContext, goal: nextGoal, time: nextTime }, simplified];
|
|
292
|
+
},
|
|
293
|
+
);
|
|
294
|
+
const qedProof = simplify(inner.context, inner.goal, proof.qed.proof, inner.time);
|
|
295
|
+
return { ...proof, steps: steps.flat(), qed: { ...proof.qed, proof: qedProof } };
|
|
694
296
|
}
|
|
695
297
|
}
|
|
696
298
|
};
|
|
697
299
|
|
|
698
|
-
const simplifyStep = (
|
|
300
|
+
const simplifyStep = (
|
|
301
|
+
context: Hyp[],
|
|
302
|
+
goal: Expr,
|
|
303
|
+
step: Step,
|
|
304
|
+
time: Time,
|
|
305
|
+
): [Hyp[], Expr, Step[], Time] => {
|
|
699
306
|
const level = getLevel(step.step);
|
|
700
307
|
switch (step.kind) {
|
|
701
308
|
case "Forget":
|
|
702
|
-
return [context, goal, [step]];
|
|
309
|
+
return [context, goal, [step], time];
|
|
703
310
|
case "Assert": {
|
|
704
|
-
const inner = proveAssertion(context, step.sequent, step);
|
|
311
|
+
const inner = proveAssertion(context, step.sequent, step, time);
|
|
705
312
|
const simplified: Step = {
|
|
706
313
|
...step,
|
|
707
|
-
proof: simplify(inner.context, inner.active, step.proof),
|
|
314
|
+
proof: simplify(inner.context, inner.active, step.proof, inner.time),
|
|
708
315
|
};
|
|
709
|
-
const next = useAssertion(false, context, goal, step.sequent, simplified);
|
|
710
|
-
return [next.context, next.active, [simplified]];
|
|
316
|
+
const next = useAssertion(false, context, goal, step.sequent, simplified, time);
|
|
317
|
+
return [next.context, next.active, [simplified], time];
|
|
711
318
|
}
|
|
712
319
|
case "Suffices": {
|
|
713
|
-
const inner = useAssertion(true, context, goal, step.sequent, step);
|
|
320
|
+
const inner = useAssertion(true, context, goal, step.sequent, step, time);
|
|
714
321
|
const simplified: Step = {
|
|
715
322
|
...step,
|
|
716
|
-
proof: simplify(inner.context, inner.active, step.proof),
|
|
323
|
+
proof: simplify(inner.context, inner.active, step.proof, time),
|
|
717
324
|
};
|
|
718
|
-
const next = proveAssertion(context, step.sequent, simplified);
|
|
719
|
-
return [next.context, next.active, [simplified]];
|
|
325
|
+
const next = proveAssertion(context, step.sequent, simplified, time);
|
|
326
|
+
return [next.context, next.active, [simplified], next.time];
|
|
720
327
|
}
|
|
721
328
|
case "Use": {
|
|
722
329
|
const byProof: Proof = {
|
|
@@ -725,21 +332,19 @@ export const createGenerator = (
|
|
|
725
332
|
isOnly: step.isOnly,
|
|
726
333
|
location: step.location,
|
|
727
334
|
step: step.step,
|
|
728
|
-
|
|
335
|
+
method: step.method,
|
|
729
336
|
};
|
|
730
|
-
const simplified = simplify(context, goal, byProof);
|
|
337
|
+
const simplified = simplify(context, goal, byProof, time);
|
|
731
338
|
if (simplified.kind !== "Steps")
|
|
732
339
|
throw new TlaProofError("simplifying BY does not produce a non-leaf proof!");
|
|
733
|
-
const assumed = step.usable.facts.map(()
|
|
734
|
-
|
|
735
|
-
|
|
736
|
-
visibility: "Visible",
|
|
737
|
-
location: step.location,
|
|
738
|
-
}));
|
|
340
|
+
const assumed = step.usable.facts.map(() =>
|
|
341
|
+
getFact(AT_NOWHERE, "Visible", time, step.location),
|
|
342
|
+
);
|
|
739
343
|
return [
|
|
740
344
|
[...context, ...assumed],
|
|
741
345
|
shiftExpr(step.usable.facts.length, goal),
|
|
742
346
|
simplified.steps,
|
|
347
|
+
time,
|
|
743
348
|
];
|
|
744
349
|
}
|
|
745
350
|
case "Hide": {
|
|
@@ -759,7 +364,7 @@ export const createGenerator = (
|
|
|
759
364
|
: entry,
|
|
760
365
|
);
|
|
761
366
|
}, context);
|
|
762
|
-
return [hidden, goal, [step]];
|
|
367
|
+
return [hidden, goal, [step], time];
|
|
763
368
|
}
|
|
764
369
|
case "Define":
|
|
765
370
|
return [
|
|
@@ -768,7 +373,7 @@ export const createGenerator = (
|
|
|
768
373
|
...step.definitions.map((definition): Hyp => ({
|
|
769
374
|
kind: "Defn",
|
|
770
375
|
definition,
|
|
771
|
-
whereDefined: "Proof",
|
|
376
|
+
whereDefined: { kind: "Proof", time },
|
|
772
377
|
visibility: "Visible",
|
|
773
378
|
isLocal: true,
|
|
774
379
|
location: step.location,
|
|
@@ -776,18 +381,13 @@ export const createGenerator = (
|
|
|
776
381
|
],
|
|
777
382
|
shiftExpr(step.definitions.length, goal),
|
|
778
383
|
[step],
|
|
384
|
+
time,
|
|
779
385
|
];
|
|
780
386
|
case "Have": {
|
|
781
387
|
const connective = exposeConnective(context, goal);
|
|
782
|
-
const fact: Hyp = {
|
|
783
|
-
kind: "Fact",
|
|
784
|
-
expression: step.expression,
|
|
785
|
-
visibility: "Visible",
|
|
786
|
-
location: step.location,
|
|
787
|
-
};
|
|
788
388
|
const isImplication = isBinary(connective, "Implies");
|
|
789
389
|
const sequent: Sequent = {
|
|
790
|
-
context: [
|
|
390
|
+
context: [getFact(step.expression, "Visible", time, step.location)],
|
|
791
391
|
active: isImplication ? shiftExpr(1, connective.args[1]) : connective,
|
|
792
392
|
};
|
|
793
393
|
const proof: Proof = isImplication
|
|
@@ -814,38 +414,33 @@ export const createGenerator = (
|
|
|
814
414
|
location: step.location,
|
|
815
415
|
step: step.step,
|
|
816
416
|
});
|
|
817
|
-
return simplifyStep(context, goal, suffices);
|
|
417
|
+
return simplifyStep(context, goal, suffices, time);
|
|
818
418
|
}
|
|
819
419
|
case "Take":
|
|
820
420
|
return simplifyStep(
|
|
821
421
|
context,
|
|
822
422
|
goal,
|
|
823
423
|
renumberStep(level, getTakeSuffices(context, goal, step)),
|
|
424
|
+
time,
|
|
824
425
|
);
|
|
825
426
|
case "Witness":
|
|
826
427
|
return simplifyStep(
|
|
827
428
|
context,
|
|
828
429
|
goal,
|
|
829
430
|
renumberStep(level, getWitnessSuffices(context, goal, step)),
|
|
431
|
+
time,
|
|
830
432
|
);
|
|
831
433
|
case "Pcase": {
|
|
832
434
|
const assertion: Step = {
|
|
833
435
|
kind: "Assert",
|
|
834
436
|
sequent: {
|
|
835
|
-
context: [
|
|
836
|
-
{
|
|
837
|
-
kind: "Fact",
|
|
838
|
-
expression: step.expression,
|
|
839
|
-
visibility: "Visible",
|
|
840
|
-
location: step.location,
|
|
841
|
-
},
|
|
842
|
-
],
|
|
437
|
+
context: [getFact(step.expression, "Visible", time, step.location)],
|
|
843
438
|
active: shiftExpr(1, goal),
|
|
844
439
|
},
|
|
845
440
|
proof: step.proof,
|
|
846
441
|
...getProps(step),
|
|
847
442
|
};
|
|
848
|
-
return simplifyStep(context, goal, renumberStep(level, assertion));
|
|
443
|
+
return simplifyStep(context, goal, renumberStep(level, assertion), time);
|
|
849
444
|
}
|
|
850
445
|
case "Pick": {
|
|
851
446
|
const existential: Expr = at(
|
|
@@ -853,31 +448,36 @@ export const createGenerator = (
|
|
|
853
448
|
step,
|
|
854
449
|
);
|
|
855
450
|
const salted = getSalted(step.step, "ex");
|
|
856
|
-
const [assertContext, assertGoal, asserted] = simplifyStep(
|
|
857
|
-
|
|
858
|
-
|
|
859
|
-
|
|
860
|
-
|
|
861
|
-
|
|
862
|
-
|
|
451
|
+
const [assertContext, assertGoal, asserted, assertTime] = simplifyStep(
|
|
452
|
+
context,
|
|
453
|
+
goal,
|
|
454
|
+
{
|
|
455
|
+
kind: "Assert",
|
|
456
|
+
sequent: { context: [], active: existential },
|
|
457
|
+
proof: step.proof,
|
|
458
|
+
...getProps(step),
|
|
459
|
+
step: salted,
|
|
460
|
+
},
|
|
461
|
+
time,
|
|
462
|
+
);
|
|
863
463
|
const shifted = shiftExpr(2, existential);
|
|
864
464
|
if (shifted.kind !== "Quant") throw new TlaProofError("Proof.Simplify.simplify_step/PICK");
|
|
865
465
|
const hyps = [
|
|
866
466
|
...getBoundHyps(shifted.bounds),
|
|
867
|
-
|
|
868
|
-
kind: "Fact",
|
|
869
|
-
expression: shifted.body,
|
|
870
|
-
visibility: "Visible",
|
|
871
|
-
location: shifted.body.location,
|
|
872
|
-
} satisfies Hyp,
|
|
467
|
+
getFact(shifted.body, "Visible", assertTime, shifted.body.location),
|
|
873
468
|
];
|
|
874
|
-
const [nextContext, nextGoal, sufficed] = simplifyStep(
|
|
875
|
-
|
|
876
|
-
|
|
877
|
-
|
|
878
|
-
|
|
879
|
-
|
|
880
|
-
|
|
469
|
+
const [nextContext, nextGoal, sufficed, nextTime] = simplifyStep(
|
|
470
|
+
assertContext,
|
|
471
|
+
assertGoal,
|
|
472
|
+
{
|
|
473
|
+
kind: "Suffices",
|
|
474
|
+
sequent: { context: hyps, active: shiftExpr(hyps.length, assertGoal) },
|
|
475
|
+
proof: { kind: "Omitted", omission: "Elsewhere", ...getProps(step) },
|
|
476
|
+
...getProps(step),
|
|
477
|
+
},
|
|
478
|
+
assertTime,
|
|
479
|
+
);
|
|
480
|
+
return [nextContext, nextGoal, [...asserted, ...sufficed], nextTime];
|
|
881
481
|
}
|
|
882
482
|
}
|
|
883
483
|
};
|
|
@@ -893,12 +493,12 @@ export const createGenerator = (
|
|
|
893
493
|
const bounds = expandDittoes(step.bounds);
|
|
894
494
|
const stripBounds = (
|
|
895
495
|
amount: number,
|
|
896
|
-
|
|
496
|
+
sideFacts: Expr[],
|
|
897
497
|
current: Expr,
|
|
898
498
|
rest: Bound[],
|
|
899
|
-
): {
|
|
499
|
+
): { sideFacts: Expr[]; goal: Expr } | string => {
|
|
900
500
|
const bound = rest[0];
|
|
901
|
-
if (!bound) return {
|
|
501
|
+
if (!bound) return { sideFacts, goal: current };
|
|
902
502
|
const exposed = exposeConnective(context, current);
|
|
903
503
|
if (
|
|
904
504
|
exposed.kind !== "Quant" ||
|
|
@@ -936,7 +536,7 @@ export const createGenerator = (
|
|
|
936
536
|
goalBound.name,
|
|
937
537
|
);
|
|
938
538
|
}
|
|
939
|
-
const
|
|
539
|
+
const nextSideFacts =
|
|
940
540
|
domain.kind === "Domain" &&
|
|
941
541
|
goalDomain.kind === "Domain" &&
|
|
942
542
|
!isEqualExpr(domain.expression, goalDomain.expression)
|
|
@@ -946,17 +546,18 @@ export const createGenerator = (
|
|
|
946
546
|
operator: { kind: "Internal", builtin: "Subseteq" },
|
|
947
547
|
args: [goalDomain.expression, domain.expression],
|
|
948
548
|
} satisfies Expr,
|
|
949
|
-
...
|
|
549
|
+
...sideFacts,
|
|
950
550
|
]
|
|
951
|
-
:
|
|
952
|
-
if (goalBounds.length === 0)
|
|
551
|
+
: sideFacts;
|
|
552
|
+
if (goalBounds.length === 0)
|
|
553
|
+
return stripBounds(1, nextSideFacts, exposed.body, rest.slice(1));
|
|
953
554
|
const shiftedBounds =
|
|
954
555
|
rest.length === 1
|
|
955
556
|
? goalBounds.map((item) => substituteBounds(shift(amount), [item])[1][0])
|
|
956
557
|
: goalBounds;
|
|
957
558
|
return stripBounds(
|
|
958
559
|
amount + 1,
|
|
959
|
-
|
|
560
|
+
nextSideFacts,
|
|
960
561
|
at(
|
|
961
562
|
{ kind: "Quant", quantifier: "Forall", bounds: shiftedBounds, body: exposed.body },
|
|
962
563
|
exposed,
|
|
@@ -969,22 +570,15 @@ export const createGenerator = (
|
|
|
969
570
|
return {
|
|
970
571
|
kind: "Suffices",
|
|
971
572
|
sequent: {
|
|
972
|
-
context: [
|
|
973
|
-
{
|
|
974
|
-
kind: "Fact",
|
|
975
|
-
expression: getTrue(goal),
|
|
976
|
-
visibility: "Visible",
|
|
977
|
-
location: step.location,
|
|
978
|
-
},
|
|
979
|
-
],
|
|
573
|
+
context: [getFact(getTrue(goal), "Visible", "Now", step.location)],
|
|
980
574
|
active: goal,
|
|
981
575
|
},
|
|
982
576
|
proof: { kind: "Error", message: stripped, ...getProps(step) },
|
|
983
577
|
...getProps(step),
|
|
984
578
|
};
|
|
985
579
|
}
|
|
986
|
-
const unique = stripped.
|
|
987
|
-
(item, index) => stripped.
|
|
580
|
+
const unique = stripped.sideFacts.filter(
|
|
581
|
+
(item, index) => stripped.sideFacts.findIndex((other) => isEqualExpr(item, other)) === index,
|
|
988
582
|
);
|
|
989
583
|
const facts = [at({ kind: "Ix", index: 2 }, step), ...unique.map((item) => shiftExpr(2, item))];
|
|
990
584
|
return {
|
|
@@ -1000,7 +594,7 @@ export const createGenerator = (
|
|
|
1000
594
|
goal: Expr,
|
|
1001
595
|
step: Step & { kind: "Witness" },
|
|
1002
596
|
): Step => {
|
|
1003
|
-
const
|
|
597
|
+
const sideFacts: Expr[] = [];
|
|
1004
598
|
let error = "";
|
|
1005
599
|
let current = goal;
|
|
1006
600
|
for (const witness of step.expressions) {
|
|
@@ -1041,7 +635,7 @@ export const createGenerator = (
|
|
|
1041
635
|
const subset = isEqualExpr(termDomain, domain)
|
|
1042
636
|
? []
|
|
1043
637
|
: [applyBuiltin("Subseteq", [termDomain, domain], termDomain)];
|
|
1044
|
-
|
|
638
|
+
sideFacts.push(...subset, membership);
|
|
1045
639
|
value = term;
|
|
1046
640
|
} else {
|
|
1047
641
|
error ||= getMessage(
|
|
@@ -1060,7 +654,7 @@ export const createGenerator = (
|
|
|
1060
654
|
}
|
|
1061
655
|
const proof: Proof =
|
|
1062
656
|
error === ""
|
|
1063
|
-
? getWitnessProof(step,
|
|
657
|
+
? getWitnessProof(step, sideFacts)
|
|
1064
658
|
: { kind: "Error", message: error, ...getProps(step) };
|
|
1065
659
|
return {
|
|
1066
660
|
kind: "Suffices",
|
|
@@ -1070,5 +664,5 @@ export const createGenerator = (
|
|
|
1070
664
|
};
|
|
1071
665
|
};
|
|
1072
666
|
|
|
1073
|
-
return
|
|
667
|
+
return simplify;
|
|
1074
668
|
};
|