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 level = 4
let message1 st1 m t1 =
- L.ct_items1 "In the context" m st1 t1
+ L.et_items1 "In the environment" m st1 t1
let log1 s m t =
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 context", "the term", "is of type" in
+ let sm, st1, st2 = "In the environment", "the term", "is of type" in
match mu with
| Some mu ->
- let smu, st3 = "but in the context", "it must be of type" in
- L.ct_items3 sm m st1 t1 st2 t2 ~sc3:smu ~c3:mu st3 t3
+ let smu, st3 = "but in the environment", "it must be of type" in
+ L.et_items3 sm m st1 t1 st2 t2 ~sc3:smu ~c3:mu st3 t3
| None ->
let st3 = "but it must be of type" in
- L.ct_items3 sm m st1 t1 st2 t2 st3 t3
+ 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
+let assert_convertibility err f ~si m u w v =
+ let err _ = error3 err m v w u in
R.are_convertible err f ~si m u m w
-let assert_applicability f ~si m u w v =
+let assert_applicability err f ~si m u w v =
let f mu = function
+ | B.Sort _ -> error1 err "not a function type" m u
| B.Bind (B.Abst (_, u), _) ->
- let err _ = error3 m v w ~mu u in
+ let err _ = error3 err m v w ~mu u in
R.are_convertible err f ~si mu u m w
- | _ -> error1 "not a function type" m u
+ | _ -> assert false
in
R.xwhd f m u
-let rec b_type_of f ~si g m x =
+let rec b_type_of err f ~si g m x =
log1 "Now checking" m x;
match x with
| B.Sort (a, h) ->
S.lift (f x) (succ i) (0) w
| B.Abbr _ -> assert false
| B.Void _ ->
- error1 "reference to excluded variable" m x
+ error1 err "reference to excluded variable" m x
in
- let err _ = error1 "reference to unknown variable" m x in
+ let err _ = error1 err "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
+ | _, _, Y.Abst w -> f x w
+ | _, _, Y.Abbr (B.Cast (_, w, _)) -> f x w
+ | _, _, Y.Abbr _ -> assert false
in
- let err _ = error1 "reference to unknown object" m x in
- E.get_obj err f uri
+ let err _ = error1 err "reference to unknown entry" m x in
+ E.get_entity err f uri
| B.Bind (B.Abbr (a, 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 m = b_type_of err (f xv) ~si g m t in
let f xv = R.push (f xv) m (B.abbr a 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
+ type_of err f ~si g m v
| B.Bind (B.Abst (a, 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 m = b_type_of err (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
+ type_of err f ~si g m u
| B.Bind (B.Void a as b, t) ->
let f xt tt =
f (A.sh1 t xt x (B.bind b)) (B.bind b tt)
in
- let f m = b_type_of f ~si g m t in
+ let f m = b_type_of err f ~si g m t in
R.push f m b
| 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 ~si 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
+ let f xv vv = b_type_of err (f xv vv) ~si g m t in
+ type_of err f ~si 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 ~si 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) ~si g m t in
+ type_of err f ~si g m u
(* Interface functions ******************************************************)
-and type_of f ?(si=false) g m x =
+and type_of err f ?(si=false) 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 ~si g m x