X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Fcic_disambiguation%2FdisambiguateChoices.ml;h=bdbc9317908efe7dc29a9f3e11637a7761923ed0;hb=771ee8b9d122fa963881c876e86f90531bb7434f;hp=99f8fca91634c9acb057c8d83beae1d247f6efeb;hpb=8b55faddb06e3c4b0a13839210bb49170939b33e;p=helm.git

diff --git a/helm/ocaml/cic_disambiguation/disambiguateChoices.ml b/helm/ocaml/cic_disambiguation/disambiguateChoices.ml
index 99f8fca91..bdbc93179 100644
--- a/helm/ocaml/cic_disambiguation/disambiguateChoices.ml
+++ b/helm/ocaml/cic_disambiguation/disambiguateChoices.ml
@@ -23,11 +23,12 @@
  * http://helm.cs.unibo.it/
  *)
 
+(* $Id$ *)
+
 open Printf
 
 open DisambiguateTypes
 
-exception Invalid_choice
 exception Choice_not_found of string Lazy.t
 
 let num_choices = ref []
@@ -52,16 +53,17 @@ let mk_choice (dsc, args, appl_pattern) =
       in
       try
         List.combine names cic_args
-      with Invalid_argument _ -> raise Invalid_choice
+      with Invalid_argument _ ->
+       raise (Invalid_choice (lazy "The notation expects a different number of arguments"))
     in
-    CicNotationFwd.instantiate_appl_pattern env' appl_pattern)
+    TermAcicContent.instantiate_appl_pattern env' appl_pattern)
 
 let lookup_symbol_by_dsc symbol dsc =
   try
     mk_choice
       (List.find
         (fun (dsc', _, _) -> dsc = dsc')
-        (CicNotationRew.lookup_interpretations symbol))
-  with CicNotationRew.Interpretation_not_found | Not_found ->
+        (TermAcicContent.lookup_interpretations symbol))
+  with TermAcicContent.Interpretation_not_found | Not_found ->
     raise (Choice_not_found (lazy (sprintf "Symbol %s, dsc %s" symbol dsc)))