summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-07 18:46:09 (GMT)
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-07 18:46:09 (GMT)
commit198898b3d56fdfc3da69e5e5b109f5d91019bf86 (patch)
treed2ef6b5e43ae9717734930953a34adf3991be622
parent19638a78663426969452f2dd3f64310abfd95482 (diff)
merge revision(s) 13902, 13907, 13914:
* numeric.c (flo_divmod): round to the nearest integer. [ ruby-Bugs-14540 ] * numeric.c (flodivmod): work around for inifinity. * numeric.c (flo_divmod): work around for platforms have no round(). [ruby-dev:32247] * numeric.c (round): fallback definition. * numeric.c (flo_divmod, flo_round): use round() always. [ruby-dev:32269] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@16931 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog19
-rw-r--r--configure.in2
-rw-r--r--numeric.c40
-rw-r--r--version.h2
4 files changed, 53 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index 37ca61b..1131ae4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+Sun Jun 8 03:42:10 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * numeric.c (round): fallback definition.
+
+ * numeric.c (flo_divmod, flo_round): use round() always.
+ [ruby-dev:32269]
+
+Sun Jun 8 03:42:10 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * numeric.c (flodivmod): work around for inifinity.
+
+ * numeric.c (flo_divmod): work around for platforms have no round().
+ [ruby-dev:32247]
+
+Sun Jun 8 03:42:10 2008 URABE Shyouhei <shyouhei@ice.uec.ac.jp>
+
+ * numeric.c (flo_divmod): round to the nearest integer.
+ [ ruby-Bugs-14540 ]
+
Sun Jun 8 03:28:53 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
* lib/rexml/encodings/SHIFT-JIS.rb (REXML::Encoding): place -x for
diff --git a/configure.in b/configure.in
index 4183cc5..fafd398 100644
--- a/configure.in
+++ b/configure.in
@@ -545,7 +545,7 @@ AC_CHECK_FUNCS(fmod killpg wait4 waitpid syscall chroot fsync getcwd eaccess\
getgroups setgroups getpriority getrlimit setrlimit sysconf\
group_member dlopen sigprocmask\
sigaction _setjmp setsid telldir seekdir fchmod mktime timegm\
- cosh sinh tanh setuid setgid setenv unsetenv)
+ cosh sinh tanh round setuid setgid setenv unsetenv)
AC_ARG_ENABLE(setreuid,
[ --enable-setreuid use setreuid()/setregid() according to need even if obsolete.],
[use_setreuid=$enableval])
diff --git a/numeric.c b/numeric.c
index 6d69df9..d6544d3 100644
--- a/numeric.c
+++ b/numeric.c
@@ -63,6 +63,25 @@
#define DBL_EPSILON 2.2204460492503131e-16
#endif
+#ifndef HAVE_ROUND
+double
+round(x)
+ double x;
+{
+ double f;
+
+ if (x > 0.0) {
+ f = floor(x);
+ x = f + (x - f >= 0.5);
+ }
+ else if (x < 0.0) {
+ f = ceil(x);
+ x = f - (f - x >= 0.5);
+ }
+ return x;
+}
+#endif
+
static ID id_coerce, id_to_i, id_eq;
VALUE rb_cNumeric;
@@ -662,7 +681,10 @@ flodivmod(x, y, divp, modp)
mod = x - z * y;
}
#endif
- div = (x - mod) / y;
+ if (isinf(x) && !isinf(y) && !isnan(y))
+ div = x;
+ else
+ div = (x - mod) / y;
if (y*mod < 0) {
mod += y;
div -= 1.0;
@@ -735,11 +757,14 @@ flo_divmod(x, y)
}
flodivmod(RFLOAT(x)->value, fy, &div, &mod);
if (FIXABLE(div)) {
- val = div;
- a = LONG2FIX(val);
+ val = round(div);
+ a = LONG2FIX(val);
+ }
+ else if (isnan(div) || isinf(div)) {
+ a = rb_float_new(div);
}
else {
- a = rb_dbl2big(div);
+ a = rb_dbl2big(div);
}
b = rb_float_new(mod);
return rb_assoc_new(a, b);
@@ -1291,8 +1316,7 @@ flo_round(num)
double f = RFLOAT(num)->value;
long val;
- if (f > 0.0) f = floor(f+0.5);
- if (f < 0.0) f = ceil(f-0.5);
+ f = round(f);
if (!FIXABLE(f)) {
return rb_dbl2big(f);
@@ -1530,7 +1554,7 @@ rb_num2long(val)
char *s;
sprintf(buf, "%-.10g", RFLOAT(val)->value);
- if (s = strchr(buf, ' ')) *s = '\0';
+ if ((s = strchr(buf, ' ')) != 0) *s = '\0';
rb_raise(rb_eRangeError, "float %s out of range of integer", buf);
}
@@ -1681,7 +1705,7 @@ rb_num2ll(val)
char *s;
sprintf(buf, "%-.10g", RFLOAT(val)->value);
- if (s = strchr(buf, ' ')) *s = '\0';
+ if ((s = strchr(buf, ' ')) != 0) *s = '\0';
rb_raise(rb_eRangeError, "float %s out of range of long long", buf);
}
diff --git a/version.h b/version.h
index c989aea..2fed3dd 100644
--- a/version.h
+++ b/version.h
@@ -2,7 +2,7 @@
#define RUBY_RELEASE_DATE "2008-06-08"
#define RUBY_VERSION_CODE 186
#define RUBY_RELEASE_CODE 20080608
-#define RUBY_PATCHLEVEL 141
+#define RUBY_PATCHLEVEL 144
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8