diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-10-02 19:34:28 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-10-02 19:34:28 +0000 |
commit | b3525ae1e792e12e69f25d32962e8146d0b93f9b (patch) | |
tree | 46ff49fc23be5f2f915cca7cea0582209713502e /parse.y | |
parent | ac57952ab99cf6573d5e79e4885ec4c8f7ef04cf (diff) |
* parse.y (assignable_gen): parser_yyerror takes two arguments.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25201 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'parse.y')
-rw-r--r-- | parse.y | 16 |
1 files changed, 8 insertions, 8 deletions
@@ -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; |