many strings that are supposed to be URIs are now UriManager.uri

[helm.git] / helm / ocaml / tactics / eliminationTactics.ml

diff --git a/helm/ocaml/tactics/eliminationTactics.ml b/helm/ocaml/tactics/eliminationTactics.ml
index 1db11951fed63c9ac2383026412d9e859afe776a..d018dc52cf229ca42f1f9087fc2ea5128bc8dd69 100644 (file)
--- a/helm/ocaml/tactics/eliminationTactics.ml
+++ b/helm/ocaml/tactics/eliminationTactics.ml
@@ -27,11 +27,12 @@
 
   (** perform debugging output? *)
 let debug = false
+let debug_print = fun _ -> ()
 
   (** debugging print *)
 let warn s =
   if debug then
-    prerr_endline ("DECOMPOSE: " ^ s)
+    debug_print ("DECOMPOSE: " ^ s)
 
 
 
@@ -83,57 +84,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 +95,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 +137,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)
@@ -210,8 +162,8 @@ let decompose_tac ?(uris_choice_callback=(function l -> l)) term =
                              (T.then_ 
                                 ~start:(
                                   if (term'==term) (* if it's the first application of elim, there's no need to clear the hyp *) 
-                                   then begin prerr_endline ("%%%%%%% no clear"); T.id_tac end
-                                   else begin prerr_endline ("%%%%%%% clear " ^ (string_of_int (new_nr_of_hyp_still_to_elim))); (S.clear ~hyp:(List.nth context (new_nr_of_hyp_still_to_elim))) end)
+                                   then begin debug_print ("%%%%%%% no clear"); T.id_tac end
+                                   else begin debug_print ("%%%%%%% clear " ^ (string_of_int (new_nr_of_hyp_still_to_elim))); (S.clear ~hyp:(List.nth context (new_nr_of_hyp_still_to_elim))) end)
                                 ~continuation:(ProofEngineTypes.mk_tactic (elim_clear_tac ~term':(C.Rel new_nr_of_hyp_still_to_elim) ~nr_of_hyp_still_to_elim:new_nr_of_hyp_still_to_elim)))
                                 status
                         )))