diff options
| author |  xclerc <xclerc@85f007b7-540e-0410-9357-904b9bb8a0f7> | 2013-10-14 07:33:57 +0000 |
|---|---|---|
| committer | xclerc <xclerc@85f007b7-540e-0410-9357-904b9bb8a0f7> | 2013-10-14 07:33:57 +0000 |
| commit | ec5ed7870b4b59e05c5e994c9bad35e28685b8bd (patch) | |
| tree | 6b735f9c86df8102f132946afbf7b728f5b19edc /tools | |
| parent | 38d9a3342f626d16bcf5c993bf15ff3e6e8ee8d9 (diff) | |
Getting rid of the use of deprecated elements (from the OCaml standard library).
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@16882 85f007b7-540e-0410-9357-904b9bb8a0f7
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/coq_makefile.ml | 8 | ||||
| -rw-r--r-- | tools/coq_tex.ml | 2 | ||||
| -rw-r--r-- | tools/coqdoc/index.ml | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/tools/coq_makefile.ml b/tools/coq_makefile.ml index 060bd3d37..bd77bb1ba 100644 --- a/tools/coq_makefile.ml +++ b/tools/coq_makefile.ml @@ -89,7 +89,7 @@ let string_prefix a b = let is_prefix dir1 dir2 = let l1 = String.length dir1 in let l2 = String.length dir2 in - dir1 = dir2 or (l1 < l2 & String.sub dir2 0 l1 = dir1 & dir2.[l1] = '/') + dir1 = dir2 || (l1 < l2 && String.sub dir2 0 l1 = dir1 && dir2.[l1] = '/') let physical_dir_of_logical_dir ldir = let le = String.length ldir - 1 in @@ -687,8 +687,8 @@ let ensure_root_dir (v,(mli,ml4,ml,mllib,mlpack),_,_) ((i_inc,r_inc) as l) = let here = Sys.getcwd () in let not_tops =List.for_all (fun s -> s <> Filename.basename s) in if List.exists (fun (_,x) -> x = here) i_inc - or List.exists (fun (_,_,x) -> is_prefix x here) r_inc - or (not_tops v && not_tops mli && not_tops ml4 && not_tops ml + || List.exists (fun (_,_,x) -> is_prefix x here) r_inc + || (not_tops v && not_tops mli && not_tops ml4 && not_tops ml && not_tops mllib && not_tops mlpack) then l else @@ -712,7 +712,7 @@ let check_overlapping_include (_,inc_r) = if not (is_prefix pwd abspdir) then Printf.eprintf "Warning: in option -R, %s is not a subdirectory of the current directory\n" pdir; List.iter (fun (pdir',_,abspdir') -> - if is_prefix abspdir abspdir' or is_prefix abspdir' abspdir then + if is_prefix abspdir abspdir' || is_prefix abspdir' abspdir then Printf.eprintf "Warning: in options -R, %s and %s overlap\n" pdir pdir') l; in aux inc_r diff --git a/tools/coq_tex.ml b/tools/coq_tex.ml index c19a9c3f1..c47be6e77 100644 --- a/tools/coq_tex.ml +++ b/tools/coq_tex.ml @@ -171,7 +171,7 @@ let insert texfile coq_output result = just_after () end else begin if !verbose then Printf.printf "Coq < %s\n" s; - if (not first_block) & k=0 then output_string c_out "\\medskip\n"; + if (not first_block) && k=0 then output_string c_out "\\medskip\n"; if show_questions then encapsule false c_out ("Coq < " ^ s); if has_match dot_end_line s then begin let bl = next_block (succ k) in diff --git a/tools/coqdoc/index.ml b/tools/coqdoc/index.ml index 7368ac1e0..8e82f4577 100644 --- a/tools/coqdoc/index.ml +++ b/tools/coqdoc/index.ml @@ -131,7 +131,7 @@ let find_external_library logicalpath = let rec aux = function | [] -> raise Not_found | (l,u)::rest -> - if String.length logicalpath > String.length l & + if String.length logicalpath > String.length l && String.sub logicalpath 0 (String.length l + 1) = l ^"." then u else aux rest |