widl: Group <ATTR> tokens together.

a46facfd · Rémi Bernon · Alexandre Julliard · 832d6985 · a46facfd
Commit a46facfd authored Jan 24, 2023 by Rémi Bernon Committed by Alexandre Julliard Mar 17, 2023
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 6 deletions

parser.l tools/widl/parser.l +10 -6

No files found.
--- a/tools/widl/parser.l
+++ b/tools/widl/parser.l
@@ -199,12 +199,16 @@ struct uuid *parse_uuid(const char *u)
 <SQUOTE>\\\'	addcchar(yytext[1]);
 <QUOTE,WSTRQUOTE,SQUOTE>\\.	addcchar('\\'); addcchar(yytext[1]);
 <QUOTE,WSTRQUOTE,SQUOTE>.	addcchar(yytext[0]);
-<ATTR>\]		yy_pop_state(); return ']';
-<ATTR>{cident}		return attr_token(yytext, yylval);
-<ATTR>{uuid}			{
-				yylval->uuid = parse_uuid(yytext);
-				return aUUID;
-			}
+
+<ATTR>{
+    \]                                          { yy_pop_state(); return ']'; }
+
+    {cident}                                    { return attr_token( yytext, yylval ); }
+    {uuid}                                      {
+                                                    yylval->uuid = parse_uuid( yytext );
+                                                    return aUUID;
+                                                }
+}

 <INITIAL>{
    ^{ws}*\#{ws}*pragma{ws}+                    { yy_push_state( PP_PRAGMA ); }