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

Follow behaviour of IO#ungetbyte

Browse Source 
see r65802 and [Bug #14359]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@66760 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
kazu 2019-01-09 12:55:20 +00:00
parent bc27f87889
commit 730f2886b5
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ext/stringio/stringio.c
View File

@ -803,16 +803,27 @@ static VALUE
strio_ungetbyte(VALUE self, VALUE c) strio_ungetbyte(VALUE self, VALUE c)
{ {
struct StringIO *ptr = readable(self); struct StringIO *ptr = readable(self);
char buf[1], *cp = buf;
long cl = 1;
check_modifiable(ptr); check_modifiable(ptr);
if (NIL_P(c)) return Qnil; if (NIL_P(c)) return Qnil;
if (FIXNUM_P(c)) { if (FIXNUM_P(c)) {
buf[0] = (char)FIX2INT(c); int i = FIX2INT(c);
return strio_unget_bytes(ptr, buf, 1); if (0 <= i && i <= UCHAR_MAX) {
char buf[1];
buf[0] = (char)i;
return strio_unget_bytes(ptr, buf, 1);
}
else {
rb_raise(rb_eRangeError,
"integer %d too big to convert into `unsigned char'", i);
}
}
else if (RB_TYPE_P(c, T_BIGNUM)) {
rb_raise(rb_eRangeError, "bignum too big to convert into `unsigned char'");
} }
else { else {
char *cp;
long cl;
SafeStringValue(c); SafeStringValue(c);
cp = RSTRING_PTR(c); cp = RSTRING_PTR(c);
cl = RSTRING_LEN(c); cl = RSTRING_LEN(c);

4
test/stringio/test_stringio.rb
View File

@ -452,6 +452,10 @@ class TestStringIO < Test::Unit::TestCase
t.ungetbyte("\u{30eb 30d3 30fc}") t.ungetbyte("\u{30eb 30d3 30fc}")
assert_equal(0, t.pos) assert_equal(0, t.pos)
assert_equal("\u{30eb 30d3 30fc}\u7d05\u7389bar\n", s) assert_equal("\u{30eb 30d3 30fc}\u7d05\u7389bar\n", s)
assert_raise(RangeError) {t.ungetbyte(-1)}
assert_raise(RangeError) {t.ungetbyte(256)}
assert_raise(RangeError) {t.ungetbyte(1<<64)}
end end
def test_ungetc def test_ungetc