let aconjecture_of_conjecture' = aconjecture_of_conjecture seed
ids_to_terms ids_to_father_ids ids_to_inner_sorts ids_to_inner_types
ids_to_hypotheses hypotheses_seed in
- let eta_fix metasenv t =
- if eta_fix then E.eta_fix metasenv t else t
+ let eta_fix metasenv context t =
+ if eta_fix then E.eta_fix metasenv context t else t
in
let aobj =
match obj with
C.Constant (id,Some bo,ty,params) ->
- let bo' = eta_fix [] bo in
- let ty' = eta_fix [] ty in
+ let bo' = eta_fix [] [] bo in
+ let ty' = eta_fix [] [] ty in
let abo = acic_term_of_cic_term' bo' (Some ty') in
let aty = acic_term_of_cic_term' ty' None in
C.AConstant
("mettereaposto",Some "mettereaposto2",id,Some abo,aty,params)
| C.Constant (id,None,ty,params) ->
- let ty' = eta_fix [] ty in
+ let ty' = eta_fix [] [] ty in
let aty = acic_term_of_cic_term' ty' None in
C.AConstant
("mettereaposto",None,id,None,aty,params)
| C.Variable (id,bo,ty,params) ->
- let ty' = eta_fix [] ty in
+ let ty' = eta_fix [] [] ty in
let abo =
match bo with
None -> None
| Some bo ->
- let bo' = eta_fix [] bo in
+ let bo' = eta_fix [] [] bo in
Some (acic_term_of_cic_term' bo' (Some ty'))
in
let aty = acic_term_of_cic_term' ty' None in
("mettereaposto",id,abo,aty, params)
| C.CurrentProof (id,conjectures,bo,ty,params) ->
let conjectures' =
- (*CSC: This code is bugged, since it does a List.map instead
- * of a List.fold, withouth calling eta_fixing with the
- * current context. Indeed, eta_fix always starts now in the
- * empty context. Instead of fixing this piece of code and
- * adding a new argument to eta_fix, I just skip eta_fixing
- * of the CurrentProof metasenv. Does this break well-typedness?
List.map
(function (i,canonical_context,term) ->
let canonical_context' =
- List.map
- (function
- None -> None
- | Some (n, C.Decl t)-> Some (n, C.Decl (eta_fix conjectures t))
- | Some (n, C.Def (t,None)) ->
- Some (n, C.Def ((eta_fix conjectures t),None))
- | Some (_,C.Def (_,Some _)) -> assert false
- ) canonical_context
+ List.fold_right
+ (fun d canonical_context' ->
+ let d' =
+ match d with
+ None -> None
+ | Some (n, C.Decl t)->
+ Some (n, C.Decl (eta_fix conjectures canonical_context' t))
+ | Some (n, C.Def (t,None)) ->
+ Some (n,
+ C.Def ((eta_fix conjectures canonical_context' t),None))
+ | Some (_,C.Def (_,Some _)) -> assert false
+ in
+ d::canonical_context'
+ ) [] canonical_context
in
- let term' = eta_fix conjectures term in
+ let term' = eta_fix conjectures canonical_context' term in
(i,canonical_context',term')
- ) conjectures *)
- conjectures
+ ) conjectures
in
let aconjectures =
List.map
(cid,i,(List.rev revacanonical_context),aterm)
) conjectures' in *)
let time1 = Sys.time () in
- let bo' = eta_fix conjectures' bo in
- let ty' = eta_fix conjectures' ty in
+ let bo' = eta_fix conjectures' [] bo in
+ let ty' = eta_fix conjectures' [] ty in
let time2 = Sys.time () in
prerr_endline
("++++++++++ Tempi della eta_fix: "^ string_of_float (time2 -. time1)) ;
* 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
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
;;
-
-
-
-
-
-
-
-
-
-
-
projects / helm.git / commitdiff