diff options
| author | Matthieu Sozeau | 2015-01-16 17:33:54 +0530 |
|---|---|---|
| committer | Matthieu Sozeau | 2015-01-16 17:36:02 +0530 |
| commit | 81489f299ef60c21ac3da1d2157b02c3b41886d1 (patch) | |
| tree | 34c9681b67067f00da510bed57df517003737e56 | |
| parent | 13140f20c1080a6ac0c0c7ad878fa1ff3f34de60 (diff) | |
Revert "TCs: Properly handle Hint Extern with conclusions of the form _ -> _"
Not supposed to be part of 8.5beta.
This reverts commit 74682bb27da074fedc115238f3085baaccf12d73.
| -rw-r--r-- | tactics/class_tactics.ml | 10 | ||||
| -rw-r--r-- | test-suite/bugs/closed/3794.v | 6 |
2 files changed, 5 insertions, 11 deletions
diff --git a/tactics/class_tactics.ml b/tactics/class_tactics.ml index 7964c0a8fe..1c15fa40bf 100644 --- a/tactics/class_tactics.ml +++ b/tactics/class_tactics.ml @@ -197,8 +197,8 @@ let rec e_trivial_fail_db db_list local_db goal = in tclFIRST (List.map tclCOMPLETE tacl) goal -and e_my_find_search db_list local_db hdc complete sigma oconcl = - let prods, concl = decompose_prod_assum oconcl in +and e_my_find_search db_list local_db hdc complete sigma concl = + let prods, concl = decompose_prod_assum concl in let nprods = List.length prods in let freeze = try @@ -213,8 +213,8 @@ and e_my_find_search db_list local_db hdc complete sigma oconcl = (fun db -> let tacs = if Hint_db.use_dn db then (* Using dnet *) - Hint_db.map_eauto hdc oconcl db - else Hint_db.map_existential hdc oconcl db + Hint_db.map_eauto hdc concl db + else Hint_db.map_existential hdc concl db in let flags = auto_unif_flags freeze (Hint_db.transparent_state db) in List.map (fun x -> (flags, x)) tacs) @@ -232,7 +232,7 @@ and e_my_find_search db_list local_db hdc complete sigma oconcl = (if complete then tclIDTAC else e_trivial_fail_db db_list local_db) | Unfold_nth c -> tclWEAK_PROGRESS (unfold_in_concl [AllOccurrences,c]) | Extern tacast -> - Proofview.V82.of_tactic (conclPattern oconcl p tacast) + Proofview.V82.of_tactic (conclPattern concl p tacast) in let tac = if complete then tclCOMPLETE tac else tac in match t with diff --git a/test-suite/bugs/closed/3794.v b/test-suite/bugs/closed/3794.v deleted file mode 100644 index 6963d81c14..0000000000 --- a/test-suite/bugs/closed/3794.v +++ /dev/null @@ -1,6 +0,0 @@ -Hint Extern 10 ((?X = ?Y) -> False) => intros; discriminate. -Hint Unfold not : core. - -Goal true<>false. -typeclasses eauto with core. -Qed.
\ No newline at end of file |