From: Enrico Tassi Date: Fri, 4 Jan 2008 11:22:57 +0000 (+0000) Subject: matitadep ported to the new baseuri free model X-Git-Url: http://matita.cs.unibo.it/gitweb/?p=helm.git;a=commitdiff_plain;h=35a06fa8d6c2664301b59e77dcbff5bcfd4a5091 matitadep ported to the new baseuri free model --- diff --git a/components/grafite_parser/dependenciesParser.ml b/components/grafite_parser/dependenciesParser.ml index 91ba4aed6..360cdb14d 100644 --- a/components/grafite_parser/dependenciesParser.ml +++ b/components/grafite_parser/dependenciesParser.ml @@ -25,28 +25,15 @@ (* $Id$ *) -(* FG - * From Cambridge dictionary - * Dependency: - * a country which is supported and governed by another country - * Dependence: - * when you need something or someone all the time, especially in order to - * continue existing or operating - * - * Fate vobis ... - *) - exception UnableToInclude of string (* statements meaningful for matitadep *) type dependency = | IncludeDep of string - | BaseuriDep of string | UriDep of UriManager.uri let pp_dependency = function | IncludeDep str -> "include \"" ^ str ^ "\"" - | BaseuriDep str -> "set \"baseuri\" \"" ^ str ^ "\"" | UriDep uri -> "uri \"" ^ UriManager.string_of_uri uri ^ "\"" let parse_dependencies lexbuf = @@ -66,8 +53,6 @@ let parse_dependencies lexbuf = parse (UriDep (UriManager.uri_of_string u) :: acc) | [< '("IDENT", "include"); '("QSTRING", fname) >] -> parse (IncludeDep fname :: acc) - | [< '("IDENT", "set"); '("QSTRING", "baseuri"); '("QSTRING", baseuri) >] -> - parse (BaseuriDep baseuri :: acc) | [< '("EOI", _) >] -> acc | [< 'tok >] -> parse acc | [< >] -> acc) tok_stream @@ -77,3 +62,12 @@ let parse_dependencies lexbuf = in List.rev (parse []) +let deps_of_file ma_file = + try + let ic = open_in ma_file in + let istream = Ulexing.from_utf8_channel ic in + let dependencies = parse_dependencies istream in + close_in ic; + dependencies + with End_of_file -> [] +;; diff --git a/components/grafite_parser/dependenciesParser.mli b/components/grafite_parser/dependenciesParser.mli index 5445a51ba..1b4a03a71 100644 --- a/components/grafite_parser/dependenciesParser.mli +++ b/components/grafite_parser/dependenciesParser.mli @@ -28,10 +28,8 @@ exception UnableToInclude of string (* statements meaningful for matitadep *) type dependency = | IncludeDep of string - | BaseuriDep of string | UriDep of UriManager.uri val pp_dependency: dependency -> string - (** @raise End_of_file *) -val parse_dependencies: Ulexing.lexbuf -> dependency list +val deps_of_file: string -> dependency list diff --git a/components/grafite_parser/grafiteParser.ml b/components/grafite_parser/grafiteParser.ml index b5d803f9d..07ca6a6f1 100644 --- a/components/grafite_parser/grafiteParser.ml +++ b/components/grafite_parser/grafiteParser.ml @@ -728,3 +728,4 @@ let exc_located_wrapper f = let parse_statement lexbuf = exc_located_wrapper (fun () -> (Grammar.Entry.parse statement (Obj.magic lexbuf))) + diff --git a/components/grafite_parser/test_dep.ml b/components/grafite_parser/test_dep.ml index 2d0f7813f..b397df31b 100644 --- a/components/grafite_parser/test_dep.ml +++ b/components/grafite_parser/test_dep.ml @@ -26,15 +26,10 @@ (* $Id$ *) let _ = - let ic = ref stdin in + let ic = ref "/dev/fd/0" in let usage = "test_coarse_parser [ file ]" in - let open_file fname = - if !ic <> stdin then close_in !ic; - ic := open_in fname - in + let open_file fname = ic := fname in Arg.parse [] open_file usage; - let deps = - DependenciesParser.parse_dependencies (Ulexing.from_utf8_channel !ic) - in + let deps = DependenciesParser.deps_of_file !ic in List.iter (fun dep -> print_endline (DependenciesParser.pp_dependency dep)) deps diff --git a/components/tactics/tactics.mli b/components/tactics/tactics.mli index 8c97039fb..69f415ee1 100644 --- a/components/tactics/tactics.mli +++ b/components/tactics/tactics.mli @@ -1,4 +1,4 @@ -(* GENERATED FILE, DO NOT EDIT. STAMP:Wed Nov 14 12:07:32 CET 2007 *) +(* GENERATED FILE, DO NOT EDIT. STAMP:Fri Jan 4 11:45:29 CET 2008 *) val absurd : term:Cic.term -> ProofEngineTypes.tactic val apply : term:Cic.term -> ProofEngineTypes.tactic val applyS : diff --git a/matita/library/algebra/CoRN/Setoids.ma b/matita/library/algebra/CoRN/Setoids.ma index 669d5e2c8..2e2129e1e 100644 --- a/matita/library/algebra/CoRN/Setoids.ma +++ b/matita/library/algebra/CoRN/Setoids.ma @@ -48,10 +48,10 @@ record CSetoid : Type \def cs_proof : is_CSetoid cs_crr cs_eq cs_ap}. interpretation "setoid equality" - 'eq x y = (cic:/matita/algebra/CoRN/Setoid/cs_eq.con _ x y). + 'eq x y = (cic:/matita/algebra/CoRN/Setoids/cs_eq.con _ x y). interpretation "setoid apart" - 'neq x y = (cic:/matita/algebra/CoRN/Setoid/cs_ap.con _ x y). + 'neq x y = (cic:/matita/algebra/CoRN/Setoids/cs_ap.con _ x y). (* visto che sia "ap" che "eq" vanno in Prop e data la "tight-apartness", "cs_neq" e "ap" non sono la stessa cosa? *) @@ -809,7 +809,7 @@ definition id_un_op : \forall S:CSetoid. CSetoid_un_op S definition un_op_fun: \forall S:CSetoid. CSetoid_un_op S \to CSetoid_fun S S \def \lambda S.\lambda f.f. -coercion cic:/matita/algebra/CoRN/Setoid/un_op_fun.con. +coercion cic:/matita/algebra/CoRN/Setoids/un_op_fun.con. definition cs_un_op_strext : \forall S:CSetoid. \forall f: CSetoid_fun S S. fun_strext S S (csf_fun S S f) \def \lambda S:CSetoid. \lambda f : CSetoid_fun S S. csf_strext S S f. @@ -862,7 +862,7 @@ definition cs_bin_op_strext : \forall S:CSetoid. \forall f: CSetoid_bin_fun S S definition bin_op_bin_fun: \forall S:CSetoid. CSetoid_bin_op S \to CSetoid_bin_fun S S S \def \lambda S.\lambda f.f. -coercion cic:/matita/algebra/CoRN/Setoid/bin_op_bin_fun.con. +coercion cic:/matita/algebra/CoRN/Setoids/bin_op_bin_fun.con. @@ -982,7 +982,7 @@ definition outer_op_bin_fun: \forall S:CSetoid. CSetoid_outer_op S S \to CSetoid_bin_fun S S S \def \lambda S.\lambda f.f. -coercion cic:/matita/algebra/CoRN/Setoid/outer_op_bin_fun.con. +coercion cic:/matita/algebra/CoRN/Setoids/outer_op_bin_fun.con. (* begin hide Identity Coercion outer_op_bin_fun : CSetoid_outer_op >-> CSetoid_bin_fun. end hide *) diff --git a/matita/library/list/list.ma b/matita/library/list/list.ma index b7a38ed99..42e20b5b2 100644 --- a/matita/library/list/list.ma +++ b/matita/library/list/list.ma @@ -32,9 +32,9 @@ notation "hvbox(l1 break @ l2)" right associative with precedence 47 for @{'append $l1 $l2 }. -interpretation "nil" 'nil = (cic:/matita/list/list.ind#xpointer(1/1/1) _). +interpretation "nil" 'nil = (cic:/matita/list/list/list.ind#xpointer(1/1/1) _). interpretation "cons" 'cons hd tl = - (cic:/matita/list/list.ind#xpointer(1/1/2) _ hd tl). + (cic:/matita/list/list/list.ind#xpointer(1/1/2) _ hd tl). (* theorem test_notation: [O; S O; S (S O)] = O :: S O :: S (S O) :: []. *) @@ -62,7 +62,7 @@ definition tail := \lambda A:Type. \lambda l: list A. [ nil => [] | (cons hd tl) => tl]. -interpretation "append" 'append l1 l2 = (cic:/matita/list/append.con _ l1 l2). +interpretation "append" 'append l1 l2 = (cic:/matita/list/list/append.con _ l1 l2). theorem append_nil: \forall A:Type.\forall l:list A.l @ [] = l. intros; diff --git a/matita/matitaInit.ml b/matita/matitaInit.ml index e9d447c11..e4cd8bfe5 100644 --- a/matita/matitaInit.ml +++ b/matita/matitaInit.ml @@ -236,7 +236,7 @@ let parse_cmdline init_status = BuildTimeConf.stdlib_dir_installed ; ] in let absolutize s = - if Pcre.pmatch ~pat:"^/" s then s else Sys.getcwd() ^"/"^s + if Pcre.pmatch ~pat:"^/" s then s else Sys.getcwd () ^"/"^s in let args = ref [] in let add_l l = fun s -> l := s :: !l in diff --git a/matita/matitac.ml b/matita/matitac.ml index 179a0ba8e..31258f694 100644 --- a/matita/matitac.ml +++ b/matita/matitac.ml @@ -98,9 +98,6 @@ let main () = |"matitaprover.opt.static" ->Matitaprover.main() |"matitawiki"|"matitawiki.opt" ->MatitaWiki.main() | _ -> -(* - let _ = Paramodulation.Saturation.init () in *) -(* ALB to link paramodulation *) let dump_msg = " Dump source with expanded macros to " in MatitaInit.add_cmdline_spec ["-dump", Arg.String dump, dump_msg]; let _ = MatitacLib.main `COMPILER in diff --git a/matita/matitadep.ml b/matita/matitadep.ml index f6ea9da8a..2fc72ad8a 100644 --- a/matita/matitadep.ml +++ b/matita/matitadep.ml @@ -30,154 +30,94 @@ open Printf module GA = GrafiteAst module U = UriManager -let obj_file_of_baseuri writable baseuri = - try - LibraryMisc.obj_file_of_baseuri - ~must_exist:true ~baseuri ~writable - with - | Http_getter_types.Unresolvable_URI _ - | Http_getter_types.Key_not_found _ -> - LibraryMisc.obj_file_of_baseuri - ~must_exist:false ~baseuri ~writable:true -;; - let main () = (* all are maps from "file" to "something" *) - let include_deps = Hashtbl.create (Array.length Sys.argv) in - let include_deps_dot = Hashtbl.create (Array.length Sys.argv) in - let baseuri_of = Hashtbl.create (Array.length Sys.argv) in - let baseuri_of_inv = Hashtbl.create (Array.length Sys.argv) in - let uri_deps = Hashtbl.create (Array.length Sys.argv) in - let ma_topo = Hashtbl.create (Array.length Sys.argv) in - let ma_topo_keys = ref [] in + let include_deps = Hashtbl.create 13 in + let baseuri_of = Hashtbl.create 13 in + let baseuri_of_inv = Hashtbl.create 13 in + let dot_file = ref "" in + (* helpers *) + let include_paths = + Helm_registry.get_list Helm_registry.string "matita.includes" + in + let baseuri_of_script s = + try Hashtbl.find baseuri_of s + with Not_found -> + let _,b,_ = Librarian.baseuri_of_script ~include_paths s in + Hashtbl.add baseuri_of s b; + Hashtbl.add baseuri_of_inv b s; + b + in + let script_of_baseuri b = + try Hashtbl.find baseuri_of_inv b + with Not_found -> + assert false + (* should be called only after baseuri_of_script is + * called on every file *) + in let buri alias = U.buri_of_uri (U.uri_of_string alias) in let resolve alias current_buri = let buri = buri alias in - if buri <> current_buri then Some buri else None in - let dot_file = ref "" in - let order_only = ref false in + if buri <> current_buri then Some buri else None + in + (* initialization *) MatitaInit.add_cmdline_spec ["-dot", Arg.Set_string dot_file, - " Save dependency graph in dot format to the given file"; - "-order", Arg.Set order_only, - "Only print (one of the possibles) build order(s) for the given *.ma"]; + " Save dependency graph in dot format to the given file";]; MatitaInit.parse_cmdline_and_configuration_file (); MatitaInit.initialize_environment (); MatitamakeLib.initialize (); - let include_paths = - Helm_registry.get_list Helm_registry.string "matita.includes" in let args = Helm_registry.get_list Helm_registry.string "matita.args" in - if args = [] then - begin - prerr_endline "At least one .ma file must be specified"; - exit 1 - end; - let ma_files = args in - let bof = Hashtbl.create 10 in - let baseuri_of_script s = - try Hashtbl.find bof s - with Not_found -> - let _,b,_ = Librarian.baseuri_of_script ~include_paths s in - Hashtbl.add bof s b; b + let args = + if args = [] then + let roots = Librarian.find_roots_in_dir (Sys.getcwd ()) in + match roots with + | [] -> + prerr_endline ("No roots found in " ^ Sys.getcwd ()); + exit 1 + | [x] -> + Sys.chdir (Filename.dirname x); + HExtlib.find ~test:(fun x -> Filename.check_suffix x ".ma") "." + | _ -> + prerr_endline ("Too many roots: " ^ String.concat ", " roots); + prerr_endline ("Enter one of these directories and retry"); + exit 1 + else + args in + let ma_files = args in + (* here we go *) + (* fills: + Hashtbl.add include_deps ma_file moo_file + Hashtbl.add include_deps_dot ma_file baseuri + *) + List.iter (fun ma_file -> ignore (baseuri_of_script ma_file)) ma_files; List.iter (fun ma_file -> - let ic = open_in ma_file in - let istream = Ulexing.from_utf8_channel ic in - let dependencies = DependenciesParser.parse_dependencies istream in - close_in ic; - if !order_only then begin - let relative_ma_file = - (* change a path leading to a .ma file into a path relative to its - * development root dir *) - let absolute_ma_file = - if Filename.is_relative ma_file then - Filename.concat (Sys.getcwd ()) ma_file - else - ma_file in - let ma_dir = Filename.dirname absolute_ma_file in - match MatitamakeLib.development_for_dir ma_dir with - | None -> - eprintf "no development setup for dir '%s'\n%!" ma_dir; - assert false - | Some devel -> - Pcre.replace - ~pat:(Pcre.quote(MatitamakeLib.root_for_development devel) ^ "/?") - ~templ:"" absolute_ma_file - in - ma_topo_keys := relative_ma_file :: !ma_topo_keys; - List.iter - (function - | DependenciesParser.IncludeDep path -> - Hashtbl.add ma_topo relative_ma_file path - | _ -> ()) - dependencies - end else + let ma_baseuri = baseuri_of_script ma_file in + let dependencies = DependenciesParser.deps_of_file ma_file in List.iter (function | DependenciesParser.UriDep uri -> let uri = UriManager.string_of_uri uri in if not (Http_getter_storage.is_legacy uri) then - Hashtbl.add uri_deps ma_file uri - | DependenciesParser.BaseuriDep uri -> - let uri = Http_getter_misc.strip_trailing_slash uri in - Hashtbl.add baseuri_of ma_file uri; - Hashtbl.add baseuri_of_inv uri ma_file + let dep = resolve uri ma_baseuri in + (match dep with + | None -> () + | Some u -> Hashtbl.add include_deps ma_file (script_of_baseuri u)) | DependenciesParser.IncludeDep path -> - try - let baseuri = baseuri_of_script path in - if not (Http_getter_storage.is_legacy baseuri) then - (let moo_file = obj_file_of_baseuri false baseuri in - Hashtbl.add include_deps ma_file moo_file; - Hashtbl.add include_deps_dot ma_file baseuri) - with Sys_error _ -> - HLog.warn - ("Unable to find " ^ path ^ " that is included in " ^ ma_file)) + Hashtbl.add include_deps ma_file path) dependencies) ma_files; - Hashtbl.iter - (fun file alias -> - try - let dep = resolve alias (Hashtbl.find baseuri_of file) in - match dep with - | None -> () - | Some u -> - Hashtbl.add include_deps file (obj_file_of_baseuri false u) - with Not_found -> - prerr_endline ("File "^ file^" has no baseuri. Use set baseuri"); - exit 1) - uri_deps; - let gcp x y = - (* explode and implode from the OCaml Expert FAQ. *) - let explode s = - let rec exp i l = - if i < 0 then l else exp (i - 1) (s.[i] :: l) in - exp (String.length s - 1) [] - in - let implode l = - let res = String.create (List.length l) in - let rec imp i = function - | [] -> res - | c :: l -> res.[i] <- c; imp (i + 1) l in - imp 0 l - in - let rec aux = function - | x::tl1,y::tl2 when x = y -> x::(aux (tl1,tl2)) - | _ -> [] - in - implode (aux (explode x,explode y)) - in - let max_path = List.hd ma_files in - let max_path = List.fold_left gcp max_path ma_files in - let short x = Pcre.replace ~pat:("^"^max_path) x in - if !dot_file <> "" then (* generate dependency graph if required *) + (* dot generation *) + if !dot_file <> "" then begin let oc = open_out !dot_file in let fmt = Format.formatter_of_out_channel oc in - GraphvizPp.Dot.header (* ~graph_attrs:["rankdir","LR"] *) fmt; + GraphvizPp.Dot.header fmt; List.iter (fun ma_file -> - let deps = Hashtbl.find_all include_deps_dot ma_file in + let deps = Hashtbl.find_all include_deps ma_file in let deps = HExtlib.filter_map (fun u -> @@ -187,41 +127,31 @@ let main () = in let deps = List.fast_sort Pervasives.compare deps in let deps = HExtlib.list_uniq deps in - GraphvizPp.Dot.node (short ma_file) fmt; - List.iter (fun dep -> GraphvizPp.Dot.edge (short ma_file) (short dep) fmt) deps) + GraphvizPp.Dot.node ma_file fmt; + List.iter (fun dep -> GraphvizPp.Dot.edge ma_file dep fmt) deps) ma_files; GraphvizPp.Dot.trailer fmt; close_out oc end; - if !order_only then begin - let module OrdererString = - struct - type t = string - let compare = Pervasives.compare - end - in - let module Topo = HTopoSort.Make (OrdererString) in - let sorted_ma = - Topo.topological_sort !ma_topo_keys (Hashtbl.find_all ma_topo) in - List.iter print_endline sorted_ma - (*Hashtbl.iter (fun k v -> printf "%s: %s\n" k v) ma_topo*) - end else - List.iter (* generate regular .depend output *) - (fun ma_file -> - try - let deps = Hashtbl.find_all include_deps ma_file in - let deps = List.fast_sort Pervasives.compare deps in - let deps = HExtlib.list_uniq deps in - let deps = ma_file :: deps in - let baseuri = Hashtbl.find baseuri_of ma_file in - let moo = obj_file_of_baseuri true baseuri in - printf "%s: %s\n%s: %s\n%s: %s\n%s: %s\n" - moo (String.concat " " deps) - (Filename.basename(Pcre.replace ~pat:"ma$" ~templ:"mo" ma_file)) moo - (Pcre.replace ~pat:"ma$" ~templ:"mo" ma_file) moo - (Pcre.replace ~pat:"ma$" ~templ:"mo" (short ma_file)) moo - with Not_found -> - prerr_endline ("File "^ma_file^" has no baseuri. Use set baseuri"); - exit 1) - ma_files + (* generate regular depend output *) + let oc = open_out "depends" in + List.iter + (fun ma_file -> + let deps = Hashtbl.find_all include_deps ma_file in + let deps = List.fast_sort Pervasives.compare deps in + let deps = HExtlib.list_uniq deps in + let deps = ma_file :: deps in + let deps = + List.map (fun f -> + let f = + if Pcre.pmatch ~pat:"^\\./" f then + String.sub f 2 (String.length f - 2) + else + f + in HExtlib.normalize_path f) deps + in + output_string oc (String.concat " " deps ^ "\n")) + ma_files; + close_out oc; + HLog.message ("Generated " ^ Sys.getcwd () ^ "/depends")