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

Commits on Nov 5, 2016

  1. Copy the full SHA
    0bcdc12 View commit details
  2. Copy the full SHA
    e127807 View commit details
7 changes: 0 additions & 7 deletions truffle/src/main/java/org/jruby/truffle/RubyContext.java
Original file line number Diff line number Diff line change
@@ -35,7 +35,6 @@
import org.jruby.truffle.core.thread.ThreadManager;
import org.jruby.truffle.extra.AttachmentsManager;
import org.jruby.truffle.interop.InteropManager;
import org.jruby.truffle.interop.JRubyInterop;
import org.jruby.truffle.language.CallStackManager;
import org.jruby.truffle.language.LexicalScope;
import org.jruby.truffle.language.Options;
@@ -77,7 +76,6 @@ public class RubyContext extends ExecutionContext {
private final Options options = new Options();
private final RopeTable ropeTable = new RopeTable();
private final PrimitiveManager primitiveManager = new PrimitiveManager();
private final JRubyInterop jrubyInterop;
private final SafepointManager safepointManager = new SafepointManager(this);
private final SymbolTable symbolTable;
private final InteropManager interopManager = new InteropManager(this);
@@ -115,7 +113,6 @@ public class RubyContext extends ExecutionContext {
public RubyContext(RubyInstanceConfig instanceConfig, Ruby jrubyRuntime, TruffleLanguage.Env env) {
this.instanceConfig = instanceConfig;
jrubyHome = findJRubyHome();
this.jrubyInterop = new JRubyInterop(jrubyRuntime);
this.env = env;
this.currentDirectory = System.getProperty("user.dir");

@@ -292,10 +289,6 @@ public NativePlatform getNativePlatform() {
return nativePlatform;
}

public JRubyInterop getJRubyInterop() {
return jrubyInterop;
}

public CoreLibrary getCoreLibrary() {
return coreLibrary;
}
48 changes: 0 additions & 48 deletions truffle/src/main/java/org/jruby/truffle/interop/JRubyInterop.java

This file was deleted.

Original file line number Diff line number Diff line change
@@ -32,6 +32,7 @@
import org.jruby.util.Memo;

import java.io.IOException;
import java.util.List;

@CoreClass("Truffle::Boot")
public abstract class TruffleBootNodes {
@@ -141,11 +142,11 @@ public abstract static class OriginalLoadPathNode extends CoreMethodNode {
@TruffleBoundary
@Specialization
public DynamicObject originalLoadPath() {
final String[] path = getContext().getJRubyInterop().getOriginalLoadPath();
final Object[] array = new Object[path.length];
final List<String> paths = getContext().getInstanceConfig().getLoadPaths();
final Object[] array = new Object[paths.size()];

for (int n = 0; n < array.length; n++) {
array[n] = StringOperations.createString(getContext(), StringOperations.encodeRope(path[n], UTF8Encoding.INSTANCE));
array[n] = StringOperations.createString(getContext(), StringOperations.encodeRope(paths.get(n), UTF8Encoding.INSTANCE));
}

return createArray(array, array.length);