Skip to content

Commit

Permalink
[Truffle] ClassNode -> LogicalClassNode
Browse files Browse the repository at this point in the history
@chrisseaton
chrisseaton committed Feb 20, 2016

Unverified

This user has not yet uploaded their public signing key.
GPG key ID: CEF2BBFE18BD0E67
Learn about vigilant mode
1 parent 4e2620b commit 0228c08
Showing 4 changed files with 18 additions and 18 deletions.
16 changes: 8 additions & 8 deletions truffle/src/main/java/org/jruby/truffle/core/kernel/KernelNodes.java
View file
Original file line number Diff line number Diff line change
@@ -104,8 +104,8 @@
import org.jruby.truffle.language.methods.LookupMethodNode;
import org.jruby.truffle.language.methods.LookupMethodNodeGen;
import org.jruby.truffle.language.methods.SharedMethodInfo;
import org.jruby.truffle.language.objects.ClassNode;
import org.jruby.truffle.language.objects.ClassNodeGen;
import org.jruby.truffle.language.objects.LogicalClassNode;
import org.jruby.truffle.language.objects.LogicalClassNodeGen;
import org.jruby.truffle.language.objects.FreezeNode;
import org.jruby.truffle.language.objects.FreezeNodeGen;
import org.jruby.truffle.language.objects.IsANode;
@@ -403,11 +403,11 @@ public DynamicObject callerLocations(int omit, int length) {
@CoreMethod(names = "class")
public abstract static class KernelClassNode extends CoreMethodArrayArgumentsNode {

@Child private ClassNode classNode;
@Child private LogicalClassNode classNode;

public KernelClassNode(RubyContext context, SourceSection sourceSection) {
super(context, sourceSection);
classNode = ClassNodeGen.create(context, sourceSection, null);
classNode = LogicalClassNodeGen.create(context, sourceSection, null);
}

@Specialization
@@ -961,11 +961,11 @@ public Object initializeDup(VirtualFrame frame, DynamicObject self, DynamicObjec
@CoreMethod(names = "instance_of?", required = 1)
public abstract static class InstanceOfNode extends CoreMethodArrayArgumentsNode {

@Child private ClassNode classNode;
@Child private LogicalClassNode classNode;

public InstanceOfNode(RubyContext context, SourceSection sourceSection) {
super(context, sourceSection);
classNode = ClassNodeGen.create(context, sourceSection, null);
classNode = LogicalClassNodeGen.create(context, sourceSection, null);
}

@Specialization(guards = "isRubyClass(rubyClass)")
@@ -2099,13 +2099,13 @@ public String toHexString(DynamicObject value) {
@CoreMethod(names = "to_s")
public abstract static class ToSNode extends CoreMethodArrayArgumentsNode {

@Child private ClassNode classNode;
@Child private LogicalClassNode classNode;
@Child private ObjectPrimitiveNodes.ObjectIDPrimitiveNode objectIDNode;
@Child private ToHexStringNode toHexStringNode;

public ToSNode(RubyContext context, SourceSection sourceSection) {
super(context, sourceSection);
classNode = ClassNodeGen.create(context, sourceSection, null);
classNode = LogicalClassNodeGen.create(context, sourceSection, null);
objectIDNode = ObjectPrimitiveNodesFactory.ObjectIDPrimitiveNodeFactory.create(context, sourceSection, new RubyNode[]{ null });
toHexStringNode = KernelNodesFactory.ToHexStringNodeFactory.create(context, sourceSection, new RubyNode[]{ null });
}
8 changes: 4 additions & 4 deletions truffle/src/main/java/org/jruby/truffle/core/method/MethodNodes.java
View file
Original file line number Diff line number Diff line change
@@ -44,8 +44,8 @@
import org.jruby.truffle.language.methods.CallMethodNodeGen;
import org.jruby.truffle.language.methods.DeclarationContext;
import org.jruby.truffle.language.methods.InternalMethod;
import org.jruby.truffle.language.objects.ClassNode;
import org.jruby.truffle.language.objects.ClassNodeGen;
import org.jruby.truffle.language.objects.LogicalClassNode;
import org.jruby.truffle.language.objects.LogicalClassNodeGen;

@CoreClass(name = "Method")
public abstract class MethodNodes {
@@ -207,11 +207,11 @@ public Object sourceLocation(DynamicObject method) {
@CoreMethod(names = "unbind")
public abstract static class UnbindNode extends CoreMethodArrayArgumentsNode {

@Child private ClassNode classNode;
@Child private LogicalClassNode classNode;

public UnbindNode(RubyContext context, SourceSection sourceSection) {
super(context, sourceSection);
classNode = ClassNodeGen.create(context, sourceSection, null);
classNode = LogicalClassNodeGen.create(context, sourceSection, null);
}

@Specialization
8 changes: 4 additions & 4 deletions truffle/src/main/java/org/jruby/truffle/core/rubinius/VMPrimitiveNodes.java
View file
Original file line number Diff line number Diff line change
@@ -66,8 +66,8 @@
import org.jruby.truffle.language.control.ThrowException;
import org.jruby.truffle.language.dispatch.CallDispatchHeadNode;
import org.jruby.truffle.language.dispatch.DispatchHeadNodeFactory;
import org.jruby.truffle.language.objects.ClassNode;
import org.jruby.truffle.language.objects.ClassNodeGen;
import org.jruby.truffle.language.objects.LogicalClassNode;
import org.jruby.truffle.language.objects.LogicalClassNodeGen;
import org.jruby.truffle.language.objects.IsANode;
import org.jruby.truffle.language.objects.IsANodeGen;
import org.jruby.truffle.language.yield.YieldDispatchHeadNode;
@@ -230,11 +230,11 @@ public DynamicObject vmGetUserHome(DynamicObject username) {
@RubiniusPrimitive(name = "vm_object_class", needsSelf = false)
public static abstract class VMObjectClassPrimitiveNode extends RubiniusPrimitiveArrayArgumentsNode {

@Child private ClassNode classNode;
@Child private LogicalClassNode classNode;

public VMObjectClassPrimitiveNode(RubyContext context, SourceSection sourceSection) {
super(context, sourceSection);
classNode = ClassNodeGen.create(context, sourceSection, null);
classNode = LogicalClassNodeGen.create(context, sourceSection, null);
}

@Specialization
4 changes: 2 additions & 2 deletions ...y/truffle/language/objects/ClassNode.java → ...le/language/objects/LogicalClassNode.java
View file
Original file line number Diff line number Diff line change
@@ -22,9 +22,9 @@
import org.jruby.truffle.language.RubyNode;

@NodeChild(value="object", type=RubyNode.class)
public abstract class ClassNode extends RubyNode {
public abstract class LogicalClassNode extends RubyNode {

public ClassNode(RubyContext context, SourceSection sourceSection) {
public LogicalClassNode(RubyContext context, SourceSection sourceSection) {
super(context, sourceSection);
}

1 comment on commit 0228c08

@eregon
Copy link
Member

@eregon eregon commented on 0228c08 Feb 24, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍 Always wanted to do this!

Sorry, something went wrong.

Please sign in to comment.