Metasenv added as parameter to eta_fixing.

[helm.git] / helm / ocaml / cic_omdoc / cic2acic.ml

diff --git a/helm/ocaml/cic_omdoc/cic2acic.ml b/helm/ocaml/cic_omdoc/cic2acic.ml
index 495cb0405ddc55bcde5987b085132fdbe0df45db..bf686ac4e6e1781cf505d6e8330cf86dd3542cf9 100644 (file)
--- a/helm/ocaml/cic_omdoc/cic2acic.ml
+++ b/helm/ocaml/cic_omdoc/cic2acic.ml
@@ -414,30 +414,30 @@ 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 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
@@ -445,28 +445,27 @@ 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' =
-            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
@@ -519,8 +518,8 @@ let acic_object_of_cic_object ?(eta_fix=true) obj =
               (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)) ;