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

range.c: reject ArithmeticSequence in rb_range_values

Browse source 
Reject ArithmeticSequence in rb_range_values so that methods like
Array#[] raises TypeError for ArithmeticSequence as an index.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@66478 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
mrkn 2018-12-21 13:05:16 +00:00
parent fa5601e7b9
commit 7bef465e9b
4 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
enumerator.c
View file

@ -169,7 +169,7 @@ struct enum_chain {
long pos; long pos;
}; };
static VALUE rb_cArithSeq; VALUE rb_cArithSeq;
/* /*
* Enumerator * Enumerator

1
internal.h
View file

@ -1414,6 +1414,7 @@ void rb_encdb_set_unicode(int index);
PUREFUNC(int rb_data_is_encoding(VALUE obj)); PUREFUNC(int rb_data_is_encoding(VALUE obj));
/* enum.c */ /* enum.c */
extern VALUE rb_cArithSeq;
VALUE rb_f_send(int argc, VALUE *argv, VALUE recv); VALUE rb_f_send(int argc, VALUE *argv, VALUE recv);
VALUE rb_nmin_run(VALUE obj, VALUE num, int by, int rev, int ary); VALUE rb_nmin_run(VALUE obj, VALUE num, int by, int rev, int ary);

3
range.c
View file

@ -1141,6 +1141,9 @@ rb_range_values(VALUE range, VALUE *begp, VALUE *endp, int *exclp)
e = RANGE_END(range); e = RANGE_END(range);
excl = EXCL(range); excl = EXCL(range);
} }
else if (RTEST(rb_obj_is_kind_of(range, rb_cArithSeq))) {
return (int)Qfalse;
}
else { else {
VALUE x; VALUE x;
b = rb_check_funcall(range, id_beg, 0, 0); b = rb_check_funcall(range, id_beg, 0, 0);

1
test/ruby/test_array.rb
View file

@ -2244,6 +2244,7 @@ class TestArray < Test::Unit::TestCase
def test_aref def test_aref
assert_raise(ArgumentError) { [][0, 0, 0] } assert_raise(ArgumentError) { [][0, 0, 0] }
assert_raise(TypeError) { [][(1..10).step(2)] }
end end
def test_fetch def test_fetch