nagachika	2013-08-17 01:22:11 +0900 (Sat, 17 Aug 2013)

  New Revision: 42590

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

  Log:
    merge revision(s) 42282: [Backport #8785]
    
    * parse.y: fix build error with bison-3.0.

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/ChangeLog
    branches/ruby_2_0_0/parse.y
    branches/ruby_2_0_0/version.h
Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 42589)
+++ ruby_2_0_0/ChangeLog	(revision 42590)
@@ -1,3 +1,7 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Sat Aug 17 00:42:12 2013  Kazuhiro NISHIYAMA  <zn@m...>
+
+	* parse.y: fix build error with bison-3.0.
+
 Sat Aug 17 00:39:20 2013  NAKAMURA Usaku  <usa@r...>
 
 	* test/webrick/test_cgi.rb (TestWEBrickCGI#{start_cgi_server,test_cgi}):
Index: ruby_2_0_0/parse.y
===================================================================
--- ruby_2_0_0/parse.y	(revision 42589)
+++ ruby_2_0_0/parse.y	(revision 42590)
@@ -306,8 +306,6 @@ struct parser_params { https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/parse.y#L306
 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_ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/parse.y#L348
 #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 https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/parse.y#L682
 #endif
 %}
 
-%pure_parser
+%pure-parser
+%lex-param {struct parser_params *parser}
 %parse-param {struct parser_params *parser}
 
 %union {
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 42589)
+++ ruby_2_0_0/version.h	(revision 42590)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1
 #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

Property changes on: ruby_2_0_0
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r42282


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