update in helena

[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 1f47b60ddc4a005fac7ebeaff5f5362abaa74c3a..c7ecb151259e890a5fa6cd68ac2452fe2db93c2c 100644 (file)
--- a/helm/software/helena/src/basic_ag/bagType.ml
+++ b/helm/software/helena/src/basic_ag/bagType.ml
@@ -21,6 +21,8 @@ module ZO = BagOutput
 module ZE = BagEnvironment
 module ZR = BagReduction
 
+IFDEF TYPE THEN
+
 (* Internal functions *******************************************************)
 
 let level = 4
@@ -45,7 +47,9 @@ let mk_gref u l =
 
 let rec b_type_of err f st c x = 
 (*   L.warn "Entering T.b_type_of"; *)
-   if !G.ct >= level then log1 st "Now checking" c x;
+IFDEF TRACE THEN
+   if !G.ct >= level then log1 st "Now checking" c x
+ELSE () END;
    match x with
    | Z.Sort h                   ->
       let h = H.apply h in f x (Z.Sort h) 
@@ -60,10 +64,10 @@ let rec b_type_of err f st c x =
       Z.get err0 f c i
    | Z.GRef uri                 ->
       let f = function
-         | _, _, _, E.Abst w               -> f x w
-        | _, _, _, E.Abbr (Z.Cast (w, v)) -> f x w
-        | _, _, _, E.Abbr _               -> assert false
-        | _, _, _, E.Void                 -> assert false
+         | _, _, _, E.Abst (_, w)             -> f x w
+        | _, _, _, E.Abbr (_, Z.Cast (w, v)) -> f x w
+        | _, _, _, E.Abbr _                  -> assert false
+        | _, _, _, E.Void                    -> assert false
       in
       ZE.get_entity f uri   
    | Z.Bind (y, l, Z.Abbr v, t) ->
@@ -93,7 +97,9 @@ let rec b_type_of err f st c x =
    | Z.Appl (v, t)              ->
       let f xv vv xt tt = function
         | ZR.Abst w -> 
-           if !G.ct > level then L.log st ZO.specs level (L.t_items1 "Just scanned" c w);
+IFDEF TRACE THEN
+           if !G.ct > level then L.log st ZO.specs level (L.t_items1 "Just scanned" c w)
+ELSE () END;
            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)
@@ -118,3 +124,5 @@ let rec b_type_of err f st c x =
 (* Interface functions ******************************************************)
 
 and type_of err f st c x = b_type_of err f st c x
+
+END