diff options
author | nagachika <nagachika@ruby-lang.org> | 2022-11-05 13:52:01 +0900 |
---|---|---|
committer | nagachika <nagachika@ruby-lang.org> | 2022-11-05 14:24:03 +0900 |
commit | 597ce7966c38e4f7fc7368a860ac2d056de794ba (patch) | |
tree | a7f887d5815e554a0d05048e5e392df281be7f35 | |
parent | f08dee67dc41d961f9032ba18dc597ea072672fb (diff) | |
download | ruby-597ce7966c38e4f7fc7368a860ac2d056de794ba.tar.gz |
merge revision(s) 54cad3123a07583c90e85bcfc55ebd87124c1250: [Backport #19004]
[Bug #19004] `Complex.polar` handles complex singular `abs` argument
`Complex.polar` accepts Complex values as arguments for the polar form as long
as the value of the complex has no imaginary part (ie it is 'real'). In
`f_complex_polar` this is handled by extracting the real part of the arguments.
However in the case `polar` is called with only a single argument, the absolute
value (abs), then the Complex is created without applying a check on the type
of abs, meaning it is possible to create a Complex where the real part is itself
an instance of a Complex. This change removes the short circuit for the single
argument case meaning the real part extraction is performed correctly
(by f_complex_polar).
Also adds an example to `spec/ruby/core/complex/polar_spec.rb` to check that
the real part of a complex argument is correctly extracted and used in the
resulting Complex real and imaginary parts.
---
complex.c | 13 ++++++-------
spec/ruby/core/complex/polar_spec.rb | 16 ++++++++++++++++
2 files changed, 22 insertions(+), 7 deletions(-)
-rw-r--r-- | complex.c | 15 | ||||
-rw-r--r-- | spec/ruby/core/complex/polar_spec.rb | 16 | ||||
-rw-r--r-- | version.h | 6 |
3 files changed, 26 insertions, 11 deletions
@@ -694,14 +694,13 @@ nucomp_s_polar(int argc, VALUE *argv, VALUE klass) { VALUE abs, arg; - switch (rb_scan_args(argc, argv, "11", &abs, &arg)) { - case 1: - nucomp_real_check(abs); - return nucomp_s_new_internal(klass, abs, ZERO); - default: - nucomp_real_check(abs); - nucomp_real_check(arg); - break; + argc = rb_scan_args(argc, argv, "11", &abs, &arg); + nucomp_real_check(abs); + if (argc == 2) { + nucomp_real_check(arg); + } + else { + arg = ZERO; } if (RB_TYPE_P(abs, T_COMPLEX)) { get_dat1(abs); diff --git a/spec/ruby/core/complex/polar_spec.rb b/spec/ruby/core/complex/polar_spec.rb index 2a5d8ebd69..3bb3751bc6 100644 --- a/spec/ruby/core/complex/polar_spec.rb +++ b/spec/ruby/core/complex/polar_spec.rb @@ -10,6 +10,22 @@ describe "Complex.polar" do ->{ Complex.polar(nil) }.should raise_error(TypeError) ->{ Complex.polar(nil, nil) }.should raise_error(TypeError) end + + ruby_bug "#19004", ""..."3.2" do + it "computes the real values of the real & imaginary parts from the polar form" do + a = Complex.polar(1.0+0.0i, Math::PI/2+0.0i) + a.real.should be_close(0.0, TOLERANCE) + a.imag.should be_close(1.0, TOLERANCE) + a.real.real?.should be_true + a.imag.real?.should be_true + + b = Complex.polar(1+0.0i) + b.real.should be_close(1.0, TOLERANCE) + b.imag.should be_close(0.0, TOLERANCE) + b.real.real?.should be_true + b.imag.real?.should be_true + end + end end describe "Complex#polar" do @@ -11,11 +11,11 @@ # define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR #define RUBY_VERSION_TEENY 3 #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR -#define RUBY_PATCHLEVEL 172 +#define RUBY_PATCHLEVEL 173 #define RUBY_RELEASE_YEAR 2022 -#define RUBY_RELEASE_MONTH 10 -#define RUBY_RELEASE_DAY 24 +#define RUBY_RELEASE_MONTH 11 +#define RUBY_RELEASE_DAY 5 #include "ruby/version.h" |