kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* string.c (rb_str_concat): use unsigned int for GB18030.

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29453 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2010-10-12 09:25:33 +00:00
parent 2d8612e966
commit 1e22306569
3 changed files with 14 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -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 17:53:49 2010 NARUSE, Yui <naruse@ruby-lang.org> Tue Oct 12 17:53:49 2010 NARUSE, Yui <naruse@ruby-lang.org>
* numeric (check_uint): the mask must refer to VALUE. * numeric (check_uint): the mask must refer to VALUE.

23
string.c
View file

@ -2021,37 +2021,28 @@ rb_str_append(VALUE str, VALUE str2)
VALUE VALUE
rb_str_concat(VALUE str1, VALUE str2) rb_str_concat(VALUE str1, VALUE str2)
{ {
SIGNED_VALUE lc; unsigned int lc;
if (FIXNUM_P(str2)) { if (FIXNUM_P(str2)) {
lc = FIX2LONG(str2); lc = FIX2UINT(str2);
if (lc < 0)
rb_raise(rb_eRangeError, "negative argument");
} }
else if (TYPE(str2) == T_BIGNUM) { else if (TYPE(str2) == T_BIGNUM) {
if (!RBIGNUM_SIGN(str2)) lc = NUM2UINT(str2);
rb_raise(rb_eRangeError, "negative argument");
lc = rb_big2ulong(str2);
} }
else { else {
return rb_str_append(str1, str2); 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); rb_encoding *enc = STR_ENC_GET(str1);
long pos = RSTRING_LEN(str1); long pos = RSTRING_LEN(str1);
int cr = ENC_CODERANGE(str1); int cr = ENC_CODERANGE(str1);
int c, len; int len;
if ((len = rb_enc_codelen(c = (int)lc, enc)) <= 0) { if ((len = rb_enc_codelen(lc, enc)) <= 0) {
rb_raise(rb_eRangeError, "%u invalid char", c); rb_raise(rb_eRangeError, "%u invalid char", lc);
} }
rb_str_resize(str1, pos+len); 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); ENC_CODERANGE_SET(str1, cr);
return str1; return str1;
} }

3
test/ruby/test_m17n_comb.rb
View file

@ -346,6 +346,9 @@ class TestM17NComb < Test::Unit::TestCase
assert_raise(Encoding::CompatibilityError) { s << s2 } assert_raise(Encoding::CompatibilityError) { s << s2 }
end end
} }
assert_equal("A\x84\x31\xA4\x39".force_encoding("GB18030"),
"A".force_encoding("GB18030") << 0x8431A439)
end end
def test_str_aref def test_str_aref