module O = BrgOutput
module E = BrgEnvironment
-exception TypeError of B.message
-
type machine = {
c: B.context;
s: (B.context * B.term) list;
let log2 s cu u ct t =
let s1, s2, s3 = s ^ " in the context", "the term", "and in the context" in
- L.log O.specs level (L.ct_items2 s1 cu s2 u s3 ct s2 t)
-
-let error0 i =
- let s = Printf.sprintf "local reference not found %u" i in
- raise (TypeError (L.items1 s))
-
-let error1 st c t =
- let sc = "In the context" in
- raise (TypeError (L.ct_items1 sc c st t))
-
-let error3 c t1 t2 t3 =
- let sc, st1, st2, st3 =
- "In the context", "the term", "is of type", "but must be of type"
- in
- raise (TypeError (L.ct_items3 sc c st1 t1 st2 t2 st3 t3))
+ L.log O.specs level (L.ct_items2 s1 cu s2 u ~sc2:s3 ~c2:ct s2 t)
-let are_alpha_convertible f t1 t2 =
+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) -> f (p1 = p2)
- | B.GRef (_, u1), B.GRef (_, u2) -> f (U.eq u1 u2)
+ | 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 r = if r then aux f (t1, t2) else f r in
+ let f () = aux f (t1, t2) in
aux f (v1, v2)
| B.Bind (b1, t1), B.Bind (b2, t2) ->
- let f r = if r then aux f (t1, t2) else f r in
+ let f () = aux f (t1, t2) in
aux_bind f (b1, b2)
- | _ -> f false
+ | _ -> 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 true
- | _ -> f false
+ | B.Void _, B.Void _ -> f ()
+ | _ -> err ()
in
- if S.eq t1 t2 then f true else aux f (t1, t2)
+ if S.eq t1 t2 then f () else aux f (t1, t2)
let get f m i =
- B.get error0 f m.c i
+ B.get C.err f m.c i
(* to share *)
let rec step f ?(delta=false) ?(rt=false) m x =
let f c = step f ~delta ~rt {m with c = c} t in
B.push f m.c ~c:m.c b
-let domain f m t =
- let f r = L.unbox level; f r in
- let f m _ = function
- | B.Bind (B.Abst (_, w), _) -> f m w
- | _ -> error1 "not a function" m.c t
- in
- L.box level; log1 "Now scanning" m.c t;
- step f ~delta:true ~rt:true m t
-
let push f m b =
assert (m.s = []);
let b, i = match b with
let f c = f {m with c = c; i = i} in
B.push f m.c ~c:m.c b
-let rec ac_nfs f ~si r m1 a1 u m2 a2 t =
+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 r else f false
+ if h1 = h2 then f () else err ()
| Some (e1, B.Abst _), _, Some (e2, B.Abst _), _ ->
- if e1 = e2 then ac_stacks f r m1 m2 else f false
+ 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 f r =
- if r then f r
- else begin
- P.add ~gdelta:2 ();
- ac f ~si true m1 v1 m2 v2
- end
+ let err () =
+ P.add ~gdelta:2 ();
+ ac err f ~si m1 v1 m2 v2
in
- ac_stacks f r m1 m2
+ ac_stacks err f m1 m2
else if e1 < e2 then begin
P.add ~gdelta:1 ();
- step (ac_nfs f ~si r m1 a1 u) m2 v2
+ step (ac_nfs err f ~si m1 a1 u) m2 v2
end else begin
P.add ~gdelta:1 ();
- step (ac_nfs_rev f ~si r m2 a2 t) m1 v1
+ step (ac_nfs_rev err f ~si m2 a2 t) m1 v1
end
| _, _, Some (_, B.Abbr (_, v2)), _ ->
P.add ~gdelta:1 ();
- step (ac_nfs f ~si r m1 a1 u) m2 v2
+ step (ac_nfs err f ~si m1 a1 u) m2 v2
| Some (_, B.Abbr (_, v1)), _, _, _ ->
P.add ~gdelta:1 ();
- step (ac_nfs_rev f ~si r m2 a2 t) m1 v1
+ 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 g m1 m2 = ac f ~si r m1 t1 m2 t2 in
- let g m1 = push (g m1) m2 b2 in
- let f r = if r then push g m1 b1 else f false in
- ac f ~si:false r m1 w1 m2 w2
+ 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 f ~si r m1 u m2 t in
+ 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
- | _ -> f false
+ | _ -> err ()
-and ac_nfs_rev f ~si r m2 a2 t m1 a1 u = ac_nfs f ~si r m1 a1 u m2 a2 t
+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 f ~si r m1 t1 m2 t2 =
+and ac err f ~si m1 t1 m2 t2 =
(* L.warn "entering R.are_convertible"; *)
- let g m1 a1 t1 = step (ac_nfs f ~si r m1 a1 t1) m2 t2 in
- if r = false then f false else step g m1 t1
+ let f m1 a1 t1 = step (ac_nfs err f ~si m1 a1 t1) m2 t2 in
+ step f m1 t1
-and ac_stacks f r m1 m2 =
+and ac_stacks err f m1 m2 =
(* L.warn "entering R.are_convertible_stacks"; *)
- if List.length m1.s <> List.length m2.s then f false else
- let map f r (c1, v1) (c2, v2) =
+ 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 f ~si:false r m1 v1 m2 v2
+ ac err f ~si:false m1 v1 m2 v2
in
- C.list_fold_left2 f map r m1.s m2.s
+ C.list_iter2 f map m1.s m2.s
(* Interface functions ******************************************************)
let f c = f in
get f m i
-let assert_conversion f ?(si=false) ?(rt=false) mw u w v =
- let f mu u =
- L.box level; log2 "Now converting" mu.c u mw.c w;
- let f r =
- if r then begin L.unbox level; f () end else error3 mw.c v w u
- in
- let g r = if r then f r else ac f ~si true mu u mw w in
-(* if S.eq mu mw then are_alpha_convertible g u w else *) g false
- in
- if rt then domain f mw u else f mw u
+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 message1 st m t =
- L.ct_items1 "In the context" m.c st 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 () = L.unbox level; f () 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 message1 st1 m t1 =
+ L.ct_items1 "In the context" m.c st1 t1
+
+let message3 st1 st2 ?sm3 st3 m1 t1 t2 ?m3 t3 =
+ let sm1 = "In the context" in
+ match sm3, m3 with
+ | Some sm3, Some m3 ->
+ L.ct_items3 sm1 m1.c st1 t1 st2 t2 ~sc3:sm3 ~c3:m3.c st3 t3
+ | None, None ->
+ L.ct_items3 sm1 m1.c st1 t1 st2 t2 st3 t3
+ | _ -> assert false
projects / helm.git / blobdiff