diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-12-14 08:11:00 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-12-14 08:11:00 +0000 |
commit | 5a565d5c4df425c9c591099cf750f123d432ba7a (patch) | |
tree | b27ef07942485729d2b018bb2f39f0de9a14ca7a | |
parent | 1d7f737553b2d7071fc4e28e4bfaf40778acf9a6 (diff) | |
download | ruby-5a565d5c4df425c9c591099cf750f123d432ba7a.tar.gz |
parse.y: fix line number
* parse.y (parser_params): parser_tokline to track the line number at
which token started. [ruby-dev:46737] [Bug #7559]
* parse.y (fcall): operation with starting line number.
* parse.y (command, primary, method_call): point method name line.
* parse.y (gettable_gen): return token line for __LINE__.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38378 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 11 | ||||
-rw-r--r-- | parse.y | 48 | ||||
-rw-r--r-- | test/ruby/test_syntax.rb | 34 |
3 files changed, 73 insertions, 20 deletions
@@ -1,3 +1,14 @@ +Fri Dec 14 17:10:19 2012 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * parse.y (parser_params): parser_tokline to track the line number at + which token started. [ruby-dev:46737] [Bug #7559] + + * parse.y (fcall): operation with starting line number. + + * parse.y (command, primary, method_call): point method name line. + + * parse.y (gettable_gen): return token line for __LINE__. + Fri Dec 14 16:56:59 2012 Shugo Maeda <shugo@ruby-lang.org> * vm_insnhelper.c (vm_call_super_method): remove volatile introduced @@ -249,6 +249,7 @@ struct parser_params { char *parser_tokenbuf; int parser_tokidx; int parser_toksiz; + int parser_tokline; VALUE parser_lex_input; VALUE parser_lex_lastline; VALUE parser_lex_nextline; @@ -323,6 +324,7 @@ static int parser_yyerror(struct parser_params*, const char*); #define tokenbuf (parser->parser_tokenbuf) #define tokidx (parser->parser_tokidx) #define toksiz (parser->parser_toksiz) +#define tokline (parser->parser_tokline) #define lex_input (parser->parser_lex_input) #define lex_lastline (parser->parser_lex_lastline) #define lex_nextline (parser->parser_lex_nextline) @@ -753,7 +755,7 @@ static void token_info_pop(struct parser_params*, const char *token); %type <node> literal numeric dsym cpath %type <node> top_compstmt top_stmts top_stmt %type <node> bodystmt compstmt stmts stmt_or_begin stmt expr arg primary command command_call method_call -%type <node> expr_value arg_value primary_value +%type <node> expr_value arg_value primary_value fcall %type <node> if_tail opt_else case_body cases opt_rescue exc_list exc_var opt_ensure %type <node> args call_args opt_call_args %type <node> paren_args opt_paren_args args_tail opt_args_tail block_args_tail opt_block_args_tail @@ -1358,22 +1360,33 @@ cmd_brace_block : tLBRACE_ARG } ; -command : operation command_args %prec tLOWEST +fcall : operation { /*%%%*/ - $$ = NEW_FCALL($1, $2); - fixpos($$, $2); + $$ = NEW_FCALL($1, 0); + nd_set_line($$, tokline); + /*% + %*/ + } + ; + +command : fcall command_args %prec tLOWEST + { + /*%%%*/ + $$ = $1; + $$->nd_args = $2; /*% $$ = dispatch2(command, $1, $2); %*/ } - | operation command_args cmd_brace_block + | fcall command_args cmd_brace_block { /*%%%*/ block_dup_check($2,$3); - $3->nd_iter = NEW_FCALL($1, $2); + $1->nd_args = $2; + $3->nd_iter = $1; $$ = $3; - fixpos($$, $2); + fixpos($$, $1); /*% $$ = dispatch2(command, $1, $2); $$ = method_add_block($$, $3); @@ -2715,10 +2728,10 @@ primary : literal $$ = dispatch2(unary, ripper_intern("not"), Qnil); %*/ } - | operation brace_block + | fcall brace_block { /*%%%*/ - $2->nd_iter = NEW_FCALL($1, 0); + $2->nd_iter = $1; $$ = $2; /*% $$ = method_arg(dispatch1(fcall, $1), arg_new()); @@ -3559,19 +3572,13 @@ block_call : command do_block } ; -method_call : operation - { - /*%%%*/ - $<num>$ = ruby_sourceline; - /*% %*/ - } - paren_args +method_call : fcall paren_args { /*%%%*/ - $$ = NEW_FCALL($1, $3); - nd_set_line($$, $<num>2); + $$ = $1; + $$->nd_args = $2; /*% - $$ = method_arg(dispatch1(fcall, $1), $3); + $$ = method_arg(dispatch1(fcall, $1), $2); %*/ } | primary_value '.' operation2 @@ -5601,6 +5608,7 @@ static char* parser_newtok(struct parser_params *parser) { tokidx = 0; + tokline = ruby_sourceline; if (!tokenbuf) { toksiz = 60; tokenbuf = ALLOC_N(char, 60); @@ -8401,7 +8409,7 @@ gettable_gen(struct parser_params *parser, ID id) return NEW_STR(rb_external_str_new_with_enc(ruby_sourcefile, strlen(ruby_sourcefile), rb_filesystem_encoding())); case keyword__LINE__: - return NEW_LIT(INT2FIX(ruby_sourceline)); + return NEW_LIT(INT2FIX(tokline)); case keyword__ENCODING__: return NEW_LIT(rb_enc_from_encoding(current_enc)); } diff --git a/test/ruby/test_syntax.rb b/test/ruby/test_syntax.rb index ec3af712f4..f9f279d751 100644 --- a/test/ruby/test_syntax.rb +++ b/test/ruby/test_syntax.rb @@ -194,6 +194,36 @@ class TestSyntax < Test::Unit::TestCase end end + Bug7559 = '[ruby-dev:46737]' + + def test_lineno_command_call_quote + expected = __LINE__ + 1 + actual = caller_lineno "a +b +c +d +e" + assert_equal(expected, actual, "#{Bug7559}: ") + end + + def test_lineno_after_heredoc + bug7559 = '[ruby-dev:46737]' + expected, _, actual = __LINE__, <<eom, __LINE__ + a + b + c + d +eom + assert_equal(expected, actual, bug7559) + end + + def test_lineno_operation_brace_block + expected = __LINE__ + 1 + actual = caller_lineno\ + {} + assert_equal(expected, actual) + end + private def not_label(x) @result = x; @not_label ||= nil end @@ -227,4 +257,8 @@ class TestSyntax < Test::Unit::TestCase const_set(:SCRIPT_LINES__, script_lines) if script_lines end end + + def caller_lineno(*) + caller_locations(1, 1)[0].lineno + end end |