mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
stringio.c: warn block for new
* ext/stringio/stringio.c (strio_s_new): warn if a block is given, as well as IO.new. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54792 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
d226ce8dec
commit
7a5b56677a
3 changed files with 25 additions and 0 deletions
|
@ -1,3 +1,8 @@
|
||||||
|
Wed Apr 27 15:47:54 2016 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||||
|
|
||||||
|
* ext/stringio/stringio.c (strio_s_new): warn if a block is given,
|
||||||
|
as well as IO.new.
|
||||||
|
|
||||||
Wed Apr 27 14:29:47 2016 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
Wed Apr 27 14:29:47 2016 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||||
|
|
||||||
* error.c (ruby_only_for_internal_use): raise fatal error when
|
* error.c (ruby_only_for_internal_use): raise fatal error when
|
||||||
|
|
|
@ -241,6 +241,19 @@ strio_s_open(int argc, VALUE *argv, VALUE klass)
|
||||||
return rb_ensure(rb_yield, obj, strio_finalize, obj);
|
return rb_ensure(rb_yield, obj, strio_finalize, obj);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* :nodoc: */
|
||||||
|
static VALUE
|
||||||
|
strio_s_new(int argc, VALUE *argv, VALUE klass)
|
||||||
|
{
|
||||||
|
if (rb_block_given_p()) {
|
||||||
|
VALUE cname = rb_obj_as_string(klass);
|
||||||
|
|
||||||
|
rb_warn("%"PRIsVALUE"::new() does not take block; use %"PRIsVALUE"::open() instead",
|
||||||
|
cname, cname);
|
||||||
|
}
|
||||||
|
return rb_class_new_instance(argc, argv, klass);
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Returns +false+. Just for compatibility to IO.
|
* Returns +false+. Just for compatibility to IO.
|
||||||
*/
|
*/
|
||||||
|
@ -1523,6 +1536,7 @@ Init_stringio(void)
|
||||||
|
|
||||||
rb_include_module(StringIO, rb_mEnumerable);
|
rb_include_module(StringIO, rb_mEnumerable);
|
||||||
rb_define_alloc_func(StringIO, strio_s_allocate);
|
rb_define_alloc_func(StringIO, strio_s_allocate);
|
||||||
|
rb_define_singleton_method(StringIO, "new", strio_s_new, -1);
|
||||||
rb_define_singleton_method(StringIO, "open", strio_s_open, -1);
|
rb_define_singleton_method(StringIO, "open", strio_s_open, -1);
|
||||||
rb_define_method(StringIO, "initialize", strio_initialize, -1);
|
rb_define_method(StringIO, "initialize", strio_initialize, -1);
|
||||||
rb_define_method(StringIO, "initialize_copy", strio_copy, 1);
|
rb_define_method(StringIO, "initialize_copy", strio_copy, 1);
|
||||||
|
|
|
@ -674,4 +674,10 @@ class TestStringIO < Test::Unit::TestCase
|
||||||
bug_11945 = '[ruby-core:72699] [Bug #11945]'
|
bug_11945 = '[ruby-core:72699] [Bug #11945]'
|
||||||
assert_equal Encoding::ASCII_8BIT, s.external_encoding, bug_11945
|
assert_equal Encoding::ASCII_8BIT, s.external_encoding, bug_11945
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def test_new_block_warning
|
||||||
|
assert_warn(/does not take block/) do
|
||||||
|
StringIO.new {}
|
||||||
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in a new issue