Skip to content

Commit

Permalink
[Truffle] @child fields should normally be private, and in that order.
Browse files Browse the repository at this point in the history
  • Loading branch information
@chrisseaton
chrisseaton committed Jan 6, 2017
1 parent e3d7c86 commit 340eca1
Show file tree
Hide file tree
Showing 37 changed files with 108 additions and 109 deletions.
4 changes: 2 additions & 2 deletions truffle/src/main/java/org/jruby/truffle/cext/CExtNodes.java
View file
Expand Up @@ -323,8 +323,8 @@ public RubyNode coerceToString(RubyNode name) {
return NameToJavaStringNodeGen.create(name);
}

@Child LookupConstantNode lookupConstantNode = LookupConstantNode.create(true, false);
@Child GetConstantNode getConstantNode = GetConstantNode.create();
@Child private LookupConstantNode lookupConstantNode = LookupConstantNode.create(true, false);
@Child private GetConstantNode getConstantNode = GetConstantNode.create();

@Specialization
public Object constGetFrom(VirtualFrame frame, DynamicObject module, String name) {
Expand Down
8 changes: 4 additions & 4 deletions truffle/src/main/java/org/jruby/truffle/core/InlinedCoreMethodNode.java
View file
Expand Up @@ -35,10 +35,10 @@ public class InlinedCoreMethodNode extends RubyNode {
private final InternalMethod method;
private final Assumption tracingUnused;

@Child InlinableBuiltin builtin;
@Child LookupMethodNode lookupMethodNode;
@Child RubyNode receiverNode;
@Children final RubyNode[] argumentNodes;
@Child private InlinableBuiltin builtin;
@Child private LookupMethodNode lookupMethodNode;
@Child private RubyNode receiverNode;
@Children private final RubyNode[] argumentNodes;

private RubyCallNode replacedBy = null;

Expand Down
2 changes: 1 addition & 1 deletion truffle/src/main/java/org/jruby/truffle/core/LoadRequiredLibrariesNode.java
View file
Expand Up @@ -20,7 +20,7 @@
/** Load libraries required from the command line (-r LIBRARY) */
public class LoadRequiredLibrariesNode extends RubyNode {

@Child CallDispatchHeadNode requireNode = DispatchHeadNodeFactory.createMethodCallOnSelf();
@Child private CallDispatchHeadNode requireNode = DispatchHeadNodeFactory.createMethodCallOnSelf();

@Override
public Object execute(VirtualFrame frame) {
Expand Down
4 changes: 2 additions & 2 deletions truffle/src/main/java/org/jruby/truffle/core/VMPrimitiveNodes.java
View file
Expand Up @@ -242,8 +242,8 @@ public boolean vmMethodIsBasic(VirtualFrame frame, DynamicObject method) {
@Primitive(name = "vm_method_lookup", needsSelf = false)
public static abstract class VMMethodLookupNode extends PrimitiveArrayArgumentsNode {

@Child NameToJavaStringNode nameToJavaStringNode;
@Child LookupMethodNode lookupMethodNode;
@Child private NameToJavaStringNode nameToJavaStringNode;
@Child private LookupMethodNode lookupMethodNode;

public VMMethodLookupNode() {
nameToJavaStringNode = NameToJavaStringNode.create();
Expand Down
2 changes: 1 addition & 1 deletion truffle/src/main/java/org/jruby/truffle/core/array/ArrayLiteralNode.java
View file
Expand Up @@ -28,7 +28,7 @@ public static ArrayLiteralNode create(RubyNode[] values) {
}

@Children protected final RubyNode[] values;
@Child protected AllocateObjectNode allocateObjectNode = AllocateObjectNodeGen.create(false, null, null);
@Child private AllocateObjectNode allocateObjectNode = AllocateObjectNodeGen.create(false, null, null);

public ArrayLiteralNode(RubyNode[] values) {
this.values = values;
Expand Down
10 changes: 5 additions & 5 deletions truffle/src/main/java/org/jruby/truffle/core/array/ArrayNodes.java
View file
Expand Up @@ -177,10 +177,10 @@ public Object fallback(DynamicObject array, Object object) {
@ImportStatic(ArrayGuards.class)
public abstract static class IndexNode extends PrimitiveArrayArgumentsNode {

@Child protected ArrayReadDenormalizedNode readNode;
@Child protected ArrayReadSliceDenormalizedNode readSliceNode;
@Child protected ArrayReadSliceNormalizedNode readNormalizedSliceNode;
@Child protected AllocateObjectNode allocateObjectNode = AllocateObjectNode.create();
@Child private ArrayReadDenormalizedNode readNode;
@Child private ArrayReadSliceDenormalizedNode readSliceNode;
@Child private ArrayReadSliceNormalizedNode readNormalizedSliceNode;
@Child private AllocateObjectNode allocateObjectNode = AllocateObjectNode.create();

@Specialization
public Object index(DynamicObject array, int index, NotProvided length) {
Expand Down Expand Up @@ -250,7 +250,7 @@ public abstract static class IndexSetNode extends ArrayCoreMethodNode {

@Child private ArrayReadNormalizedNode readNode;
@Child private ArrayWriteNormalizedNode writeNode;
@Child protected ArrayReadSliceNormalizedNode readSliceNode;
@Child private ArrayReadSliceNormalizedNode readSliceNode;
@Child private ToIntNode toIntNode;

private final BranchProfile negativeIndexProfile = BranchProfile.create();
Expand Down
2 changes: 1 addition & 1 deletion truffle/src/main/java/org/jruby/truffle/core/cast/NumericToFloatNode.java
View file
Expand Up @@ -32,7 +32,7 @@
public abstract class NumericToFloatNode extends RubyNode {

@Child private IsANode isANode = IsANodeGen.create(null, null);
@Child CallDispatchHeadNode toFloatCallNode;
@Child private CallDispatchHeadNode toFloatCallNode;

private final String method;

Expand Down
6 changes: 3 additions & 3 deletions truffle/src/main/java/org/jruby/truffle/core/fiber/FiberNodes.java
View file
Expand Up @@ -201,7 +201,7 @@ public interface FiberMessage {

public abstract static class FiberTransferNode extends CoreMethodArrayArgumentsNode {

@Child SingleValueCastNode singleValueCastNode;
@Child private SingleValueCastNode singleValueCastNode;

protected Object singleValue(VirtualFrame frame, Object[] args) {
if (singleValueCastNode == null) {
Expand Down Expand Up @@ -249,7 +249,7 @@ public DynamicObject initialize(DynamicObject fiber, DynamicObject block) {
@CoreMethod(names = "resume", rest = true, unsafe = UnsafeGroup.THREADS)
public abstract static class ResumeNode extends CoreMethodArrayArgumentsNode {

@Child FiberTransferNode fiberTransferNode = FiberNodesFactory.FiberTransferNodeFactory.create(null);
@Child private FiberTransferNode fiberTransferNode = FiberNodesFactory.FiberTransferNodeFactory.create(null);

@Specialization
public Object resume(VirtualFrame frame, DynamicObject fiberBeingResumed, Object[] args) {
Expand All @@ -261,7 +261,7 @@ public Object resume(VirtualFrame frame, DynamicObject fiberBeingResumed, Object
@CoreMethod(names = "yield", onSingleton = true, rest = true, unsafe = UnsafeGroup.THREADS)
public abstract static class YieldNode extends CoreMethodArrayArgumentsNode {

@Child FiberTransferNode fiberTransferNode = FiberNodesFactory.FiberTransferNodeFactory.create(null);
@Child private FiberTransferNode fiberTransferNode = FiberNodesFactory.FiberTransferNodeFactory.create(null);

@Specialization
public Object yield(VirtualFrame frame, Object[] args,
Expand Down
12 changes: 6 additions & 6 deletions truffle/src/main/java/org/jruby/truffle/core/kernel/KernelNodes.java
View file
Expand Up @@ -889,7 +889,7 @@ public DynamicObject instanceVariables(VirtualFrame frame, Object self) {
@CoreMethod(names = { "is_a?", "kind_of?" }, required = 1)
public abstract static class KernelIsANode extends CoreMethodArrayArgumentsNode {

@Child IsANode isANode = IsANodeGen.create(null, null);
@Child private IsANode isANode = IsANodeGen.create(null, null);

@Specialization
public boolean isA(Object self, DynamicObject module) {
Expand Down Expand Up @@ -1006,9 +1006,9 @@ public DynamicObject methodName() {
})
public abstract static class MethodNode extends CoreMethodNode {

@Child NameToJavaStringNode nameToJavaStringNode = NameToJavaStringNode.create();
@Child LookupMethodNode lookupMethodNode = LookupMethodNodeGen.create(true, false, null, null);
@Child CallDispatchHeadNode respondToMissingNode = DispatchHeadNodeFactory.createMethodCall(true);
@Child private NameToJavaStringNode nameToJavaStringNode = NameToJavaStringNode.create();
@Child private LookupMethodNode lookupMethodNode = LookupMethodNodeGen.create(true, false, null, null);
@Child private CallDispatchHeadNode respondToMissingNode = DispatchHeadNodeFactory.createMethodCall(true);

@CreateCast("name")
public RubyNode coerceToString(RubyNode name) {
Expand Down Expand Up @@ -1116,7 +1116,7 @@ public boolean isNil() {
@CoreMethod(names = "p", needsSelf = false, required = 1, unsafe = UnsafeGroup.IO)
public abstract static class DebugPrintNode extends CoreMethodArrayArgumentsNode {

@Child CallDispatchHeadNode callInspectNode = CallDispatchHeadNode.createMethodCall();
@Child private CallDispatchHeadNode callInspectNode = CallDispatchHeadNode.createMethodCall();

@Specialization
public Object p(VirtualFrame frame, Object value) {
Expand Down Expand Up @@ -1159,7 +1159,7 @@ public DynamicObject privateMethods(Object self, boolean includeAncestors) {
@CoreMethod(names = "proc", isModuleFunction = true, needsBlock = true)
public abstract static class ProcNode extends CoreMethodArrayArgumentsNode {

@Child ProcNewNode procNewNode = ProcNewNodeFactory.create(null);
@Child private ProcNewNode procNewNode = ProcNewNodeFactory.create(null);

@Specialization
public DynamicObject proc(VirtualFrame frame, Object maybeBlock) {
Expand Down
4 changes: 2 additions & 2 deletions truffle/src/main/java/org/jruby/truffle/core/method/MethodNodes.java
View file
Expand Up @@ -78,7 +78,7 @@ public int arity(DynamicObject method) {
@CoreMethod(names = { "call", "[]" }, needsBlock = true, rest = true)
public abstract static class CallNode extends CoreMethodArrayArgumentsNode {

@Child CallBoundMethodNode callBoundMethodNode = CallBoundMethodNodeGen.create(null, null, null);
@Child private CallBoundMethodNode callBoundMethodNode = CallBoundMethodNodeGen.create(null, null, null);

@Specialization
protected Object call(VirtualFrame frame, DynamicObject method, Object[] arguments, Object maybeBlock) {
Expand Down Expand Up @@ -167,7 +167,7 @@ public Object sourceLocation(DynamicObject method) {
@CoreMethod(names = "super_method")
public abstract static class SuperMethodNode extends CoreMethodArrayArgumentsNode {

@Child MetaClassNode metaClassNode = MetaClassNode.create();
@Child private MetaClassNode metaClassNode = MetaClassNode.create();

@Specialization
public DynamicObject superMethod(DynamicObject method) {
Expand Down

0 comments on commit 340eca1

Please sign in to comment.