module U = NUri
module C = Cps
module L = Log
-module I = AutItem
module B = Bag
module O = BagOutput
module E = BagEnvironment
| GRef of U.uri * B.term list
| Abst of B.term
-type ac_result = (int * NUri.uri * Bag.term list) list option
-
-type extension = No | NSI
-
(* Internal functions *******************************************************)
let term_of_whdr = function
let f mc = whd f c {m with c = mc} t in
B.push f m.c l id b
-let insert f i uri vs = function
- | Some l -> f (Some ((i, uri, vs) :: l))
- | None -> assert false
-
(* Interface functions ******************************************************)
-let ext = ref No
+let nsi = ref false
let rec ho_whd f c m x =
let aux m = function
- | Sort_ h -> f (Sort h)
- | Bind_ (_, _, w, _) ->
+ | Sort_ h -> f (Sort h)
+ | Bind_ (_, _, w, _) ->
let f w = f (Abst w) in unwind_to_term f m w
- | LRef_ (_, Some w) -> ho_whd f c m w
- | GRef_ (_, uri, B.Abst w) ->
- let h = function
- | Abst _ as r -> f r
- | GRef _ as r -> f r
- | Sort _ ->
- let f vs = f (GRef (uri, vs)) in unwind_stack f m
- in
- if !ext = No then ho_whd h c m w else ho_whd f c m w
- | GRef_ (_, _, B.Abbr v) -> ho_whd f c m v
- | LRef_ (_, None) -> assert false
- | GRef_ (_, _, B.Void) -> assert false
+ | LRef_ (_, Some w) -> ho_whd f c m w
+ | GRef_ (_, _, B.Abst w) -> ho_whd f c m w
+ | GRef_ (_, _, B.Abbr v) -> ho_whd f c m v
+ | LRef_ (_, None) -> assert false
+ | GRef_ (_, _, B.Void) -> assert false
in
whd aux c m x
L.box level; log1 "Now scanning" c t;
ho_whd f c empty_machine t
-let rec are_convertible f xl c m1 t1 m2 t2 =
+let rec are_convertible f a c m1 t1 m2 t2 =
let rec aux m1 r1 m2 r2 =
let u, t = term_of_whdr r1, term_of_whdr r2 in
log2 "Now really converting" c u t;
match r1, r2 with
- | Sort_ h1, Sort_ h2 ->
- if h1 = h2 then f xl else f None
+ | Sort_ h1, Sort_ h2 ->
+ if h1 = h2 then f a else f false
| LRef_ (i1, _), LRef_ (i2, _) ->
- if i1 = i2 then are_convertible_stacks f xl c m1 m2 else f None
+ if i1 = i2 then are_convertible_stacks f a c m1 m2 else f false
| GRef_ (a1, _, B.Abst _), GRef_ (a2, _, B.Abst _) ->
- if a1 = a2 then are_convertible_stacks f xl c m1 m2 else f None
+ if a1 = a2 then are_convertible_stacks f a c m1 m2 else f false
| GRef_ (a1, _, B.Abbr v1), GRef_ (a2, _, B.Abbr v2) ->
- if a1 = a2 then are_convertible_stacks f xl c m1 m2 else
+ if a1 = a2 then
+ let f a = if a then f a else are_convertible f true c m1 v1 m2 v2 in
+ are_convertible_stacks f a c m1 m2
+ else
if a1 < a2 then whd (aux m1 r1) c m2 v2 else
whd (aux_rev m2 r2) c m1 v1
| _, GRef_ (_, _, B.Abbr v2) ->
| GRef_ (_, _, B.Abbr v1), _ ->
whd (aux_rev m2 r2) c m1 v1
| Bind_ (l1, id1, w1, t1), Bind_ (l2, id2, w2, t2) ->
- let f xl =
- let h c =
- let m1, m2 = inc m1, inc m2 in
- S.subst (are_convertible f xl c m1 t1 m2) l1 l2 t2
- in
- if xl = None then f xl else push h c m1 l1 id1 w1
+ let h c =
+ let m1, m2 = inc m1, inc m2 in
+ S.subst (are_convertible f a c m1 t1 m2) l1 l2 t2
in
- are_convertible f xl c m1 w1 m2 w2
+ let f r = if r then push h c m1 l1 id1 w1 else f false in
+ are_convertible f a c m1 w1 m2 w2
(* we detect the AUT-QE reduction rule for type/prop inclusion *)
- | GRef_ (_, uri, B.Abst _), Bind_ (l1, _, _, _) when !ext = No ->
- let g vs = insert f l1 uri vs xl in
- if U.eq uri I.imp then unwind_stack g m1 else
- if U.eq uri I.all then unwind_stack g m1 else
- begin L.warn (U.string_of_uri uri); f None end
- | Sort_ _, Bind_ (l2, id2, w2, t2) when !ext = NSI ->
+ | Sort_ _, Bind_ (l2, id2, w2, t2) when !nsi ->
let m1, m2 = inc m1, inc m2 in
- let f c = are_convertible f xl c m1 (term_of_whdr r1) m2 t2 in
+ let f c = are_convertible f a c m1 (term_of_whdr r1) m2 t2 in
push f c m2 l2 id2 w2
- | _ -> f None
+ | _ -> f false
and aux_rev m2 r2 m1 r1 = aux m1 r1 m2 r2 in
- let f m1 r1 = whd (aux m1 r1) c m2 t2 in
- whd f c m1 t1
+ let g m1 r1 = whd (aux m1 r1) c m2 t2 in
+ if a = false then f false else whd g c m1 t1
-and are_convertible_stacks f xl c m1 m2 =
+and are_convertible_stacks f a c m1 m2 =
let mm1, mm2 = {m1 with s = []}, {m2 with s = []} in
- let map f xl v1 v2 = are_convertible f xl c mm1 v1 mm2 v2 in
- if List.length m1.s <> List.length m2.s then f None else
- C.list_fold_left2 f map xl m1.s m2.s
+ let map f a v1 v2 = are_convertible f a c mm1 v1 mm2 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 a m1.s m2.s
let are_convertible f c u t =
let f b = L.unbox level; f b in
L.box level; log2 "Now converting" c u t;
- are_convertible f (Some []) c empty_machine u empty_machine t
+ are_convertible f true c empty_machine u empty_machine t
projects / helm.git / blobdiff