1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* string.c (rb_str_comparable): empty strings in any encoding are

Browse Source 
compatible each other.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15742 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
matz 2008-03-11 00:55:02 +00:00
parent eb1f89015e
commit 923a661a7a
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Tue Mar 11 09:52:49 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
* string.c (rb_str_comparable): empty strings in any encoding are
compatible each other.
Tue Mar 11 00:46:29 2008 Yukihiro Matsumoto <matz@ruby-lang.org> Tue Mar 11 00:46:29 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
* ruby.c (usage): remove some unimportant lines to fit -h message * ruby.c (usage): remove some unimportant lines to fit -h message

11
string.c
View File

@ -1847,20 +1847,23 @@ rb_str_hash_m(VALUE str)
int int
rb_str_comparable(VALUE str1, VALUE str2) rb_str_comparable(VALUE str1, VALUE str2)
{ {
int idx1 = ENCODING_GET(str1); int idx1, idx2;
int idx2 = ENCODING_GET(str2);
int rc1, rc2; int rc1, rc2;
if (RSTRING_LEN(str1) == 0) return Qtrue;
if (RSTRING_LEN(str2) == 0) return Qtrue;
idx1 = ENCODING_GET(str1);
idx2 = ENCODING_GET(str2);
if (idx1 == idx2) return Qtrue; if (idx1 == idx2) return Qtrue;
rc1 = rb_enc_str_coderange(str1); rc1 = rb_enc_str_coderange(str1);
rc2 = rb_enc_str_coderange(str2); rc2 = rb_enc_str_coderange(str2);
if (rc1 == ENC_CODERANGE_7BIT) { if (rc1 == ENC_CODERANGE_7BIT) {
if (rc2 == ENC_CODERANGE_7BIT) return Qtrue; if (rc2 == ENC_CODERANGE_7BIT) return Qtrue;
if (rb_enc_asciicompat(rb_enc_from_index(idx1))) if (rb_enc_asciicompat(rb_enc_from_index(idx2)))
return Qtrue; return Qtrue;
} }
if (rc2 == ENC_CODERANGE_7BIT) { if (rc2 == ENC_CODERANGE_7BIT) {
if (rb_enc_asciicompat(rb_enc_from_index(idx2))) if (rb_enc_asciicompat(rb_enc_from_index(idx1)))
return Qtrue; return Qtrue;
} }
return Qfalse; return Qfalse;