widl: Introduce a new helper to produce num tokens.

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

Showing with 8 additions and 8 deletions

parser.l tools/widl/parser.l +8 -8

No files found.
--- a/tools/widl/parser.l
+++ b/tools/widl/parser.l
@@ -131,6 +131,12 @@ struct uuid *parse_uuid(const char *u)
  return uuid;
 }

+static int token_num( int token, const char *yytext, YYSTYPE *yylval )
+{
+    yylval->num = xstrtoul( yytext, NULL, 0 );
+    return token;
+}
+
 %}

 /*
@@ -227,14 +233,8 @@ SAFEARRAY{ws}*/\(	return tSAFEARRAY;
    ^{ws}*\#{ws}*                               { yy_push_state(PP_LINE); }
    \[                                          { yy_push_state(ATTR); return '['; }

-    {hex}                                       {
-                                                    yylval->num = xstrtoul(yytext, NULL, 0);
-                                                    return aHEXNUM;
-                                                }
-    {int}                                       {
-                                                    yylval->num = xstrtoul(yytext, NULL, 0);
-                                                    return aNUM;
-                                                }
+    {hex}                                       { return token_num( aHEXNUM, yytext, yylval ); }
+    {int}                                       { return token_num( aNUM, yytext, yylval ); }

    \n                                          { line_number++; }
    {ws}                                        {}