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: eef3c4064a47
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d32ec828d757
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on Dec 28, 2015

  1. Fixes #3564. Rational suffix doesn't work with 0

    @enebo
    enebo committed Dec 28, 2015
    Copy the full SHA
    079df3e View commit details

  2. Merge remote-tracking branch 'origin/master' into ruby-2.3

    @headius
    headius committed Dec 28, 2015
    Copy the full SHA
    cdb6aa2 View commit details

  3. Revert "Make these float syntax until #3564 gets fixed." 

    This reverts commit 38092b1.
    @headius
    headius committed Dec 28, 2015
    Copy the full SHA
    d32ec82 View commit details
Showing with 4 additions and 4 deletions.
  1. +2 −2 core/src/main/java/org/jruby/lexer/yacc/RubyLexer.java
  2. +2 −2 test/mri/ruby/test_math.rb
4 changes: 2 additions & 2 deletions core/src/main/java/org/jruby/lexer/yacc/RubyLexer.java
View file
Original file line number Diff line number Diff line change
@@ -2588,8 +2588,8 @@ private int parseNumber(int c) throws IOException {
break;
default :
pushback(c);
yaccValue = new FixnumNode(getPosition(), 0);
return Tokens.tINTEGER;
numberBuffer.append('0');
return getIntegerToken(numberBuffer.toString(), 10, numberLiteralSuffix(SUFFIX_ALL));
}
}

4 changes: 2 additions & 2 deletions test/mri/ruby/test_math.rb
View file
Original file line number Diff line number Diff line change
@@ -322,8 +322,8 @@ def to_f
end
end

check(Math.exp((0.0r + 1)._to_f), Math.exp(0.0r))
check(Math.log((0.0r + 1)._to_f), Math.log(0.0r))
check(Math.exp((0r + 1)._to_f), Math.exp(0r))
check(Math.log((0r + 1)._to_f), Math.log(0r))

Rational.class_eval { alias to_f _to_f }
end