diff options
author | 2016-11-04 11:41:54 +0100 | |
---|---|---|
committer | 2016-11-04 11:41:54 +0100 | |
commit | 2a22e90918588933b9793312613b737be4d12423 (patch) | |
tree | c6390fb10c0e6f535cf082392bf34482b53604d5 /tactics | |
parent | 5939d426ac785ec063e66a302f3692b645993c56 (diff) | |
parent | 5737c8a41782ee66e96f4e855b00e396a23e8479 (diff) |
Merge remote-tracking branch 'github/pr/336' into v8.6
Was PR#336: Remove v62
Diffstat (limited to 'tactics')
-rw-r--r-- | tactics/auto.mli | 8 | ||||
-rw-r--r-- | tactics/eauto.ml | 4 | ||||
-rw-r--r-- | tactics/hints.ml | 3 |
3 files changed, 5 insertions, 10 deletions
diff --git a/tactics/auto.mli b/tactics/auto.mli index ccfb520f1..3befaaade 100644 --- a/tactics/auto.mli +++ b/tactics/auto.mli @@ -50,17 +50,15 @@ val new_auto : ?debug:Tacexpr.debug -> (** auto with default search depth and with the hint database "core" *) val default_auto : unit Proofview.tactic -(** auto with all hint databases except the "v62" compatibility database *) +(** auto with all hint databases *) val full_auto : ?debug:Tacexpr.debug -> int -> Tacexpr.delayed_open_constr list -> unit Proofview.tactic -(** auto with all hint databases except the "v62" compatibility database - and doing delta *) +(** auto with all hint databases and doing delta *) val new_full_auto : ?debug:Tacexpr.debug -> int -> Tacexpr.delayed_open_constr list -> unit Proofview.tactic -(** auto with default search depth and with all hint databases - except the "v62" compatibility database *) +(** auto with default search depth and with all hint databases *) val default_full_auto : unit Proofview.tactic (** The generic form of auto (second arg [None] means all bases) *) diff --git a/tactics/eauto.ml b/tactics/eauto.ml index 2eab800df..23ff58225 100644 --- a/tactics/eauto.ml +++ b/tactics/eauto.ml @@ -416,9 +416,7 @@ let eauto ?(debug=Off) np lems dbnames = tclTRY (e_search_auto debug np lems db_list) let full_eauto ?(debug=Off) n lems gl = - let dbnames = current_db_names () in - let dbnames = String.Set.remove "v62" dbnames in - let db_list = List.map searchtable_map (String.Set.elements dbnames) in + let db_list = current_pure_db () in tclTRY (e_search_auto debug n lems db_list) gl let gen_eauto ?(debug=Off) np lems = function diff --git a/tactics/hints.ml b/tactics/hints.ml index 823af0b0a..ba92b74df 100644 --- a/tactics/hints.ml +++ b/tactics/hints.ml @@ -683,8 +683,7 @@ let searchtable_add (name,db) = let current_db_names () = Hintdbmap.domain !searchtable let current_db () = Hintdbmap.bindings !searchtable -let current_pure_db () = - List.map snd (Hintdbmap.bindings (Hintdbmap.remove "v62" !searchtable)) +let current_pure_db () = List.map snd (current_db ()) let error_no_such_hint_database x = errorlabstrm "Hints" (str "No such Hint database: " ++ str x ++ str ".") |