module G = Library
module BrgO = BrgOutput
module BrgR = BrgReduction
-module BrgT = BrgType
module BrgU = BrgUntrusted
module MBag = MetaBag
module BagO = BagOutput
ast = AP.initial_status
}
-let count count_fun c item =
- if !L.level > 2 then count_fun C.start c item else c
+let count count_fun c entity =
+ if !L.level > 2 then count_fun C.start c entity else c
let flush () = L.flush 0; L.flush_err ()
let brg_error s msg =
L.error BrgR.specs (L.Warn s :: L.Loc :: msg); flush ()
-let process_item f st =
+let process_entity f st =
let f ast = f {st with ast = ast} in
- AP.process_item f st.ast
+ AP.process_entity f st.ast
(* kernel related ***********************************************************)
type kernel = Brg | Bag
-type kernel_item = BrgItem of Brg.item
- | BagItem of Bag.item
+type kernel_entity = BrgEntity of Brg.entity
+ | BagEntity of Bag.entity
let kernel = ref Brg
| Brg -> BrgO.print_counters C.start st.brgc
| Bag -> BagO.print_counters C.start st.bagc
-let kernel_of_meta f st item = match !kernel with
+let kernel_of_meta f st entity = match !kernel with
| Brg ->
- let f item = f st (BrgItem item) in
- MBrg.brg_of_meta f item
+ let f entity = f st (BrgEntity entity) in
+ MBrg.brg_of_meta f entity
| Bag ->
- let f item = f st (BagItem item) in
- MBag.bag_of_meta f item
+ let f entity = f st (BagEntity entity) in
+ MBag.bag_of_meta f entity
-let count_item st = function
- | BrgItem item -> {st with brgc = count BrgO.count_item st.brgc item}
- | BagItem item -> {st with bagc = count BagO.count_item st.bagc item}
+let count_entity st = function
+ | BrgEntity entity -> {st with brgc = count BrgO.count_entity st.brgc entity}
+ | BagEntity entity -> {st with bagc = count BagO.count_entity st.bagc entity}
-let export_item si g = function
- | BrgItem item -> G.export_item BrgO.export_obj si g item
- | BagItem _ -> ()
+let export_entity si g = function
+ | BrgEntity entity -> G.old_export_entity BrgO.export_entry si g entity
+ | BagEntity _ -> ()
let type_check f st si g k =
+ let brg_err msg = brg_error "Type Error" msg; failwith "Interrupted" in
let f _ = function
- | None -> f st None
+ | None -> f st None
| Some (i, u, _) -> f st (Some (i, u))
in
match k with
- | BrgItem item -> BrgU.type_check f ~si g item
- | BagItem item -> BagU.type_check f ~si g item
+ | BrgEntity entity -> BrgU.type_check brg_err f ~si g entity
+ | BagEntity entity -> BagU.type_check f ~si g entity
(****************************************************************************)
let main =
try
- let version_string = "Helena 0.8.0 M - September 2009" in
+ let version_string = "Helena 0.8.1 M - September 2009" in
let stage = ref 3 in
let moch = ref None in
let meta = ref false in
let process = ref false in
let use_cover = ref true in
let si = ref false in
+ let cc = ref false in
let export = ref false in
let graph = ref (H.graph_of_string C.err C.start "Z2") in
let set_hierarchy s =
if !L.level > 0 then T.utime_stamp "parsed";
let rec aux st = function
| [] -> st
- | item :: tl ->
+ | entity :: tl ->
(* stage 3 *)
let f st = function
| None -> st
st
in
(* stage 2 *)
- let f st item =
- let st = count_item st item in
- if !export then export_item !si !graph item;
- if !stage > 2 then type_check f st !si !graph item else st
+ let f st entity =
+ let st = count_entity st entity in
+ if !export then export_entity !si !graph entity;
+ if !stage > 2 then type_check f st !si !graph entity else st
in
(* stage 1 *)
- let f st mst item =
+ let f st mst entity =
let st = {st with
- mst = mst; mc = count MO.count_item st.mc item
+ mst = mst; mc = count MO.count_entity st.mc entity
} in
begin match !moch with
| None -> ()
- | Some och -> ML.write_item C.start och item
+ | Some och -> ML.write_entity C.start och entity
end;
- if !stage > 1 then kernel_of_meta f st item else st
+ if !stage > 1 then kernel_of_meta f st entity else st
in
(* stage 0 *)
- let st = {st with ac = count AO.count_item st.ac item} in
- let f st item =
+ let st = {st with ac = count AO.count_entity st.ac entity} in
+ let f st entity =
let st =
- if !stage > 0 then MA.meta_of_aut (f st) st.mst item else st
+ if !stage > 0 then MA.meta_of_aut (f st) st.mst entity else st
in
aux st tl
in
- if !process then process_item f st item else f st item
+ if !process then process_entity f st entity else f st entity
in
O.clear_reductions ();
let cover = if !use_cover then base_name else "" in
let help_S = "<number> set summary level (see above)" in
let help_V = " show version information" in
- let help_c = " disable initial segment of URI hierarchy" in
+ let help_c = " output conversion constraints" 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_p = " preprocess Automath source" in
- let help_u = " activate sort inclusion" 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 objects (XML)" in
L.box 0; L.box_err ();
- H.set_new_sorts ignore ["Set"; "Prop"];
+ H.set_sorts ignore ["Set"; "Prop"] 0;
at_exit exit;
Arg.parse [
("-S", Arg.Int set_summary, help_S);
("-V", Arg.Unit print_version, help_V);
- ("-c", Arg.Clear use_cover, help_c);
+ ("-c", Arg.Set cc, help_c);
("-h", Arg.String set_hierarchy, help_h);
("-i", Arg.Set O.indexes, help_i);
("-j", Arg.Set progress, help_j);
("-k", Arg.String set_kernel, help_k);
("-m", Arg.Set meta, help_m);
("-p", Arg.Set process, help_p);
- ("-u", Arg.Set si, help_u);
+ ("-r", Arg.Clear use_cover, help_r);
("-s", Arg.Int set_stage, help_s);
+ ("-u", Arg.Set si, help_u);
("-x", Arg.Set export, help_x)
] read_file help;
with BagT.TypeError msg -> bag_error "Type Error" msg
- | BrgT.TypeError msg -> brg_error "Type Error" msg
projects / helm.git / blobdiff