X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=components%2Facic_content%2FtermAcicContent.ml;h=257d2440ba87b66c93e6863f660e715318bb0d35;hb=699d76ddae765f0a927648cddf624b540743f225;hp=cda76ce0914e44ccaae48e2f716fba326a9b8346;hpb=213cc7cf3c9da7c024b44b54e07035b831f7a31f;p=helm.git

diff --git a/components/acic_content/termAcicContent.ml b/components/acic_content/termAcicContent.ml
index cda76ce09..257d2440b 100644
--- a/components/acic_content/termAcicContent.ml
+++ b/components/acic_content/termAcicContent.ml
@@ -44,17 +44,17 @@ type term_info =
 let get_types uri =
   let o,_ = CicEnvironment.get_obj CicUniv.empty_ugraph uri in
     match o with
-      | Cic.InductiveDefinition (l,_,_,_) -> l 
+      | Cic.InductiveDefinition (l,_,lpsno,_) -> l, lpsno 
       | _ -> assert false
 
 let name_of_inductive_type uri i = 
-  let types = get_types uri in
+  let types, _ = get_types uri in
   let (name, _, _, _) = try List.nth types i with Not_found -> assert false in
   name
 
   (* returns <name, type> pairs *)
 let constructors_of_inductive_type uri i =
-  let types = get_types uri in
+  let types, _ = get_types uri in
   let (_, _, _, constructors) = 
     try List.nth types i with Not_found -> assert false
   in
@@ -66,6 +66,9 @@ let constructor_of_inductive_type uri i j =
     fst (List.nth (constructors_of_inductive_type uri i) (j-1))
   with Not_found -> assert false)
 
+  (* returns the number of left parameters *)
+let left_params_no_of_inductive_type uri =
+   snd (get_types uri)
 
 let ast_of_acic0 term_info acic k =
   let k = k term_info in
@@ -120,7 +123,7 @@ let ast_of_acic0 term_info acic k =
           k s, k t))
     | Cic.AAppl (aid,(Cic.AConst _ as he::tl as args))
     | Cic.AAppl (aid,(Cic.AMutInd _ as he::tl as args))
-    | Cic.AAppl (aid,(Cic.AMutConstruct _ as he::tl as args)) ->
+    | Cic.AAppl (aid,(Cic.AMutConstruct _ as he::tl as args)) as t ->
        let last_n n l =
          let rec aux =
           function
@@ -140,14 +143,17 @@ let ast_of_acic0 term_info acic k =
                idref aid (Ast.Appl (l@tl))
            | l -> idref aid (Ast.Appl l)
        in
-       let deannot_he = Deannotate.deannotate_term he in
-       if CoercGraph.is_a_coercion deannot_he && !Acic2content.hide_coercions
-       then
-         match CoercGraph.is_a_coercion_to_funclass deannot_he with
-         | None -> idref aid (last_n 1 (List.map k tl))
-         | Some i -> idref aid (last_n (i+1) (List.map k tl))
-       else
-        idref aid (Ast.Appl (List.map k args))
+       (match LibraryObjects.destroy_nat t with
+       | Some n -> idref aid (Ast.Num (string_of_int n, -1))
+       | None ->
+           let deannot_he = Deannotate.deannotate_term he in
+           if CoercDb.is_a_coercion' deannot_he && !Acic2content.hide_coercions
+           then
+             (match CoercDb.is_a_coercion_to_funclass deannot_he with
+             | None -> idref aid (last_n 1 (List.map k tl))
+             | Some i -> idref aid (last_n (i+1) (List.map k tl)))
+           else
+             idref aid (Ast.Appl (List.map k args)))
     | Cic.AAppl (aid,args) ->
         idref aid (Ast.Appl (List.map k args))
     | Cic.AConst (id,uri,substs) ->
@@ -175,10 +181,12 @@ let ast_of_acic0 term_info acic k =
         in
         let case_indty = name, Some (UriManager.uri_of_string puri_str) in
         let constructors = constructors_of_inductive_type uri typeno in
-        let rec eat_branch ty pat =
+        let lpsno = left_params_no_of_inductive_type uri in
+	let rec eat_branch n ty pat =
           match (ty, pat) with
+	  | Cic.Prod (_, _, t), _ when n > 0 -> eat_branch (pred n) t pat 
           | Cic.Prod (_, _, t), Cic.ALambda (_, name, s, t') ->
-              let (cv, rhs) = eat_branch t t' in
+              let (cv, rhs) = eat_branch 0 t t' in
               (CicNotationUtil.name_of_cic_name name, Some (k s)) :: cv, rhs
           | _, _ -> [], k pat
         in
@@ -188,9 +196,9 @@ let ast_of_acic0 term_info acic k =
             List.map2
               (fun (name, ty) pat ->
                 incr j;
-                let (capture_variables, rhs) = eat_branch ty pat in
-                ((name, Some (ctor_puri !j), capture_variables), rhs))
-              constructors patterns
+                let (capture_variables, rhs) = eat_branch lpsno ty pat in
+                Ast.Pattern (name, Some (ctor_puri !j), capture_variables), rhs
+              ) constructors patterns
           with Invalid_argument _ -> assert false
         in
         idref id (Ast.Case (k te, Some case_indty, Some (k ty), patterns))