diff options
| author | Kenneth Graunke <[email protected]> | 2013-07-29 15:55:06 -0700 |
|---|---|---|
| committer | Kenneth Graunke <[email protected]> | 2013-07-31 11:52:06 -0700 |
| commit | de917b4c4c4dfc949d5f8e3d9eb2dd48b63a3de5 (patch) | |
| tree | c42badf1369077a7306971d29ef979934f06d600 | |
| parent | f043381334a0760ec118d07b6fb7785b5692572a (diff) | |
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 <[email protected]>
Reviewed-by: Matt Turner <[email protected]>
Tested-by: Laurent Carlier <[email protected]>
Cc: "9.2" [email protected]
| -rw-r--r-- | src/mesa/program/program_lexer.l | 2 | ||||
| -rw-r--r-- | src/mesa/program/program_parse.y | 11 |
2 files changed, 10 insertions, 3 deletions
diff --git a/src/mesa/program/program_lexer.l b/src/mesa/program/program_lexer.l index 0947bb0462c..d5dbcf347b3 100644 --- a/src/mesa/program/program_lexer.l +++ b/src/mesa/program/program_lexer.l @@ -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 %% diff --git a/src/mesa/program/program_parse.y b/src/mesa/program/program_parse.y index e2da633477d..6415bef765f 100644 --- a/src/mesa/program/program_parse.y +++ b/src/mesa/program/program_parse.y @@ -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); +} %} %% |