diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-08-19 09:32:32 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-08-19 09:32:32 +0000 |
commit | 37cdb7c147fc8189b21f309b022cbf3ecdc4c62b (patch) | |
tree | 17852f2e53c2313e897da457e31e515eae35db0d | |
parent | 768cfdd50bf53bbb10498906a7aa49a91ca008db (diff) |
merge revision(s) 42282: [Backport #8785]
* parse.y: fix build error with bison-3.0.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@42621 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | parse.y | 9 | ||||
-rw-r--r-- | version.h | 6 |
3 files changed, 13 insertions, 6 deletions
@@ -1,3 +1,7 @@ +Mon Aug 19 18:31:26 2013 Kazuhiro NISHIYAMA <zn@mbf.nifty.com> + + * parse.y: fix build error with bison-3.0. + Fri Aug 16 15:35:10 2013 Tadayoshi Funaba <tadf@dotrb.org> * ext/date/date_{core,strftime}.c: [ruby-core:46990]. @@ -277,8 +277,6 @@ struct parser_params { 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_params*, const char*); #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_params*, const char *token); #endif %} -%pure_parser +%pure-parser +%lex-param {struct parser_params *parser} %parse-param {struct parser_params *parser} %union { @@ -1,10 +1,10 @@ #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" |