X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=matita%2Fcomponents%2Fbinaries%2Fprobe%2Fengine.ml;h=345f065fec977afc91fda19b548640d0cd5caf9c;hb=ea99a55173ebdcfe60f3b3d6f6c979f5d7785d48;hp=5117f57fcde29a4b93073eaad0a0e3c44aee6197;hpb=8ff4315142253a1a0478b67c07dddf70c36f50cd;p=helm.git

diff --git a/matita/components/binaries/probe/engine.ml b/matita/components/binaries/probe/engine.ml
index 5117f57fc..345f065fe 100644
--- a/matita/components/binaries/probe/engine.ml
+++ b/matita/components/binaries/probe/engine.ml
@@ -1,12 +1,12 @@
 (*
-    ||M||  This file is part of HELM, an Hypertextual, Electronic        
-    ||A||  Library of Mathematics, developed at the Computer Science     
-    ||T||  Department, University of Bologna, Italy.                     
-    ||I||                                                                
-    ||T||  HELM is free software; you can redistribute it and/or         
-    ||A||  modify it under the terms of the GNU General Public License   
-    \   /  version 2 or (at your option) any later version.      
-     \ /   This software is distributed as is, NO WARRANTY.     
+    ||M||  This file is part of HELM, an Hypertextual, Electronic
+    ||A||  Library of Mathematics, developed at the Computer Science
+    ||T||  Department, University of Bologna, Italy.
+    ||I||
+    ||T||  HELM is free software; you can redistribute it and/or
+    ||A||  modify it under the terms of the GNU General Public License
+    \   /  version 2 or (at your option) any later version.
+     \ /   This software is distributed as is, NO WARRANTY.
       V_______________________________________________________________ *)
 
 module F = Filename
@@ -18,40 +18,39 @@ module US = U.UriSet
 module B  = Librarian
 module H  = HExtlib
 
-let unsupported protocol =
-   failwith (P.sprintf "probe: unsupported protocol: %s" protocol)
-
-let missing path =
-   failwith (P.sprintf "probe: missing path: %s" path)
-
-let unrooted path =
-   failwith (P.sprintf "probe: missing root: %s" path)
+module M = MacLexer
+module X = Error
 
 let out_int i = P.printf "%u\n" i
 
 let out_length uris = out_int (US.cardinal uris)
 
 let out_uris uris =
-   let map uri = P.printf "%s\n" (U.string_of_uri uri) in
-   US.iter map uris
+  let map uri = P.printf "%S\n" (U.string_of_uri uri) in
+  US.iter map uris
 
 let is_registry str =
-   F.check_suffix str ".conf.xml"
+  F.check_suffix str ".conf.xml"
 
 let get_uri str =
   let str = H.normalize_path str in
   let dir, file =
-      if H.is_regular str && F.check_suffix str ".ma" 
-      then F.dirname str, F.chop_extension (F.basename str)
-      else if H.is_dir str then str, ""
-      else missing str
-   in
-   let rec aux bdir file = match B.find_roots_in_dir bdir with
-      | [root] -> 
-         let buri = L.assoc "baseuri" (B.load_root_file root) in         
-	 F.concat bdir file, F.concat buri file
-      | _      -> 
-         if bdir = F.current_dir_name || bdir = F.dir_sep then unrooted dir else
-	 aux (F.dirname bdir) (F.concat (F.basename bdir) file)
-   in
-   aux dir file
+    if H.is_regular str && F.check_suffix str ".ma"
+    then F.dirname str, F.chop_extension (F.basename str)
+    else if H.is_dir str then str, ""
+    else X.missing str
+  in
+  let rec aux bdir file = match B.find_roots_in_dir bdir with
+  | [root] ->
+    let buri = L.assoc "baseuri" (B.load_root_file root) in
+    F.concat bdir file, F.concat buri file
+  | roots  ->
+    if bdir = F.current_dir_name || bdir = F.dir_sep then X.unrooted dir roots else
+    aux (F.dirname bdir) (F.concat (F.basename bdir) file)
+  in
+  aux dir file
+
+let mac fname =
+  let ich = open_in fname in
+  let lexbuf = Lexing.from_channel ich in
+  M.token lexbuf; close_in ich