mirror of
https://gitlab.freedesktop.org/mesa/mesa.git
synced 2026-05-04 22:49:13 +02:00
mesa/program: Change the program parser's namespace.
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
(cherry picked from commit de917b4c4c)
This commit is contained in:
parent
b319e3975e
commit
06aee8a56c
2 changed files with 10 additions and 3 deletions
|
|
@ -165,7 +165,7 @@ szf [HR]?
|
|||
cc C?
|
||||
sat (_SAT)?
|
||||
|
||||
%option prefix="_mesa_program_"
|
||||
%option prefix="_mesa_program_lexer_"
|
||||
%option bison-bridge bison-locations reentrant noyywrap
|
||||
%%
|
||||
|
||||
|
|
|
|||
|
|
@ -269,8 +269,15 @@ static struct asm_instruction *asm_instruction_copy_ctor(
|
|||
%type <negate> optionalSign
|
||||
|
||||
%{
|
||||
extern int yylex(YYSTYPE *yylval_param, YYLTYPE *yylloc_param,
|
||||
void *yyscanner);
|
||||
extern int
|
||||
_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);
|
||||
}
|
||||
%}
|
||||
|
||||
%%
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue