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

* io.c (io_getc): set read_encoding to resulted one character

Browse Source 
string. [ruby-dev:41023]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27426 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2010-04-20 18:19:01 +00:00
parent 52998fa591
commit 8a269f85a0
3 changed files with 43 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Wed Apr 21 03:17:17 2010 NARUSE, Yui <naruse@ruby-lang.org>
* io.c (io_getc): set read_encoding to resulted one character
string. [ruby-dev:41023]
Wed Apr 21 00:29:39 2010 Yusuke Endoh <mame@tsg.ne.jp> Wed Apr 21 00:29:39 2010 Yusuke Endoh <mame@tsg.ne.jp>
* bignum.c (bigmul1_karatsuba): fix calculation order to prevent * bignum.c (bigmul1_karatsuba): fix calculation order to prevent

35
io.c
View File

@ -2739,17 +2739,15 @@ io_getc(rb_io_t *fptr, rb_encoding *enc)
if (NEED_READCONV(fptr)) { if (NEED_READCONV(fptr)) {
VALUE str = Qnil; VALUE str = Qnil;
rb_encoding *read_enc = io_read_encoding(fptr);
make_readconv(fptr, 0); make_readconv(fptr, 0);
while (1) { while (1) {
if (fptr->cbuf_len) { if (fptr->cbuf_len) {
if (fptr->encs.enc) r = rb_enc_precise_mbclen(fptr->cbuf+fptr->cbuf_off,
r = rb_enc_precise_mbclen(fptr->cbuf+fptr->cbuf_off, fptr->cbuf+fptr->cbuf_off+fptr->cbuf_len,
fptr->cbuf+fptr->cbuf_off+fptr->cbuf_len, read_enc);
fptr->encs.enc);
else
r = ONIGENC_CONSTRUCT_MBCLEN_CHARFOUND(1);
if (!MBCLEN_NEEDMORE_P(r)) if (!MBCLEN_NEEDMORE_P(r))
break; break;
if (fptr->cbuf_len == fptr->cbuf_capa) { if (fptr->cbuf_len == fptr->cbuf_capa) {
@ -2761,17 +2759,30 @@ io_getc(rb_io_t *fptr, rb_encoding *enc)
clear_readconv(fptr); clear_readconv(fptr);
if (fptr->cbuf_len == 0) if (fptr->cbuf_len == 0)
return Qnil; return Qnil;
/* return an incomplete character just before EOF */ /* return an unit of an incomplete character just before EOF */
return io_shift_cbuf(fptr, fptr->cbuf_len, &str); r = rb_enc_mbclen(fptr->cbuf+fptr->cbuf_off,
fptr->cbuf+fptr->cbuf_off+fptr->cbuf_len,
read_enc);
io_shift_cbuf(fptr, r, &str);
str = io_enc_str(str, fptr);
ENC_CODERANGE_SET(str, ENC_CODERANGE_BROKEN);
return str;
} }
} }
if (MBCLEN_INVALID_P(r)) { if (MBCLEN_INVALID_P(r)) {
r = rb_enc_mbclen(fptr->cbuf+fptr->cbuf_off, r = rb_enc_mbclen(fptr->cbuf+fptr->cbuf_off,
fptr->cbuf+fptr->cbuf_off+fptr->cbuf_len, fptr->cbuf+fptr->cbuf_off+fptr->cbuf_len,
fptr->encs.enc); read_enc);
return io_shift_cbuf(fptr, r, &str); io_shift_cbuf(fptr, r, &str);
} cr = ENC_CODERANGE_BROKEN;
return io_shift_cbuf(fptr, MBCLEN_CHARFOUND_LEN(r), &str); }
else {
io_shift_cbuf(fptr, MBCLEN_CHARFOUND_LEN(r), &str);
cr = ENC_CODERANGE_VALID;
}
str = io_enc_str(str, fptr);
ENC_CODERANGE_SET(str, cr);
return str;
} }
if (io_fillbuf(fptr) < 0) { if (io_fillbuf(fptr) < 0) {

15
test/ruby/test_io_m17n.rb
View File

@ -385,6 +385,21 @@ EOT
} }
end end
def test_getc_newlineconv
with_tmpdir {
src = "\u3042"
generate_file('tmp', src)
defext = Encoding.default_external
Encoding.default_external = Encoding::UTF_8
open("tmp", "rt") {|f|
s = f.getc
assert_equal(true, s.valid_encoding?)
assert_equal("\u3042", s)
}
Encoding.default_external = defext
}
end
def test_ungetc_stateful_conversion def test_ungetc_stateful_conversion
with_tmpdir { with_tmpdir {
src = "before \e$B\x23\x30\x23\x31\e(B after".force_encoding("iso-2022-jp") src = "before \e$B\x23\x30\x23\x31\e(B after".force_encoding("iso-2022-jp")