зеркало из https://github.com/github/ruby.git
* parse.y: fix build error with bison-3.0.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@42282 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
Родитель
43f944dcf1
Коммит
434826c0e9
|
@ -1,3 +1,7 @@
|
|||
Wed Jul 31 22:01:24 2013 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
|
||||
|
||||
* parse.y: fix build error with bison-3.0.
|
||||
|
||||
Wed Jul 31 21:58:53 2013 Kouhei Sutou <kou@cozmixng.org>
|
||||
|
||||
* test/rexml/test_notationdecl_parsetest.rb: Split test patterns.
|
||||
|
|
9
parse.y
9
parse.y
|
@ -304,8 +304,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)
|
||||
|
@ -349,7 +347,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
|
||||
|
@ -684,7 +686,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 {
|
||||
|
|
Загрузка…
Ссылка в новой задаче