Experimental enhancements to the ndestruct tactic. By using the syntax

[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 6aee803f42578cf16cb04a5187856470c2f3c48a..7ce0407e85d58e24a481f023b024a0eb49159368 100644 (file)
--- a/helm/software/components/grafite_parser/grafiteDisambiguate.ml
+++ b/helm/software/components/grafite_parser/grafiteDisambiguate.ml
@@ -81,12 +81,18 @@ let ncic_mk_choice = function
         ~term_of_nref:(fun nref -> NCic.Const nref)
        name dsc
   | LexiconAst.Number_alias (_, dsc) -> 
-       let desc,f = DisambiguateChoices.lookup_num_by_dsc dsc in
-       desc, `Num_interp
+     (try
+       let desc,f = DisambiguateChoices.nlookup_num_by_dsc dsc in
+        desc, `Num_interp
+         (fun num -> match f with `Num_interp f -> f num | _ -> assert false)
+      with
+       DisambiguateChoices.Choice_not_found _ ->
+        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)))
+              (match f with `Num_interp f -> f num | _ -> assert false))))
   | LexiconAst.Ident_alias (name, uri) -> 
      uri, `Sym_interp 
       (fun l->assert(l = []);
@@ -301,15 +307,18 @@ let disambiguate_reduction_kind text prefix_len lexicon_status_ref = function
 ;;
 
 let disambiguate_auto_params 
-  disambiguate_term metasenv context (terms, params) 
+  disambiguate_term metasenv context (oterms, params) 
 =
-    let metasenv, terms = 
-      List.fold_right 
-       (fun t (metasenv, terms) ->
-         let metasenv,t = disambiguate_term context metasenv t in
-         metasenv,t::terms) terms (metasenv, [])
-    in
-    metasenv, (terms, params)
+  match oterms with 
+    | None -> metasenv, (None, params)
+    | Some terms ->
+       let metasenv, terms = 
+         List.fold_right 
+           (fun t (metasenv, terms) ->
+               let metasenv,t = disambiguate_term context metasenv t in
+                metasenv,t::terms) terms (metasenv, [])
+       in
+         metasenv, (Some terms, params)
 ;;
 
 let disambiguate_just disambiguate_term context metasenv =