Release 2.0.17

[gob-dx.git] / src / lexer.l

diff --git a/src/lexer.l b/src/lexer.l
index 0c8ef11cd4c3f1ffe877888a302df7832fb9fd82..1a58a9ccd6f929f8fddb7a79f5aa49f9b9a3ce97 100644 (file)
--- a/src/lexer.l
+++ b/src/lexer.l
@@ -189,7 +189,7 @@ REJECT;
        g_free(str);
 }
 
-<C_CODE>^#[ \t]*include[ \t][<"][^\n">]*[>"] {
+<C_CODE>^#[ \t]*include[ \t][<"][^\n\r">]*[>"] {
        if(look_for_includes==1) {
                char *p;
                char *file;
@@ -625,13 +625,14 @@ flags             { return FLAGS; }
 
 <CLASS_CODE,CLASS_CODE_I,INITIAL,PROPERTY_CODE,PROPERTY_CODE_I>[\f\t ] ;  /*ignore*/
 
+<*>[\n\r]      ;  /*ignore*/
+
+
 <*>.           {
                        yylval.line = line_no;
                        return yytext[0];
                }
 
-<*>[\n\r]      ;  /*ignore*/
-
 ^[ \t]*prealloc[ \t]+[0-9]+[ \t]*$ {
                        char *p;
                        int t;