From 12b80db8a06a9586f2c384ac825602b4acaffe9f Mon Sep 17 00:00:00 2001 From: nagachika Date: Fri, 16 Aug 2013 16:22:11 +0000 Subject: [PATCH] merge revision(s) 42282: [Backport #8785] * parse.y: fix build error with bison-3.0. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@42590 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ parse.y | 9 ++++++--- version.h | 2 +- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index a9af951a46..2bd5f717ac 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Sat Aug 17 00:42:12 2013 Kazuhiro NISHIYAMA + + * parse.y: fix build error with bison-3.0. + Sat Aug 17 00:39:20 2013 NAKAMURA Usaku * test/webrick/test_cgi.rb (TestWEBrickCGI#{start_cgi_server,test_cgi}): diff --git a/parse.y b/parse.y index 1bdba058e1..01db8bdd44 100644 --- a/parse.y +++ b/parse.y @@ -306,8 +306,6 @@ struct parser_params { static int parser_yyerror(struct parser_params*, const char*); #define yyerror(msg) parser_yyerror(parser, (msg)) -#define YYLEX_PARAM parser - #define lex_strterm (parser->parser_lex_strterm) #define lex_state (parser->parser_lex_state) #define cond_stack (parser->parser_cond_stack) @@ -350,7 +348,11 @@ static int parser_yyerror(struct parser_params*, const char*); #define ruby_coverage (parser->coverage) #endif +#if YYPURE static int yylex(void*, void*); +#else +static int yylex(void*); +#endif #ifndef RIPPER #define yyparse ruby_yyparse @@ -680,7 +682,8 @@ static void token_info_pop(struct parser_params*, const char *token); #endif %} -%pure_parser +%pure-parser +%lex-param {struct parser_params *parser} %parse-param {struct parser_params *parser} %union { diff --git a/version.h b/version.h index 8c80c234d9..6ffc82c6c6 100644 --- a/version.h +++ b/version.h @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.0.0" #define RUBY_RELEASE_DATE "2013-08-17" -#define RUBY_PATCHLEVEL 294 +#define RUBY_PATCHLEVEL 295 #define RUBY_RELEASE_YEAR 2013 #define RUBY_RELEASE_MONTH 8