X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Flambda-delta%2Fbasic_ag%2FbagType.ml;h=9bae115df0594f38e0ba948a738e97b1f33cd029;hb=ae63e62aaf5659fe6b0e48cc4a4bdcf7b57318ad;hp=80b883ff44612101b47dcead611ef55aa88b438a;hpb=4924ddb52a836eea45a593a7f4faccca64bac9e7;p=helm.git

diff --git a/helm/software/lambda-delta/basic_ag/bagType.ml b/helm/software/lambda-delta/basic_ag/bagType.ml
index 80b883ff4..9bae115df 100644
--- a/helm/software/lambda-delta/basic_ag/bagType.ml
+++ b/helm/software/lambda-delta/basic_ag/bagType.ml
@@ -26,11 +26,19 @@ exception TypeError of B.message
 
 let level = 4
 
-let error1 s c t =
-   raise (TypeError (L.ct_items1 s c t))
+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 error2 s1 c1 t1 s2 c2 t2 =
-   raise (TypeError (L.ct_items2 s1 c1 t1 s2 c2 t2))
+let error1 st c t =
+   let sc = "In the context" in
+   raise (TypeError (L.ct_items1 sc c st 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 mk_gref u l =
    let map t v = B.Appl (v, t) in
@@ -55,6 +63,7 @@ let add_coercion f t (i, uri, vs) =
          add f v
       | B.Bind (l, _, _, _) when i = l -> 
          if U.eq uri I.imp then f (mk_gref I.mt (vs @ [x])) else
+         if U.eq uri I.all then f (mk_gref I.alli (vs @ [x])) else
 	 assert false
       | B.Bind (l, id, B.Abst w, t)    ->
          let f ww =
@@ -79,7 +88,7 @@ let add_coercions f = C.list_fold_left f add_coercion
 (* Interface functions ******************************************************)
 
 let rec b_type_of f g c x = 
-   L.log O.specs level (L.ct_items1 "Now checking" c x);
+   log1 "Now checking" c x;
    match x with
    | B.Sort h                    ->
       let f h = f x (B.Sort h) in H.apply f g h
@@ -128,41 +137,46 @@ let rec b_type_of f g c x =
       let f cc = b_type_of f g cc t in
       B.push f c l id B.Void   
    | B.Appl (v, t)            ->
-      let h xv vv xt tt cc = function
-         | R.Sort _ -> error1 "not a function" c xt
-	 | R.Abst w -> 
+      let f xv vv xt tt = function
+	 | R.Abst w                             -> 
             L.box (succ level);
-	    L.log O.specs (succ level) (L.ct_items1 "Just scanned" cc w);
+	    L.log O.specs (succ level) (L.t_items1 "Just scanned" c w);
 	    L.unbox (succ level);
 	    let f = function
-	       | Some l -> f (S.sh2 v xv t xt x B.appl) (B.appl xv tt)
-	       | None   -> error2 "the term" cc xv "must be of type" cc w
+               | Some [] -> f (S.sh2 v xv t xt x B.appl) (B.appl xv tt)
+	       | Some l  ->
+	          L.log O.specs level (L.items1 "Rechecking coerced term");
+		  let f xv = b_type_of f g c (S.sh2 v xv t xt x B.appl) in
+	          add_coercions f xv l
+	       | None   -> error3 c xv vv w
 	    in
-	    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 uri)) when U.eq uri I.imp ->
-            b_type_of f g c (mk_gref I.mp [y1; y2; xv; xt])
-         | B.Appl (y1, B.GRef uri) when U.eq uri I.not ->
-            b_type_of f g c (mk_gref I.mp [y1; B.GRef I.con; xv; xt])	 
-	 | tt -> R.ho_whd (h xv vv xt tt) c tt
+	    R.are_convertible f c w vv
+(* inserting a missing "modus ponens" *)
+	 | R.GRef (uri, vs) when U.eq uri I.imp && !R.ext = R.No ->
+	    L.log O.specs level (L.items1 "Rechecking coerced term");
+	    b_type_of f g c (mk_gref I.mp (vs @ [xv; xt]))
+	 | R.GRef (uri, vs) when U.eq uri I.all && !R.ext = R.No ->
+	    L.log O.specs level (L.items1 "Rechecking coerced term");
+	    b_type_of f g c (mk_gref I.alle (vs @ [xt; xv]))
+	 | _                                    -> 
+	    error1 "not a function" c xt
       in
+      let f xv vv xt tt = R.ho_whd (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
    | B.Cast (u, t)            ->
-      let f xu xt = function 
+      let f xu xt tt = function 
          | Some [] -> f (S.sh2 u xu t xt x B.cast) xu
 	 | Some l  ->
-	    let f xt = type_of f g c (S.sh2 u xu t xt x B.cast) in
+	    L.log O.specs level (L.items1 "Rechecking coerced term");
+	    let f xt = b_type_of f g c (S.sh2 u xu t xt x B.cast) in
 	    add_coercions f xt l
-	 | None    -> error2 "the term" c xt "must be of type" c xu
+	 | None    -> error3 c xt tt xu
       in
-      let f xu xt tt = R.are_convertible (f xu xt) c xu tt in
+      let f xu xt tt = R.are_convertible (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
 
 and type_of f g c x =
    let f t u = L.unbox level; f t u in
    L.box level; b_type_of f g c x
-