X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fhelena%2Fsrc%2Fbasic_rg%2FbrgReduction.ml;h=ffe223ab5ba02de662a2eea8d134241b8b6fe2b9;hb=88977b2d546e547e23b046792fe2ad8f6ff192a4;hp=8747e6425dab62313088dd93f84d6328e0478e83;hpb=fec20705af4705f8eb9542aece87769b82a6a6b4;p=helm.git

diff --git a/helm/software/helena/src/basic_rg/brgReduction.ml b/helm/software/helena/src/basic_rg/brgReduction.ml
index 8747e6425..ffe223ab5 100644
--- a/helm/software/helena/src/basic_rg/brgReduction.ml
+++ b/helm/software/helena/src/basic_rg/brgReduction.ml
@@ -10,6 +10,7 @@
       V_______________________________________________________________ *)
 
 module U  = NUri
+module C  = Cps
 module S  = Share
 module L  = Log
 module G  = Options
@@ -44,10 +45,11 @@ let log2 st s cu u ct t =
    let s1, s2, s3 = s ^ " in the environment (expected)", "the term", "and in the environment (inferred)" in
    L.log st BO.specs (pred level) (L.et_items2 s1 cu s2 u ~sc2:s3 ~c2:ct s2 t)
 
-let rec list_and map = function
+let rec list_and f map = function
    | hd1 :: tl1, hd2 :: tl2 ->
-      if map hd1 hd2 then list_and map (tl1, tl2) else false
-   | l1, l2                 -> l1 = l2
+      let f b = f (b && map hd1 hd2) in
+      list_and f map (tl1, tl2)
+   | l1, l2                 -> f (l1 = l2)
 
 let zero = Some 0
 
@@ -91,9 +93,11 @@ let get m i =
    let _, c, a, _, b = B.get m.e i in c, a, b
 
 (* to share *)
-let rec step st m r = 
+let rec step st m r =
+IFDEF TRACE THEN
    if !G.ct >= sublevel then 
-   log1 st (Printf.sprintf "entering R.step: l=%u, n=%s," m.l (match m.n with Some n -> string_of_int n | None -> "infinite")) m.e r;
+   log1 st (Printf.sprintf "entering R.step: l=%u, n=%s," m.l (match m.n with Some n -> string_of_int n | None -> "infinite")) m.e r
+ELSE () END;
    match r with
    | B.Sort k                            ->
       if assert_tstep m false then
@@ -101,25 +105,31 @@ let rec step st m r =
       else m, r, None
    | B.GRef (_, u)                       ->
       begin match BE.get_entity u with
-         | _, a, _, E.Abbr v ->
+         | _, a, _, E.Abbr (_, v) ->
 	       m, B.gref a u, Some v
-         | _, _, _, E.Abst w ->
+         | _, _, _, E.Abst (_, w) ->
             if assert_tstep m true then begin
-               if !G.summary then O.add ~grt:1 (); 
+IFDEF SUMMARY THEN
+               if !G.summary then O.add ~grt:1 ()
+ELSE () END;
                step st (tstep m) w
             end else
 	       m, r, None   
-	 | _, _, _, E.Void   ->
+	 | _, _, _, E.Void        ->
             assert false
       end
    | B.LRef (_, i)                       ->
       begin match get m i with
 	 | c, _, B.Abbr v         ->
-	    if !G.summary then O.add ~ldelta:1 ();
+IFDEF SUMMARY THEN
+	    if !G.summary then O.add ~ldelta:1 ()
+ELSE () END; 
 	    step st {m with e = c} v
 	 | c, a, B.Abst (_, _, w) ->
             if assert_tstep m true then begin
-               if !G.summary then O.add ~lrt:1 ();
+IFDEF SUMMARY THEN
+               if !G.summary then O.add ~lrt:1 ()
+ELSE () END;
                step st {(tstep m) with e = c} w
             end else
 	       m, B.lref a i, None
@@ -128,17 +138,23 @@ let rec step st m r =
       end
    | B.Cast (u, t)                       ->
       if assert_tstep m false then begin
-         if !G.summary then O.add ~e:1 ();
+IFDEF SUMMARY THEN
+         if !G.summary then O.add ~e:1 ()
+ELSE () END;
          step st (tstep m) u
       end else begin
-         if !G.summary then O.add ~epsilon:1 ();
+IFDEF SUMMARY THEN
+         if !G.summary then O.add ~epsilon:1 ()
+ELSE () END;
          step st m t
       end
    | B.Appl (_, v, t)                    ->
       step st {m with s = (m.e, v) :: m.s} t   
    | B.Bind (y, B.Abst (false, n, w), t) ->
       let i = tsteps m in
-      if !G.summary then O.add ~x:i ();
+IFDEF SUMMARY THEN
+      if !G.summary then O.add ~x:i ()
+ELSE () END;
       let n = if i = 0 then n else N.minus st n i in
       let r = B.Bind (y, B.Abst (true, n, w), t) in
       step st m r
@@ -147,17 +163,23 @@ let rec step st m r =
          | []          ->
             m, B.Bind (y, B.Abst (true, n, w), t), None
 	 | (c, v) :: s ->
-	    if !G.summary then O.add ~beta:1 ~theta:(List.length s) ();
+IFDEF SUMMARY THEN
+	    if !G.summary then O.add ~beta:1 ~theta:(List.length s) ()
+ELSE () END;
 	    let v = B.Cast (w, v) in
             let e = B.push m.e c E.empty_node y (B.abbr v) in
 	    step st {m with e = e; s = s} t
       end else begin
-         if !G.summary then O.add ~upsilon:1 ();
+IFDEF SUMMARY THEN
+         if !G.summary then O.add ~upsilon:1 ()
+ELSE () END;
          let e = B.push m.e m.e E.empty_node y B.Void in (**) (* this is wrong in general *) 
          step st {m with e = e} t
       end
    | B.Bind (y, b, t)        ->
-      if !G.summary then O.add ~theta:(List.length m.s) ();
+IFDEF SUMMARY THEN
+      if !G.summary then O.add ~theta:(List.length m.s) ()
+ELSE () END;
       let e = B.push m.e m.e E.empty_node y b in 
       step st {m with e = e} t
 
@@ -176,7 +198,9 @@ let push m y b =
    {m with e = e; l = l}
 
 let rec ac_nfs st (m1, t1, r1) (m2, t2, r2) =
-   if !G.ct >= level then log2 st "Now converting nfs" m1.e t1 m2.e t2;
+IFDEF TRACE THEN
+   if !G.ct >= level then log2 st "Now converting nfs" m1.e t1 m2.e t2
+ELSE () END;
    match t1, r1, t2, r2 with
       | B.Sort k1, _, B.Sort k2, _                         ->
          k1 = k2
@@ -188,21 +212,31 @@ let rec ac_nfs st (m1, t1, r1) (m2, t2, r2) =
       | B.GRef ({E.n_apix = e1}, u1), Some v1, 
         B.GRef ({E.n_apix = e2}, u2), Some v2              ->
          if U.eq u1 u2 && assert_iterations m1 m2 && ac_stacks st m1 m2 then true
-         else if e1 < e2 then begin 
-            if !G.summary then O.add ~gdelta:1 ();
+         else if e1 < e2 then begin
+IFDEF SUMMARY THEN 
+            if !G.summary then O.add ~gdelta:1 ()
+ELSE () END;
 	    ac_nfs st (m1, t1, r1) (step st m2 v2)
 	 end else if e2 < e1 then begin
-	    if !G.summary then O.add ~gdelta:1 ();
+IFDEF SUMMARY THEN
+	    if !G.summary then O.add ~gdelta:1 ()
+ELSE () END;
 	    ac_nfs st (step st m1 v1) (m2, t2, r2) 
          end else begin
-	    if !G.summary then O.add ~gdelta:2 ();
+IFDEF SUMMARY THEN
+	    if !G.summary then O.add ~gdelta:2 ()
+ELSE () END;
 	    ac st m1 v1 m2 v2
          end
       | _, _, B.GRef _, Some v2                            ->
-         if !G.summary then O.add ~gdelta:1 ();
+IFDEF SUMMARY THEN
+         if !G.summary then O.add ~gdelta:1 ()
+ELSE () END;
 	 ac_nfs st (m1, t1, r1) (step st m2 v2)
       | B.GRef _, Some v1, _, _                            ->
-	 if !G.summary then O.add ~gdelta:1 ();
+IFDEF SUMMARY THEN
+	 if !G.summary then O.add ~gdelta:1 ()
+ELSE () END;
 	 ac_nfs st (step st m1 v1) (m2, t2, r2)
       | B.Bind (y1, (B.Abst (true, n1, w1) as b1), t1), _, 
         B.Bind (y2, (B.Abst (true, n2, w2) as b2), t2), _  ->
@@ -213,7 +247,9 @@ let rec ac_nfs st (m1, t1, r1) (m2, t2, r2) =
       | B.Sort _, _, B.Bind (y, B.Abst (true, n, _), t), _ ->
          if !G.si then
             if !G.cc && not (N.assert_zero st n) then false else begin
-	    if !G.summary then O.add ~upsilon:1 ();
+IFDEF SUMMARY THEN
+	    if !G.summary then O.add ~upsilon:1 ()
+ELSE () END;
 	    ac st (push m1 y B.Void) t1 (push m2 y B.Void) t end
          else false
       | _                                                  -> false
@@ -224,17 +260,18 @@ and ac st m1 t1 m2 t2 =
 
 and ac_stacks st m1 m2 =
 (*   L.warn "entering R.are_convertible_stacks"; *)
-   if List.length m1.s <> List.length m2.s then false else
    let map (c1, v1) (c2, v2) =
       let m1, m2 = reset m1 ~e:c1 zero, reset m2 ~e:c2 zero in
       ac st m1 v1 m2 v2
    in
-   list_and map (m1.s, m2.s)
+   list_and C.start map (m1.s, m2.s)
 
 let rec ih_nfs st (m, t, r) =
    match t, r with
       | B.GRef _, Some v ->
-	 if !G.summary then O.add ~gdelta:1 ();
+IFDEF SUMMARY THEN
+	 if !G.summary then O.add ~gdelta:1 ()
+ELSE () END;
 	 ih st m v
       | _                -> m, t
 
@@ -251,11 +288,15 @@ let get m i =
    let _, _, _, _, b = B.get m.e i in b
 
 let xwhd st m n t =
-   if !G.ct >= level then log1 st "Now scanning" m.e t;   
+IFDEF TRACE THEN
+   if !G.ct >= level then log1 st "Now scanning" m.e t
+ELSE () END;
    ih st (reset m n) t
 
 let are_convertible st m1 n1 t1 m2 n2 t2 = 
-   if !G.ct >= level then log2 st "Now converting" m1.e t1 m2.e t2;
+IFDEF TRACE THEN
+   if !G.ct >= level then log2 st "Now converting" m1.e t1 m2.e t2
+ELSE () END;   
    let r = ac st (reset m1 n1) t1 (reset m2 n2) t2 in
    r
 (*    let err _ = in