| C.Cast (te, ty) -> C.Cast (aux k te, aux k ty)
| C.Prod (n,s,t) -> C.Prod (n, aux k s, aux (k + 1) t)
| C.Lambda (n,s,t) -> C.Lambda (n, aux k s, aux (k + 1) t)
+ | C.LetIn (n,s,t) -> C.LetIn (n, aux k s, aux (k + 1) t)
| C.Appl (he::tl) ->
(* Get rid of C.Appl (C.Appl l1) l2 *)
let newtl = List.map (aux k) tl in
let rec cookrec ty =
function
var::tl ->
- let (varname, vartype) =
+ let (varname, varbody, vartype) =
match CicCache.get_obj var with
- C.Variable (varname, vartype) -> (varname, vartype)
+ C.Variable (varname, varbody, vartype) -> (varname, varbody, vartype)
| _ -> raise (WrongUriToVariable (U.string_of_uri var))
in
- cookrec (add_binder (C.Name varname) vartype (cook curi cookingsno var ty)) tl
+ cookrec (add_binder (C.Name varname) varbody vartype
+ (cook curi cookingsno var ty)) tl
| _ -> ty
in
cookrec ty vars
;;
let cook_prod =
- cook_gen (fun n s t -> Cic.Prod (n,s,t))
+ cook_gen (fun n b s t ->
+ match b with
+ None -> Cic.Prod (n,s,t)
+ | Some b -> Cic.LetIn (n,b,t)
+ )
and cook_lambda =
- cook_gen (fun n s t -> Cic.Lambda (n,s,t))
+ cook_gen (fun n b s t ->
+ match b with
+ None -> Cic.Lambda (n,s,t)
+ | Some b -> Cic.LetIn (n,b,t)
+ )
;;
(*CSC: sbagliato da rifare e completare *)