kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* parse.y (assignable_gen): parser_yyerror takes two arguments.

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25201 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2009-10-02 19:34:28 +00:00
parent ac57952ab9
commit b3525ae1e7
2 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
Sat Oct 3 04:34:25 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* parse.y (assignable_gen): parser_yyerror takes two arguments.
Sat Oct 3 04:07:52 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/rake: updated to rake code to rake-0.8.7 source code base.

16
parse.y
View file

@ -5226,7 +5226,7 @@ parser_nextc(struct parser_params *parser)
rb_str_buf_cat(parser->delayed,
parser->tokp, lex_pend - parser->tokp);
parser->delayed_line = ruby_sourceline;
parser->delayed_col = parser->tokp - lex_pbeg;
parser->delayed_col = (int)(parser->tokp - lex_pbeg);
}
else {
rb_str_buf_cat(parser->delayed,
@ -6354,7 +6354,7 @@ parser_yylex(struct parser_params *parser)
rb_encoding *enc;
int mb;
#ifdef RIPPER
int fallthru = Qfalse;
int fallthru = FALSE;
#endif
if (lex_strterm) {
@ -6416,7 +6416,7 @@ parser_yylex(struct parser_params *parser)
lex_p = lex_pend;
#ifdef RIPPER
ripper_dispatch_scan_event(parser, tCOMMENT);
fallthru = Qtrue;
fallthru = TRUE;
#endif
/* fall through */
case '\n':
@ -6430,7 +6430,7 @@ parser_yylex(struct parser_params *parser)
if (!fallthru) {
ripper_dispatch_scan_event(parser, tIGNORED_NL);
}
fallthru = Qfalse;
fallthru = FALSE;
#endif
goto retry;
default:
@ -6528,7 +6528,7 @@ parser_yylex(struct parser_params *parser)
/* skip embedded rd document */
if (strncmp(lex_p, "begin", 5) == 0 && ISSPACE(lex_p[5])) {
#ifdef RIPPER
int first_p = Qtrue;
int first_p = TRUE;
lex_goto_eol(parser);
ripper_dispatch_scan_event(parser, tEMBDOC_BEG);
@ -6539,7 +6539,7 @@ parser_yylex(struct parser_params *parser)
if (!first_p) {
ripper_dispatch_scan_event(parser, tEMBDOC);
}
first_p = Qfalse;
first_p = FALSE;
#endif
c = nextc();
if (c == -1) {
@ -8014,7 +8014,7 @@ assignable_gen(struct parser_params *parser, ID id, NODE *val)
#ifdef RIPPER
ID id = get_id(lhs);
# define assignable_result(x) get_value(lhs)
# define parser_yyerror(x) dispatch1(assign_error, lhs)
# define parser_yyerror(parser, x) dispatch1(assign_error, lhs)
#else
# define assignable_result(x) x
#endif
@ -9721,7 +9721,7 @@ parser_initialize(struct parser_params *parser)
parser->result = Qnil;
parser->parsing_thread = Qnil;
parser->toplevel_p = Qtrue;
parser->toplevel_p = TRUE;
#endif
#ifdef YYMALLOC
parser->heap = NULL;