autItem : the uris of the objects involved in the implicit coercions

[helm.git] / helm / software / lambda-delta / basic_rg / brgType.ml

diff --git a/helm/software/lambda-delta/basic_rg/brgType.ml b/helm/software/lambda-delta/basic_rg/brgType.ml
index 50d20b7546b89a0b94e1cb96e27d65a5ce976fec..fb7862c242223dc32b3a618959fdd4cf06e723bd 100644 (file)
--- a/helm/software/lambda-delta/basic_rg/brgType.ml
+++ b/helm/software/lambda-delta/basic_rg/brgType.ml
@@ -9,8 +9,11 @@
      \ /   This software is distributed as is, NO WARRANTY.              
       V_______________________________________________________________ *)
 
+module U = NUri
+module S = Share
 module L = Log
 module H = Hierarchy
+module I = AutItem
 module B = Brg
 module O = BrgOutput
 module E = BrgEnvironment
@@ -28,17 +31,21 @@ let error1 s c t =
 let error2 s1 c1 t1 s2 c2 t2 =
    raise (TypeError (L.ct_items2 s1 c1 t1 s2 c2 t2))
 
+let mk_gref u l =
+   let map t v = B.Appl (v, t) in
+   List.fold_left map (B.GRef u) l
+
 (* Interface functions ******************************************************)
 
-let rec type_of f g c x = 
-   L.log O.specs level (L.ct_items1 "now checking" c x);
+let rec b_type_of f g c x = 
+   L.log O.specs level (L.ct_items1 "Now checking" c x);
    match x with
    | B.Sort h                 ->
-      let f h = f (B.Sort h) in H.apply f g h
+      let f h = f x (B.Sort h) in H.apply f g h
    | B.LRef i                 ->
       let f = function
-         | Some (_, B.Abst w)               -> f w
-        | Some (_, B.Abbr (B.Cast (w, v))) -> f w
+         | Some (_, B.Abst w)               -> f x w
+        | Some (_, B.Abbr (B.Cast (w, v))) -> f x w
         | Some (_, B.Abbr _)               -> assert false
         | Some (_, B.Void)                 -> 
            error1 "reference to excluded variable" c x
@@ -48,48 +55,65 @@ let rec type_of f g c x =
       B.get f c i
    | B.GRef uri               ->
       let f = function
-         | _, _, B.Abst w               -> f w
-        | _, _, B.Abbr (B.Cast (w, v)) -> f w
+         | _, _, B.Abst w               -> f x w
+        | _, _, B.Abbr (B.Cast (w, v)) -> f x w
         | _, _, B.Abbr _               -> assert false
         | _, _, B.Void                 ->
            error1 "reference to excluded object" c x
       in
-      E.get_obj f uri
-   | B.Bind (id, B.Abbr u, t) ->
-      let f tt = f (B.Bind (id, B.Abbr u, tt)) in
-      let f cc = type_of f g cc t in
-      let f u = B.push f c id (B.Abbr u) in
-      let f uu = match u with 
-        | B.Cast _ -> f u
-         | _        -> f (B.Cast (uu, u))
+      E.get_obj f uri   
+   | B.Bind (id, B.Abbr v, t) ->
+      let f xv xt tt =
+         f (S.sh2 v xv t xt x (B.bind_abbr id)) (B.bind_abbr id xv tt)
       in
-      type_of f g c u
+      let f xv cc = b_type_of (f xv) g cc t in
+      let f xv = B.push (f xv) c 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 g c v
    | B.Bind (id, B.Abst u, t) ->
-      let f tt = f (B.Bind (id, B.Abst u, tt)) in
-      let f cc = type_of f g cc t in
-      let f _ = B.push f c id (B.Abst u) in
+      let f xu xt tt =
+        f (S.sh2 u xu t xt x (B.bind_abst id)) (B.bind_abst id xu tt)
+      in
+      let f xu cc = b_type_of (f xu) g cc t in
+      let f xu _ = B.push (f xu) c id (B.Abst xu) in
       type_of f g c u
    | B.Bind (id, B.Void, t)   ->
-      let f tt = f (B.Bind (id, B.Void, tt)) in
-      let f cc = type_of f g cc t in
-      B.push f c id B.Void
+      let f xt tt = 
+         f (S.sh1 t xt x (B.bind id B.Void)) (B.bind id B.Void tt)
+      in
+      let f cc = b_type_of f g cc t in
+      B.push f c id B.Void   
    | B.Appl (v, t)            ->
-      let f tt cc = function
-         | R.Sort _ -> error1 "not a function" c t
+      let h xv vv xt tt cc = function
+         | R.Sort _ -> error1 "not a function" c xt
         | R.Abst w -> 
             L.log O.specs (succ level) (L.ct_items1 "Just scanned" cc w);
            let f b =
-              if b then f (B.Appl (v, tt)) else
-              error2 "the term" c v "must be of type" cc w
+              if b then f (S.sh2 v xv t xt x B.appl) (B.appl xv tt) else
+              error2 "the term" cc xv "must be of type" cc w
            in
-           type_of (R.are_convertible f cc w) g c v
+           R.are_convertible f cc w vv     
+      in
+      let f xv vv xt = function
+(* inserting a missing "modus ponens" *)      
+         | B.Appl (y2, B.Appl (y1, B.GRef u)) when U.eq u I.imp ->
+            b_type_of f g c (mk_gref I.mp [y1; y2; xv; xt])
+         | tt -> R.ho_whd (h xv vv xt tt) c tt
       in
-      let f tt = R.ho_whd (f tt) c t in
-      type_of f g c t 
+      let f xv vv = b_type_of (f xv vv) g c t in
+      type_of f g c v
    | B.Cast (u, t)            ->
-      let f b = 
-         if b then f u else
-        error2 "the term" c t "must be of type" c u
+      let f xu xt b = 
+         if b then f (S.sh2 u xu t xt x B.cast) xu else
+        error2 "the term" c xt "must be of type" c xu
       in
-      let f _ = type_of (R.are_convertible f c u) g c t in
+      let f xu xt tt = R.are_convertible (f xu xt) c xu tt in
+      let f xu _ = b_type_of (f xu) g c t in
       type_of f g c u
+
+and type_of f g c x =
+   let f t u = L.unbox (); f t u in
+   L.box (); b_type_of f g c x