let args,sort = NCicReduction.split_prods status ~subst:[] [] (-1) ty in
let args = List.rev_map (function name,_ -> mk_id name) args in
let rec_arg = mk_id (fresh_name ()) in
- let p_ty =
+ let mk_prods =
List.fold_right
- (fun name res -> NotationPt.Binder (`Forall,(name,None),res)) args
+ (fun name res -> NotationPt.Binder (`Forall,(name,None),res)) in
+ let p_ty = mk_prods args
(NotationPt.Binder
(`Forall,
(rec_arg,Some (mk_appl (mk_id ind_name :: params @ args))),
NotationPt.Sort outsort)) in
+ let mk_arrs n = mk_prods (HExtlib.mk_list (mk_id "_") n) in
let args = args @ [rec_arg] in
let k_names = List.map (function _,name,_ -> name_of_k name) cl in
+ (*
let final_params =
List.map (function name -> name, None) params @
[p_name,Some p_ty] @
List.map (function name -> name, None) k_names @
List.map (function name -> name, None) args in
+ *)
let cty = mk_appl (p_name :: args) in
let ty = Some cty in
- let branches =
+ let branches_with_args =
List.map
(function (_,name,ty) ->
let _,ty = NCicReduction.split_prods status ~subst:[] [] leftno ty in
let cargs,ty= my_split_prods status ~subst:[] [] (-1) ty in
- let cargs_and_recursive_args =
- List.rev_map
- (function
+ let cargs_recargs_nih =
+ List.fold_left
+ (fun (acc,nih) -> function
_,NCic.Def _ -> assert false
| name,NCic.Decl ty ->
let context,ty = my_split_prods status ~subst:[] [] (-1) ty in
->
let abs = List.rev_map (fun id,_ -> mk_id id) context in
let name = mk_id name in
- name, Some (
+ (name, Some (
List.fold_right
(fun id res ->
NotationPt.Binder (`Lambda,(id,None),res))
k_names @
List.map (fun _ -> NotationPt.Implicit `JustOne)
(List.tl args) @
- [mk_appl (name::abs)])))
- | _ -> mk_id name,None
- ) cargs in
+ [mk_appl (name::abs)]))))::acc, nih + 1
+ | _ -> (mk_id name,None)::acc,nih
+ ) ([],0) cargs in
+ let cargs_and_recursive_args, nih = cargs_recargs_nih in
let cargs,recursive_args = List.split cargs_and_recursive_args in
let recursive_args = HExtlib.filter_map (fun x -> x) recursive_args in
- NotationPt.Pattern (name,None,List.map (fun x -> x,None) cargs),
- mk_appl (name_of_k name :: cargs @ recursive_args)
+ (NotationPt.Pattern (name,None,List.map (fun x -> x,None) cargs),
+ mk_appl (name_of_k name :: cargs @ recursive_args)), (name,cargs, nih)
) cl
in
- let bo = NotationPt.Case (rec_arg,Some (ind_name,None),None,branches) in
+ let branches, branch_args = List.split branches_with_args in
+ let bo = NotationPt.Case (rec_arg,Some (ind_name,None),Some p_name,branches) in
+ let final_params =
+ List.map (function name -> name, None) params @
+ [p_name,Some p_ty] @
+ List.map (function name, cargs, nih ->
+ name_of_k name,
+ Some (mk_prods cargs (mk_arrs nih
+ (mk_appl
+ (p_name::HExtlib.mk_list (NotationPt.Implicit `JustOne)
+ (List.length args - 1) @
+ [mk_appl (mk_id name :: params @ cargs)]))))) branch_args @
+ List.map (function name -> name, None) args in
let recno = List.length final_params in
let where = recno - 1 in
let res =
| _ -> assert false
;;
-(* this code should be unified with NTermCicContent.nast_of_cic0,
- but the two contexts have different types *)
-let pp (status: #NCic.status) =
- let rec pp rels =
- function
- NCic.Rel i -> List.nth rels (i - 1)
- | NCic.Const _ as t ->
- NotationPt.Ident
- (status#ppterm ~metasenv:[] ~subst:[] ~context:[] t,None)
- | NCic.Sort s -> NotationPt.Sort (fst (ast_of_sort s))
- | NCic.Meta _
- | NCic.Implicit _ -> assert false
- | NCic.Appl l -> NotationPt.Appl (List.map (pp rels) l)
- | NCic.Prod (n,s,t) ->
- let n = mk_id n in
- NotationPt.Binder (`Pi, (n,Some (pp rels s)), pp (n::rels) t)
- | NCic.Lambda (n,s,t) ->
- let n = mk_id n in
- NotationPt.Binder (`Lambda, (n,Some (pp rels s)), pp (n::rels) t)
- | NCic.LetIn (n,s,ty,t) ->
- let n = mk_id n in
- NotationPt.LetIn ((n, Some (pp rels ty)), pp rels s, pp (n::rels) t)
- | NCic.Match (NReference.Ref (uri,_) as r,outty,te,patterns) ->
- let name = NUri.name_of_uri uri in
- let case_indty = Some (name, None) in
- let constructors, leftno =
- let _,leftno,tys,_,n = NCicEnvironment.get_checked_indtys status r in
- let _,_,_,cl = List.nth tys n in
- cl,leftno
- in
- let rec eat_branch n rels ty pat =
- match (ty, pat) with
- | NCic.Prod (name, s, t), _ when n > 0 ->
- eat_branch (pred n) rels t pat
- | NCic.Prod (_, _, t), NCic.Lambda (name, s, t') ->
- let cv, rhs = eat_branch 0 ((mk_id name)::rels) t t' in
- (mk_id name, Some (pp rels s)) :: cv, rhs
- | _, _ -> [], pp rels pat
- in
- let patterns =
- try
- List.map2
- (fun (_, name, ty) pat ->
- let capture_variables,rhs = eat_branch leftno rels ty pat in
- NotationPt.Pattern (name, None, capture_variables), rhs
- ) constructors patterns
- with Invalid_argument _ -> assert false
- in
- NotationPt.Case (pp rels te, case_indty, Some (pp rels outty), patterns)
- in
- pp
-;;
-
let mk_projection status leftno tyname consname consty (projname,_,_) i =
let argsno = count_prods consty - leftno in
let rec aux names ty leftno =
HExtlib.mk_list underscore i @ [bvar,None] @
HExtlib.mk_list underscore (argsno - i -1) in
let branch = NotationPt.Pattern (consname,None,bvars), bvar in
- let projs,outtype = nth_prod [] i ty in
- let rels =
- List.map
- (fun name -> mk_appl (mk_id name :: List.rev names @ [arg])) projs
- @ names in
- let outtype = pp status rels outtype in
- let outtype= NotationPt.Binder (`Lambda, (arg, Some arg_ty), outtype) in
+ let _,outtype = nth_prod [] i ty in
+ let outtype=
+ NotationPt.Binder (`Lambda, (arg, Some arg_ty), NotationPt.NCic outtype) in
[arg, Some arg_ty], NotationPt.Case (arg,None,Some outtype,[branch])
| _,NCic.Prod (name,_,t) ->
let name = mk_id name in
projects / helm.git / blobdiff