jruby · Jan 8, 2015 · Jan 8, 2015 · Jan 8, 2015 · Jan 8, 2015 · Jan 8, 2015
diff --git a/core/src/main/java/org/jruby/truffle/nodes/AssignmentWrapperNode.java b/core/src/main/java/org/jruby/truffle/nodes/AssignmentWrapperNode.java
@@ -15,7 +15,7 @@
 
 public class AssignmentWrapperNode extends RubyNode {
 
-    @Child protected RubyNode child;
+    @Child private RubyNode child;
 
     public AssignmentWrapperNode(RubyContext context, SourceSection sourceSection, RubyNode child) {
         super(context, sourceSection);

diff --git a/core/src/main/java/org/jruby/truffle/nodes/DefinedNode.java b/core/src/main/java/org/jruby/truffle/nodes/DefinedNode.java
@@ -19,7 +19,7 @@
  */
 public class DefinedNode extends RubyNode {
 
-    @Child protected RubyNode child;
+    @Child private RubyNode child;
 
     public DefinedNode(RubyContext context, SourceSection sourceSection, RubyNode child) {
         super(context, sourceSection);

diff --git a/core/src/main/java/org/jruby/truffle/nodes/ForNode.java b/core/src/main/java/org/jruby/truffle/nodes/ForNode.java
@@ -15,7 +15,7 @@
 
 public class ForNode extends RubyNode {
 
-    @Child protected RubyCallNode callNode;
+    @Child private RubyCallNode callNode;
 
     public ForNode(RubyContext context, SourceSection sourceSection, RubyCallNode callNode) {
         super(context, sourceSection);

diff --git a/core/src/main/java/org/jruby/truffle/nodes/ReadConstantNode.java b/core/src/main/java/org/jruby/truffle/nodes/ReadConstantNode.java
@@ -25,8 +25,8 @@
 public class ReadConstantNode extends RubyNode {
 
     private final String name;
-    @Child protected RubyNode receiver;
-    @Child protected DispatchHeadNode dispatch;
+    @Child private RubyNode receiver;
+    @Child private DispatchHeadNode dispatch;
 
     public ReadConstantNode(RubyContext context, SourceSection sourceSection, String name, RubyNode receiver, LexicalScope lexicalScope) {
         super(context, sourceSection);

diff --git a/core/src/main/java/org/jruby/truffle/nodes/RubyCallNode.java b/core/src/main/java/org/jruby/truffle/nodes/RubyCallNode.java
@@ -36,14 +36,14 @@ public class RubyCallNode extends RubyNode {
 
     private final String methodName;
 
-    @Child protected RubyNode receiver;
-    @Child protected ProcOrNullNode block;
-    @Children protected final RubyNode[] arguments;
+    @Child private RubyNode receiver;
+    @Child private ProcOrNullNode block;
+    @Children private final RubyNode[] arguments;
 
     private final boolean isSplatted;
     private final boolean isVCall;
 
-    @Child protected DispatchHeadNode dispatchHead;
+    @Child private DispatchHeadNode dispatchHead;
 
     private final BranchProfile splatNotArrayProfile = BranchProfile.create();
 
@@ -52,8 +52,8 @@ public class RubyCallNode extends RubyNode {
     @CompilerDirectives.CompilationFinal private boolean seenLongFixnumInUnsplat = false;
     @CompilerDirectives.CompilationFinal private boolean seenObjectInUnsplat = false;
 
-    @Child protected DispatchHeadNode respondToMissing;
-    @Child protected BooleanCastNode respondToMissingCast;
+    @Child private DispatchHeadNode respondToMissing;
+    @Child private BooleanCastNode respondToMissingCast;
 
     private final boolean ignoreVisibility;
 

diff --git a/core/src/main/java/org/jruby/truffle/nodes/RubyRootNode.java b/core/src/main/java/org/jruby/truffle/nodes/RubyRootNode.java
@@ -27,7 +27,7 @@ public class RubyRootNode extends RootNode {
 
     private final RubyContext context;
     private final SharedMethodInfo sharedMethodInfo;
-    @Child protected RubyNode body;
+    @Child private RubyNode body;
     private final RubyNode uninitializedBody;
 
     public RubyRootNode(RubyContext context, SourceSection sourceSection, FrameDescriptor frameDescriptor, SharedMethodInfo sharedMethodInfo, RubyNode body) {

diff --git a/core/src/main/java/org/jruby/truffle/nodes/TopLevelRaiseHandler.java b/core/src/main/java/org/jruby/truffle/nodes/TopLevelRaiseHandler.java
@@ -19,7 +19,7 @@
 
 public class TopLevelRaiseHandler extends RubyNode {
 
-    @Child protected RubyNode body;
+    @Child private RubyNode body;
 
     public TopLevelRaiseHandler(RubyContext context, SourceSection sourceSection, RubyNode body) {
         super(context, sourceSection);

diff --git a/core/src/main/java/org/jruby/truffle/nodes/WriteConstantNode.java b/core/src/main/java/org/jruby/truffle/nodes/WriteConstantNode.java
@@ -24,8 +24,8 @@ public class WriteConstantNode extends RubyNode {
 
     private final String name;
     private final LexicalScope lexicalScope;
-    @Child protected RubyNode module;
-    @Child protected RubyNode rhs;
+    @Child private RubyNode module;
+    @Child private RubyNode rhs;
 
     public WriteConstantNode(RubyContext context, SourceSection sourceSection, String name, LexicalScope lexicalScope, RubyNode module, RubyNode rhs) {
         super(context, sourceSection);

diff --git a/core/src/main/java/org/jruby/truffle/nodes/cast/ArrayCastNode.java b/core/src/main/java/org/jruby/truffle/nodes/cast/ArrayCastNode.java
@@ -34,7 +34,7 @@ public abstract class ArrayCastNode extends RubyNode {
 
     private final SplatCastNode.NilBehavior nilBehavior;
 
-    @Child protected DispatchHeadNode toArrayNode;
+    @Child private DispatchHeadNode toArrayNode;
 
     public ArrayCastNode(RubyContext context, SourceSection sourceSection) {
         this(context, sourceSection, SplatCastNode.NilBehavior.NIL);

diff --git a/core/src/main/java/org/jruby/truffle/nodes/cast/HashCastNode.java b/core/src/main/java/org/jruby/truffle/nodes/cast/HashCastNode.java
@@ -30,7 +30,7 @@
 @NodeChild("child")
 public abstract class HashCastNode extends RubyNode {
 
-    @Child protected DispatchHeadNode toHashNode;
+    @Child private DispatchHeadNode toHashNode;
 
     public HashCastNode(RubyContext context, SourceSection sourceSection) {
         super(context, sourceSection);

diff --git a/core/src/main/java/org/jruby/truffle/nodes/cast/LambdaNode.java b/core/src/main/java/org/jruby/truffle/nodes/cast/LambdaNode.java
@@ -21,7 +21,7 @@ public class LambdaNode extends RubyNode {
 
     // TODO(CS): this should be a lambda definition node, alongside block definition node
 
-    @Child protected RubyNode definition;
+    @Child private RubyNode definition;
 
     public LambdaNode(RubyContext context, SourceSection sourceSection, RubyNode definition) {
         super(context, sourceSection);

diff --git a/core/src/main/java/org/jruby/truffle/nodes/cast/ProcCastNode.java b/core/src/main/java/org/jruby/truffle/nodes/cast/ProcCastNode.java
@@ -26,7 +26,7 @@
 @NodeChild("child")
 public abstract class ProcCastNode extends RubyNode {
 
-    @Child protected DispatchHeadNode toProc;
+    @Child private DispatchHeadNode toProc;
 
     public ProcCastNode(RubyContext context, SourceSection sourceSection) {
         super(context, sourceSection);

diff --git a/core/src/main/java/org/jruby/truffle/nodes/cast/SplatCastNode.java b/core/src/main/java/org/jruby/truffle/nodes/cast/SplatCastNode.java
@@ -40,10 +40,10 @@ public static enum NilBehavior {
     private final NilBehavior nilBehavior;
     private final boolean useToAry;
 
-    @Child protected ArrayDupNode dup;
-    @Child protected DispatchHeadNode respondToToA;
-    @Child protected BooleanCastNode respondToCast;
-    @Child protected DispatchHeadNode toA;
+    @Child private ArrayDupNode dup;
+    @Child private DispatchHeadNode respondToToA;
+    @Child private BooleanCastNode respondToCast;
+    @Child private DispatchHeadNode toA;
 
     public SplatCastNode(RubyContext context, SourceSection sourceSection, NilBehavior nilBehavior, boolean useToAry) {
         super(context, sourceSection);

diff --git a/core/src/main/java/org/jruby/truffle/nodes/cast/ToSNode.java b/core/src/main/java/org/jruby/truffle/nodes/cast/ToSNode.java
@@ -26,8 +26,8 @@
 @NodeChild(type = RubyNode.class)
 public abstract class ToSNode extends RubyNode {
 
-    @Child protected DispatchHeadNode callToSNode;
-    @Child protected KernelNodes.ToSNode kernelToSNode;
+    @Child private DispatchHeadNode callToSNode;
+    @Child private KernelNodes.ToSNode kernelToSNode;
 
     public ToSNode(RubyContext context, SourceSection sourceSection) {
         super(context, sourceSection);

diff --git a/core/src/main/java/org/jruby/truffle/nodes/control/AndNode.java b/core/src/main/java/org/jruby/truffle/nodes/control/AndNode.java
@@ -22,9 +22,9 @@
  */
 public class AndNode extends RubyNode {
 
-    @Child protected RubyNode left;
-    @Child protected BooleanCastNode leftCast;
-    @Child protected RubyNode right;
+    @Child private RubyNode left;
+    @Child private BooleanCastNode leftCast;
+    @Child private RubyNode right;
     private final ConditionProfile conditionProfile = ConditionProfile.createCountingProfile();
 
     public AndNode(RubyContext context, SourceSection sourceSection, RubyNode left, RubyNode right) {

diff --git a/core/src/main/java/org/jruby/truffle/nodes/control/ElidableResultNode.java b/core/src/main/java/org/jruby/truffle/nodes/control/ElidableResultNode.java
@@ -27,8 +27,8 @@
 @NodeInfo(cost = NodeCost.NONE)
 public class ElidableResultNode extends RubyNode {
 
-    @Child protected RubyNode required;
-    @Child protected RubyNode elidableResult;
+    @Child private RubyNode required;
+    @Child private RubyNode elidableResult;
 
     public ElidableResultNode(RubyContext context, SourceSection sourceSection, RubyNode required, RubyNode elidableResult) {
         super(context, sourceSection);

diff --git a/core/src/main/java/org/jruby/truffle/nodes/control/EnsureNode.java b/core/src/main/java/org/jruby/truffle/nodes/control/EnsureNode.java
@@ -19,8 +19,8 @@
  */
 public class EnsureNode extends RubyNode {
 
-    @Child protected RubyNode tryPart;
-    @Child protected RubyNode ensurePart;
+    @Child private RubyNode tryPart;
+    @Child private RubyNode ensurePart;
 
     public EnsureNode(RubyContext context, SourceSection sourceSection, RubyNode tryPart, RubyNode ensurePart) {
         super(context, sourceSection);

diff --git a/core/src/main/java/org/jruby/truffle/nodes/control/FlipFlopNode.java b/core/src/main/java/org/jruby/truffle/nodes/control/FlipFlopNode.java
@@ -18,9 +18,9 @@
 
 public class FlipFlopNode extends RubyNode {
 
-    @Child protected BooleanCastNode begin;
-    @Child protected BooleanCastNode end;
-    @Child protected FlipFlopStateNode stateNode;
+    @Child private BooleanCastNode begin;
+    @Child private BooleanCastNode end;
+    @Child private FlipFlopStateNode stateNode;
 
     private final boolean exclusive;
 

diff --git a/core/src/main/java/org/jruby/truffle/nodes/control/IfNode.java b/core/src/main/java/org/jruby/truffle/nodes/control/IfNode.java
@@ -23,9 +23,9 @@
  */
 public class IfNode extends RubyNode {
 
-    @Child protected BooleanCastNode condition;
-    @Child protected RubyNode thenBody;
-    @Child protected RubyNode elseBody;
+    @Child private BooleanCastNode condition;
+    @Child private RubyNode thenBody;
+    @Child private RubyNode elseBody;
     private final ConditionProfile conditionProfile = ConditionProfile.createCountingProfile();
 
     public IfNode(RubyContext context, SourceSection sourceSection, BooleanCastNode condition, RubyNode thenBody, RubyNode elseBody) {

diff --git a/core/src/main/java/org/jruby/truffle/nodes/control/NotNode.java b/core/src/main/java/org/jruby/truffle/nodes/control/NotNode.java
@@ -20,7 +20,7 @@
  */
 public class NotNode extends RubyNode {
 
-    @Child protected BooleanCastNode child;
+    @Child private BooleanCastNode child;
 
     public NotNode(RubyContext context, SourceSection sourceSection, BooleanCastNode child) {
         super(context, sourceSection);

diff --git a/core/src/main/java/org/jruby/truffle/nodes/control/OnceNode.java b/core/src/main/java/org/jruby/truffle/nodes/control/OnceNode.java
@@ -17,7 +17,7 @@
 
 public class OnceNode extends RubyNode {
 
-    @Child protected RubyNode child;
+    @Child private RubyNode child;
 
     // TODO(CS): need to always copy this with cloned nodes
     private final AssumedValue<Object> valueMemo = new AssumedValue<>(null);

diff --git a/core/src/main/java/org/jruby/truffle/nodes/control/OrNode.java b/core/src/main/java/org/jruby/truffle/nodes/control/OrNode.java
@@ -22,9 +22,9 @@
  */
 public class OrNode extends RubyNode {
 
-    @Child protected RubyNode left;
-    @Child protected BooleanCastNode leftCast;
-    @Child protected RubyNode right;
+    @Child private RubyNode left;
+    @Child private BooleanCastNode leftCast;
+    @Child private RubyNode right;
     private final ConditionProfile conditionProfile = ConditionProfile.createCountingProfile();
 
     public OrNode(RubyContext context, SourceSection sourceSection, RubyNode left, RubyNode right) {

diff --git a/core/src/main/java/org/jruby/truffle/nodes/control/RescueNode.java b/core/src/main/java/org/jruby/truffle/nodes/control/RescueNode.java
@@ -21,7 +21,7 @@
  */
 public abstract class RescueNode extends RubyNode {
 
-    @Child protected RubyNode body;
+    @Child private RubyNode body;
 
     public RescueNode(RubyContext context, SourceSection sourceSection, RubyNode body) {
         super(context, sourceSection);

diff --git a/core/src/main/java/org/jruby/truffle/nodes/control/ReturnNode.java b/core/src/main/java/org/jruby/truffle/nodes/control/ReturnNode.java
@@ -22,7 +22,7 @@
 public class ReturnNode extends RubyNode {
 
     private final long returnID;
-    @Child protected RubyNode value;
+    @Child private RubyNode value;
 
     public ReturnNode(RubyContext context, SourceSection sourceSection, long returnID, RubyNode value) {
         super(context, sourceSection);

diff --git a/core/src/main/java/org/jruby/truffle/nodes/control/SequenceNode.java b/core/src/main/java/org/jruby/truffle/nodes/control/SequenceNode.java
@@ -29,7 +29,7 @@
 @NodeInfo(cost = NodeCost.NONE)
 public final class SequenceNode extends RubyNode {
 
-    @Children protected final RubyNode[] body;
+    @Children private final RubyNode[] body;
 
     public static RubyNode sequence(RubyContext context, SourceSection sourceSection, RubyNode... sequence) {
         return sequence(context, sourceSection, Arrays.asList(sequence));

diff --git a/core/src/main/java/org/jruby/truffle/nodes/control/TraceNode.java b/core/src/main/java/org/jruby/truffle/nodes/control/TraceNode.java
@@ -27,11 +27,11 @@
 public class TraceNode extends RubyNode {
 
     private final RubyContext context;
-    @Child protected RubyNode child;
+    @Child private RubyNode child;
 
     @CompilerDirectives.CompilationFinal private Assumption traceAssumption;
     @CompilerDirectives.CompilationFinal private RubyProc traceFunc;
-    @Child protected DirectCallNode callNode;
+    @Child private DirectCallNode callNode;
 
     private final RubyString event;
     private final RubyString file;

diff --git a/core/src/main/java/org/jruby/truffle/nodes/control/TryNode.java b/core/src/main/java/org/jruby/truffle/nodes/control/TryNode.java
@@ -29,10 +29,10 @@
  */
 public class TryNode extends RubyNode {
 
-    @Child protected ExceptionTranslatingNode tryPart;
+    @Child private ExceptionTranslatingNode tryPart;
     @Children final RescueNode[] rescueParts;
-    @Child protected RubyNode elsePart;
-    @Child protected WriteInstanceVariableNode clearExceptionVariableNode;
+    @Child private RubyNode elsePart;
+    @Child private WriteInstanceVariableNode clearExceptionVariableNode;
 
     private final BranchProfile elseProfile = BranchProfile.create();
     private final BranchProfile controlFlowProfile = BranchProfile.create();

diff --git a/core/src/main/java/org/jruby/truffle/nodes/control/WhenSplatNode.java b/core/src/main/java/org/jruby/truffle/nodes/control/WhenSplatNode.java
@@ -19,9 +19,9 @@
 
 public class WhenSplatNode extends RubyNode {
 
-    @Child protected RubyNode readCaseExpression;
-    @Child protected RubyNode splat;
-    @Child protected PredicateDispatchHeadNode dispatchCaseEqual;
+    @Child private RubyNode readCaseExpression;
+    @Child private RubyNode splat;
+    @Child private PredicateDispatchHeadNode dispatchCaseEqual;
 
     public WhenSplatNode(RubyContext context, SourceSection sourceSection, RubyNode readCaseExpression, RubyNode splat) {
         super(context, sourceSection);

diff --git a/core/src/main/java/org/jruby/truffle/nodes/control/WhileNode.java b/core/src/main/java/org/jruby/truffle/nodes/control/WhileNode.java
@@ -26,7 +26,7 @@
 
 public final class WhileNode extends RubyNode {
 
-    @Child protected LoopNode loopNode;
+    @Child private LoopNode loopNode;
     private final BranchProfile breakUsed = BranchProfile.create();
 
     private WhileNode(RubyContext context, SourceSection sourceSection, RepeatingNode repeatingNode) {
@@ -62,6 +62,7 @@ private static abstract class WhileRepeatingBaseNode extends Node implements Rep
 
         @Child protected BooleanCastNode condition;
         @Child protected RubyNode body;
+
         protected final BranchProfile redoUsed = BranchProfile.create();
         protected final BranchProfile nextUsed = BranchProfile.create();
 

diff --git a/core/src/main/java/org/jruby/truffle/nodes/core/ArrayConcatNode.java b/core/src/main/java/org/jruby/truffle/nodes/core/ArrayConcatNode.java
@@ -22,8 +22,8 @@
  */
 public final class ArrayConcatNode extends RubyNode {
 
-    @Children protected final RubyNode[] children;
-    @Child protected ArrayBuilderNode arrayBuilderNode;
+    @Children private final RubyNode[] children;
+    @Child private ArrayBuilderNode arrayBuilderNode;
 
     private final BranchProfile appendArrayProfile = BranchProfile.create();
     private final BranchProfile appendObjectProfile = BranchProfile.create();