diff options
| author | Maxime Dénès | 2015-07-02 16:16:46 +0200 |
|---|---|---|
| committer | Maxime Dénès | 2015-07-02 16:16:46 +0200 |
| commit | 27de0f2d7e5cd0cc4b221413dfe3c7b739104350 (patch) | |
| tree | a42625106f71295ebc2011b797603cd1b3b8ec83 /tools | |
| parent | a28d9981e5baf812de14e62de8d904e545e804e5 (diff) | |
| parent | 44f45f58dc0a169286c9fcfa7d2edbc8bc04673b (diff) | |
Merge branch 'v8.5' into trunk
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/coqdep.ml | 4 | ||||
| -rw-r--r-- | tools/coqdep_common.ml | 11 | ||||
| -rw-r--r-- | tools/coqdep_lexer.mli | 1 | ||||
| -rw-r--r-- | tools/coqdep_lexer.mll | 5 |
4 files changed, 0 insertions, 21 deletions
diff --git a/tools/coqdep.ml b/tools/coqdep.ml index dd5593f65f..f1a3131dd8 100644 --- a/tools/coqdep.ml +++ b/tools/coqdep.ml @@ -62,7 +62,6 @@ let sort () = try loop (Hashtbl.find vKnown s) with Not_found -> ()) sl - | RequireString s -> loop s | _ -> () done with Fin_fichier -> @@ -320,9 +319,6 @@ let treat_coq_file chan = let acc = match action with | Require strl -> List.fold_left mark_v_done acc strl - | RequireString s -> - let str = Filename.basename s in - mark_v_done acc [str] | Declare sl -> let declare suff dir s = let base = file_name s dir in diff --git a/tools/coqdep_common.ml b/tools/coqdep_common.ml index 9b7845b09e..38e454aefb 100644 --- a/tools/coqdep_common.ml +++ b/tools/coqdep_common.ml @@ -316,17 +316,6 @@ let rec traite_fichier_Coq suffixe verbose f = if verbose && not (Hashtbl.mem coqlibKnown str) then warning_module_notfound f str end) strl - | RequireString s -> - let str = Filename.basename s in - if not (List.mem [str] !deja_vu_v) then begin - addQueue deja_vu_v [str]; - try - let file_str = Hashtbl.find vKnown [str] in - printf " %s%s" (canonize file_str) suffixe - with Not_found -> - if not (Hashtbl.mem coqlibKnown [str]) then - warning_notfound f s - end | Declare sl -> let declare suff dir s = let base = file_name s dir in diff --git a/tools/coqdep_lexer.mli b/tools/coqdep_lexer.mli index b447030afd..c7b9c9a0a8 100644 --- a/tools/coqdep_lexer.mli +++ b/tools/coqdep_lexer.mli @@ -12,7 +12,6 @@ type qualid = string list type coq_token = Require of qualid list - | RequireString of string | Declare of string list | Load of string | AddLoadPath of string diff --git a/tools/coqdep_lexer.mll b/tools/coqdep_lexer.mll index 8ecc419c87..5692e5b45f 100644 --- a/tools/coqdep_lexer.mll +++ b/tools/coqdep_lexer.mll @@ -17,7 +17,6 @@ type coq_token = | Require of qualid list - | RequireString of string | Declare of string list | Load of string | AddLoadPath of string @@ -277,10 +276,6 @@ and require_file = parse | Some from -> (from_pre_ident := None ; Require (List.map (fun x -> from @ x) qid)) } - | '"' [^'"']* '"' (*'"'*) - { let s = Lexing.lexeme lexbuf in - parse_dot lexbuf; - RequireString (unquote_vfile_string s) } | eof { syntax_error lexbuf } | _ |