module U = NUri
module C = Cps
+module S = Share
module L = Log
module P = Output
module B = Brg
module O = BrgOutput
module E = BrgEnvironment
-module S = BrgSubstitution
-exception TypeError of B.message
-
-type machine = {
- c: B.context;
- s: (B.term * int) list
+type kam = {
+ c: B.lenv;
+ s: (B.lenv * B.term) list;
+ i: int
}
(* Internal functions *******************************************************)
let level = 5
let log1 s c t =
- let sc, st = s ^ " in the context", "the term" in
- L.log O.specs level (L.ct_items1 sc c st 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 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"
+ 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
- raise (TypeError (L.ct_items3 sc c st1 t1 st2 t2 st3 t3))
-
-let empty_machine c = {
- c = c; s = []
-}
-
-let get f m i =
- let f e = function
- | Some (_, b) -> f e b
- | None -> error0 i
- in
- B.get f m.c i
-
-let lift_stack f s =
- let map f (v, i) = f (v, succ i) in
- Cps.list_map f map s
+ if S.eq t1 t2 then f () else aux f (t1, t2)
-let push f m a b =
- assert (m.s = []);
- f {m with c = (a, b) :: m.c}
+let get err f m i =
+ B.get err f m.c i
(* to share *)
let rec step f ?(delta=false) ?(rt=false) m x =
(* L.warn "entering R.step"; *)
match x with
- | B.Sort _ -> f m x
- | B.GRef (a, uri) ->
+ | B.Sort _ -> f m None x
+ | B.GRef (_, uri) ->
let f = function
- | _, _, 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
- | e, _, b ->
- f m (B.GRef (B.Entry (e, b) :: a, uri))
+ | _, _, 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
- E.get_obj f uri
- | B.LRef (a, i) ->
- let f e = function
- | B.Abbr v ->
+ 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 v
- | B.Abst w when rt ->
+ step f ~delta ~rt {m with c = c} v
+ | B.Abst (_, w) when rt ->
P.add ~lrt:1 ();
- step f ~delta ~rt m w
- | b ->
- f m (B.LRef (B.Entry (e, b) :: a, i))
- in
- let f e = S.lift_bind (f e) (succ i) (0) in
- get f m i
- | B.Cast (_, _, t) ->
+ 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 = (v, 0) :: m.s} t
- | B.Bind (a, B.Abst w, 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 x
- | (v, h) :: tl ->
- P.add ~beta:1 ~upsilon:(List.length tl) ();
- let f c s = step f ~delta ~rt {c = c; s = s} t in
- let f c = lift_stack (f c) tl in
- let f v = B.push f m.c a (B.Abbr v (* (B.Cast ([], w, v)) *) ) in
- S.lift f h (0) v
+ | [] -> 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 (a, b, t) ->
+ | B.Bind (b, t) ->
P.add ~upsilon:(List.length m.s) ();
- let f s c = step f ~delta ~rt {c = c; s = s} t in
- let f s = B.push (f s) m.c a b in
- lift_stack f m.s
-
-(* Interface functions ******************************************************)
+ 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
+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
- L.box level; log1 "Now scanning" m.c t;
- step f ~delta:true ~rt:true m t
+ 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 u m2 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 u, t with
- | B.Sort (_, h1), B.Sort (_, h2) ->
- if h1 = h2 then f r else f false
- | B.LRef (B.Entry (e1, B.Abst _) :: _, i1),
- B.LRef (B.Entry (e2, B.Abst _) :: _, i2) ->
- P.add ~zeta:(i1+i2-e1-e2) ();
- if e1 = e2 then ac_stacks f ~si r m1 m2 else f false
- | B.GRef (B.Entry (e1, B.Abst _) :: _, _),
- B.GRef (B.Entry (e2, B.Abst _) :: _, _) ->
- if e1 = e2 then ac_stacks f ~si r m1 m2 else f false
- | B.GRef (B.Entry (e1, B.Abbr v1) :: _, _),
- B.GRef (B.Entry (e2, B.Abbr v2) :: _, _) ->
+ 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 f r =
- if r then f r
- else begin
- P.add ~gdelta:2 ();
- ac f ~si true m1 v1 m2 v2
- end
- in
- ac_stacks f ~si r m1 m2
+ 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 f ~si r m1 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 t) m1 v1
+ step (ac_nfs_rev err f ~si m2 a2 t) m1 v1
end
- | _, B.GRef (B.Entry (_, B.Abbr v2) :: _, _) ->
+ | _, _, Some (_, B.Abbr (_, v2)), _ ->
P.add ~gdelta:1 ();
- step (ac_nfs f ~si r m1 u) m2 v2
- | B.GRef (B.Entry (_, B.Abbr v1) :: _, _), _ ->
+ 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 t) m1 v1
- | B.Bind (a1, (B.Abst w1 as b1), t1),
- B.Bind (a2, (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 a2 b2 in
- let f r = if r then push g m1 a1 b1 else f false in
- ac f ~si r m1 w1 m2 w2
- | B.Sort _, B.Bind (a, b, t) when si ->
+ 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 f ~si r m1 u m2 t in
- let f m1 = push (f m1) m2 a b in
- push f m1 a b
- | _ -> f false
+ 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 f ~si r m2 t m1 u = ac_nfs f ~si r m1 u m2 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 t1 = step (ac_nfs f ~si r m1 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 ~si r m1 m2 =
+and ac_stacks err f m1 m2 =
(* L.warn "entering R.are_convertible_stacks"; *)
- let mm1, mm2 = {m1 with s = []}, {m2 with s = []} in
- let map f r (v1, h1) (v2, h2) =
- let f v1 = S.lift (ac f ~si r mm1 v1 mm2) h2 (0) v2 in
- S.lift f h1 (0) v1
+ 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
- if List.length m1.s <> List.length m2.s then
- begin
-(* L.warn (Printf.sprintf "Different lengths: %u %u"
- (List.length m1.s) (List.length m2.s)
- ); *)
- f false
- end
- else
- C.list_fold_left2 f map r m1.s m2.s
+ C.list_iter2 f map m1.s m2.s
-let assert_conversion f ?(si=false) ?(rt=false) c u w v =
- let f b = L.unbox level; f b in
- let mw = empty_machine c in
- let f mu u =
- let f = function
- | true -> f ()
- | false -> error3 c v w u
- in
- L.box level; log2 "Now converting" c u c w;
- ac f ~si true mu u mw w
- in
- if rt then domain f mw u else f mw u
+(* Interface functions ******************************************************)
+
+let empty_kam = {
+ c = B.empty_lenv; s = []; i = 0
+}
+
+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 ()
+
+(* error reporting **********************************************************)
+
+let pp_term m frm t = O.specs.L.pp_term m.c frm t
+
+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