X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;ds=sidebyside;f=helm%2Fmatita%2FmatitaMisc.ml;h=0c4329e554350936ea863f1c2e581e13df8ca5d9;hb=771ee8b9d122fa963881c876e86f90531bb7434f;hp=ab077d9238d60d0dbb2ef14278fc160ada0277d9;hpb=0d681e06c6ced0be7f9dbce417684b082229745a;p=helm.git

diff --git a/helm/matita/matitaMisc.ml b/helm/matita/matitaMisc.ml
index ab077d923..0c4329e55 100644
--- a/helm/matita/matitaMisc.ml
+++ b/helm/matita/matitaMisc.ml
@@ -23,27 +23,18 @@
  * http://helm.cs.unibo.it/
  *)
 
+(* $Id$ *)
+
 open Printf
-open MatitaTypes 
-
-let is_dir fname =
-  try
-    (Unix.stat fname).Unix.st_kind = Unix.S_DIR
-  with Unix.Unix_error _ -> false
-
-let is_regular fname =
-  try
-    (Unix.stat fname).Unix.st_kind = Unix.S_REG
-  with Unix.Unix_error _ -> false
-
-let input_file fname =
-  let size = (Unix.stat fname).Unix.st_size in
-  let buf = Buffer.create size in
-  let ic = open_in fname in
-  Buffer.add_channel buf ic size;
-  close_in ic;
-  Buffer.contents buf
 
+(** Functions "imported" from Http_getter_misc *)
+
+let normalize_dir = Http_getter_misc.normalize_dir
+let strip_suffix = Http_getter_misc.strip_suffix
+
+let absolute_path file =
+  if file.[0] = '/' then file else Unix.getcwd () ^ "/" ^ file
+  
 let is_proof_script fname = true  (** TODO Zack *)
 let is_proof_object fname = true  (** TODO Zack *)
 
@@ -53,22 +44,6 @@ let append_phrase_sep s =
   else
     s
 
-let strip_trailing_blanks =
-  let rex = Pcre.regexp "\\s*$" in
-  fun s -> Pcre.replace ~rex s
-
-let strip_trailing_slash =
-  let rex = Pcre.regexp "/$" in
-  fun s -> Pcre.replace ~rex s
-
-let empty_mathml () =
-  DomMisc.domImpl#createDocument ~namespaceURI:(Some DomMisc.mathml_ns)
-    ~qualifiedName:(Gdome.domString "math") ~doctype:None
-
-let empty_boxml () =
-  DomMisc.domImpl#createDocument ~namespaceURI:(Some DomMisc.boxml_ns) 
-    ~qualifiedName:(Gdome.domString "box") ~doctype:None
-
 exception History_failure
 
 type 'a memento = 'a array * int * int * int  (* data, hd, tl, cur *)
@@ -163,48 +138,15 @@ let singleton f =
   let instance = lazy (f ()) in
   fun () -> Lazy.force instance
 
-let mkdir d =
-  let errmsg = sprintf "Unable to create directory \"%s\"" d in
-  try
-    (match Unix.system ("mkdir -p " ^ d) with
-    | Unix.WEXITED 0 -> ()
-    | _ -> failwith errmsg)
-  with Unix.Unix_error _ -> failwith errmsg
-
-let get_proof_status status =
-  match status.proof_status with
-  | Incomplete_proof s -> s
-  | _ -> statement_error "no ongoing proof"
-
-let get_proof_metasenv status =
-  match status.proof_status with
-  | No_proof -> []
-  | Incomplete_proof ((_, metasenv, _, _), _) -> metasenv
-  | Proof (_, metasenv, _, _) -> metasenv
-  | Intermediate m -> m
-
-let get_proof_context status =
-  match status.proof_status with
-  | Incomplete_proof ((_, metasenv, _, _), goal) ->
-      let (_, context, _) = CicUtil.lookup_meta goal metasenv in
-      context
-  | _ -> []
- 
-let get_proof_aliases status = status.aliases
-  
-let qualify status name = get_string_option status "baseuri" ^ "/" ^ name
-
-let unopt = function None -> failwith "unopt: None" | Some v -> v
-
 let image_path n = sprintf "%s/%s" BuildTimeConf.images_dir n
 
 let end_ma_RE = Pcre.regexp "\\.ma$"
-let obj_file_of_script f = Pcre.replace ~rex:end_ma_RE ~templ:".moo" f
-
-let rec list_uniq = function 
-  | [] -> []
-  | h::[] -> [h]
-  | h1::h2::tl when h1 = h2 -> list_uniq (h2 :: tl) 
-  | h1::tl (* when h1 <> h2 *) -> h1 :: list_uniq tl
 
-let end_ma_RE = Pcre.regexp "\\.ma$"
+let list_tl_at ?(equality=(==)) e l =
+  let rec aux =
+    function
+    | [] -> raise Not_found
+    | hd :: tl as l when equality hd e -> l
+    | hd :: tl -> aux tl
+  in
+  aux l