X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=components%2Fgrafite_parser%2FgrafiteDisambiguate.ml;h=ae4eac52082e91e30f5ad602f230836b162438b3;hb=00d934e7be5c77d8f3ee92d6ee39c2e8fc2d880e;hp=151d8cebdb008d4ab83a22159b391f2ee1944d30;hpb=9e18c7f8aa6c5b905598521c769c1a2f58c13262;p=helm.git

diff --git a/components/grafite_parser/grafiteDisambiguate.ml b/components/grafite_parser/grafiteDisambiguate.ml
index 151d8cebd..ae4eac520 100644
--- a/components/grafite_parser/grafiteDisambiguate.ml
+++ b/components/grafite_parser/grafiteDisambiguate.ml
@@ -123,9 +123,9 @@ let disambiguate_tactic
     | GrafiteAst.Apply (loc, term) ->
         let metasenv,cic = disambiguate_term context metasenv term in
         metasenv,GrafiteAst.Apply (loc, cic)
-    | GrafiteAst.ApplyS (loc, term) ->
+    | GrafiteAst.ApplyS (loc, term, params) ->
         let metasenv,cic = disambiguate_term context metasenv term in
-        metasenv,GrafiteAst.ApplyS (loc, cic)
+        metasenv,GrafiteAst.ApplyS (loc, cic, params)
     | GrafiteAst.Assumption loc ->
         metasenv,GrafiteAst.Assumption loc
     | GrafiteAst.Auto (loc,params) ->
@@ -157,7 +157,7 @@ let disambiguate_tactic
                     metasenv,(GrafiteAst.Type (uri, tyno) :: types)
                 | _ ->
                   raise (GrafiteDisambiguator.DisambiguationError
-                   (0,[[None,lazy "Decompose works only on inductive types"]])))
+                   (0,[[[],[],None,lazy "Decompose works only on inductive types"]])))
         in
         let metasenv,types =
          List.fold_left disambiguate (metasenv,[]) types
@@ -165,9 +165,9 @@ let disambiguate_tactic
          metasenv,GrafiteAst.Decompose (loc, types, what, names)
     | GrafiteAst.Demodulate loc ->
         metasenv,GrafiteAst.Demodulate loc
-    | GrafiteAst.Discriminate (loc,term) ->
+    | GrafiteAst.Destruct (loc,term) ->
         let metasenv,term = disambiguate_term context metasenv term in
-        metasenv,GrafiteAst.Discriminate(loc,term)
+        metasenv,GrafiteAst.Destruct(loc,term)
     | GrafiteAst.Exact (loc, term) -> 
         let metasenv,cic = disambiguate_term context metasenv term in
         metasenv,GrafiteAst.Exact (loc, cic)
@@ -205,9 +205,6 @@ let disambiguate_tactic
         metasenv,GrafiteAst.Goal (loc, g)
     | GrafiteAst.IdTac loc ->
         metasenv,GrafiteAst.IdTac loc
-    | GrafiteAst.Injection (loc, term) ->
-        let metasenv,term = disambiguate_term context metasenv term in
-        metasenv,GrafiteAst.Injection (loc,term)
     | GrafiteAst.Intros (loc, num, names) ->
         metasenv,GrafiteAst.Intros (loc, num, names)
     | GrafiteAst.Inversion (loc, term) ->
@@ -246,8 +243,8 @@ let disambiguate_tactic
         metasenv,GrafiteAst.Ring loc
     | GrafiteAst.Split loc ->
         metasenv,GrafiteAst.Split loc
-    | GrafiteAst.Subst (loc, hyp) ->
-        metasenv, GrafiteAst.Subst (loc, hyp)
+    | GrafiteAst.Subst loc ->
+        metasenv, GrafiteAst.Subst loc
     | GrafiteAst.Symmetry loc ->
         metasenv,GrafiteAst.Symmetry loc
     | GrafiteAst.Transitivity (loc, term) -> 
@@ -365,19 +362,50 @@ let disambiguate_obj lexicon_status ~baseuri metasenv (text,prefix_len,obj) =
   lexicon_status, metasenv, cic
   
 let disambiguate_command lexicon_status ~baseuri metasenv (text,prefix_len,cmd)=
- match cmd with
-  | GrafiteAst.Coercion _
-  | GrafiteAst.Default _
-  | GrafiteAst.Drop _
-  | GrafiteAst.Print _
-  | GrafiteAst.Include _
-  | GrafiteAst.Qed _
-  | GrafiteAst.Set _ as cmd ->
-      lexicon_status,metasenv,cmd
-  | GrafiteAst.Obj (loc,obj) ->
-      let lexicon_status,metasenv,obj =
-       disambiguate_obj lexicon_status ~baseuri metasenv (text,prefix_len,obj)in
-      lexicon_status, metasenv, GrafiteAst.Obj (loc,obj)
+  match cmd with
+   | GrafiteAst.Index(loc,key,uri) ->
+       let lexicon_status_ref = ref lexicon_status in 
+       let disambiguate_term =
+	 disambiguate_term text prefix_len lexicon_status_ref [] in
+       let disambiguate_term_option metasenv =
+	 function
+             None -> metasenv,None
+	   | Some t ->
+               let metasenv,t = disambiguate_term metasenv t in
+		 metasenv, Some t
+       in
+       let metasenv,key = disambiguate_term_option metasenv key in
+       !lexicon_status_ref, metasenv,GrafiteAst.Index(loc,key,uri)
+   | GrafiteAst.Coercion _
+   | GrafiteAst.Default _
+   | GrafiteAst.Drop _
+   | GrafiteAst.Include _
+   | GrafiteAst.Print _
+   | GrafiteAst.Qed _
+   | GrafiteAst.Set _ as cmd ->
+       lexicon_status,metasenv,cmd
+   | GrafiteAst.Obj (loc,obj) ->
+       let lexicon_status,metasenv,obj =
+        disambiguate_obj lexicon_status ~baseuri metasenv (text,prefix_len,obj)in
+       lexicon_status, metasenv, GrafiteAst.Obj (loc,obj)
+   | GrafiteAst.Relation (loc,id,a,aeq,refl,sym,trans) ->
+      let lexicon_status_ref = ref lexicon_status in 
+      let disambiguate_term =
+       disambiguate_term text prefix_len lexicon_status_ref [] in
+      let disambiguate_term_option metasenv =
+       function
+          None -> metasenv,None
+       | Some t ->
+          let metasenv,t = disambiguate_term metasenv t in
+           metasenv, Some t
+      in
+      let metasenv,a = disambiguate_term metasenv a in
+      let metasenv,aeq = disambiguate_term metasenv aeq in
+      let metasenv,refl = disambiguate_term_option metasenv refl in
+      let metasenv,sym = disambiguate_term_option metasenv sym in
+      let metasenv,trans = disambiguate_term_option metasenv trans in
+       !lexicon_status_ref, metasenv,
+        GrafiteAst.Relation (loc,id,a,aeq,refl,sym,trans)
 
 let disambiguate_macro 
   lexicon_status_ref metasenv context (text,prefix_len, macro) 
@@ -400,5 +428,6 @@ let disambiguate_macro
       let metasenv,term = disambiguate_term context metasenv term in
        metasenv,GrafiteAst.Check (loc,term)
    | GrafiteAst.Hint _
-   | GrafiteAst.WLocate _ as macro ->
+   | GrafiteAst.WLocate _
+   | GrafiteAst.Inline _ as macro ->
       metasenv,macro