From 6342e704a779fac6bca464e2470a70ae84a77ba5 Mon Sep 17 00:00:00 2001 From: matz Date: Sun, 23 Dec 2007 16:07:09 +0000 Subject: * string.c (rb_str_comparable): comparison including broken coderange strings do not consider encoding. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@14533 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- string.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'string.c') diff --git a/string.c b/string.c index ebfd39c9b..728790f6f 100644 --- a/string.c +++ b/string.c @@ -1269,11 +1269,16 @@ rb_str_comparable(VALUE str1, VALUE str2) { int idx1 = rb_enc_get_index(str1); int idx2 = rb_enc_get_index(str2); + int rc1, rc2; if (idx1 == idx2) return Qtrue; - if (!is_ascii_string(str1)) return Qfalse; - if (!is_ascii_string(str2)) return Qfalse; - return Qtrue; + rc1 = rb_enc_str_coderange(str1); + rc2 = rb_enc_str_coderange(str2); + if (rc1 == ENC_CODERANGE_7BIT && rc2 == ENC_CODERANGE_7BIT) + return Qtrue; + if (rc1 == ENC_CODERANGE_BROKEN) return Qtrue; + if (rc2 == ENC_CODERANGE_BROKEN) return Qtrue; + return Qfalse; } int @@ -1288,9 +1293,6 @@ rb_str_cmp(VALUE str1, VALUE str2) retval = memcmp(RSTRING_PTR(str1), RSTRING_PTR(str2), len); if (retval == 0) { if (RSTRING_LEN(str1) == RSTRING_LEN(str2)) { - if (!enc) { - return rb_enc_get_index(str1) - rb_enc_get_index(str2); - } return 0; } if (RSTRING_LEN(str1) > RSTRING_LEN(str2)) return 1; -- cgit