module U = NUri
module C = Cps
-module S = Share
+module W = Share
module L = Log
module H = Hierarchy
module E = Entity
+module N = Level
module B = Brg
module BE = BrgEnvironment
module BS = BrgSubstitution
let assert_applicability err f st m u w v =
match BR.xwhd st m u with
- | _, B.Sort _ -> error1 err "not a function type" m u
- | mu, B.Bind (_, B.Abst u, _) ->
+ | _, B.Sort _ ->
+ error1 err "not a function type" m u
+ | mu, B.Bind (_, B.Abst (_, u), _) ->
if BR.are_convertible st mu u m w then f () else
error3 err m v w ~mu u
- | _ -> assert false (**)
+ | _ -> assert false (**)
let rec b_type_of err f st m x =
log1 "Now checking" m x;
let h = H.apply h in f x (B.Sort (a, h))
| B.LRef (_, i) ->
begin match BR.get m i with
- | B.Abst w ->
+ | B.Abst (_, w) ->
f x (BS.lift (succ i) (0) w)
| B.Abbr (B.Cast (_, w, _)) ->
f x (BS.lift (succ i) (0) w)
end
| B.GRef (_, uri) ->
begin match BE.get_entity uri with
- | _, _, E.Abst w -> f x w
+ | _, _, E.Abst (_, w) -> f x w
| _, _, E.Abbr (B.Cast (_, w, _)) -> f x w
| _, _, E.Abbr _ -> assert false
| _, _, E.Void ->
end
| B.Bind (a, B.Abbr v, t) ->
let f xv xt tt =
- f (S.sh2 v xv t xt x (B.bind_abbr a)) (B.bind_abbr a xv tt)
+ f (W.sh2 v xv t xt x (B.bind_abbr a)) (B.bind_abbr a xv tt)
in
let f xv m = b_type_of err (f xv) st m t in
let f xv = f xv (BR.push m a (B.abbr xv)) in
| _ -> f (B.Cast ([], vv, xv))
in
type_of err f st m v
- | B.Bind (a, B.Abst u, t) ->
+ | B.Bind (a, B.Abst (n, u), t) ->
let f xu xt tt =
- f (S.sh2 u xu t xt x (B.bind_abst a)) (B.bind_abst a xu tt)
+ f (W.sh2 u xu t xt x (B.bind_abst n a)) (B.bind_abst (N.pred n) a xu tt)
in
let f xu m = b_type_of err (f xu) st m t in
- let f xu _ = f xu (BR.push m a (B.abst xu)) in
+ let f xu _ = f xu (BR.push m a (B.abst n xu)) in
type_of err f st m u
| B.Bind (a, B.Void, t) ->
let f xt tt =
- f (S.sh1 t xt x (B.bind_void a)) (B.bind_void a tt)
+ f (W.sh1 t xt x (B.bind_void a)) (B.bind_void a tt)
in
b_type_of err f st (BR.push m a B.Void) t
| B.Appl (a, v, t) ->
let f xv vv xt tt =
- let f _ = f (S.sh2 v xv t xt x (B.appl a)) (B.appl a xv tt) in
+ let f _ = f (W.sh2 v xv t xt x (B.appl a)) (B.appl a xv tt) in
assert_applicability err f st m tt vv xv
in
let f xv vv = b_type_of err (f xv vv) st m t in
type_of err f st m v
| B.Cast (a, u, t) ->
let f xu xt tt =
- let f _ = f (S.sh2 u xu t xt x (B.cast a)) xu in
+ let f _ = f (W.sh2 u xu t xt x (B.cast a)) xu in
assert_convertibility err f st m xu tt xt
in
let f xu _ = b_type_of err (f xu) st m t in