(* Interface functions ******************************************************)
-let rec b_type_of f ~si g c x =
+let rec b_type_of f st c x =
(* L.warn "Entering T.b_type_of"; *)
log1 "Now checking" c x;
match x with
| B.Sort h ->
- let f h = f x (B.Sort h) in H.apply f g h
+ let h = H.apply h in f x (B.Sort h)
| B.LRef i ->
let f = function
| Some (_, B.Abst w) -> f x w
let f xv xt tt =
f (S.sh2 v xv t xt x (B.bind_abbr l id)) (B.bind_abbr l id xv tt)
in
- let f xv cc = b_type_of (f xv) ~si g cc t in
+ let f xv cc = b_type_of (f xv) st cc t in
let f xv = B.push "type abbr" (f xv) c l id (B.Abbr xv) in
let f xv vv = match xv with
| B.Cast _ -> f xv
| _ -> f (B.Cast (vv, xv))
in
- type_of f ~si g c v
+ type_of f st c v
| B.Bind (l, id, B.Abst u, t) ->
let f xu xt tt =
f (S.sh2 u xu t xt x (B.bind_abst l id)) (B.bind_abst l id xu tt)
in
- let f xu cc = b_type_of (f xu) ~si g cc t in
+ let f xu cc = b_type_of (f xu) st cc t in
let f xu _ = B.push "type abst" (f xu) c l id (B.Abst xu) in
- type_of f ~si g c u
+ type_of f st c u
| B.Bind (l, id, B.Void, t) ->
let f xt tt =
f (S.sh1 t xt x (B.bind l id B.Void)) (B.bind l id B.Void tt)
in
- let f cc = b_type_of f ~si g cc t in
+ let f cc = b_type_of f st cc t in
B.push "type void" f c l id B.Void
| B.Appl (v, t) ->
let f xv vv xt tt = function
if a then f (S.sh2 v xv t xt x B.appl) (B.appl xv tt)
else error3 c xv vv w
in
- R.are_convertible f ~si c w vv
+ R.are_convertible f ~si:st.Y.si c w vv
| _ ->
error1 "not a function" c xt
in
let f xv vv xt tt = R.ho_whd (f xv vv xt tt) c tt in
- let f xv vv = b_type_of (f xv vv) ~si g c t in
- type_of f ~si g c v
+ let f xv vv = b_type_of (f xv vv) st c t in
+ type_of f st c v
| B.Cast (u, t) ->
let f xu xt tt a =
(* L.warn (Printf.sprintf "Convertible: %b" a); *)
if a then f (S.sh2 u xu t xt x B.cast) xu else error3 c xt tt xu
in
- let f xu xt tt = R.are_convertible (f xu xt tt) ~si c xu tt in
- let f xu _ = b_type_of (f xu) ~si g c t in
- type_of f ~si g c u
+ let f xu xt tt = R.are_convertible (f xu xt tt) ~si:st.Y.si c xu tt in
+ let f xu _ = b_type_of (f xu) st c t in
+ type_of f st c u
-and type_of f ?(si=false) g c x =
+and type_of f st c x =
let f t u = L.unbox level; f t u in
- L.box level; b_type_of f ~si g c x
+ L.box level; b_type_of f st c x