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