diff options
author | David Gibson <david@gibson.dropbear.id.au> | 2007-12-05 09:50:25 +1100 |
---|---|---|
committer | Jon Loeliger <jdl@freescale.com> | 2007-12-05 08:27:37 -0600 |
commit | 2b67c632df15ab57e5bf1a59f23cbcac8cda6acd (patch) | |
tree | b31777a378e48e89ff057b5b74a5537e3c1f0066 /dtc-lexer.l | |
parent | 459c955cca6adfa393b9279ee595c60e199dbffe (diff) | |
download | device-tree-compiler-2b67c632df15ab57e5bf1a59f23cbcac8cda6acd.tar.gz |
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 <david@gibson.dropbear.id.au>
Diffstat (limited to 'dtc-lexer.l')
-rw-r--r-- | dtc-lexer.l | 8 |
1 files 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("<BYTESTRING>\n"); BEGIN(BYTESTRING); @@ -216,9 +217,6 @@ static int dts_version; /* = 0 */ DPRINT("<PROPNODENAME>\n"); BEGIN(PROPNODENAME); } - DPRINT("Char: %c (\\x%02x)\n", yytext[0], - (unsigned)yytext[0]); - return yytext[0]; } |