X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Fcic_omdoc%2Fcic2acic.ml;h=495cb0405ddc55bcde5987b085132fdbe0df45db;hb=fe99a52453c40c840cfaa718e9e2646eaab87763;hp=ab6342b55892acf917bea708f444123b0e6dc5a7;hpb=9be7ec5bbacfafed8a3e37cfe0095f2aea1b9bf9;p=helm.git diff --git a/helm/ocaml/cic_omdoc/cic2acic.ml b/helm/ocaml/cic_omdoc/cic2acic.ml index ab6342b55..495cb0405 100644 --- a/helm/ocaml/cic_omdoc/cic2acic.ml +++ b/helm/ocaml/cic_omdoc/cic2acic.ml @@ -109,7 +109,10 @@ let acic_of_cic_context' seed ids_to_terms ids_to_father_ids ids_to_inner_sorts C.Sort C.Prop -> "Prop" | C.Sort C.Set -> "Set" | C.Sort C.Type -> "Type" - | C.Sort C.CProp -> "CProp" + | C.Sort C.CProp -> "CProp" + | C.Meta _ -> +prerr_endline "Cic2acic: string_of_sort applied to a meta" ; + "?" | _ -> assert false in let ainnertypes,innertype,innersort,expected_available = @@ -411,8 +414,8 @@ let acic_object_of_cic_object ?(eta_fix=true) obj = 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 context t = - if eta_fix then E.eta_fix context t else t + let eta_fix metasenv t = + if eta_fix then E.eta_fix metasenv t else t in let aobj = match obj with @@ -442,6 +445,12 @@ let acic_object_of_cic_object ?(eta_fix=true) obj = ("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' = @@ -456,7 +465,8 @@ let acic_object_of_cic_object ?(eta_fix=true) obj = in let term' = eta_fix conjectures term in (i,canonical_context',term') - ) conjectures + ) conjectures *) + conjectures in let aconjectures = List.map