X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Ftactics%2FeliminationTactics.ml;h=15645951e29a0af9920195a60dca96ff8ce9d2ec;hb=de9a83f286eee12117fb478ea2db18f7faebac9a;hp=1db11951fed63c9ac2383026412d9e859afe776a;hpb=655906d74521fa49de332f54ec34bfc9d9744151;p=helm.git

diff --git a/helm/ocaml/tactics/eliminationTactics.ml b/helm/ocaml/tactics/eliminationTactics.ml
index 1db11951f..15645951e 100644
--- a/helm/ocaml/tactics/eliminationTactics.ml
+++ b/helm/ocaml/tactics/eliminationTactics.ml
@@ -83,57 +83,6 @@ let interactive_user_uri_choice =
       title:string -> msg:string -> string list -> string list) ref)
 ;;
 
-exception IllFormedUri of string
-
-let cic_textual_parser_uri_of_string uri' =
- try
-  (* Constant *)
-  if String.sub uri' (String.length uri' - 4) 4 = ".con" then
-   CicTextualParser0.ConUri (UriManager.uri_of_string uri')
-  else
-   if String.sub uri' (String.length uri' - 4) 4 = ".var" then
-    CicTextualParser0.VarUri (UriManager.uri_of_string uri')
-   else
-    (try
-      (* Inductive Type *)
-      let uri'',typeno = CicTextualLexer.indtyuri_of_uri uri' in
-       CicTextualParser0.IndTyUri (uri'',typeno)
-     with
-      _ ->
-       (* Constructor of an Inductive Type *)
-       let uri'',typeno,consno =
-        CicTextualLexer.indconuri_of_uri uri'
-       in
-        CicTextualParser0.IndConUri (uri'',typeno,consno)
-    )
- with
-  _ -> raise (IllFormedUri uri')
-;;
-
-(*
-let constructor_uri_of_string uri = 
-  match cic_textual_parser_uri_of_string uri with
-     CicTextualParser0.IndTyUri (uri,typeno) -> (uri,typeno,[])
-   | _ -> assert false
-;;
-
-let call_back uris = 
-(* N.B.: nella finestra c'e' un campo "nessuno deei precedenti, prova questo" che non ha senso? *)
-(* N.B.: in questo passaggio perdo l'informazione su exp_named_subst !!!! *)
-(* domanda: due triple possono essere diverse solo per avere exp_named_subst diverse?? *)
-  let module U = UriManager in 
-   List.map 
-    (constructor_uri_of_string)
-    (!interactive_user_uri_choice 
-      ~selection_mode:`EXTENDED ~ok:"Ok" ~enable_button_for_non_vars:false 
-      ~title:"Decompose" ~msg:"Please, select the Inductive Types to decompose" 
-      (List.map 
-        (function (uri,typeno,_) -> U.string_of_uri uri ^ "#1/" ^ string_of_int (typeno+1)) 
-        uris)
-    ) 
-;;
-*)
-
 let decompose_tac ?(uris_choice_callback=(function l -> l)) term =
  let decompose_tac uris_choice_callback term status =
   let (proof, goal) = status in
@@ -145,9 +94,9 @@ let decompose_tac ?(uris_choice_callback=(function l -> l)) term =
    let _,metasenv,_,_ = proof in
     let _,context,ty = CicUtil.lookup_meta goal metasenv in
      let old_context_len = List.length context in
-     let termty = CicTypeChecker.type_of_aux' metasenv context term in
-
-      let rec make_list termty = 
+     let termty,_ = 
+       CicTypeChecker.type_of_aux' metasenv context term CicUniv.empty_ugraph in
+     let rec make_list termty = 
       (* N.B.: altamente inefficente? *)
        let rec search_inductive_types urilist termty =
         (* search in term the Inductive Types and return a list of uris as triples like this: (uri,typeno,exp_named_subst) *)
@@ -187,7 +136,9 @@ let decompose_tac ?(uris_choice_callback=(function l -> l)) term =
           let _,metasenv,_,_ = proof in
            let _,context,_ = CicUtil.lookup_meta goal metasenv in
             let old_context_len = List.length context in
-            let termty = CicTypeChecker.type_of_aux' metasenv context term' in
+            let termty,_ = 
+	      CicTypeChecker.type_of_aux' metasenv context term' 
+		CicUniv.empty_ugraph in
              warn ("elim_clear termty= " ^ CicPp.ppterm termty);
              match termty with
                 C.MutInd (uri,typeno,exp_named_subst)