OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mesa/program: Change the program parser's namespace.

Browse Source 
Bison 3.0 removes the YYLEX_PARAM macro.  In preparation for handling
this using %lex-param, the parser needs a wrapper function for the
actual Flex lex() function.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=67354
Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Matt Turner <mattst88@gmail.com>
Tested-by: Laurent Carlier <lordheavym@gmail.com>
Cc: "9.2" mesa-stable@lists.freedesktop.org
This commit is contained in:
Kenneth Graunke
2013-07-29 15:55:06 -07:00
parent f043381334
commit de917b4c4c
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/mesa/program/program_lexer.l
View File

@@ -165,7 +165,7 @@ szf [HR]?
cc C? cc C?
sat (_SAT)? sat (_SAT)?
%option prefix="_mesa_program_" %option prefix="_mesa_program_lexer_"
%option bison-bridge bison-locations reentrant noyywrap %option bison-bridge bison-locations reentrant noyywrap
%% %%

11
src/mesa/program/program_parse.y
View File

@@ -269,8 +269,15 @@ static struct asm_instruction *asm_instruction_copy_ctor(
%type <negate> optionalSign %type <negate> optionalSign
%{ %{
extern int yylex(YYSTYPE *yylval_param, YYLTYPE *yylloc_param, extern int
void *yyscanner); _mesa_program_lexer_lex(YYSTYPE *yylval_param, YYLTYPE *yylloc_param,
void *yyscanner);
static int
yylex(YYSTYPE *yylval_param, YYLTYPE *yylloc_param, void *yyscanner)
{
return _mesa_program_lexer_lex(yylval_param, yylloc_param, yyscanner);
}
%} %}
%% %%