* file.c (rb_find_file_ext): should not terminate searching with

  empty path, just ignore.

* dir.c: remove <sys/parm.h> inclusion.

* compar.c (cmp_eq,cmp_gt,cmp_ge,cmp_lt,cmp_le): check using
  rb_cmpint().

* error.c (init_syserr): remove sys_nerr dependency.

* numeric.c (num_cmp): added to satisfy Comparable assumption.

* eval.c (rb_add_method): "initialize" should be public if it is a
  singleton method.

* regex.c (re_match): avoid dereferencing if size == 0.
  (ruby-bugs-ja:PR#360)

* time.c (time_cmp): should return nil if an operand is not a
  number nor time. (ruby-bugs-ja:PR#359)

* file.c (rb_stat_cmp): should return nil if an operand is not
  File::Stat.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3076 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 5 insertions, 18 deletions

diff --git a/time.c b/time.c
index 30b13fb674..adb92c7eba 100644
--- a/time.c
+++ b/time.c
@@ -713,6 +713,10 @@ time_cmp(time1, time2)
       case T_FLOAT:
 	return rb_dbl_cmp((double)tobj1->tv.tv_sec + (double)tobj1->tv.tv_usec*1e-6,
 			  RFLOAT(time2)->value);
+
+      case T_BIGNUM:
+	return rb_dbl_cmp((double)tobj1->tv.tv_sec + (double)tobj1->tv.tv_usec*1e-6,
+			  rb_big2dbl(time2));
     }
 
     if (TYPE(time2) == T_DATA && RDATA(time2)->dfree == time_free) {
@@ -725,24 +729,7 @@ time_cmp(time1, time2)
 	if (tobj1->tv.tv_sec > tobj2->tv.tv_sec) return INT2FIX(1);
 	return INT2FIX(-1);
     }
-    if (TYPE(time2) == T_BIGNUM) {
-	double a = (double)tobj1->tv.tv_sec+(double)tobj1->tv.tv_usec/1e6;
-	double b = rb_big2dbl(time2);
-
-	if (a == b) return INT2FIX(0);
-	if (a > b) return INT2FIX(1);
-	if (a < b) return INT2FIX(-1);
-    }
-    i = NUM2LONG(time2);
-    if (tobj1->tv.tv_sec == i) {
-	if (tobj1->tv.tv_usec == 0)
-	    return INT2FIX(0);
-	if (tobj1->tv.tv_usec > 0)
-	    return INT2FIX(1);
-	return INT2FIX(-1);
-    }
-    if (tobj1->tv.tv_sec > i) return INT2FIX(1);
-    return INT2FIX(-1);
+    return Qnil;
 }
 
 static VALUE