X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2FgTopLevel%2Fcic2acic.ml;h=d7688499c7cbfe497d6e30485cf3341cef98b1d1;hb=ee35bf33520d92753899985329cc4bfee141b808;hp=08cb06d9d93b8dcc49a827223fd1b2d7e629c01c;hpb=06e9498bf967323fe12d6383ec7b279a4546a06c;p=helm.git diff --git a/helm/gTopLevel/cic2acic.ml b/helm/gTopLevel/cic2acic.ml index 08cb06d9d..d7688499c 100644 --- a/helm/gTopLevel/cic2acic.ml +++ b/helm/gTopLevel/cic2acic.ml @@ -47,13 +47,13 @@ let rec get_nth l n = | (_,_) -> raise NotEnoughElements ;; -let acic_of_cic_env' seed ids_to_terms ids_to_father_ids ids_to_inner_sorts - ids_to_inner_types metasenv env t +let acic_of_cic_context' seed ids_to_terms ids_to_father_ids ids_to_inner_sorts + ids_to_inner_types metasenv context t = let module T = CicTypeChecker in let module C = Cic in let fresh_id' = fresh_id seed ids_to_terms ids_to_father_ids in - let rec aux computeinnertypes father bs tt = + let rec aux computeinnertypes father context tt = let fresh_id'' = fresh_id' father tt in let aux' = aux true (Some fresh_id'') in (* First of all we compute the inner type and the inner sort *) @@ -69,19 +69,18 @@ let acic_of_cic_env' seed ids_to_terms ids_to_father_ids ids_to_inner_sorts | _ -> assert false in let ainnertype,innertype,innersort = - let cicenv = List.map (function (_,ty) -> ty) bs in (*CSC: Here we need the algorithm for Coscoy's double type-inference *) (*CSC: (expected type + inferred type). Just for now we use the usual *) (*CSC: type-inference, but the result is very poort. As a very weak *) (*CSC: patch, I apply whd to the computed type. Full beta *) (*CSC: reduction would be a much better option. *) let innertype = - CicReduction.whd cicenv (T.type_of_aux' metasenv cicenv tt) + CicReduction.whd context (T.type_of_aux' metasenv context tt) in - let innersort = T.type_of_aux' metasenv cicenv innertype in + let innersort = T.type_of_aux' metasenv context innertype in let ainnertype = if computeinnertypes then - Some (aux false (Some fresh_id'') bs innertype) + Some (aux false (Some fresh_id'') context innertype) else None in @@ -95,8 +94,8 @@ let acic_of_cic_env' seed ids_to_terms ids_to_father_ids ids_to_inner_sorts match tt with C.Rel n -> let id = - match get_nth bs n with - (C.Name s,_) -> s + match get_nth context n with + (Some (C.Name s,_)) -> s | _ -> raise NameExpected in Hashtbl.add ids_to_inner_sorts fresh_id'' innersort ; @@ -104,20 +103,24 @@ let acic_of_cic_env' seed ids_to_terms ids_to_father_ids ids_to_inner_sorts | C.Var uri -> Hashtbl.add ids_to_inner_sorts fresh_id'' innersort ; C.AVar (fresh_id'', uri) - | C.Meta n -> + | C.Meta (n,l) -> Hashtbl.add ids_to_inner_sorts fresh_id'' innersort ; - C.AMeta (fresh_id'', n) + C.AMeta (fresh_id'', n, + (List.map + (function None -> None | Some t -> Some (aux' context t)) l)) | C.Sort s -> C.ASort (fresh_id'', s) | C.Implicit -> C.AImplicit (fresh_id'') | C.Cast (v,t) -> Hashtbl.add ids_to_inner_sorts fresh_id'' innersort ; if innersort = "Prop" then add_inner_type fresh_id'' ; - C.ACast (fresh_id'', aux' bs v, aux' bs t) + C.ACast (fresh_id'', aux' context v, aux' context t) | C.Prod (n,s,t) -> Hashtbl.add ids_to_inner_sorts fresh_id'' (string_of_sort innertype) ; - C.AProd (fresh_id'', n, aux' bs s, aux' ((n, C.Decl s)::bs) t) + C.AProd + (fresh_id'', n, aux' context s, + aux' ((Some (n, C.Decl s))::context) t) | C.Lambda (n,s,t) -> Hashtbl.add ids_to_inner_sorts fresh_id'' innersort ; if innersort = "Prop" then @@ -133,15 +136,19 @@ let acic_of_cic_env' seed ids_to_terms ids_to_father_ids ids_to_inner_sorts if not father_is_lambda then add_inner_type fresh_id'' end ; - C.ALambda (fresh_id'',n, aux' bs s, aux' ((n, C.Decl s)::bs) t) + C.ALambda + (fresh_id'',n, aux' context s, + aux' ((Some (n, C.Decl s)::context)) t) | C.LetIn (n,s,t) -> Hashtbl.add ids_to_inner_sorts fresh_id'' innersort ; - C.ALetIn (fresh_id'', n, aux' bs s, aux' ((n, C.Def s)::bs) t) + C.ALetIn + (fresh_id'', n, aux' context s, + aux' ((Some (n, C.Def s))::context) t) | C.Appl l -> Hashtbl.add ids_to_inner_sorts fresh_id'' innersort ; if innersort = "Prop" then add_inner_type fresh_id'' ; - C.AAppl (fresh_id'', List.map (aux' bs) l) + C.AAppl (fresh_id'', List.map (aux' context) l) | C.Const (uri,cn) -> Hashtbl.add ids_to_inner_sorts fresh_id'' innersort ; C.AConst (fresh_id'', uri, cn) @@ -154,11 +161,11 @@ let acic_of_cic_env' seed ids_to_terms ids_to_father_ids ids_to_inner_sorts Hashtbl.add ids_to_inner_sorts fresh_id'' innersort ; if innersort = "Prop" then add_inner_type fresh_id'' ; - C.AMutCase (fresh_id'', uri, cn, tyno, aux' bs outty, - aux' bs term, List.map (aux' bs) patterns) + C.AMutCase (fresh_id'', uri, cn, tyno, aux' context outty, + aux' context term, List.map (aux' context) patterns) | C.Fix (funno, funs) -> - let names = - List.map (fun (name,_,ty,_) -> C.Name name, C.Decl ty) funs + let tys = + List.map (fun (name,_,ty,_) -> Some (C.Name name, C.Decl ty)) funs in Hashtbl.add ids_to_inner_sorts fresh_id'' innersort ; if innersort = "Prop" then @@ -166,95 +173,38 @@ let acic_of_cic_env' seed ids_to_terms ids_to_father_ids ids_to_inner_sorts C.AFix (fresh_id'', funno, List.map (fun (name, indidx, ty, bo) -> - (name, indidx, aux' bs ty, aux' (names@bs) bo) + (name, indidx, aux' context ty, aux' (tys@context) bo) ) funs ) | C.CoFix (funno, funs) -> - let names = - List.map (fun (name,ty,_) -> C.Name name, C.Decl ty) funs in + let tys = + List.map (fun (name,ty,_) -> Some (C.Name name, C.Decl ty)) funs in Hashtbl.add ids_to_inner_sorts fresh_id'' innersort ; if innersort = "Prop" then add_inner_type fresh_id'' ; C.ACoFix (fresh_id'', funno, List.map (fun (name, ty, bo) -> - (name, aux' bs ty, aux' (names@bs) bo) + (name, aux' context ty, aux' (tys@context) bo) ) funs ) in - aux true None env t + aux true None context t ;; -let acic_of_cic_env metasenv env t = +let acic_of_cic_context metasenv context t = let ids_to_terms = Hashtbl.create 503 in let ids_to_father_ids = Hashtbl.create 503 in let ids_to_inner_sorts = Hashtbl.create 503 in let ids_to_inner_types = Hashtbl.create 503 in let seed = ref 0 in - acic_of_cic_env' seed ids_to_terms ids_to_father_ids ids_to_inner_sorts - ids_to_inner_types metasenv env t, + acic_of_cic_context' seed ids_to_terms ids_to_father_ids ids_to_inner_sorts + ids_to_inner_types metasenv context t, ids_to_terms, ids_to_father_ids, ids_to_inner_sorts, ids_to_inner_types ;; exception Found of (Cic.name * Cic.context_entry) list;; -(* get_context_of_meta meta term *) -(* returns the context of the occurrence of [meta] in [term]. *) -(* Warning: if [meta] occurs not linearly in [term], the context *) -(* of one "random" occurrence is returned. *) -let get_context_of_meta meta term = - let module C = Cic in - let rec aux ctx = - function - C.Rel _ - | C.Var _ -> () - | C.Meta i when meta = i -> raise (Found ctx) - | C.Meta _ - | C.Sort _ - | C.Implicit -> () - | C.Cast (te,ty) -> aux ctx te ; aux ctx ty - | C.Prod (n,s,t) -> aux ctx s ; aux ((n, C.Decl s)::ctx) t - | C.Lambda (n,s,t) -> aux ctx s ; aux ((n, C.Decl s)::ctx) t - | C.LetIn (n,s,t) -> aux ctx s ; aux ((n, C.Def s)::ctx) t - | C.Appl l -> List.iter (aux ctx) l - | C.Const _ -> () - | C.Abst _ -> assert false - | C.MutInd _ - | C.MutConstruct _ -> () - | C.MutCase (_,_,_,outt,t,pl) -> - aux ctx outt ; aux ctx t; List.iter (aux ctx) pl - | C.Fix (_,ifl) -> - let counter = ref 0 in - let ctx' = - List.rev_map - (function (name,_,ty,bo) -> - let res = (C.Name name, C.Def (C.Fix (!counter,ifl))) in - incr counter ; - res - ) ifl - @ ctx - in - List.iter (function (_,_,ty,bo) -> aux ctx ty ; aux ctx' bo) ifl - | C.CoFix (_,ifl) -> - let counter = ref 0 in - let ctx' = - List.rev_map - (function (name,ty,bo) -> - let res = (C.Name name, C.Def (C.CoFix (!counter,ifl))) in - incr counter ; - res - ) ifl - @ ctx - in - List.iter (function (_,ty,bo) -> aux ctx ty ; aux ctx' bo) ifl - in - try - aux [] term ; - assert false (* No occurrences found. *) - with - Found context -> context -;; - exception NotImplemented;; let acic_object_of_cic_object obj = @@ -264,10 +214,10 @@ let acic_object_of_cic_object obj = let ids_to_inner_sorts = Hashtbl.create 503 in let ids_to_inner_types = Hashtbl.create 503 in let seed = ref 0 in - let acic_term_of_cic_term_env' = - acic_of_cic_env' seed ids_to_terms ids_to_father_ids ids_to_inner_sorts + let acic_term_of_cic_term_context' = + acic_of_cic_context' seed ids_to_terms ids_to_father_ids ids_to_inner_sorts ids_to_inner_types in - let acic_term_of_cic_term' = acic_term_of_cic_term_env' [] [] in + let acic_term_of_cic_term' = acic_term_of_cic_term_context' [] [] in let aobj = match obj with C.Definition (id,bo,ty,params) -> @@ -280,13 +230,32 @@ let acic_object_of_cic_object obj = | C.CurrentProof (id,conjectures,bo,ty) -> let aconjectures = List.map - (function (i,term) -> - let context = get_context_of_meta i bo in - let aterm = acic_term_of_cic_term_env' conjectures context term in - (i, aterm)) - conjectures in - let abo = acic_term_of_cic_term_env' conjectures [] bo in - let aty = acic_term_of_cic_term_env' conjectures [] ty in + (function (i,canonical_context,term) -> + let acanonical_context = + let rec aux = + function + [] -> [] + | (Some (n,C.Decl t))::tl -> + let at = + acic_term_of_cic_term_context' conjectures tl t + in + Some (n,C.ADecl at)::(aux tl) + | (Some (n,C.Def t))::tl -> + let at = + acic_term_of_cic_term_context' conjectures tl t + in + Some (n,C.ADef at)::(aux tl) + | None::tl -> None::(aux tl) + in + aux canonical_context + in + let aterm = + acic_term_of_cic_term_context' conjectures canonical_context term + in + (i, acanonical_context,aterm) + ) conjectures in + let abo = acic_term_of_cic_term_context' conjectures [] bo in + let aty = acic_term_of_cic_term_context' conjectures [] ty in C.ACurrentProof ("mettereaposto",id,aconjectures,abo,aty) | C.InductiveDefinition (tys,params,paramsno) -> raise NotImplemented in