(* helpers ******************************************************************)
-let mk_uri root s =
- String.concat "/" ["ld:"; "crg"; root; s ^ ".ld"]
+let mk_uri si root s =
+ let kernel = if si then "crg-si" else "crg" in
+ String.concat "/" ["ld:"; kernel; root; s ^ ".ld"]
let empty_lenv = ESort
let push_proj f lenv a e = f (EProj (lenv, a, e))
-let push2 err f lenv attr ?t = match lenv, t with
+let push2 err f lenv attr ?t () = match lenv, t with
| EBind (e, a, Abst ws), Some t -> f (EBind (e, (attr :: a), Abst (t :: ws)))
| EBind (e, a, Abbr vs), Some t -> f (EBind (e, (attr :: a), Abbr (t :: vs)))
| EBind (e, a, Void n), None -> f (EBind (e, (attr :: a), Void (succ n)))
(* this id not tail recursive *)
let resolve_lref err f id lenv =
let rec aux f i k = function
- | ESort -> err ()
- | EBind (tl, a, _) ->
+ | ESort -> err ()
+ | EBind (tl, _, Abst [])
+ | EBind (tl, _, Abbr [])
+ | EBind (tl, _, Void 0) -> aux f i k tl
+ | EBind (tl, a, _) ->
let err kk = aux f (succ i) (k + kk) tl in
let f j = f i j (k + j) in
Entity.resolve err f id a
- | EProj _ -> assert false (* TODO *)
+ | EProj _ -> assert false (* TODO *)
in
aux f 0 0 lenv
let rec get_name err f i j = function
| ESort -> err i
- | EBind (tl, a, Abst []) -> get_name err f i j tl
- | EBind (tl, a, Abbr []) -> get_name err f i j tl
- | EBind (tl, a, Void 0) -> get_name err f i j tl
+ | EBind (tl, _, Abst [])
+ | EBind (tl, _, Abbr [])
+ | EBind (tl, _, Void 0) -> get_name err f i j tl
| EBind (_, a, _) when i = 0 ->
let err () = err i in
Entity.get_name err f j a
| EProj (tl, _, e) ->
let err i = get_name err f i j tl in
get_name err f i j e
+
+let get_index err f i j lenv =
+ let rec aux f i k = function
+ | ESort -> err i
+ | EBind (tl, _, Abst [])
+ | EBind (tl, _, Abbr [])
+ | EBind (tl, _, Void 0) -> aux f i k tl
+ | EBind (_, a, _) when i = 0 ->
+ if Entity.count_names a > j then f (k + j) else err i
+ | EBind (tl, a, _) ->
+ aux f (pred i) (k + Entity.count_names a) tl
+ | EProj _ -> assert false (* TODO *)
+ in
+ aux f i 0 lenv