metaAut: now we use hash tables properly (processing time: 2s)

[helm.git] / helm / software / lambda-delta / toplevel / metaAut.ml

diff --git a/helm/software/lambda-delta/toplevel/metaAut.ml b/helm/software/lambda-delta/toplevel/metaAut.ml
index 59801dac7833fc98efe739589ef10bd23a9ebab5..7e18bd1e5332d7a64fec80ef1004198612eb56ea 100644 (file)
--- a/helm/software/lambda-delta/toplevel/metaAut.ml
+++ b/helm/software/lambda-delta/toplevel/metaAut.ml
@@ -9,14 +9,15 @@
      \ /   This software is distributed as is, NO WARRANTY.              
       V_______________________________________________________________ *)
 
-module H = Hashtbl
 module U = NUri
+module H = U.UriHash
 module M = Meta
 module A = Aut
 
-type qid = M.id * M.id list (* qualified identifier: name, qualifiers *)
+(* qualified identifier: uri, name, qualifiers *)
+type qid = U.uri * M.id * M.id list
 
-type environment = (qid, M.pars) H.t
+type environment = M.pars H.t
 
 type context_node = qid option (* context node: None = root *)
 
@@ -44,13 +45,15 @@ let initial_status size = {
 
 let id_of_name (id, _, _) = id
 
-let uri_of_qid (id, path) =
-   let path = String.concat "/" path in
-   let str = Filename.concat path id in
-   U.uri_of_string ("ld:/" ^ str)
+let mk_qid id path =
+   let str = String.concat "/" path in
+   let str = Filename.concat str id in
+   U.uri_of_string ("ld:/" ^ str), id, path
+
+let uri_of_qid (uri, _, _) = uri
 
 let complete_qid f st (id, is_local, qs) =
-   let f qs = f (id, qs) in
+   let f qs = f (mk_qid id qs) in
    let f path = Cps.list_rev_append f path ~tail:qs in
    let rec skip f = function
       | phd :: ptl, qshd :: _ when phd = qshd -> f ptl
@@ -59,8 +62,8 @@ let complete_qid f st (id, is_local, qs) =
    in
    if is_local then f st.path else skip f (st.path, qs)
 
-let relax_qid f (id, path) =
-   let f path = f (id, path) in
+let relax_qid f (_, id, path) =
+   let f path = f (mk_qid id path) in
    let f = function
       | _ :: tl -> Cps.list_rev f tl
       | []      -> assert false
@@ -87,7 +90,7 @@ let resolve_lref_strict f st l lenv id =
    resolve_lref f st l lenv id
 
 let resolve_gref f st qid =
-   try let args = H.find st.henv qid in f qid (Some args)
+   try let args = H.find st.henv (uri_of_qid qid) in f qid (Some args)
    with Not_found -> f qid None
 
 let resolve_gref_relaxed f st qid =
@@ -99,8 +102,8 @@ let resolve_gref_relaxed f st qid =
 
 let get_pars f st = function
    | None              -> f [] None
-   | Some name as node ->
-      try let pars = H.find st.hcnt name in f pars None
+   | Some qid as node ->
+      try let pars = H.find st.hcnt (uri_of_qid qid) in f pars None
       with Not_found -> f [] (Some node)
 
 let get_pars_relaxed f st =
@@ -159,7 +162,7 @@ let xlate_item f st = function
       let f qid = 
          let f pars =
            let f ww = 
-              H.add st.hcnt qid ((name, ww) :: pars);
+              H.add st.hcnt (uri_of_qid qid) ((name, ww) :: pars);
               f {st with node = Some qid} None
            in
             xlate_term f st pars w
@@ -172,7 +175,7 @@ let xlate_item f st = function
          let f qid = 
             let f ww =
               let entry = (st.line, pars, uri_of_qid qid, ww, None) in
-              H.add st.henv qid pars;
+              H.add st.henv (uri_of_qid qid) pars;
               f {st with line = succ st.line} (Some entry)
            in
            xlate_term f st pars w
@@ -185,7 +188,7 @@ let xlate_item f st = function
          let f qid = 
             let f ww vv = 
               let entry = (st.line, pars, uri_of_qid qid, ww, Some (trans, vv)) in
-              H.add st.henv qid pars;
+              H.add st.henv (uri_of_qid qid) pars;
               f {st with line = succ st.line} (Some entry)
            in
            let f ww = xlate_term (f ww) st pars v in