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 b44ad499484f2f5919d9bf258dde20d4b358de6b..53fb7ab6d63b8cdf5f845f9fe7c68d0d0e72532c 100644 (file)
--- a/helm/software/components/grafite_parser/dependenciesParser.ml
+++ b/helm/software/components/grafite_parser/dependenciesParser.ml
@@ -40,7 +40,7 @@ let pp_dependency = function
 
 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 =
@@ -56,9 +56,11 @@ 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"); '("IDENT", "procedural"); '("QSTRING", fname) >] ->
+      | [< '("IDENT", "inline"); '("QSTRING", fname) >] ->
           true, (InlineDep fname :: acc)
       | [< '("EOI", _) >] -> false, acc
       | [< 'tok >] -> true, acc