(* *)
(******************************************************************************)
+(* $Id$ *)
(* The code of this module is derived from the code of CicReduction *)
let module S = CicSubstitution in
function
C.Rel n as t ->
- (try
- match List.nth context (n-1) with
- Some (_,C.Decl _) -> if l = [] then t else C.Appl (t::l)
- | Some (_,C.Def (bo,_)) ->
- try_delta_expansion context l t (S.lift n bo)
- | None -> raise RelToHiddenHypothesis
- with
- Failure _ -> assert false)
+ (* we never perform delta expansion automatically *)
+ if l = [] then t else C.Appl (t::l)
| C.Var (uri,exp_named_subst) ->
let exp_named_subst' =
reduceaux_exp_named_subst context l exp_named_subst
| C.Sort _ as t -> t (* l should be empty *)
| C.Implicit _ as t -> t
| C.Cast (te,ty) ->
- C.Cast (reduceaux context l te, reduceaux context l ty)
+ C.Cast (reduceaux context l te, reduceaux context [] ty)
| C.Prod (name,s,t) ->
assert (l = []) ;
C.Prod (name,
in
reduceaux context [] body'
| C.Appl (C.CoFix (i,fl) :: tl) ->
- let tys =
- List.map (function (name,ty,_) -> Some (C.Name name, C.Decl ty)) fl in
let (_,_,body) = List.nth fl i in
- let body' =
- let counter = ref (List.length fl) in
- List.fold_right
- (fun _ -> decr counter ; S.subst (C.CoFix (!counter,fl)))
- fl
- body
- in
- let tl' = List.map (reduceaux context []) tl in
- reduceaux context tl' body'
+ let body' =
+ let counter = ref (List.length fl) in
+ List.fold_right
+ (fun _ -> decr counter ; S.subst (C.CoFix (!counter,fl)))
+ fl
+ body
+ in
+ let tl' = List.map (reduceaux context []) tl in
+ reduceaux context tl' body'
| t -> t
in
(match decofix (CicReduction.whd context term) with