diff options
author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-12-08 08:00:22 +0000 |
---|---|---|
committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-12-08 08:00:22 +0000 |
commit | 2eadd924faba28f8ca3f7b8463f962b6c3bb55a5 (patch) | |
tree | 04bcc5c70bd0c5d25a9f6c1e5f1bb1b2f6c9383f | |
parent | aba207b7620d963e212e4187213db7e1eee7a790 (diff) | |
download | ruby-2eadd924faba28f8ca3f7b8463f962b6c3bb55a5.tar.gz |
merge revision(s) 65667: [Backport #15284]
Fix for bison 3.2 [Bug #15284]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_5@66285 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rwxr-xr-x | tool/ytab.sed | 1 | ||||
-rw-r--r-- | version.h | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/tool/ytab.sed b/tool/ytab.sed index a9599ce0ed..a3b411aa8f 100755 --- a/tool/ytab.sed +++ b/tool/ytab.sed @@ -52,6 +52,7 @@ a\ 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/ @@ -1,10 +1,10 @@ #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" |