X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=matita%2Fcomponents%2Fgrafite_parser%2FdependenciesParser.ml;h=6b0142bf12233a544c2dd2f34b3b18c3b064d366;hb=f6b7c6ae353e014761a3d24dbc87e00d828d7f2d;hp=53fb7ab6d63b8cdf5f845f9fe7c68d0d0e72532c;hpb=42aa528129728611cae9da02904886522b08f94a;p=helm.git diff --git a/matita/components/grafite_parser/dependenciesParser.ml b/matita/components/grafite_parser/dependenciesParser.ml index 53fb7ab6d..6b0142bf1 100644 --- a/matita/components/grafite_parser/dependenciesParser.ml +++ b/matita/components/grafite_parser/dependenciesParser.ml @@ -30,12 +30,12 @@ exception UnableToInclude of string (* statements meaningful for matitadep *) type dependency = | IncludeDep of string - | UriDep of UriManager.uri + | UriDep of NUri.uri | InlineDep of string let pp_dependency = function | IncludeDep str -> "include \"" ^ str ^ "\"" - | UriDep uri -> "uri \"" ^ UriManager.string_of_uri uri ^ "\"" + | UriDep uri -> "uri \"" ^ NUri.string_of_uri uri ^ "\"" | InlineDep str -> "inline \"" ^ str ^ "\"" let parse_dependencies lexbuf = @@ -48,12 +48,11 @@ let parse_dependencies lexbuf = (parser | [< '("QSTRING", s) >] -> (* because of alias id qstring = qstring :-( *) - (try - true, (UriDep (UriManager.uri_of_string s) :: acc) - with - UriManager.IllFormedUri _ -> true, acc) + if String.sub s 0 5 <> "cic:/" then true,acc + else + true, (UriDep (NUri.uri_of_string s) :: acc) | [< '("URI", u) >] -> - true, (UriDep (UriManager.uri_of_string u) :: acc) + true, (UriDep (NUri.uri_of_string u) :: acc) | [< '("IDENT", "include"); '("QSTRING", fname) >] -> true, (IncludeDep fname :: acc) | [< '("IDENT", "include"); '("IDENT", "source"); '("QSTRING", fname) >] ->