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

Commits on Oct 14, 2015

  1. Add colon to KeyError.

    @headius
    headius committed Oct 14, 2015
    Copy the full SHA
    ed17ba4 View commit details

  2. Remove useless exception handling and logging here.

    @headius
    headius committed Oct 14, 2015
    Copy the full SHA
    eb46319 View commit details

  3. Eliminate circular require warning for bigdecimal.

    @headius
    headius committed Oct 14, 2015
    Copy the full SHA
    8e6f722 View commit details
2 changes: 1 addition & 1 deletion core/src/main/java/org/jruby/RubyHash.java
View file
Original file line number Diff line number Diff line change
@@ -1180,7 +1180,7 @@ public IRubyObject fetch(ThreadContext context, IRubyObject key, Block block) {
if (value == null) {
if (block.isGiven()) return block.yield(context, key);

throw runtime.newKeyError("key not found: " + key);
throw runtime.newKeyError("key not found: :" + key);
}

return value;
6 changes: 0 additions & 6 deletions core/src/main/java/org/jruby/ext/bigdecimal/RubyBigDecimal.java
View file
Original file line number Diff line number Diff line change
@@ -127,7 +127,6 @@ public RubyBigDecimal allocate(Ruby runtime, RubyClass klass) {
private static final double SQRT_10 = 3.162277660168379332;

public static RubyClass createBigDecimal(Ruby runtime) {
try {
RubyClass bigDecimal = runtime.defineClass("BigDecimal", runtime.getNumeric(), ALLOCATOR);

runtime.getKernel().defineAnnotatedMethods(BigDecimalKernelMethods.class);
@@ -146,11 +145,6 @@ public static RubyClass createBigDecimal(Ruby runtime) {
bigDecimal.defineConstant("INFINITY", newInfinity(runtime, 1));

return bigDecimal;
} catch (Exception e) {
System.out.println("E:" + e);
e.printStackTrace();
}
return null;
}

private boolean isNaN;
1 change: 0 additions & 1 deletion core/src/main/ruby/jruby/bigdecimal.rb
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
require 'bigdecimal'
require 'bigdecimal/util'

module BigMath