diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-12-02 08:06:58 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-12-02 08:06:58 +0000 |
commit | 931e3b6a67d7e65961ab350f8cef58d7515bcc07 (patch) | |
tree | b440454298aa48dfec88a1c64b30e8139b1aeb40 | |
parent | cd504997011c0078df5725ad9b751d05cd83f248 (diff) |
merges r29453 from trunk into ruby_1_9_2.
--
* string.c (rb_str_concat): use unsigned int for GB18030.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30040 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | string.c | 23 | ||||
-rw-r--r-- | test/ruby/test_m17n_comb.rb | 3 | ||||
-rw-r--r-- | version.h | 2 |
4 files changed, 15 insertions, 17 deletions
@@ -1,3 +1,7 @@ +Tue Oct 12 18:25:04 2010 NARUSE, Yui <naruse@ruby-lang.org> + + * string.c (rb_str_concat): use unsigned int for GB18030. + Tue Oct 12 15:52:35 2010 NAKAMURA Usaku <usa@ruby-lang.org> * win32/win32.c (rb_w32_strerror): unmap some range of errno for @@ -1992,37 +1992,28 @@ rb_str_append(VALUE str, VALUE str2) VALUE rb_str_concat(VALUE str1, VALUE str2) { - SIGNED_VALUE lc; + unsigned int lc; if (FIXNUM_P(str2)) { - lc = FIX2LONG(str2); - if (lc < 0) - rb_raise(rb_eRangeError, "negative argument"); + lc = FIX2UINT(str2); } else if (TYPE(str2) == T_BIGNUM) { - if (!RBIGNUM_SIGN(str2)) - rb_raise(rb_eRangeError, "negative argument"); - lc = rb_big2ulong(str2); + lc = NUM2UINT(str2); } else { return rb_str_append(str1, str2); } -#if SIZEOF_INT < SIZEOF_VALUE - if ((VALUE)lc > UINT_MAX) { - rb_raise(rb_eRangeError, "%"PRIuVALUE" out of char range", lc); - } -#endif { rb_encoding *enc = STR_ENC_GET(str1); long pos = RSTRING_LEN(str1); int cr = ENC_CODERANGE(str1); - int c, len; + int len; - if ((len = rb_enc_codelen(c = (int)lc, enc)) <= 0) { - rb_raise(rb_eRangeError, "%u invalid char", c); + if ((len = rb_enc_codelen(lc, enc)) <= 0) { + rb_raise(rb_eRangeError, "%u invalid char", lc); } rb_str_resize(str1, pos+len); - rb_enc_mbcput(c, RSTRING_PTR(str1)+pos, enc); + rb_enc_mbcput(lc, RSTRING_PTR(str1)+pos, enc); ENC_CODERANGE_SET(str1, cr); return str1; } diff --git a/test/ruby/test_m17n_comb.rb b/test/ruby/test_m17n_comb.rb index cf80377172..e730f6f0e8 100644 --- a/test/ruby/test_m17n_comb.rb +++ b/test/ruby/test_m17n_comb.rb @@ -346,6 +346,9 @@ class TestM17NComb < Test::Unit::TestCase assert_raise(Encoding::CompatibilityError) { s << s2 } end } + + assert_equal("A\x84\x31\xA4\x39".force_encoding("GB18030"), + "A".force_encoding("GB18030") << 0x8431A439) end def test_str_aref @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.2" -#define RUBY_PATCHLEVEL 70 +#define RUBY_PATCHLEVEL 71 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 1 |