From: Juerg Billeter <j@bitron.ch>
Date: Sun, 3 Feb 2008 16:18:23 +0000 (+0000)
Subject: accept carriage returns in source files
X-Git-Tag: VALA_0_1_7~135
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eda3f8a5344d9cdec551390ef500efc41af9a05b;p=thirdparty%2Fvala.git

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 68300b2ff..e70a00b9c 100644
--- 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 c7f4e5568..88445db23 100644
--- 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); }