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

[ruby/stringio] NULL StringIO by StringIO.new(nil)

Browse Source 
https://github.com/ruby/stringio/commit/779f71359d
This commit is contained in:
Nobuyoshi Nakada 2022-07-01 00:57:15 +09:00 committed by git
parent 1e7c0fcc9a
commit a1ced60692
2 changed files with 34 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
ext/stringio/stringio.c
View File

@ -48,7 +48,7 @@ static long strio_write(VALUE self, VALUE str);
#define IS_STRIO(obj) (rb_typeddata_is_kind_of((obj), &strio_data_type)) #define IS_STRIO(obj) (rb_typeddata_is_kind_of((obj), &strio_data_type))
#define error_inval(msg) (rb_syserr_fail(EINVAL, msg)) #define error_inval(msg) (rb_syserr_fail(EINVAL, msg))
#define get_enc(ptr) ((ptr)->enc ? (ptr)->enc : rb_enc_get((ptr)->string)) #define get_enc(ptr) ((ptr)->enc ? (ptr)->enc : !NIL_P((ptr)->string) ? rb_enc_get((ptr)->string) : NULL)
static struct StringIO * static struct StringIO *
strio_alloc(void) strio_alloc(void)
@ -281,13 +281,13 @@ strio_init(int argc, VALUE *argv, struct StringIO *ptr, VALUE self)
argc = rb_scan_args(argc, argv, "02:", &string, &vmode, &opt); argc = rb_scan_args(argc, argv, "02:", &string, &vmode, &opt);
rb_io_extract_modeenc(&vmode, 0, opt, &oflags, &ptr->flags, &convconfig); rb_io_extract_modeenc(&vmode, 0, opt, &oflags, &ptr->flags, &convconfig);
if (argc) { if (!NIL_P(string)) {
StringValue(string); StringValue(string);
} }
else { else if (!argc) {
string = rb_enc_str_new("", 0, rb_default_external_encoding()); string = rb_enc_str_new("", 0, rb_default_external_encoding());
} }
if (OBJ_FROZEN_RAW(string)) { if (!NIL_P(string) && OBJ_FROZEN_RAW(string)) {
if (ptr->flags & FMODE_WRITABLE) { if (ptr->flags & FMODE_WRITABLE) {
rb_syserr_fail(EACCES, 0); rb_syserr_fail(EACCES, 0);
} }
@ -297,11 +297,11 @@ strio_init(int argc, VALUE *argv, struct StringIO *ptr, VALUE self)
ptr->flags |= FMODE_WRITABLE; ptr->flags |= FMODE_WRITABLE;
} }
} }
if (ptr->flags & FMODE_TRUNC) { if (!NIL_P(string) && (ptr->flags & FMODE_TRUNC)) {
rb_str_resize(string, 0); rb_str_resize(string, 0);
} }
RB_OBJ_WRITE(self, &ptr->string, string); RB_OBJ_WRITE(self, &ptr->string, string);
if (argc == 1) { if (argc == 1 && !NIL_P(string)) {
ptr->enc = rb_enc_get(string); ptr->enc = rb_enc_get(string);
} }
else { else {
@ -595,6 +595,7 @@ static struct StringIO *
strio_to_read(VALUE self) strio_to_read(VALUE self)
{ {
struct StringIO *ptr = readable(self); struct StringIO *ptr = readable(self);
if (NIL_P(ptr->string)) return NULL;
if (ptr->pos < RSTRING_LEN(ptr->string)) return ptr; if (ptr->pos < RSTRING_LEN(ptr->string)) return ptr;
return NULL; return NULL;
} }
@ -872,7 +873,7 @@ strio_getc(VALUE self)
int len; int len;
char *p; char *p;
if (pos >= RSTRING_LEN(str)) { if (NIL_P(str) || pos >= RSTRING_LEN(str)) {
return Qnil; return Qnil;
} }
p = RSTRING_PTR(str)+pos; p = RSTRING_PTR(str)+pos;
@ -893,7 +894,7 @@ strio_getbyte(VALUE self)
{ {
struct StringIO *ptr = readable(self); struct StringIO *ptr = readable(self);
int c; int c;
if (ptr->pos >= RSTRING_LEN(ptr->string)) { if (NIL_P(ptr->string) || ptr->pos >= RSTRING_LEN(ptr->string)) {
return Qnil; return Qnil;
} }
c = RSTRING_PTR(ptr->string)[ptr->pos++]; c = RSTRING_PTR(ptr->string)[ptr->pos++];
@ -931,6 +932,7 @@ strio_ungetc(VALUE self, VALUE c)
rb_encoding *enc, *enc2; rb_encoding *enc, *enc2;
check_modifiable(ptr); check_modifiable(ptr);
if (NIL_P(ptr->string)) return Qnil;
if (NIL_P(c)) return Qnil; if (NIL_P(c)) return Qnil;
if (RB_INTEGER_TYPE_P(c)) { if (RB_INTEGER_TYPE_P(c)) {
int len, cc = NUM2INT(c); int len, cc = NUM2INT(c);
@ -968,6 +970,7 @@ strio_ungetbyte(VALUE self, VALUE c)
struct StringIO *ptr = readable(self); struct StringIO *ptr = readable(self);
check_modifiable(ptr); check_modifiable(ptr);
if (NIL_P(ptr->string)) return Qnil;
if (NIL_P(c)) return Qnil; if (NIL_P(c)) return Qnil;
if (RB_INTEGER_TYPE_P(c)) { if (RB_INTEGER_TYPE_P(c)) {
/* rb_int_and() not visible from exts */ /* rb_int_and() not visible from exts */
@ -1171,7 +1174,7 @@ prepare_getline_args(struct StringIO *ptr, struct getline_arg *arg, int argc, VA
if (!NIL_P(lim)) limit = NUM2LONG(lim); if (!NIL_P(lim)) limit = NUM2LONG(lim);
break; break;
} }
if (!NIL_P(rs)) { if (!NIL_P(ptr->string) && !NIL_P(rs)) {
rb_encoding *enc_rs, *enc_io; rb_encoding *enc_rs, *enc_io;
enc_rs = rb_enc_get(rs); enc_rs = rb_enc_get(rs);
enc_io = get_enc(ptr); enc_io = get_enc(ptr);
@ -1226,7 +1229,7 @@ strio_getline(struct getline_arg *arg, struct StringIO *ptr)
long w = 0; long w = 0;
rb_encoding *enc = get_enc(ptr); rb_encoding *enc = get_enc(ptr);
if (ptr->pos >= (n = RSTRING_LEN(ptr->string))) { if (NIL_P(ptr->string) || ptr->pos >= (n = RSTRING_LEN(ptr->string))) {
return Qnil; return Qnil;
} }
s = RSTRING_PTR(ptr->string); s = RSTRING_PTR(ptr->string);
@ -1323,6 +1326,7 @@ strio_gets(int argc, VALUE *argv, VALUE self)
VALUE str; VALUE str;
if (prepare_getline_args(ptr, &arg, argc, argv)->limit == 0) { if (prepare_getline_args(ptr, &arg, argc, argv)->limit == 0) {
if (NIL_P(ptr->string)) return Qnil;
return rb_enc_str_new(0, 0, get_enc(ptr)); return rb_enc_str_new(0, 0, get_enc(ptr));
} }
@ -1437,6 +1441,7 @@ strio_write(VALUE self, VALUE str)
if (!RB_TYPE_P(str, T_STRING)) if (!RB_TYPE_P(str, T_STRING))
str = rb_obj_as_string(str); str = rb_obj_as_string(str);
enc = get_enc(ptr); enc = get_enc(ptr);
if (!enc) return 0;
enc2 = rb_enc_get(str); enc2 = rb_enc_get(str);
if (enc != enc2 && enc != ascii8bit && enc != (usascii = rb_usascii_encoding())) { if (enc != enc2 && enc != ascii8bit && enc != (usascii = rb_usascii_encoding())) {
VALUE converted = rb_str_conv_enc(str, enc2, enc); VALUE converted = rb_str_conv_enc(str, enc2, enc);
@ -1509,10 +1514,12 @@ strio_putc(VALUE self, VALUE ch)
check_modifiable(ptr); check_modifiable(ptr);
if (RB_TYPE_P(ch, T_STRING)) { if (RB_TYPE_P(ch, T_STRING)) {
if (NIL_P(ptr->string)) return ch;
str = rb_str_substr(ch, 0, 1); str = rb_str_substr(ch, 0, 1);
} }
else { else {
char c = NUM2CHR(ch); char c = NUM2CHR(ch);
if (NIL_P(ptr->string)) return ch;
str = rb_str_new(&c, 1); str = rb_str_new(&c, 1);
} }
strio_write(self, str); strio_write(self, str);
@ -1555,7 +1562,8 @@ strio_read(int argc, VALUE *argv, VALUE self)
if (len < 0) { if (len < 0) {
rb_raise(rb_eArgError, "negative length %ld given", len); rb_raise(rb_eArgError, "negative length %ld given", len);
} }
if (len > 0 && ptr->pos >= RSTRING_LEN(ptr->string)) { if (len > 0 &&
(NIL_P(ptr->string) || ptr->pos >= RSTRING_LEN(ptr->string))) {
if (!NIL_P(str)) rb_str_resize(str, 0); if (!NIL_P(str)) rb_str_resize(str, 0);
return Qnil; return Qnil;
} }
@ -1564,6 +1572,7 @@ strio_read(int argc, VALUE *argv, VALUE self)
} }
/* fall through */ /* fall through */
case 0: case 0:
if (NIL_P(ptr->string)) return Qnil;
len = RSTRING_LEN(ptr->string); len = RSTRING_LEN(ptr->string);
if (len <= ptr->pos) { if (len <= ptr->pos) {
rb_encoding *enc = get_enc(ptr); rb_encoding *enc = get_enc(ptr);
@ -1733,7 +1742,7 @@ strio_size(VALUE self)
{ {
VALUE string = StringIO(self)->string; VALUE string = StringIO(self)->string;
if (NIL_P(string)) { if (NIL_P(string)) {
rb_raise(rb_eIOError, "not opened"); return INT2FIX(0);
} }
return ULONG2NUM(RSTRING_LEN(string)); return ULONG2NUM(RSTRING_LEN(string));
} }
@ -1750,10 +1759,12 @@ strio_truncate(VALUE self, VALUE len)
{ {
VALUE string = writable(self)->string; VALUE string = writable(self)->string;
long l = NUM2LONG(len); long l = NUM2LONG(len);
long plen = RSTRING_LEN(string); long plen;
if (l < 0) { if (l < 0) {
error_inval("negative length"); error_inval("negative length");
} }
if (NIL_P(string)) return 0;
plen = RSTRING_LEN(string);
rb_str_resize(string, l); rb_str_resize(string, l);
if (plen < l) { if (plen < l) {
MEMZERO(RSTRING_PTR(string) + plen, char, l - plen); MEMZERO(RSTRING_PTR(string) + plen, char, l - plen);
@ -1824,7 +1835,7 @@ strio_set_encoding(int argc, VALUE *argv, VALUE self)
} }
} }
ptr->enc = enc; ptr->enc = enc;
if (WRITABLE(self)) { if (!NIL_P(ptr->string) && WRITABLE(self)) {
rb_enc_associate(ptr->string, enc); rb_enc_associate(ptr->string, enc);
} }

10
test/stringio/test_stringio.rb
View File

@ -22,10 +22,11 @@ class TestStringIO < Test::Unit::TestCase
assert_kind_of StringIO, StringIO.new assert_kind_of StringIO, StringIO.new
assert_kind_of StringIO, StringIO.new('str') assert_kind_of StringIO, StringIO.new('str')
assert_kind_of StringIO, StringIO.new('str', 'r+') assert_kind_of StringIO, StringIO.new('str', 'r+')
assert_kind_of StringIO, StringIO.new(nil)
assert_raise(ArgumentError) { StringIO.new('', 'x') } assert_raise(ArgumentError) { StringIO.new('', 'x') }
assert_raise(ArgumentError) { StringIO.new('', 'rx') } assert_raise(ArgumentError) { StringIO.new('', 'rx') }
assert_raise(ArgumentError) { StringIO.new('', 'rbt') } assert_raise(ArgumentError) { StringIO.new('', 'rbt') }
assert_raise(TypeError) { StringIO.new(nil) } assert_raise(TypeError) { StringIO.new(Object) }
o = Object.new o = Object.new
def o.to_str def o.to_str
@ -40,6 +41,13 @@ class TestStringIO < Test::Unit::TestCase
assert_kind_of StringIO, StringIO.new(o) assert_kind_of StringIO, StringIO.new(o)
end end
def test_null
io = StringIO.new(nil)
assert_nil io.gets
io.puts "abc"
assert_nil io.string
end
def test_truncate def test_truncate
io = StringIO.new("") io = StringIO.new("")
io.puts "abc" io.puts "abc"