Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ruby 2.7: Add Complex#<=> #2161

Merged
merged 1 commit into from
Nov 17, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ Compatibility:
* Implement `Enumerable#tally` and `Enumerable#filter_map` (#2144 and #2152, @LillianZ).
* Implement `Range#minmax`.
* Pass more `Enumerator::Lazy#uniq` and `Enumerator::Lazy#chunk` specs (#2146, @LillianZ).
* Implement `Complex#<=>` (#2004, @ssnickolay).

Performance:

Expand Down
3 changes: 0 additions & 3 deletions spec/tags/core/complex/comparision_tags.txt

This file was deleted.

12 changes: 11 additions & 1 deletion src/main/ruby/truffleruby/core/complex.rb
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@

class Complex < Numeric

undef_method :%, :<, :<=, :<=>, :>, :>=, :between?, :clamp, # comparable
undef_method :%, :<, :<=, :>, :>=, :between?, :clamp, # comparable
:div, :divmod, :floor, :ceil, :modulo, :remainder,
:round, :step, :truncate, :i, :negative?, :positive?

Expand Down Expand Up @@ -373,6 +373,16 @@ def marshal_load(ary)
self
end

def <=>(other)
if imag == 0 && other.kind_of?(Numeric)
if other.kind_of?(Complex) && other.imag == 0
real <=> other.real
elsif other.real?
real <=> other
end
end
end

I = Complex(0, 1)

end
1 change: 0 additions & 1 deletion test/mri/excludes/Complex_Test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,3 @@
exclude :test_rationalize, "needs investigation"
exclude :test_Complex_with_invalid_exception, "needs investigation"
exclude :test_conv, "needs investigation"
exclude :test_cmp, "needs investigation"