summaryrefslogtreecommitdiffstats
path: root/src/glsl/glsl_parser.yy
diff options
context:
space:
mode:
authorKenneth Graunke <[email protected]>2013-07-29 15:27:46 -0700
committerKenneth Graunke <[email protected]>2013-07-31 11:49:30 -0700
commiteb7c8c7fb6e49a04f3fe84a6d438160dc4a14ac0 (patch)
treee7f1b22c0eff4c806978c691d14dce1780107c74 /src/glsl/glsl_parser.yy
parenteed0a80137dfac641adfd39ce316938dbcf2be10 (diff)
glsl: Change the lexer'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]
Diffstat (limited to 'src/glsl/glsl_parser.yy')
-rw-r--r--src/glsl/glsl_parser.yy6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/glsl/glsl_parser.yy b/src/glsl/glsl_parser.yy
index bf312366b85..0b16d1d4a59 100644
--- a/src/glsl/glsl_parser.yy
+++ b/src/glsl/glsl_parser.yy
@@ -39,6 +39,12 @@ static void yyerror(YYLTYPE *loc, _mesa_glsl_parse_state *st, const char *msg)
{
_mesa_glsl_error(loc, st, "%s", msg);
}
+
+static int
+_mesa_glsl_lex(YYSTYPE *val, YYLTYPE *loc, void *scanner)
+{
+ return _mesa_glsl_lexer_lex(val, loc, scanner);
+}
%}
%expect 0