X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Flambda-delta%2Fbasic_rg%2FbrgType.ml;h=8b119e5e25aa165cabc483a3ad48faf13aa11295;hb=e17c4da82bd52712f03c112660c52eb8f1783843;hp=d10ddefaa3a6209f689eea0214e62d32a62c4977;hpb=f3b4d265268a43ca98e6843b733109fdfe3f6b0b;p=helm.git

diff --git a/helm/software/lambda-delta/basic_rg/brgType.ml b/helm/software/lambda-delta/basic_rg/brgType.ml
index d10ddefaa..8b119e5e2 100644
--- a/helm/software/lambda-delta/basic_rg/brgType.ml
+++ b/helm/software/lambda-delta/basic_rg/brgType.ml
@@ -9,53 +9,123 @@
      \ /   This software is distributed as is, NO WARRANTY.              
       V_______________________________________________________________ *)
 
+module U = NUri
+module C = Cps
+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
 
-exception TypeError of string Lazy.t
+type message = (R.kam, B.term) Log.message
 
 (* Internal functions *******************************************************)
 
-let error msg = raise (TypeError (lazy msg))
+let level = 4
 
-(* Interface functions ******************************************************)
+let message1 st1 m 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 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
+   match mu with
+      | Some mu ->
+         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.et_items3 sm m st1 t1 st2 t2 st3 t3
+   
+let error3 err m t1 t2 ?mu t3 =
+   err (message3 m t1 t2 ?mu t3)
+
+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 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 type_of f g c = function
-   | B.Sort h             -> f (B.Sort (g h))
-   | B.LRef i             ->
-      let f = function
-         | B.Abst, w             -> f w
-	 | B.Abbr, B.Cast (w, v) -> f w
-	 | B.Abbr, _             -> error "lref"
+let rec b_type_of err f st m x =
+   log1 "Now checking" m x;
+   match x with
+   | B.Sort (a, h)           ->
+      let h = H.apply h in f x (B.Sort (a, h)) 
+   | 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
-      R.get f c i
-   | B.GRef uri           ->
-      let f = function
-         | _, _, B.Abst, w             -> f w
-	 | _, _, B.Abbr, B.Cast (w, v) -> f w
-	 | _, _, B.Abbr, _             -> error "gref"
+      let f xv m = b_type_of err (f xv) st 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
-      E.get_obj f uri
-   | B.Bind (id, b, u, t) ->
-      let f uu tt = match b, t with 
-         | B.Abst, _ 
-	 | B.Abbr, B.Cast _ -> f (B.Bind (id, b, u, tt))
-         | _                -> f (B.Bind (id, b, B.Cast (uu, u), tt))
+      type_of err f st 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 uu cc = type_of (f uu) g cc t in
-      let f uu = R.push (f uu) c b u in
-      type_of f g c u
-   | B.Appl (v, t)        ->
-      let f tt cc = function
-         | R.Sort _ -> error "appl"
-	 | R.Abst w -> 
-	    let f b = if b then f (B.Appl (v, tt)) else error "appl_cast" in
-	    type_of (R.are_convertible f cc w) g c v
+      let f xu m = b_type_of err (f xu) st m t in
+      let f xu _ = f xu (R.push m a (B.abst xu)) in
+      type_of err f st m u
+   | B.Bind (a, B.Void, t)   ->
+      let f xt tt = 
+         f (A.sh1 t xt x (B.bind_void a)) (B.bind_void a tt)
       in
-      let f tt = R.ho_whd (f tt) c t in
-      type_of f g c t 
-   | B.Cast (u, t)        ->
-      let f b = if b then f u else error "cast" in
-      let f _ = type_of (R.are_convertible f c u) g c t in
-      type_of f g c u
+      b_type_of err f st (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 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 (A.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
+      type_of err f st m u
+
+(* Interface functions ******************************************************)
+
+and type_of err f st m x =
+   let f t u = L.unbox level; f t u in
+   L.box level; b_type_of err f st m x