X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Fcic_disambiguation%2Fdisambiguate.ml;h=54478c81a795862a8c89349a010ccd8ce954f5ae;hb=d8dd9228da904dd64317ef87e0f1b499af8606ba;hp=7237c8fb72d0d5acc664e438ac2a0795618dd4a3;hpb=d62461c7f4d79e6f87aa454dab636c2db3a3e7bc;p=helm.git

diff --git a/helm/ocaml/cic_disambiguation/disambiguate.ml b/helm/ocaml/cic_disambiguation/disambiguate.ml
index 7237c8fb7..54478c81a 100644
--- a/helm/ocaml/cic_disambiguation/disambiguate.ml
+++ b/helm/ocaml/cic_disambiguation/disambiguate.ml
@@ -67,10 +67,11 @@ let refine metasenv context term ugraph =
 	(Ok (term', metasenv')),ugraph1
     with
       | CicRefine.Uncertain _ ->
-          debug_print ("%%% UNCERTAIN!!! " ^ CicPp.ppterm term) ;
+          debug_print ("UNCERTAIN!!! " ^ CicPp.ppterm term) ;
           Uncertain,ugraph
-      | CicRefine.RefineFailure _ ->
-          debug_print ("%%% PRUNED!!! " ^ CicPp.ppterm term) ;
+      | CicRefine.RefineFailure msg ->
+          debug_print (sprintf "PRUNED!!!\nterm%s\nmessage:%s"
+            (CicPp.ppterm term) msg);
           Ko,ugraph
       | CicUnification.UnificationFailure s -> 
 	 prerr_endline ("PASSADI QUI: " ^ s);
@@ -79,7 +80,9 @@ let refine metasenv context term ugraph =
 let resolve (env: environment) (item: domain_item) ?(num = "") ?(args = []) () =
   try
     snd (Environment.find item env) env num args
-  with Not_found -> assert false
+  with Not_found -> 
+    failwith ("Domain item not found: " ^ 
+      (DisambiguateTypes.string_of_domain_item item))
 
   (* TODO move it to Cic *)
 let find_in_environment name context =
@@ -447,7 +450,7 @@ module Make (C: Callbacks) =
         uris
 
     let disambiguate_term ~(dbd:Mysql.dbd) context metasenv term
-      ?(initial_ugraph = CicUniv.empty_ugraph)  ~aliases:current_env
+      ?(initial_ugraph = CicUniv.empty_ugraph) ~aliases:current_env
     =
       debug_print "NEW DISAMBIGUATE INPUT";
       let disambiguate_context =  (* cic context -> disambiguate context *)
@@ -605,3 +608,25 @@ module Make (C: Callbacks) =
         failwith "Disambiguate: circular dependency"
   end
 
+module Trivial =
+struct
+  exception Ambiguous_term of string
+  exception Exit
+  module Callbacks =
+  struct
+    let interactive_user_uri_choice ~selection_mode ?ok
+          ?(enable_button_for_non_vars = true) ~title ~msg ~id uris =
+              raise Exit
+    let interactive_interpretation_choice interp = raise Exit
+    let input_or_locate_uri ~(title:string) ?id = raise Exit
+  end
+  module Disambiguator = Make (Callbacks)
+  let disambiguate_string ~dbd ?(context=[]) ?(metasenv=[]) ?initial_ugraph
+        ?(aliases=DisambiguateTypes.Environment.empty) term =
+    let ast = CicTextualParser2.parse_term (Stream.of_string term) in
+    try
+      Disambiguator.disambiguate_term ~dbd context metasenv ast ?initial_ugraph
+        ~aliases
+    with Exit -> raise (Ambiguous_term term)
+end
+