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

Commits on Feb 5, 2015

  1. [Truffle] Better scoped exception handling.

    @nirvdrum
    nirvdrum committed Feb 5, 2015
    Copy the full SHA
    788692a View commit details

  2. [Truffle] Removed shims that never should have been committed.

    @nirvdrum
    nirvdrum committed Feb 5, 2015
    Copy the full SHA
    492d599 View commit details
Showing with 9 additions and 14 deletions.
  1. +9 −2 truffle/src/main/java/org/jruby/truffle/nodes/core/KernelNodes.java
  2. +0 −12 truffle/src/main/ruby/jruby/truffle/core/shims.rb
11 changes: 9 additions & 2 deletions truffle/src/main/java/org/jruby/truffle/nodes/core/KernelNodes.java
View file
Original file line number Diff line number Diff line change
@@ -1248,8 +1248,15 @@ public boolean load(RubyString file) {

try {
getContext().loadFile(file.toString(), this);
} catch (Throwable t) {
throw new RaiseException(getContext().getCoreLibrary().loadErrorCannotLoad(file.toString(), this));
} catch (RuntimeException e) {
// TODO (nirvdrum 05-Feb-15) This is ugly, but checked exceptions are wrapped up the call stack. We need to revisit this.
if (e.getCause() instanceof java.io.IOException) {
CompilerDirectives.transferToInterpreter();

throw new RaiseException(getContext().getCoreLibrary().loadErrorCannotLoad(file.toString(), this));
} else {
throw e;
}
}

return true;
12 changes: 0 additions & 12 deletions truffle/src/main/ruby/jruby/truffle/core/shims.rb
View file
Original file line number Diff line number Diff line change
@@ -156,18 +156,6 @@ def extended_modules(object)

end

class File
def gets
read.split("\n").first
end

def rewind
end

def set_encoding(encoding, internal_encoding)
end
end

class String
def gsub(*args)
dup.gsub!(*args)