- new attributes system

[helm.git] / helm / software / helena / src / basic_rg / brgReduction.ml

diff --git a/helm/software/helena/src/basic_rg/brgReduction.ml b/helm/software/helena/src/basic_rg/brgReduction.ml
index 09e262d12eb900caa58f02e4e825df3e4d6c69c2..f397c1c6f5c10ceac594ed4617ff6a164757b836 100644 (file)
--- a/helm/software/helena/src/basic_rg/brgReduction.ml
+++ b/helm/software/helena/src/basic_rg/brgReduction.ml
@@ -10,7 +10,6 @@
       V_______________________________________________________________ *)
 
 module U  = NUri
-module C  = Cps
 module W  = Share
 module L  = Log
 module H  = Hierarchy
@@ -98,19 +97,19 @@ let rec step st m x =
       else m, x, None
    | B.GRef (_, uri)              ->
       begin match BE.get_entity uri with
-         | _, _, E.Abbr v      ->
+         | _, _, _, E.Abbr v ->
             if st.S.delta then begin
               if !G.summary then O.add ~gdelta:1 ();
                step st m v
             end else
               m, x, Some v
-         | _, _, E.Abst (_, w) ->
+         | _, _, _, E.Abst w ->
             if assert_tstep m true then begin
                if !G.summary then O.add ~grt:1 (); 
                step st (tstep m) w
             end else
             m, x, None   
-        | _, _, E.Void        ->
+        | _, _, _, E.Void   ->
             assert false
       end
    | B.LRef (_, i)                ->
@@ -144,9 +143,9 @@ let rec step st m x =
             let n = N.minus n m.d in
             m, B.Bind (a, B.Abst (n, w), t), None
         | (c, v) :: s ->
-            if N.is_zero n then Q.add_nonzero st.S.cc a;
+(*            if N.is_zero n then Q.add_nonzero st.S.cc a; *)
            if !G.summary then O.add ~beta:1 ~theta:(List.length s) ();
-           let v = if assert_tstep m false then B.Cast ([], w, v) else v in
+           let v = if assert_tstep m false then B.Cast (E.empty_node, w, v) else v in
             let e = B.push m.e c a (B.abbr v) in
            step st {m with e = e; s = s} t
       end
@@ -163,9 +162,8 @@ let assert_iterations m1 m2 = match m1.n, m2.n with
       | _                -> false 
 
 let push m a b = 
-   assert (m.s = []);
    let a, l = match b with
-      | B.Abst _ -> E.Apix m.l :: a, succ m.l
+      | B.Abst _ -> {a with E.n_apix = Some m.l}, succ m.l
       | b        -> a, m.l
    in
    let e = B.push m.e m.e a b in
@@ -176,15 +174,13 @@ let rec ac_nfs st (m1, t1, r1) (m2, t2, r2) =
    match t1, r1, t2, r2 with
       | B.Sort (_, h1), _, B.Sort (_, h2), _                ->
          h1 = h2
-      | B.LRef (a1, _), _, B.LRef (a2, _), _                ->
-         let e1 = E.apix C.err C.start a1 in
-         let e2 = E.apix C.err C.start a2 in
+      | B.LRef ({E.n_apix = Some e1}, _), _, 
+        B.LRef ({E.n_apix = Some e2}, _), _                 ->
         if e1 = e2 then ac_stacks st m1 m2 else false
       | B.GRef (_, u1), None, B.GRef (_, u2), None          ->
         if U.eq u1 u2 && assert_iterations m1 m2 then ac_stacks st m1 m2 else false
-      | B.GRef (a1, u1), Some v1, B.GRef (a2, u2), Some v2  ->
-         let e1 = E.apix C.err C.start a1 in
-         let e2 = E.apix C.err C.start a2 in
+      | B.GRef ({E.n_apix = Some e1}, u1), Some v1, 
+        B.GRef ({E.n_apix = Some e2}, u2), Some v2          ->
          if e1 < e2 then begin 
             if !G.summary then O.add ~gdelta:1 ();
            ac_nfs st (m1, t1, r1) (step st m2 v2)
@@ -204,12 +200,12 @@ let rec ac_nfs st (m1, t1, r1) (m2, t2, r2) =
         ac_nfs st (step st m1 v1) (m2, t2, r2)
       | B.Bind (a1, (B.Abst (n1, w1) as b1), t1), _, 
         B.Bind (a2, (B.Abst (n2, w2) as b2), t2), _         ->
-        if n1 = n2 then () else Q.add_equal st.S.cc a1 a2;
+(*      if n1 = n2 then () else Q.add_equal st.S.cc a1 a2; *)
          if ac {st with S.si = false} (reset m1 zero) w1 (reset m2 zero) w2 then
            ac st (push m1 a1 b1) t1 (push m2 a2 b2) t2
         else false
       | B.Sort _, _, B.Bind (a, (B.Abst (n, _) as b), t), _ ->
-         if N.is_zero n then () else Q.add_zero st.S.cc a;
+(*         if N.is_zero n then () else Q.add_zero st.S.cc a; *)
         if !G.summary then O.add ~si:1 ();
         ac st (push m1 a b) t1 (push m2 a b) t
       | _                                                   -> false