new options activated

[helm.git] / helm / software / helena / src / basic_ag / bagType.ml

diff --git a/helm/software/helena/src/basic_ag/bagType.ml b/helm/software/helena/src/basic_ag/bagType.ml
index b6f3deb558624b69369345836b0cf539542c2169..009a2eaf9ec5e08d673881df3b43bdf6156fbc46 100644 (file)
--- a/helm/software/helena/src/basic_ag/bagType.ml
+++ b/helm/software/helena/src/basic_ag/bagType.ml
@@ -45,11 +45,11 @@ let mk_gref u l =
 
 let rec b_type_of err f st c x = 
 (*   L.warn "Entering T.b_type_of"; *)
-   if !G.trace >= level then log1 st "Now checking" c x;
+   if !G.ct >= level then log1 st "Now checking" c x;
    match x with
-   | Z.Sort h                    ->
+   | Z.Sort h                   ->
       let h = H.apply h in f x (Z.Sort h) 
-   | Z.LRef i                    ->
+   | Z.LRef i                   ->
       let err0 () = error1 err "variable not found" c x in
       let f _ = function
          | Z.Abst w               -> f x w
@@ -58,7 +58,7 @@ let rec b_type_of err f st c x =
         | Z.Void                 -> error1 err "reference to excluded variable" c x     
       in
       Z.get err0 f c i
-   | Z.GRef uri                  ->
+   | Z.GRef uri                 ->
       let f = function
          | _, _, _, E.Abst w               -> f x w
         | _, _, _, E.Abbr (Z.Cast (w, v)) -> f x w
@@ -90,10 +90,10 @@ let rec b_type_of err f st c x =
       in
       let f cc = b_type_of err f st cc t in
       Z.push "type void" f c a l Z.Void   
-   | Z.Appl (v, t)            ->
+   | Z.Appl (v, t)              ->
       let f xv vv xt tt = function
         | ZR.Abst w                             -> 
-           if !G.trace > level then L.log st ZO.specs level (L.t_items1 "Just scanned" c w);
+           if !G.ct > level then L.log st ZO.specs level (L.t_items1 "Just scanned" c w);
            let f a =                
 (*            L.warn (Printf.sprintf "Convertible: %b" a); *)
               if a then f (S.sh2 v xv t xt x Z.appl) (Z.appl xv tt)
@@ -106,7 +106,7 @@ let rec b_type_of err f st c x =
       let f xv vv xt tt = ZR.ho_whd (f xv vv xt tt) st c tt in
       let f xv vv = b_type_of err (f xv vv) st c t in
       type_of err f st c v
-   | Z.Cast (u, t)            ->
+   | Z.Cast (u, t)              ->
       let f xu xt tt a =  
          (* L.warn (Printf.sprintf "Convertible: %b" a); *)
         if a then f (S.sh2 u xu t xt x Z.cast) xu else error3 err c xt tt xu