nagachika	2018-12-08 17:00:22 +0900 (Sat, 08 Dec 2018)

  New Revision: 66285

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=66285

  Log:
    merge revision(s) 65667: [Backport #15284]
    
    Fix for bison 3.2 [Bug #15284]

  Modified directories:
    branches/ruby_2_5/
  Modified files:
    branches/ruby_2_5/tool/ytab.sed
    branches/ruby_2_5/version.h
Index: ruby_2_5/tool/ytab.sed
===================================================================
--- ruby_2_5/tool/ytab.sed	(revision 66284)
+++ ruby_2_5/tool/ytab.sed	(revision 66285)
@@ -52,6 +52,7 @@ a\ https://github.com/ruby/ruby/blob/trunk/ruby_2_5/tool/ytab.sed#L52
   s/fprintf *(stderr,/YYFPRINTF (parser,/g
 }
 s/\( YYFPRINTF *(\)yyoutput,/\1parser,/
+s/\( YYFPRINTF *(\)yyo,/\1parser,/
 s/\( YYFPRINTF *(\)stderr,/\1parser,/
 s/\( YYDPRINTF *((\)stderr,/\1parser,/
 s/^\([ 	]*\)\(yyerror[ 	]*([ 	]*parser,\)/\1parser_\2/
Index: ruby_2_5/version.h
===================================================================
--- ruby_2_5/version.h	(revision 66284)
+++ ruby_2_5/version.h	(revision 66285)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_5/version.h#L1
 #define RUBY_VERSION "2.5.4"
-#define RUBY_RELEASE_DATE "2018-12-05"
-#define RUBY_PATCHLEVEL 119
+#define RUBY_RELEASE_DATE "2018-12-08"
+#define RUBY_PATCHLEVEL 120
 
 #define RUBY_RELEASE_YEAR 2018
 #define RUBY_RELEASE_MONTH 12
-#define RUBY_RELEASE_DAY 5
+#define RUBY_RELEASE_DAY 8
 
 #include "ruby/version.h"
 
Index: ruby_2_5
===================================================================
--- ruby_2_5	(revision 66284)
+++ ruby_2_5	(revision 66285)

Property changes on: ruby_2_5
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /trunk:r65667

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