X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Flambda-delta%2Fsrc%2Ftoplevel%2Ftop.ml;h=4a1446734153a79cd18e110ac973274a6ae7ad7e;hb=f7988fc51f7c96617aa2b3320628645480af681a;hp=40a58673a01a837ba3255279671cad607ae07fc5;hpb=f57c2060459d2b55567447b70590bc5a26933cc7;p=helm.git diff --git a/helm/software/lambda-delta/src/toplevel/top.ml b/helm/software/lambda-delta/src/toplevel/top.ml index 40a58673a..4a1446734 100644 --- a/helm/software/lambda-delta/src/toplevel/top.ml +++ b/helm/software/lambda-delta/src/toplevel/top.ml @@ -19,6 +19,7 @@ module G = Options module H = Hierarchy module O = Output module E = Entity +module S = Status module XL = XmlLibrary module XD = XmlCrg module AA = AutProcess @@ -46,7 +47,7 @@ type status = { mc : MO.counters; brgc: BO.counters; bagc: ZO.counters; - kst : E.status + kst : S.status } let flush_all () = L.flush 0; L.flush_err () @@ -66,37 +67,34 @@ let initial_status () = { dst = AD.initial_status (); tst = TD.initial_status (); ast = AA.initial_status (); - kst = E.initial_status () + kst = S.initial_status () } let refresh_status st = {st with mst = MA.refresh_status st.mst; dst = AD.refresh_status st.dst; tst = TD.refresh_status st.tst; - kst = E.refresh_status st.kst + kst = S.refresh_status st.kst } (* kernel related ***********************************************************) -type kernel = Brg | Bag - type kernel_entity = BrgEntity of Brg.entity | BagEntity of Bag.entity | CrgEntity of Crg.entity | MetaEntity of Meta.entity -let kernel = ref Brg - -let print_counters st = match !kernel with - | Brg -> BO.print_counters C.start st.brgc - | Bag -> ZO.print_counters C.start st.bagc +let print_counters st = function + | G.Brg -> BO.print_counters C.start st.brgc + | G.Bag -> ZO.print_counters C.start st.bagc + | G.Crg -> () -let xlate_entity entity = match !kernel, entity with - | Brg, CrgEntity e -> +let xlate_entity entity = match !G.kernel, entity with + | G.Brg, CrgEntity e -> let f e = (BrgEntity e) in E.xlate f BD.brg_of_crg e - | Brg, MetaEntity e -> + | G.Brg, MetaEntity e -> let f e = (BrgEntity e) in E.xlate f MB.brg_of_meta e - | Bag, MetaEntity e -> + | G.Bag, MetaEntity e -> let f e = (BagEntity e) in E.xlate f MZ.bag_of_meta e | _, entity -> entity @@ -119,9 +117,9 @@ let count_entity st = function | BagEntity e -> {st with bagc = ZO.count_entity C.start st.bagc e} | _ -> st -let export_entity si xdir = function - | CrgEntity e -> XL.export_entity XD.export_term si xdir e - | BrgEntity e -> XL.export_entity BO.export_term si xdir e +let export_entity = function + | CrgEntity e -> XL.export_entity XD.export_term e + | BrgEntity e -> XL.export_entity BO.export_term e | MetaEntity _ | BagEntity _ -> () @@ -210,21 +208,20 @@ let stage = ref 3 let progress = ref false let preprocess = ref false let root = ref "" -let cc = ref false -let export = ref "" +let export = ref false let old = ref false let st = ref (initial_status ()) let streaming = ref false (* parsing style (temporary) *) let process_2 st entity = let st = if !L.level > 2 then count_entity st entity else st in - if !export <> "" then export_entity !G.si !export entity; + if !export then export_entity entity; if !stage > 2 then type_check st entity else st let process_1 st entity = if !progress then pp_progress entity; let st = if !L.level > 2 then count_entity st entity else st in - if !export <> "" && !stage = 1 then export_entity !G.si !export entity; + if !export && !stage = 1 then export_entity entity; if !stage > 1 then process_2 st (xlate_entity entity) else st let process_0 st entity = @@ -249,9 +246,10 @@ let process_0 st entity = if !preprocess then process_input f st entity else f st entity let process_nostreaming st lexbuf input = + let id x = x in let rec aux1 book = match entity_of_input lexbuf input with | NoEntity -> List.rev book - | e -> aux1 (e :: book) + | e -> aux1 (id e :: book) in let rec aux2 st = function | [] -> st @@ -259,9 +257,12 @@ let process_nostreaming st lexbuf input = in aux2 st (aux1 []) -let rec process_streaming st lexbuf input = match entity_of_input lexbuf input with - | NoEntity -> st - | e -> process_streaming (process_0 st e) lexbuf input +let process_streaming st lexbuf input = + let rec aux st = match entity_of_input lexbuf input with + | NoEntity -> st + | e -> aux (process_0 st e) + in + aux st (****************************************************************************) @@ -271,29 +272,31 @@ let process st name = let ich = open_in name in let lexbuf = Lexing.from_channel ich in let st = process st lexbuf input in - close_in ich; st, input + close_in ich; + if !stage > 2 && !G.cc && !G.si then XL.export_csys st.kst.S.cc; + st, input let main = try - let version_string = "Helena 0.8.1 M - August 2010" in + let version_string = "Helena 0.8.1 M - October 2010" in let print_version () = L.warn (version_string ^ "\n"); exit 0 in let set_hierarchy s = if H.set_graph s then () else L.warn (P.sprintf "Unknown type hierarchy: %s" s) in let set_kernel = function - | "brg" -> kernel := Brg - | "bag" -> kernel := Bag + | "brg" -> G.kernel := G.Brg + | "bag" -> G.kernel := G.Bag | s -> L.warn (P.sprintf "Unknown kernel version: %s" s) in let set_summary i = L.level := i in let set_stage i = stage := i in - let set_xdir s = export := s in + let set_xdir s = G.xdir := s in let set_root s = root := s in let clear_options () = - stage := 3; progress := false; old := false; - preprocess := false; root := ""; cc := false; export := ""; - kernel := Brg; st := initial_status (); + progress := false; old := false; export := false; preprocess := false; + stage := 3; root := ""; + st := initial_status (); L.clear (); G.clear (); H.clear (); O.clear_reductions (); streaming := false; in @@ -303,14 +306,9 @@ try L.warn (P.sprintf "Processing file: %s" name); if !L.level > 0 then Y.utime_stamp "started"; let base_name = Filename.chop_extension (Filename.basename name) in - let mk_uri = - if !stage < 2 then Crg.mk_uri else - match !kernel with - | Brg -> Brg.mk_uri - | Bag -> Bag.mk_uri - in let cover = F.concat !root base_name in - G.mk_uri := mk_uri; G.cover := cover; + if !stage < 2 then G.kernel := G.Crg; + G.cover := cover; let sst, input = process (refresh_status !st) name in st := sst; if !L.level > 0 then Y.utime_stamp "processed"; @@ -318,7 +316,7 @@ try AO.print_counters C.start !st.ac; if !preprocess then AO.print_process_counters C.start !st.ast; if !stage > 0 then MO.print_counters C.start !st.mc; - if !stage > 1 then print_counters !st; + if !stage > 1 then print_counters !st !G.kernel; if !stage > 2 then O.print_reductions () end in @@ -327,41 +325,43 @@ try flush_all () in let help = - "Usage: helena [ -LPVXcgijopqu1 | -Ss | -x | -hkr ]* [ ]*\n\n" ^ + "Usage: helena [ -LPVXcgijopqux1 | -Ss | -O | -hkr ]* [ ]*\n\n" ^ "Summary levels: 0 just errors (default), 1 time stamps, 2 processed file names, \ 3 data information, 4 typing information, 5 reduction information\n\n" ^ "Stages: 0 parsing, 1 to intermediate, 2 to untrusted, 3 to trusted (default)\n" in let help_L = " show lexer debug information" in + let help_O = " set location of output directory (XML) to (default: current directory)" in let help_P = " show parser debug information" in let help_S = " set summary level (see above)" in let help_V = " show version information" in let help_X = " clear options" in - let help_c = " output conversion constraints" in + let help_c = " read/write conversion constraints" in let help_g = " always expand global definitions" in - let help_h = " set type hierarchy (default: Z1)" in + let help_h = " set type hierarchy (default: \"Z1\")" in let help_i = " show local references by index" in let help_j = " show URI of processed kernel objects" in - let help_k = " set kernel version (default: brg)" in + let help_k = " set kernel version (default: \"brg\")" in let help_o = " use old abstract language instead of crg" in let help_p = " preprocess source" in let help_q = " disable quotation of identifiers" in - let help_r = " set initial segment of URI hierarchy" in + let help_r = " set initial segment of URI hierarchy (default: empty)" in let help_s = " set translation stage (see above)" in let help_u = " activate sort inclusion" in - let help_x = " export kernel entities (XML) to " in + let help_x = " export kernel entities (XML)" in let help_1 = " parse files with streaming policy" in L.box 0; L.box_err (); at_exit exit; Arg.parse [ ("-L", Arg.Set G.debug_lexer, help_L); + ("-O", Arg.String set_xdir, help_O); ("-P", Arg.Set G.debug_parser, help_P); ("-S", Arg.Int set_summary, help_S); ("-V", Arg.Unit print_version, help_V); ("-X", Arg.Unit clear_options, help_X); - ("-c", Arg.Set cc, help_c); + ("-c", Arg.Set G.cc, help_c); ("-g", Arg.Set G.expand, help_g); ("-h", Arg.String set_hierarchy, help_h); ("-i", Arg.Set G.indexes, help_i); @@ -373,7 +373,7 @@ try ("-r", Arg.String set_root, help_r); ("-s", Arg.Int set_stage, help_s); ("-u", Arg.Set G.si, help_u); - ("-x", Arg.String set_xdir, help_x); + ("-x", Arg.Set export, help_x); ("-1", Arg.Set streaming, help_1); ] process_file help; with ZT.TypeError msg -> bag_error "Type Error" msg