removed abstractios for dummy metavariables when generating letins body

[helm.git] / components / grafite_parser / dependenciesParser.ml

diff --git a/components/grafite_parser/dependenciesParser.ml b/components/grafite_parser/dependenciesParser.ml
index 686caa5b108bbf9e0c971f19c1fecebbe3b8b2b8..5e80d8b4c8279d118cd8c92dd03172bd78b304eb 100644 (file)
--- a/components/grafite_parser/dependenciesParser.ml
+++ b/components/grafite_parser/dependenciesParser.ml
@@ -45,6 +45,12 @@ let parse_dependencies lexbuf =
   let rec parse acc = 
    try
     (parser
+    | [< '("QSTRING", s) >] ->
+        (* because of alias id qstring = qstring :-( *)
+        (try
+          parse (UriDep (UriManager.uri_of_string s) :: acc)
+         with
+          UriManager.IllFormedUri _ -> parse acc)
     | [< '("URI", u) >] ->
         parse (UriDep (UriManager.uri_of_string u) :: acc)
     | [< '("IDENT", "include"); '("QSTRING", fname) >] ->
@@ -55,7 +61,8 @@ let parse_dependencies lexbuf =
     | [< 'tok >] -> parse acc
     | [<  >] -> acc) tok_stream
    with
-    Stream.Error _ -> parse acc
+      Stream.Error _ -> parse acc
+    | CicNotationLexer.Error _ -> parse acc
   in
   List.rev (parse [])
 
@@ -86,4 +93,4 @@ let baseuri_of_script ~include_paths file =
  let uri = Http_getter_misc.strip_trailing_slash buri in
  if String.length uri < 5 || String.sub uri 0 5 <> "cic:/" then
    HLog.error (file ^ " sets an incorrect baseuri: " ^ buri);
- uri
+ uri,file