\ / This software is distributed as is, NO WARRANTY.
V_______________________________________________________________ *)
-module H = Hashtbl
module U = NUri
+module H = U.UriHash
+module C = Cps
+module Y = Entity
module M = Meta
module A = Aut
-type qid = M.id * M.id list (* qualified identifier: name, qualifiers *)
+(* qualified identifier: uri, name, qualifiers *)
+type qid = M.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 *)
node: context_node; (* current context node *)
nodes: context_node list; (* context node list *)
line: int; (* line number *)
- explicit: bool (* need explicit context root? *)
+ cover: string (* initial segment of URI hierarchy *)
}
type resolver = Local of int
| Global of M.pars
-let hsize = 11 (* hash tables initial size *)
+let henv_size, hcnt_size = 7000, 4300 (* hash tables initial sizes *)
(* Internal functions *******************************************************)
-let initial_status size = {
- path = []; node = None; nodes = []; line = 1; explicit = true;
- henv = H.create size; hcnt = H.create size
+let initial_status cover = {
+ path = []; node = None; nodes = []; line = 1; cover = cover;
+ henv = H.create henv_size; hcnt = H.create hcnt_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 st id path =
+ let uripath = if st.cover = "" then path else st.cover :: path in
+ let str = String.concat "/" uripath in
+ let str = Filename.concat str id in
+ U.uri_of_string ("ld:/" ^ str ^ ".ld"), 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 path = Cps.list_rev_append f path ~tail:qs in
+ let f qs = f (mk_qid st id qs) in
+ let f path = C.list_rev_append f path ~tail:qs in
let rec skip f = function
| phd :: ptl, qshd :: _ when phd = qshd -> f ptl
| _ :: ptl, _ :: _ -> skip f (ptl, 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 st (_, id, path) =
+ let f path = f (mk_qid st id path) in
let f = function
- | _ :: tl -> Cps.list_rev f tl
+ | _ :: tl -> C.list_rev f tl
| [] -> assert false
in
- Cps.list_rev f path
+ C.list_rev f path
-let relax_opt_qid f = function
+let relax_opt_qid f st = function
| None -> f None
- | Some qid -> let f qid = f (Some qid) in relax_qid f qid
+ | Some qid -> let f qid = f (Some qid) in relax_qid f st qid
let resolve_lref f st l lenv id =
let rec aux f i = function
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 =
let rec g qid = function
- | None -> relax_qid (resolve_gref g st) qid
+ | None -> relax_qid (resolve_gref g st) st qid
| Some args -> f qid args
in
resolve_gref g 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 =
let rec g pars = function
| None -> f pars
- | Some node -> relax_opt_qid (get_pars g st) node
+ | Some node -> relax_opt_qid (get_pars g st) st node
in
get_pars g st st.node
let map2 f (id, _) = resolve_lref_strict f st l lenv id in
let f tail =
let f args = f (M.GRef (l, uri_of_qid qid, args)) in
- let f defs = Cps.list_rev_map_append f map2 defs ~tail in
- Cps.list_sub_strict f defs args
+ let f defs = C.list_rev_map_append f map2 defs ~tail in
+ C.list_sub_strict f defs args
in
- Cps.list_map f map1 args
+ C.list_map f map1 args
in
let g qid = resolve_gref_relaxed g st qid in
let f = function
in
resolve_lref f st l lenv (id_of_name name)
-let xlate_item f st = function
- | A.Section (Some name) ->
- f {st with path = name :: st.path; nodes = st.node :: st.nodes} None
+let xlate_entity err f st = function
+ | A.Section (Some (_, name)) ->
+ err {st with path = name :: st.path; nodes = st.node :: st.nodes}
| A.Section None ->
begin match st.path, st.nodes with
| _ :: ptl, nhd :: ntl ->
- f {st with path = ptl; node = nhd; nodes = ntl} None
+ err {st with path = ptl; node = nhd; nodes = ntl}
| _ -> assert false
end
| A.Context None ->
- f {st with node = None} None
+ err {st with node = None}
| A.Context (Some name) ->
- let f name = f {st with node = Some name} None in
+ let f name = err {st with node = Some name} in
complete_qid f st name
| A.Block (name, w) ->
let f qid =
let f pars =
let f ww =
- H.add st.hcnt qid ((name, ww) :: pars);
- f {st with node = Some qid} None
+ H.add st.hcnt (uri_of_qid qid) ((name, ww) :: pars);
+ err {st with node = Some qid}
in
xlate_term f st pars w
in
let f pars =
let f qid =
let f ww =
- let entry = (st.line, pars, uri_of_qid qid, ww, None) in
- H.add st.henv qid pars;
- f {st with line = succ st.line} (Some entry)
+ H.add st.henv (uri_of_qid qid) pars;
+ let a = [Y.Mark st.line] in
+ let entry = pars, ww, None in
+ let entity = a, uri_of_qid qid, Y.Abst entry in
+ f {st with line = succ st.line} entity
in
xlate_term f st pars w
in
let f pars =
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;
- f {st with line = succ st.line} (Some entry)
+ H.add st.henv (uri_of_qid qid) pars;
+ let a = Y.Mark st.line :: if trans then [] else [Y.Priv] in
+ let entry = pars, ww, Some vv in
+ let entity = a, uri_of_qid qid, Y.Abbr entry in
+ f {st with line = succ st.line} entity
in
let f ww = xlate_term (f ww) st pars v in
xlate_term f st pars w
(* Interface functions ******************************************************)
-let initial_status = initial_status hsize
+let initial_status ?(cover="") () =
+ initial_status cover
-let meta_of_aut = xlate_item
+let meta_of_aut = xlate_entity
projects / helm.git / blobdiff