From 2c4aff3fe045ea63f2dfafe69f61e221acc04ac4 Mon Sep 17 00:00:00 2001 From: matz Date: Fri, 1 Jun 2007 16:27:05 +0000 Subject: [PATCH] * numeric.c (int_round): small optimization to handle bignums. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12423 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ numeric.c | 18 +++++++++++++++++- version.h | 6 +++--- 3 files changed, 24 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 95b27b8622..0cbe620f2b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Sat Jun 2 01:27:27 2007 Yukihiro Matsumoto + + * numeric.c (int_round): small optimization to handle bignums. + Fri Jun 1 13:02:35 2007 NAKAMURA Usaku * insnhelper.h (INC_SP): shouldn't cast ``x'' to unsigned type because diff --git a/numeric.c b/numeric.c index 8cf7a1e48a..6153b94549 100644 --- a/numeric.c +++ b/numeric.c @@ -2308,6 +2308,22 @@ int_pow(long x, unsigned long y) return LONG2NUM(z); } +static VALUE +int_round(int argc, VALUE* argv, VALUE num) +{ + VALUE nd; + int ndigits; + + if (argc == 0) return num; + rb_scan_args(argc, argv, "1", &nd); + ndigits = NUM2INT(nd); + if (ndigits > 0) { + return rb_Float(num); + } + ndigits = -ndigits; + return rb_funcall(num, '-', 1, rb_funcall(num, '%', 1, int_pow(10, ndigits))); +} + /* * call-seq: * fix ** other => Numeric @@ -3013,8 +3029,8 @@ Init_Numeric(void) rb_define_method(rb_cInteger, "to_int", int_to_i, 0); rb_define_method(rb_cInteger, "floor", int_to_i, 0); rb_define_method(rb_cInteger, "ceil", int_to_i, 0); - rb_define_method(rb_cInteger, "round", int_to_i, 0); rb_define_method(rb_cInteger, "truncate", int_to_i, 0); + rb_define_method(rb_cInteger, "round", int_round, -1); rb_cFixnum = rb_define_class("Fixnum", rb_cInteger); rb_include_module(rb_cFixnum, rb_mPrecision); diff --git a/version.h b/version.h index dc64e990b4..7c163e27e2 100644 --- a/version.h +++ b/version.h @@ -1,7 +1,7 @@ #define RUBY_VERSION "1.9.0" -#define RUBY_RELEASE_DATE "2007-06-01" +#define RUBY_RELEASE_DATE "2007-06-02" #define RUBY_VERSION_CODE 190 -#define RUBY_RELEASE_CODE 20070601 +#define RUBY_RELEASE_CODE 20070602 #define RUBY_PATCHLEVEL 0 #define RUBY_VERSION_MAJOR 1 @@ -9,7 +9,7 @@ #define RUBY_VERSION_TEENY 0 #define RUBY_RELEASE_YEAR 2007 #define RUBY_RELEASE_MONTH 6 -#define RUBY_RELEASE_DAY 1 +#define RUBY_RELEASE_DAY 2 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[];