kazu	2013-07-31 22:01:57 +0900 (Wed, 31 Jul 2013)

  New Revision: 42282

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=42282

  Log:
    * parse.y: fix build error with bison-3.0.

  Modified files:
    trunk/ChangeLog
    trunk/parse.y

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 42281)
+++ ChangeLog	(revision 42282)
@@ -1,3 +1,7 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Wed Jul 31 22:01:24 2013  Kazuhiro NISHIYAMA  <zn@m...>
+
+	* parse.y: fix build error with bison-3.0.
+
 Wed Jul 31 21:58:53 2013  Kouhei Sutou  <kou@c...>
 
 	* test/rexml/test_notationdecl_parsetest.rb: Split test patterns.
Index: parse.y
===================================================================
--- parse.y	(revision 42281)
+++ parse.y	(revision 42282)
@@ -304,8 +304,6 @@ struct parser_params { https://github.com/ruby/ruby/blob/trunk/parse.y#L304
 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)
@@ -349,7 +347,11 @@ static int parser_yyerror(struct parser_ https://github.com/ruby/ruby/blob/trunk/parse.y#L347
 #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
@@ -684,7 +686,8 @@ static void token_info_pop(struct parser https://github.com/ruby/ruby/blob/trunk/parse.y#L686
 #endif
 %}
 
-%pure_parser
+%pure-parser
+%lex-param {struct parser_params *parser}
 %parse-param {struct parser_params *parser}
 
 %union {

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/