mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
merge revision(s) 42178: [Backport #8687]
* rational.c (f_round_common): Rational is expected to be returned by Rational#*, but mathn.rb breaks that assumption. [ruby-core:56177] [Bug #8687] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@42326 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa
parent
297ac0a672
commit
b13edd512d
4 changed files with 111 additions and 5 deletions
|
|
@ -1,3 +1,9 @@
|
|||
Fri Aug 2 20:03:39 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||
|
||||
* rational.c (f_round_common): Rational is expected to be returned by
|
||||
Rational#*, but mathn.rb breaks that assumption. [ruby-core:56177]
|
||||
[Bug #8687]
|
||||
|
||||
Wed Jul 17 11:00:21 2013 Tadayoshi Funaba <tadf@dotrb.org>
|
||||
|
||||
* ext/date/date_core.c: [ruby-core:46058].
|
||||
|
|
|
|||
|
|
@ -1230,6 +1230,10 @@ f_round_common(int argc, VALUE *argv, VALUE self, VALUE (*func)(VALUE))
|
|||
b = f_expt10(n);
|
||||
s = f_mul(self, b);
|
||||
|
||||
if (!k_rational_p(s)) {
|
||||
s = f_rational_new_bang1(CLASS_OF(self), s);
|
||||
}
|
||||
|
||||
s = (*func)(s);
|
||||
|
||||
s = f_div(f_rational_new_bang1(CLASS_OF(self), s), b);
|
||||
|
|
|
|||
|
|
@ -5,6 +5,102 @@ require_relative 'ruby/envutil'
|
|||
class TestMathn < Test::Unit::TestCase
|
||||
def test_power
|
||||
assert_in_out_err ['-r', 'mathn', '-e', 'a=1**2;!a'], "", [], [], '[ruby-core:25740]'
|
||||
assert_in_out_err ['-r', 'mathn', '-e', 'a=(1<<126)**2;!a'], "", [], [], '[ruby-core:25740]'
|
||||
assert_in_out_err ['-r', 'mathn', '-e', 'a=(1 << 126)**2;!a'], "", [], [], '[ruby-core:25740]'
|
||||
end
|
||||
|
||||
def assert_separated_equal(options, expected, actual, message = nil)
|
||||
assert_in_out_err([*options, '-e', "p((#{actual})==(#{expected}))"], "", ["true"], [], message)
|
||||
end
|
||||
|
||||
def test_floor
|
||||
assert_separated_equal(%w[-rmathn], " 2", "( 13/5).floor")
|
||||
assert_separated_equal(%w[-rmathn], " 2", "( 5/2).floor")
|
||||
assert_separated_equal(%w[-rmathn], " 2", "( 12/5).floor")
|
||||
assert_separated_equal(%w[-rmathn], "-3", "(-12/5).floor")
|
||||
assert_separated_equal(%w[-rmathn], "-3", "( -5/2).floor")
|
||||
assert_separated_equal(%w[-rmathn], "-3", "(-13/5).floor")
|
||||
|
||||
assert_separated_equal(%w[-rmathn], " 2", "( 13/5).floor(0)")
|
||||
assert_separated_equal(%w[-rmathn], " 2", "( 5/2).floor(0)")
|
||||
assert_separated_equal(%w[-rmathn], " 2", "( 12/5).floor(0)")
|
||||
assert_separated_equal(%w[-rmathn], "-3", "(-12/5).floor(0)")
|
||||
assert_separated_equal(%w[-rmathn], "-3", "( -5/2).floor(0)")
|
||||
assert_separated_equal(%w[-rmathn], "-3", "(-13/5).floor(0)")
|
||||
|
||||
assert_separated_equal(%w[-rmathn], "( 13/5)", "( 13/5).floor(2)")
|
||||
assert_separated_equal(%w[-rmathn], "( 5/2)", "( 5/2).floor(2)")
|
||||
assert_separated_equal(%w[-rmathn], "( 12/5)", "( 12/5).floor(2)")
|
||||
assert_separated_equal(%w[-rmathn], "(-12/5)", "(-12/5).floor(2)")
|
||||
assert_separated_equal(%w[-rmathn], "( -5/2)", "( -5/2).floor(2)")
|
||||
assert_separated_equal(%w[-rmathn], "(-13/5)", "(-13/5).floor(2)")
|
||||
end
|
||||
|
||||
def test_ceil
|
||||
assert_separated_equal(%w[-rmathn], " 3", "( 13/5).ceil")
|
||||
assert_separated_equal(%w[-rmathn], " 3", "( 5/2).ceil")
|
||||
assert_separated_equal(%w[-rmathn], " 3", "( 12/5).ceil")
|
||||
assert_separated_equal(%w[-rmathn], "-2", "(-12/5).ceil")
|
||||
assert_separated_equal(%w[-rmathn], "-2", "( -5/2).ceil")
|
||||
assert_separated_equal(%w[-rmathn], "-2", "(-13/5).ceil")
|
||||
|
||||
assert_separated_equal(%w[-rmathn], " 3", "( 13/5).ceil(0)")
|
||||
assert_separated_equal(%w[-rmathn], " 3", "( 5/2).ceil(0)")
|
||||
assert_separated_equal(%w[-rmathn], " 3", "( 12/5).ceil(0)")
|
||||
assert_separated_equal(%w[-rmathn], "-2", "(-12/5).ceil(0)")
|
||||
assert_separated_equal(%w[-rmathn], "-2", "( -5/2).ceil(0)")
|
||||
assert_separated_equal(%w[-rmathn], "-2", "(-13/5).ceil(0)")
|
||||
|
||||
assert_separated_equal(%w[-rmathn], "( 13/5)", "( 13/5).ceil(2)")
|
||||
assert_separated_equal(%w[-rmathn], "( 5/2)", "( 5/2).ceil(2)")
|
||||
assert_separated_equal(%w[-rmathn], "( 12/5)", "( 12/5).ceil(2)")
|
||||
assert_separated_equal(%w[-rmathn], "(-12/5)", "(-12/5).ceil(2)")
|
||||
assert_separated_equal(%w[-rmathn], "( -5/2)", "( -5/2).ceil(2)")
|
||||
assert_separated_equal(%w[-rmathn], "(-13/5)", "(-13/5).ceil(2)")
|
||||
end
|
||||
|
||||
def test_truncate
|
||||
assert_separated_equal(%w[-rmathn], " 2", "( 13/5).truncate")
|
||||
assert_separated_equal(%w[-rmathn], " 2", "( 5/2).truncate")
|
||||
assert_separated_equal(%w[-rmathn], " 2", "( 12/5).truncate")
|
||||
assert_separated_equal(%w[-rmathn], "-2", "(-12/5).truncate")
|
||||
assert_separated_equal(%w[-rmathn], "-2", "( -5/2).truncate")
|
||||
assert_separated_equal(%w[-rmathn], "-2", "(-13/5).truncate")
|
||||
|
||||
assert_separated_equal(%w[-rmathn], " 2", "( 13/5).truncate(0)")
|
||||
assert_separated_equal(%w[-rmathn], " 2", "( 5/2).truncate(0)")
|
||||
assert_separated_equal(%w[-rmathn], " 2", "( 12/5).truncate(0)")
|
||||
assert_separated_equal(%w[-rmathn], "-2", "(-12/5).truncate(0)")
|
||||
assert_separated_equal(%w[-rmathn], "-2", "( -5/2).truncate(0)")
|
||||
assert_separated_equal(%w[-rmathn], "-2", "(-13/5).truncate(0)")
|
||||
|
||||
assert_separated_equal(%w[-rmathn], "( 13/5)", "( 13/5).truncate(2)")
|
||||
assert_separated_equal(%w[-rmathn], "( 5/2)", "( 5/2).truncate(2)")
|
||||
assert_separated_equal(%w[-rmathn], "( 12/5)", "( 12/5).truncate(2)")
|
||||
assert_separated_equal(%w[-rmathn], "(-12/5)", "(-12/5).truncate(2)")
|
||||
assert_separated_equal(%w[-rmathn], "( -5/2)", "( -5/2).truncate(2)")
|
||||
assert_separated_equal(%w[-rmathn], "(-13/5)", "(-13/5).truncate(2)")
|
||||
end
|
||||
|
||||
def test_round
|
||||
assert_separated_equal(%w[-rmathn], " 3", "( 13/5).round")
|
||||
assert_separated_equal(%w[-rmathn], " 3", "( 5/2).round")
|
||||
assert_separated_equal(%w[-rmathn], " 2", "( 12/5).round")
|
||||
assert_separated_equal(%w[-rmathn], "-2", "(-12/5).round")
|
||||
assert_separated_equal(%w[-rmathn], "-3", "( -5/2).round")
|
||||
assert_separated_equal(%w[-rmathn], "-3", "(-13/5).round")
|
||||
|
||||
assert_separated_equal(%w[-rmathn], " 3", "( 13/5).round(0)")
|
||||
assert_separated_equal(%w[-rmathn], " 3", "( 5/2).round(0)")
|
||||
assert_separated_equal(%w[-rmathn], " 2", "( 12/5).round(0)")
|
||||
assert_separated_equal(%w[-rmathn], "-2", "(-12/5).round(0)")
|
||||
assert_separated_equal(%w[-rmathn], "-3", "( -5/2).round(0)")
|
||||
assert_separated_equal(%w[-rmathn], "-3", "(-13/5).round(0)")
|
||||
|
||||
assert_separated_equal(%w[-rmathn], "( 13/5)", "( 13/5).round(2)")
|
||||
assert_separated_equal(%w[-rmathn], "( 5/2)", "( 5/2).round(2)")
|
||||
assert_separated_equal(%w[-rmathn], "( 12/5)", "( 12/5).round(2)")
|
||||
assert_separated_equal(%w[-rmathn], "(-12/5)", "(-12/5).round(2)")
|
||||
assert_separated_equal(%w[-rmathn], "( -5/2)", "( -5/2).round(2)")
|
||||
assert_separated_equal(%w[-rmathn], "(-13/5)", "(-13/5).round(2)")
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
#define RUBY_VERSION "1.9.3"
|
||||
#define RUBY_PATCHLEVEL 455
|
||||
#define RUBY_PATCHLEVEL 456
|
||||
|
||||
#define RUBY_RELEASE_DATE "2013-07-17"
|
||||
#define RUBY_RELEASE_DATE "2013-08-02"
|
||||
#define RUBY_RELEASE_YEAR 2013
|
||||
#define RUBY_RELEASE_MONTH 7
|
||||
#define RUBY_RELEASE_DAY 17
|
||||
#define RUBY_RELEASE_MONTH 8
|
||||
#define RUBY_RELEASE_DAY 2
|
||||
|
||||
#include "ruby/version.h"
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue