[3689] MacRuby/branches/icu

4 Mar 2010

Revision: 3689
          http://trac.macosforge.org/projects/ruby/changeset/3689
Author:   lsansonetti@apple.com
Date:     2010-03-03 17:11:53 -0800 (Wed, 03 Mar 2010)
Log Message:
-----------
added Symbol#casecmp, fixed a bug in String#casecmp

Modified Paths:
--------------
    MacRuby/branches/icu/include/ruby/intern.h
    MacRuby/branches/icu/string.c
    MacRuby/branches/icu/symbol.c

Modified: MacRuby/branches/icu/include/ruby/intern.h
===================================================================

--- MacRuby/branches/icu/include/ruby/intern.h	2010-03-04 00:49:19 UTC (rev 3688)
+++ MacRuby/branches/icu/include/ruby/intern.h	2010-03-04 01:11:53 UTC (rev 3689)
@@ -592,6 +592,7 @@
 int rb_str_hash_cmp(VALUE,VALUE);
 int rb_str_comparable(VALUE, VALUE);
 int rb_str_cmp(VALUE, VALUE);
+int rb_str_casecmp(VALUE, VALUE);
 VALUE rb_str_equal(VALUE str1, VALUE str2);
 void rb_str_update(VALUE, long, long, VALUE);
 VALUE rb_str_split(VALUE, const char*);

Modified: MacRuby/branches/icu/string.c
===================================================================
--- MacRuby/branches/icu/string.c	2010-03-04 00:49:19 UTC (rev 3688)
+++ MacRuby/branches/icu/string.c	2010-03-04 01:11:53 UTC (rev 3689)
@@ -887,6 +887,71 @@
     return res > 0 ? 1 : -1;
 }
 
+static int
+str_case_compare(rb_str_t *self, rb_str_t *str)
+{
+    if (self == str) {
+	return 0;
+    }
+
+    if (self->length_in_bytes == 0 && str->length_in_bytes == 0) {
+	// both strings are empty
+	return 0;
+    }
+
+    if (str_compatible_encoding(self, str) == NULL) {
+	// incompatible encodings
+	return -1;
+    }
+
+    if (str_is_stored_in_uchars(self)
+	    != str_is_stored_in_uchars(str)) {
+	// one is in uchars and the other is in binary
+	if (!str_try_making_data_uchars(self)
+		|| !str_try_making_data_uchars(str)) {
+	    // one is in uchars but the other one can't be converted in
+	    // uchars
+	    return -1;
+	}
+    }
+
+    const long min_length = self->length_in_bytes < str->length_in_bytes
+	? self->length_in_bytes : str->length_in_bytes;
+
+    if (str_is_stored_in_uchars(str)) {
+	for (long i = 0; i < BYTES_TO_UCHARS(min_length); i++) {
+	    UChar c1 = self->data.uchars[i];
+	    UChar c2 = str->data.uchars[i];
+	    if (c1 != c2) {
+		c1 = isascii(c1) ? toupper(c1) : c1;
+		c2 = isascii(c2) ? toupper(c2) : c2;
+		if (c1 != c2) {
+		    return c1 < c2 ? -1 : 1;
+		}
+	    }
+	}
+    }
+    else {
+	for (long i = 0; i < min_length; i++) {
+	    char c1 = self->data.bytes[i];
+	    char c2 = str->data.bytes[i];
+	    if (c1 != c2) {
+		c1 = isascii(c1) ? toupper(c1) : c1;
+		c2 = isascii(c2) ? toupper(c2) : c2;
+		if (c1 != c2) {
+		    return c1 < c2 ? -1 : 1;
+		}
+	    }
+	}
+    }
+
+    if (self->length_in_bytes == str->length_in_bytes) {
+	return 0;
+    }
+    return self->length_in_bytes > str->length_in_bytes ? 1 : -1;
+}
+
+
 static long
 str_offset_in_bytes_to_index(rb_str_t *self, long offset_in_bytes,
 	bool ucs2_mode)
@@ -2149,60 +2214,7 @@
 static VALUE
 rstr_casecmp(VALUE str, SEL sel, VALUE other)
 {
-    StringValue(other);
-
-    rb_str_t *self_str = RSTR(str);
-    rb_str_t *other_str = str_need_string(other);
-    if (self_str == other_str
-	|| (self_str->length_in_bytes == 0
-	    && other_str->length_in_bytes == 0)) {
-	return INT2FIX(0);
-    }
-
-    if (str_compatible_encoding(self_str, other_str) == NULL) {
-	// incompatible encodings
-	return Qnil;
-    }
-
-    if (str_is_stored_in_uchars(self_str)
-	    != str_is_stored_in_uchars(other_str)) {
-	// one is in uchars and the other is in binary
-	if (!str_try_making_data_uchars(self_str)
-		|| !str_try_making_data_uchars(other_str)) {
-	    // one is in uchars but the other one can't be converted in
-	    // uchars
-	    return Qnil;
-	}
-    }
-
-    const long min_length =
-	self_str->length_in_bytes < other_str->length_in_bytes
-	? self_str->length_in_bytes : other_str->length_in_bytes;
-
-    if (str_is_stored_in_uchars(other_str)) {
-	for (long i = 0; i < BYTES_TO_UCHARS(min_length); i++) {
-	    UChar c1 = toupper(self_str->data.uchars[i]);
-	    UChar c2 = toupper(other_str->data.uchars[i]);
-	    if (c1 != c2) {
-		return INT2FIX(c1 < c2 ? -1 : 1);
-	    }
-	}
-    }
-    else {
-	for (long i = 0; i < min_length; i++) {
-	    char c1 = toupper(self_str->data.bytes[i]);
-	    char c2 = toupper(other_str->data.bytes[i]);
-	    if (c1 != c2) {
-		return INT2FIX(c1 < c2 ? -1 : 1);
-	    }
-	}
-    }
-
-    if (self_str->length_in_bytes == other_str->length_in_bytes) {
-	return INT2FIX(0);
-    }
-    return self_str->length_in_bytes > other_str->length_in_bytes
-	? INT2FIX(1) : INT2FIX(-1);
+    return INT2FIX(str_case_compare(RSTR(str), str_need_string(other)));
 }
 
 /*
@@ -5156,3 +5168,9 @@
 {
     return str_compare(str_need_string(str1), str_need_string(str2));
 }
+
+int
+rb_str_casecmp(VALUE str1, VALUE str2)
+{
+    return str_case_compare(str_need_string(str1), str_need_string(str2));
+}

Modified: MacRuby/branches/icu/symbol.c
===================================================================
--- MacRuby/branches/icu/symbol.c	2010-03-04 00:49:19 UTC (rev 3688)
+++ MacRuby/branches/icu/symbol.c	2010-03-04 01:11:53 UTC (rev 3689)
@@ -251,6 +251,23 @@
 }
 
 /*
+ * call-seq:
+ *
+ *   sym.casecmp(other)  => -1, 0, +1 or nil
+ *
+ * Case-insensitive version of <code>Symbol#<=></code>.
+ */
+
+static VALUE
+rsym_casecmp(VALUE sym, SEL sel, VALUE other)
+{
+    if (TYPE(other) != T_SYMBOL) {
+	return Qnil;
+    }
+    return INT2FIX(rb_str_casecmp(RSYM(sym)->str, RSYM(other)->str));
+}
+
+/*
  *  call-seq:
  *     sym == obj   => true or false
  *  
@@ -401,6 +418,7 @@
 
     rb_objc_define_method(rb_cSymbol, "==", rsym_equal, 1);
     rb_objc_define_method(rb_cSymbol, "<=>", rsym_cmp, 1);
+    rb_objc_define_method(rb_cSymbol, "casecmp", rsym_casecmp, 1);
     rb_objc_define_method(rb_cSymbol, "eql?", rsym_equal, 1);
     rb_objc_define_method(rb_cSymbol, "inspect", rsym_inspect, 0);
     rb_objc_define_method(rb_cSymbol, "to_proc", rsym_to_proc, 0);

    

source_changes＠macosforge.org

tags

participants (1)