aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEnrico Tassi2020-02-13 17:47:46 +0100
committerEnrico Tassi2020-02-13 17:47:46 +0100
commitd0ade96ed78895eec3f80b88e3e4cf148b854ecd (patch)
tree160dd2fe82a5db4d2de5029bf08a4ca6b5fbabd2
parent6e020b001ec8b9d84293c5e9e7115bb1ddf901ca (diff)
parent481db1ce8b0e653c22f332ef7eab5c1fa575b6f4 (diff)
Merge PR #11564: Recognize Default Proof Using in STM
Ack-by: gares
-rw-r--r--stm/stm.ml3
1 files changed, 2 insertions, 1 deletions
diff --git a/stm/stm.ml b/stm/stm.ml
index 5402600041..a521f9001d 100644
--- a/stm/stm.ml
+++ b/stm/stm.ml
@@ -2154,6 +2154,7 @@ let collect_proof keep cur hd brkind id =
let is_defined = function
| _, { expr = e } -> is_defined_expr e.CAst.v.expr
&& (not (Vernacprop.has_Fail e)) in
+ let has_default_proof_using = Option.has_some (Proof_using.get_default_proof_using ()) in
let proof_using_ast = function
| VernacProof(_,Some _) -> true
| _ -> false
@@ -2162,7 +2163,7 @@ let collect_proof keep cur hd brkind id =
| Some (_, v) when proof_using_ast v.expr.CAst.v.expr
&& (not (Vernacprop.has_Fail v.expr)) -> Some v
| _ -> None in
- let has_proof_using x = proof_using_ast x <> None in
+ let has_proof_using x = has_default_proof_using || (proof_using_ast x <> None) in
let proof_no_using = function
| VernacProof(t,None) -> t
| _ -> assert false