accept carriage returns in source files

2008-02-03  Juerg Billeter  <j@bitron.ch>

	* vala/scanner.l: accept carriage returns in source files

svn path=/trunk/; revision=956

diff --git a/ChangeLog b/ChangeLog
index 68300b2ff8a806bd5a51b975b117d6e06728b408..e70a00b9c579c9f305b8b240fd4b8dde24e85846 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-02-03  Jürg Billeter  <j@bitron.ch>
+
+       * vala/scanner.l: accept carriage returns in source files
+
 2008-02-02  Jürg Billeter  <j@bitron.ch>
 
        * vala/valaproperty.vala: add missing return statement

diff --git a/vala/scanner.l b/vala/scanner.l
index c7f4e55682b91ca9a89f5614e366a83efd27ad58..88445db230a68eea89b4f58bdd4a99712b189651 100644 (file)
--- a/vala/scanner.l
+++ b/vala/scanner.l
@@ -201,7 +201,7 @@ generic_type                        {type_name}("<"{space}{type_name}("?"|"*"+)?(","{space}{type_name
 
 {ident}                        { uploc; yylval->str = g_strdup (yytext); return IDENTIFIER; }
 
-[ \t]+         { uploc; /* eat up whitespace */ }
+[ \t\r]+       { uploc; /* eat up whitespace */ }
 [\n]+          { yylloc->first_line = yylloc->last_line = yylineno; yylloc->first_column = 1; yylloc->last_column = 0; }
 
 .      { uploc; fprintf (stderr, "%d: syntax error: unexpected character ´%s´\n", yylloc->first_line, yytext); }