diff options
| author | Pierre-Marie Pédrot | 2016-04-09 17:14:18 +0200 |
|---|---|---|
| committer | Pierre-Marie Pédrot | 2016-04-09 17:14:18 +0200 |
| commit | bb43730ac876b8de79967090afa50f00858af6d5 (patch) | |
| tree | 8d96531b4869f9ab1e0cd00064f4dbab96cd4ac8 /tactics | |
| parent | b5420538da04984ca42eb4284a9be27f3b5ba021 (diff) | |
| parent | 84f079fa31723b6a97edc50ca7a81e1eb19e759c (diff) | |
Merge branch 'v8.5'
Diffstat (limited to 'tactics')
| -rw-r--r-- | tactics/tactics.ml | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tactics/tactics.ml b/tactics/tactics.ml index 7ae178af57..a626092dd1 100644 --- a/tactics/tactics.ml +++ b/tactics/tactics.ml @@ -1468,7 +1468,8 @@ let descend_in_conjunctions avoid tac (err, info) c = let sigma = Sigma.Unsafe.of_evar_map sigma in let Sigma (elim, _, _) = build_case_analysis_scheme env sigma (ind,u) false sort in NotADefinedRecordUseScheme elim in - Tacticals.New.tclFIRST + Tacticals.New.tclORELSE0 + (Tacticals.New.tclFIRST (List.init n (fun i -> Proofview.Goal.enter { enter = begin fun gl -> let env = Proofview.Goal.env gl in @@ -1481,7 +1482,8 @@ let descend_in_conjunctions avoid tac (err, info) c = [Proofview.V82.tactic (refine p); (* Might be ill-typed due to forbidden elimination. *) Tacticals.New.onLastHypId (tac (not isrec))] - end })) + end }))) + (Proofview.tclZERO ~info err) | None -> Proofview.tclZERO ~info err with RefinerError _|UserError _ -> Proofview.tclZERO ~info err end } |
