jruby · Feb 23, 2016 · Feb 23, 2016 · Feb 23, 2016
diff --git a/truffle/src/main/java/org/jruby/truffle/language/locals/ReadDeclarationVariableNode.java b/truffle/src/main/java/org/jruby/truffle/language/locals/ReadDeclarationVariableNode.java
@@ -17,6 +17,7 @@
 import org.jruby.truffle.RubyContext;
 import org.jruby.truffle.language.RubyNode;
 import org.jruby.truffle.language.arguments.RubyArguments;
+import org.jruby.truffle.language.translator.ReadLocalNode;
 import org.jruby.truffle.language.translator.Translator;
 
 import java.util.Collections;

diff --git a/truffle/src/main/java/org/jruby/truffle/language/locals/ReadFrameSlotNode.java b/truffle/src/main/java/org/jruby/truffle/language/locals/ReadFrameSlotNode.java
@@ -20,39 +20,38 @@ public abstract class ReadFrameSlotNode extends Node {
     protected final FrameSlot frameSlot;
 
     public ReadFrameSlotNode(FrameSlot slot) {
-        assert slot != null;
         this.frameSlot = slot;
     }
 
     public abstract Object executeRead(Frame frame);
 
-    @Specialization(rewriteOn = {FrameSlotTypeException.class})
+    @Specialization(rewriteOn = FrameSlotTypeException.class)
     public boolean readBoolean(Frame frame) throws FrameSlotTypeException {
         return frame.getBoolean(frameSlot);
     }
 
-    @Specialization(rewriteOn = {FrameSlotTypeException.class})
-    public int readInteger(Frame frame) throws FrameSlotTypeException {
+    @Specialization(rewriteOn = FrameSlotTypeException.class)
+    public int readInt(Frame frame) throws FrameSlotTypeException {
         return frame.getInt(frameSlot);
     }
 
-    @Specialization(rewriteOn = {FrameSlotTypeException.class})
+    @Specialization(rewriteOn = FrameSlotTypeException.class)
     public long readLong(Frame frame) throws FrameSlotTypeException {
         return frame.getLong(frameSlot);
     }
 
-    @Specialization(rewriteOn = {FrameSlotTypeException.class})
+    @Specialization(rewriteOn = FrameSlotTypeException.class)
     public double readDouble(Frame frame) throws FrameSlotTypeException {
         return frame.getDouble(frameSlot);
     }
 
-    @Specialization(rewriteOn = {FrameSlotTypeException.class})
+    @Specialization(rewriteOn = FrameSlotTypeException.class)
     public Object readObject(Frame frame) throws FrameSlotTypeException {
         return frame.getObject(frameSlot);
     }
 
     @Specialization
-    public Object doValue(Frame frame) {
+    public Object readAny(Frame frame) {
         return frame.getValue(frameSlot);
     }
 

diff --git a/truffle/src/main/java/org/jruby/truffle/language/locals/ReadLocalVariableNode.java b/truffle/src/main/java/org/jruby/truffle/language/locals/ReadLocalVariableNode.java
@@ -16,6 +16,7 @@
 import org.jcodings.specific.UTF8Encoding;
 import org.jruby.truffle.RubyContext;
 import org.jruby.truffle.language.RubyNode;
+import org.jruby.truffle.language.translator.ReadLocalNode;
 import org.jruby.truffle.language.translator.Translator;
 
 public class ReadLocalVariableNode extends ReadLocalNode {

diff --git a/truffle/src/main/java/org/jruby/truffle/language/locals/WriteFrameSlotNode.java b/truffle/src/main/java/org/jruby/truffle/language/locals/WriteFrameSlotNode.java
@@ -21,71 +21,71 @@
 @ImportStatic(RubyGuards.class)
 public abstract class WriteFrameSlotNode extends Node {
 
-    protected final FrameSlot frameSlot;
+    private final FrameSlot frameSlot;
 
     public WriteFrameSlotNode(FrameSlot frameSlot) {
-        assert frameSlot != null;
         this.frameSlot = frameSlot;
     }
 
     public abstract Object executeWrite(Frame frame, Object value);
 
-    @Specialization(guards = "isBooleanKind(frame)")
+    @Specialization(guards = "checkBooleanKind(frame)")
     public boolean writeBoolean(Frame frame, boolean value) {
         frame.setBoolean(frameSlot, value);
         return value;
     }
 
-    @Specialization(guards = "isIntegerKind(frame)")
+    @Specialization(guards = "checkIntegerKind(frame)")
     public int writeInteger(Frame frame, int value) {
         frame.setInt(frameSlot, value);
         return value;
     }
 
-    @Specialization(guards = "isLongKind(frame)")
+    @Specialization(guards = "checkLongKind(frame)")
     public long writeLong(Frame frame, long value) {
         frame.setLong(frameSlot, value);
         return value;
     }
 
-    @Specialization(guards = "isDoubleKind(frame)")
+    @Specialization(guards = "checkDoubleKind(frame)")
     public double writeDouble(Frame frame, double value) {
         frame.setDouble(frameSlot, value);
         return value;
     }
 
-    @Specialization(guards = "isObjectKind(frame)")
+    @Specialization(guards = "checkObjectKind(frame)")
     public Object writeObject(Frame frame, Object value) {
         assert RubyGuards.wasProvided(value); // Useful debug aid to catch a running-away NotProvided
         frame.setObject(frameSlot, value);
         return value;
     }
 
-    protected final boolean isBooleanKind(Frame frame) {
-        return isKind(FrameSlotKind.Boolean);
+    protected boolean checkBooleanKind(Frame frame) {
+        return checkKind(FrameSlotKind.Boolean);
     }
 
-    protected final boolean isIntegerKind(Frame frame) {
-        return isKind(FrameSlotKind.Int);
+    protected boolean checkIntegerKind(Frame frame) {
+        return checkKind(FrameSlotKind.Int);
     }
 
-    protected final boolean isLongKind(Frame frame) {
-        return isKind(FrameSlotKind.Long);
+    protected boolean checkLongKind(Frame frame) {
+        return checkKind(FrameSlotKind.Long);
     }
 
-    protected final boolean isDoubleKind(Frame frame) {
-        return isKind(FrameSlotKind.Double);
+    protected boolean checkDoubleKind(Frame frame) {
+        return checkKind(FrameSlotKind.Double);
     }
 
-    protected final boolean isObjectKind(Frame frame) {
+    protected boolean checkObjectKind(Frame frame) {
         if (frameSlot.getKind() != FrameSlotKind.Object) {
             CompilerDirectives.transferToInterpreter();
             frameSlot.setKind(FrameSlotKind.Object);
         }
+
         return true;
     }
 
-    private boolean isKind(FrameSlotKind kind) {
+    private boolean checkKind(FrameSlotKind kind) {
         if (frameSlot.getKind() == kind) {
             return true;
         } else {
@@ -99,6 +99,7 @@ private boolean initialSetKind(FrameSlotKind kind) {
             frameSlot.setKind(kind);
             return true;
         }
+
         return false;
     }
 

diff --git a/truffle/src/main/java/org/jruby/truffle/language/translator/BodyTranslator.java b/truffle/src/main/java/org/jruby/truffle/language/translator/BodyTranslator.java
@@ -134,7 +134,6 @@
 import org.jruby.truffle.language.locals.FlipFlopStateNode;
 import org.jruby.truffle.language.locals.InitFlipFlopSlotNode;
 import org.jruby.truffle.language.locals.LocalFlipFlopStateNode;
-import org.jruby.truffle.language.locals.ReadLocalNode;
 import org.jruby.truffle.language.locals.ReadLocalVariableNode;
 import org.jruby.truffle.language.locals.WriteLocalVariableNode;
 import org.jruby.truffle.language.methods.AddMethodNodeGen;

diff --git a/...ruffle/language/locals/ReadLocalNode.java → ...le/language/translator/ReadLocalNode.java b/...ruffle/language/locals/ReadLocalNode.java → ...le/language/translator/ReadLocalNode.java
@@ -7,7 +7,7 @@
  * GNU General Public License version 2
  * GNU Lesser General Public License version 2.1
  */
-package org.jruby.truffle.language.locals;
+package org.jruby.truffle.language.translator;
 
 import com.oracle.truffle.api.source.SourceSection;
 import org.jruby.truffle.RubyContext;

diff --git a/truffle/src/main/java/org/jruby/truffle/language/translator/TranslatorEnvironment.java b/truffle/src/main/java/org/jruby/truffle/language/translator/TranslatorEnvironment.java
@@ -17,7 +17,6 @@
 import org.jruby.truffle.language.control.BreakID;
 import org.jruby.truffle.language.control.ReturnID;
 import org.jruby.truffle.language.locals.ReadDeclarationVariableNode;
-import org.jruby.truffle.language.locals.ReadLocalNode;
 import org.jruby.truffle.language.locals.ReadLocalVariableNode;
 import org.jruby.truffle.language.methods.SharedMethodInfo;