X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=components%2Fcic_acic%2Fcic2acic.ml;h=bb00476b97b73faf25e2fed68d891855c3a06aaf;hb=241dd3fc882e24a1d3a386a9c612aa8fc720abdb;hp=98b14298274542288534df848c3bedf4303fa78d;hpb=2c31fd0349b612a8dd3fc24046bb1428642cebd5;p=helm.git

diff --git a/components/cic_acic/cic2acic.ml b/components/cic_acic/cic2acic.ml
index 98b142982..bb00476b9 100644
--- a/components/cic_acic/cic2acic.ml
+++ b/components/cic_acic/cic2acic.ml
@@ -82,16 +82,16 @@ let fresh_id seed ids_to_terms ids_to_father_ids =
 
 let source_id_of_id id = "#source#" ^ id;;
 
-exception NotEnoughElements;;
+exception NotEnoughElements of string;;
 
 (*CSC: cut&paste da cicPp.ml *)
 (* get_nth l n   returns the nth element of the list l if it exists or *)
 (* raises NotEnoughElements if l has less than n elements             *)
-let rec get_nth l n =
+let rec get_nth msg l n =
  match (n,l) with
     (1, he::_) -> he
-  | (n, he::tail) when n > 1 -> get_nth tail (n-1)
-  | (_,_) -> raise NotEnoughElements
+  | (n, he::tail) when n > 1 -> get_nth msg tail (n-1)
+  | (_,_) -> raise (NotEnoughElements msg)
 ;;
 
 
@@ -224,7 +224,7 @@ let acic_of_cic_context' ~computeinnertypes:global_computeinnertypes
          match tt with
             C.Rel n ->
              let id =
-              match get_nth context n with
+              match get_nth "1" context n with
                  (Some (C.Name s,_)) -> s
                | _ -> "__" ^ string_of_int n
              in
@@ -508,30 +508,30 @@ let acic_object_of_cic_object ?(eta_fix=false) 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 context t =
+   let eta_fix_and_unshare metasenv context t =
     let t = if eta_fix then E.eta_fix metasenv context t else t in
      Unshare.unshare t in
    let aobj =
     match obj with
       C.Constant (id,Some bo,ty,params,attrs) ->
-       let bo' = (*eta_fix [] []*) bo in
-       let ty' = eta_fix [] [] ty in
+       let bo' = (*eta_fix_and_unshare[] [] bo*) Unshare.unshare bo in
+       let ty' = eta_fix_and_unshare [] [] ty in
        let abo = acic_term_of_cic_term' ~computeinnertypes:true bo' (Some ty') in
        let aty = acic_term_of_cic_term' ~computeinnertypes:false ty' None in
         C.AConstant
          ("mettereaposto",Some "mettereaposto2",id,Some abo,aty,params,attrs)
     | C.Constant (id,None,ty,params,attrs) ->
-       let ty' = eta_fix [] [] ty in
+       let ty' = eta_fix_and_unshare [] [] ty in
        let aty = acic_term_of_cic_term' ~computeinnertypes:false ty' None in
         C.AConstant
          ("mettereaposto",None,id,None,aty,params,attrs)
     | C.Variable (id,bo,ty,params,attrs) ->
-       let ty' = eta_fix [] [] ty in
+       let ty' = eta_fix_and_unshare [] [] ty in
        let abo =
         match bo with
            None -> None
          | Some bo ->
-            let bo' = eta_fix [] [] bo in
+            let bo' = eta_fix_and_unshare [] [] bo in
              Some (acic_term_of_cic_term' ~computeinnertypes:true bo' (Some ty'))
        in
        let aty = acic_term_of_cic_term' ~computeinnertypes:false ty' None in
@@ -548,16 +548,16 @@ let acic_object_of_cic_object ?(eta_fix=false) obj =
                 match d with
                    None -> None
                  | Some (n, C.Decl t)->
-                    Some (n, C.Decl (eta_fix conjectures canonical_context' t))
+                    Some (n, C.Decl (eta_fix_and_unshare conjectures canonical_context' t))
                  | Some (n, C.Def (t,None)) ->
                     Some (n,
-                     C.Def ((eta_fix conjectures canonical_context' t),None))
+                     C.Def ((eta_fix_and_unshare conjectures canonical_context' t),None))
                  | Some (_,C.Def (_,Some _)) -> assert false
                in
                 d::canonical_context'
              ) canonical_context []
            in
-           let term' = eta_fix conjectures canonical_context' term in
+           let term' = eta_fix_and_unshare conjectures canonical_context' term in
             (i,canonical_context',term')
          ) conjectures
        in
@@ -573,7 +573,7 @@ let acic_object_of_cic_object ?(eta_fix=false) obj =
           conjectures' in 
        (* let bo' = eta_fix conjectures' [] bo in *)
        let bo' = bo in
-       let ty' = eta_fix conjectures' [] ty in
+       let ty' = eta_fix_and_unshare conjectures' [] ty in
 (*
        let time2 = Sys.time () in
        prerr_endline
@@ -643,7 +643,7 @@ let plain_acic_term_of_cic_term =
   match t with
      C.Rel n ->
       let idref,id =
-       match get_nth context n with
+       match get_nth "2" context n with
           idref,(Some (C.Name s,_)) -> idref,s
         | idref,_ -> idref,"__" ^ string_of_int n
       in