more work

[helm.git] / helm / software / matita / matitacLib.ml

diff --git a/helm/software/matita/matitacLib.ml b/helm/software/matita/matitacLib.ml
index 80f99ed0de685508e0c50411fff6b0de64f0e173..7790f75683d252920326d88477f9825e6208957d 100644 (file)
--- a/helm/software/matita/matitacLib.ml
+++ b/helm/software/matita/matitacLib.ml
@@ -110,7 +110,7 @@ let get_include_paths options =
 ;;
 
 let activate_extraction baseuri fname =
- if false then
+ if Helm_registry.get_bool "matita.extract" then
   let mangled_baseuri =
    let baseuri = String.sub baseuri 5 (String.length baseuri - 5) in
      let baseuri = Pcre.replace ~pat:"/" ~templ:"_" baseuri in
@@ -248,28 +248,26 @@ let compile options fname =
      LexiconSync.time_travel 
        ~present:lexicon_status ~past:initial_lexicon_status;
      clean_exit baseuri false
-  | MatitaEngine.EnrichedWithLexiconStatus (exn, lex_stat) ->
+  | MatitaEngine.EnrichedWithLexiconStatus (exn, lex_stat) as exn' ->
       (match exn with
       | Sys.Break -> HLog.error "user break!"
       | HExtlib.Localized (floc,CicNotationParser.Parse_error err) ->
           let (x, y) = HExtlib.loc_of_floc floc in
           HLog.error (sprintf "Parse error at %d-%d: %s" x y err)
+      | exn when matita_debug -> raise exn'
       | exn -> HLog.error (snd (MatitaExcPp.to_string exn)));
       LexiconSync.time_travel ~present:lex_stat ~past:initial_lexicon_status;
       pp_times fname false big_bang big_bang_u big_bang_s;
       clean_exit baseuri false
-  | Sys.Break as exn ->
-     if matita_debug then raise exn; 
+  | Sys.Break when not matita_debug ->
      HLog.error "user break!";
      pp_times fname false big_bang big_bang_u big_bang_s;
      clean_exit baseuri false
-  | exn ->
-       if matita_debug then raise exn; 
+  | exn when not matita_debug ->
        HLog.error 
          ("Unwrapped exception, please fix: "^ snd (MatitaExcPp.to_string exn));
        pp_times fname false big_bang big_bang_u big_bang_s;
        clean_exit baseuri false
-;;
 
 module F = 
   struct 
@@ -280,8 +278,7 @@ module F =
 
     let is_readonly_buri_of opts file = 
      let buri = List.assoc "baseuri" opts in
-     Http_getter_storage.is_read_only (Librarian.mk_baseuri buri file)      
-    ;;
+     Http_getter_storage.is_read_only (Librarian.mk_baseuri buri file)
 
     let root_and_target_of opts mafile = 
       try
@@ -292,30 +289,19 @@ module F =
         Some root, LibraryMisc.obj_file_of_baseuri 
           ~must_exist:false ~baseuri ~writable:true 
       with Librarian.NoRootFor x -> None, ""
-    ;;
 
     let mtime_of_source_object s =
       try Some (Unix.stat s).Unix.st_mtime
       with Unix.Unix_error (Unix.ENOENT, "stat", f) when f = s -> None
-    ;;
 
     let mtime_of_target_object s =
       try Some (Unix.stat s).Unix.st_mtime
       with Unix.Unix_error (Unix.ENOENT, "stat", f) when f = s -> None
-    ;;
 
     let build = compile;;
 
     let load_deps_file = Librarian.load_deps_file;;
 
-    let dotdothack s = 
-      let rec aux = function
-        | ".." :: _ :: tl -> aux tl
-        | x -> x
-      in
-      String.concat "/" (aux (Str.split (Str.regexp "/") s))
-    ;;
-
   end 
 
 module Make = Librarian.Make(F)