Improved exception catching.

diff --git a/helm/ocaml/mathql/mQueryMisc.ml b/helm/ocaml/mathql/mQueryMisc.ml
index 311596baa3e4523af9d1a2f4fed6ca91f00b1227..bb5bb74aef24488ef686d449ca7db7fcc58de6fb 100644 (file)
--- a/helm/ocaml/mathql/mQueryMisc.ml
+++ b/helm/ocaml/mathql/mQueryMisc.ml
@@ -57,15 +57,20 @@ let cic_textual_parser_uri_of_string uri' =
       let uri'',typeno = CicTextualLexer.indtyuri_of_uri uri' in
        CicTextualParser0.IndTyUri (uri'',typeno)
      with
-      _ ->
-       (* Constructor of an Inductive Type *)
-       let uri'',typeno,consno =
-        CicTextualLexer.indconuri_of_uri uri'
-       in
-        CicTextualParser0.IndConUri (uri'',typeno,consno)
+        UriManager.IllFormedUri _
+      | CicTextualParser0.LexerFailure _
+      | Invalid_argument _ ->
+         (* Constructor of an Inductive Type *)
+         let uri'',typeno,consno =
+          CicTextualLexer.indconuri_of_uri uri'
+         in
+          CicTextualParser0.IndConUri (uri'',typeno,consno)
     )
  with
-  _ -> raise (IllFormedUri uri')
+    UriManager.IllFormedUri _
+  | CicTextualParser0.LexerFailure _
+  | Invalid_argument _ ->
+     raise (IllFormedUri uri')
 ;;
 let cic_textual_parser_uri_of_string uri' =
   let res = cic_textual_parser_uri_of_string uri' in