summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-10-24 16:48:05 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-10-24 16:48:05 +0000
commit1dc46d8782dd34738ed2970b0b68ce17739bd076 (patch)
treec2db25ebc5acab448c3a45763e418ae3e8650e98
parent27e57f572000aac812833034f3725a826d64864e (diff)
downloadruby-1dc46d8782dd34738ed2970b0b68ce17739bd076.tar.gz
ruby-1dc46d8782dd34738ed2970b0b68ce17739bd076.tar.xz
ruby-1dc46d8782dd34738ed2970b0b68ce17739bd076.zip
* object.c (rb_obj_cmp): defines Object#<=>. [ruby-core:24063]
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@25453 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--lib/delegate.rb2
-rw-r--r--object.c10
3 files changed, 15 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 6e829ade4..0d294d2d0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sat Oct 24 13:38:45 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * object.c (rb_obj_cmp): defines Object#<=>. [ruby-core:24063]
+
Sat Oct 24 00:36:47 2009 Tanaka Akira <akr@fsij.org>
* io.c (io_cntl): update max file descriptor by the result of
diff --git a/lib/delegate.rb b/lib/delegate.rb
index 9ce3aee81..77804e47f 100644
--- a/lib/delegate.rb
+++ b/lib/delegate.rb
@@ -115,7 +115,7 @@
# implementation, see SimpleDelegator.
#
class Delegator
- [:to_s,:inspect,:=~,:!~,:===].each do |m|
+ [:to_s,:inspect,:=~,:!~,:===,:<=>].each do |m|
undef_method m
end
diff --git a/object.c b/object.c
index 6e6934373..9f7537f12 100644
--- a/object.c
+++ b/object.c
@@ -1119,6 +1119,15 @@ rb_obj_not_match(VALUE obj1, VALUE obj2)
}
+/* :nodoc: */
+static VALUE
+rb_obj_cmp(VALUE obj1, VALUE obj2)
+{
+ if (obj1 == obj2 || rb_obj_equal(obj1, obj2))
+ return INT2FIX(0);
+ return Qnil;
+}
+
/***********************************************************************
*
* Document-class: Module
@@ -2555,6 +2564,7 @@ Init_Object(void)
rb_define_method(rb_mKernel, "!~", rb_obj_not_match, 1);
rb_define_method(rb_mKernel, "eql?", rb_obj_equal, 1);
rb_define_method(rb_mKernel, "hash", rb_obj_hash, 0);
+ rb_define_method(rb_mKernel, "<=>", rb_obj_cmp, 1);
rb_define_method(rb_mKernel, "class", rb_obj_class, 0);
rb_define_method(rb_mKernel, "clone", rb_obj_clone, 0);