NCic.Appl (t:: aux (List.length ctx))
;;
+exception Nothing_to_do;;
+
let fix_outty curi tyno t context outty =
let leftno,rightno =
match fst (CicEnvironment.get_obj CicUniv.oblivion_ugraph curi) with
leftno, count_prods leftno [] arity
| _ -> assert false in
let ens,args =
- match fst (CicTypeChecker.type_of_aux' [] context t CicUniv.oblivion_ugraph)
- with
+ let tty,_= CicTypeChecker.type_of_aux' [] context t CicUniv.oblivion_ugraph in
+ match CicReduction.whd context tty with
Cic.MutInd (_,_,ens) -> ens,[]
| Cic.Appl (Cic.MutInd (_,_,ens)::args) ->
ens,fst (HExtlib.split_nth leftno args)
| _ -> assert false
in
- let rec aux n irl context outty =
- match n, CicReduction.whd context outty with
- 0, (Cic.Lambda _ as t) -> t
- | 0, t ->
- let ty = Cic.MutInd (curi,tyno,ens) in
- let args = args @ irl in
- let ty = if args = [] then ty else Cic.Appl (ty::args) in
- Cic.Lambda (Cic.Anonymous, ty, CicSubstitution.lift 1 t)
- | n, Cic.Lambda (name,so,ty) ->
+ let rec aux n irl context outsort =
+ match n, CicReduction.whd context outsort with
+ 0, Cic.Prod _ -> raise Nothing_to_do
+ | 0, _ ->
+ let irl = List.rev irl in
+ let ty = CicSubstitution.lift rightno (Cic.MutInd (curi,tyno,ens)) in
+ let ty =
+ if args = [] && irl = [] then ty
+ else
+ Cic.Appl (ty::(List.map (CicSubstitution.lift rightno) args)@irl) in
+ let he = CicSubstitution.lift (rightno + 1) outty in
+ let t =
+ if irl = [] then he
+ else Cic.Appl (he::List.map (CicSubstitution.lift 1) irl)
+ in
+ Cic.Lambda (Cic.Anonymous, ty, t)
+ | n, Cic.Prod (name,so,ty) ->
let ty' =
aux (n - 1) (Cic.Rel n::irl) (Some (name, Cic.Decl so)::context) ty
in
| _,_ -> assert false
in
(*prerr_endline ("RIGHTNO = " ^ string_of_int rightno ^ " OUTTY = " ^ CicPp.ppterm outty);*)
- let outty' = aux rightno [] context outty in
+ let outsort =
+ fst (CicTypeChecker.type_of_aux' [] context outty CicUniv.oblivion_ugraph)
+ in
+ try aux rightno [] context outsort
+ with Nothing_to_do -> outty
(*prerr_endline (CicPp.ppterm outty ^ " <==> " ^ CicPp.ppterm outty');*)
- if outty' = outty then outty else outty'
+;;
+
+let fix_outtype t =
+ let module C = Cic in
+ let rec aux context =
+ function
+ C.Rel _ as t -> t
+ | C.Var (uri,exp_named_subst) ->
+ let exp_named_subst' =
+ List.map (function i,t -> i, (aux context t)) exp_named_subst in
+ C.Var (uri,exp_named_subst')
+ | C.Implicit _
+ | C.Meta _ -> assert false
+ | C.Sort _ as t -> t
+ | C.Cast (v,t) -> C.Cast (aux context v, aux context t)
+ | C.Prod (n,s,t) ->
+ C.Prod (n, aux context s, aux ((Some (n, C.Decl s))::context) t)
+ | C.Lambda (n,s,t) ->
+ C.Lambda (n, aux context s, aux ((Some (n, C.Decl s))::context) t)
+ | C.LetIn (n,s,ty,t) ->
+ C.LetIn
+ (n, aux context s, aux context ty,
+ aux ((Some (n, C.Def(s,ty)))::context) t)
+ | C.Appl l -> C.Appl (List.map (aux context) l)
+ | C.Const (uri,exp_named_subst) ->
+ let exp_named_subst' =
+ List.map (function i,t -> i, (aux context t)) 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, (aux context t)) 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, (aux context t)) exp_named_subst
+ in
+ C.MutConstruct (uri, tyno, consno, exp_named_subst')
+ | C.MutCase (uri, tyno, outty, term, patterns) ->
+ let outty = fix_outty uri tyno term context outty in
+ C.MutCase (uri, tyno, aux context outty,
+ aux context term, List.map (aux context) patterns)
+ | C.Fix (funno, funs) ->
+ let tys,_ =
+ List.fold_left
+ (fun (types,len) (n,_,ty,_) ->
+ ((Some (C.Name n,(C.Decl (CicSubstitution.lift len ty)))))::types,
+ len+1
+ ) ([],0) funs
+ in
+ C.Fix (funno,
+ List.map
+ (fun (name, indidx, ty, bo) ->
+ (name, indidx, aux context ty, aux (tys@context) bo)
+ ) funs
+ )
+ | C.CoFix (funno, funs) ->
+ let tys,_ =
+ List.fold_left
+ (fun (types,len) (n,ty,_) ->
+ ((Some (C.Name n,(C.Decl (CicSubstitution.lift len ty)))))::types,
+ len+1
+ ) ([],0) funs
+ in
+ C.CoFix (funno,
+ List.map
+ (fun (name, ty, bo) ->
+ (name, aux context ty, aux (tys@context) bo)
+ ) funs
+ )
+ in
+ aux [] t
+;;
+
+let get_fresh =
+ let seed = ref 0 in
+ function () ->
+ incr seed;
+ string_of_int !seed
;;
(* we are lambda-lifting also variables that do not occur *)
let buri =
UriManager.uri_of_string
(UriManager.buri_of_uri uri^"/"^
- UriManager.name_of_uri uri ^ string_of_int (List.length ctx)^".con")
+ UriManager.name_of_uri uri ^ "___" ^ get_fresh () ^ ".con")
in
let bctx, fixpoints_tys, tys, _ =
List.fold_right
let buri =
UriManager.uri_of_string
(UriManager.buri_of_uri uri^"/"^
- UriManager.name_of_uri uri ^ string_of_int (List.length ctx)^".con")
+ UriManager.name_of_uri uri ^ "___" ^ get_fresh () ^ ".con")
in
let bad_bctx, fixpoints_tys, tys, _ =
List.fold_right
| (NCic.Appl l1)::l2 -> NCic.Appl (l1@l2), fixpoints
| _ -> NCic.Appl l, fixpoints)
| Cic.Const (curi, ens) ->
- aux_ens octx ctx n_fix uri ens
+ aux_ens curi octx ctx n_fix uri ens
(match fst(CicEnvironment.get_obj CicUniv.oblivion_ugraph curi) with
| Cic.Constant (_,Some _,_,_,_) ->
NCic.Const (Ref.reference_of_ouri curi Ref.Def)
NCic.Const (Ref.reference_of_ouri curi Ref.Decl)
| _ -> assert false)
| Cic.MutInd (curi, tyno, ens) ->
- aux_ens octx ctx n_fix uri ens
+ aux_ens curi octx ctx n_fix uri ens
(NCic.Const (Ref.reference_of_ouri curi (Ref.Ind tyno)))
| Cic.MutConstruct (curi, tyno, consno, ens) ->
- aux_ens octx ctx n_fix uri ens
+ aux_ens curi octx ctx n_fix uri ens
(NCic.Const (Ref.reference_of_ouri curi (Ref.Con (tyno,consno))))
| Cic.MutCase (curi, tyno, outty, t, branches) ->
- let outty = fix_outty curi tyno t octx outty in
let r = Ref.reference_of_ouri curi (Ref.Ind tyno) in
let outty, fixpoints_outty = aux octx ctx n_fix uri outty in
let t, fixpoints_t = aux octx ctx n_fix uri t in
in
NCic.Match (r,outty,t,branches), fixpoints_outty@fixpoints_t@fixpoints
| Cic.Implicit _ | Cic.Meta _ | Cic.Var _ -> assert false
- and aux_ens octx ctx n_fix uri ens he =
+ and aux_ens curi octx ctx n_fix uri ens he =
match ens with
[] -> he,[]
| _::_ ->
+ let params =
+ match fst (CicEnvironment.get_obj CicUniv.oblivion_ugraph curi) with
+ Cic.Constant (_,_,_,params,_)
+ | Cic.InductiveDefinition (_,params,_,_) -> params
+ | Cic.Variable _
+ | Cic.CurrentProof _ -> assert false
+ in
let ens,objs =
List.fold_right
- (fun (_,t) (l,objs) ->
+ (fun uri (l,objs) ->
+ let t = List.assoc uri ens in
let t,o = aux octx ctx n_fix uri t in
t::l, o@objs
- ) ens ([],[])
+ ) params ([],[])
in
NCic.Appl (he::ens),objs
in
;;
let cook mode vars t =
- let t = CicSubstitution.lift (List.length vars) t in
- snd (List.fold_right
- (fun uri (n,t) ->
- let t = CicSubstitution.subst_vars [uri,Cic.Rel 1] t in
+ let t = fix_outtype t in
+ let varsno = List.length vars in
+ let t = CicSubstitution.lift varsno t in
+ let rec aux n acc l =
+ let subst =
+ snd(List.fold_left (fun (i,res) uri -> i+1,(uri,Cic.Rel i)::res) (1,[]) acc)
+ in
+ match l with
+ [] -> CicSubstitution.subst_vars subst t
+ | uri::uris ->
let bo,ty =
match fst (CicEnvironment.get_obj CicUniv.oblivion_ugraph uri) with
- Cic.Variable (_,bo,ty,_,_) -> bo,ty
+ Cic.Variable (_,bo,ty,_,_) ->
+ HExtlib.map_option fix_outtype bo, fix_outtype ty
| _ -> assert false in
+ let ty = CicSubstitution.subst_vars subst ty in
+ let bo = HExtlib.map_option (CicSubstitution.subst_vars subst) bo in
let id = Cic.Name (UriManager.name_of_uri uri) in
- let t =
+ let t = aux (n-1) (uri::acc) uris in
match bo,ty,mode with
None,ty,`Lambda -> Cic.Lambda (id,ty,t)
| None,ty,`Pi -> Cic.Prod (id,ty,t)
| Some bo,ty,_ -> Cic.LetIn (id,bo,ty,t)
- in
- n+1,t
- ) vars (1,t))
+ in
+ aux varsno [] vars
;;
let convert_obj_aux uri = function
projects / helm.git / blobdiff