X-Git-Url: http://matita.cs.unibo.it/gitweb/?p=helm.git;a=blobdiff_plain;f=matita%2Fcomponents%2Fbinaries%2Fprobe%2FmatitaList.ml;h=d6426e361244313b067c1994aa8f2fb70a26b049;hp=ee6cb417afeede5fe163439af7b57352e68c7aa7;hb=2f19651bcec24abfb1bf15ff7e1387daad1f6638;hpb=bfd440cc2a790741616cae6b375609c6bbdc3b24 diff --git a/matita/components/binaries/probe/matitaList.ml b/matita/components/binaries/probe/matitaList.ml index ee6cb417a..d6426e361 100644 --- a/matita/components/binaries/probe/matitaList.ml +++ b/matita/components/binaries/probe/matitaList.ml @@ -23,73 +23,73 @@ module O = Options module E = Engine let chop_extension file = - try F.chop_extension file - with Invalid_argument("Filename.chop_extension") -> file + try F.chop_extension file + with Invalid_argument _ -> file let script devel = chop_extension devel ^ ".ma" let src_exists path = !O.no_devel || Y.file_exists path -let is_obj base path = - if H.is_regular (F.concat base path) then - F.check_suffix path ".con.ng" || - F.check_suffix path ".ind.ng" || - F.check_suffix path ".var.ng" +let is_obj base path = + if H.is_regular (F.concat base path) then + F.check_suffix path ".con.ng" || + F.check_suffix path ".ind.ng" || + F.check_suffix path ".var.ng" else false -let is_src base path = - H.is_regular (F.concat base path) && - F.check_suffix path ".ng" +let is_src base path = + H.is_regular (F.concat base path) && + F.check_suffix path ".ng" let is_dir base path = - H.is_dir (F.concat base path) + H.is_dir (F.concat base path) let is_script devel = - src_exists (script devel) + src_exists (script devel) let mk_file path = - if F.check_suffix path "/" then S.sub path 0 (pred (S.length path)) - else path ^ ".ng" + if F.check_suffix path "/" then S.sub path 0 (pred (S.length path)) + else path ^ ".ng" let add_obj path = - let path = F.chop_extension path in - let str = F.concat "cic:" path in - O.objs := US.add (U.uri_of_string str) !O.objs + let path = F.chop_extension path in + let str = F.concat "cic:" path in + O.objs := US.add (U.uri_of_string str) !O.objs let add_src devel path = - let path = F.chop_extension path in - let str = F.concat "cic:" path ^ "/" in - O.srcs := US.add (U.uri_of_string str) !O.srcs; - E.mac (script devel) + let path = F.chop_extension path in + let str = F.concat "cic:" path ^ "/" in + O.srcs := US.add (U.uri_of_string str) !O.srcs; + E.mac (script devel) let add_remove base path = - O.remove := F.concat base path :: !O.remove + O.remove := F.concat base path :: !O.remove let rec scan_entry inner base devel path = -(* Printf.eprintf "%b %s %s%!\n" inner devel path; *) - if is_obj base path && inner then add_obj path else - if is_src base path && is_script devel then add_src devel path else - if is_dir base path && is_script devel then scan_dir true base devel path else - if is_dir base path && src_exists devel then scan_dir false base devel path else - add_remove base path +(* Printf.eprintf "%b %s %s%!\n" inner devel path; *) + if is_obj base path && inner then add_obj path else + if is_src base path && is_script devel then add_src devel path else + if is_dir base path && is_script devel then scan_dir true base devel path else + if is_dir base path && src_exists devel then scan_dir false base devel path else + add_remove base path and scan_dir inner base devel path = - let files = Y.readdir (F.concat base path) in - let map base file = scan_entry inner base (F.concat devel file) (F.concat path file) in - A.iter (map base) files + let files = Y.readdir (F.concat base path) in + let map base file = scan_entry inner base (F.concat devel file) (F.concat path file) in + A.iter (map base) files let from_uri base devel uri = - O.no_devel := devel = ""; - let str = U.string_of_uri uri in - let i = S.index str '/' in - let protocol = S.sub str 0 i in - if protocol = "cic:" then - let path = S.sub str (succ i) (S.length str - succ i) in - let file = mk_file path in - if Y.file_exists (F.concat base file) then - scan_entry (is_script devel) base devel file - else E.missing path - else E.unsupported protocol + O.no_devel := devel = ""; + let str = U.string_of_uri uri in + let i = S.index str '/' in + let protocol = S.sub str 0 i in + if protocol = "cic:" then + let path = S.sub str (succ i) (S.length str - succ i) in + let file = mk_file path in + if Y.file_exists (F.concat base file) then + scan_entry (is_script devel) base devel file + else E.missing path + else E.unsupported protocol let from_string base devel s = - from_uri base devel (U.uri_of_string s) + from_uri base devel (U.uri_of_string s)