\ / This software is distributed as is, NO WARRANTY.
V_______________________________________________________________ *)
-module F = Filename
-module P = Printf
-module U = NUri
-module C = Cps
-module L = Log
-module T = Time
-module O = Options
-module H = Hierarchy
-module Op = Output
-module Y = Entity
-module XL = XmlLibrary
-module XCrg = XmlCrg
-module AL = AutLexer
-module AP = AutProcess
-module AO = AutOutput
-module DT = CrgTxt
-module DA = CrgAut
-module MA = MetaAut
-module MO = MetaOutput
-module ML = MetaLibrary
-module MBrg = MetaBrg
-module BrgC = BrgCrg
-module BrgO = BrgOutput
-module BrgR = BrgReduction
-module BrgU = BrgUntrusted
-module MBag = MetaBag
-module BagO = BagOutput
-module BagT = BagType
-module BagU = BagUntrusted
+module F = Filename
+module P = Printf
+module U = NUri
+module C = Cps
+module L = Log
+module Y = Time
+module G = Options
+module H = Hierarchy
+module O = Output
+module E = Entity
+module XL = XmlLibrary
+module XD = XmlCrg
+module AA = AutProcess
+module AO = AutOutput
+module TD = CrgTxt
+module AD = CrgAut
+module MA = MetaAut
+module MO = MetaOutput
+module MB = MetaBrg
+module BD = BrgCrg
+module BO = BrgOutput
+module BR = BrgReduction
+module BU = BrgUntrusted
+module MZ = MetaBag
+module ZO = BagOutput
+module ZT = BagType
+module ZU = BagUntrusted
type status = {
- ast : AP.status;
- dst : DA.status;
+ ast : AA.status;
+ dst : AD.status;
mst : MA.status;
- tst : DT.status;
+ tst : TD.status;
ac : AO.counters;
mc : MO.counters;
- brgc: BrgO.counters;
- bagc: BagO.counters;
- kst : Y.status
+ brgc: BO.counters;
+ bagc: ZO.counters;
+ kst : E.status
}
let flush_all () = L.flush 0; L.flush_err ()
let bag_error s msg =
- L.error BagO.specs (L.Warn s :: L.Loc :: msg); flush_all ()
+ L.error ZO.specs (L.Warn s :: L.Loc :: msg); flush_all ()
let brg_error s msg =
- L.error BrgR.specs (L.Warn s :: L.Loc :: msg); flush_all ()
+ L.error BR.specs (L.Warn s :: L.Loc :: msg); flush_all ()
let initial_status () = {
ac = AO.initial_counters;
mc = MO.initial_counters;
- brgc = BrgO.initial_counters;
- bagc = BagO.initial_counters;
+ brgc = BO.initial_counters;
+ bagc = ZO.initial_counters;
mst = MA.initial_status ();
- dst = DA.initial_status ();
- tst = DT.initial_status ();
- ast = AP.initial_status ();
- kst = Y.initial_status ()
+ dst = AD.initial_status ();
+ tst = TD.initial_status ();
+ ast = AA.initial_status ();
+ kst = E.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
+ dst = AD.refresh_status st.dst;
+ tst = TD.refresh_status st.tst;
+ kst = E.refresh_status st.kst
}
(* kernel related ***********************************************************)
let kernel = ref Brg
let print_counters st = match !kernel with
- | Brg -> BrgO.print_counters C.start st.brgc
- | Bag -> BagO.print_counters C.start st.bagc
+ | Brg -> BO.print_counters C.start st.brgc
+ | Bag -> ZO.print_counters C.start st.bagc
let xlate_entity entity = match !kernel, entity with
| Brg, CrgEntity e ->
- let f e = (BrgEntity e) in Y.xlate f BrgC.brg_of_crg e
+ let f e = (BrgEntity e) in E.xlate f BD.brg_of_crg e
| Brg, MetaEntity e ->
- let f e = (BrgEntity e) in Y.xlate f MBrg.brg_of_meta e
+ let f e = (BrgEntity e) in E.xlate f MB.brg_of_meta e
| Bag, MetaEntity e ->
- let f e = (BagEntity e) in Y.xlate f MBag.bag_of_meta e
+ let f e = (BagEntity e) in E.xlate f MZ.bag_of_meta e
| _, entity -> entity
let pp_progress e =
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
+ E.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
+ | CrgEntity e -> E.common f e
+ | BrgEntity e -> E.common f e
+ | BagEntity e -> E.common f e
+ | MetaEntity e -> E.common f e
let count_entity st = function
| 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}
+ | BrgEntity e -> {st with brgc = BO.count_entity C.start st.brgc e}
+ | BagEntity e -> {st with bagc = ZO.count_entity C.start st.bagc e}
| _ -> st
-let export_entity si xdir moch = function
- | CrgEntity e -> XL.export_entity XCrg.export_term si xdir e
- | BrgEntity e -> XL.export_entity BrgO.export_term si xdir e
- | MetaEntity e ->
- begin match moch with
- | None -> ()
- | Some och -> ML.write_entity C.start och e
- end
+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
+ | MetaEntity _
| BagEntity _ -> ()
let type_check st k =
let brg_err msg = brg_error "Type Error" msg; failwith "Interrupted" in
let ok _ _ = st in
match k with
- | BrgEntity entity -> BrgU.type_check brg_err ok st.kst entity
- | BagEntity entity -> BagU.type_check ok st.kst entity
+ | BrgEntity entity -> BU.type_check brg_err ok st.kst entity
+ | BagEntity entity -> ZU.type_check ok st.kst entity
| CrgEntity _
| MetaEntity _ -> st
let process_input f st = function
| AutEntity e ->
let f ast e = f {st with ast = ast} (AutEntity e) in
- AP.process_command f st.ast e
+ AA.process_command f st.ast e
| xe -> f st xe
let count_input st = function
(****************************************************************************)
let stage = ref 3
-let moch = ref None
-let meta = ref false
let progress = ref false
let preprocess = ref false
let root = ref ""
let process_2 st entity =
let st = if !L.level > 2 then count_entity st entity else st in
- if !export <> "" then export_entity !O.si !export !moch entity;
+ if !export <> "" then export_entity !G.si !export 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 !O.si !export !moch entity;
+ if !export <> "" && !stage = 1 then export_entity !G.si !export entity;
if !stage > 1 then process_2 st (xlate_entity entity) else st
let process_0 st entity =
| AutEntity e, false ->
let err dst = {st with dst = dst} in
let g dst e = process_1 {st with dst = dst} (CrgEntity e) in
- DA.crg_of_aut err g st.dst e
+ AD.crg_of_aut err g st.dst e
| TxtEntity e, _ ->
let crr tst = {st with tst = tst} in
let d tst e = process_1 {st with tst = tst} (CrgEntity e) in
- DT.crg_of_txt crr d gen_text st.tst e
+ 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
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
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
(****************************************************************************)
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
in
let set_summary i = L.level := i in
let set_stage i = stage := i in
- let set_meta_file name =
- 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;
+ stage := 3; progress := false; old := false;
preprocess := false; root := ""; cc := false; export := "";
- old := false; kernel := Brg; st := initial_status ();
- L.clear (); O.clear (); H.clear (); Op.clear_reductions ();
+ kernel := Brg; st := initial_status ();
+ L.clear (); G.clear (); H.clear (); O.clear_reductions ();
streaming := false;
in
let process_file name =
- if !L.level > 0 then T.gmtime version_string;
+ 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 T.utime_stamp "started";
+ if !L.level > 0 then Y.utime_stamp "started";
let base_name = Filename.chop_extension (Filename.basename name) in
- if !meta then set_meta_file base_name;
let mk_uri =
if !stage < 2 then Crg.mk_uri else
match !kernel with
| Bag -> Bag.mk_uri
in
let cover = F.concat !root base_name in
- O.mk_uri := mk_uri; O.cover := cover;
+ G.mk_uri := mk_uri; G.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 > 0 then Y.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 Op.print_reductions ()
+ if !stage > 2 then O.print_reductions ()
end
in
let exit () =
- close !moch;
- if !L.level > 0 then T.utime_stamp "at exit";
+ if !L.level > 0 then Y.utime_stamp "at exit";
flush_all ()
in
let help =
- "Usage: helena [ -LPVXcgijmopqu1 | -Ss <number> | -x <dir> | -hkr <string> ]* [ <file> ]*\n\n" ^
+ "Usage: helena [ -LPVXcgijopqu1 | -Ss <number> | -x <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"
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 crg" in
let help_p = " preprocess source" in
let help_q = " disable quotation of identifiers" in
L.box 0; L.box_err ();
at_exit exit;
Arg.parse [
- ("-L", Arg.Set O.debug_lexer, help_L);
- ("-P", Arg.Set O.debug_parser, help_P);
+ ("-L", Arg.Set G.debug_lexer, help_L);
+ ("-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);
- ("-g", Arg.Set O.expand, help_g);
+ ("-g", Arg.Set G.expand, help_g);
("-h", Arg.String set_hierarchy, help_h);
- ("-i", Arg.Set O.indexes, help_i);
+ ("-i", Arg.Set G.indexes, help_i);
("-j", Arg.Set progress, help_j);
("-k", Arg.String set_kernel, help_k);
- ("-m", Arg.Set meta, help_m);
("-o", Arg.Set old, help_o);
("-p", Arg.Set preprocess, help_p);
- ("-q", Arg.Set O.unquote, help_q);
+ ("-q", Arg.Set G.unquote, help_q);
("-r", Arg.String set_root, help_r);
("-s", Arg.Int set_stage, help_s);
- ("-u", Arg.Set O.si, help_u);
+ ("-u", Arg.Set G.si, help_u);
("-x", Arg.String set_xdir, help_x);
("-1", Arg.Set streaming, help_1);
] process_file help;
-with BagT.TypeError msg -> bag_error "Type Error" msg
+with ZT.TypeError msg -> bag_error "Type Error" msg
projects / helm.git / blobdiff