* string.c (str_eql): extracted from rb_str_equal and rb_str_eql.

git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@22775 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 17 insertions, 18 deletions

diff --git a/ChangeLog b/ChangeLog
index 2878fcd2d..3e68c6c5e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,6 @@
-Thu Mar  5 10:24:56 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Thu Mar  5 10:29:10 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (str_eql): extracted from rb_str_equal and rb_str_eql.
 
 	* string.c (rb_str_chomp_bang): keeps 7bit coderange.
 
diff --git a/string.c b/string.c
index e94f56399..d464d5f56 100644
--- a/string.c
+++ b/string.c
@@ -2227,7 +2227,18 @@ rb_str_cmp(VALUE str1, VALUE str2)
     return -1;
 }
 
+/* expect tail call optimization */
+static VALUE
+str_eql(const VALUE str1, const VALUE str2)
+{
+    const long len = RSTRING_LEN(str1);
 
+    if (len != RSTRING_LEN(str2)) return Qfalse;
+    if (!rb_str_comparable(str1, str2)) return Qfalse;
+    if (memcmp(RSTRING_PTR(str1), RSTRING_PTR(str2), len) == 0)
+	return Qtrue;
+    return Qfalse;
+}
 /*
  *  call-seq:
  *     str == obj   => true or false
@@ -2240,8 +2251,6 @@ rb_str_cmp(VALUE str1, VALUE str2)
 VALUE
 rb_str_equal(VALUE str1, VALUE str2)
 {
-    int len;
-
     if (str1 == str2) return Qtrue;
     if (TYPE(str2) != T_STRING) {
 	if (!rb_respond_to(str2, rb_intern("to_str"))) {
@@ -2249,12 +2258,7 @@ rb_str_equal(VALUE str1, VALUE str2)
 	}
 	return rb_equal(str2, str1);
     }
-    if (!rb_str_comparable(str1, str2)) return Qfalse;
-    if (RSTRING_LEN(str1) == (len = RSTRING_LEN(str2)) &&
-	memcmp(RSTRING_PTR(str1), RSTRING_PTR(str2), len) == 0) {
-	return Qtrue;
-    }
-    return Qfalse;
+    return str_eql(str1, str2);
 }
 
 /*
@@ -2267,15 +2271,8 @@ rb_str_equal(VALUE str1, VALUE str2)
 static VALUE
 rb_str_eql(VALUE str1, VALUE str2)
 {
-    if (TYPE(str2) != T_STRING || RSTRING_LEN(str1) != RSTRING_LEN(str2))
-	return Qfalse;
-
-    if (!rb_str_comparable(str1, str2)) return Qfalse;
-    if (memcmp(RSTRING_PTR(str1), RSTRING_PTR(str2),
-	       lesser(RSTRING_LEN(str1), RSTRING_LEN(str2))) == 0)
-	return Qtrue;
-
-    return Qfalse;
+    if (TYPE(str2) != T_STRING) return Qfalse;
+    return str_eql(str1, str2);
 }
 
 /*