diff options
author | 卜部昌平 <shyouhei@ruby-lang.org> | 2020-07-27 11:15:50 +0900 |
---|---|---|
committer | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2020-12-03 12:47:51 +0900 |
commit | 43b95bafd57d04c8fb401d3a9b52aca3f5b4b0be (patch) | |
tree | 642b463fce3ff7c5d683eb6e8068cf2dfa2c14df /io.c | |
parent | 84eb2bfab940fc9c6962c10ede7f72cee3fb9899 (diff) |
delete deprecated IO-like methods
This commit deletes
{IO,ARGF,StringIO,Zib::GZipReader}#{bytes,chars,lines,codepoints}, which
have been deprecated since c47c095b9740e7c19d6fdca29ab661c1089221d4.
Note that String also has those methods. They are neither depreacted
nor deleted because they are not aliases of counterpart each_something.
Diffstat (limited to 'io.c')
-rw-r--r-- | io.c | 117 |
1 files changed, 0 insertions, 117 deletions
@@ -3959,19 +3959,6 @@ rb_io_each_line(int argc, VALUE *argv, VALUE io) } /* - * This is a deprecated alias for #each_line. - */ - -static VALUE -rb_io_lines(int argc, VALUE *argv, VALUE io) -{ - rb_warn_deprecated("IO#lines", "#each_line"); - if (!rb_block_given_p()) - return rb_enumeratorize(io, ID2SYM(rb_intern("each_line")), argc, argv); - return rb_io_each_line(argc, argv, io); -} - -/* * call-seq: * ios.each_byte {|byte| block } -> ios * ios.each_byte -> an_enumerator @@ -4009,19 +3996,6 @@ rb_io_each_byte(VALUE io) return io; } -/* - * This is a deprecated alias for #each_byte. - */ - -static VALUE -rb_io_bytes(VALUE io) -{ - rb_warn_deprecated("IO#bytes", "#each_byte"); - if (!rb_block_given_p()) - return rb_enumeratorize(io, ID2SYM(rb_intern("each_byte")), 0, 0); - return rb_io_each_byte(io); -} - static VALUE io_getc(rb_io_t *fptr, rb_encoding *enc) { @@ -4164,20 +4138,6 @@ rb_io_each_char(VALUE io) } /* - * This is a deprecated alias for #each_char. - */ - -static VALUE -rb_io_chars(VALUE io) -{ - rb_warn_deprecated("IO#chars", "#each_char"); - if (!rb_block_given_p()) - return rb_enumeratorize(io, ID2SYM(rb_intern("each_char")), 0, 0); - return rb_io_each_char(io); -} - - -/* * call-seq: * ios.each_codepoint {|c| block } -> ios * ios.codepoints {|c| block } -> ios @@ -4295,20 +4255,6 @@ rb_io_each_codepoint(VALUE io) } /* - * This is a deprecated alias for #each_codepoint. - */ - -static VALUE -rb_io_codepoints(VALUE io) -{ - rb_warn_deprecated("IO#codepoints", "#each_codepoint"); - if (!rb_block_given_p()) - return rb_enumeratorize(io, ID2SYM(rb_intern("each_codepoint")), 0, 0); - return rb_io_each_codepoint(io); -} - - -/* * call-seq: * ios.getc -> string or nil * @@ -12755,23 +12701,7 @@ argf_each_line(int argc, VALUE *argv, VALUE argf) } /* - * This is a deprecated alias for #each_line. - */ - -static VALUE -argf_lines(int argc, VALUE *argv, VALUE argf) -{ - rb_warn_deprecated("ARGF#lines", "#each_line"); - if (!rb_block_given_p()) - return rb_enumeratorize(argf, ID2SYM(rb_intern("each_line")), argc, argv); - return argf_each_line(argc, argv, argf); -} - -/* * call-seq: - * ARGF.bytes {|byte| block } -> ARGF - * ARGF.bytes -> an_enumerator - * * ARGF.each_byte {|byte| block } -> ARGF * ARGF.each_byte -> an_enumerator * @@ -12802,19 +12732,6 @@ argf_each_byte(VALUE argf) } /* - * This is a deprecated alias for #each_byte. - */ - -static VALUE -argf_bytes(VALUE argf) -{ - rb_warn_deprecated("ARGF#bytes", "#each_byte"); - if (!rb_block_given_p()) - return rb_enumeratorize(argf, ID2SYM(rb_intern("each_byte")), 0, 0); - return argf_each_byte(argf); -} - -/* * call-seq: * ARGF.each_char {|char| block } -> ARGF * ARGF.each_char -> an_enumerator @@ -12841,19 +12758,6 @@ argf_each_char(VALUE argf) } /* - * This is a deprecated alias for #each_char. - */ - -static VALUE -argf_chars(VALUE argf) -{ - rb_warn_deprecated("ARGF#chars", "#each_char"); - if (!rb_block_given_p()) - return rb_enumeratorize(argf, ID2SYM(rb_intern("each_char")), 0, 0); - return argf_each_char(argf); -} - -/* * call-seq: * ARGF.each_codepoint {|codepoint| block } -> ARGF * ARGF.each_codepoint -> an_enumerator @@ -12880,19 +12784,6 @@ argf_each_codepoint(VALUE argf) } /* - * This is a deprecated alias for #each_codepoint. - */ - -static VALUE -argf_codepoints(VALUE argf) -{ - rb_warn_deprecated("ARGF#codepoints", "#each_codepoint"); - if (!rb_block_given_p()) - return rb_enumeratorize(argf, ID2SYM(rb_intern("each_codepoint")), 0, 0); - return argf_each_codepoint(argf); -} - -/* * call-seq: * ARGF.filename -> String * ARGF.path -> String @@ -13555,10 +13446,6 @@ Init_IO(void) rb_define_method(rb_cIO, "each_byte", rb_io_each_byte, 0); rb_define_method(rb_cIO, "each_char", rb_io_each_char, 0); rb_define_method(rb_cIO, "each_codepoint", rb_io_each_codepoint, 0); - rb_define_method(rb_cIO, "lines", rb_io_lines, -1); - rb_define_method(rb_cIO, "bytes", rb_io_bytes, 0); - rb_define_method(rb_cIO, "chars", rb_io_chars, 0); - rb_define_method(rb_cIO, "codepoints", rb_io_codepoints, 0); rb_define_method(rb_cIO, "syswrite", rb_io_syswrite, 1); rb_define_method(rb_cIO, "sysread", rb_io_sysread, -1); @@ -13697,10 +13584,6 @@ Init_IO(void) rb_define_method(rb_cARGF, "each_byte", argf_each_byte, 0); rb_define_method(rb_cARGF, "each_char", argf_each_char, 0); rb_define_method(rb_cARGF, "each_codepoint", argf_each_codepoint, 0); - rb_define_method(rb_cARGF, "lines", argf_lines, -1); - rb_define_method(rb_cARGF, "bytes", argf_bytes, 0); - rb_define_method(rb_cARGF, "chars", argf_chars, 0); - rb_define_method(rb_cARGF, "codepoints", argf_codepoints, 0); rb_define_method(rb_cARGF, "read", argf_read, -1); rb_define_method(rb_cARGF, "readpartial", argf_readpartial, -1); |