tla-ts 0.0.9 → 0.0.10-dev.63a6693bd
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +29 -1
- package/dist/compile.cjs +23 -0
- package/dist/compile.js +23 -0
- package/dist/deciders.cjs +29 -29
- package/dist/deciders.js +42 -42
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +106 -10
- package/dist/index.d.ts +106 -10
- package/dist/index.js +1 -1
- package/dist/parallel-worker.cjs +1 -1
- package/dist/parallel-worker.js +1 -1
- package/dist/prove-worker.cjs +1 -1
- package/dist/prove-worker.js +1 -1
- package/dist/prove.cjs +117 -37
- package/dist/prove.js +116 -36
- package/dist/run.cjs +143 -31
- package/dist/run.js +143 -31
- package/dist/tlapm.cjs +2 -2
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +129 -104
- package/dist/transfer.js +129 -104
- package/dist/worker.cjs +7 -7
- package/dist/worker.js +7 -7
- package/package.json +3 -1
- package/src/ast.ts +48 -62
- package/src/bags.ts +99 -102
- package/src/builtins.ts +28 -75
- package/src/bundled-modules.ts +1 -8
- package/src/check-failure.ts +116 -0
- package/src/check-trace.ts +282 -0
- package/src/check.ts +599 -754
- package/src/cli/options.ts +12 -32
- package/src/cli/run.ts +0 -2
- package/src/cli/runtime-invariants.ts +136 -0
- package/src/cli/shared.ts +19 -12
- package/src/cli/tlapm.ts +14 -25
- package/src/cli/tlc-arguments.ts +652 -0
- package/src/cli/tlc-output.ts +687 -0
- package/src/cli/tlc-usage.ts +361 -0
- package/src/cli/tlc.ts +309 -658
- package/src/cli/typescript.ts +23 -0
- package/src/cli/xml-exporter.ts +27 -49
- package/src/cli.ts +0 -1
- package/src/codegen.ts +196 -74
- package/src/config.ts +140 -109
- package/src/coverage.ts +830 -0
- package/src/dependencies.ts +14 -53
- package/src/dfid.ts +618 -0
- package/src/environment-config.ts +315 -0
- package/src/environment.ts +169 -335
- package/src/errors.ts +71 -55
- package/src/evaluate.ts +598 -340
- package/src/exit-codes.ts +37 -3
- package/src/fingerprints.ts +75 -11
- package/src/index.ts +3 -0
- package/src/instances.ts +126 -21
- package/src/java-hash.ts +7 -0
- package/src/java-overrides.ts +4 -19
- package/src/json-reader.ts +455 -0
- package/src/json.ts +252 -139
- package/src/levels.ts +46 -58
- package/src/lexer.ts +80 -100
- package/src/liveness-checker.ts +103 -153
- package/src/liveness.ts +150 -109
- package/src/obligations/action.ts +8 -39
- package/src/obligations/anonymize.ts +88 -82
- package/src/obligations/equality.ts +1 -1
- package/src/obligations/expression.ts +20 -21
- package/src/obligations/format.ts +1 -9
- package/src/obligations/generate.ts +46 -49
- package/src/obligations/index.ts +2 -13
- package/src/obligations/levels.ts +4 -8
- package/src/obligations/module.ts +28 -53
- package/src/obligations/normalize.ts +7 -25
- package/src/obligations/operators.ts +1 -2
- package/src/obligations/pragma.ts +1 -10
- package/src/obligations/printer.ts +47 -46
- package/src/obligations/proof.ts +1 -5
- package/src/obligations/regroup.ts +1 -4
- package/src/obligations/simplify.ts +42 -58
- package/src/obligations/source.ts +48 -78
- package/src/obligations/subexpression.ts +5 -11
- package/src/obligations/substitution.ts +1 -3
- package/src/obligations/temporal.ts +13 -19
- package/src/obligations/tuples.ts +3 -9
- package/src/parallel-worker.ts +30 -60
- package/src/parallel.ts +57 -71
- package/src/parser.ts +584 -316
- package/src/pcal/ast.ts +53 -86
- package/src/pcal/parse.ts +144 -219
- package/src/pcal/tokenize.ts +91 -131
- package/src/pcal/translate.ts +83 -130
- package/src/pcal/validate.ts +48 -68
- package/src/pretty-print.ts +7 -8
- package/src/prover/decide-pool.ts +8 -13
- package/src/prover/deciders.ts +3 -7
- package/src/prover/first-order.ts +0 -11
- package/src/prover/isabelle/decide.ts +0 -6
- package/src/prover/isabelle/encode.ts +11 -23
- package/src/prover/isabelle/isar/inner-syntax.ts +114 -115
- package/src/prover/isabelle/isar/method.ts +29 -53
- package/src/prover/isabelle/isar/proof.ts +1 -10
- package/src/prover/isabelle/isar/statement.ts +1 -6
- package/src/prover/isabelle/isar/theory.ts +26 -36
- package/src/prover/isabelle/isar/type-check.ts +17 -31
- package/src/prover/isabelle/provers/blast/blast.ts +17 -104
- package/src/prover/isabelle/provers/blast/branch.ts +1 -32
- package/src/prover/isabelle/provers/blast/prove.ts +1 -35
- package/src/prover/isabelle/provers/blast/rules.ts +6 -44
- package/src/prover/isabelle/provers/blast/state.ts +2 -28
- package/src/prover/isabelle/provers/blast/term.ts +9 -36
- package/src/prover/isabelle/provers/clasimp.ts +1 -13
- package/src/prover/isabelle/provers/classical.ts +14 -42
- package/src/prover/isabelle/provers/hypsubst.ts +28 -51
- package/src/prover/isabelle/pure/bicompose.ts +25 -38
- package/src/prover/isabelle/pure/consts.ts +1 -7
- package/src/prover/isabelle/pure/conv.ts +3 -17
- package/src/prover/isabelle/pure/drule.ts +33 -42
- package/src/prover/isabelle/pure/envir.ts +3 -52
- package/src/prover/isabelle/pure/goal.ts +1 -7
- package/src/prover/isabelle/pure/interrupt.ts +0 -5
- package/src/prover/isabelle/pure/list.ts +0 -3
- package/src/prover/isabelle/pure/logic.ts +2 -15
- package/src/prover/isabelle/pure/name.ts +2 -9
- package/src/prover/isabelle/pure/net.ts +3 -59
- package/src/prover/isabelle/pure/object-logic.ts +3 -10
- package/src/prover/isabelle/pure/pattern.ts +2 -19
- package/src/prover/isabelle/pure/raw-simplifier.ts +17 -62
- package/src/prover/isabelle/pure/rewriter.ts +31 -67
- package/src/prover/isabelle/pure/search.ts +3 -10
- package/src/prover/isabelle/pure/seq.ts +1 -10
- package/src/prover/isabelle/pure/simplifier.ts +4 -12
- package/src/prover/isabelle/pure/table.ts +3 -32
- package/src/prover/isabelle/pure/tactic.ts +12 -22
- package/src/prover/isabelle/pure/tactical.ts +48 -47
- package/src/prover/isabelle/pure/term-ord.ts +2 -6
- package/src/prover/isabelle/pure/term.ts +2 -43
- package/src/prover/isabelle/pure/thm.ts +27 -47
- package/src/prover/isabelle/pure/type.ts +2 -15
- package/src/prover/isabelle/pure/unify.ts +20 -30
- package/src/prover/isabelle/pure/variable.ts +3 -7
- package/src/prover/isabelle/tla/classical-setup.ts +17 -24
- package/src/prover/isabelle/tla/context.ts +15 -18
- package/src/prover/isabelle/tla/logic.ts +14 -32
- package/src/prover/isabelle/tla/simpdata.ts +46 -43
- package/src/prover/isabelle/tools/intuitionistic.ts +1 -10
- package/src/prover/ocaml.ts +0 -6
- package/src/prover/prep/action.ts +14 -54
- package/src/prover/prep/enabled-axioms.ts +12 -19
- package/src/prover/prep/fingerprint.ts +2 -21
- package/src/prover/prep/level-comparison.ts +8 -12
- package/src/prover/prep/md5.ts +0 -2
- package/src/prover/prep/methods.ts +33 -39
- package/src/prover/prep/normalize.ts +4 -28
- package/src/prover/prove-worker.ts +0 -2
- package/src/prover/prove.ts +87 -100
- package/src/prover/ptl/decide.ts +7 -12
- package/src/prover/ptl/encode.ts +14 -36
- package/src/prover/ptl/sat.ts +24 -32
- package/src/prover/ptl/tableau.ts +12 -26
- package/src/prover/smt/axioms.ts +0 -7
- package/src/prover/smt/context.ts +20 -28
- package/src/prover/smt/data.ts +433 -424
- package/src/prover/smt/encode.ts +43 -52
- package/src/prover/smt/extensionality.ts +0 -10
- package/src/prover/smt/flatten.ts +3 -22
- package/src/prover/smt/format.ts +5 -10
- package/src/prover/smt/instances.ts +0 -10
- package/src/prover/smt/rewrite.ts +663 -667
- package/src/prover/smt/solver/act-cache.ts +0 -15
- package/src/prover/smt/solver/arith-rewriter.ts +3 -48
- package/src/prover/smt/solver/array.ts +1 -3
- package/src/prover/smt/solver/asserted-formulas.ts +1 -43
- package/src/prover/smt/solver/ast-lt.ts +1 -11
- package/src/prover/smt/solver/ast-util.ts +1 -6
- package/src/prover/smt/solver/ast.ts +1 -165
- package/src/prover/smt/solver/auf-solver.ts +8 -44
- package/src/prover/smt/solver/case-split-queue.ts +1 -9
- package/src/prover/smt/solver/cg-table.ts +1 -18
- package/src/prover/smt/solver/clause.ts +1 -27
- package/src/prover/smt/solver/conflict-resolution.ts +0 -9
- package/src/prover/smt/solver/context.ts +7 -64
- package/src/prover/smt/solver/ctx-simplify.ts +14 -41
- package/src/prover/smt/solver/der.ts +2 -21
- package/src/prover/smt/solver/dyn-ack.ts +1 -11
- package/src/prover/smt/solver/e-matching.ts +4 -35
- package/src/prover/smt/solver/enode.ts +1 -21
- package/src/prover/smt/solver/expr-ref.ts +1 -5
- package/src/prover/smt/solver/expr-safe-replace.ts +1 -6
- package/src/prover/smt/solver/fingerprints.ts +1 -12
- package/src/prover/smt/solver/flat-literals.ts +1 -9
- package/src/prover/smt/solver/goal.ts +2 -14
- package/src/prover/smt/solver/hash.ts +0 -8
- package/src/prover/smt/solver/hashtable.ts +1 -12
- package/src/prover/smt/solver/internalizer.ts +7 -100
- package/src/prover/smt/solver/lbool.ts +1 -2
- package/src/prover/smt/solver/literal.ts +0 -3
- package/src/prover/smt/solver/lp/bound-propagator.ts +8 -26
- package/src/prover/smt/solver/lp/constraints.ts +2 -8
- package/src/prover/smt/solver/lp/containers.ts +12 -30
- package/src/prover/smt/solver/lp/core-solver.ts +10 -31
- package/src/prover/smt/solver/lp/cross-nested.ts +6 -20
- package/src/prover/smt/solver/lp/dep-intervals.ts +7 -22
- package/src/prover/smt/solver/lp/dependency.ts +1 -4
- package/src/prover/smt/solver/lp/dioph-eq.ts +9 -102
- package/src/prover/smt/solver/lp/explanation.ts +1 -6
- package/src/prover/smt/solver/lp/gomory.ts +9 -22
- package/src/prover/smt/solver/lp/hnf-cutter.ts +17 -23
- package/src/prover/smt/solver/lp/hnf.ts +11 -26
- package/src/prover/smt/solver/lp/int-cube.ts +15 -36
- package/src/prover/smt/solver/lp/int-solver.ts +4 -34
- package/src/prover/smt/solver/lp/lar-solver.ts +32 -81
- package/src/prover/smt/solver/lp/lar-term.ts +1 -5
- package/src/prover/smt/solver/lp/lp-settings.ts +1 -14
- package/src/prover/smt/solver/lp/maximize-term.ts +20 -45
- package/src/prover/smt/solver/lp/nex-creator.ts +5 -28
- package/src/prover/smt/solver/lp/nex.ts +1 -6
- package/src/prover/smt/solver/lp/nla-backoff.ts +1 -4
- package/src/prover/smt/solver/lp/nla-basics.ts +5 -30
- package/src/prover/smt/solver/lp/nla-core.ts +36 -135
- package/src/prover/smt/solver/lp/nla-divisions.ts +32 -42
- package/src/prover/smt/solver/lp/nla-emonics.ts +4 -21
- package/src/prover/smt/solver/lp/nla-factorization.ts +1 -4
- package/src/prover/smt/solver/lp/nla-grobner.ts +15 -69
- package/src/prover/smt/solver/lp/nla-horner.ts +3 -11
- package/src/prover/smt/solver/lp/nla-intervals.ts +2 -12
- package/src/prover/smt/solver/lp/nla-monomial-bounds.ts +16 -41
- package/src/prover/smt/solver/lp/nla-monotone.ts +2 -6
- package/src/prover/smt/solver/lp/nla-order.ts +2 -13
- package/src/prover/smt/solver/lp/nla-patcher.ts +4 -7
- package/src/prover/smt/solver/lp/nla-tangents.ts +1 -9
- package/src/prover/smt/solver/lp/nla-throttle.ts +1 -6
- package/src/prover/smt/solver/lp/nla-types.ts +1 -11
- package/src/prover/smt/solver/lp/nla-var-eqs.ts +4 -25
- package/src/prover/smt/solver/lp/nra-solver.ts +5 -52
- package/src/prover/smt/solver/lp/numeric-pair.ts +1 -4
- package/src/prover/smt/solver/lp/pdd-interval.ts +1 -3
- package/src/prover/smt/solver/lp/pdd-simplifier.ts +2 -14
- package/src/prover/smt/solver/lp/pdd-solver.ts +4 -33
- package/src/prover/smt/solver/lp/pdd.ts +7 -70
- package/src/prover/smt/solver/lp/random-updater.ts +1 -8
- package/src/prover/smt/solver/lp/static-matrix.ts +9 -19
- package/src/prover/smt/solver/lp/union-find.ts +1 -6
- package/src/prover/smt/solver/mam-compiler.ts +18 -58
- package/src/prover/smt/solver/mam-interpreter.ts +1 -21
- package/src/prover/smt/solver/maximize-ac-sharing.ts +2 -17
- package/src/prover/smt/solver/model-checker.ts +3 -37
- package/src/prover/smt/solver/model-evaluator.ts +3 -29
- package/src/prover/smt/solver/model-finder.ts +15 -32
- package/src/prover/smt/solver/model-generator.ts +1 -12
- package/src/prover/smt/solver/model-macro-solver.ts +23 -88
- package/src/prover/smt/solver/nlsat/algebraic.ts +63 -159
- package/src/prover/smt/solver/nlsat/atoms.ts +25 -23
- package/src/prover/smt/solver/nlsat/evaluator.ts +17 -22
- package/src/prover/smt/solver/nlsat/explain.ts +10 -69
- package/src/prover/smt/solver/nlsat/interval-set.ts +9 -50
- package/src/prover/smt/solver/nlsat/levelwise.ts +49 -135
- package/src/prover/smt/solver/nlsat/mpbq.ts +3 -14
- package/src/prover/smt/solver/nlsat/polynomial.ts +29 -159
- package/src/prover/smt/solver/nlsat/solver.ts +18 -90
- package/src/prover/smt/solver/nlsat/types.ts +1 -8
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +2 -45
- package/src/prover/smt/solver/nlsat/upolynomial.ts +11 -92
- package/src/prover/smt/solver/nnf.ts +3 -38
- package/src/prover/smt/solver/pattern-inference.ts +2 -15
- package/src/prover/smt/solver/poly-rewriter.ts +3 -23
- package/src/prover/smt/solver/propagate-values.ts +1 -10
- package/src/prover/smt/solver/proto-model.ts +3 -52
- package/src/prover/smt/solver/pull-quant.ts +1 -12
- package/src/prover/smt/solver/qe-lite-der.ts +1 -29
- package/src/prover/smt/solver/qe-lite-fm.ts +2 -25
- package/src/prover/smt/solver/qe-lite.ts +3 -33
- package/src/prover/smt/solver/qi-queue.ts +1 -16
- package/src/prover/smt/solver/quant-tactics.ts +5 -22
- package/src/prover/smt/solver/quantifier-analyzer.ts +27 -47
- package/src/prover/smt/solver/quantifier-manager.ts +2 -13
- package/src/prover/smt/solver/random-gen.ts +1 -2
- package/src/prover/smt/solver/rational.ts +1 -8
- package/src/prover/smt/solver/ref-vector.ts +1 -6
- package/src/prover/smt/solver/relevancy.ts +2 -15
- package/src/prover/smt/solver/rewriter-tpl.ts +3 -147
- package/src/prover/smt/solver/rewriter.ts +3 -85
- package/src/prover/smt/solver/rlimit.ts +2 -20
- package/src/prover/smt/solver/smtlib-parser.ts +80 -131
- package/src/prover/smt/solver/solver.ts +23 -34
- package/src/prover/smt/solver/sort.ts +1 -5
- package/src/prover/smt/solver/sticky-generations.ts +0 -5
- package/src/prover/smt/solver/theory-lra-axioms.ts +3 -24
- package/src/prover/smt/solver/theory-lra-bounds.ts +1 -7
- package/src/prover/smt/solver/theory-lra-final-check.ts +4 -22
- package/src/prover/smt/solver/theory-lra-internalize.ts +6 -43
- package/src/prover/smt/solver/theory-lra-model.ts +4 -19
- package/src/prover/smt/solver/theory-lra-propagate.ts +1 -15
- package/src/prover/smt/solver/theory-lra-state.ts +3 -8
- package/src/prover/smt/solver/theory-lra.ts +1 -8
- package/src/prover/smt/solver/var-subst.ts +2 -26
- package/src/prover/smt/table.ts +0 -8
- package/src/prover/tlapm/cache.ts +45 -40
- package/src/prover/tlapm/ocaml-marshal.ts +19 -21
- package/src/prover/tlapm/tlapm.ts +21 -20
- package/src/prover/verdict.ts +7 -2
- package/src/prover/zenon/check/check.ts +1 -11
- package/src/prover/zenon/check/definitions.ts +5 -15
- package/src/prover/zenon/check/equality.ts +0 -8
- package/src/prover/zenon/check/functions.ts +0 -4
- package/src/prover/zenon/check/keys.ts +0 -7
- package/src/prover/zenon/check/propositional.ts +0 -3
- package/src/prover/zenon/check/records.ts +1 -6
- package/src/prover/zenon/check/relations.ts +2 -14
- package/src/prover/zenon/check/rewrites.ts +2 -21
- package/src/prover/zenon/check/sets.ts +40 -61
- package/src/prover/zenon/check/terms.ts +1 -19
- package/src/prover/zenon/check/tla.ts +0 -6
- package/src/prover/zenon/decide.ts +0 -12
- package/src/prover/zenon/encode.ts +1 -8
- package/src/prover/zenon/eqrel.ts +2 -13
- package/src/prover/zenon/equality-rules.ts +0 -4
- package/src/prover/zenon/expr.ts +8 -26
- package/src/prover/zenon/index-table.ts +26 -57
- package/src/prover/zenon/isar-case.ts +9 -19
- package/src/prover/zenon/isar.ts +36 -64
- package/src/prover/zenon/limits.ts +0 -4
- package/src/prover/zenon/llproof.ts +2 -20
- package/src/prover/zenon/mltoll.ts +66 -104
- package/src/prover/zenon/node.ts +1 -11
- package/src/prover/zenon/ocaml.ts +1 -17
- package/src/prover/zenon/parse.ts +4 -12
- package/src/prover/zenon/phrase.ts +1 -11
- package/src/prover/zenon/proof.ts +0 -9
- package/src/prover/zenon/propositional-rules.ts +0 -5
- package/src/prover/zenon/rules.ts +2 -6
- package/src/prover/zenon/search.ts +5 -31
- package/src/prover/zenon/tla/functions.ts +59 -31
- package/src/prover/zenon/tla/llproof.ts +67 -76
- package/src/prover/zenon/tla/records.ts +57 -33
- package/src/prover/zenon/tla/rewrites.ts +12 -19
- package/src/prover/zenon/tla/sets.ts +83 -53
- package/src/prover/zenon/tla/terms.ts +0 -6
- package/src/prover/zenon/tla/tla.ts +66 -64
- package/src/randomization.ts +81 -35
- package/src/resolve.ts +67 -184
- package/src/runtime.ts +22 -22
- package/src/sany/builtins.ts +2 -5
- package/src/sany/generation.ts +394 -0
- package/src/sany/generator-def-entries.ts +210 -0
- package/src/sany/generator-definitions.ts +686 -0
- package/src/sany/generator-expressions.ts +1100 -0
- package/src/sany/generator-proofs.ts +662 -0
- package/src/sany/generator.ts +191 -2764
- package/src/sany/levels.ts +6 -34
- package/src/sany/lexer.ts +58 -77
- package/src/sany/linter.ts +1 -9
- package/src/sany/modules.ts +1 -5
- package/src/sany/nodes.ts +5 -43
- package/src/sany/parse-error.ts +39 -117
- package/src/sany/report.ts +32 -69
- package/src/sany/selectors.ts +49 -76
- package/src/sany/source.ts +1 -17
- package/src/sany/xml.ts +35 -117
- package/src/search.ts +541 -163
- package/src/simulate.ts +709 -0
- package/src/spec-description.ts +192 -100
- package/src/standard-definitions.ts +0 -4
- package/src/standard-modules.ts +264 -95
- package/src/state-graph.ts +52 -31
- package/src/subexpressions.ts +69 -52
- package/src/substitution-levels.ts +7 -7
- package/src/successors.ts +266 -99
- package/src/symmetry.ts +33 -25
- package/src/tableau.ts +27 -24
- package/src/tlc/fingerprint.ts +183 -67
- package/src/tlc/jar-data.ts +112 -6
- package/src/tlc/messages.ts +125 -54
- package/src/tlc/order.ts +39 -69
- package/src/tlc/random.ts +37 -49
- package/src/tlc/replay.ts +553 -228
- package/src/tlc/summary.ts +36 -47
- package/src/tlc/tlc-operators.ts +78 -44
- package/src/tlc/tlcext-operators.ts +139 -122
- package/src/tlc/trace-spec.ts +249 -0
- package/src/tlc/value-stream.ts +139 -0
- package/src/tlc/version.ts +1 -4
- package/src/transfer.ts +22 -25
- package/src/typescript/actions.ts +479 -0
- package/src/typescript/collections.ts +614 -0
- package/src/typescript/compile.ts +63 -0
- package/src/typescript/context.ts +94 -0
- package/src/typescript/emit.ts +121 -0
- package/src/typescript/expressions.ts +496 -0
- package/src/typescript/formula.ts +154 -0
- package/src/typescript/functions.ts +284 -0
- package/src/typescript/model.ts +162 -0
- package/src/typescript/names.ts +114 -0
- package/src/typescript/program.ts +48 -0
- package/src/typescript/properties.ts +139 -0
- package/src/typescript/scope.ts +112 -0
- package/src/typescript/steps.ts +167 -0
- package/src/typescript/types.ts +171 -0
- package/src/values.ts +832 -484
- package/src/worker.ts +7 -8
|
@@ -1,5 +1,4 @@
|
|
|
1
|
-
// A port of tlapm's obligation printer
|
|
2
|
-
// identifier renaming in Ctx.
|
|
1
|
+
// A port of tlapm's obligation printer (E_fmt, Fmtutil and Ctx).
|
|
3
2
|
|
|
4
3
|
import { TlaProofError } from "../errors";
|
|
5
4
|
import {
|
|
@@ -16,8 +15,6 @@ import {
|
|
|
16
15
|
import { format, formatDelimited, renderDoc, text, type Doc } from "./format";
|
|
17
16
|
import { getStandardForm, lookupOperator } from "./operators";
|
|
18
17
|
|
|
19
|
-
// Ctx, which names each binder apart from the names in scope by adding a salt, as a mutable stack:
|
|
20
|
-
// printers bind and unbind names in strict nesting order.
|
|
21
18
|
interface Ident {
|
|
22
19
|
rep: string;
|
|
23
20
|
salt: number;
|
|
@@ -38,7 +35,6 @@ export const createContext = (): Context => ({
|
|
|
38
35
|
defined: new Map(),
|
|
39
36
|
});
|
|
40
37
|
|
|
41
|
-
// The name of the binder index places in, counting from 1 for the innermost.
|
|
42
38
|
export const getBoundName = (context: Context, index: number) => {
|
|
43
39
|
const ident = context.stack[context.stack.length - index];
|
|
44
40
|
return ident && getIdentName(ident);
|
|
@@ -139,9 +135,9 @@ const printMinimal = (expression: Minimal): Doc => {
|
|
|
139
135
|
}
|
|
140
136
|
};
|
|
141
137
|
|
|
142
|
-
const
|
|
138
|
+
const createAtom = (doc: Doc): Minimal => ({ kind: "Atm", doc });
|
|
143
139
|
|
|
144
|
-
const
|
|
140
|
+
const createBig = (doc: Doc): Minimal => ({ kind: "Big", doc });
|
|
145
141
|
|
|
146
142
|
const isWith = (expression: Expr): boolean => {
|
|
147
143
|
if (expression.kind === "Lambda") return isWith(expression.body);
|
|
@@ -180,7 +176,6 @@ const LEVEL_NAMES = {
|
|
|
180
176
|
Unknown: "UNKNOWN",
|
|
181
177
|
};
|
|
182
178
|
|
|
183
|
-
// hyps names the indices beyond the printer's own context, as the hypothesis deque does in E_fmt.
|
|
184
179
|
const createPrinter = (hyps: Hyp[] = []) => {
|
|
185
180
|
const context = createContext();
|
|
186
181
|
const printExpr = (expression: Expr): Doc => printMinimal(formatExpr(expression));
|
|
@@ -197,8 +192,6 @@ const createPrinter = (hyps: Hyp[] = []) => {
|
|
|
197
192
|
),
|
|
198
193
|
);
|
|
199
194
|
|
|
200
|
-
// fmt_bounds: names bind left to right, domains print in the enclosing context, and dittos
|
|
201
|
-
// share the previous domain.
|
|
202
195
|
const formatBounds = <Result>(bounds: Bound[], body: (boundsDoc: Doc) => Result): Result => {
|
|
203
196
|
const domains = bounds.map((bound) =>
|
|
204
197
|
bound.domain.kind === "Domain" ? printExpr(bound.domain.expression) : undefined,
|
|
@@ -274,15 +267,15 @@ const createPrinter = (hyps: Hyp[] = []) => {
|
|
|
274
267
|
skeleton: {
|
|
275
268
|
kind: "Infix",
|
|
276
269
|
assoc: "Left",
|
|
277
|
-
left:
|
|
278
|
-
right:
|
|
270
|
+
left: createBig(printLambda(operator.params, operator.body)),
|
|
271
|
+
right: createAtom(format("(%a)", formatDelimited(args, printExpr))),
|
|
279
272
|
},
|
|
280
273
|
};
|
|
281
274
|
}
|
|
282
275
|
if (operator.kind === "Bang") {
|
|
283
276
|
return args.length === 0
|
|
284
277
|
? formatExpr(operator)
|
|
285
|
-
:
|
|
278
|
+
: createAtom(
|
|
286
279
|
format("@[<b2>%a@[<b1>(%a)@]@]", printExpr(operator), formatDelimited(args, printExpr)),
|
|
287
280
|
);
|
|
288
281
|
}
|
|
@@ -291,7 +284,7 @@ const createPrinter = (hyps: Hyp[] = []) => {
|
|
|
291
284
|
return formatExpr(args[0]);
|
|
292
285
|
}
|
|
293
286
|
if (operator.builtin === "Irregular") {
|
|
294
|
-
return
|
|
287
|
+
return createAtom(format("@[<h>@<1>%s%a@<1>%s@]", "<[", printExpr(args[0]), "]>"));
|
|
295
288
|
}
|
|
296
289
|
}
|
|
297
290
|
const form = (() => {
|
|
@@ -316,9 +309,11 @@ const createPrinter = (hyps: Hyp[] = []) => {
|
|
|
316
309
|
high: form.high,
|
|
317
310
|
skeleton,
|
|
318
311
|
});
|
|
319
|
-
if (args.length === 0) return
|
|
312
|
+
if (args.length === 0) return createAtom(text(form.name));
|
|
320
313
|
if (form.fixity === "Nonfix") {
|
|
321
|
-
return
|
|
314
|
+
return createAtom(
|
|
315
|
+
format("@[<b2>%s@[<b1>(%a)@]@]", form.name, formatDelimited(args, printExpr)),
|
|
316
|
+
);
|
|
322
317
|
}
|
|
323
318
|
if (form.fixity === "Prefix" && args.length === 1) {
|
|
324
319
|
return getOperation(
|
|
@@ -352,17 +347,17 @@ const createPrinter = (hyps: Hyp[] = []) => {
|
|
|
352
347
|
case "Internal":
|
|
353
348
|
return formatApply(expression, []);
|
|
354
349
|
case "Lambda":
|
|
355
|
-
return
|
|
350
|
+
return createBig(printLambda(expression.params, expression.body));
|
|
356
351
|
case "Bang":
|
|
357
|
-
return
|
|
352
|
+
return createAtom([printExpr(expression.expression), printSelectors(expression.selectors)]);
|
|
358
353
|
case "Apply":
|
|
359
354
|
return formatApply(expression.operator, expression.args);
|
|
360
355
|
case "Sequent":
|
|
361
|
-
return
|
|
356
|
+
return createBig(printSequent(expression.sequent));
|
|
362
357
|
case "With":
|
|
363
358
|
return formatExpr(expression.expression);
|
|
364
359
|
case "If":
|
|
365
|
-
return
|
|
360
|
+
return createBig(
|
|
366
361
|
format(
|
|
367
362
|
"@[<hv2>@[<b2>IF@ %a@]@ @[<b2>THEN %a@]@ @[<b2>ELSE %a@]@]",
|
|
368
363
|
printExpr(expression.condition),
|
|
@@ -372,13 +367,13 @@ const createPrinter = (hyps: Hyp[] = []) => {
|
|
|
372
367
|
);
|
|
373
368
|
case "List": {
|
|
374
369
|
if (expression.bullet === "Refs" && expression.items.length === 0) {
|
|
375
|
-
return
|
|
370
|
+
return createAtom(format("TRUE"));
|
|
376
371
|
}
|
|
377
372
|
if (expression.bullet === "Refs" && expression.items.length === 1) {
|
|
378
373
|
return formatExpr(expression.items[0]);
|
|
379
374
|
}
|
|
380
375
|
const bullet = expression.bullet === "Or" ? "\\/" : "/\\";
|
|
381
|
-
return
|
|
376
|
+
return createBig(
|
|
382
377
|
format(
|
|
383
378
|
"@[<v0>%a@]",
|
|
384
379
|
formatDelimited(
|
|
@@ -397,11 +392,15 @@ const createPrinter = (hyps: Hyp[] = []) => {
|
|
|
397
392
|
);
|
|
398
393
|
const bodyDoc = printExpr(expression.body);
|
|
399
394
|
popNames(context, expression.definitions.length);
|
|
400
|
-
return
|
|
395
|
+
return createBig([
|
|
396
|
+
format("@[<hv0>LET @[<v0>"),
|
|
397
|
+
definitionsDoc,
|
|
398
|
+
format("@]@\nIN %a@]", bodyDoc),
|
|
399
|
+
]);
|
|
401
400
|
}
|
|
402
401
|
case "Quant":
|
|
403
402
|
return formatBounds(expression.bounds, (boundsDoc) =>
|
|
404
|
-
|
|
403
|
+
createBig(
|
|
405
404
|
format(
|
|
406
405
|
"@[<b3>%s @[<b0>%a@] :@ %a@]",
|
|
407
406
|
expression.quantifier === "Forall" ? "\\A" : "\\E",
|
|
@@ -412,7 +411,7 @@ const createPrinter = (hyps: Hyp[] = []) => {
|
|
|
412
411
|
);
|
|
413
412
|
case "Tquant":
|
|
414
413
|
return withNames(context, expression.names, (names) =>
|
|
415
|
-
|
|
414
|
+
createBig(
|
|
416
415
|
format(
|
|
417
416
|
"@[<b4>%s @[<b0>%a@] : %a@]",
|
|
418
417
|
expression.quantifier === "Forall" ? "\\AA" : "\\EE",
|
|
@@ -424,7 +423,7 @@ const createPrinter = (hyps: Hyp[] = []) => {
|
|
|
424
423
|
case "Choose": {
|
|
425
424
|
const domainDoc = expression.domain && printExpr(expression.domain);
|
|
426
425
|
return withNames(context, [expression.name], ([name]) =>
|
|
427
|
-
|
|
426
|
+
createBig(
|
|
428
427
|
domainDoc
|
|
429
428
|
? format(
|
|
430
429
|
"@[<b2>CHOOSE @[<b2>%s \\in@ %a@] :@ %a@]",
|
|
@@ -439,7 +438,7 @@ const createPrinter = (hyps: Hyp[] = []) => {
|
|
|
439
438
|
case "SetSt": {
|
|
440
439
|
const domainDoc = printExpr(expression.domain);
|
|
441
440
|
return withNames(context, [expression.name], ([name]) =>
|
|
442
|
-
|
|
441
|
+
createAtom(
|
|
443
442
|
format(
|
|
444
443
|
"@[<b3>{@[<b2>%s \\in@ %a@] :@ %a}@]",
|
|
445
444
|
name,
|
|
@@ -451,22 +450,24 @@ const createPrinter = (hyps: Hyp[] = []) => {
|
|
|
451
450
|
}
|
|
452
451
|
case "SetOf":
|
|
453
452
|
return formatBounds(expression.bounds, (boundsDoc) =>
|
|
454
|
-
|
|
453
|
+
createAtom(format("@[<b3>{%a :@ %a}@]", printExpr(expression.element), boundsDoc)),
|
|
455
454
|
);
|
|
456
455
|
case "SetEnum":
|
|
457
|
-
return
|
|
456
|
+
return createAtom(
|
|
457
|
+
format("@[<h>{@[<b0>%a@]}@]", formatDelimited(expression.elements, printExpr)),
|
|
458
|
+
);
|
|
458
459
|
case "Arrow":
|
|
459
|
-
return
|
|
460
|
+
return createAtom(
|
|
460
461
|
format("@[<b3>[%a ->@ %a]@]", printExpr(expression.domain), printExpr(expression.range)),
|
|
461
462
|
);
|
|
462
463
|
case "Fcn":
|
|
463
464
|
return formatBounds(expression.bounds, (boundsDoc) =>
|
|
464
|
-
|
|
465
|
+
createAtom(format("@[<b3>[%a |->@ %a]@]", boundsDoc, printExpr(expression.body))),
|
|
465
466
|
);
|
|
466
467
|
case "FcnApp": {
|
|
467
468
|
const target = formatExpr(expression.function);
|
|
468
469
|
const isAtom = target.kind === "Atm";
|
|
469
|
-
return
|
|
470
|
+
return createAtom(
|
|
470
471
|
format(
|
|
471
472
|
"@[<h>%s%a%s@[<b1>[%a]@]@]",
|
|
472
473
|
isAtom ? "" : "(",
|
|
@@ -495,11 +496,13 @@ const createPrinter = (hyps: Hyp[] = []) => {
|
|
|
495
496
|
};
|
|
496
497
|
}
|
|
497
498
|
case "Tuple":
|
|
498
|
-
return
|
|
499
|
+
return createAtom(
|
|
500
|
+
format("@[<b2><<%a>>@]", formatDelimited(expression.elements, printExpr)),
|
|
501
|
+
);
|
|
499
502
|
case "Rect":
|
|
500
503
|
case "Record": {
|
|
501
504
|
const separator = expression.kind === "Rect" ? ":" : "|->";
|
|
502
|
-
return
|
|
505
|
+
return createAtom(
|
|
503
506
|
format(
|
|
504
507
|
"@[<b1>[%a]@]",
|
|
505
508
|
formatDelimited(expression.fields, (field) =>
|
|
@@ -509,7 +512,7 @@ const createPrinter = (hyps: Hyp[] = []) => {
|
|
|
509
512
|
);
|
|
510
513
|
}
|
|
511
514
|
case "Except":
|
|
512
|
-
return
|
|
515
|
+
return createAtom(
|
|
513
516
|
format(
|
|
514
517
|
"@[<b3>[%a EXCEPT@ @[<v0>%a@]]@]",
|
|
515
518
|
printExpr(expression.function),
|
|
@@ -537,14 +540,14 @@ const createPrinter = (hyps: Hyp[] = []) => {
|
|
|
537
540
|
kind: "Infix",
|
|
538
541
|
assoc: "Left",
|
|
539
542
|
left: formatExpr(expression.expression),
|
|
540
|
-
right:
|
|
543
|
+
right: createAtom(text(expression.field)),
|
|
541
544
|
},
|
|
542
545
|
};
|
|
543
546
|
case "Sub":
|
|
544
547
|
case "Tsub": {
|
|
545
548
|
const isBox = expression.modal === "Box";
|
|
546
549
|
const open = expression.kind === "Sub" ? (isBox ? "[" : "<<") : isBox ? "[][" : "<><<";
|
|
547
|
-
return
|
|
550
|
+
return createAtom(
|
|
548
551
|
format(
|
|
549
552
|
"@[<h>%s@[<b2>%a@]%s%a@]",
|
|
550
553
|
open,
|
|
@@ -555,7 +558,7 @@ const createPrinter = (hyps: Hyp[] = []) => {
|
|
|
555
558
|
);
|
|
556
559
|
}
|
|
557
560
|
case "Fair":
|
|
558
|
-
return
|
|
561
|
+
return createBig(
|
|
559
562
|
format(
|
|
560
563
|
"@[<h>%s_%a (%a)@]",
|
|
561
564
|
expression.fairness === "Weak" ? "WF" : "SF",
|
|
@@ -564,7 +567,7 @@ const createPrinter = (hyps: Hyp[] = []) => {
|
|
|
564
567
|
),
|
|
565
568
|
);
|
|
566
569
|
case "Case":
|
|
567
|
-
return
|
|
570
|
+
return createBig(
|
|
568
571
|
format(
|
|
569
572
|
"@[<v2>CASE %a%a@]",
|
|
570
573
|
formatDelimited(
|
|
@@ -578,9 +581,9 @@ const createPrinter = (hyps: Hyp[] = []) => {
|
|
|
578
581
|
),
|
|
579
582
|
);
|
|
580
583
|
case "String":
|
|
581
|
-
return
|
|
584
|
+
return createAtom(format('"%s"', expression.value));
|
|
582
585
|
case "Num":
|
|
583
|
-
return
|
|
586
|
+
return createAtom(
|
|
584
587
|
text(
|
|
585
588
|
expression.fraction === ""
|
|
586
589
|
? expression.integer
|
|
@@ -588,7 +591,7 @@ const createPrinter = (hyps: Hyp[] = []) => {
|
|
|
588
591
|
),
|
|
589
592
|
);
|
|
590
593
|
case "At":
|
|
591
|
-
return
|
|
594
|
+
return createAtom(text("@"));
|
|
592
595
|
case "Parens": {
|
|
593
596
|
const form = expression.form;
|
|
594
597
|
if (form.kind === "Syntax") return formatExpr(expression.expression);
|
|
@@ -603,7 +606,7 @@ const createPrinter = (hyps: Hyp[] = []) => {
|
|
|
603
606
|
const inner = formatExpr(expression.expression);
|
|
604
607
|
if (names.length === 0) {
|
|
605
608
|
const pattern = inner.kind === "Op" ? "%s::(%a)" : "%s::%a";
|
|
606
|
-
return
|
|
609
|
+
return createAtom(format(pattern, form.label, printMinimal(inner)));
|
|
607
610
|
}
|
|
608
611
|
const namesDoc = formatDelimited(names, text);
|
|
609
612
|
const pattern =
|
|
@@ -612,12 +615,11 @@ const createPrinter = (hyps: Hyp[] = []) => {
|
|
|
612
615
|
: inner.kind === "Big"
|
|
613
616
|
? "%s(%a)::(%a)"
|
|
614
617
|
: "(%s(%a):: %a)";
|
|
615
|
-
return
|
|
618
|
+
return createAtom(format(pattern, form.label, namesDoc, printMinimal(inner)));
|
|
616
619
|
}
|
|
617
620
|
}
|
|
618
621
|
};
|
|
619
622
|
|
|
620
|
-
// pp_print_defn: returns the definition's document and binds its name for what follows.
|
|
621
623
|
const printDefinition = (definition: Defn): Doc => {
|
|
622
624
|
switch (definition.kind) {
|
|
623
625
|
case "Operator":
|
|
@@ -671,7 +673,6 @@ const createPrinter = (hyps: Hyp[] = []) => {
|
|
|
671
673
|
}
|
|
672
674
|
};
|
|
673
675
|
|
|
674
|
-
// pp_print_hyp: prints the hypothesis in the context before it, then binds it.
|
|
675
676
|
const printHyp = (hyp: Hyp): Doc => {
|
|
676
677
|
switch (hyp.kind) {
|
|
677
678
|
case "Fresh": {
|
package/src/obligations/proof.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
// tlapm's proof IR (P_t).
|
|
1
|
+
// A port of tlapm's proof IR (P_t).
|
|
2
2
|
|
|
3
3
|
import type { Bound, Defn, Expr, Locus, Sequent } from "./expression";
|
|
4
4
|
import type { OldMethod } from "./pragma";
|
|
@@ -24,7 +24,6 @@ export type ObligationKind =
|
|
|
24
24
|
| { kind: "Error"; message: string }
|
|
25
25
|
| { kind: "Omitted"; omission: Omission };
|
|
26
26
|
|
|
27
|
-
// method is the one an old-style pragma names, which keeps find_meth from choosing.
|
|
28
27
|
export interface Obligation {
|
|
29
28
|
sequent: Sequent;
|
|
30
29
|
location: Locus | undefined;
|
|
@@ -32,7 +31,6 @@ export interface Obligation {
|
|
|
32
31
|
method?: OldMethod;
|
|
33
32
|
}
|
|
34
33
|
|
|
35
|
-
// useLocation is where a USE step comes from, so find_meth can tell apart the facts of each BY.
|
|
36
34
|
interface ProofProps {
|
|
37
35
|
location?: Locus;
|
|
38
36
|
step?: StepNumber;
|
|
@@ -72,8 +70,6 @@ type StepCore =
|
|
|
72
70
|
export const getStepName = (step: StepNumber) =>
|
|
73
71
|
step.kind === "Named" ? `<${step.level}>${step.label}` : `<${step.level}>`;
|
|
74
72
|
|
|
75
|
-
// Std.unique: one counter for the whole run, shared by the parser, anonymization, and
|
|
76
|
-
// simplification, so anonymous step names match tlapm's.
|
|
77
73
|
export interface Counter {
|
|
78
74
|
value: number;
|
|
79
75
|
}
|
|
@@ -1,6 +1,4 @@
|
|
|
1
|
-
//
|
|
2
|
-
// entirely below it, so SUBSET S \ T is SUBSET (S \ T) to tlapm though SANY reads (SUBSET S) \ T.
|
|
3
|
-
// This regroups an infix application the way tlapm does.
|
|
1
|
+
// A port of tlapm's Pco.resolve.
|
|
4
2
|
|
|
5
3
|
import type { Expression, SourceLocation } from "../ast";
|
|
6
4
|
import { lookupOperator, type Operator } from "./operators";
|
|
@@ -33,7 +31,6 @@ const withEnd = (expression: Expression, end: SourceLocation | undefined): Expre
|
|
|
33
31
|
: expression;
|
|
34
32
|
};
|
|
35
33
|
|
|
36
|
-
// The operator an expression leaves open on tlapm's parse stack, with the operand after it.
|
|
37
34
|
const getOpenOperator = (expression: Expression) => {
|
|
38
35
|
if (expression.kind === "Apply") {
|
|
39
36
|
const operator = lookupOperator(expression.operator);
|
|
@@ -1,13 +1,14 @@
|
|
|
1
|
-
// A port of tlapm's Proof.Simplify
|
|
2
|
-
// BY becomes USE steps and an OBVIOUS QED, and HAVE, TAKE, WITNESS, CASE and PICK become
|
|
3
|
-
// assertions.
|
|
1
|
+
// A port of tlapm's Proof.Simplify.
|
|
4
2
|
|
|
5
3
|
import { TlaProofError } from "../errors";
|
|
6
4
|
import { isEqualExpr } from "./equality";
|
|
7
5
|
import {
|
|
6
|
+
AT_NOWHERE,
|
|
8
7
|
applyBuiltin,
|
|
9
8
|
at,
|
|
9
|
+
getDefinitionHyp,
|
|
10
10
|
getFact,
|
|
11
|
+
getTrue,
|
|
11
12
|
isBuiltinApply,
|
|
12
13
|
mapAccumulate,
|
|
13
14
|
mapBoundDomains,
|
|
@@ -21,7 +22,7 @@ import {
|
|
|
21
22
|
type Time,
|
|
22
23
|
} from "./expression";
|
|
23
24
|
import { format, renderDoc, type Doc } from "./format";
|
|
24
|
-
import {
|
|
25
|
+
import { proveAssertion, useAssertion } from "./generate";
|
|
25
26
|
import { printExpression } from "./printer";
|
|
26
27
|
import { getUnique, type Counter, type Proof, type Step, type StepNumber } from "./proof";
|
|
27
28
|
import {
|
|
@@ -33,7 +34,6 @@ import {
|
|
|
33
34
|
substituteExpr,
|
|
34
35
|
} from "./substitution";
|
|
35
36
|
|
|
36
|
-
// tlapm builds nodes with x @@ step, which copies all of the step's properties.
|
|
37
37
|
const getProps = (from: Step) => ({
|
|
38
38
|
location: from.location,
|
|
39
39
|
step: from.step,
|
|
@@ -51,8 +51,6 @@ const isBinary = (
|
|
|
51
51
|
const getMessage = (pattern: string, ...args: (string | Doc)[]) =>
|
|
52
52
|
renderDoc(format(pattern, ...args));
|
|
53
53
|
|
|
54
|
-
// Visit.hyps_of_bounds_unditto: dittos repeat the previous domain, and each domain shifts past the
|
|
55
|
-
// names bound before it.
|
|
56
54
|
const getBoundHyps = (bounds: Bound[]): Hyp[] =>
|
|
57
55
|
expandDittoes(bounds).map((bound, index): Hyp => {
|
|
58
56
|
const domain =
|
|
@@ -76,7 +74,6 @@ const expandDittoes = (bounds: Bound[]): Bound[] => {
|
|
|
76
74
|
});
|
|
77
75
|
};
|
|
78
76
|
|
|
79
|
-
// The bounds after a witnessed one, where a ditto takes the witnessed domain.
|
|
80
77
|
const getRemainingBounds = (first: Bound, rest: Bound[]): Bound[] => {
|
|
81
78
|
const shifted = substituteBounds(shift(1), rest)[1];
|
|
82
79
|
return shifted[0].domain.kind === "Ditto" && first.domain.kind === "Domain"
|
|
@@ -90,7 +87,6 @@ const getRemainingBounds = (first: Bound, rest: Bound[]): Bound[] => {
|
|
|
90
87
|
: shifted;
|
|
91
88
|
};
|
|
92
89
|
|
|
93
|
-
// A WITNESS proves each membership and subset it relies on, then the goal from them.
|
|
94
90
|
const getWitnessProof = (step: Step, sideFacts: Expr[]): Proof => {
|
|
95
91
|
if (sideFacts.length === 0) return { kind: "Obvious", ...getProps(step) };
|
|
96
92
|
const steps = sideFacts.map((item, index): Step => {
|
|
@@ -114,7 +110,6 @@ const getWitnessProof = (step: Step, sideFacts: Expr[]): Proof => {
|
|
|
114
110
|
at({ kind: "Ix", index: 2 * (sideFacts.length - index) }, step),
|
|
115
111
|
),
|
|
116
112
|
];
|
|
117
|
-
// tlapm removes the method from the QED.
|
|
118
113
|
const qedProof: Proof = {
|
|
119
114
|
kind: "By",
|
|
120
115
|
usable: { facts, defs: [] },
|
|
@@ -135,6 +130,13 @@ const replaceAt = (expression: Expr, replacement: Expr): Expr =>
|
|
|
135
130
|
? at(stripProps(replacement), expression)
|
|
136
131
|
: mapChildren(expression, (inner) => replaceAt(inner, replacement));
|
|
137
132
|
|
|
133
|
+
interface SimplifiedSteps {
|
|
134
|
+
context: Hyp[];
|
|
135
|
+
goal: Expr;
|
|
136
|
+
steps: Step[];
|
|
137
|
+
time: Time;
|
|
138
|
+
}
|
|
139
|
+
|
|
138
140
|
export const createSimplifier = (counter: Counter) => {
|
|
139
141
|
const getAnonymous = (level: number): StepNumber => ({
|
|
140
142
|
kind: "Named",
|
|
@@ -211,7 +213,6 @@ export const createSimplifier = (counter: Counter) => {
|
|
|
211
213
|
return active.kind === "Apply" && active.args.length === 2 ? active.args[1] : undefined;
|
|
212
214
|
};
|
|
213
215
|
|
|
214
|
-
// at_expand: @ in a step stands for the right side of the previous step's assertion.
|
|
215
216
|
const expandAt = (proof: Proof): Proof => {
|
|
216
217
|
if (proof.kind !== "Steps") return proof;
|
|
217
218
|
const steps: Step[] = [];
|
|
@@ -282,13 +283,8 @@ export const createSimplifier = (counter: Counter) => {
|
|
|
282
283
|
{ context, goal, time },
|
|
283
284
|
proof.steps,
|
|
284
285
|
(state, step) => {
|
|
285
|
-
const
|
|
286
|
-
|
|
287
|
-
state.goal,
|
|
288
|
-
step,
|
|
289
|
-
state.time,
|
|
290
|
-
);
|
|
291
|
-
return [{ context: nextContext, goal: nextGoal, time: nextTime }, simplified];
|
|
286
|
+
const next = simplifyStep(state.context, state.goal, step, state.time);
|
|
287
|
+
return [next, next.steps];
|
|
292
288
|
},
|
|
293
289
|
);
|
|
294
290
|
const qedProof = simplify(inner.context, inner.goal, proof.qed.proof, inner.time);
|
|
@@ -297,16 +293,11 @@ export const createSimplifier = (counter: Counter) => {
|
|
|
297
293
|
}
|
|
298
294
|
};
|
|
299
295
|
|
|
300
|
-
const simplifyStep = (
|
|
301
|
-
context: Hyp[],
|
|
302
|
-
goal: Expr,
|
|
303
|
-
step: Step,
|
|
304
|
-
time: Time,
|
|
305
|
-
): [Hyp[], Expr, Step[], Time] => {
|
|
296
|
+
const simplifyStep = (context: Hyp[], goal: Expr, step: Step, time: Time): SimplifiedSteps => {
|
|
306
297
|
const level = getLevel(step.step);
|
|
307
298
|
switch (step.kind) {
|
|
308
299
|
case "Forget":
|
|
309
|
-
return
|
|
300
|
+
return { context, goal, steps: [step], time };
|
|
310
301
|
case "Assert": {
|
|
311
302
|
const inner = proveAssertion(context, step.sequent, step, time);
|
|
312
303
|
const simplified: Step = {
|
|
@@ -314,7 +305,7 @@ export const createSimplifier = (counter: Counter) => {
|
|
|
314
305
|
proof: simplify(inner.context, inner.active, step.proof, inner.time),
|
|
315
306
|
};
|
|
316
307
|
const next = useAssertion(false, context, goal, step.sequent, simplified, time);
|
|
317
|
-
return
|
|
308
|
+
return { context: next.context, goal: next.active, steps: [simplified], time };
|
|
318
309
|
}
|
|
319
310
|
case "Suffices": {
|
|
320
311
|
const inner = useAssertion(true, context, goal, step.sequent, step, time);
|
|
@@ -323,7 +314,7 @@ export const createSimplifier = (counter: Counter) => {
|
|
|
323
314
|
proof: simplify(inner.context, inner.active, step.proof, time),
|
|
324
315
|
};
|
|
325
316
|
const next = proveAssertion(context, step.sequent, simplified, time);
|
|
326
|
-
return
|
|
317
|
+
return { context: next.context, goal: next.active, steps: [simplified], time: next.time };
|
|
327
318
|
}
|
|
328
319
|
case "Use": {
|
|
329
320
|
const byProof: Proof = {
|
|
@@ -340,12 +331,12 @@ export const createSimplifier = (counter: Counter) => {
|
|
|
340
331
|
const assumed = step.usable.facts.map(() =>
|
|
341
332
|
getFact(AT_NOWHERE, "Visible", time, step.location),
|
|
342
333
|
);
|
|
343
|
-
return
|
|
344
|
-
[...context, ...assumed],
|
|
345
|
-
shiftExpr(step.usable.facts.length, goal),
|
|
346
|
-
simplified.steps,
|
|
334
|
+
return {
|
|
335
|
+
context: [...context, ...assumed],
|
|
336
|
+
goal: shiftExpr(step.usable.facts.length, goal),
|
|
337
|
+
steps: simplified.steps,
|
|
347
338
|
time,
|
|
348
|
-
|
|
339
|
+
};
|
|
349
340
|
}
|
|
350
341
|
case "Hide": {
|
|
351
342
|
const hidden = step.usable.defs.reduce((current, def) => {
|
|
@@ -358,31 +349,24 @@ export const createSimplifier = (counter: Counter) => {
|
|
|
358
349
|
`USE DEF ${name} invalid because ${name} is not a defined operator`,
|
|
359
350
|
);
|
|
360
351
|
}
|
|
361
|
-
return current.map((entry, position) =>
|
|
362
|
-
position === index
|
|
363
|
-
? { ...hyp, visibility: "Hidden" as const, location: step.location }
|
|
364
|
-
: entry,
|
|
352
|
+
return current.map((entry, position): Hyp =>
|
|
353
|
+
position === index ? { ...hyp, visibility: "Hidden", location: step.location } : entry,
|
|
365
354
|
);
|
|
366
355
|
}, context);
|
|
367
|
-
return
|
|
356
|
+
return { context: hidden, goal, steps: [step], time };
|
|
368
357
|
}
|
|
369
358
|
case "Define":
|
|
370
|
-
return
|
|
371
|
-
[
|
|
359
|
+
return {
|
|
360
|
+
context: [
|
|
372
361
|
...context,
|
|
373
|
-
...step.definitions.map((definition)
|
|
374
|
-
kind: "
|
|
375
|
-
|
|
376
|
-
whereDefined: { kind: "Proof", time },
|
|
377
|
-
visibility: "Visible",
|
|
378
|
-
isLocal: true,
|
|
379
|
-
location: step.location,
|
|
380
|
-
})),
|
|
362
|
+
...step.definitions.map((definition) =>
|
|
363
|
+
getDefinitionHyp(definition, { kind: "Proof", time }, "Visible", true, step.location),
|
|
364
|
+
),
|
|
381
365
|
],
|
|
382
|
-
shiftExpr(step.definitions.length, goal),
|
|
383
|
-
[step],
|
|
366
|
+
goal: shiftExpr(step.definitions.length, goal),
|
|
367
|
+
steps: [step],
|
|
384
368
|
time,
|
|
385
|
-
|
|
369
|
+
};
|
|
386
370
|
case "Have": {
|
|
387
371
|
const connective = exposeConnective(context, goal);
|
|
388
372
|
const isImplication = isBinary(connective, "Implies");
|
|
@@ -448,7 +432,7 @@ export const createSimplifier = (counter: Counter) => {
|
|
|
448
432
|
step,
|
|
449
433
|
);
|
|
450
434
|
const salted = getSalted(step.step, "ex");
|
|
451
|
-
const
|
|
435
|
+
const asserted = simplifyStep(
|
|
452
436
|
context,
|
|
453
437
|
goal,
|
|
454
438
|
{
|
|
@@ -464,20 +448,20 @@ export const createSimplifier = (counter: Counter) => {
|
|
|
464
448
|
if (shifted.kind !== "Quant") throw new TlaProofError("Proof.Simplify.simplify_step/PICK");
|
|
465
449
|
const hyps = [
|
|
466
450
|
...getBoundHyps(shifted.bounds),
|
|
467
|
-
getFact(shifted.body, "Visible",
|
|
451
|
+
getFact(shifted.body, "Visible", asserted.time, shifted.body.location),
|
|
468
452
|
];
|
|
469
|
-
const
|
|
470
|
-
|
|
471
|
-
|
|
453
|
+
const sufficed = simplifyStep(
|
|
454
|
+
asserted.context,
|
|
455
|
+
asserted.goal,
|
|
472
456
|
{
|
|
473
457
|
kind: "Suffices",
|
|
474
|
-
sequent: { context: hyps, active: shiftExpr(hyps.length,
|
|
458
|
+
sequent: { context: hyps, active: shiftExpr(hyps.length, asserted.goal) },
|
|
475
459
|
proof: { kind: "Omitted", omission: "Elsewhere", ...getProps(step) },
|
|
476
460
|
...getProps(step),
|
|
477
461
|
},
|
|
478
|
-
|
|
462
|
+
asserted.time,
|
|
479
463
|
);
|
|
480
|
-
return
|
|
464
|
+
return { ...sufficed, steps: [...asserted.steps, ...sufficed.steps] };
|
|
481
465
|
}
|
|
482
466
|
}
|
|
483
467
|
};
|