Rémi Bernon : widl: Group <ATTR> tokens together.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: a46facfd8cfa42b073a65257becdc5bbba621471
URL:    https://gitlab.winehq.org/wine/wine/-/commit/a46facfd8cfa42b073a65257becdc5b...

Author: Rémi Bernon <rbernon(a)codeweavers.com>
Date:   Tue Jan 24 22:19:45 2023 +0100

widl: Group <ATTR> tokens together.

---

 tools/widl/parser.l | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/tools/widl/parser.l b/tools/widl/parser.l
index d534b23bf02..02db1cfeeb1 100644
--- 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 ); }