X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Flambda-delta%2Fbasic_rg%2FbrgType.ml;h=79949a3a745753596a391a32f05f5c07f7ebde4e;hb=a22628e5de37d3ffe9de056d7683f2ebdf7226fb;hp=8c9996c22a3fbb000cd3a8f7d8717606052bf733;hpb=dcdee4ca839dac671924a95f0ada71faf06a8be4;p=helm.git

diff --git a/helm/software/lambda-delta/basic_rg/brgType.ml b/helm/software/lambda-delta/basic_rg/brgType.ml
index 8c9996c22..79949a3a7 100644
--- a/helm/software/lambda-delta/basic_rg/brgType.ml
+++ b/helm/software/lambda-delta/basic_rg/brgType.ml
@@ -11,115 +11,121 @@
 
 module U = NUri
 module C = Cps
-module S = Share
+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 B.message
+type message = (R.kam, B.term) Log.message
 
 (* Internal functions *******************************************************)
 
 let level = 4
 
-let log1 s c t =
-   let sc, st = s ^ " in the context", "the term" in
-   L.log O.specs level (L.ct_items1 sc c st t)
+let message1 st1 m t1 =
+   L.et_items1 "In the environment" m st1 t1
 
-let error1 st c t =
-   let sc = "In the context" in
-   raise (TypeError (L.ct_items1 sc c st t))
+let log1 s m t =
+   let s =  s ^ " the term" in
+   L.log R.specs level (message1 s m t) 
 
-let error3 c t1 t2 t3 =
-   let sc, st1, st2, st3 = 
-      "In the context", "the term", "is of type", "but must be of type"
-   in
-   raise (TypeError (L.ct_items3 sc c st1 t1 st2 t2 st3 t3))
+let error1 err s m t =
+   err (message1 s m t)
 
-(* Interface functions ******************************************************)
+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 si = ref false
+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 g c x = 
-(*   L.warn "Entering T.b_type_of"; *)
-   log1 "Now checking" c x;
+let rec b_type_of err f st g m x =
+   log1 "Now checking" m x;
    match x with
    | 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
-         | Some (_, B.Abst w)                  -> f x w
-	 | Some (_, B.Abbr (B.Cast (_, w, _))) -> f x w
-	 | Some (_, B.Abbr _)                  -> assert false
-	 | Some (_, B.Void)                    -> 
-	    error1 "reference to excluded variable" c x
-         | None                             ->
-	    error1 "variable not found" c x	 
-      in
-      B.get f c 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)         ->
-      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" c x
-      in
-      E.get_obj f 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 (S.sh2 v xv t xt x (B.bind_abbr a)) (B.bind_abbr a xv tt)
+         f (A.sh2 v xv t xt x (B.bind_abbr a)) (B.bind_abbr a xv tt)
       in
-      let f xv cc = b_type_of (f xv) g cc t in
-      let f xv = B.push (f xv) c a (B.Abbr 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 g c v
+      type_of err f st g m v
    | B.Bind (a, B.Abst 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 (A.sh2 u xu t xt x (B.bind_abst a)) (B.bind_abst a xu tt)
       in
-      let f xu cc = b_type_of (f xu) g cc t in
-      let f xu _ = B.push (f xu) c a (B.Abst xu) in
-      type_of f g c u
+      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 (S.sh1 t xt x (B.bind a B.Void)) (B.bind a B.Void tt)
+         f (A.sh1 t xt x (B.bind_void a)) (B.bind_void a tt)
       in
-      let f cc = b_type_of f g cc t in
-      B.push f c a B.Void   
+      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 = function
-	 | Some w -> 
-            L.box (succ level);
-	    L.log O.specs (succ level) (L.t_items1 "Just scanned" c w);
-	    L.unbox (succ level);
-	    let f r =
-(*	       L.warn (Printf.sprintf "Convertible: %b" a); *)
-	       if r then f (S.sh2 v xv t xt x (B.appl a)) (B.appl a xv tt)
-	       else error3 c xv vv w
-	    in
-	    R.are_convertible f ~si:!si c w vv
-	 | None   -> 
-	    error1 "not a function" c xt
+      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 xt tt = R.domain (f xv vv xt tt) c tt in
-      let f xv vv = b_type_of (f xv vv) g c t in
-      type_of f g c v
+      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 r =  
-         (* L.warn (Printf.sprintf "Convertible: %b" a); *)
-	 if r then f (S.sh2 u xu t xt x (B.cast a)) xu else error3 c xt tt xu
+      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 xt tt = R.are_convertible ~si:!si (f xu xt tt) c xu tt in
-      let f xu _ = b_type_of (f xu) g c t in
-      type_of f g c 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 g c 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 g c x
+   L.box level; b_type_of err f st g m x