diff options
| author | Pierre-Marie Pédrot | 2020-09-01 20:51:08 +0200 |
|---|---|---|
| committer | Pierre-Marie Pédrot | 2020-09-01 20:51:08 +0200 |
| commit | 8666b46353c1f2c751bb5b6d4e1012783d107ae4 (patch) | |
| tree | be0d256f863dc7ecf1cd2dbbb510c7622282ad24 /stm | |
| parent | 0d30f79268fea18ef99c040a859956f61c3d978a (diff) | |
| parent | 636fe1deaf220f1c30821846343b3a70ef7a078c (diff) | |
Merge PR #12872: Unify the shelves
Reviewed-by: SkySkimmer
Reviewed-by: gares
Ack-by: mattam82
Reviewed-by: ppedrot
Diffstat (limited to 'stm')
| -rw-r--r-- | stm/proofBlockDelimiter.ml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/stm/proofBlockDelimiter.ml b/stm/proofBlockDelimiter.ml index e41f62361d..f367167d48 100644 --- a/stm/proofBlockDelimiter.ml +++ b/stm/proofBlockDelimiter.ml @@ -51,8 +51,8 @@ let is_focused_goal_simple ~doc id = | `Valid (Some { Vernacstate.lemmas }) -> Option.cata (Vernacstate.LemmaStack.with_top ~f:(fun proof -> let proof = Declare.Proof.get proof in - let Proof.{ goals=focused; stack=r1; shelf=r2; sigma } = Proof.data proof in - let rest = List.(flatten (map (fun (x,y) -> x @ y) r1)) @ r2 @ (Evar.Set.elements @@ Evd.given_up sigma) in + let Proof.{ goals=focused; stack=r1; sigma } = Proof.data proof in + let rest = List.(flatten (map (fun (x,y) -> x @ y) r1)) @ (Evd.shelf sigma) @ (Evar.Set.elements @@ Evd.given_up sigma) in if List.for_all (fun x -> simple_goal sigma x rest) focused then `Simple focused else `Not)) `Not lemmas |