X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fgrafite_parser%2FgrafiteDisambiguate.ml;h=47e7a86276ad3fe2af11f54c35bb14421ac15065;hb=75de1f4c87166f120d8bb42d98926adaf407c98c;hp=516c4af20301e1a6946995cbe44c60fd05491448;hpb=5649890273cf8e660bba744e84ce5fee1e5efe69;p=helm.git

diff --git a/helm/software/components/grafite_parser/grafiteDisambiguate.ml b/helm/software/components/grafite_parser/grafiteDisambiguate.ml
index 516c4af20..47e7a8627 100644
--- a/helm/software/components/grafite_parser/grafiteDisambiguate.ml
+++ b/helm/software/components/grafite_parser/grafiteDisambiguate.ml
@@ -120,6 +120,18 @@ let disambiguate_auto_params
     metasenv, (terms, params)
 ;;
 
+let disambiguate_just disambiguate_term context metasenv =
+ function
+    `Term t ->
+      let metasenv,t = disambiguate_term context metasenv t in
+       metasenv, `Term t
+  | `Auto params ->
+      let metasenv,params = disambiguate_auto_params disambiguate_term metasenv
+       context params
+      in
+       metasenv, `Auto params
+;;
+      
 let rec disambiguate_tactic 
   lexicon_status_ref context metasenv (text,prefix_len,tactic) 
 =
@@ -195,6 +207,9 @@ let rec disambiguate_tactic
     | GrafiteAst.Apply (loc, term) ->
         let metasenv,cic = disambiguate_term context metasenv term in
         metasenv,GrafiteAst.Apply (loc, cic)
+    | GrafiteAst.ApplyP (loc, term) ->
+        let metasenv,cic = disambiguate_term context metasenv term in
+        metasenv,GrafiteAst.ApplyP (loc, cic)
     | GrafiteAst.ApplyS (loc, term, params) ->
         let metasenv, params = disambiguate_auto_params metasenv params in
         let metasenv,cic = disambiguate_term context metasenv term in
@@ -204,9 +219,10 @@ let rec disambiguate_tactic
     | GrafiteAst.AutoBatch (loc,params) ->
         let metasenv, params = disambiguate_auto_params metasenv params in
         metasenv,GrafiteAst.AutoBatch (loc,params)
-    | GrafiteAst.Cases (loc, what, idents) ->
+    | GrafiteAst.Cases (loc, what, pattern, idents) ->
         let metasenv,what = disambiguate_term context metasenv what in
-        metasenv,GrafiteAst.Cases (loc, what, idents)
+	let pattern = disambiguate_pattern pattern in
+        metasenv,GrafiteAst.Cases (loc, what, pattern, idents)
     | GrafiteAst.Change (loc, pattern, with_what) -> 
         let with_what = disambiguate_lazy_term with_what in
         let pattern = disambiguate_pattern pattern in
@@ -339,14 +355,11 @@ let rec disambiguate_tactic
 	          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.Bydone (loc,just) ->
+        let metasenv,just =
+         disambiguate_just disambiguate_term context metasenv just
+        in
+	 metasenv,GrafiteAst.Bydone (loc, just)
     | GrafiteAst.We_need_to_prove (loc,term,id,term') ->
         let metasenv,cic = disambiguate_term context metasenv term in
 	let metasenv,cic' = 
@@ -356,13 +369,9 @@ let rec disambiguate_tactic
 	          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
+    | GrafiteAst.By_just_we_proved (loc,just,term',id,term'') ->
+        let metasenv,just =
+         disambiguate_just disambiguate_term context metasenv just in
         let metasenv,cic' = disambiguate_term context metasenv term' in
 	let metasenv,cic'' = 
 	    match term'' with
@@ -370,7 +379,7 @@ let rec disambiguate_tactic
 	   |  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'')
+	metasenv,GrafiteAst.By_just_we_proved (loc,just,cic',id,cic'')
     | GrafiteAst.We_proceed_by_cases_on (loc, term, term') ->
         let metasenv,cic = disambiguate_term context metasenv term in
 	let metasenv,cic' = disambiguate_term context metasenv term' in
@@ -385,21 +394,18 @@ let rec disambiguate_tactic
    | 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 =
-           match term with
-             None -> metasenv,None
-           | Some t ->
-                 let metasenv,t = disambiguate_term context metasenv t in
-                 metasenv,Some t in
+   | GrafiteAst.ExistsElim (loc, just, id1, term1, id2, term2) ->
+	let metasenv,just =
+         disambiguate_just disambiguate_term context metasenv just in
         let metasenv,cic' = disambiguate_term context metasenv term1 in
 	let cic''= disambiguate_lazy_term 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
+	metasenv,GrafiteAst.ExistsElim(loc, just, id1, cic', id2, cic'')
+   | GrafiteAst.AndElim (loc, just, id, term1, id1, term2) ->
+	let metasenv,just =
+         disambiguate_just disambiguate_term context metasenv just 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'')   
+	metasenv,GrafiteAst.AndElim(loc, just, id, cic', id1, cic'')   
    | GrafiteAst.Case (loc, id, params) ->
         let metasenv,params' =
 	 List.fold_right
@@ -467,7 +473,12 @@ let disambiguate_command lexicon_status ?baseuri metasenv (text,prefix_len,cmd)=
        in
        let metasenv,key = disambiguate_term_option metasenv key in
        !lexicon_status_ref, metasenv,GrafiteAst.Index(loc,key,uri)
-   | GrafiteAst.Coercion _
+   | GrafiteAst.Coercion (loc,t,b,a,s) -> 
+       let lexicon_status_ref = ref lexicon_status in 
+       let disambiguate_term =
+	 disambiguate_term text prefix_len lexicon_status_ref [] in
+      let metasenv,t = disambiguate_term metasenv t in
+      !lexicon_status_ref, metasenv, GrafiteAst.Coercion (loc,t,b,a,s)
    | GrafiteAst.Default _
    | GrafiteAst.Drop _
    | GrafiteAst.Include _
@@ -502,6 +513,8 @@ let disambiguate_macro
   lexicon_status_ref metasenv context (text,prefix_len, macro) 
 =
  let disambiguate_term = disambiguate_term text prefix_len lexicon_status_ref in
+  let disambiguate_reduction_kind = 
+    disambiguate_reduction_kind text prefix_len lexicon_status_ref in
   match macro with
    | GrafiteAst.WMatch (loc,term) ->
       let metasenv,term = disambiguate_term context metasenv term in
@@ -518,6 +531,10 @@ let disambiguate_macro
    | GrafiteAst.Check (loc,term) ->
       let metasenv,term = disambiguate_term context metasenv term in
        metasenv,GrafiteAst.Check (loc,term)
+   | GrafiteAst.Eval (loc,kind,term) ->
+      let metasenv, term = disambiguate_term context metasenv term in
+      let kind = disambiguate_reduction_kind kind in
+       metasenv,GrafiteAst.Eval (loc,kind,term)
    | GrafiteAst.AutoInteractive (loc, params) -> 
       let metasenv, params = 
         disambiguate_auto_params disambiguate_term metasenv context params in