Bug fixed: in case of (t ...) where t has flexible type, a failure obtained

[helm.git] / helm / software / lambda-delta / dual_rg / drgAut.ml

diff --git a/helm/software/lambda-delta/dual_rg/drgAut.ml b/helm/software/lambda-delta/dual_rg/drgAut.ml
index aaf9d20c73ee3b126a09e9821aa13f71313b823c..aa6cf5d9766649c92d474caa2f4ac18b14925fb1 100644 (file)
--- a/helm/software/lambda-delta/dual_rg/drgAut.ml
+++ b/helm/software/lambda-delta/dual_rg/drgAut.ml
@@ -21,14 +21,10 @@ type qid = D.uri * D.id * D.id list
 
 type context = Y.attrs * D.term list
 
-type environment = context H.t
-
 type context_node = qid option (* context node: None = root *)
 
 type status = {
-   henv: environment;        (* optimized global environment *)
    path: D.id list;          (* current section path *) 
-   hcnt: environment;        (* optimized context *)   
    node: context_node;       (* current context node *)
    nodes: context_node list; (* context node list *)
    line: int;                (* line number *)
@@ -40,11 +36,15 @@ type resolver = Local of int
 
 let henv_size, hcnt_size = 7000, 4300 (* hash tables initial sizes *)
 
+let henv = H.create henv_size (* optimized global environment *)
+
+let hcnt = H.create hcnt_size (* optimized context *)
+
 (* Internal functions *******************************************************)
 
-let initial_status mk_uri = {
-   path = []; node = None; nodes = []; line = 1; mk_uri = mk_uri;
-   henv = H.create henv_size; hcnt = H.create hcnt_size
+let initial_status mk_uri =
+   H.clear henv; H.clear hcnt; {
+   path = []; node = None; nodes = []; line = 1; mk_uri = mk_uri
 }
 
 let empty_cnt = [], []
@@ -53,7 +53,7 @@ let add_abst (a, ws) id w =
    Y.Name (id, true) :: a, w :: ws 
 
 let lenv_of_cnt (a, ws) = 
-   D.push C.start D.empty_lenv a (D.Abst ws)
+   D.push_bind C.start D.empty_lenv a (D.Abst ws)
 
 let mk_lref f i j k = f (D.TLRef ([Y.Apix k], i, j))
 
@@ -88,7 +88,7 @@ let relax_opt_qid f st = function
    | Some qid -> let f qid = f (Some qid) in relax_qid f st qid
 
 let resolve_gref err f st qid =
-   try let cnt = H.find st.henv (uri_of_qid qid) in f qid cnt
+   try let cnt = H.find henv (uri_of_qid qid) in f qid cnt
    with Not_found -> err qid 
 
 let resolve_gref_relaxed f st qid =
@@ -99,7 +99,7 @@ let resolve_gref_relaxed f st qid =
 let get_cnt err f st = function
    | None              -> f empty_cnt
    | Some qid as node ->
-      try let cnt = H.find st.hcnt (uri_of_qid qid) in f cnt
+      try let cnt = H.find hcnt (uri_of_qid qid) in f cnt
       with Not_found -> err node
 
 let get_cnt_relaxed f st =
@@ -121,22 +121,24 @@ let rec xlate_term f st lenv = function
          let a, b = [Y.Name (name, true)], (D.Abst [ww]) in
         let f tt = f (D.TBind (a, b, tt)) in
          let f lenv = xlate_term f st lenv t in
-        D.push f lenv a b
+        D.push_bind f lenv a b
       in
       xlate_term f st lenv w
    | A.GRef (name, args) ->
+      let map1 f = function
+           | Y.Name (id, _) -> f (A.GRef ((id, true, []), []))
+           | _              -> C.err ()
+      in
+      let map2 f = xlate_term f st lenv in
       let g qid (a, _) =
-        let map1 f = xlate_term f st lenv in       
-        let map2 f = function
-           | Y.Name (id, _) -> D.resolve_lref Cps.err (mk_lref f) id lenv
-           | _              -> assert false
-        in
-         let f tail = 
-           let f args = f (D.TAppl ([], args, D.TGRef ([], uri_of_qid qid))) in
-            let f a = C.list_rev_map_append f map2 a ~tail in
-           C.list_sub_strict f a args
-        in   
-        C.list_map f map1 args
+         let gref = D.TGRef ([], uri_of_qid qid) in
+        match args with
+           | []   -> f gref
+           | args -> 
+              let f args = f (D.TAppl ([], args, gref)) in
+              let f args = f (List.rev_map (map2 C.start) args) in
+              let f a = C.list_rev_map_append f map1 a ~tail:args in
+              C.list_sub_strict f a args
       in
       let g qid = resolve_gref_relaxed g st qid in
       let err () = complete_qid g st name in
@@ -160,11 +162,9 @@ let xlate_entity err f st = function
       let f qid = 
          let f cnt =
            let lenv = lenv_of_cnt cnt in
-           let f ww = 
-              H.add st.hcnt (uri_of_qid qid) (add_abst cnt name ww);
-              err {st with node = Some qid}
-           in
-            xlate_term f st lenv w
+           let ww = xlate_term C.start st lenv w in
+           H.add hcnt (uri_of_qid qid) (add_abst cnt name ww);
+           err {st with node = Some qid}
         in
          get_cnt_relaxed f st
       in
@@ -174,13 +174,11 @@ let xlate_entity err f st = function
          let a, ws = cnt in
          let lenv = lenv_of_cnt cnt in
         let f qid = 
-            let f ww =
-              H.add st.henv (uri_of_qid qid) cnt;            
-              let b = Y.Abst (D.TBind (a, D.Abst ws, ww)) in
-              let entity = [Y.Mark st.line], uri_of_qid qid, b in
-              f {st with line = succ st.line} entity
-           in
-           xlate_term f st lenv w
+            let ww = xlate_term C.start st lenv w in
+           H.add henv (uri_of_qid qid) cnt;
+           let b = Y.Abst (D.TBind (a, D.Abst ws, ww)) in
+           let entity = [Y.Mark st.line], uri_of_qid qid, b in
+           f {st with line = succ st.line} entity
         in
          complete_qid f st (name, true, [])
       in
@@ -190,17 +188,13 @@ let xlate_entity err f st = function
         let a, ws = cnt in
         let lenv = lenv_of_cnt cnt in
          let f qid = 
-            let f ww vv = 
-              H.add st.henv (uri_of_qid qid) cnt;
-               let b = Y.Abbr (D.TBind (a, D.Abst ws, D.TCast ([], ww, vv))) in
-              let a =
-                 if trans then [Y.Mark st.line] else [Y.Mark st.line; Y.Priv]
-              in
-              let entity = a, uri_of_qid qid, b in
-              f {st with line = succ st.line} entity
-           in
-           let f ww = xlate_term (f ww) st lenv v in
-           xlate_term f st lenv w
+            let ww = xlate_term C.start st lenv w in
+           let vv = xlate_term C.start st lenv v in
+           H.add henv (uri_of_qid qid) cnt;
+            let b = Y.Abbr (D.TBind (a, D.Abst ws, D.TCast ([], ww, vv))) in
+           let a = Y.Mark st.line :: if trans then [] else [Y.Priv] in
+           let entity = a, uri_of_qid qid, b in
+           f {st with line = succ st.line} entity
         in
          complete_qid f st (name, true, [])
       in