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

diff --git a/helm/software/lambda-delta/basic_rg/brgReduction.ml b/helm/software/lambda-delta/basic_rg/brgReduction.ml
index 74f6a5048..1ae73652d 100644
--- a/helm/software/lambda-delta/basic_rg/brgReduction.ml
+++ b/helm/software/lambda-delta/basic_rg/brgReduction.ml
@@ -13,189 +13,198 @@ 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 environment = int * B.bind list
-
-type stack = B.term list
-
-type context = {
-   g: environment;
-   l: environment;
-   s: stack
+type kam = {
+   e: B.lenv;
+   s: (B.lenv * B.term) list;
+   i: int
 }
 
-exception LRefNotFound of (context, B.term) L.item list
-
-type whd_result =
-   | Sort_ of int
-   | LRef_ of int * B.term option
-   | GRef_ of int * B.bind
-   | Bind_ of B.term * B.term
-
-type ho_whd_result =
-   | Sort of int
-   | Abst of B.term
-
 (* Internal functions *******************************************************)
 
-let error i = raise (LRefNotFound (L.items1 (string_of_int i)))
-
-let empty_e = 0, []
-
-let push_e f b (l, e) =
-   f (succ l, b :: e)
-
-let get_e f c i =
-   let (gl, ge), (ll, le) = c.g, c.l in
-   if i >= gl + ll then error i;
-   let b =
-      if i < gl then List.nth ge (gl - (succ i)) 
-      else List.nth le (gl + ll - (succ i))
+let level = 5
+
+let log1 s c t =
+   let sc, st = s ^ " in the environment", "the term" in
+   L.log O.specs level (L.et_items1 sc c st t)
+
+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)
+      | B.LRef (_, p1), B.LRef (_, p2)         ->
+         if p1 = p2 then f () else err ()
+      | B.GRef (_, u1), B.GRef (_, u2)         ->
+         if U.eq u1 u2 then f () else err ()
+      | B.Cast (_, v1, t1), B.Cast (_, v2, 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) ->
+         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 ()
+      | _                                      -> err ()
    in
-   f b
-
-let rec lref_map_bind f map b = match b with
-   | B.Abbr v ->
-      let f v' = f (S.sh1 v v' b B.abbr) in
-      lref_map f map v      
-   | B.Abst w ->
-      let f w' = f (S.sh1 w w' b B.abst) in
-      lref_map f map w
-   | B.Void   -> f b
-
-and lref_map f map t = match t with
-   | B.LRef i          -> f (B.LRef (map i))
-   | B.GRef _          -> f t
-   | B.Sort _          -> f t
-   | B.Cast (w, u)     ->
-      let f w' u' = f (S.sh2 w w' u u' t B.cast) in
-      let f w' = lref_map (f w') map u in 
-      lref_map f map w
-   | B.Appl (w, u)     ->
-      let f w' u' = f (S.sh2 w w' u u' t B.appl) in
-      let f w' = lref_map (f w') map u in 
-      lref_map f map w
-   | B.Bind (id, b, u) ->
-      let f b' u' = f (S.sh2 b b' u u' t (B.bind id)) in
-      let f b' = lref_map (f b') map u in 
-      lref_map_bind f map b
+   if S.eq t1 t2 then f () else aux f (t1, t2)
+
+let get m i =
+   let _, c, a, b = B.get m.e i in c, a, b
 
 (* to share *)
-let lift f c = 
-   let (gl, _), (ll, le) = c.g, c.l in
-   let map i = if i >= gl then succ i else i in
-   let map f = function
-      | B.Abbr t -> let f t' = f (B.Abbr t') in lref_map f map t
-      | _       -> assert false
+let rec step st m x = 
+(*   L.warn "entering R.step"; *)
+   match x with
+   | 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 st {m with e = c} v
+	 | c, _, B.Abst w when st.Y.rt ->
+            P.add ~lrt:1 ();
+            step st {m with e = c} w
+	 | c, _, B.Void                ->
+	    assert false
+	 | 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 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
+         | []          -> m, None, x
+	 | (c, v) :: s ->
+            P.add ~beta:1 ~upsilon:(List.length s) ();
+	    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 (a, b, t)        ->
+      P.add ~upsilon:(List.length m.s) ();
+      let e = B.push m.e m.e a b in 
+      step st {m with e = e} t
+
+let push m a b = 
+   assert (m.s = []);
+   let a, i = match b with
+      | B.Abst _ -> Y.Apix m.i :: a, succ m.i
+      | b        -> a, m.i
    in
-   let f le' = f {c with l = (ll, le')} in
-   C.list_map f map le
-
-let xchg f c t =
-   let (gl, _), (ll, _) = c.g, c.l in
-   let map i =
-      if i < gl || i > gl + ll then i else
-      if i >= gl && i < gl + ll then succ i else gl
+   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
+	    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 ();
+	    ac_nfs st (m1, r1, u) (step st m2 v2)
+	 end else begin
+	    P.add ~gdelta:1 ();
+	    ac_nfs st (step st m1 v1) (m2, r2, t) 
+         end
+      | _, _, Some (_, _, B.Abbr v2), _                        ->
+         P.add ~gdelta:1 ();
+	 ac_nfs st (m1, r1, u) (step st m2 v2)      
+      | Some (_, _, B.Abbr v1), _, _, _                        ->
+         P.add ~gdelta:1 ();
+	 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 ();
+	 ac st (push m1 a b) u (push m2 a b) t
+      | _                                                      -> false
+
+and ac st m1 t1 m2 t2 =
+(*   L.warn "entering R.are_convertible"; *)
+   ac_nfs st (step st m1 t1) (step st 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 = {m1 with e = c1; s = []}, {m2 with e = c2; s = []} in
+      ac {st with Y.si = false} m1 v1 m2 v2
    in
-   lref_map (f c) map t
+   list_and map (m1.s, m2.s)
 
-(* to share *)
-let rec whd f c t = match t with
-   | B.Sort h                 -> f c (Sort_ h)
-   | B.GRef uri               ->
-      let f (i, _, b) = f c (GRef_ (i, b)) in
-      E.get_obj f uri
-   | B.LRef i                ->
-      let f = function
-         | B.Void   -> f c (LRef_ (i, None))
-	 | B.Abst t -> f c (LRef_ (i, Some t))
-	 | B.Abbr t -> whd f c t
-      in
-      get_e f c i
-   | B.Cast (_, t)           -> whd f c t
-   | B.Appl (v, t)           -> whd f {c with s = v :: c.s} t   
-   | B.Bind (_, B.Abst w, t) -> 
-      begin match c.s with
-         | []      -> f c (Bind_ (w, t))
-	 | v :: tl -> 
-	    let f tl l = whd f {c with l = l; s = tl} t in
-	    push_e (f tl) (B.Abbr v) c.l
-      end
-   | B.Bind (_, b, t) -> 
-      let f l = whd f {c with l = l} t in
-      push_e f b c.l
+(* Interface functions ******************************************************)
+
+let empty_kam = { 
+   e = B.empty; s = []; i = 0
+}
 
-let push f c t = 
-   assert (c.s = []);
-   let f c g = xchg f {c with g = g} t in
-   let f c = push_e (f c) B.Void c.g in
-   lift f c 
+let get m i =
+   assert (m.s = []);
+   let _, _, _, b = B.get m.e i in b
 
-(* Interface functions ******************************************************)
+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 rec are_convertible f c1 t1 c2 t2 =
-   let rec aux c1' r1 c2' r2 = match r1, r2 with
-      | Sort_ h1, Sort_ h2                           -> f (h1 = h2)
-      | LRef_ (i1, _), LRef_ (i2, _)                 ->
-         if i1 = i2 then are_convertible_stacks f c1' c2' else f false
-      | GRef_ (a1, B.Abst _), GRef_ (a2, B.Abst _)   ->
-         if a1 = a2 then are_convertible_stacks f c1' c2' else f false
-      | GRef_ (a1, B.Abbr v1), GRef_ (a2, B.Abbr v2) ->
-         if a1 = a2 then are_convertible_stacks f c1' c2' else
-	 if a1 < a2 then whd (aux c1' r1) c2' v2 else
-	 whd (aux_rev c2' r2) c1' v1
-      | _, GRef_ (_, B.Abbr v2)                      ->
-         whd (aux c1' r1) c2' v2
-      | GRef_ (_, B.Abbr v1), _                      ->
-	 whd (aux_rev c2' r2) c1' v1
-      | Bind_ (w1, t1), Bind_ (w2, t2)               ->
-         let f b = 
-	    if b then 
-	       let f c1'' t1' = push (are_convertible f c1'' t1') c2' t2 in
-               push f c1' t1
-	    else f false
-	 in
-	 are_convertible f c1' w1 c2' w2
-      | _                                              -> f false
-   and aux_rev c2 r2 c1 r1 = aux c1 r1 c2 r2 in
-   let f c1' r1 = whd (aux c1' r1) c2 t2 in 
-   whd f c1 t1
-
-and are_convertible_stacks f c1 c2 =
-   let map f v1 v2 = are_convertible f c1 v1 c2 v2 in
-   if List.length c1.s <> List.length c2.s then f false else
-   C.forall2 f map c1.s c2.s
-
-let are_convertible f c t1 t2 = are_convertible f c t1 c t2
-
-let rec ho_whd f c t =
-   let aux c' = function
-      | Sort_ h             -> f c' (Sort h)
-      | Bind_ (w, t)        -> f c' (Abst w)
-      | LRef_ (_, Some w)   -> ho_whd f c w
-      | GRef_ (_, B.Abst u) -> ho_whd f c u
-      | GRef_ (_, B.Abbr u) -> ho_whd f c u
-      | LRef_ (_, None)     -> assert false
-      | GRef_ (_, B.Void)   -> assert false
-   in
-   whd aux c t
+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 () *)
 
-let push f c b = 
-   assert (c.l = empty_e && c.s = []);
-   let f g = f {c with g = g} in
-   push_e f b c.g
+(* error reporting **********************************************************)
 
-let get f c i =
-   let gl, ge = c.g in
-   if i >= gl then error i;
-   f (List.nth ge (gl - (succ i)))
+let pp_term m frm t = O.specs.L.pp_term m.e frm t
 
-let empty_context = {
-   g = empty_e; l = empty_e; s = []
-}
+let pp_lenv frm m = O.specs.L.pp_lenv frm m.e
 
-let iter f map c =
-   let _, ge = c.g in   
-   C.list_iter f map ge
+let specs = {
+   L.pp_term = pp_term; L.pp_lenv = pp_lenv
+}