X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;ds=sidebyside;f=helm%2Fsoftware%2Flambda-delta%2Fbasic_rg%2FbrgReduction.ml;h=1ae73652d7d9f0778cba8ec7b6705bd5ad3319a0;hb=a22628e5de37d3ffe9de056d7683f2ebdf7226fb;hp=e6ea501423b65792c82c084c3c3bc696cc01f521;hpb=79684e8bd0f54b5c88fff981366bd8c78dd0fbe9;p=helm.git

diff --git a/helm/software/lambda-delta/basic_rg/brgReduction.ml b/helm/software/lambda-delta/basic_rg/brgReduction.ml
index e6ea50142..1ae73652d 100644
--- a/helm/software/lambda-delta/basic_rg/brgReduction.ml
+++ b/helm/software/lambda-delta/basic_rg/brgReduction.ml
@@ -13,13 +13,14 @@ module U = NUri
 module C = Cps
 module S = Share
 module L = Log
+module Y = Entity
 module P = Output
 module B = Brg
 module O = BrgOutput
 module E = BrgEnvironment
 
 type kam = {
-   c: B.lenv;
+   e: B.lenv;
    s: (B.lenv * B.term) list;
    i: int
 }
@@ -36,6 +37,12 @@ let log2 s cu u ct t =
    let s1, s2, s3 = s ^ " in the environment", "the term", "and in the environment" in
    L.log O.specs level (L.et_items2 s1 cu s2 u ~sc2:s3 ~c2:ct s2 t)
 
+let rec list_and map = function
+   | hd1 :: tl1, hd2 :: tl2 ->
+      if map hd1 hd2 then list_and map (tl1, tl2) else false
+   | l1, l2                 -> l1 = l2
+
+(* check closure *)
 let are_alpha_convertible err f t1 t2 =
    let rec aux f = function
       | B.Sort (_, p1), B.Sort (_, p2)
@@ -47,160 +54,156 @@ let are_alpha_convertible err f t1 t2 =
       | B.Appl (_, v1, t1), B.Appl (_, v2, t2) ->
          let f _ = aux f (t1, t2) in
 	 aux f (v1, v2)
-      | B.Bind (b1, t1), B.Bind (b2, t2)       ->
+      | B.Bind (_, b1, t1), B.Bind (_, b2, t2) ->
          let f _ = aux f (t1, t2) in
 	 aux_bind f (b1, b2)
       | _                                      -> err ()
    and aux_bind f = function
-      | B.Abbr (_, v1), B.Abbr (_, v2)
-      | B.Abst (_, v1), B.Abst (_, v2)         -> aux f (v1, v2)
-      | B.Void _, B.Void _                     -> f ()
+      | B.Abbr v1, B.Abbr v2
+      | B.Abst v1, B.Abst v2                   -> aux f (v1, v2)
+      | B.Void, B.Void                         -> f ()
       | _                                      -> err ()
    in
    if S.eq t1 t2 then f () else aux f (t1, t2)
 
-let get err f m i =
-   B.get err f m.c i
+let get m i =
+   let _, c, a, b = B.get m.e i in c, a, b
 
 (* to share *)
-let rec step f ?(delta=false) ?(rt=false) m x = 
+let rec step st m x = 
 (*   L.warn "entering R.step"; *)
    match x with
-   | B.Sort _                  -> f m None x
-   | B.GRef (_, uri)           ->
-      let f = function
-         | _, _, B.Abbr (_, v) when delta ->
-	    P.add ~gdelta:1 (); step f ~delta ~rt m v
-         | _, _, B.Abst (_, w) when rt    ->
-            P.add ~grt:1 (); step f ~delta ~rt m w	 
-	 | _, _, B.Void _                 ->
-	    assert false
-	 | e, _, b                        ->
-	    f m (Some (e, b)) x
-      in
-      E.get_entry C.err f uri
-   | B.LRef (_, i)             ->
-      let f c = function
-	 | B.Abbr (_, v)         ->
+   | B.Sort _                -> m, None, x
+   | B.GRef (_, uri)         ->
+      begin match E.get_entity uri with
+         | _, _, Y.Abbr v when st.Y.delta ->
+	    P.add ~gdelta:1 (); step st m v
+         | _, _, Y.Abst w when st.Y.rt    ->
+            P.add ~grt:1 (); step st m w	 
+	 | a, _, Y.Abbr v                 ->
+	    let e = Y.apix C.err C.start a in
+	    m, Some (e, a, B.Abbr v), x   
+	 | a, _, Y.Abst w                 ->
+	    let e = Y.apix C.err C.start a in
+	    m, Some (e, a, B.Abst w), x
+	 | _, _, Y.Void                   -> assert false
+      end
+   | B.LRef (_, i)           ->
+      begin match get m i with
+	 | c, _, B.Abbr v              ->
 	    P.add ~ldelta:1 ();
-	    step f ~delta ~rt {m with c = c} v
-	 | B.Abst (_, w) when rt ->
+	    step st {m with e = c} v
+	 | c, _, B.Abst w when st.Y.rt ->
             P.add ~lrt:1 ();
-            step f ~delta ~rt {m with c = c} w
-	 | B.Void _              ->
+            step st {m with e = c} w
+	 | c, _, B.Void                ->
 	    assert false
-	 | B.Abst (a, _) as b    ->
-	    let f e = f {m with c = c} (Some (e, b)) x in 
-	    B.apix C.err f a
-      in 
-      get C.err f m i
-   | B.Cast (_, _, t)          ->
+	 | c, a, (B.Abst _ as b)       ->
+	    let e = Y.apix C.err C.start a in
+	    {m with e = c}, Some (e, a, b), x
+      end
+   | B.Cast (_, _, t)        ->
       P.add ~tau:1 ();
-      step f ~delta ~rt m t
-   | B.Appl (_, v, t)          ->
-      step f ~delta ~rt {m with s = (m.c, v) :: m.s} t   
-   | B.Bind (B.Abst (a, w), t) ->
+      step st m t
+   | B.Appl (_, v, t)        ->
+      step st {m with s = (m.e, v) :: m.s} t   
+   | B.Bind (a, B.Abst w, t) ->
       begin match m.s with
-         | []          -> f m None x
+         | []          -> m, None, x
 	 | (c, v) :: s ->
             P.add ~beta:1 ~upsilon:(List.length s) ();
-	    let f c = step f ~delta ~rt {m with c = c; s = s} t in 
-	    B.push f m.c ~c (B.abbr a v) (* (B.Cast ([], w, v)) *)
+	    let e = B.push m.e c a (B.abbr v) (* (B.Cast ([], w, v)) *) in 
+	    step st {m with e = e; s = s} t
       end
-   | B.Bind (b, t)             ->
+   | B.Bind (a, b, t)        ->
       P.add ~upsilon:(List.length m.s) ();
-      let f c = step f ~delta ~rt {m with c = c} t in
-      B.push f m.c ~c:m.c b
+      let e = B.push m.e m.e a b in 
+      step st {m with e = e} t
 
-let push f m b = 
+let push m a b = 
    assert (m.s = []);
-   let b, i = match b with
-      | B.Abst (a, w) -> B.abst (B.Apix m.i :: a) w, succ m.i
-      | b             -> b, m.i
+   let a, i = match b with
+      | B.Abst _ -> Y.Apix m.i :: a, succ m.i
+      | b        -> a, m.i
    in
-   let f c = f {m with c = c; i = i} in
-   B.push f m.c ~c:m.c b
-
-let rec ac_nfs err f ~si m1 a1 u m2 a2 t =
-   log2 "Now converting nfs" m1.c u m2.c t;
-   match a1, u, a2, t with
-      | _, B.Sort (_, h1), _, B.Sort (_, h2)                       ->
-         if h1 = h2 then f () else err () 
-      | Some (e1, B.Abst _), _, Some (e2, B.Abst _), _             ->
-	 if e1 = e2 then ac_stacks err f m1 m2 else err ()
-      | Some (e1, B.Abbr (_, v1)), _, Some (e2, B.Abbr (_, v2)), _ ->
+   let e = B.push m.e m.e a b in
+   {m with e = e; i = i}
+
+let rec ac_nfs st (m1, r1, u) (m2, r2, t) =
+   log2 "Now converting nfs" m1.e u m2.e t;
+   match r1, u, r2, t with
+      | _, B.Sort (_, h1), _, B.Sort (_, h2)                   ->
+         h1 = h2  
+      | Some (e1, _, B.Abst _), _, Some (e2, _, B.Abst _), _   ->
+	 if e1 = e2 then ac_stacks st m1 m2 else false
+      | Some (e1, _, B.Abbr v1), _, Some (e2, _, B.Abbr v2), _ ->
          if e1 = e2 then
-	    let err _ = P.add ~gdelta:2 (); ac err f ~si m1 v1 m2 v2 in
-	    ac_stacks err f m1 m2
+	    if ac_stacks st m1 m2 then true else begin
+	       P.add ~gdelta:2 (); ac st m1 v1 m2 v2
+	    end
 	 else if e1 < e2 then begin 
             P.add ~gdelta:1 ();
-	    step (ac_nfs err f ~si m1 a1 u) m2 v2
+	    ac_nfs st (m1, r1, u) (step st m2 v2)
 	 end else begin
 	    P.add ~gdelta:1 ();
-	    step (ac_nfs_rev err f ~si m2 a2 t) m1 v1
+	    ac_nfs st (step st m1 v1) (m2, r2, t) 
          end
-      | _, _, Some (_, B.Abbr (_, v2)), _                          ->
+      | _, _, Some (_, _, B.Abbr v2), _                        ->
          P.add ~gdelta:1 ();
-         step (ac_nfs err f ~si m1 a1 u) m2 v2      
-      | Some (_, B.Abbr (_, v1)), _, _, _                          ->
+	 ac_nfs st (m1, r1, u) (step st m2 v2)      
+      | Some (_, _, B.Abbr v1), _, _, _                        ->
          P.add ~gdelta:1 ();
-	 step (ac_nfs_rev err f ~si m2 a2 t) m1 v1            
-      | _, B.Bind ((B.Abst (_, w1) as b1), t1), 
-        _, B.Bind ((B.Abst (_, w2) as b2), t2)                     ->
-	 let f m1 m2 = ac err f ~si m1 t1 m2 t2 in
-         let f m1 = push (f m1) m2 b2 in 
-	 let f _ = push f m1 b1 in
-	 ac err f ~si:false m1 w1 m2 w2      
-      | _, B.Sort _, _, B.Bind (b, t) when si                      ->
+	 ac_nfs st (step st m1 v1) (m2, r2, t)             
+      | _, B.Bind (a1, (B.Abst w1 as b1), t1), 
+        _, B.Bind (a2, (B.Abst w2 as b2), t2)                  ->
+	 if ac {st with Y.si = false} m1 w1 m2 w2 then
+	    ac st (push m1 a1 b1) t1 (push m2 a2 b2) t2
+	 else false
+      | _, B.Sort _, _, B.Bind (a, b, t) when st.Y.si          ->
 	 P.add ~si:1 ();
-	 let f m1 m2 = ac err f ~si m1 u m2 t in
-	 let f m1 = push (f m1) m2 b in
-	 push f m1 b
-      | _                                                          -> err ()
-
-and ac_nfs_rev err f ~si m2 a2 t m1 a1 u = ac_nfs err f ~si m1 a1 u m2 a2 t
+	 ac st (push m1 a b) u (push m2 a b) t
+      | _                                                      -> false
 
-and ac err f ~si m1 t1 m2 t2 =
+and ac st m1 t1 m2 t2 =
 (*   L.warn "entering R.are_convertible"; *)
-   let f m1 a1 t1 = step (ac_nfs err f ~si m1 a1 t1) m2 t2 in 
-   step f m1 t1
+   ac_nfs st (step st m1 t1) (step st m2 t2)
 
-and ac_stacks err f m1 m2 =
+and ac_stacks st m1 m2 =
 (*   L.warn "entering R.are_convertible_stacks"; *)
-   if List.length m1.s <> List.length m2.s then err () else
-   let map f (c1, v1) (c2, v2) =
-      let m1, m2 = {m1 with c = c1; s = []}, {m2 with c = c2; s = []} in
-      ac err f ~si:false m1 v1 m2 v2
+(*   if List.length m1.s <> List.length m2.s then false else *)
+   let map (c1, v1) (c2, v2) =
+      let m1, m2 = {m1 with e = c1; s = []}, {m2 with e = c2; s = []} in
+      ac {st with Y.si = false} m1 v1 m2 v2
    in
-   C.list_iter2 f map m1.s m2.s
+   list_and map (m1.s, m2.s)
 
 (* Interface functions ******************************************************)
 
 let empty_kam = { 
-   c = B.empty_lenv; s = []; i = 0
+   e = B.empty; s = []; i = 0
 }
 
-let get err f m i =
+let get m i =
    assert (m.s = []);
-   let f c = f in
-   get err f m i
+   let _, _, _, b = B.get m.e i in b
 
-let xwhd f m t =
-   L.box level; log1 "Now scanning" m.c t;
-   let f m _ t = L.unbox level; f m t in
-   step f ~delta:true ~rt:true m t
+let xwhd st m t =
+   L.box level; log1 "Now scanning" m.e t;   
+   let m, _, t = step {st with Y.delta = true; Y.rt = true} m t in
+   L.unbox level; m, t
 
-let are_convertible err f ?(si=false) mu u mw w = 
-      L.box level; log2 "Now converting" mu.c u mw.c w;
-      let f x = L.unbox level; f x in
-      let err _ = ac err f ~si mu u mw w in
-(*      if S.eq mu mw then are_alpha_convertible err f u w else *) err ()
+let are_convertible st mu u mw w = 
+   L.box level; log2 "Now converting" mu.e u mw.e w;
+   let r = ac {st with Y.delta = false; Y.rt = false} mu u mw w in   
+   L.unbox level; r
+(*    let err _ = in 
+      if S.eq mu mw then are_alpha_convertible err f u w else err () *)
 
 (* error reporting **********************************************************)
 
-let pp_term m frm t = O.specs.L.pp_term m.c frm t
+let pp_term m frm t = O.specs.L.pp_term m.e frm t
 
-let pp_lenv frm m = O.specs.L.pp_lenv frm m.c
+let pp_lenv frm m = O.specs.L.pp_lenv frm m.e
 
 let specs = {
    L.pp_term = pp_term; L.pp_lenv = pp_lenv