X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Flambda-delta%2Ftoplevel%2Ftop.ml;h=245c00d4a951cd5f600c05d6546c830040f6406c;hb=ef98db5ff416ef53004e57cc054e28abd1bf871e;hp=6c6691354f65e1754330d9e46db95a88d8950ed5;hpb=28430d599505ac26b51e4887e5196d9b380c898a;p=helm.git diff --git a/helm/software/lambda-delta/toplevel/top.ml b/helm/software/lambda-delta/toplevel/top.ml index 6c6691354..245c00d4a 100644 --- a/helm/software/lambda-delta/toplevel/top.ml +++ b/helm/software/lambda-delta/toplevel/top.ml @@ -15,8 +15,9 @@ module U = NUri module C = Cps module L = Log module T = Time +module O = Options module H = Hierarchy -module O = Output +module Op = Output module Y = Entity module X = Library module AL = AutLexer @@ -58,16 +59,23 @@ let bag_error s msg = let brg_error s msg = L.error BrgR.specs (L.Warn s :: L.Loc :: msg); flush_all () -let initial_status mk_uri cover expand si = { +let initial_status () = { ac = AO.initial_counters; mc = MO.initial_counters; brgc = BrgO.initial_counters; bagc = BagO.initial_counters; - mst = MA.initial_status ~cover (); - dst = DA.initial_status (mk_uri si cover); - tst = DT.initial_status (mk_uri si cover); - ast = AP.initial_status; - kst = Y.initial_status expand si + mst = MA.initial_status (); + dst = DA.initial_status (); + tst = DT.initial_status (); + ast = AP.initial_status (); + kst = Y.initial_status () +} + +let refresh_status st = {st with + mst = MA.refresh_status st.mst; + dst = DA.refresh_status st.dst; + tst = DT.refresh_status st.tst; + kst = Y.refresh_status st.kst } (* kernel related ***********************************************************) @@ -113,9 +121,9 @@ let count_entity st = function | BagEntity e -> {st with bagc = BagO.count_entity C.start st.bagc e} | _ -> st -let export_entity si moch = function - | CrgEntity e -> X.export_entity DO.export_term si e - | BrgEntity e -> X.export_entity BrgO.export_term si e +let export_entity si xdir moch = function + | CrgEntity e -> X.export_entity DO.export_term si xdir e + | BrgEntity e -> X.export_entity BrgO.export_term si xdir e | MetaEntity e -> begin match moch with | None -> () @@ -172,13 +180,20 @@ let txt_xl = initial_lexer TxtLexer.token let aut_xl = initial_lexer AutLexer.token -let entity_of_input lexbuf = function - | Text -> +let parbuf = ref [] (* parser buffer *) + +let gen_text command = + parbuf := TxtEntity command :: !parbuf + +let entity_of_input lexbuf i = match i, !parbuf with + | Text, [] -> begin match TxtParser.entry (token txt_xl) lexbuf with | Some e, unget -> txt_xl.unget <- unget; Some (TxtEntity e) | None, _ -> None end - | Automath -> + | Text, hd :: tl -> + parbuf := tl; Some hd + | Automath, _ -> begin match AutParser.entry (token aut_xl) lexbuf with | Some e, unget -> aut_xl.unget <- unget; Some (AutEntity e) | None, _ -> None @@ -202,21 +217,20 @@ let meta = ref false let progress = ref false let preprocess = ref false let root = ref "" -let si = ref false -let expand = ref false let cc = ref false -let export = ref false +let export = ref "" let old = ref false +let st = ref (initial_status ()) let process_2 st entity = let st = if !L.level > 2 then count_entity st entity else st in - if !export then export_entity !si !moch entity; + if !export <> "" then export_entity !O.si !export !moch 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 !si !moch entity; + if !export <> "" && !stage = 1 then export_entity !O.si !export !moch entity; if !stage > 1 then process_2 st (xlate_entity entity) else st let process_0 st entity = @@ -231,7 +245,7 @@ let process_0 st entity = match entity, !old with | AutEntity e, true -> MA.meta_of_aut frr h st.mst e | AutEntity e, false -> DA.crg_of_aut err g st.dst e - | TxtEntity e, false -> DT.crg_of_txt crr d st.tst e + | TxtEntity e, false -> DT.crg_of_txt crr d gen_text st.tst e | _ -> assert false in let st = if !L.level > 2 then count_input st entity else st in @@ -268,11 +282,18 @@ try let f och = moch := Some och in ML.open_out f name in + let set_xdir s = export := s in let set_root s = root := s in let close = function | None -> () | Some och -> ML.close_out C.start och in + let clear_options () = + stage := 3; moch := None; meta := false; progress := false; + preprocess := false; root := ""; cc := false; export := ""; + old := false; kernel := Brg; st := initial_status (); + L.clear (); O.clear (); H.clear (); Op.clear_reductions () + in let process_file name = if !L.level > 0 then T.gmtime version_string; if !L.level > 1 then @@ -280,7 +301,6 @@ try if !L.level > 0 then T.utime_stamp "started"; let base_name = Filename.chop_extension (Filename.basename name) in if !meta then set_meta_file base_name; - O.clear_reductions (); let mk_uri = if !stage < 2 then Crg.mk_uri else match !kernel with @@ -288,15 +308,16 @@ try | Bag -> Bag.mk_uri in let cover = F.concat !root base_name in - let st = initial_status mk_uri cover !expand !si in - let st, input = process st name in + O.mk_uri := mk_uri; O.cover := cover; + let sst, input = process (refresh_status !st) name in + st := sst; if !L.level > 0 then T.utime_stamp "processed"; if !L.level > 2 then begin - 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 > 2 then O.print_reductions () + 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 > 2 then Op.print_reductions () end in let exit () = @@ -305,14 +326,15 @@ try flush_all () in let help = - "Usage: helena [ -Vcgijmopqux | -Ss | -hkr ] ...\n\n" ^ + "Usage: helena [ -VXcgijmopqu | -Ss | -x | -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_S = " set summary level (see above)" in - let help_V = " show version information" in - + let help_V = " show version information" in + let help_X = " clear options" in + let help_c = " output conversion constraints" in let help_g = " always expand global definitions" in let help_h = " set type hierarchy (default: Z1)" in @@ -321,19 +343,20 @@ try let help_k = " set kernel version (default: brg)" in let help_m = " output intermediate representation (HAL)" in let help_o = " use old abstract language instead of crg" in - let help_p = " preprocess Automath source" 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_s = " set translation stage (see above)" in let help_u = " activate sort inclusion" in - let help_x = " export kernel entities (XML)" in + let help_x = " export kernel entities (XML) to " in L.box 0; L.box_err (); at_exit exit; Arg.parse [ ("-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); - ("-g", Arg.Set expand, help_g); + ("-g", Arg.Set O.expand, help_g); ("-h", Arg.String set_hierarchy, help_h); ("-i", Arg.Set O.indexes, help_i); ("-j", Arg.Set progress, help_j); @@ -341,10 +364,10 @@ try ("-m", Arg.Set meta, help_m); ("-o", Arg.Set old, help_o); ("-p", Arg.Set preprocess, help_p); - ("-q", Arg.Set AL.unquote, help_q); + ("-q", Arg.Set O.unquote, help_q); ("-r", Arg.String set_root, help_r); ("-s", Arg.Int set_stage, help_s); - ("-u", Arg.Set si, help_u); - ("-x", Arg.Set export, help_x) + ("-u", Arg.Set O.si, help_u); + ("-x", Arg.String set_xdir, help_x) ] process_file help; with BagT.TypeError msg -> bag_error "Type Error" msg