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

Commits on Nov 4, 2016

  1. Copy the full SHA
    4ec0326 View commit details
  2. Copy the full SHA
    49ef479 View commit details
  3. [Truffle] Dead class.

    chrisseaton committed Nov 4, 2016
    Copy the full SHA
    fcb9ea7 View commit details
  4. Copy the full SHA
    277af88 View commit details
  5. Copy the full SHA
    ea4f2f5 View commit details
1,473 changes: 4 additions & 1,469 deletions truffle/src/main/java/org/jruby/truffle/core/regexp/ClassicRegexp.java

Large diffs are not rendered by default.

12 changes: 0 additions & 12 deletions truffle/src/main/java/org/jruby/truffle/interop/JRubyInterop.java
Original file line number Diff line number Diff line change
@@ -75,18 +75,6 @@ private String findJRubyHome() {
return jrubyRuntime.getJRubyHome();
}

@TruffleBoundary
public DynamicObject toTruffle(org.jruby.RubyException jrubyException, RubyNode currentNode) {
switch (jrubyException.getMetaClass().getName()) {
case "ArgumentError":
return context.getCoreExceptions().argumentError(jrubyException.getMessage().toString(), currentNode);
case "RegexpError":
return context.getCoreExceptions().regexpError(jrubyException.getMessage().toString(), currentNode);
}

throw new UnsupportedOperationException();
}

@TruffleBoundary
public String getArg0() {
return jrubyRuntime.getGlobalVariables().get("$0").toString();
Original file line number Diff line number Diff line change
@@ -57,9 +57,6 @@ public Object execute(VirtualFrame frame) {
} catch (TruffleFatalException exception) {
errorProfile.enter();
throw exception;
} catch (org.jruby.exceptions.RaiseException e) {
errorProfile.enter();
throw new RaiseException(getContext().getJRubyInterop().toTruffle(e.getException(), this));
} catch (StackOverflowError error) {
errorProfile.enter();
throw new RaiseException(translate(error));
2,590 changes: 76 additions & 2,514 deletions truffle/src/main/java/org/jruby/truffle/parser/Helpers.java

Large diffs are not rendered by default.

This file was deleted.

This file was deleted.

This file was deleted.

164 changes: 0 additions & 164 deletions truffle/src/main/java/org/jruby/truffle/parser/ast/util/ArgsUtil.java

This file was deleted.

Original file line number Diff line number Diff line change
@@ -27,7 +27,6 @@
package org.jruby.truffle.parser.lexer;

import org.jcodings.Encoding;
import org.jruby.RubyArray;
import org.jruby.RubyEncoding;
import org.jruby.RubyIO;
import org.jruby.runtime.builtin.IRubyObject;
@@ -54,25 +53,6 @@ public GetsLexerSource(String sourceName, int line, IRubyObject io, List<ByteLis
this.encoding = encoding;
}

// FIXME (enebo 21-Apr-15): ripper probably has same problem as main-line parser so this constructor
// may need to be a mix of frobbing the encoding of an incoming object plus defaultEncoding if not.
// But main-line parser should not be asking IO for encoding.
// Ripper constructor
public GetsLexerSource(String sourceName, int line, IRubyObject io, RubyArray scriptLines) {
this(sourceName, line, io, scriptLines, frobnicateEncoding(io));
}

// FIXME: Should be a hard failure likely if no encoding is possible
public static final Encoding frobnicateEncoding(IRubyObject io) {
// Non-ripper IO will not have encoding so we will just use default external
if (!io.respondsTo("encoding")) return io.getRuntime().getDefaultExternalEncoding();

IRubyObject encodingObject = io.callMethod(io.getRuntime().getCurrentContext(), "encoding");

return encodingObject instanceof RubyEncoding ?
((RubyEncoding) encodingObject).getEncoding() : io.getRuntime().getDefaultExternalEncoding();
}

@Override
public Encoding getEncoding() {
return encoding;