diff options
author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-08-28 16:59:17 +0000 |
---|---|---|
committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-08-28 16:59:17 +0000 |
commit | c23ec90e813457ec4db5d02677cdb358743974b5 (patch) | |
tree | b972d1a636501c729245bdeaae323e231fceaf4c | |
parent | 77d7a80f9778d415165fff1c7ce0bf99b96b9ef3 (diff) | |
download | ruby-c23ec90e813457ec4db5d02677cdb358743974b5.tar.gz |
* transcode.c (sym_invalid_byte_sequence): new variable.
(sym_undefined_conversion): ditto.
(sym_destination_buffer_full): ditto.
(sym_source_buffer_empty): ditto.
(sym_finished): ditto.
(sym_output_followed_by_input): ditto.
(sym_incomplete_input): ditto.
(econv_result_to_symbol): use above variables.
(Init_transcode): initialize above variables.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18908 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 12 | ||||
-rw-r--r-- | transcode.c | 30 |
2 files changed, 35 insertions, 7 deletions
@@ -1,3 +1,15 @@ +Fri Aug 29 01:57:58 2008 Tanaka Akira <akr@fsij.org> + + * transcode.c (sym_invalid_byte_sequence): new variable. + (sym_undefined_conversion): ditto. + (sym_destination_buffer_full): ditto. + (sym_source_buffer_empty): ditto. + (sym_finished): ditto. + (sym_output_followed_by_input): ditto. + (sym_incomplete_input): ditto. + (econv_result_to_symbol): use above variables. + (Init_transcode): initialize above variables. + Fri Aug 29 00:53:40 2008 Shugo Maeda <shugo@ruby-lang.org> * strftime.c (rb_strftime): fixed a bug of padding. diff --git a/transcode.c b/transcode.c index 13d7c92452..861c285eed 100644 --- a/transcode.c +++ b/transcode.c @@ -23,6 +23,14 @@ VALUE rb_cEncodingConverter; static VALUE sym_invalid, sym_undef, sym_ignore, sym_replace; +static VALUE sym_invalid_byte_sequence; +static VALUE sym_undefined_conversion; +static VALUE sym_destination_buffer_full; +static VALUE sym_source_buffer_empty; +static VALUE sym_finished; +static VALUE sym_output_followed_by_input; +static VALUE sym_incomplete_input; + typedef struct { struct rb_transcoding *tc; unsigned char *out_buf_start; @@ -2300,13 +2308,13 @@ static VALUE econv_result_to_symbol(rb_econv_result_t res) { switch (res) { - case econv_invalid_byte_sequence: return ID2SYM(rb_intern("invalid_byte_sequence")); - case econv_incomplete_input: return ID2SYM(rb_intern("incomplete_input")); - case econv_undefined_conversion: return ID2SYM(rb_intern("undefined_conversion")); - case econv_destination_buffer_full: return ID2SYM(rb_intern("destination_buffer_full")); - case econv_source_buffer_empty: return ID2SYM(rb_intern("source_buffer_empty")); - case econv_finished: return ID2SYM(rb_intern("finished")); - case econv_output_followed_by_input: return ID2SYM(rb_intern("output_followed_by_input")); + case econv_invalid_byte_sequence: return sym_invalid_byte_sequence; + case econv_incomplete_input: return sym_incomplete_input; + case econv_undefined_conversion: return sym_undefined_conversion; + case econv_destination_buffer_full: return sym_destination_buffer_full; + case econv_source_buffer_empty: return sym_source_buffer_empty; + case econv_finished: return sym_finished; + case econv_output_followed_by_input: return sym_output_followed_by_input; default: return INT2NUM(res); /* should not be reached */ } } @@ -2661,6 +2669,14 @@ Init_transcode(void) sym_ignore = ID2SYM(rb_intern("ignore")); sym_replace = ID2SYM(rb_intern("replace")); + sym_invalid_byte_sequence = ID2SYM(rb_intern("invalid_byte_sequence")); + sym_undefined_conversion = ID2SYM(rb_intern("undefined_conversion")); + sym_destination_buffer_full = ID2SYM(rb_intern("destination_buffer_full")); + sym_source_buffer_empty = ID2SYM(rb_intern("source_buffer_empty")); + sym_finished = ID2SYM(rb_intern("finished")); + sym_output_followed_by_input = ID2SYM(rb_intern("output_followed_by_input")); + sym_incomplete_input = ID2SYM(rb_intern("incomplete_input")); + rb_define_method(rb_cString, "encode", str_encode, -1); rb_define_method(rb_cString, "encode!", str_encode_bang, -1); |