From 2b67c632df15ab57e5bf1a59f23cbcac8cda6acd Mon Sep 17 00:00:00 2001 From: David Gibson Date: Wed, 5 Dec 2007 09:50:25 +1100 Subject: [PATCH] dtc: Trivial lexer cleanups This patch applies a couple of tiny cleanups to the lexer. The not-very-useful 'WS' named pattern is removed, and the debugging printf() for single character tokens is moved to the top of the action, which results in less confusing output when LEXDEBUG is switched on (because it goes before the printf()s for possible resulting lexer state changes). Signed-off-by: David Gibson --- dtc-lexer.l | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dtc-lexer.l b/dtc-lexer.l index 109661d..3c4b798 100644 --- a/dtc-lexer.l +++ b/dtc-lexer.l @@ -29,7 +29,6 @@ PROPNODECHAR [a-zA-Z0-9,._+*#?@-] PATHCHAR ({PROPNODECHAR}|[/]) LEGACYPATHCHAR [a-zA-Z0-9_@/] LABEL [a-zA-Z_][a-zA-Z0-9_]* -WS [[:space:]] %{ #include "dtc.h" @@ -193,7 +192,7 @@ static int dts_version; /* = 0 */ } -<*>{WS}+ /* eat whitespace */ +<*>[[:space:]]+ /* eat whitespace */ <*>"/*"([^*]|\*+[^*/])*\*+"/" { yylloc.filenum = srcpos_filenum; @@ -207,6 +206,8 @@ static int dts_version; /* = 0 */ <*>. { yylloc.filenum = srcpos_filenum; yylloc.first_line = yylineno; + DPRINT("Char: %c (\\x%02x)\n", yytext[0], + (unsigned)yytext[0]); if (yytext[0] == '[') { DPRINT("\n"); BEGIN(BYTESTRING); @@ -216,9 +217,6 @@ static int dts_version; /* = 0 */ DPRINT("\n"); BEGIN(PROPNODENAME); } - DPRINT("Char: %c (\\x%02x)\n", yytext[0], - (unsigned)yytext[0]); - return yytext[0]; }