[Truffle] Move some classes out of the root.

jruby · May 7, 2015 · b5e081c · b5e081c
1 parent 76ac629
commit b5e081c
Showing 13 changed files with 21 additions and 13 deletions.
diff --git a/...jruby/truffle/nodes/ReadConstantNode.java → ...fle/nodes/constants/ReadConstantNode.java b/...jruby/truffle/nodes/ReadConstantNode.java → ...fle/nodes/constants/ReadConstantNode.java
@@ -7,11 +7,12 @@
  * GNU General Public License version 2
  * GNU Lesser General Public License version 2.1
  */
-package org.jruby.truffle.nodes;
+package org.jruby.truffle.nodes.constants;
 
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.source.SourceSection;
+import org.jruby.truffle.nodes.RubyNode;
 import org.jruby.truffle.nodes.dispatch.DispatchAction;
 import org.jruby.truffle.nodes.dispatch.DispatchHeadNode;
 import org.jruby.truffle.nodes.dispatch.MissingBehavior;

diff --git a/...ruby/truffle/nodes/WriteConstantNode.java → ...le/nodes/constants/WriteConstantNode.java b/...ruby/truffle/nodes/WriteConstantNode.java → ...le/nodes/constants/WriteConstantNode.java
@@ -7,11 +7,12 @@
  * GNU General Public License version 2
  * GNU Lesser General Public License version 2.1
  */
-package org.jruby.truffle.nodes;
+package org.jruby.truffle.nodes.constants;
 
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.source.SourceSection;
+import org.jruby.truffle.nodes.RubyNode;
 import org.jruby.truffle.runtime.RubyContext;
 import org.jruby.truffle.runtime.control.RaiseException;
 import org.jruby.truffle.runtime.core.RubyModule;

diff --git a/...java/org/jruby/truffle/nodes/ForNode.java → .../jruby/truffle/nodes/control/ForNode.java b/...java/org/jruby/truffle/nodes/ForNode.java → .../jruby/truffle/nodes/control/ForNode.java
@@ -7,10 +7,11 @@
  * GNU General Public License version 2
  * GNU Lesser General Public License version 2.1
  */
-package org.jruby.truffle.nodes;
+package org.jruby.truffle.nodes.control;
 
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.source.SourceSection;
+import org.jruby.truffle.nodes.RubyNode;
 import org.jruby.truffle.runtime.RubyContext;
 
 public class ForNode extends RubyNode {

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/methods/locals/ReadLevelVariableNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/methods/locals/ReadLevelVariableNode.java
@@ -15,7 +15,7 @@
 import com.oracle.truffle.api.frame.MaterializedFrame;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.source.SourceSection;
-import org.jruby.truffle.nodes.ReadNode;
+import org.jruby.truffle.translator.ReadNode;
 import org.jruby.truffle.nodes.RubyNode;
 import org.jruby.truffle.runtime.RubyArguments;
 import org.jruby.truffle.runtime.RubyContext;

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/methods/locals/ReadLocalVariableNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/methods/locals/ReadLocalVariableNode.java
@@ -14,7 +14,7 @@
 import com.oracle.truffle.api.frame.FrameSlotTypeException;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.source.SourceSection;
-import org.jruby.truffle.nodes.ReadNode;
+import org.jruby.truffle.translator.ReadNode;
 import org.jruby.truffle.nodes.RubyNode;
 import org.jruby.truffle.runtime.RubyContext;
 import org.jruby.truffle.translator.BodyTranslator;

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/methods/locals/WriteLevelVariableNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/methods/locals/WriteLevelVariableNode.java
@@ -16,7 +16,7 @@
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.source.SourceSection;
 import org.jruby.truffle.nodes.RubyNode;
-import org.jruby.truffle.nodes.WriteNode;
+import org.jruby.truffle.translator.WriteNode;
 import org.jruby.truffle.runtime.RubyArguments;
 import org.jruby.truffle.runtime.RubyContext;
 

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/methods/locals/WriteLocalVariableNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/methods/locals/WriteLocalVariableNode.java
@@ -15,7 +15,7 @@
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.source.SourceSection;
 import org.jruby.truffle.nodes.RubyNode;
-import org.jruby.truffle.nodes.WriteNode;
+import org.jruby.truffle.translator.WriteNode;
 import org.jruby.truffle.runtime.RubyContext;
 
 @NodeChild(value = "rhs", type = RubyNode.class)

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/objects/ReadInstanceVariableNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/objects/ReadInstanceVariableNode.java
@@ -16,7 +16,7 @@
 import com.oracle.truffle.api.object.Shape;
 import com.oracle.truffle.api.source.SourceSection;
 import com.oracle.truffle.api.utilities.BranchProfile;
-import org.jruby.truffle.nodes.ReadNode;
+import org.jruby.truffle.translator.ReadNode;
 import org.jruby.truffle.nodes.RubyNode;
 import org.jruby.truffle.nodes.objectstorage.ReadHeadObjectFieldNode;
 import org.jruby.truffle.runtime.RubyContext;

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/objects/WriteInstanceVariableNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/objects/WriteInstanceVariableNode.java
@@ -14,7 +14,7 @@
 import com.oracle.truffle.api.nodes.UnexpectedResultException;
 import com.oracle.truffle.api.source.SourceSection;
 import org.jruby.truffle.nodes.RubyNode;
-import org.jruby.truffle.nodes.WriteNode;
+import org.jruby.truffle.translator.WriteNode;
 import org.jruby.truffle.nodes.objectstorage.WriteHeadObjectFieldNode;
 import org.jruby.truffle.runtime.RubyContext;
 import org.jruby.truffle.runtime.control.RaiseException;

diff --git a/truffle/src/main/java/org/jruby/truffle/translator/BodyTranslator.java b/truffle/src/main/java/org/jruby/truffle/translator/BodyTranslator.java
@@ -26,10 +26,12 @@
 import org.jruby.runtime.Visibility;
 import org.jruby.truffle.nodes.*;
 import org.jruby.truffle.nodes.DefinedNode;
-import org.jruby.truffle.nodes.ForNode;
+import org.jruby.truffle.nodes.control.ForNode;
 import org.jruby.truffle.nodes.array.PrimitiveArrayNodeFactory;
 import org.jruby.truffle.nodes.cast.*;
 import org.jruby.truffle.nodes.cast.LambdaNode;
+import org.jruby.truffle.nodes.constants.ReadConstantNode;
+import org.jruby.truffle.nodes.constants.WriteConstantNode;
 import org.jruby.truffle.nodes.control.AndNode;
 import org.jruby.truffle.nodes.control.BreakNode;
 import org.jruby.truffle.nodes.control.*;

diff --git a/truffle/src/main/java/org/jruby/truffle/translator/LoadArgumentsTranslator.java b/truffle/src/main/java/org/jruby/truffle/translator/LoadArgumentsTranslator.java
@@ -18,7 +18,6 @@
 import org.jruby.ast.StarNode;
 import org.jruby.ast.types.INameNode;
 import org.jruby.lexer.yacc.ISourcePosition;
-import org.jruby.truffle.nodes.ReadNode;
 import org.jruby.truffle.nodes.RubyNode;
 import org.jruby.truffle.nodes.array.PrimitiveArrayNodeFactory;
 import org.jruby.truffle.nodes.cast.ArrayCastNodeGen;

diff --git a/...ava/org/jruby/truffle/nodes/ReadNode.java → ...rg/jruby/truffle/translator/ReadNode.java b/...ava/org/jruby/truffle/nodes/ReadNode.java → ...rg/jruby/truffle/translator/ReadNode.java
@@ -7,7 +7,9 @@
  * GNU General Public License version 2
  * GNU Lesser General Public License version 2.1
  */
-package org.jruby.truffle.nodes;
+package org.jruby.truffle.translator;
+
+import org.jruby.truffle.nodes.RubyNode;
 
 /**
  * Interface for all nodes which read something, providing a method to transform them to write the

diff --git a/...va/org/jruby/truffle/nodes/WriteNode.java → ...g/jruby/truffle/translator/WriteNode.java b/...va/org/jruby/truffle/nodes/WriteNode.java → ...g/jruby/truffle/translator/WriteNode.java
@@ -7,7 +7,9 @@
  * GNU General Public License version 2
  * GNU Lesser General Public License version 2.1
  */
-package org.jruby.truffle.nodes;
+package org.jruby.truffle.translator;
+
+import org.jruby.truffle.nodes.RubyNode;
 
 /**
  * Interface for all nodes which write something, providing a method to transform them to read the