archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-17 17:43:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

merge revision(s) 42282: [Backport #8785]

Browse source 
* parse.y: fix build error with bison-3.0.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@42590 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagachika 2013-08-16 16:22:11 +00:00
parent 98905e2201
commit 12b80db8a0
3 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
Sat Aug 17 00:42:12 2013 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
* parse.y: fix build error with bison-3.0.
Sat Aug 17 00:39:20 2013 NAKAMURA Usaku <usa@ruby-lang.org> Sat Aug 17 00:39:20 2013 NAKAMURA Usaku <usa@ruby-lang.org>
* test/webrick/test_cgi.rb (TestWEBrickCGI#{start_cgi_server,test_cgi}): * test/webrick/test_cgi.rb (TestWEBrickCGI#{start_cgi_server,test_cgi}):

9
parse.y
View file

@ -306,8 +306,6 @@ struct parser_params {
static int parser_yyerror(struct parser_params*, const char*); static int parser_yyerror(struct parser_params*, const char*);
#define yyerror(msg) parser_yyerror(parser, (msg)) #define yyerror(msg) parser_yyerror(parser, (msg))
#define YYLEX_PARAM parser
#define lex_strterm (parser->parser_lex_strterm) #define lex_strterm (parser->parser_lex_strterm)
#define lex_state (parser->parser_lex_state) #define lex_state (parser->parser_lex_state)
#define cond_stack (parser->parser_cond_stack) #define cond_stack (parser->parser_cond_stack)
@ -350,7 +348,11 @@ static int parser_yyerror(struct parser_params*, const char*);
#define ruby_coverage (parser->coverage) #define ruby_coverage (parser->coverage)
#endif #endif
#if YYPURE
static int yylex(void*, void*); static int yylex(void*, void*);
#else
static int yylex(void*);
#endif
#ifndef RIPPER #ifndef RIPPER
#define yyparse ruby_yyparse #define yyparse ruby_yyparse
@ -680,7 +682,8 @@ static void token_info_pop(struct parser_params*, const char *token);
#endif #endif
%} %}
%pure_parser %pure-parser
%lex-param {struct parser_params *parser}
%parse-param {struct parser_params *parser} %parse-param {struct parser_params *parser}
%union { %union {

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.0.0" #define RUBY_VERSION "2.0.0"
#define RUBY_RELEASE_DATE "2013-08-17" #define RUBY_RELEASE_DATE "2013-08-17"
#define RUBY_PATCHLEVEL 294 #define RUBY_PATCHLEVEL 295
#define RUBY_RELEASE_YEAR 2013 #define RUBY_RELEASE_YEAR 2013
#define RUBY_RELEASE_MONTH 8 #define RUBY_RELEASE_MONTH 8