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

Commits on Oct 8, 2015

  1. [Truffle] Added missing attribution.

    @nirvdrum
    nirvdrum committed Oct 8, 2015
    Copy the full SHA
    1a9aec2 View commit details

  2. [Truffle] Removed unused conversions from JRuby objects to Truffle ob… 

    …jects.
    @nirvdrum
    nirvdrum committed Oct 8, 2015
    Copy the full SHA
    46d74df View commit details
10 changes: 1 addition & 9 deletions truffle/src/main/java/org/jruby/truffle/runtime/RubyContext.java
View file
Original file line number Diff line number Diff line change
@@ -505,11 +505,7 @@ public org.jruby.RubyString toJRubyString(DynamicObject string) {
}

public Object toTruffle(IRubyObject object) {
if (object == runtime.getTopSelf()) {
return getCoreLibrary().getMainObject();
} else if (object == runtime.getKernel()) {
return getCoreLibrary().getKernelModule();
} else if (object instanceof RubyNil) {
if (object instanceof RubyNil) {
return getCoreLibrary().getNilObject();
} else if (object instanceof org.jruby.RubyFixnum) {
final long value = ((org.jruby.RubyFixnum) object).getLongValue();
@@ -526,10 +522,6 @@ public Object toTruffle(IRubyObject object) {
return Layouts.BIGNUM.createBignum(coreLibrary.getBignumFactory(), value);
} else if (object instanceof org.jruby.RubyString) {
return toTruffle((org.jruby.RubyString) object);
} else if (object instanceof org.jruby.RubySymbol) {
return getSymbolTable().getSymbol(object.toString());
} else if (object instanceof org.jruby.RubyArray) {
return toTruffle((org.jruby.RubyArray) object);
} else if (object instanceof org.jruby.RubyException) {
return toTruffle((org.jruby.RubyException) object, null);
} else {
2 changes: 2 additions & 0 deletions truffle/src/main/java/org/jruby/truffle/runtime/util/ArgumentDescriptorUtils.java
View file
Original file line number Diff line number Diff line change
@@ -6,6 +6,8 @@
* Eclipse Public License version 1.0
* GNU General Public License version 2
* GNU Lesser General Public License version 2.1
*
* Contains code modified from JRuby's org.jruby.runtime.Helpers and org.jruby.runtime.ArgumentType.
*/
package org.jruby.truffle.runtime.util;