X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fhelena%2Fsrc%2Fautomath%2FautCrg.ml;h=d1a72518b2d053636bbc639eb30d434854322950;hb=88977b2d546e547e23b046792fe2ad8f6ff192a4;hp=a92b6fea98f44b696c10675650a5317bcafcdf40;hpb=9935a5bf5bdc98ad01a2b0234cf4e612a62c939f;p=helm.git diff --git a/helm/software/helena/src/automath/autCrg.ml b/helm/software/helena/src/automath/autCrg.ml index a92b6fea9..d1a72518b 100644 --- a/helm/software/helena/src/automath/autCrg.ml +++ b/helm/software/helena/src/automath/autCrg.ml @@ -24,7 +24,7 @@ type qid = D.uri * D.id * D.id list type context_node = qid option (* context node: None = root *) type status = { - path: D.id list; (* current section path *) + path: D.id list; (* current section path *) node: context_node; (* current context node *) nodes: context_node list; (* context node list *) line: int; (* line number *) @@ -44,19 +44,29 @@ let empty_cnt = D.empty_lenv let alpha id = if id.[0] >= '0' && id.[0] <= '9' then !G.alpha ^ id else id -let add_abst cnt id aw w = +let attrs_for_appl yv yt = + E.appl_attrs ~side:yv ~main:yt !G.restricted + +let attrs_for_abst id yw = let id = if !G.alpha <> "" then alpha id else id in - let aw = {aw with E.n_name = Some (id, true); E.n_degr = succ aw.E.n_degr} in - D.EBind (cnt, aw, D.Abst (N.two, w)) + E.bind_attrs ~name:(id, true) ~side:yw ~main:(E.succ yw) () + +let attrs_for_env y = + E.env_attrs ~side:y () + +let add_abst cnt id yw w = + let a = attrs_for_abst id yw in + let l = if !G.infinity then N.infinity else N.two in + D.EBind (cnt, E.empty_node, a, D.Abst (false, l, w)) -let mk_lref f a i = f a (D.TLRef (a, i)) +let mk_lref f _ a i = f a.E.b_main (D.TLRef (E.empty_node, i)) let id_of_name (id, _, _) = if !G.alpha <> "" then alpha id else id let mk_qid f lst id path = let str = String.concat "/" path in - let str = Filename.concat str id in + let str = Filename.concat str id in let str = lst.mk_uri str in f (U.uri_of_string str, id, path) @@ -83,11 +93,11 @@ let relax_opt_qid f lst = function | Some qid -> let f qid = f (Some qid) in relax_qid f lst qid let resolve_gref err f lst qid = - try let a, cnt = UH.find henv (uri_of_qid qid) in f qid a cnt + try let y, cnt = UH.find henv (uri_of_qid qid) in f qid y cnt with Not_found -> err qid let resolve_gref_relaxed f lst qid = -(* this is not tail recursive *) +(* this is not tail recursive *) let rec err qid = relax_qid (resolve_gref err f lst) lst qid in resolve_gref err f lst qid @@ -98,65 +108,72 @@ let get_cnt err f lst = function with Not_found -> err node let get_cnt_relaxed f lst = -(* this is not tail recursive *) +(* this is not tail recursive *) let rec err node = relax_opt_qid (get_cnt err f lst) lst node in get_cnt err f lst lst.node let push_abst f a w lenv = - let bw = D.Abst (N.infinite, w) in - D.push_bind f a bw lenv - -let add_proj e t = match e with - | D.ESort -> t - | D.EBind (D.ESort, a, b) -> D.TBind (a, b, t) - | _ -> D.TProj (E.empty_node, e, t) + let bw = D.Abst (false, N.infinity, w) in + D.push_bind f E.empty_node a bw lenv +(* +let rec set_name_y f = function + | D.ESort -> f D.ESort + | D.EBind (e, a, y, b) -> set_name_y (D.push_bind f a {y with E.b_name = Some ("Y", true)} b) e + | D.EAppl (e, a, v) -> set_name_y (D.push_appl f a v) e + | D.EProj (e, d) -> let f d = set_name_y (D.push_proj f d) e in set_name_y f d +*) +let add_proj yt e t = match e with + | D.ESort -> t + | D.EBind (D.ESort, _, a, b) -> D.TBind (E.compose a yt, b, t) + | e -> + D.TProj (D.set_attrs C.start yt e, t) (* this is not tail recursive in the GRef branch *) -let rec xlate_term f st lst y lenv = function +let rec xlate_term f st lst z lenv = function | A.Sort s -> - let h = if s then 0 else 1 in - let a = E.node_attrs ~sort:h () in - f a (D.TSort (a, h)) + let k = if s then 0 else 1 in + f (k, 0) (D.TSort k) | A.Appl (v, t) -> - let f vv at tt = f at (D.TAppl (at, vv, tt)) in - let f _ vv = xlate_term (f vv) st lst y lenv t in + let f yv vv yt tt = + f yt (D.TAppl (attrs_for_appl yv yt, vv, tt)) + in + let f yv vv = xlate_term (f yv vv) st lst z lenv t in xlate_term f st lst false lenv v | A.Abst (name, w, t) -> - let name = if !G.alpha <> "" then alpha name else name in - let name = Some (name, true) in - let f aw ww = - let f at tt = - let l = - if !G.cc then match y, at.E.n_degr with + let f yw ww = + let a = attrs_for_abst name yw in + let f yt tt = + let l = + if !G.cc then match z, snd yt with | true, _ -> N.one | _ , 0 -> N.one | _ , 1 -> N.unknown st | _ , 2 -> N.two | _ -> assert false - else N.infinite + else N.infinity in - let b = D.Abst (l, ww) in - let at = {at with E.n_name = name} in - f at (D.TBind (at, b, tt)) + let b = D.Abst (false, l, ww) in +(* let yt = {yt with E.b_name = Some ("P", true)} in *) + f yt (D.TBind (E.compose a yt, b, tt)) in - let f lenv = xlate_term f st lst y lenv t in - push_abst f {aw with E.n_name = name; E.n_degr = succ aw.E.n_degr} ww lenv + let f lenv = xlate_term f st lst z lenv t in + push_abst f a ww lenv in xlate_term f st lst true lenv w | A.GRef (name, args) -> let map1 args (id, _) = A.GRef ((id, true, []), []) :: args in - let map2 f arg args = - let f _ arg = f (D.EAppl (args, E.empty_node, arg)) in + let map2 y f arg args = + let f yv v = f (D.EAppl (args, attrs_for_appl yv y, v)) in xlate_term f st lst false lenv arg in - let g qid a cnt = - let gref = D.TGRef (a, uri_of_qid qid) in - if cnt = D.ESort then f a gref else - let f = function - | D.EAppl (D.ESort, _, v) -> f a (D.TAppl (a, v, gref)) - | args -> f a (D.TProj (a, args, gref)) + let g qid y cnt = + let gref = D.TGRef (E.empty_node, uri_of_qid qid) in + if cnt = D.ESort then f y gref else + let f = function + | D.EAppl (D.ESort, a, v) -> f y (D.TAppl (a, v, gref)) + | args -> f y (D.TProj (args, gref)) in - let f args = C.list_fold_right f map2 args D.ESort in + let f args = C.list_fold_right f (map2 y) args D.ESort in D.sub_list_strict (D.fold_names f map1 args) cnt args in let g qid = resolve_gref_relaxed g lst qid in @@ -168,7 +185,7 @@ let xlate_entity err f st lst = function err {lst with path = name :: lst.path; nodes = lst.node :: lst.nodes} | A.Section None -> begin match lst.path, lst.nodes with - | _ :: ptl, nhd :: ntl -> + | _ :: ptl, nhd :: ntl -> err {lst with path = ptl; node = nhd; nodes = ntl} | _ -> assert false end @@ -176,12 +193,12 @@ let xlate_entity err f st lst = function err {lst with node = None} | A.Context (Some name) -> let f name = err {lst with node = Some name} in - complete_qid f lst name + complete_qid f lst name | A.Block (name, w) -> - let f qid = + let f qid = let f cnt = - let f aw ww = - UH.add hcnt (uri_of_qid qid) (add_abst cnt name aw ww); + let f yw ww = + UH.add hcnt (uri_of_qid qid) (add_abst cnt name yw ww); err {lst with node = Some qid} in xlate_term f st lst true cnt w @@ -191,37 +208,44 @@ let xlate_entity err f st lst = function complete_qid f lst (name, true, []) | A.Decl (name, w) -> let f lenv = - let f qid = - let f aw ww = - let aw = {aw with E.n_apix = lst.line; E.n_degr = succ aw.E.n_degr} in - UH.add henv (uri_of_qid qid) (aw, lenv); - let t = add_proj lenv ww in -(* - print_newline (); CrgOutput.pp_term print_string t; -*) - let b = E.Abst t in - let entity = E.empty_root, aw, uri_of_qid qid, b in + let f qid = + let f yw ww = + let yv = E.succ yw in + let a = attrs_for_env yv in + UH.add henv (uri_of_qid qid) (yv, lenv); + let t = add_proj yw lenv ww in + let na = E.node_attrs ~apix:lst.line () in + let entity = E.empty_root, na, uri_of_qid qid, E.abst a t in +IFDEF TRACE THEN + G.set_current_trace lst.line +ELSE () END; f {lst with line = succ lst.line} entity in xlate_term f st lst true lenv w in complete_qid f lst (name, true, []) in - get_cnt_relaxed (D.replace f N.one) lst + let f = if !G.infinity then f else D.set_layer f N.one in + get_cnt_relaxed f lst | A.Def (name, w, trans, v) -> let f lenv = - let f qid = - let f _ ww = - let f av vv = - let na = {av with E.n_apix = lst.line} in - UH.add henv (uri_of_qid qid) (na, lenv); - let t = add_proj lenv (D.TCast (na, ww, vv)) in -(* - print_newline (); CrgOutput.pp_term print_string t; -*) - let b = E.Abbr t in + let f qid = + let f yw ww = + let f yv vv = + let a = attrs_for_env yv in + UH.add henv (uri_of_qid qid) (yv, lenv); + let t = if !G.cast then + let f e = D.TCast (add_proj yw e ww, add_proj yv lenv vv) in + if !G.infinity then f lenv else D.set_layer f N.one lenv + else + add_proj yv lenv (D.TCast (ww, vv)) + in + let na = E.node_attrs ~apix:lst.line () in let ra = if trans then E.empty_root else E.root_attrs ~meta:[E.Private] () in - let entity = ra, na, uri_of_qid qid, b in + let entity = ra, na, uri_of_qid qid, E.abbr a t in +IFDEF TRACE THEN + G.set_current_trace lst.line +ELSE () END; f {lst with line = succ lst.line} entity in xlate_term f st lst false lenv v