zc : ZO.counters;
}
-let flush_all () = L.flush 0; L.flush_err ()
+let level = 0
let bag_error s msg =
- L.error ZO.specs (L.Warn s :: L.Loc :: msg); flush_all ()
+ L.error ZO.specs (L.Warn s :: msg)
let brg_error s msg =
- L.error BR.specs (L.Warn s :: L.Loc :: msg); flush_all ()
+ L.error BR.specs (L.Warn s :: msg)
let initial_status () = {
kst = S.initial_status ();
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
+ let err () = L.warn 2 (P.sprintf "<%s>" s) in
+ let f i = L.warn 2 (P.sprintf "[%u] <%s>" i s) in
E.apix err f a
in
match e with
let type_check st k =
let brg_err msg = brg_error "Type Error" msg; failwith "Interrupted" in
+ let bag_err msg = bag_error "Type Error" msg; failwith "Interrupted" in
let ok _ _ = st in
match k with
| BrgEntity entity -> BU.type_check brg_err ok st.kst entity
- | BagEntity entity -> ZU.type_check ok st.kst entity
+ | BagEntity entity -> ZU.type_check bag_err ok st.kst entity
| CrgEntity _ -> st
let validate st k =
assert (H.set_graph "Z2");
Automath
else begin
- L.warn (P.sprintf "Unknown file type: %s" name); exit 2
+ L.warn level (P.sprintf "Unknown file type: %s" name); exit 2
end
let txt_xl = initial_lexer TxtLexer.token
(****************************************************************************)
let version = ref true
-let stage = ref 3
-let progress = ref false
let preprocess = ref false
let root = ref ""
let export = ref false
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
+ let st = if !G.summary then count_entity st entity else st in
if !export then export_entity entity;
- if !stage > 2 then
+ if !G.stage >= 3 then
let f = if !version then validate else type_check in
f 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 entity;
- if !stage > 1 then process_2 st (xlate_entity entity) else st
+ if !G.trace >= 3 then pp_progress entity;
+ let st = if !G.summary then count_entity st entity else st in
+ if !export && !G.stage = 1 then export_entity entity;
+ if !G.stage >= 2 then process_2 st (xlate_entity entity) else st
let process_0 st entity =
let f st entity =
- if !stage = 0 then st else
+ if !G.stage = 0 then st else
match entity with
| AutEntity e ->
let err ast = {st with ast = ast} in
TD.crg_of_txt crr d gen_text st.tst e
| NoEntity -> assert false
in
- let st = if !L.level > 2 then count_input st entity else st in
+ let st = if !G.summary then count_input st entity else st in
if !preprocess then process_input f st entity else f st entity
let process_nostreaming st lexbuf input =
let lexbuf = Lexing.from_channel ich in
let st = process st lexbuf input in
close_in ich;
- if !stage > 2 && !G.cc && !G.si then XL.export_csys st.kst.S.cc;
+ if !G.cc then XL.export_csys st.kst.S.cc;
st, input
-let main =
-try
+let main =
let version_string = "Helena 0.8.2 M - November 2014" in
- let print_version () = L.warn (version_string ^ "\n"); exit 0 in
+ let print_version () = L.warn level (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)
+ L.warn level (P.sprintf "Unknown type hierarchy: %s" s)
in
let set_kernel = function
| "brg" -> G.kernel := G.Brg
| "bag" -> G.kernel := G.Bag
- | s -> L.warn (P.sprintf "Unknown kernel version: %s" s)
+ | s -> L.warn level (P.sprintf "Unknown kernel version: %s" s)
+ in
+ let set_trace i =
+ if !G.trace = 0 && i > 0 then Y.gmtime version_string;
+ if !G.trace > 0 && i = 0 then Y.utime_stamp "at exit";
+ G.trace := i;
+ if i <= 1 then G.summary := false;
+ if i <= 1 then preprocess := false
in
- let set_summary i = L.level := i in
- let set_stage i = stage := i in
+ let set_summary () =
+ if !G.trace >= 2 then G.summary := true
+ in
+ let set_preprocess () =
+ if !G.trace >= 2 then begin preprocess := true; G.summary := true end
+ in
+ let set_stage i = G.stage := i in
let set_xdir s = G.xdir := s in
let set_root s = root := s in
let clear_options () =
- progress := false; export := false; preprocess := false;
- stage := 3; root := "";
+ export := false; preprocess := false;
+ root := "";
st := initial_status ();
- L.clear (); G.clear (); H.clear (); O.clear_reductions ();
+ G.clear (); H.clear (); O.clear_reductions ();
streaming := false;
version := true
in
let process_file name =
- if !L.level > 0 then Y.gmtime version_string;
- if !L.level > 1 then
- L.warn (P.sprintf "Processing file: %s" name);
- if !L.level > 0 then Y.utime_stamp "started";
+ if !G.trace >= 2 then L.warn 1 (P.sprintf "Processing file: %s" name);
+ if !G.trace >= 2 then Y.utime_stamp "started";
let base_name = Filename.chop_extension (Filename.basename name) in
let cover = F.concat !root base_name in
- if !stage < 2 then G.kernel := G.Crg;
+ if !G.stage <= 1 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";
- if !L.level > 2 then begin
+ if !G.trace >= 2 then Y.utime_stamp "processed";
+ if !G.summary then begin
AO.print_counters C.start !st.ac;
if !preprocess then AO.print_process_counters C.start !st.pst;
- if !stage > 0 then print_counters !st G.Crg;
- if !stage > 1 then print_counters !st !G.kernel;
- if !stage > 2 then O.print_reductions ()
+ if !G.stage >= 1 then print_counters !st G.Crg;
+ if !G.stage >= 2 then print_counters !st !G.kernel;
+ if !G.stage >= 3 then O.print_reductions ()
end
in
let exit () =
- if !L.level > 0 then Y.utime_stamp "at exit";
- flush_all ()
+ if !G.trace >= 1 then Y.utime_stamp "at exit"
in
let help =
- "Usage: helena [ -LPVXcgijopqtx1 | -Ss <number> | -O <dir> | -hkr <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"
+ "Usage: helena [ -LPVXcdgiopqtx1 | -Ts <number> | -O <dir> | -hkr <string> ]* [ <file> ]*\n\n" ^
+ "Trace levels: 0 just errors (default), 1 time stamps, 2 processed files, \
+ 3 typing information, 4 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 = "<dir> set location of output directory (XML) to <dir> (default: current directory)" in
let help_P = " show parser debug information" in
- let help_S = "<number> set summary level (see above)" in
+ let help_T = "<number> set trace level (see above)" in
let help_V = " show version information" in
let help_X = " clear options" in
let help_c = " read/write conversion constraints" in
+ let help_d = " show summary information (requires trace >= 2)" in
let help_g = " always expand global definitions" in
let help_h = "<string> 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 = "<string> set kernel version (default: \"brg\")" in
let help_o = " activate sort inclusion" in
let help_p = " preprocess source" 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);
+ ("-T", Arg.Int set_trace, help_T);
("-V", Arg.Unit print_version, help_V);
("-X", Arg.Unit clear_options, help_X);
("-c", Arg.Set G.cc, help_c);
+ ("-d", Arg.Unit set_summary, help_d);
("-g", Arg.Set G.expand, help_g);
("-h", Arg.String set_hierarchy, help_h);
("-i", Arg.Set G.indexes, help_i);
- ("-j", Arg.Set progress, help_j);
("-k", Arg.String set_kernel, help_k);
("-o", Arg.Set G.si, help_o);
- ("-p", Arg.Set preprocess, help_p);
+ ("-p", Arg.Unit set_preprocess, help_p);
("-q", Arg.Set G.unquote, help_q);
("-r", Arg.String set_root, help_r);
("-s", Arg.Int set_stage, help_s);
("-x", Arg.Set export, help_x);
("-1", Arg.Set streaming, help_1);
] process_file help;
-with ZT.TypeError msg -> bag_error "Type Error" msg
projects / helm.git / blobdiff