\ / This software is distributed as is, NO WARRANTY.
V_______________________________________________________________ *)
-module F = Filename
-module P = Printf
+module KF = Filename
+module KP = Printf
module U = NUri
module C = Cps
module L = Log
module Y = Time
+module P = Marks
module G = Options
module H = Hierarchy
+module N = Layer
module E = Entity
module O = Output
-module S = Status
module DO = CrgOutput
module TD = TxtCrg
module AA = AutProcess
module ZU = BagUntrusted
type status = {
- kst: S.status;
+ kst: N.status;
tst: TD.status;
pst: AA.status;
ast: AD.status;
let level = 0
let bag_error st s msg =
- L.error st.kst.S.lenv ZO.specs (L.Warn s :: msg)
+ L.error st.kst ZO.specs (L.Warn s :: msg)
let brg_error st s msg =
- L.error st.kst.S.lenv BR.specs (L.Warn s :: msg)
+ L.error st.kst BR.specs (L.Warn s :: msg)
let initial_status () = {
- kst = S.initial_status ();
+ kst = N.initial_status ();
tst = TD.initial_status ();
pst = AA.initial_status ();
ast = AD.initial_status ();
}
let refresh_status st = {st with
- kst = S.refresh_status st.kst;
+ kst = N.refresh_status st.kst;
tst = TD.refresh_status st.tst;
ast = AD.refresh_status st.ast;
}
| CrgEntity of Crg.entity
let print_counters st = function
- | G.Crg -> DO.print_counters C.start st.dc
- | G.Brg -> BO.print_counters C.start st.bc
- | G.Bag -> ZO.print_counters C.start st.zc
+ | G.V4 -> DO.print_counters C.start st.dc
+ | G.V3 -> BO.print_counters C.start st.bc
+ | G.V0 -> ZO.print_counters C.start st.zc
let xlate_entity st entity = match !G.kernel, entity with
- | G.Brg, CrgEntity e ->
+ | G.V3, CrgEntity e ->
let f e = (BrgEntity e) in E.xlate f BD.brg_of_crg e
- | G.Bag, CrgEntity e ->
- let f e = (BagEntity e) in E.xlate f (ZD.bag_of_crg st.kst.S.lenv) e
+ | G.V0, CrgEntity e ->
+ let f e = (BagEntity e) in E.xlate f (ZD.bag_of_crg st.kst) e
| _, entity -> entity
let pp_progress e =
let f _ na u =
let s = U.string_of_uri u 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 na
+ L.warn 2 (KP.sprintf "[%u] <%s>" na.E.n_apix s);
in
+ Y.utime_stamp "intermediate";
match e with
| CrgEntity e -> E.common f e
| BrgEntity e -> E.common f e
| CrgEntity e -> {st with dc = DO.count_entity C.start st.dc e}
let export_entity st = function
- | CrgEntity e -> XL.export_entity (XD.export_term st.kst.S.lenv) e
- | BrgEntity e -> XL.export_entity (BO.export_term st.kst.S.lenv) e
- | BagEntity e -> XL.export_entity (ZO.export_term st.kst.S.lenv) e
+ | CrgEntity e -> XL.export_entity (XD.export_term st.kst) e
+ | BrgEntity e -> XL.export_entity (BO.export_term st.kst) e
+ | BagEntity e -> XL.export_entity (ZO.export_term st.kst) e
let type_check st k =
let brg_err msg = brg_error st "Type Error" msg; failwith "Interrupted" in
let brg_err msg = brg_error st "Validation Error" msg; failwith "Interrupted" in
let ok _ = st in
match k with
- | BrgEntity entity ->
- let st = BU.validate brg_err ok st.kst entity in
- begin match st.och with
- | None -> st
- | Some och ->
- if BG.output_entity st.kst.S.lenv och entity then st
- else begin L.warn level "Matita exportation stopped"; {st with och = None} end
- end
+ | BrgEntity entity -> BU.validate brg_err ok st.kst entity
| BagEntity _ -> st
| CrgEntity _ -> st
+let grafite st och = function
+ | BrgEntity entity ->
+ if BG.output_entity st.kst och entity then st else
+ begin L.warn level "Matita exportation stopped"; {st with och = None} end
+ | BagEntity _ -> st
+ | CrgEntity _ -> st
+
(* extended lexer ***********************************************************)
type 'token lexer = {
| NoEntity
let type_of_input name =
- if F.check_suffix name ".hln" then Text
- else if F.check_suffix name ".aut" then
+ if KF.check_suffix name ".hln" then Text
+ else if KF.check_suffix name ".aut" then
let _ = H.set_sorts 0 ["Set"; "Prop"] in
assert (H.set_graph "Z2");
Automath
else begin
- L.warn level (P.sprintf "Unknown file type: %s" name); exit 2
+ L.warn level (KP.sprintf "Unknown file type: %s" name); exit 2
end
let txt_xl = initial_lexer TxtLexer.token
let process_2 st entity =
let st = if !G.summary then count_entity st entity else st in
+ let st =
+ if !G.stage >= 3 then
+ let f = if !version then validate else type_check in f st entity
+ else st
+ in
if !export then export_entity st entity;
- if !G.stage >= 3 then
- let f = if !version then validate else type_check in
- f st entity
- else st
+ match st.och with
+ | None -> st
+ | Some och -> grafite st och entity
let process_1 st entity =
if !G.trace >= 3 then pp_progress entity;
let ich = open_in name in
let lexbuf = Lexing.from_channel ich in
let st = process st lexbuf input in
- close_in ich;
-(* if !G.cc then XL.export_csys st.kst.S.cc; *)
+ close_in ich;
st, input
let main =
let print_version () = L.warn level (G.version_string ^ "\n"); exit 0 in
let set_hierarchy s =
if H.set_graph s then () else
- L.warn level (P.sprintf "Unknown type hierarchy: %s" s)
+ L.warn level (KP.sprintf "Unknown type hierarchy: %s" s)
in
let set_kernel = function
- | "brg" -> G.kernel := G.Brg
- | "bag" -> G.kernel := G.Bag
- | s -> L.warn level (P.sprintf "Unknown kernel version: %s" s)
+ | "V3" -> G.kernel := G.V3
+ | "V0" -> G.kernel := G.V0
+ | s -> L.warn level (KP.sprintf "Unknown kernel version: %s" s)
in
let set_trace i =
if !G.trace = 0 && i > 0 then Y.gmtime G.version_string;
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_madir s = G.ma_dir := s in
- let set_xdir s = G.xdir := s in
- let set_root s = root := s in
let clear_options () =
export := false; preprocess := false;
root := "";
- st := initial_status ();
G.clear (); H.clear (); O.clear_reductions ();
streaming := false;
version := true
in
- let set_ma_preamble fname = G.ma_preamble := fname in
let process_file name =
- if !G.trace >= 2 then L.warn 1 (P.sprintf "Processing file: %s" name);
+ if !G.trace >= 2 then L.warn 1 (KP.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 !G.stage <= 1 then G.kernel := G.Crg;
+ let cover = KF.concat !root base_name in
+ if !G.stage <= 1 then G.kernel := G.V4;
G.cover := cover;
if !G.ma_preamble <> "" then st := {!st with och = Some (BG.open_out base_name)};
+ P.clear_marks ();
let sst, input = process (refresh_status !st) name in
st := begin match sst.och with
| None -> sst
if !G.summary then begin
AO.print_counters C.start !st.ac;
if !preprocess then AO.print_process_counters C.start !st.pst;
- if !G.stage >= 1 then print_counters !st G.Crg;
+ if !G.stage >= 1 then print_counters !st G.V4;
if !G.stage >= 2 then print_counters !st !G.kernel;
if !G.stage >= 3 then O.print_reductions ()
end
if !G.trace >= 1 then Y.utime_stamp "at exit"
in
let help =
- "Usage: helena [ -LPVXdgilopqtx1 | -Ts <number> | -MO <dir> | -m <file> | -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" ^
+ "Usage: helena [ -LPVXdgilopqtx1 | -Ts <number> | -MO <dir> | -m <file> | -ahkr <string> ]* [ <file> ]*\n\n" ^
+ "Trace levels: 0 just errors (default), 1 time stamps, 2 processed files, 3 processed objects,\n" ^
+ " 4 typing information, 5 conversion information, 6 reduction information,\n" ^
+ " 7 level disambiguation\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_V = " show version information" in
let help_X = " clear options" in
+ let help_a = "<string> set prefix of numeric identifiers (default: empty)" 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_k = "<string> set kernel version (default: \"brg\")" in
+ let help_k = "<string> set kernel version (default: \"V3\")" in
let help_l = " disambiguate binders level (Automath)" in
let help_m = "<file> export kernel entities (Grafite) setting location of preamble to <file> (default: empty)" in
let help_o = " activate sort inclusion (default: false)" in
at_exit exit;
Arg.parse [
("-L", Arg.Set G.debug_lexer, help_L);
- ("-M", Arg.String set_madir, help_M);
- ("-O", Arg.String set_xdir, help_O);
- ("-P", Arg.Set G.debug_parser, help_P);
+ ("-M", Arg.String ((:=) G.ma_dir), help_M);
+ ("-O", Arg.String ((:=) G.xdir), help_O);
+ ("-P", Arg.Set G.debug_parser, help_P);
("-T", Arg.Int set_trace, help_T);
("-V", Arg.Unit print_version, help_V);
("-X", Arg.Unit clear_options, help_X);
+ ("-a", Arg.String ((:=) G.alpha), help_a);
("-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);
("-k", Arg.String set_kernel, help_k);
("-l", Arg.Set G.cc, help_l);
- ("-m", Arg.String set_ma_preamble, help_m);
+ ("-m", Arg.String ((:=) G.ma_preamble), help_m);
("-o", Arg.Set G.si, help_o);
("-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);
+ ("-r", Arg.String ((:=) root), help_r);
+ ("-s", Arg.Int ((:=) G.stage), help_s);
("-t", Arg.Clear version, help_t);
("-x", Arg.Set export, help_x);
("-1", Arg.Set streaming, help_1);
- ] process_file help;
+ ] process_file help