X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fgrafite_parser%2FgrafiteDisambiguate.ml;h=e4df929d76b6f42e816a174b31fd74aafc965194;hb=0d1ecc789c6d57a3eef47a028634d316905ef317;hp=04521361ddbb27215c87964a11cb697b37ca5171;hpb=bc76b4d2f3c380894259b45fad52cf85ae6cee18;p=helm.git

diff --git a/helm/software/components/grafite_parser/grafiteDisambiguate.ml b/helm/software/components/grafite_parser/grafiteDisambiguate.ml
index 04521361d..e4df929d7 100644
--- a/helm/software/components/grafite_parser/grafiteDisambiguate.ml
+++ b/helm/software/components/grafite_parser/grafiteDisambiguate.ml
@@ -1,4 +1,4 @@
-(* Copyright (C) 2005, HELM Team.
+(*
  * 
  * This file is part of HELM, an Hypertextual, Electronic
  * Library of Mathematics, developed at the Computer Science
@@ -255,19 +255,92 @@ let disambiguate_tactic
     | GrafiteAst.Assume (loc, id, term) -> 
         let metasenv,cic = disambiguate_term context metasenv term in
         metasenv,GrafiteAst.Assume (loc, id, cic)
-    | GrafiteAst.Suppose (loc, term, id) ->
-        let metasenv,cic = disambiguate_term context metasenv term in 
-	metasenv,GrafiteAst.Suppose (loc, cic, id)
+    | GrafiteAst.Suppose (loc, term, id, term') ->
+        let metasenv,cic = disambiguate_term context metasenv term in
+	let metasenv,cic' =
+	   match term' with
+	      None -> metasenv,None
+	    | Some t ->
+	          let metasenv,t = disambiguate_term context metasenv t in
+		  metasenv,Some t in
+	metasenv,GrafiteAst.Suppose (loc, cic, id, cic')
     | GrafiteAst.Bydone (loc,term) ->
+        let metasenv,cic = 
+	   match term with
+	      None -> metasenv,None
+	     |Some t ->
+                 let metasenv,t = disambiguate_term context metasenv t in
+		 metasenv,Some t in
+	         metasenv,GrafiteAst.Bydone (loc, cic)
+    | GrafiteAst.We_need_to_prove (loc,term,id,term') ->
         let metasenv,cic = disambiguate_term context metasenv term in
-	metasenv,GrafiteAst.Bydone (loc, cic)
-    | GrafiteAst.We_need_to_prove (loc,term,id) ->
+	let metasenv,cic' = 
+	    match term' with
+	      None -> metasenv,None
+	    | Some t ->
+	          let metasenv,t = disambiguate_term context metasenv t in
+		  metasenv,Some t in
+	metasenv,GrafiteAst.We_need_to_prove (loc,cic,id,cic')
+    | GrafiteAst.By_term_we_proved (loc,term,term',id,term'') ->
+        let metasenv,cic =
+	   match term with 
+	     None -> metasenv,None
+	   | Some t ->
+	         let metasenv,t = disambiguate_term context metasenv t in
+		 metasenv,Some t in
+        let metasenv,cic' = disambiguate_term context metasenv term' in
+	let metasenv,cic'' = 
+	    match term'' with
+	      None -> metasenv,None
+	   |  Some t ->  
+	            let metasenv,t = disambiguate_term context metasenv t in
+	             metasenv,Some t in
+	metasenv,GrafiteAst.By_term_we_proved (loc,cic,cic',id,cic'')
+    | GrafiteAst.We_proceed_by_induction_on (loc, term, term') ->
         let metasenv,cic = disambiguate_term context metasenv term in
-	metasenv,GrafiteAst.We_need_to_prove (loc,cic,id)
-    | GrafiteAst.By_term_we_proved (loc,term,term',id) ->
+	let metasenv,cic' = disambiguate_term context metasenv term' in
+	metasenv,GrafiteAst.We_proceed_by_induction_on (loc, cic, cic')
+   | GrafiteAst.Byinduction (loc, term, id) ->
         let metasenv,cic = disambiguate_term context metasenv term in
-        let metasenv,cic' = disambiguate_term context metasenv term' in
-	metasenv,GrafiteAst.By_term_we_proved (loc,cic,cic',id)
+	metasenv,GrafiteAst.Byinduction(loc, cic, id)
+   | GrafiteAst.Thesisbecomes (loc, term) ->
+        let metasenv,cic = disambiguate_term context metasenv term in
+	metasenv,GrafiteAst.Thesisbecomes (loc, cic)
+   | GrafiteAst.ExistsElim (loc, term, id1, term1, id2, term2) ->
+        let metasenv,cic = disambiguate_term context metasenv term in
+        let metasenv,cic' = disambiguate_term context metasenv term1 in
+	let metasenv,cic''= disambiguate_term context metasenv term2 in
+	metasenv,GrafiteAst.ExistsElim(loc, cic, id1, cic', id2, cic'')
+   | GrafiteAst.AndElim (loc, term, id, term1, id1, term2) ->
+	let metasenv,cic = disambiguate_term context metasenv term in
+	let metasenv,cic'= disambiguate_term context metasenv term1 in
+	let metasenv,cic''= disambiguate_term context metasenv term2 in
+	metasenv,GrafiteAst.AndElim(loc, cic, id, cic', id1, cic'')   
+   | GrafiteAst.Case (loc, id, params) ->
+        let metasenv,params' =
+	 List.fold_right
+	  (fun (id,term) (metasenv,params) ->
+            let metasenv,cic = disambiguate_term context metasenv term in
+	     metasenv,(id,cic)::params
+	  ) params (metasenv,[])
+	in
+	metasenv,GrafiteAst.Case(loc, id, params')   
+   | GrafiteAst.RewritingStep (loc, term1, term2, term3, cont) ->
+        let metasenv,cic =
+	 match term1 with
+	    None -> metasenv,None
+	  | Some t -> 
+	     let metasenv,t = disambiguate_term context metasenv t in
+	      metasenv,Some t in
+	let metasenv,cic'= disambiguate_term context metasenv term2 in
+        let metasenv,cic'' =
+	 match term3 with
+	    None -> metasenv,None
+	  | Some t -> 
+	     let metasenv,t = disambiguate_term context metasenv t in
+	      metasenv,Some t in
+	metasenv,GrafiteAst.RewritingStep (loc, cic, cic', cic'', cont)   
+
 
 let disambiguate_obj lexicon_status ~baseuri metasenv (text,prefix_len,obj) =
   let uri =