New version.

[helm.git] / helm / software / components / grafite_parser / grafiteDisambiguate.ml

diff --git a/helm/software/components/grafite_parser/grafiteDisambiguate.ml b/helm/software/components/grafite_parser/grafiteDisambiguate.ml
index c5cfa3b290fbae393fd589095258e1789b5dabc2..9f63a5d8f6bd52a8a1d979d84d8ea957b47f6a93 100644 (file)
--- a/helm/software/components/grafite_parser/grafiteDisambiguate.ml
+++ b/helm/software/components/grafite_parser/grafiteDisambiguate.ml
@@ -41,7 +41,7 @@ let singleton msg = function
   | l, _   ->
       let debug = 
          Printf.sprintf "GrafiteDisambiguate.singleton (%s): %u interpretations"
-        msg (List.length l)
+         msg (List.length l)
       in
       HLog.debug debug; assert false
 
@@ -343,7 +343,7 @@ let rec disambiguate_tactic
         metasenv,GrafiteAst.AutoBatch (loc,params)
     | GrafiteAst.Cases (loc, what, pattern, idents) ->
         let metasenv,what = disambiguate_term context metasenv what in
-       let pattern = disambiguate_pattern pattern in
+        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
@@ -381,20 +381,20 @@ let rec disambiguate_tactic
            metasenv, term :: terms
         in
         let metasenv, terms = List.fold_right map terms (metasenv, []) in 
-       metasenv, GrafiteAst.Destruct(loc, Some terms)
+        metasenv, GrafiteAst.Destruct(loc, Some terms)
     | GrafiteAst.Destruct (loc, None) ->
         metasenv,GrafiteAst.Destruct(loc,None)
     | GrafiteAst.Exact (loc, term) -> 
         let metasenv,cic = disambiguate_term context metasenv term in
         metasenv,GrafiteAst.Exact (loc, cic)
     | GrafiteAst.Elim (loc, what, Some using, pattern, specs) ->
-       let metasenv,what = disambiguate_term context metasenv what in
+        let metasenv,what = disambiguate_term context metasenv what in
         let metasenv,using = disambiguate_term context metasenv using in
-       let pattern = disambiguate_pattern pattern in
+        let pattern = disambiguate_pattern pattern in
         metasenv,GrafiteAst.Elim (loc, what, Some using, pattern, specs)
     | GrafiteAst.Elim (loc, what, None, pattern, specs) ->
-       let metasenv,what = disambiguate_term context metasenv what in
-       let pattern = disambiguate_pattern pattern in
+        let metasenv,what = disambiguate_term context metasenv what in
+        let pattern = disambiguate_pattern pattern in
         metasenv,GrafiteAst.Elim (loc, what, None, pattern, specs)
     | GrafiteAst.ElimType (loc, what, Some using, specs) ->
         let metasenv,what = disambiguate_term context metasenv what in
@@ -470,94 +470,94 @@ let rec disambiguate_tactic
         metasenv,GrafiteAst.Assume (loc, id, cic)
     | 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')
+        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,just) ->
         let metasenv,just =
          disambiguate_just disambiguate_term context metasenv just
         in
-        metasenv,GrafiteAst.Bydone (loc, just)
+         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' = 
-           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')
+        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_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
-             None -> metasenv,None
-          |  Some t ->  
-                   let metasenv,t = disambiguate_term context metasenv t in
-                    metasenv,Some t in
-       metasenv,GrafiteAst.By_just_we_proved (loc,just,cic',id,cic'')
+        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_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
-       metasenv,GrafiteAst.We_proceed_by_cases_on (loc, cic, cic')
+        let metasenv,cic' = disambiguate_term context metasenv term' in
+        metasenv,GrafiteAst.We_proceed_by_cases_on (loc, cic, cic')
     | GrafiteAst.We_proceed_by_induction_on (loc, term, term') ->
         let metasenv,cic = disambiguate_term context metasenv term in
-       let metasenv,cic' = disambiguate_term context metasenv term' in
-       metasenv,GrafiteAst.We_proceed_by_induction_on (loc, cic, cic')
+        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
-       metasenv,GrafiteAst.Byinduction(loc, 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)
+        metasenv,GrafiteAst.Thesisbecomes (loc, cic)
    | GrafiteAst.ExistsElim (loc, just, id1, term1, id2, term2) ->
-       let metasenv,just =
+        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, just, id1, cic', id2, cic'')
+        let cic''= disambiguate_lazy_term term2 in
+        metasenv,GrafiteAst.ExistsElim(loc, just, id1, cic', id2, cic'')
    | GrafiteAst.AndElim (loc, just, id, term1, id1, term2) ->
-       let metasenv,just =
+        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, just, id, cic', id1, cic'')   
+        let metasenv,cic'= disambiguate_term context metasenv term1 in
+        let metasenv,cic''= disambiguate_term context metasenv term2 in
+        metasenv,GrafiteAst.AndElim(loc, just, id, cic', id1, cic'')   
    | GrafiteAst.Case (loc, id, params) ->
         let metasenv,params' =
-        List.fold_right
-         (fun (id,term) (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')   
+             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 (start,t) -> 
-            let metasenv,t = disambiguate_term context metasenv t in
-             metasenv,Some (start,t) in
-       let metasenv,cic'= disambiguate_term context metasenv term2 in
+         match term1 with
+            None -> metasenv,None
+          | Some (start,t) -> 
+             let metasenv,t = disambiguate_term context metasenv t in
+              metasenv,Some (start,t) in
+        let metasenv,cic'= disambiguate_term context metasenv term2 in
         let metasenv,cic'' =
-        match term3 with
+         match term3 with
           | `SolveWith term ->
-            let metasenv,term = disambiguate_term context metasenv term in
+             let metasenv,term = disambiguate_term context metasenv term in
              metasenv, `SolveWith term
-         | `Auto params -> 
+          | `Auto params -> 
               let metasenv, params = disambiguate_auto_params metasenv params in
               metasenv,`Auto params
-         | `Term t -> 
-            let metasenv,t = disambiguate_term context metasenv t in
-             metasenv,`Term t
+          | `Term t -> 
+             let metasenv,t = disambiguate_term context metasenv t in
+              metasenv,`Term t
           | `Proof as t -> metasenv,t in
-       metasenv,GrafiteAst.RewritingStep (loc, cic, cic', cic'', cont)   
+        metasenv,GrafiteAst.RewritingStep (loc, cic, cic', cic'', cont)   
 
 let disambiguate_obj lexicon_status ?baseuri metasenv (text,prefix_len,obj) =
   let uri =
@@ -700,26 +700,32 @@ let disambiguate_command lexicon_status ?baseuri metasenv (text,prefix_len,cmd)=
    | GrafiteAst.Index(loc,key,uri) ->
        let lexicon_status_ref = ref lexicon_status in 
        let disambiguate_term =
-        disambiguate_term None text prefix_len lexicon_status_ref [] in
+         disambiguate_term None text prefix_len lexicon_status_ref [] in
        let disambiguate_term_option metasenv =
-        function
+         function
              None -> metasenv,None
-          | Some t ->
+           | Some t ->
                let metasenv,t = disambiguate_term metasenv t in
-                metasenv, Some t
+                 metasenv, Some t
        in
        let metasenv,key = disambiguate_term_option metasenv key in
        !lexicon_status_ref, metasenv,GrafiteAst.Index(loc,key,uri)
+   | GrafiteAst.PreferCoercion (loc,t) -> 
+       let lexicon_status_ref = ref lexicon_status in 
+       let disambiguate_term =
+         disambiguate_term None text prefix_len lexicon_status_ref [] in
+      let metasenv,t = disambiguate_term metasenv t in
+      !lexicon_status_ref, metasenv, GrafiteAst.PreferCoercion (loc,t)
    | GrafiteAst.Coercion (loc,t,b,a,s) -> 
        let lexicon_status_ref = ref lexicon_status in 
        let disambiguate_term =
-        disambiguate_term None text prefix_len lexicon_status_ref [] in
+         disambiguate_term None 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.UnificationHint (loc, t) ->
        let lexicon_status_ref = ref lexicon_status in 
        let disambiguate_term =
-        disambiguate_term None text prefix_len lexicon_status_ref [] in
+         disambiguate_term None text prefix_len lexicon_status_ref [] in
       let metasenv,t = disambiguate_term metasenv t in
       !lexicon_status_ref, metasenv, GrafiteAst.UnificationHint (loc,t)
    | GrafiteAst.Default _