...

[helm.git] / helm / software / lambda-delta / basic_ag / bagType.ml

diff --git a/helm/software/lambda-delta/basic_ag/bagType.ml b/helm/software/lambda-delta/basic_ag/bagType.ml
index 0520883d50a815b75d7b7374f4ed1633cdaa67d9..c398e034dfeefb5c2e34328f4b575d63946b381d 100644 (file)
--- a/helm/software/lambda-delta/basic_ag/bagType.ml
+++ b/helm/software/lambda-delta/basic_ag/bagType.ml
@@ -19,8 +19,6 @@ module O = BagOutput
 module E = BagEnvironment
 module R = BagReduction
 
-exception TypeError of B.message
-
 (* Internal functions *******************************************************)
 
 let level = 4
@@ -31,13 +29,13 @@ let log1 s c t =
 
 let error1 st c t =
    let sc = "In the context" in
-   raise (TypeError (L.ct_items1 sc c st t))
+   raise (R.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))
+   raise (R.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
@@ -45,7 +43,8 @@ let mk_gref u l =
 
 (* Interface functions ******************************************************)
 
-let rec b_type_of f g c x = 
+let rec b_type_of f ~si g c x = 
+(*   L.warn "Entering T.b_type_of"; *)
    log1 "Now checking" c x;
    match x with
    | B.Sort h                    ->
@@ -74,26 +73,26 @@ let rec b_type_of f g c x =
       let f xv xt tt =
          f (S.sh2 v xv t xt x (B.bind_abbr l id)) (B.bind_abbr l id xv tt)
       in
-      let f xv cc = b_type_of (f xv) g cc t in
-      let f xv = B.push (f xv) c l id (B.Abbr xv) in
+      let f xv cc = b_type_of (f xv) ~si g cc t in
+      let f xv = B.push "type abbr" (f xv) c l 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
+      type_of f ~si g c v
    | B.Bind (l, id, B.Abst u, t) ->
       let f xu xt tt =
         f (S.sh2 u xu t xt x (B.bind_abst l id)) (B.bind_abst l 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 l id (B.Abst xu) in
-      type_of f g c u
+      let f xu cc = b_type_of (f xu) ~si g cc t in
+      let f xu _ = B.push "type abst" (f xu) c l id (B.Abst xu) in
+      type_of f ~si g c u
    | B.Bind (l, id, B.Void, t)   ->
       let f xt tt = 
          f (S.sh1 t xt x (B.bind l id B.Void)) (B.bind l id B.Void tt)
       in
-      let f cc = b_type_of f g cc t in
-      B.push f c l id B.Void   
+      let f cc = b_type_of f ~si g cc t in
+      B.push "type void" f c l id B.Void   
    | B.Appl (v, t)            ->
       let f xv vv xt tt = function
         | R.Abst w                             -> 
@@ -101,30 +100,26 @@ let rec b_type_of f g c x =
            L.log O.specs (succ level) (L.t_items1 "Just scanned" c w);
            L.unbox (succ level);
            let f a =                
-               L.box (succ level);
-              L.warn (Printf.sprintf "Convertible: %b" a); 
-              L.unbox (succ level);
+(*            L.warn (Printf.sprintf "Convertible: %b" a); *)
               if a then f (S.sh2 v xv t xt x B.appl) (B.appl xv tt)
               else error3 c xv vv w
            in
-           R.are_convertible f c w vv
+           R.are_convertible f ~si c w vv
         | _                                    -> 
            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
+      let f xv vv = b_type_of (f xv vv) ~si g c t in
+      type_of f ~si g c v
    | B.Cast (u, t)            ->
       let f xu xt tt a =  
-               L.box (succ level);
-              L.warn (Printf.sprintf "Convertible: %b" a); 
-              L.unbox (succ level);         
+         (* L.warn (Printf.sprintf "Convertible: %b" a); *)
         if a then f (S.sh2 u xu t xt x B.cast) xu else error3 c xt tt xu
       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
+      let f xu xt tt = R.are_convertible (f xu xt tt) ~si c xu tt in
+      let f xu _ = b_type_of (f xu) ~si g c t in
+      type_of f ~si g c u
 
-and type_of f g c x =
+and type_of f ?(si=false) g c 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 f ~si g c x