Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jruby/jruby
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: ee2ee7f833e9
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: eccb28ddcd6b
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Jan 23, 2018

  1. Accept nil as an argument of Rational#<=> 

    Ref: https://github.com/ruby/ruby/blob/v2_3_0/rational.c#L1104
    @yui-knk
    yui-knk committed Jan 23, 2018
    Copy the full SHA
    fd8c917 View commit details

  2. Merge pull request #5000 from yui-knk/fix_test_cmp 

    Accept `nil` as an argument of `Rational#<=>`
    @enebo
    enebo authored Jan 23, 2018
    Copy the full SHA
    eccb28d View commit details
Showing with 1 addition and 2 deletions.
  1. +1 −1 core/src/main/java/org/jruby/RubyRational.java
  2. +0 −1 test/mri/excludes/Rational_Test.rb
2 changes: 1 addition & 1 deletion core/src/main/java/org/jruby/RubyRational.java
View file
Original file line number Diff line number Diff line change
@@ -674,7 +674,7 @@ public IRubyObject op_cmp(ThreadContext context, IRubyObject other) {
}
return f_cmp(context, f_sub(context, num1, num2), RubyFixnum.zero(context.runtime));
}
return coerceBin(context, sites(context).op_cmp, other);
return coerceCmp(context, sites(context).op_cmp, other);
}

/** nurat_equal_p
1 change: 0 additions & 1 deletion test/mri/excludes/Rational_Test.rb
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
exclude :test_cmp, "needs investigation"
exclude :test_coerce, "needs investigation"
exclude :test_coerce2, "needs investigation"
exclude :test_conv, "needs investigation"