ruby-changes:5003
From: ko1@a...
Date: Wed, 21 May 2008 01:37:47 +0900 (JST)
Subject: [ruby-changes:5003] naruse - Ruby:r16496 (trunk): * transcode.c, include/ruby/encodng.h (rb_str_transcode):
naruse 2008-05-21 01:37:13 +0900 (Wed, 21 May 2008) New Revision: 16496 Modified files: trunk/ChangeLog trunk/include/ruby/encoding.h trunk/transcode.c trunk/version.h Log: * transcode.c, include/ruby/encodng.h (rb_str_transcode): C API of encoding conversion for Ruby object. VALUE rb_str_transcode(VALUE str, VALUE to). * transcode.c (str_encode, str_encode_bang): rename from rb_tr_transcode or rb_str_transcode_bang. http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/version.h?r1=16496&r2=16495&diff_format=u http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=16496&r2=16495&diff_format=u http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/transcode.c?r1=16496&r2=16495&diff_format=u http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/include/ruby/encoding.h?r1=16496&r2=16495&diff_format=u Index: include/ruby/encoding.h =================================================================== --- include/ruby/encoding.h (revision 16495) +++ include/ruby/encoding.h (revision 16496) @@ -193,4 +193,6 @@ return ENC_DUMMY_P(ENC_FROM_ENCODING(enc)); } +VALUE rb_str_transcode(VALUE str, VALUE to); + #endif /* RUBY_ENCODING_H */ Index: ChangeLog =================================================================== --- ChangeLog (revision 16495) +++ ChangeLog (revision 16496) @@ -1,3 +1,12 @@ +Wed May 21 01:28:47 2008 NARUSE, Yui <naruse@r...> + + * transcode.c, include/ruby/encodng.h (rb_str_transcode): + C API of encoding conversion for Ruby object. + VALUE rb_str_transcode(VALUE str, VALUE to). + + * transcode.c (str_encode, str_encode_bang): + rename from rb_tr_transcode or rb_str_transcode_bang. + Tue May 20 23:26:05 2008 Yusuke Endoh <mame@t...> * test/ruby/test_array.rb: fix tests for 64bit CPU. Index: version.h =================================================================== --- version.h (revision 16495) +++ version.h (revision 16496) @@ -1,7 +1,7 @@ #define RUBY_VERSION "1.9.0" -#define RUBY_RELEASE_DATE "2008-05-20" +#define RUBY_RELEASE_DATE "2008-05-21" #define RUBY_VERSION_CODE 190 -#define RUBY_RELEASE_CODE 20080520 +#define RUBY_RELEASE_CODE 20080521 #define RUBY_PATCHLEVEL 0 #define RUBY_VERSION_MAJOR 1 @@ -9,7 +9,7 @@ #define RUBY_VERSION_TEENY 0 #define RUBY_RELEASE_YEAR 2008 #define RUBY_RELEASE_MONTH 5 -#define RUBY_RELEASE_DAY 20 +#define RUBY_RELEASE_DAY 21 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; Index: transcode.c =================================================================== --- transcode.c (revision 16495) +++ transcode.c (revision 16496) @@ -397,7 +397,7 @@ */ static VALUE -rb_str_transcode_bang(int argc, VALUE *argv, VALUE str) +str_encode_bang(int argc, VALUE *argv, VALUE str) { VALUE newstr = str; int encidx = str_transcode(argc, argv, &newstr); @@ -432,12 +432,21 @@ */ static VALUE -rb_str_transcode(int argc, VALUE *argv, VALUE str) +str_encode(int argc, VALUE *argv, VALUE str) { str = rb_str_dup(str); - return rb_str_transcode_bang(argc, argv, str); + return str_encode_bang(argc, argv, str); } +VALUE +rb_str_transcode(VALUE str, VALUE to) +{ + int argc = 1; + VALUE argv = rb_ary_new2(1); + rb_ary_push(argv, to); + return str_encode(argc, &argv, str); +} + void Init_transcode(void) { @@ -447,6 +456,6 @@ sym_invalid = ID2SYM(rb_intern("invalid")); sym_ignore = ID2SYM(rb_intern("ignore")); - rb_define_method(rb_cString, "encode", rb_str_transcode, -1); - rb_define_method(rb_cString, "encode!", rb_str_transcode_bang, -1); + rb_define_method(rb_cString, "encode", str_encode, -1); + rb_define_method(rb_cString, "encode!", str_encode_bang, -1); } -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/