Fixes:

[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 58666eed5b43a6b217d9f000b00784408ff3a15a..b02732543b0c541504cd1d82778b5cad43fa8a1a 100644 (file)
--- a/helm/software/components/grafite_parser/grafiteDisambiguate.ml
+++ b/helm/software/components/grafite_parser/grafiteDisambiguate.ml
@@ -45,21 +45,6 @@ let singleton msg = function
       in
       HLog.debug debug; assert false
 
-(*
-let cic_codomain_of_uri uri =
-  (UriManager.string_of_uri uri,
-   let term =
-     try
-       CicUtil.term_of_uri uri
-     with exn ->
-       assert false
-    in
-   fun _ _ _ -> term)
-;;
-*)
-
-(*let cic_num_choices = DisambiguateChoices.lookup_num_choices;;*)
-
 let __Implicit = "__Implicit__"
 let __Closed_Implicit = "__Closed_Implicit__"
 
@@ -78,7 +63,38 @@ let cic_mk_choice = function
       (fun l->assert(l = []);CicUtil.term_of_uri (UriManager.uri_of_string uri))
 ;;
 
-let cic_mk_implicit b =
+let ncic_mk_choice = function
+  | LexiconAst.Symbol_alias (name, _, dsc) ->
+     if name = __Implicit then
+       dsc, `Sym_interp (fun _ -> NCic.Implicit `Term)
+     else if name = __Closed_Implicit then 
+       dsc, `Sym_interp (fun _ -> NCic.Implicit `Closed)
+     else
+       DisambiguateChoices.lookup_symbol_by_dsc 
+        ~mk_implicit:(function 
+           | true -> NCic.Implicit `Closed
+           | false -> NCic.Implicit `Term)
+        ~mk_appl:(function 
+           (NCic.Appl l)::tl -> NCic.Appl (l@tl) | l -> NCic.Appl l)
+        ~term_of_uri:(fun uri ->
+           fst (OCic2NCic.convert_term uri (CicUtil.term_of_uri uri)))
+       name dsc
+  | LexiconAst.Number_alias (_, dsc) -> 
+       let desc,f = DisambiguateChoices.lookup_num_by_dsc dsc in
+       desc, `Num_interp
+         (fun num -> 
+            fst (OCic2NCic.convert_term 
+              (UriManager.uri_of_string "cic:/xxx/x.con") 
+              (match f with `Num_interp f -> f num | _ -> assert false)))
+  | LexiconAst.Ident_alias (name, uri) -> 
+     uri, `Sym_interp 
+      (fun l->assert(l = []);
+      let uri = UriManager.uri_of_string uri in
+       fst (OCic2NCic.convert_term uri (CicUtil.term_of_uri uri)))
+;;
+
+
+let mk_implicit b =
   match b with
   | false -> 
       LexiconAst.Symbol_alias (__Implicit,-1,"Fake Implicit")
@@ -86,28 +102,6 @@ let cic_mk_implicit b =
       LexiconAst.Symbol_alias (__Closed_Implicit,-1,"Fake Closed Implicit")
 ;;
 
-let ncic_codomain_of_uri uri =
-  (UriManager.string_of_uri uri,
-   let term =
-     try
-       fst (OCic2NCic.convert_term uri (CicUtil.term_of_uri uri))
-     with exn ->
-       assert false
-    in
-   fun _ _ _ -> term)
-;;
-   
-let ncic_num_choices _ = (*assert false*) [];;
-let ncic_mk_choice = 
-  DisambiguateChoices.mk_choice
-  ~mk_implicit:(function 
-     | true -> NCic.Implicit `Closed
-     | false -> NCic.Implicit `Term)
-  ~mk_appl:(function (NCic.Appl l)::tl -> NCic.Appl (l@tl) | l -> NCic.Appl l)
-  ~term_of_uri:(fun uri ->
-       fst (OCic2NCic.convert_term uri (CicUtil.term_of_uri uri)))
-;;
-
 let lookup_in_library 
   interactive_user_uri_choice input_or_locate_uri item 
 =
@@ -169,7 +163,7 @@ term =
         ?goal ~universe:(Some lexicon_status.LexiconEngine.multi_aliases)
         ~lookup_in_library
         ~mk_choice:cic_mk_choice
-        ~mk_implicit:cic_mk_implicit
+        ~mk_implicit
         ~description_of_alias:LexiconAst.description_of_alias
         ~context ~metasenv ~subst:[] (text,prefix_len,term))
   in
@@ -191,7 +185,7 @@ let disambiguate_lazy_term goal text prefix_len lexicon_status_ref term =
         (CicDisambiguate.disambiguate_term 
           ~lookup_in_library
           ~mk_choice:cic_mk_choice
-          ~mk_implicit:cic_mk_implicit
+          ~mk_implicit
           ~description_of_alias:LexiconAst.description_of_alias
           ~initial_ugraph:ugraph ~aliases:lexicon_status.LexiconEngine.aliases
           ~universe:(Some lexicon_status.LexiconEngine.multi_aliases)
@@ -576,17 +570,19 @@ let disambiguate_obj lexicon_status ?baseuri metasenv (text,prefix_len,obj) =
          | None -> raise BaseUriNotSetYet)
     | CicNotationPt.Inductive _ -> assert false
     | CicNotationPt.Theorem _ -> None in
-(*
+  (*
   (match obj with
       CicNotationPt.Theorem (_,_,ty,_) ->
        (try
          (match 
           NCicDisambiguate.disambiguate_term
-           ~lookup_in_library:(lookup_in_library ncic_codomain_of_uri
-           ncic_mk_choice ncic_num_choices)
+           ~lookup_in_library:lookup_in_library
+           ~description_of_alias:LexiconAst.description_of_alias
+           ~mk_choice:ncic_mk_choice
+           ~mk_implicit
            ~context:[] ~metasenv:[] ~subst:[]
-           ~aliases:DisambiguateTypes.Environment.empty
-           ~universe:(Some DisambiguateTypes.Environment.empty)
+        ~aliases:lexicon_status.LexiconEngine.aliases
+        ~universe:(Some lexicon_status.LexiconEngine.multi_aliases) 
            (text,prefix_len,ty)
          with
          | [_,metasenv,subst,ty],_ ->
@@ -603,13 +599,13 @@ let disambiguate_obj lexicon_status ?baseuri metasenv (text,prefix_len,obj) =
        )
     | _ -> ()
   ); 
-*)
+  *)
   let (diff, metasenv, _, cic, _) =
     singleton "third"
       (CicDisambiguate.disambiguate_obj 
         ~lookup_in_library 
         ~mk_choice:cic_mk_choice
-        ~mk_implicit:cic_mk_implicit
+        ~mk_implicit
         ~description_of_alias:LexiconAst.description_of_alias
         ~aliases:lexicon_status.LexiconEngine.aliases
         ~universe:(Some lexicon_status.LexiconEngine.multi_aliases) ~uri