X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=components%2Fgrafite_parser%2FdependenciesParser.ml;h=686caa5b108bbf9e0c971f19c1fecebbe3b8b2b8;hb=dd5b7e474d70a87846f977f887d045f77342ae62;hp=fc49de60009b78462ebecdbc54ec322cd5fba412;hpb=7f2444c2670cadafddd8785b687ef312158376b0;p=helm.git diff --git a/components/grafite_parser/dependenciesParser.ml b/components/grafite_parser/dependenciesParser.ml index fc49de600..686caa5b1 100644 --- a/components/grafite_parser/dependenciesParser.ml +++ b/components/grafite_parser/dependenciesParser.ml @@ -43,6 +43,7 @@ let parse_dependencies lexbuf = CicNotationLexer.level2_ast_lexer.Token.tok_func (Obj.magic lexbuf) in let rec parse acc = + try (parser | [< '("URI", u) >] -> parse (UriDep (UriManager.uri_of_string u) :: acc) @@ -53,6 +54,8 @@ let parse_dependencies lexbuf = | [< '("EOI", _) >] -> acc | [< 'tok >] -> parse acc | [< >] -> acc) tok_stream + with + Stream.Error _ -> parse acc in List.rev (parse []) @@ -83,10 +86,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