merges r20918 from trunk into ruby_1_9_1.

* numeric.c (int_ord): Integer#ord implemented.

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

2 files changed, 25 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 7fc96e7738..24a7d0a2ba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Dec 22 21:31:11 2008  Tanaka Akira  <akr@fsij.org>
+
+	* numeric.c (int_ord): Integer#ord implemented.
+
 Tue Dec 16 22:15:17 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* lib/minitest/unit.rb (MiniTest::Assertions#assert_instance_of):
diff --git a/numeric.c b/numeric.c
index bf9452e5b3..aee2563418 100644
--- a/numeric.c
+++ b/numeric.c
@@ -1925,6 +1925,26 @@ int_chr(int argc, VALUE *argv, VALUE num)
     return str;
 }
 
+/*
+ *  call-seq:
+ *     int.ord    => int
+ *
+ *  Returns the int itself.
+ *
+ *     ?a.ord    #=> 97
+ *
+ *  This method is intended for compatibility to
+ *  character constant in Ruby 1.9.
+ *  For example, ?a.ord returns 97 both in 1.8 and 1.9.
+ */
+
+static VALUE
+int_ord(num)
+    VALUE num;
+{
+    return num;
+}
+
 static VALUE
 int_numerator(VALUE num)
 {
@@ -3123,6 +3143,7 @@ Init_Numeric(void)
     rb_define_method(rb_cInteger, "next", int_succ, 0);
     rb_define_method(rb_cInteger, "pred", int_pred, 0);
     rb_define_method(rb_cInteger, "chr", int_chr, -1);
+    rb_define_method(rb_cInteger, "ord", int_ord, 0);
     rb_define_method(rb_cInteger, "to_i", int_to_i, 0);
     rb_define_method(rb_cInteger, "to_int", int_to_i, 0);
     rb_define_method(rb_cInteger, "floor", int_to_i, 0);