CR characters need to be treated as whitespace.

git-svn-id: http://svn.complang.org/ragel/trunk@65 052ea7fc-9027-0410-9066-f65837a77df0

diff --git a/ragel/rlscan.rl b/ragel/rlscan.rl
index c765891..8cbd2f2 100644 (file)
--- a/ragel/rlscan.rl
+++ b/ragel/rlscan.rl
@@ -29,7 +29,6 @@
 #include "avltree.h"
 #include "vector.h"
 
-
 using std::ifstream;
 using std::istream;
 using std::ostream;
@@ -37,6 +36,8 @@ using std::cout;
 using std::cerr;
 using std::endl;
 
+extern char *Parser_lelNames[];
+
 /* This is used for tracking the current stack of include file/machine pairs. It is
  * is used to detect and recursive include structure. */
 struct IncludeStackItem
@@ -328,7 +329,7 @@ void Scanner::token( int type )
 
                        #if 0
                        cerr << "scanner:" << line << ":" << column << 
-                                       ": sending token to the parser " << lelNames[*p];
+                                       ": sending token to the parser " << Parser_lelNames[*p];
                        cerr << " " << toklen;
                        if ( tokdata != 0 )
                                cerr << " " << tokdata;
@@ -750,7 +751,7 @@ void Scanner::endSection( )
                        fgoto main;
                };
 
-               [ \t]+ => { updateCol(); };
+               [ \t\r]+ => { updateCol(); };
 
                # If we are in a single line machine then newline may end the spec.
                NL => {