* http://cs.unibo.it/helm/.
*)
-exception ReferenceToVariable;;
-exception RferenceToCurrentProof;;
-exception ReferenceToInductiveDefinition;;
+exception ReferenceToNonVariable;;
let prerr_endline _ = ();;
let rec aux n ty tl res =
if n = 0 then
(match tl with
- [] -> C.Appl res
+ [] ->
+ (match res with
+ [] -> assert false
+ | [res] -> res
+ | _ -> C.Appl res)
| _ ->
match res with
[] -> assert false
aux expected_arity ty tl [hd]
;;
-let eta_fix metasenv t =
+let eta_fix metasenv context t =
let rec eta_fix' context t =
(* prerr_endline ("entering aux with: term=" ^ CicPp.ppterm t);
flush stderr ; *)
match t with
C.Rel n -> C.Rel n
| C.Var (uri,exp_named_subst) ->
- let exp_named_subst' =
- List.map
- (function i,t -> i, (eta_fix' context t)) exp_named_subst
- in
- C.Var (uri,exp_named_subst')
+ let exp_named_subst' = fix_exp_named_subst context exp_named_subst in
+ C.Var (uri,exp_named_subst')
| C.Meta (n,l) ->
- let (_,canonical_context,_) =
- List.find (function (m,_,_) -> n = m) metasenv
- in
- let l' =
+ let (_,canonical_context,_) = CicUtil.lookup_meta n metasenv in
+ let l' =
List.map2
(fun ct t ->
match (ct, t) with
(match CicEnvironment.get_obj uri with
C.Constant (_,_,ty,_) -> ty
| C.Variable _ -> raise ReferenceToVariable
- | C.CurrentProof (_,_,_,_,params) -> raise RferenceToCurrentProof
+ | C.CurrentProof (_,_,_,_,params) -> raise ReferenceToCurrentProof
| C.InductiveDefinition _ -> raise ReferenceToInductiveDefinition
) in
fix_according_to_type
constant_type (C.Const(uri,exp_named_subst)) l''
| _ -> C.Appl l' *))
| C.Const (uri,exp_named_subst) ->
- let exp_named_subst' =
- List.map
- (function i,t -> i, (eta_fix' context t)) exp_named_subst
- in
- C.Const (uri,exp_named_subst')
+ let exp_named_subst' = fix_exp_named_subst context exp_named_subst in
+ C.Const (uri,exp_named_subst')
| C.MutInd (uri,tyno,exp_named_subst) ->
- let exp_named_subst' =
- List.map
- (function i,t -> i, (eta_fix' context t)) exp_named_subst
- in
+ let exp_named_subst' = fix_exp_named_subst context exp_named_subst in
C.MutInd (uri, tyno, exp_named_subst')
| C.MutConstruct (uri,tyno,consno,exp_named_subst) ->
- let exp_named_subst' =
- List.map
- (function i,t -> i, (eta_fix' context t)) exp_named_subst
- in
+ let exp_named_subst' = fix_exp_named_subst context exp_named_subst in
C.MutConstruct (uri, tyno, consno, exp_named_subst')
| C.MutCase (uri, tyno, outty, term, patterns) as prima ->
let outty' = eta_fix' context outty in
List.map
(fun (name, ty, bo) ->
(name, eta_fix' context ty, eta_fix' (fun_types@context) bo)) funs)
- in
- eta_fix' [] t
+ and fix_exp_named_subst context exp_named_subst =
+ List.rev
+ (List.fold_left
+ (fun newsubst (uri,t) ->
+ let t' = eta_fix' context t in
+ let ty =
+ match CicEnvironment.get_obj uri with
+ Cic.Variable (_,_,ty,_) -> CicSubstitution.subst_vars newsubst ty
+ | _ -> raise ReferenceToNonVariable in
+ let t'' = fix_according_to_type ty t' [] in
+ (uri,t'')::newsubst
+ ) [] exp_named_subst)
+ in
+ eta_fix' context t
;;
-
-
-
-
-
-
-
-
-
-
-