1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

range.c: use rb_check_funcall

Browse Source 
* range.c (rb_range_values): use rb_check_funcall instead of
  calling rb_respond_to then rb_funcall, and allow `begin` and
  `end` to be private as well as other internal conversions.
  [ruby-core:83541] [Bug #14048]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@60416 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2017-10-25 05:23:54 +00:00
parent 537a46c69a
commit 50a99a7679
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
range.c
View File

@ -988,18 +988,10 @@ rb_range_values(VALUE range, VALUE *begp, VALUE *endp, int *exclp)
} }
else { else {
VALUE x; VALUE x;
#if 0
/* TODO: fix spec/mspec/lib/mspec/mocks/mock.rb:Mock.verify_call */
b = rb_check_funcall(range, id_beg, 0, 0); b = rb_check_funcall(range, id_beg, 0, 0);
if (b == Qundef) return (int)Qfalse; if (b == Qundef) return (int)Qfalse;
e = rb_check_funcall(range, id_end, 0, 0); e = rb_check_funcall(range, id_end, 0, 0);
if (e == Qundef) return (int)Qfalse; if (e == Qundef) return (int)Qfalse;
#else
if (!rb_respond_to(range, id_beg)) return (int)Qfalse;
if (!rb_respond_to(range, id_end)) return (int)Qfalse;
b = rb_funcall(range, id_beg, 0);
e = rb_funcall(range, id_end, 0);
#endif
x = rb_check_funcall(range, rb_intern("exclude_end?"), 0, 0); x = rb_check_funcall(range, rb_intern("exclude_end?"), 0, 0);
if (x == Qundef) return (int)Qfalse; if (x == Qundef) return (int)Qfalse;
excl = RTEST(x); excl = RTEST(x);

3
test/ruby/test_range.rb
View File

@ -393,6 +393,9 @@ class TestRange < Test::Unit::TestCase
o.exclude_end = false o.exclude_end = false
assert_nil([0][o]) assert_nil([0][o])
assert_raise(RangeError) { [0][o] = 1 } assert_raise(RangeError) { [0][o] = 1 }
class << o
private :begin, :end
end
o.begin = 10 o.begin = 10
o.end = 10 o.end = 10
assert_nil([0][o]) assert_nil([0][o])