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

Commits on Jun 18, 2015

  1. [Truffle] Renamed a variable to match existing conventions.

    @nirvdrum
    nirvdrum committed Jun 18, 2015
    Copy the full SHA
    d4089a6 View commit details

  2. [Truffle] Removed unused import.

    @nirvdrum
    nirvdrum committed Jun 18, 2015
    Copy the full SHA
    fc1dd07 View commit details

  3. [Truffle] Properly set the logical class of Rubinius::Channel objects.

    @nirvdrum
    nirvdrum committed Jun 18, 2015
    Copy the full SHA
    f29304b View commit details

  4. [Truffle] Renamed a method to match existing conventions.

    @nirvdrum
    nirvdrum committed Jun 18, 2015
    Copy the full SHA
    2acef62 View commit details
2 changes: 1 addition & 1 deletion truffle/src/main/java/org/jruby/truffle/nodes/rubinius/ChannelPrimitiveNodes.java
View file
Original file line number Diff line number Diff line change
@@ -25,7 +25,7 @@ public ChannelNewPrimitiveNode(RubyContext context, SourceSection sourceSection)

@Specialization
public RubyBasicObject channelNew() {
return new RubyBasicObject(getContext().getCoreLibrary().getObjectClass());
return new RubyBasicObject(getContext().getCoreLibrary().getRubiniusChannelClass());
}

}
2 changes: 1 addition & 1 deletion truffle/src/main/java/org/jruby/truffle/nodes/rubinius/ModulePrimitiveNodes.java
View file
Original file line number Diff line number Diff line change
@@ -35,7 +35,7 @@ public Object moduleMirrorCached(VirtualFrame frame, Object reflectee) {
moduleMirrorNode = insert(DispatchHeadNodeFactory.createMethodCall(getContext(), null));
}

return moduleMirrorNode.call(frame, getContext().getCoreLibrary().getRubiniusMirror(), "module_mirror", null, reflectee);
return moduleMirrorNode.call(frame, getContext().getCoreLibrary().getRubiniusMirrorClass(), "module_mirror", null, reflectee);
}

}
15 changes: 10 additions & 5 deletions truffle/src/main/java/org/jruby/truffle/runtime/core/CoreLibrary.java
View file
Original file line number Diff line number Diff line change
@@ -22,7 +22,6 @@
import org.jcodings.transcode.EConvFlags;
import org.jruby.runtime.Constants;
import org.jruby.runtime.encoding.EncodingService;
import org.jruby.runtime.load.LoadServiceResource;
import org.jruby.truffle.nodes.RubyGuards;
import org.jruby.truffle.nodes.RubyNode;
import org.jruby.truffle.nodes.core.*;
@@ -123,8 +122,9 @@ public class CoreLibrary {
private final RubyModule errnoModule;
private final RubyModule kernelModule;
private final RubyModule rubiniusModule;
private final RubyClass rubiniusChannelClass;
private final RubyModule rubiniusFFIModule;
private final RubyClass rubiniusMirrorModule;
private final RubyClass rubiniusMirrorClass;
private final RubyModule signalModule;
private final RubyModule truffleModule;
private final RubyClass bigDecimalClass;
@@ -358,7 +358,8 @@ public CoreLibrary(RubyContext context) {
defineModule(defineModule(rubiniusFFIModule, "Platform"), "POSIX");
defineClass(rubiniusFFIModule, objectClass, "Pointer", new PointerPrimitiveNodes.PointerAllocator());

rubiniusMirrorModule = defineClass(rubiniusModule, objectClass, "Mirror");
rubiniusChannelClass = defineClass(rubiniusModule, objectClass, "Channel");
rubiniusMirrorClass = defineClass(rubiniusModule, objectClass, "Mirror");
defineModule(rubiniusModule, "Type");

byteArrayClass = defineClass(rubiniusModule, objectClass, "ByteArray");
@@ -1390,8 +1391,12 @@ public RubyClass getTupleClass() {
return tupleClass;
}

public RubyClass getRubiniusMirror() {
return rubiniusMirrorModule;
public RubyClass getRubiniusChannelClass() {
return rubiniusChannelClass;
}

public RubyClass getRubiniusMirrorClass() {
return rubiniusMirrorClass;
}

public RubyBasicObject getRubiniusUndefined() {