diff options
| author |  herbelin <herbelin@85f007b7-540e-0410-9357-904b9bb8a0f7> | 2003-10-23 19:08:30 +0000 |
|---|---|---|
| committer | herbelin <herbelin@85f007b7-540e-0410-9357-904b9bb8a0f7> | 2003-10-23 19:08:30 +0000 |
| commit | e0948aaa0125db1d30807d0b8a4512a7461fdc60 (patch) | |
| tree | 9551d8b892c6d02cd9755e777b78c1956d83a3de | |
| parent | d134b5afaf26a67149d999e95bd21b264b61429b (diff) | |
Independance de grammar.cmo vis a vis de Search
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@4711 85f007b7-540e-0410-9357-904b9bb8a0f7
| -rw-r--r-- | parsing/g_basevernac.ml4 | 6 | ||||
| -rw-r--r-- | parsing/search.ml | 10 | ||||
| -rw-r--r-- | parsing/search.mli | 13 |
3 files changed, 14 insertions, 15 deletions
diff --git a/parsing/g_basevernac.ml4 b/parsing/g_basevernac.ml4 index 67078ab23..778aef105 100644 --- a/parsing/g_basevernac.ml4 +++ b/parsing/g_basevernac.ml4 @@ -103,9 +103,9 @@ GEXTEND Gram | IDENT "SearchRewrite"; c = constr_pattern; l = in_or_out_modules -> VernacSearch (SearchRewrite c, l) | IDENT "SearchAbout"; - sl = [ "["; l = LIST1 [ r = global -> Search.SearchRef r - | s = STRING -> Search.SearchString s ]; "]" -> l - | qid = global -> [Search.SearchRef qid] ]; + sl = [ "["; l = LIST1 [ r = global -> SearchRef r + | s = STRING -> SearchString s ]; "]" -> l + | qid = global -> [SearchRef qid] ]; l = in_or_out_modules -> VernacSearch (SearchAbout sl, l) | IDENT "SearchNamed"; sl = LIST1 string; l = in_or_out_modules -> diff --git a/parsing/search.ml b/parsing/search.ml index 336398e2b..492028d8b 100644 --- a/parsing/search.ml +++ b/parsing/search.ml @@ -205,13 +205,13 @@ let gen_filtered_search filter_function display_function = let name_of_reference ref = string_of_id (id_of_global ref) -type 'a search_about_item = - | SearchRef of 'a - | SearchString of string +type glob_search_about_item = + | GlobSearchRef of global_reference + | GlobSearchString of string let search_about_item (itemref,typ) = function - | SearchRef ref -> Termops.occur_term (constr_of_reference ref) typ - | SearchString s -> string_string_contains (name_of_reference itemref) s + | GlobSearchRef ref -> Termops.occur_term (constr_of_reference ref) typ + | GlobSearchString s -> string_string_contains (name_of_reference itemref) s let raw_search_about filter_modules display_function l = let filter ref' env typ = diff --git a/parsing/search.mli b/parsing/search.mli index 260c12e9d..851e6431d 100644 --- a/parsing/search.mli +++ b/parsing/search.mli @@ -18,16 +18,15 @@ open Nametab (*s Search facilities. *) -type 'a search_about_item = - | SearchRef of 'a - | SearchString of string +type glob_search_about_item = + | GlobSearchRef of global_reference + | GlobSearchString of string val search_by_head : global_reference -> dir_path list * bool -> unit val search_rewrite : constr_pattern -> dir_path list * bool -> unit val search_pattern : constr_pattern -> dir_path list * bool -> unit -val search_about : global_reference search_about_item list -> - dir_path list * bool -> unit -val search_named : string list -> dir_path list * bool -> unit +val search_about : glob_search_about_item list -> dir_path list * bool -> unit +val search_named : string list -> dir_path list * bool -> unit (* The filtering function that is by standard search facilities. It can be passed as argument to the raw search functions. @@ -46,6 +45,6 @@ val raw_search_rewrite : (global_reference -> env -> constr -> bool) -> (global_reference -> env -> constr -> unit) -> constr_pattern -> unit val raw_search_about : (global_reference -> env -> constr -> bool) -> (global_reference -> env -> constr -> unit) -> - global_reference search_about_item list -> unit + glob_search_about_item list -> unit val raw_search_named : (global_reference -> env -> constr -> bool) -> (global_reference -> env -> constr -> unit) -> string list -> unit |