milestone in basic_2, λδ-2A reconstructed

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

diff --git a/helm/software/components/grafite_parser/dependenciesParser.ml b/helm/software/components/grafite_parser/dependenciesParser.ml
index 32ee44491020b96d3108199858b2a7fe0e8d3c2e..53fb7ab6d63b8cdf5f845f9fe7c68d0d0e72532c 100644 (file)
--- a/helm/software/components/grafite_parser/dependenciesParser.ml
+++ b/helm/software/components/grafite_parser/dependenciesParser.ml
@@ -31,14 +31,16 @@ exception UnableToInclude of string
 type dependency =
   | IncludeDep of string
   | UriDep of UriManager.uri
-  
+  | InlineDep of string
+
 let pp_dependency = function
   | IncludeDep str -> "include \"" ^ str ^ "\""
   | UriDep uri -> "uri \"" ^ UriManager.string_of_uri uri ^ "\""
+  | InlineDep str -> "inline \"" ^ str ^ "\"" 
 
 let parse_dependencies lexbuf = 
   let tok_stream,_ =
-    CicNotationLexer.level2_ast_lexer.Token.tok_func (Obj.magic lexbuf)
+    (CicNotationLexer.level2_ast_lexer ()).Token.tok_func (Obj.magic lexbuf)
   in
   let rec parse acc = 
    let continue, acc =
@@ -54,8 +56,12 @@ let parse_dependencies lexbuf =
           true, (UriDep (UriManager.uri_of_string u) :: acc)
       | [< '("IDENT", "include"); '("QSTRING", fname) >] ->
           true, (IncludeDep fname :: acc)
+      | [< '("IDENT", "include"); '("IDENT", "source"); '("QSTRING", fname) >] ->
+          true, (IncludeDep fname :: acc)
       | [< '("IDENT", "include'"); '("QSTRING", fname) >] ->
           true, (IncludeDep fname :: acc)
+      | [< '("IDENT", "inline"); '("QSTRING", fname) >] ->
+          true, (InlineDep fname :: acc)
       | [< '("EOI", _) >] -> false, acc
       | [< 'tok >] -> true, acc
       | [<  >] -> false, acc) tok_stream