diff options
author | mame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-07-29 14:38:44 +0000 |
---|---|---|
committer | mame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-07-29 14:38:44 +0000 |
commit | be9994a03ae32b5cd4a799b20ed96c3aaaba97b7 (patch) | |
tree | abd38e3e99366b296bd3eac1fef12638d9ab20f0 /io.c | |
parent | d866ba69a1605a390155fe5401f11fdc0f010668 (diff) |
* io.c (io_ungetc): raise NotImplementedError when ungetc is called
against dummy encoding IO.
* io.c (rb_io_getline_1): ditto when gets with delimiter is called.
* io.c (io_getc): ditto when getc is called.
* test/ruby/test_io_m17n.rb (test_terminator_stateful_conversion,
test_getc_stateful_conversion, test_ungetc_stateful_conversion):
these tests should raise NotImplementedError.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18261 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'io.c')
-rw-r--r-- | io.c | 13 |
1 files changed, 13 insertions, 0 deletions
@@ -323,11 +323,17 @@ io_unread(rb_io_t *fptr) return; } +static rb_encoding *io_input_encoding(rb_io_t *fptr); + static void io_ungetc(VALUE str, rb_io_t *fptr) { int len = RSTRING_LEN(str); + if (rb_enc_dummy_p(io_input_encoding(fptr))) { + rb_raise(rb_eNotImpError, "ungetc against dummy encoding is not currently supported"); + } + if (fptr->rbuf == NULL) { fptr->rbuf_off = 0; fptr->rbuf_len = 0; @@ -1950,6 +1956,9 @@ rb_io_getline_1(VALUE rs, long limit, VALUE io) GetOpenFile(io, fptr); rb_io_check_readable(fptr); + if (rb_enc_dummy_p(io_input_encoding(fptr)) && rs != rb_default_rs) { + rb_raise(rb_eNotImpError, "gets with delimiter against dummy encoding is not currently supported"); + } if (NIL_P(rs)) { str = read_all(fptr, 0, Qnil); if (RSTRING_LEN(str) == 0) return Qnil; @@ -2265,6 +2274,10 @@ io_getc(rb_io_t *fptr, rb_encoding *enc) int r, n, cr = 0; VALUE str; + if (rb_enc_dummy_p(enc)) { + rb_raise(rb_eNotImpError, "getc against dummy encoding is not currently supported"); + } + if (io_fillbuf(fptr) < 0) { return Qnil; } |