module C = Cps
module S = Share
module L = Log
+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 = {
+ c: 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 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)
-(* 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
- 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
- in
- lref_map (f c) map t
+let get err f m i =
+ B.get err f m.c i
(* 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 rec step f ?(delta=false) ?(rt=false) m x =
+(* L.warn "entering R.step"; *)
+ match x with
+ | B.Sort _ -> f m None x
+ | B.GRef (_, uri) ->
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
+ | _, _, 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
- 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
+ E.get_entry C.err f uri
+ | B.LRef (_, i) ->
+ let f c = function
+ | B.Abbr (_, v) ->
+ P.add ~ldelta:1 ();
+ step f ~delta ~rt {m with c = c} v
+ | B.Abst (_, w) when rt ->
+ P.add ~lrt:1 ();
+ step f ~delta ~rt {m with c = c} w
+ | 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) ->
+ 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) ->
+ begin match m.s with
+ | [] -> f 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)) *)
end
- | B.Bind (_, b, t) ->
- let f l = whd f {c with l = l} t in
- push_e f b c.l
-
-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
+ | B.Bind (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 push f m 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
+ 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)), _ ->
+ 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
+ else if e1 < e2 then begin
+ P.add ~gdelta:1 ();
+ step (ac_nfs err f ~si m1 a1 u) m2 v2
+ end else begin
+ P.add ~gdelta:1 ();
+ step (ac_nfs_rev err f ~si m2 a2 t) m1 v1
+ end
+ | _, _, Some (_, B.Abbr (_, v2)), _ ->
+ P.add ~gdelta:1 ();
+ step (ac_nfs err f ~si m1 a1 u) 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 ->
+ 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
+
+and ac err f ~si 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
+
+and ac_stacks err f 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
+ in
+ C.list_iter2 f map m1.s m2.s
(* Interface functions ******************************************************)
-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 empty_kam = {
+ c = B.empty_lenv; s = []; i = 0
+}
-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
+let get err f m i =
+ assert (m.s = []);
+ let f c = f in
+ get err f m i
-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 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 empty_context = {
- g = empty_e; l = empty_e; s = []
-}
+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 ()
+
+(* error reporting **********************************************************)
+
+let pp_term m frm t = O.specs.L.pp_term m.c frm t
-let iter f map c =
- let _, ge = c.g in
- C.list_iter f map ge
+let pp_lenv frm m = O.specs.L.pp_lenv frm m.c
+
+let specs = {
+ L.pp_term = pp_term; L.pp_lenv = pp_lenv
+}
projects / helm.git / blobdiff