- we are moving from old (patched) management of sort inclusion

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

diff --git a/helm/software/helena/src/basic_ag/bagReduction.ml b/helm/software/helena/src/basic_ag/bagReduction.ml
index 513c14e59240a3cf6a710d95194b1b0652afee06..c9cc85e9b391d6c8edfcde60353da9c6e9fd6933 100644 (file)
--- a/helm/software/helena/src/basic_ag/bagReduction.ml
+++ b/helm/software/helena/src/basic_ag/bagReduction.ml
@@ -15,7 +15,6 @@ module L  = Log
 module G  = Options
 module J  = Marks
 module E  = Entity
-module S  = Status
 module Z  = Bag
 module ZO = BagOutput
 module ZE = BagEnvironment
@@ -125,7 +124,7 @@ let rec ho_whd f c m x =
    whd aux c m x
    
 let ho_whd f st c t =
-   if !G.trace >= level then log1 st.S.lenv "Now scanning" c t;
+   if !G.trace >= level then log1 st "Now scanning" c t;
    ho_whd f c empty_machine t
 
 let rec are_convertible f st a c m1 t1 m2 t2 =
@@ -133,7 +132,7 @@ let rec are_convertible f st a c m1 t1 m2 t2 =
    let rec aux m1 r1 m2 r2 =
 (*   L.warn "entering R.are_convertible_aux"; *)
    let u, t = term_of_whdr r1, term_of_whdr r2 in
-   if !G.trace >= level then log2 st.S.lenv "Now really converting" c u c t;   
+   if !G.trace >= level then log2 st "Now really converting" c u c t;   
    match r1, r2 with
       | Sort_ h1, Sort_ h2                                 ->
          if h1 = h2 then f a else f false 
@@ -166,7 +165,7 @@ let rec are_convertible f st a c m1 t1 m2 t2 =
          let f r = if r then push "!" h c m1 a1 l w1 else f false in
         are_convertible f st a c m1 w1 m2 w2
 (* we detect the AUT-QE reduction rule for type/prop inclusion *)      
-      | Sort_ _, Bind_ (a2, l2, w2, t2) when st.S.si       ->
+      | Sort_ _, Bind_ (a2, l2, w2, t2) when !G.si         ->
         let m1, m2 = inc m1, inc m2 in
         let f c = are_convertible f st a c m1 (term_of_whdr r1) m2 t2 in
         push "nsi" f c m2 a2 l2 w2
@@ -190,5 +189,5 @@ and are_convertible_stacks f st a c m1 m2 =
       C.list_fold_left2 f map a m1.s m2.s
 
 let are_convertible f st c u t = 
-   if !G.trace >= level then log2 st.S.lenv "Now converting" c u c t;
+   if !G.trace >= level then log2 st "Now converting" c u c t;
    are_convertible f st true c empty_machine u empty_machine t