kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

merges r23718 from trunk into ruby_1_9_1.

Browse source 
--
	* complex.c (nucomp_coerce): accepts Complex instances.

	* rational.c (nurat_coerce): accepts Rational
	  instances. [ruby-core:23859]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@23793 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
yugui 2009-06-21 09:16:44 +00:00
parent 7eb5dcf325
commit c2d571c37f
6 changed files with 26 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
Wed Jun 17 08:14:01 2009 Tadayoshi Funaba <tadf@dotrb.org>
* complex.c (nucomp_coerce): accepts Complex instances.
* rational.c (nurat_coerce): accepts Rational
instances. [ruby-core:23859]
Wed Jun 17 07:36:22 2009 NARUSE, Yui <naruse@ruby-lang.org>
* lib/webrick/httputils.rb (parse_form_data): escape boundary of

2
complex.c
View file

@ -753,6 +753,8 @@ nucomp_coerce(VALUE self, VALUE other)
{
if (k_numeric_p(other) && f_real_p(other))
return rb_assoc_new(f_complex_new_bang1(CLASS_OF(self), other), self);
if (TYPE(other) == T_COMPLEX)
return rb_assoc_new(other, self);
rb_raise(rb_eTypeError, "%s can't be coerced into %s",
rb_obj_classname(other), rb_obj_classname(self));

2
rational.c
View file

@ -902,6 +902,8 @@ nurat_coerce(VALUE self, VALUE other)
return rb_assoc_new(f_rational_new_bang1(CLASS_OF(self), other), self);
case T_FLOAT:
return rb_assoc_new(other, f_to_f(self));
case T_RATIONAL:
return rb_assoc_new(other, self);
}
rb_raise(rb_eTypeError, "%s can't be coerced into %s",

8
test/ruby/test_complex.rb
View file

@ -505,6 +505,14 @@ class Complex_Test < Test::Unit::TestCase
end
end
def test_coerce
assert_equal([Complex(2),Complex(1)], Complex(1).coerce(2))
assert_equal([Complex(2.2),Complex(1)], Complex(1).coerce(2.2))
assert_equal([Complex(Rational(2)),Complex(1)],
Complex(1).coerce(Rational(2)))
assert_equal([Complex(2),Complex(1)], Complex(1).coerce(Complex(2)))
end
def test_unify
if @unify
assert_instance_of(Fixnum, Complex(1,2) + Complex(-1,-2))

6
test/ruby/test_rational.rb
View file

@ -704,6 +704,12 @@ class Rational_Test < Test::Unit::TestCase
assert_equal(false, Rational(1) == '')
end
def test_coerce
assert_equal([Rational(2),Rational(1)], Rational(1).coerce(2))
assert_equal([Rational(2.2),Rational(1)], Rational(1).coerce(2.2))
assert_equal([Rational(2),Rational(1)], Rational(1).coerce(Rational(2)))
end
def test_unify
if @unify
assert_instance_of(Fixnum, Rational(1,2) + Rational(1,2))

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "1.9.1"
#define RUBY_RELEASE_DATE "2009-05-22"
#define RUBY_PATCHLEVEL 183
#define RUBY_PATCHLEVEL 184
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 9
#define RUBY_VERSION_TEENY 1