X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fmatita%2FmatitaMisc.ml;h=17473f38b3826029c62674fa7e8a6e23371ab928;hb=9e8c5d2163e701413517153f00a52dac1cd31ecd;hp=1ebe49e39c2e442a1b6a922373c5efe24ba93c74;hpb=c90e354dfd2a81f03664ca68504e0932f670fe17;p=helm.git

diff --git a/helm/matita/matitaMisc.ml b/helm/matita/matitaMisc.ml
index 1ebe49e39..17473f38b 100644
--- a/helm/matita/matitaMisc.ml
+++ b/helm/matita/matitaMisc.ml
@@ -26,9 +26,11 @@
 open Printf
 open MatitaTypes 
 
-let strip_trailing_slash =
-  let rex = Pcre.regexp "/$" in
-  fun s -> Pcre.replace ~rex s
+(** Functions "imported" from Http_getter_misc *)
+
+let strip_trailing_slash = Http_getter_misc.strip_trailing_slash
+let normalize_dir = Http_getter_misc.normalize_dir
+let strip_suffix = Http_getter_misc.strip_suffix
 
 let baseuri_of_baseuri_decl st =
   match st with
@@ -39,7 +41,7 @@ let baseuri_of_baseuri_decl st =
 let baseuri_of_file file = 
   let uri = ref None in
   let ic = open_in file in
-  let istream = Stream.of_channel ic in
+  let istream = Ulexing.from_utf8_channel ic in
   (try
     while true do
       try 
@@ -78,29 +80,28 @@ let is_empty buri =
 
 let safe_remove fname = if Sys.file_exists fname then Sys.remove fname
 
-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
-
-let output_file data file = 
-  let oc = open_out file in
-  output_string oc data;
-  close_out oc
-
+let is_dir_empty d =
+  try 
+    let od = Unix.opendir d in
+    try 
+      ignore (Unix.readdir od);
+      ignore (Unix.readdir od);
+      ignore (Unix.readdir od);
+      Unix.closedir od;
+      false
+    with End_of_file -> 
+      Unix.closedir od;
+      true
+  with Unix.Unix_error _ -> true
+
+let safe_rmdir d = try Unix.rmdir d with Unix.Unix_error _ -> ()
+
+let rec rmdir_descend d = 
+  if is_dir_empty d then
+    begin
+      safe_rmdir d;
+      rmdir_descend (Filename.dirname d)
+    end
 
 let absolute_path file =
   if file.[0] = '/' then file else Unix.getcwd () ^ "/" ^ file
@@ -114,29 +115,16 @@ let append_phrase_sep s =
   else
     s
 
-let strip_trailing_blanks =
-  let rex = Pcre.regexp "\\s*$" in
-  fun s -> Pcre.replace ~rex s
-
-let split ?(char = ' ') s =
-  let pieces = ref [] in
-  let rec aux idx =
-    match (try Some (String.index_from s idx char) with Not_found -> None) with
-    | Some pos ->
-        pieces := String.sub s idx (pos - idx) :: !pieces;
-        aux (pos + 1)
-    | None -> pieces := String.sub s idx (String.length s - idx) :: !pieces
-  in
-  aux 0;
-  List.rev !pieces
-
-let empty_mathml () =
+let empty_mathml = lazy (
   DomMisc.domImpl#createDocument ~namespaceURI:(Some DomMisc.mathml_ns)
-    ~qualifiedName:(Gdome.domString "math") ~doctype:None
+    ~qualifiedName:(Gdome.domString "math") ~doctype:None)
 
-let empty_boxml () =
+let empty_boxml = lazy (
   DomMisc.domImpl#createDocument ~namespaceURI:(Some DomMisc.boxml_ns) 
-    ~qualifiedName:(Gdome.domString "box") ~doctype:None
+    ~qualifiedName:(Gdome.domString "box") ~doctype:None)
+
+let closed_goal_mathml = lazy (
+  DomMisc.domImpl#createDocumentFromURI ~uri:BuildTimeConf.closed_xml ())
 
 exception History_failure
 
@@ -232,56 +220,49 @@ 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
-    let dir = "mkdir -p " ^ d in 
-    (match Unix.system dir with
-    | Unix.WEXITED 0 -> ()
-    | Unix.WEXITED n -> 
-        MatitaLog.error ("'mkdir -p " ^ dir ^ "' failed with "^string_of_int n);
-        failwith errmsg
-    | Unix.WSIGNALED s 
-    | Unix.WSTOPPED s -> 
-        MatitaLog.error 
-          ("'mkdir -p " ^ dir ^ "' signaled with " ^ string_of_int s);
-        failwith errmsg)
-  with Unix.Unix_error _ as exc -> 
-    MatitaLog.error 
-      ("Unix error in makigin dir " ^ (MatitaExcPp.to_string exc));
-    failwith errmsg
-
-let get_proof_status status =
+let get_current_proof status =
   match status.proof_status with
-  | Incomplete_proof s -> s
+  | Incomplete_proof { proof = p } -> p
   | _ -> 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
+  | Proof (_, metasenv, _, _)
+  | Incomplete_proof { proof = (_, metasenv, _, _) }
+  | Intermediate metasenv ->
+      metasenv
 
-let get_proof_context status =
+let get_proof_context status goal =
   match status.proof_status with
-  | Incomplete_proof ((_, metasenv, _, _), goal) ->
+  | Incomplete_proof { proof = (_, metasenv, _, _) } ->
       let (_, context, _) = CicUtil.lookup_meta goal metasenv in
       context
   | _ -> []
  
-let get_proof_conclusion status =
+let get_proof_conclusion status goal =
   match status.proof_status with
-  | Incomplete_proof ((_, metasenv, _, _), goal) ->
+  | Incomplete_proof { proof = (_, metasenv, _, _) } ->
       let (_, _, conclusion) = CicUtil.lookup_meta goal metasenv in
       conclusion
   | _ -> statement_error "no ongoing proof"
- 
-let get_proof_aliases status = status.aliases
 
-let qualify status name = get_string_option status "baseuri" ^ "/" ^ name
+let get_stack status =
+  match status.proof_status with
+  | Incomplete_proof p -> p.stack
+  | Proof _ -> Continuationals.Stack.empty
+  | _ -> assert false
 
-let unopt = function None -> failwith "unopt: None" | Some v -> v
+let set_stack stack status =
+  match status.proof_status with
+  | Incomplete_proof p ->
+      { status with proof_status = Incomplete_proof { p with stack = stack } }
+  | Proof _ ->
+      assert (Continuationals.Stack.is_empty stack);
+      status
+  | _ -> assert false
+ 
+let qualify status name = get_string_option status "baseuri" ^ "/" ^ name
 
 let image_path n = sprintf "%s/%s" BuildTimeConf.images_dir n
 
@@ -295,14 +276,9 @@ let obj_file_of_baseuri baseuri =
   path ^ ".moo"
 
 let obj_file_of_script f =
- let baseuri = baseuri_of_file f in
-  obj_file_of_baseuri baseuri
-
-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
+ if f = "coq.ma" then BuildTimeConf.coq_notation_script else
+  let baseuri = baseuri_of_file f in
+   obj_file_of_baseuri baseuri
 
 let list_tl_at ?(equality=(==)) e l =
   let rec aux =
@@ -313,9 +289,3 @@ let list_tl_at ?(equality=(==)) e l =
   in
   aux l
 
-let debug_wrap name f =
-  prerr_endline (sprintf "debug_wrap: ==>> %s" name);
-  let res = f () in
-  prerr_endline (sprintf "debug_wrap: <<== %s" name);
-  res
-