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 (k_def): adjust the location of method definition to the

Browse source 
line of def.  [Bug #2427]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25992 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2009-12-04 07:50:15 +00:00
parent 2c2cf71b04
commit 9ad065375f
3 changed files with 15 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Fri Dec 4 16:50:13 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* parse.y (k_def): adjust the location of method definition to the
line of def. [Bug #2427]
Fri Dec 4 15:50:18 2009 Shugo Maeda <shugo@ruby-lang.org> Fri Dec 4 15:50:18 2009 Shugo Maeda <shugo@ruby-lang.org>
* vm_eval.c (yield_under): does not yield self, and passes blockptr * vm_eval.c (yield_under): does not yield self, and passes blockptr

8
parse.y
View file

@ -2902,7 +2902,7 @@ primary : literal
NODE *body = remove_begin($5); NODE *body = remove_begin($5);
reduce_nodes(&body); reduce_nodes(&body);
$$ = NEW_DEFN($2, $4, body, NOEX_PRIVATE); $$ = NEW_DEFN($2, $4, body, NOEX_PRIVATE);
fixpos($$, $4); nd_set_line($$, $<num>1);
/*% /*%
$$ = dispatch3(def, $2, $4, $5); $$ = dispatch3(def, $2, $4, $5);
%*/ %*/
@ -2924,7 +2924,7 @@ primary : literal
NODE *body = remove_begin($8); NODE *body = remove_begin($8);
reduce_nodes(&body); reduce_nodes(&body);
$$ = NEW_DEFS($2, $5, $7, body); $$ = NEW_DEFS($2, $5, $7, body);
fixpos($$, $2); nd_set_line($$, $<num>1);
/*% /*%
$$ = dispatch5(defs, $2, $3, $5, $7, $8); $$ = dispatch5(defs, $2, $3, $5, $7, $8);
%*/ %*/
@ -3034,6 +3034,10 @@ k_module : keyword_module
k_def : keyword_def k_def : keyword_def
{ {
token_info_push("def"); token_info_push("def");
/*%%%*/
$<num>$ = ruby_sourceline;
/*%
%*/
} }
; ;

7
test/ruby/test_proc.rb
View file

@ -746,14 +746,15 @@ class TestProc < Test::Unit::TestCase
assert(x.to_s.tainted?) assert(x.to_s.tainted?)
end end
def source_location_test @@line_of_source_location_test = __LINE__ + 1
__LINE__ def source_location_test a=1,
b=2
end end
def test_source_location def test_source_location
file, lineno = method(:source_location_test).source_location file, lineno = method(:source_location_test).source_location
assert_match(/^#{ Regexp.quote(__FILE__) }$/, file) assert_match(/^#{ Regexp.quote(__FILE__) }$/, file)
assert_equal(source_location_test - 1, lineno) assert_equal(@@line_of_source_location_test, lineno, 'Bug #2427')
end end
def test_splat_without_respond_to def test_splat_without_respond_to