1. Several files in grafite that should be in grafite_parser moved there.

[helm.git] / helm / matita / matitaclean.ml

diff --git a/helm/matita/matitaclean.ml b/helm/matita/matitaclean.ml
index b8c2bb4c28cc66c9b985931efcf3cb774dca10ec..a5669d2e62d94acd4d8012b2784a64d981fd5c77 100644 (file)
--- a/helm/matita/matitaclean.ml
+++ b/helm/matita/matitaclean.ml
@@ -30,10 +30,8 @@ module TA = GrafiteAst
 
 let main () =
   let _ = MatitaInit.initialize_all () in
-  let uris_to_remove = ref [] in
-  let files_to_remove = ref [] in
   let basedir = Helm_registry.get "matita.basedir" in
-  (match Helm_registry.get_list Helm_registry.string "matita.args" with
+  match Helm_registry.get_list Helm_registry.string "matita.args" with
   | [ "all" ] ->
       LibraryDb.clean_owner_environment ();
       let xmldir = basedir ^ "/xml" in
@@ -48,14 +46,15 @@ let main () =
       exit 0
   | [] -> MatitaInit.die_usage ()
   | files ->
-      List.iter
-        (fun suri ->
+     let uris_to_remove =
+      List.fold_left
+        (fun uris_to_remove suri ->
           let uri = 
             try
               UM.buri_of_uri (UM.uri_of_string suri)
             with UM.IllFormedUri _ ->
-              files_to_remove := suri :: !files_to_remove;
-              let u = GrafiteMisc.baseuri_of_file suri in
+              let u =
+               GrafiteParserMisc.baseuri_of_script ~include_paths:[] suri in
               if String.length u < 5 || String.sub u 0 5 <> "cic:/" then begin
                 HLog.error (sprintf "File %s defines a bad baseuri: %s"
                   suri u);
@@ -63,11 +62,6 @@ let main () =
               end else
                 u
           in
-          uris_to_remove := uri :: !uris_to_remove)
-        files);
-  LibraryClean.clean_baseuris ~basedir !uris_to_remove;
-  let moos =
-   List.map (GrafiteMisc.obj_file_of_script ~basedir) !files_to_remove
-  in
-   List.iter HExtlib.safe_remove moos
-
+           uri::uris_to_remove) [] files
+     in
+      LibraryClean.clean_baseuris ~basedir uris_to_remove