let flush () = L.flush 0; L.flush_err ()
let bag_error s msg =
- L.error BagO.specs (L.Warn s :: msg); flush ()
+ L.error BagO.specs (L.Warn s :: L.Loc :: msg); flush ()
let main =
try
Format.pp_set_margin frm max_int;
meta_file := Some (och, frm)
in
- let set_nsi () = BagR.ext := BagR.NSI in
let read_file name =
if !L.level > 0 then Time.gmtime version_string;
if !L.level > 1 then
let f st _ = function
| None -> st
| Some (i, u, _) ->
- Log.warn (P.sprintf "[%u] %s" i (U.string_of_uri u)); st
+(* Log.warn (P.sprintf "[%u] %s" i (U.string_of_uri u)); *)
+ st
in
(* stage 2 *)
let f st item =
if !stage > 2 then BagU.type_check (f st) !H.graph item else st
in
(* stage 1 *)
- let f mst item =
+ let f st mst item =
let st = {st with
mst = mst; mc = count MO.count_item st.mc item
} in
(* stage 0 *)
let st = {st with ac = count AO.count_item st.ac item} in
let st =
- if !stage > 0 then MA.meta_of_aut f st.mst item else st
+ if !stage > 0 then MA.meta_of_aut (f st) st.mst item else st
in
aux st tl
in
("-h", Arg.String set_hierarchy, help_h);
("-i", Arg.Set BagO.indexes, help_i);
("-m", Arg.String set_meta_file, help_m);
- ("-n", Arg.Unit set_nsi, help_n);
- ("-s", Arg.Int set_stage, help_s);
+ ("-n", Arg.Set BagR.nsi, help_n);
+ ("-s", Arg.Int set_stage, help_s)
] read_file help;
if !L.level > 0 then Time.utime_stamp "at exit";
flush ()