(* 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) ->
+ | 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) ->
+ | 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) ->
+ | 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) ->
+ | B.Bind (_, b1, t1), B.Bind (_, b2, t2) ->
let f _ = aux f (t1, t2) in
aux_bind f (b1, b2)
- | _ -> err ()
+ | _ -> err ()
and aux_bind f = function
| B.Abbr v1, B.Abbr v2 -> aux f (v1, v2)
| B.Abst (r1, n1, v1), B.Abst (r2, n2, v2) when r1 = r2 && n1 = n2 -> aux f (v1, v2)
| None -> 0
let get m i =
- let _, c, a, b = B.get m.e i in c, a, b
+ let _, c, a, _, b = B.get m.e i in c, a, b
(* to share *)
let rec step st m r =
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;
match r with
- | B.Sort (a, h) ->
+ | B.Sort k ->
if assert_tstep m false then
- step st (tstep m) (B.Sort (a, H.apply h))
+ step st (tstep m) (B.Sort (H.apply k))
else m, r, None
- | B.GRef (_, uri) ->
- begin match BE.get_entity uri with
+ | B.GRef (_, u) ->
+ begin match BE.get_entity u with
| _, a, _, E.Abbr v ->
- m, B.gref a uri, Some v
+ m, B.gref a u, Some v
| _, _, _, E.Abst w ->
if assert_tstep m true then begin
if !G.summary then O.add ~grt:1 ();
| _, _, B.Void ->
assert false
end
- | B.Cast (_, u, t) ->
+ | B.Cast (u, t) ->
if assert_tstep m false then begin
if !G.summary then O.add ~e:1 ();
step st (tstep m) u
if !G.summary then O.add ~epsilon:1 ();
step st m t
end
- | B.Appl (_, _, v, t) ->
+ | B.Appl (_, v, t) ->
step st {m with s = (m.e, v) :: m.s} t
- | B.Bind (a, B.Abst (false, n, w), t) ->
+ | B.Bind (y, B.Abst (false, n, w), t) ->
let i = tsteps m in
if !G.summary then O.add ~x:i ();
let n = if i = 0 then n else N.minus st n i in
- let r = B.Bind (a, B.Abst (true, n, w), t) in
+ let r = B.Bind (y, B.Abst (true, n, w), t) in
step st m r
- | B.Bind (a, B.Abst (true, n, w), t) ->
+ | B.Bind (y, B.Abst (true, n, w), t) ->
if !G.si || N.is_not_zero st n then begin match m.s with
| [] ->
- m, B.Bind (a, B.Abst (true, n, w), t), None
+ 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) ();
- let v = B.Cast (E.empty_node, w, v) in
- let e = B.push m.e c a (B.abbr v) in
+ 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 ();
- let e = B.push m.e m.e a B.Void in (**) (* this is wrong in general *)
+ 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 (a, b, t) ->
+ | B.Bind (y, b, t) ->
if !G.summary then O.add ~theta:(List.length m.s) ();
- let e = B.push m.e m.e a b in
+ let e = B.push m.e m.e E.empty_node y b in
step st {m with e = e} t
let assert_iterations m1 m2 =
let reset m ?(e=m.e) n =
{m with e = e; n = n; s = []}
-let push m a b =
+let push m y b =
let a, l = match b with
- | B.Abst _ -> {a with E.n_apix = m.l}, succ m.l
- | _ -> a, m.l
+ | B.Abst _ -> E.node_attrs ~apix:m.l (), succ m.l
+ | _ -> E.empty_node, m.l
in
- let e = B.push m.e m.e a b in
+ let e = B.push m.e m.e a y b in
{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;
match t1, r1, t2, r2 with
- | B.Sort (_, h1), _, B.Sort (_, h2), _ ->
- h1 = h2
+ | B.Sort k1, _, B.Sort k2, _ ->
+ k1 = k2
| B.LRef ({E.n_apix = e1}, _), _,
B.LRef ({E.n_apix = e2}, _), _ ->
if e1 = e2 then ac_stacks st m1 m2 else false
| B.GRef _, Some v1, _, _ ->
if !G.summary then O.add ~gdelta:1 ();
ac_nfs st (step st m1 v1) (m2, t2, r2)
- | B.Bind (a1, (B.Abst (true, n1, w1) as b1), t1), _,
- B.Bind (a2, (B.Abst (true, n2, w2) as b2), t2), _ ->
+ | B.Bind (y1, (B.Abst (true, n1, w1) as b1), t1), _,
+ B.Bind (y2, (B.Abst (true, n2, w2) as b2), t2), _ ->
if ((!G.cc && N.assert_equal st n1 n2) || N.are_equal st n1 n2) &&
ac st (reset m1 zero) w1 (reset m2 zero) w2
- then ac st (push m1 a1 b1) t1 (push m2 a2 b2) t2
+ then ac st (push m1 y1 b1) t1 (push m2 y2 b2) t2
else false
- | B.Sort _, _, B.Bind (a, B.Abst (true, n, _), t), _ ->
+ | 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 ();
- ac st (push m1 a B.Void) t1 (push m2 a B.Void) t end
+ ac st (push m1 y B.Void) t1 (push m2 y B.Void) t end
else false
| _ -> false
let get m i =
assert (m.s = []);
- let _, _, _, b = B.get m.e i in b
+ 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;