usa	2013-08-19 18:32:32 +0900 (Mon, 19 Aug 2013)

  New Revision: 42621

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

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

  Modified directories:
    branches/ruby_1_9_3/
  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/parse.y
    branches/ruby_1_9_3/version.h
Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 42620)
+++ ruby_1_9_3/ChangeLog	(revision 42621)
@@ -1,3 +1,7 @@ https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/ChangeLog#L1
+Mon Aug 19 18:31:26 2013  Kazuhiro NISHIYAMA  <zn@m...>
+
+	* parse.y: fix build error with bison-3.0.
+
 Fri Aug 16 15:35:10 2013  Tadayoshi Funaba  <tadf@d...>
 
 	* ext/date/date_{core,strftime}.c: [ruby-core:46990].
Index: ruby_1_9_3/parse.y
===================================================================
--- ruby_1_9_3/parse.y	(revision 42620)
+++ ruby_1_9_3/parse.y	(revision 42621)
@@ -277,8 +277,6 @@ struct parser_params { https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/parse.y#L277
 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)
@@ -319,7 +317,11 @@ static int parser_yyerror(struct parser_ https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/parse.y#L317
 #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
@@ -610,7 +612,8 @@ static void token_info_pop(struct parser https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/parse.y#L612
 #endif
 %}
 
-%pure_parser
+%pure-parser
+%lex-param {struct parser_params *parser}
 %parse-param {struct parser_params *parser}
 
 %union {
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 42620)
+++ ruby_1_9_3/version.h	(revision 42621)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/version.h#L1
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 466
+#define RUBY_PATCHLEVEL 467
 
-#define RUBY_RELEASE_DATE "2013-08-16"
+#define RUBY_RELEASE_DATE "2013-08-19"
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 8
-#define RUBY_RELEASE_DAY 16
+#define RUBY_RELEASE_DAY 19
 
 #include "ruby/version.h"
 

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


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