module A = Share
module L = Log
module H = Hierarchy
+module Y = Entity
module B = Brg
module O = BrgOutput
module E = BrgEnvironment
module S = BrgSubstitution
module R = BrgReduction
-type message = (R.machine, B.term) Log.item list
-
-exception TypeError of message
+type message = (R.kam, B.term) Log.message
(* Internal functions *******************************************************)
let s = s ^ " the term" in
L.log R.specs level (message1 s m t)
-let error1 s m t =
- raise (TypeError (message1 s m t))
+let error1 err s m t =
+ err (message1 s m t)
let message3 m t1 t2 ?mu t3 =
let sm, st1, st2 = "In the environment", "the term", "is of type" in
let st3 = "but it must be of type" in
L.et_items3 sm m st1 t1 st2 t2 st3 t3
-let error3 m t1 t2 ?mu t3 =
- raise (TypeError (message3 m t1 t2 ?mu t3))
+let error3 err m t1 t2 ?mu t3 =
+ err (message3 m t1 t2 ?mu t3)
-let assert_convertibility f ~si m u w v =
- let err _ = error3 m v w u in
- R.are_convertible err f ~si m u m w
+let assert_convertibility err f st m u w v =
+ if R.are_convertible st m u m w then f () else
+ error3 err m v w u
-let assert_applicability f ~si m u w v =
- let f mu = function
- | B.Bind (B.Abst (_, u), _) ->
- let err _ = error3 m v w ~mu u in
- R.are_convertible err f ~si mu u m w
- | _ -> error1 "not a function type" m u
- in
- R.xwhd f m u
+let assert_applicability err f st m u w v =
+ match R.xwhd st m u with
+ | _, B.Sort _ -> error1 err "not a function type" m u
+ | mu, B.Bind (_, B.Abst u, _) ->
+ if R.are_convertible st mu u m w then f () else
+ error3 err m v w ~mu u
+ | _ -> assert false (**)
-let rec b_type_of f ~si g m x =
+let rec b_type_of err f st g m x =
log1 "Now checking" m x;
match x with
- | B.Sort (a, h) ->
+ | B.Sort (a, h) ->
let f h = f x (B.Sort (a, h)) in H.apply f g h
- | B.LRef (_, i) ->
- let f = function
- | B.Abst (_, w) ->
- S.lift (f x) (succ i) (0) w
- | B.Abbr (_, B.Cast (_, w, _)) ->
- S.lift (f x) (succ i) (0) w
- | B.Abbr _ -> assert false
- | B.Void _ ->
- error1 "reference to excluded variable" m x
- in
- let err _ = error1 "reference to unknown variable" m x in
- R.get err f m i
- | B.GRef (_, uri) ->
- let f = function
- | _, _, B.Abst (_, w) -> f x w
- | _, _, B.Abbr (_, B.Cast (_, w, _)) -> f x w
- | _, _, B.Abbr _ -> assert false
- | _, _, B.Void _ ->
- error1 "reference to excluded object" m x
- in
- let err _ = error1 "reference to unknown object" m x in
- E.get_obj err f uri
- | B.Bind (B.Abbr (a, v), t) ->
+ | B.LRef (_, i) ->
+ begin match R.get m i with
+ | B.Abst w ->
+ f x (S.lift (succ i) (0) w)
+ | B.Abbr (B.Cast (_, w, _)) ->
+ f x (S.lift (succ i) (0) w)
+ | B.Abbr _ -> assert false
+ | B.Void ->
+ error1 err "reference to excluded variable" m x
+ end
+ | B.GRef (_, uri) ->
+ begin match E.get_entity uri with
+ | _, _, Y.Abst w -> f x w
+ | _, _, Y.Abbr (B.Cast (_, w, _)) -> f x w
+ | _, _, Y.Abbr _ -> assert false
+ | _, _, Y.Void ->
+ error1 err "reference to unknown entry" m x
+ end
+ | B.Bind (a, B.Abbr v, t) ->
let f xv xt tt =
f (A.sh2 v xv t xt x (B.bind_abbr a)) (B.bind_abbr a xv tt)
in
- let f xv m = b_type_of (f xv) ~si g m t in
- let f xv = R.push (f xv) m (B.abbr a xv) in
+ let f xv m = b_type_of err (f xv) st g m t in
+ let f xv = f xv (R.push m a (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 m v
- | B.Bind (B.Abst (a, u), t) ->
+ type_of err f st g m v
+ | B.Bind (a, B.Abst u, t) ->
let f xu xt tt =
f (A.sh2 u xu t xt x (B.bind_abst a)) (B.bind_abst a xu tt)
in
- let f xu m = b_type_of (f xu) ~si g m t in
- let f xu _ = R.push (f xu) m (B.abst a xu) in
- type_of f ~si g m u
- | B.Bind (B.Void a as b, t) ->
+ let f xu m = b_type_of err (f xu) st g m t in
+ let f xu _ = f xu (R.push m a (B.abst xu)) in
+ type_of err f st g m u
+ | B.Bind (a, B.Void, t) ->
let f xt tt =
- f (A.sh1 t xt x (B.bind b)) (B.bind b tt)
+ f (A.sh1 t xt x (B.bind_void a)) (B.bind_void a tt)
in
- let f m = b_type_of f ~si g m t in
- R.push f m b
- | B.Appl (a, v, t) ->
+ b_type_of err f st g (R.push m a B.Void) t
+
+ | B.Appl (a, v, t) ->
let f xv vv xt tt =
let f _ = f (A.sh2 v xv t xt x (B.appl a)) (B.appl a xv tt) in
- assert_applicability f ~si m tt vv xv
+ assert_applicability err f st m tt vv xv
in
- let f xv vv = b_type_of (f xv vv) ~si g m t in
- type_of f ~si g m v
- | B.Cast (a, u, t) ->
+ let f xv vv = b_type_of err (f xv vv) st g m t in
+ type_of err f st g m v
+ | B.Cast (a, u, t) ->
let f xu xt tt =
let f _ = f (A.sh2 u xu t xt x (B.cast a)) xu in
- assert_convertibility f ~si m xu tt xt
+ assert_convertibility err f st m xu tt xt
in
- let f xu _ = b_type_of (f xu) ~si g m t in
- type_of f ~si g m u
+ let f xu _ = b_type_of err (f xu) st g m t in
+ type_of err f st g m u
(* Interface functions ******************************************************)
-and type_of f ?(si=false) g m x =
+and type_of err f st g m x =
let f t u = L.unbox level; f t u in
- L.box level; b_type_of f ~si g m x
+ L.box level; b_type_of err f st g m x
projects / helm.git / blobdiff