module X = Library
module AP = AutProcess
module AO = AutOutput
-module DA = DrgAut
+module DA = CrgAut
module MA = MetaAut
module MO = MetaOutput
module ML = MetaLibrary
-module DO = DrgOutput
-module DBrg = DrgBrg
+module DO = CrgOutput
+module DBrg = CrgBrg
module MBrg = MetaBrg
module BrgO = BrgOutput
module BrgR = BrgReduction
ac : AO.counters;
mc : MO.counters;
brgc: BrgO.counters;
- bagc: BagO.counters
+ bagc: BagO.counters;
+ kst : Y.status
}
-let initial_status mk_uri cover = {
+let initial_status mk_uri cover g expand si = {
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 cover);
- ast = AP.initial_status
+ ast = AP.initial_status;
+ kst = Y.initial_status g expand si
}
-let count count_fun c entity =
- if !L.level > 2 then count_fun C.start c entity else c
-
let flush_all () = L.flush 0; L.flush_err ()
let bag_error s msg =
let brg_error s msg =
L.error BrgR.specs (L.Warn s :: L.Loc :: msg); flush_all ()
-let process_entity f st =
+let process_entity f st entity =
let f ast = f {st with ast = ast} in
- AP.process_entity f st.ast
+ AP.process_entity f st.ast entity
(* kernel related ***********************************************************)
type kernel_entity = BrgEntity of Brg.entity
| BagEntity of Bag.entity
- | DrgEntity of Drg.entity
+ | CrgEntity of Crg.entity
| MetaEntity of Meta.entity
let kernel = ref Brg
| Brg -> BrgO.print_counters C.start st.brgc
| Bag -> BagO.print_counters C.start st.bagc
-let xlate f st entity = match !kernel, entity with
- | Brg, DrgEntity e ->
- let f e = f st (BrgEntity e) in Y.xlate f DBrg.brg_of_drg e
+let xlate_entity entity = match !kernel, entity with
+ | Brg, CrgEntity e ->
+ let f e = (BrgEntity e) in Y.xlate f DBrg.brg_of_crg e
| Brg, MetaEntity e ->
- let f e = f st (BrgEntity e) in Y.xlate f MBrg.brg_of_meta e
+ let f e = (BrgEntity e) in Y.xlate f MBrg.brg_of_meta e
| Bag, MetaEntity e ->
- let f e = f st (BagEntity e) in Y.xlate f MBag.bag_of_meta e
- | _, entity -> f st entity
+ let f e = (BagEntity e) in Y.xlate f MBag.bag_of_meta e
+ | _, entity -> entity
+
+let pp_progress e =
+ let f a u =
+ let s = U.string_of_uri u in
+ let err () = L.warn (P.sprintf "%s" s) in
+ let f i = L.warn (P.sprintf "[%u] %s" i s) in
+ Y.mark err f a
+ in
+ match e with
+ | CrgEntity e -> Y.common f e
+ | BrgEntity e -> Y.common f e
+ | BagEntity e -> Y.common f e
+ | MetaEntity e -> Y.common f e
let count_entity st = function
- | MetaEntity e -> {st with mc = count MO.count_entity st.mc e}
- | BrgEntity e -> {st with brgc = count BrgO.count_entity st.brgc e}
- | BagEntity e -> {st with bagc = count BagO.count_entity st.bagc e}
+ | MetaEntity e -> {st with mc = MO.count_entity C.start st.mc e}
+ | BrgEntity e -> {st with brgc = BrgO.count_entity C.start st.brgc e}
+ | BagEntity e -> {st with bagc = BagO.count_entity C.start st.bagc e}
| _ -> st
let export_entity si g moch = function
- | DrgEntity e -> X.export_entity DO.export_term si g e
- | BrgEntity e -> X.old_export_entity BrgO.export_term si g e
+ | CrgEntity e -> X.export_entity DO.export_term si g e
+ | BrgEntity e -> X.export_entity BrgO.export_term si g e
| MetaEntity e ->
begin match moch with
| None -> ()
end
| BagEntity _ -> ()
-let type_check f st si g k =
+let type_check st k =
let brg_err msg = brg_error "Type Error" msg; failwith "Interrupted" in
- let ok _ (a, u, _) = f st a u in
+ let ok _ _ = st in
match k with
- | BrgEntity entity -> BrgU.type_check brg_err ok ~si g entity
- | BagEntity entity -> BagU.type_check ok ~si g entity
- | DrgEntity (a, u, _)
- | MetaEntity (a, u, _) -> f st a u
+ | BrgEntity entity -> BrgU.type_check brg_err ok st.kst entity
+ | BagEntity entity -> BagU.type_check ok st.kst entity
+ | CrgEntity _
+ | MetaEntity _ -> st
(****************************************************************************)
let preprocess = ref false
let use_cover = ref true
let si = ref false
+let expand = ref false
let cc = ref false
let export = ref false
let graph = ref (H.graph_of_string C.err C.start "Z2")
let old = ref false
-let process_3 f st a u =
- if !progress then
- let s = U.string_of_uri u in
- let err () = L.warn (P.sprintf "%s" s); f st in
- let f i = L.warn (P.sprintf "[%u] %s" i s); f st in
- Y.mark err f a
- else
- f st
-
-let process_2 f st entity =
- let st = count_entity st entity in
+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 !graph !moch entity;
- if !stage > 2 then type_check (process_3 f) st !si !graph entity else f st
+ if !stage > 2 then type_check st entity else st
-let process_1 f st entity =
- let st = count_entity st entity in
+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 !graph !moch entity;
- if !stage > 1 then xlate (process_2 f) st entity else f st
+ if !stage > 1 then process_2 st (xlate_entity entity) else st
-let process_0 f st entity =
+let process_0 st entity =
let f st entity =
- if !stage = 0 then f st else
- let frr mst = f {st with mst = mst} in
- let h mst e = process_1 f {st with mst = mst} (MetaEntity e) in
- let err dst = f {st with dst = dst} in
- let g dst e = process_1 f {st with dst = dst} (DrgEntity e) in
+ if !stage = 0 then st else
+ let frr mst = {st with mst = mst} in
+ let h mst e = process_1 {st with mst = mst} (MetaEntity e) in
+ let err dst = {st with dst = dst} in
+ let g dst e = process_1 {st with dst = dst} (CrgEntity e) in
if !old then MA.meta_of_aut frr h st.mst entity else
- DA.drg_of_aut err g st.dst entity
+ DA.crg_of_aut err g st.dst entity
in
- let st = {st with ac = count AO.count_entity st.ac entity} in
+ let st =
+ if !L.level > 2 then {st with ac = AO.count_entity C.start st.ac entity}
+ else st
+ in
if !preprocess then process_entity f st entity else f st entity
-let rec process f book st = match book with
- | [] -> f st
- | entity :: tl ->
-(* we exploit tail recursion rather than CPS *)
- process f tl (process_0 C.start st entity)
+let rec process st = function
+ | [] -> st
+ | entity :: tl -> process (process_0 st entity) tl
(****************************************************************************)
let main =
try
- let version_string = "Helena 0.8.1 M - October 2009" in
+ let version_string = "Helena 0.8.1 M - December 2009" in
let set_hierarchy s =
let err () = L.warn (P.sprintf "Unknown type hierarchy: %s" s) in
let f g = graph := g in
if !L.level > 0 then T.utime_stamp "parsed";
O.clear_reductions ();
let mk_uri =
- if !stage < 2 then Drg.mk_uri else
+ if !stage < 2 then Crg.mk_uri else
match !kernel with
| Brg -> Brg.mk_uri
| Bag -> Bag.mk_uri
in
let cover = if !use_cover then base_name else "" in
- let f st =
- if !L.level > 0 then T.utime_stamp "processed";
- if !L.level > 2 then AO.print_counters C.start st.ac;
- if !L.level > 2 && !preprocess then AO.print_process_counters C.start st.ast;
- if !L.level > 2 && !stage > 0 then MO.print_counters C.start st.mc;
- if !L.level > 2 && !stage > 1 then print_counters st;
- if !L.level > 2 && !stage > 1 then O.print_reductions ()
- in
- process f book (initial_status mk_uri cover)
+ let st = initial_status mk_uri cover !graph !expand !si in
+ let st = process st book in
+ 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 ()
+ end
in
let exit () =
close !moch;
flush_all ()
in
let help =
- "Usage: helena [ -Vcijmopux | -Ss <number> | -hk <string> ] <file> ...\n\n" ^
+ "Usage: helena [ -Vcgijmopux | -Ss <number> | -hk <string> ] <file> ...\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"
let help_V = " show version information" in
let help_c = " output conversion constraints" in
+ let help_g = " always expand global definitions" in
let help_h = "<string> set type hierarchy (default: Z2)" in
let help_i = " show local references by index" in
let help_j = " show URI of processed kernel objects" in
let help_k = "<string> set kernel version (default: brg)" in
let help_m = " output intermediate representation (HAL)" in
- let help_o = " use old abstract language instead of drg" in
+ let help_o = " use old abstract language instead of crg" in
let help_p = " preprocess Automath source" in
let help_r = " disable initial segment of URI hierarchy" in
let help_s = "<number> set translation stage (see above)" in
let help_u = " activate sort inclusion" in
let help_x = " export kernel entities (XML)" in
L.box 0; L.box_err ();
- H.set_sorts ignore ["Set"; "Prop"] 0;
+ let _ = H.set_sorts ["Set"; "Prop"] 0 in
at_exit exit;
Arg.parse [
("-S", Arg.Int set_summary, help_S);
("-V", Arg.Unit print_version, help_V);
("-c", Arg.Set cc, help_c);
+ ("-g", Arg.Set expand, help_g);
("-h", Arg.String set_hierarchy, help_h);
("-i", Arg.Set O.indexes, help_i);
("-j", Arg.Set progress, help_j);
projects / helm.git / blobdiff