compose tactic restore and added nocomposites keyword

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

diff --git a/components/grafite_parser/dependenciesParser.ml b/components/grafite_parser/dependenciesParser.ml
index fc49de60009b78462ebecdbc54ec322cd5fba412..eb33e49b80d7b5f453dbadb433851f7de3e96556 100644 (file)
--- a/components/grafite_parser/dependenciesParser.ml
+++ b/components/grafite_parser/dependenciesParser.ml
@@ -25,6 +25,17 @@
 
 (* $Id$ *)
 
+(* FG
+ * From Cambridge dictionary
+ * Dependency:
+ * a country which is supported and governed by another country
+ * Dependence:
+ * when you need something or someone all the time, especially in order to
+ * continue existing or operating
+ *
+ * Fate vobis ...
+ *)
+
 exception UnableToInclude of string
 
   (* statements meaningful for matitadep *)
@@ -43,7 +54,14 @@ let parse_dependencies lexbuf =
     CicNotationLexer.level2_ast_lexer.Token.tok_func (Obj.magic lexbuf)
   in
   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) >] ->
@@ -53,6 +71,9 @@ let parse_dependencies lexbuf =
     | [< '("EOI", _) >] -> acc
     | [< 'tok >] -> parse acc
     | [<  >] -> acc) tok_stream
+   with
+      Stream.Error _ -> parse acc
+    | CicNotationLexer.Error _ -> parse acc
   in
   List.rev (parse [])
 
@@ -62,7 +83,9 @@ let make_absolute paths path =
    | p :: tl ->
       let path = p ^ "/" ^ path in
        try
-         ignore (Unix.stat path); path
+         ignore (Unix.stat path);
+         HLog.debug ("Including "^path^" with path: " ^ p);
+         path
        with Unix.Unix_error _ -> aux tl
    in
    try
@@ -83,10 +106,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);
- (try 
-   ignore(Http_getter.resolve uri)
- with
- | Http_getter_types.Unresolvable_URI _ -> 
-     HLog.error (file ^ " sets an unresolvable baseuri: " ^ buri)
- | Http_getter_types.Key_not_found _ -> ());
- uri
+ uri,file