summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-06-21 10:35:02 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-06-21 10:35:02 +0000
commit0e5852ce00ea1855176de8d3a8c1985853e24a28 (patch)
tree21055985f0be1fb74836eec6045a3079a0dfb7d6
parent24523af7cc04e6f51dc335470532087b2b15f497 (diff)
merges r23733 from trunk into ruby_1_9_1.
-- * numeric.c ( num_numerator, num_denominator): use to_r [ruby-core:23910]. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@23799 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--numeric.c6
-rw-r--r--version.h2
3 files changed, 10 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 2531d224cb..23c3faea24 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Jun 18 20:32:11 2009 Tadayoshi Funaba <tadf@dotrb.org>
+
+ * numeric.c ( num_numerator, num_denominator): use
+ to_r [ruby-core:23910].
+
Thu Jun 18 01:35:51 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
* numeric.c (flo_cmp): Infinity is greater than any bignum
diff --git a/numeric.c b/numeric.c
index 9c32c92f41..cd5bae60b8 100644
--- a/numeric.c
+++ b/numeric.c
@@ -1748,13 +1748,15 @@ rb_num2ull(VALUE val)
static VALUE
num_numerator(VALUE num)
{
- return rb_funcall(rb_Rational1(num), rb_intern("numerator"), 0);
+ return rb_funcall(rb_funcall(num, rb_intern("to_r"), 0),
+ rb_intern("numerator"), 0);
}
static VALUE
num_denominator(VALUE num)
{
- return rb_funcall(rb_Rational1(num), rb_intern("denominator"), 0);
+ return rb_funcall(rb_funcall(num, rb_intern("to_r"), 0),
+ rb_intern("denominator"), 0);
}
/*
diff --git a/version.h b/version.h
index 4969b88ec1..69fdf8fde4 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
#define RUBY_VERSION "1.9.1"
#define RUBY_RELEASE_DATE "2009-05-22"
-#define RUBY_PATCHLEVEL 189
+#define RUBY_PATCHLEVEL 190
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 9
#define RUBY_VERSION_TEENY 1