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)
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 f c b = c, b in
+ B.get C.err f m.c i
(* 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.Sort _ -> m, None, x
| B.GRef (_, uri) ->
- let f = function
- | _, _, Y.Abbr v when delta ->
- P.add ~gdelta:1 (); step f ~delta ~rt m v
- | _, _, Y.Abst w when rt ->
- P.add ~grt:1 (); step f ~delta ~rt m w
- | a, _, Y.Abbr v ->
- let f e = f m (Some (e, B.Abbr (a, v))) x in
- Y.apix C.err f a
- | a, _, Y.Abst w ->
- let f e = f m (Some (e, B.Abst (a, w))) x in
- Y.apix C.err f a
- in
- E.get_entity C.err f 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, B.Abbr (a, v)), x
+ | a, _, Y.Abst w ->
+ let e = Y.apix C.err C.start a in
+ m, Some (e, B.Abst (a, w)), x
+ | _, _, Y.Void -> assert false
+ end
| B.LRef (_, i) ->
- let f c = function
- | B.Abbr (_, v) ->
+ 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 c = 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 c = 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
- Y.apix C.err f a
- in
- get C.err f m i
+ | c, (B.Abst (a, _) as b) ->
+ let e = Y.apix C.err C.start a in
+ {m with c = c}, Some (e, b), x
+ end
| B.Cast (_, _, t) ->
P.add ~tau:1 ();
- step f ~delta ~rt m t
+ step st m t
| B.Appl (_, v, t) ->
- step f ~delta ~rt {m with s = (m.c, v) :: m.s} t
+ step st {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
+ | [] -> 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 c = B.push m.c ~c (B.abbr a v) (* (B.Cast ([], w, v)) *) in
+ step st {m with c = c; s = s} t
end
| 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 c = B.push m.c ~c:m.c b in
+ step st {m with c = c} t
-let push f m b =
+let push m b =
assert (m.s = []);
let b, i = match b with
| B.Abst (a, w) -> B.abst (Y.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 c = B.push m.c ~c:m.c b in
+ {m with c = c; i = i}
-let rec ac_nfs err f ~si m1 a1 u m2 a2 t =
+let rec ac_nfs st (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 ()
+ h1 = h2
| Some (e1, B.Abst _), _, Some (e2, B.Abst _), _ ->
- if e1 = e2 then ac_stacks err f m1 m2 else err ()
+ 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, a1, 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, a2, t)
end
| _, _, Some (_, B.Abbr (_, v2)), _ ->
P.add ~gdelta:1 ();
- step (ac_nfs err f ~si m1 a1 u) m2 v2
+ ac_nfs st (m1, a1, 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
+ ac_nfs st (step st m1 v1) (m2, a2, t)
| _, 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 ->
+ if ac {st with Y.si = false} m1 w1 m2 w2 then
+ ac st (push m1 b1) t1 (push m2 b2) t2
+ else false
+ | _, B.Sort _, _, B.Bind (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 b) u (push m2 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) =
+(* if List.length m1.s <> List.length m2.s then false else *)
+ let map (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
+ 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 get err f m i =
assert (m.s = []);
let f c = f in
- get err f m 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 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 ()
+ B.get err f m.c i
+
+let xwhd st m t =
+ L.box level; log1 "Now scanning" m.c t;
+ let m, _, t = step {st with Y.delta = true; Y.rt = true} m t in
+ L.unbox level; m, t
+
+let are_convertible st mu u mw w =
+ L.box level; log2 "Now converting" mu.c u mw.c 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 **********************************************************)
projects / helm.git / blobdiff