X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;ds=sidebyside;f=components%2Fextlib%2FhExtlib.ml;h=24f0dd1967ab3f8711a5538f61058bcc13417fce;hb=249d11773d32add20d665c4f8521b7380e4fec0a;hp=bf725122c260e31f0b8c4595e36f9af2833db2fb;hpb=d2eaaa0e1793c75c56f6fbfbdcf8b8aaa1dc47cb;p=helm.git

diff --git a/components/extlib/hExtlib.ml b/components/extlib/hExtlib.ml
index bf725122c..24f0dd196 100644
--- a/components/extlib/hExtlib.ml
+++ b/components/extlib/hExtlib.ml
@@ -27,7 +27,7 @@
 
 (** PROFILING *)
 
-let profiling_enabled = ComponentsConf.profiling
+let profiling_enabled = false ;; (* ComponentsConf.profiling *)
 
 let something_profiled = ref false
 
@@ -135,6 +135,10 @@ let is_alphanum c = is_alpha c || is_digit c
 
 (** {2 List processing} *)
 
+let flatten_map f l =
+  List.flatten (List.map f l)
+;;
+
 let rec list_uniq ?(eq=(=)) = function 
   | [] -> []
   | h::[] -> [h]
@@ -149,6 +153,28 @@ let rec filter_map f =
       | None -> filter_map f tl
       | Some v -> v :: filter_map f tl)
 
+let list_rev_map_filter f l =
+   let rec aux a = function
+      | []       -> a
+      | hd :: tl -> 
+         begin match f hd with
+	    | None   -> aux a tl
+	    | Some b -> aux (b :: a) tl 
+         end
+   in 
+   aux [] l
+
+let list_rev_map_filter_fold f v l =
+   let rec aux v a = function
+      | []       -> v, a
+      | hd :: tl -> 
+         begin match f v hd with
+	    | v, None   -> aux v a tl
+	    | v, Some b -> aux v (b :: a) tl 
+         end
+   in 
+   aux v [] l
+
 let list_concat ?(sep = []) =
   let rec aux acc =
     function
@@ -168,6 +194,19 @@ let rec list_findopt f l =
   in
   aux l
 
+let split_nth n l =
+  let rec aux acc n l =
+    match n, l with
+    | 0, _ -> List.rev acc, l
+    | n, [] -> raise (Failure "HExtlib.split_nth")
+    | n, hd :: tl -> aux (hd :: acc) (n - 1) tl in
+  aux [] n l
+
+let list_last l =
+  let l = List.rev l in 
+  try List.hd l with exn -> raise (Failure "HExtlib.list_last")
+;;
+  
 (** {2 File predicates} *)
 
 let is_dir fname =
@@ -175,11 +214,31 @@ let is_dir fname =
     (Unix.stat fname).Unix.st_kind = Unix.S_DIR
   with Unix.Unix_error _ -> false
 
+let writable_dir path =
+  try
+    let file = path ^ "/prova_matita" in
+    let oc = open_out file in
+    close_out oc;
+    Sys.remove file;
+    true
+  with Sys_error _ -> false
+
+
 let is_regular fname =
   try
     (Unix.stat fname).Unix.st_kind = Unix.S_REG
   with Unix.Unix_error _ -> false
 
+let is_executable fname =
+  try
+    let stat = (Unix.stat fname) in
+    stat.Unix.st_kind = Unix.S_REG &&
+    (stat.Unix.st_perm land 0o001 > 0)
+  with Unix.Unix_error _ -> false
+
+let chmod mode filename =
+   Unix.chmod filename mode
+
 let mkdir path =
   let components = split ~sep:'/' path in
   let rec aux where = function
@@ -188,13 +247,13 @@ let mkdir path =
         let path =
           if where = "" then piece else where ^ "/" ^ piece in
         (try
-          Unix.mkdir path 0o755
+          Unix.mkdir path 0o755; chmod 0o2775 path 
         with 
         | Unix.Unix_error (Unix.EEXIST,_,_) -> ()
         | Unix.Unix_error (e,_,_) -> 
             raise 
               (Failure 
-                ("Unix.mkdir " ^ path ^ " 0o755 :" ^ (Unix.error_message e))));
+                ("Unix.mkdir " ^ path ^ " 0o2775 :" ^ (Unix.error_message e))));
         aux path tl
   in
   let where = if path.[0] = '/' then "/" else "" in
@@ -226,7 +285,8 @@ let input_all ic =
 let output_file ~filename ~text = 
   let oc = open_out filename in
   output_string oc text;
-  close_out oc
+  close_out oc;
+  chmod 0o664 filename
 
 let blank_split s =
   let len = String.length s in
@@ -310,13 +370,16 @@ let find ?(test = fun _ -> true) path =
 let safe_remove fname = if Sys.file_exists fname then Sys.remove fname
 
 let is_dir_empty d =
- let od = Unix.opendir d in
- let rec aux () =
-  let name = Unix.readdir od in
-  if name <> "." && name <> ".." then false else aux () in
- let res = try aux () with End_of_file -> true in
-  Unix.closedir od;
-  res
+ try
+  let od = Unix.opendir d in
+  let rec aux () =
+   let name = Unix.readdir od in
+   if name <> "." && name <> ".." then false else aux () in
+  let res = try aux () with End_of_file -> true in
+   Unix.closedir od;
+   res
+ with
+  Unix.Unix_error _ -> true (* raised by Unix.opendir, we hope :-) *)
 
 let safe_rmdir d = try Unix.rmdir d with Unix.Unix_error _ -> ()
 
@@ -340,30 +403,20 @@ let finally at_end f arg =
 
 (** {2 Localized exceptions } *)
 
-exception Localized of Token.flocation * exn
+exception Localized of Stdpp.location * exn
 
-let loc_of_floc = function
-  | { Lexing.pos_cnum = loc_begin }, { Lexing.pos_cnum = loc_end } ->
-      (loc_begin, loc_end)
+let loc_of_floc floc = Stdpp.first_pos floc, Stdpp.last_pos floc;;
 
 let floc_of_loc (loc_begin, loc_end) =
-  let floc_begin =
-    { Lexing.pos_fname = ""; Lexing.pos_lnum = -1; Lexing.pos_bol = -1;
-      Lexing.pos_cnum = loc_begin }
-  in
-  let floc_end = { floc_begin with Lexing.pos_cnum = loc_end } in
-  (floc_begin, floc_end)
+ Stdpp.make_loc (loc_begin, loc_end)
 
 let dummy_floc = floc_of_loc (-1, -1)
 
 let raise_localized_exception ~offset floc exn =
- let (x, y) = loc_of_floc floc in
+ let x, y = loc_of_floc floc in
  let x = offset + x in
  let y = offset + y in
- let flocb,floce = floc in
- let floc =
-   { flocb with Lexing.pos_cnum = x }, { floce with Lexing.pos_cnum = y }
- in
+ let floc = floc_of_loc (x,y) in
   raise (Localized (floc, exn))
 
 let estimate_size x =