Merge branch 'master' into truffle-head

Conflicts: truffle/src/main/java/org/jruby/truffle/format/nodes/PackRootNode.java
jruby · Oct 13, 2015 · bf6c11f · bf6c11f
2 parents bd337d3 + d303dd2
commit bf6c11f
Showing 64 changed files with 170 additions and 173 deletions.
diff --git a/tool/truffle-findbugs-exclude.xml b/tool/truffle-findbugs-exclude.xml
@@ -158,7 +158,7 @@
   <!-- Risks we're happy with for the sake of performance -->
 
   <Match>
-    <Class name="org.jruby.truffle.pack.runtime.PackResult" />
+    <Class name="org.jruby.truffle.format.runtime.PackResult" />
     <Bug pattern="EI_EXPOSE_REP" />
   </Match>
   <Match>

diff --git a/.../jruby/truffle/pack/nodes/PackGuards.java → ...ruby/truffle/format/nodes/PackGuards.java b/.../jruby/truffle/pack/nodes/PackGuards.java → ...ruby/truffle/format/nodes/PackGuards.java
@@ -7,7 +7,7 @@
  * GNU General Public License version 2
  * GNU Lesser General Public License version 2.1
  */
-package org.jruby.truffle.pack.nodes;
+package org.jruby.truffle.format.nodes;
 
 import org.jruby.truffle.nodes.RubyGuards;
 

diff --git a/...rg/jruby/truffle/pack/nodes/PackNode.java → .../jruby/truffle/format/nodes/PackNode.java b/...rg/jruby/truffle/pack/nodes/PackNode.java → .../jruby/truffle/format/nodes/PackNode.java
@@ -7,7 +7,7 @@
  * GNU General Public License version 2
  * GNU Lesser General Public License version 2.1
  */
-package org.jruby.truffle.pack.nodes;
+package org.jruby.truffle.format.nodes;
 
 import com.oracle.truffle.api.CompilerAsserts;
 import com.oracle.truffle.api.CompilerDirectives;
@@ -16,8 +16,8 @@
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.utilities.ConditionProfile;
-import org.jruby.truffle.pack.runtime.PackFrameDescriptor;
-import org.jruby.truffle.pack.runtime.exceptions.TooFewArgumentsException;
+import org.jruby.truffle.format.runtime.PackFrameDescriptor;
+import org.jruby.truffle.format.runtime.exceptions.TooFewArgumentsException;
 import org.jruby.truffle.runtime.RubyContext;
 import org.jruby.util.ByteList;
 

diff --git a/...ruby/truffle/pack/nodes/PackRootNode.java → ...by/truffle/format/nodes/PackRootNode.java b/...ruby/truffle/pack/nodes/PackRootNode.java → ...by/truffle/format/nodes/PackRootNode.java
@@ -7,17 +7,17 @@
  * GNU General Public License version 2
  * GNU Lesser General Public License version 2.1
  */
-package org.jruby.truffle.pack.nodes;
+package org.jruby.truffle.format.nodes;
 
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
 import com.oracle.truffle.api.frame.FrameSlotTypeException;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.nodes.RootNode;
 import com.oracle.truffle.api.source.SourceSection;
-import org.jruby.truffle.pack.runtime.PackEncoding;
-import org.jruby.truffle.pack.runtime.PackFrameDescriptor;
-import org.jruby.truffle.pack.runtime.PackResult;
+import org.jruby.truffle.format.runtime.PackEncoding;
+import org.jruby.truffle.format.runtime.PackFrameDescriptor;
+import org.jruby.truffle.format.runtime.PackResult;
 import org.jruby.truffle.runtime.array.ArrayUtils;
 
 /**

diff --git a/.../jruby/truffle/pack/nodes/SourceNode.java → ...ruby/truffle/format/nodes/SourceNode.java b/.../jruby/truffle/pack/nodes/SourceNode.java → ...ruby/truffle/format/nodes/SourceNode.java
@@ -7,12 +7,12 @@
  * GNU General Public License version 2
  * GNU Lesser General Public License version 2.1
  */
-package org.jruby.truffle.pack.nodes;
+package org.jruby.truffle.format.nodes;
 
 import com.oracle.truffle.api.frame.FrameSlotTypeException;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.nodes.Node;
-import org.jruby.truffle.pack.runtime.PackFrameDescriptor;
+import org.jruby.truffle.format.runtime.PackFrameDescriptor;
 
 /**
  * Reads the source array from the frame - written as a node so that we can

diff --git a/...by/truffle/pack/nodes/control/AtNode.java → .../truffle/format/nodes/control/AtNode.java b/...by/truffle/pack/nodes/control/AtNode.java → .../truffle/format/nodes/control/AtNode.java
@@ -7,10 +7,10 @@
  * GNU General Public License version 2
  * GNU Lesser General Public License version 2.1
  */
-package org.jruby.truffle.pack.nodes.control;
+package org.jruby.truffle.format.nodes.control;
 
 import com.oracle.truffle.api.frame.VirtualFrame;
-import org.jruby.truffle.pack.nodes.PackNode;
+import org.jruby.truffle.format.nodes.PackNode;
 import org.jruby.truffle.runtime.RubyContext;
 
 /**

diff --git a/.../truffle/pack/nodes/control/BackNode.java → ...ruffle/format/nodes/control/BackNode.java b/.../truffle/pack/nodes/control/BackNode.java → ...ruffle/format/nodes/control/BackNode.java
@@ -7,12 +7,12 @@
  * GNU General Public License version 2
  * GNU Lesser General Public License version 2.1
  */
-package org.jruby.truffle.pack.nodes.control;
+package org.jruby.truffle.format.nodes.control;
 
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.frame.VirtualFrame;
-import org.jruby.truffle.pack.nodes.PackNode;
-import org.jruby.truffle.pack.runtime.exceptions.OutsideOfStringException;
+import org.jruby.truffle.format.nodes.PackNode;
+import org.jruby.truffle.format.runtime.exceptions.OutsideOfStringException;
 import org.jruby.truffle.runtime.RubyContext;
 
 /**

diff --git a/...uby/truffle/pack/nodes/control/NNode.java → ...y/truffle/format/nodes/control/NNode.java b/...uby/truffle/pack/nodes/control/NNode.java → ...y/truffle/format/nodes/control/NNode.java
@@ -7,12 +7,12 @@
  * GNU General Public License version 2
  * GNU Lesser General Public License version 2.1
  */
-package org.jruby.truffle.pack.nodes.control;
+package org.jruby.truffle.format.nodes.control;
 
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.nodes.ExplodeLoop;
-import org.jruby.truffle.pack.nodes.PackNode;
+import org.jruby.truffle.format.nodes.PackNode;
 import org.jruby.truffle.runtime.RubyContext;
 
 /**

diff --git a/...ffle/pack/nodes/control/SequenceNode.java → ...le/format/nodes/control/SequenceNode.java b/...ffle/pack/nodes/control/SequenceNode.java → ...le/format/nodes/control/SequenceNode.java
@@ -7,12 +7,12 @@
  * GNU General Public License version 2
  * GNU Lesser General Public License version 2.1
  */
-package org.jruby.truffle.pack.nodes.control;
+package org.jruby.truffle.format.nodes.control;
 
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.nodes.ExplodeLoop;
-import org.jruby.truffle.pack.nodes.PackNode;
+import org.jruby.truffle.format.nodes.PackNode;
 import org.jruby.truffle.runtime.RubyContext;
 
 /**

diff --git a/.../truffle/pack/nodes/control/StarNode.java → ...ruffle/format/nodes/control/StarNode.java b/.../truffle/pack/nodes/control/StarNode.java → ...ruffle/format/nodes/control/StarNode.java
@@ -7,11 +7,11 @@
  * GNU General Public License version 2
  * GNU Lesser General Public License version 2.1
  */
-package org.jruby.truffle.pack.nodes.control;
+package org.jruby.truffle.format.nodes.control;
 
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.frame.VirtualFrame;
-import org.jruby.truffle.pack.nodes.PackNode;
+import org.jruby.truffle.format.nodes.PackNode;
 import org.jruby.truffle.runtime.RubyContext;
 
 /**

diff --git a/...le/pack/nodes/format/FormatFloatNode.java → .../format/nodes/format/FormatFloatNode.java b/...le/pack/nodes/format/FormatFloatNode.java → .../format/nodes/format/FormatFloatNode.java
@@ -7,14 +7,14 @@
  * GNU General Public License version 2
  * GNU Lesser General Public License version 2.1
  */
-package org.jruby.truffle.pack.nodes.format;
+package org.jruby.truffle.format.nodes.format;
 
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.dsl.NodeChild;
 import com.oracle.truffle.api.dsl.NodeChildren;
 import com.oracle.truffle.api.dsl.Specialization;
-import org.jruby.truffle.pack.nodes.PackNode;
-import org.jruby.truffle.pack.parser.FormatDirective;
+import org.jruby.truffle.format.nodes.PackNode;
+import org.jruby.truffle.format.parser.FormatDirective;
 import org.jruby.truffle.runtime.RubyContext;
 import org.jruby.util.ByteList;
 

diff --git a/.../pack/nodes/format/FormatIntegerNode.java → ...ormat/nodes/format/FormatIntegerNode.java b/.../pack/nodes/format/FormatIntegerNode.java → ...ormat/nodes/format/FormatIntegerNode.java
@@ -7,15 +7,15 @@
  * GNU General Public License version 2
  * GNU Lesser General Public License version 2.1
  */
-package org.jruby.truffle.pack.nodes.format;
+package org.jruby.truffle.format.nodes.format;
 
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.dsl.NodeChild;
 import com.oracle.truffle.api.dsl.NodeChildren;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.object.DynamicObject;
-import org.jruby.truffle.pack.nodes.PackNode;
-import org.jruby.truffle.pack.parser.FormatDirective;
+import org.jruby.truffle.format.nodes.PackNode;
+import org.jruby.truffle.format.parser.FormatDirective;
 import org.jruby.truffle.runtime.RubyContext;
 import org.jruby.truffle.runtime.layouts.Layouts;
 import org.jruby.util.ByteList;

diff --git a/...fle/pack/nodes/read/LiteralBytesNode.java → ...e/format/nodes/read/LiteralBytesNode.java b/...fle/pack/nodes/read/LiteralBytesNode.java → ...e/format/nodes/read/LiteralBytesNode.java
@@ -7,10 +7,10 @@
  * GNU General Public License version 2
  * GNU Lesser General Public License version 2.1
  */
-package org.jruby.truffle.pack.nodes.read;
+package org.jruby.truffle.format.nodes.read;
 
 import com.oracle.truffle.api.frame.VirtualFrame;
-import org.jruby.truffle.pack.nodes.PackNode;
+import org.jruby.truffle.format.nodes.PackNode;
 import org.jruby.truffle.runtime.RubyContext;
 import org.jruby.util.ByteList;
 

diff --git a/...uffle/pack/nodes/read/ReadDoubleNode.java → ...fle/format/nodes/read/ReadDoubleNode.java b/...uffle/pack/nodes/read/ReadDoubleNode.java → ...fle/format/nodes/read/ReadDoubleNode.java
@@ -7,17 +7,17 @@
  * GNU General Public License version 2
  * GNU Lesser General Public License version 2.1
  */
-package org.jruby.truffle.pack.nodes.read;
+package org.jruby.truffle.format.nodes.read;
 
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.dsl.NodeChild;
 import com.oracle.truffle.api.dsl.NodeChildren;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.frame.VirtualFrame;
-import org.jruby.truffle.pack.nodes.PackNode;
-import org.jruby.truffle.pack.nodes.SourceNode;
-import org.jruby.truffle.pack.nodes.type.ToDoubleNode;
-import org.jruby.truffle.pack.nodes.type.ToDoubleNodeGen;
+import org.jruby.truffle.format.nodes.PackNode;
+import org.jruby.truffle.format.nodes.SourceNode;
+import org.jruby.truffle.format.nodes.type.ToDoubleNode;
+import org.jruby.truffle.format.nodes.type.ToDoubleNodeGen;
 import org.jruby.truffle.runtime.RubyContext;
 
 /**

diff --git a/.../nodes/read/ReadLongOrBigIntegerNode.java → .../nodes/read/ReadLongOrBigIntegerNode.java b/.../nodes/read/ReadLongOrBigIntegerNode.java → .../nodes/read/ReadLongOrBigIntegerNode.java
@@ -7,19 +7,19 @@
  * GNU General Public License version 2
  * GNU Lesser General Public License version 2.1
  */
-package org.jruby.truffle.pack.nodes.read;
+package org.jruby.truffle.format.nodes.read;
 
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.dsl.NodeChild;
 import com.oracle.truffle.api.dsl.NodeChildren;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.utilities.ConditionProfile;
-import org.jruby.truffle.pack.nodes.PackGuards;
-import org.jruby.truffle.pack.nodes.PackNode;
-import org.jruby.truffle.pack.nodes.SourceNode;
-import org.jruby.truffle.pack.nodes.type.ToLongNode;
-import org.jruby.truffle.pack.nodes.type.ToLongNodeGen;
+import org.jruby.truffle.format.nodes.PackGuards;
+import org.jruby.truffle.format.nodes.PackNode;
+import org.jruby.truffle.format.nodes.SourceNode;
+import org.jruby.truffle.format.nodes.type.ToLongNode;
+import org.jruby.truffle.format.nodes.type.ToLongNodeGen;
 import org.jruby.truffle.runtime.RubyContext;
 
 import java.math.BigInteger;

diff --git a/...uffle/pack/nodes/read/ReadStringNode.java → ...fle/format/nodes/read/ReadStringNode.java b/...uffle/pack/nodes/read/ReadStringNode.java → ...fle/format/nodes/read/ReadStringNode.java
@@ -7,18 +7,18 @@
  * GNU General Public License version 2
  * GNU Lesser General Public License version 2.1
  */
-package org.jruby.truffle.pack.nodes.read;
+package org.jruby.truffle.format.nodes.read;
 
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.dsl.NodeChild;
 import com.oracle.truffle.api.dsl.NodeChildren;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.frame.VirtualFrame;
-import org.jruby.truffle.pack.nodes.PackNode;
-import org.jruby.truffle.pack.nodes.SourceNode;
-import org.jruby.truffle.pack.nodes.type.ToStringNode;
-import org.jruby.truffle.pack.nodes.type.ToStringNodeGen;
-import org.jruby.truffle.pack.nodes.write.WriteByteNode;
+import org.jruby.truffle.format.nodes.PackNode;
+import org.jruby.truffle.format.nodes.SourceNode;
+import org.jruby.truffle.format.nodes.type.ToStringNode;
+import org.jruby.truffle.format.nodes.type.ToStringNodeGen;
+import org.jruby.truffle.format.nodes.write.WriteByteNode;
 import org.jruby.truffle.runtime.RubyContext;
 
 /**

diff --git a/...ruffle/pack/nodes/read/ReadValueNode.java → ...ffle/format/nodes/read/ReadValueNode.java b/...ruffle/pack/nodes/read/ReadValueNode.java → ...ffle/format/nodes/read/ReadValueNode.java
@@ -7,15 +7,15 @@
  * GNU General Public License version 2
  * GNU Lesser General Public License version 2.1
  */
-package org.jruby.truffle.pack.nodes.read;
+package org.jruby.truffle.format.nodes.read;
 
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.dsl.NodeChild;
 import com.oracle.truffle.api.dsl.NodeChildren;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.frame.VirtualFrame;
-import org.jruby.truffle.pack.nodes.PackNode;
-import org.jruby.truffle.pack.nodes.SourceNode;
+import org.jruby.truffle.format.nodes.PackNode;
+import org.jruby.truffle.format.nodes.SourceNode;
 import org.jruby.truffle.runtime.RubyContext;
 
 @NodeChildren({

diff --git a/...ack/nodes/type/AsSinglePrecisionNode.java → ...mat/nodes/type/AsSinglePrecisionNode.java b/...ack/nodes/type/AsSinglePrecisionNode.java → ...mat/nodes/type/AsSinglePrecisionNode.java
@@ -7,12 +7,12 @@
  * GNU General Public License version 2
  * GNU Lesser General Public License version 2.1
  */
-package org.jruby.truffle.pack.nodes.type;
+package org.jruby.truffle.format.nodes.type;
 
 import com.oracle.truffle.api.dsl.NodeChild;
 import com.oracle.truffle.api.dsl.NodeChildren;
 import com.oracle.truffle.api.dsl.Specialization;
-import org.jruby.truffle.pack.nodes.PackNode;
+import org.jruby.truffle.format.nodes.PackNode;
 import org.jruby.truffle.runtime.RubyContext;
 
 /**

diff --git a/.../pack/nodes/type/ReinterpretLongNode.java → ...ormat/nodes/type/ReinterpretLongNode.java b/.../pack/nodes/type/ReinterpretLongNode.java → ...ormat/nodes/type/ReinterpretLongNode.java
@@ -7,12 +7,12 @@
  * GNU General Public License version 2
  * GNU Lesser General Public License version 2.1
  */
-package org.jruby.truffle.pack.nodes.type;
+package org.jruby.truffle.format.nodes.type;
 
 import com.oracle.truffle.api.dsl.NodeChild;
 import com.oracle.truffle.api.dsl.NodeChildren;
 import com.oracle.truffle.api.dsl.Specialization;
-import org.jruby.truffle.pack.nodes.PackNode;
+import org.jruby.truffle.format.nodes.PackNode;
 import org.jruby.truffle.runtime.RubyContext;
 
 /**

diff --git a/...truffle/pack/nodes/type/ToDoubleNode.java → ...uffle/format/nodes/type/ToDoubleNode.java b/...truffle/pack/nodes/type/ToDoubleNode.java → ...uffle/format/nodes/type/ToDoubleNode.java
@@ -7,13 +7,13 @@
  * GNU General Public License version 2
  * GNU Lesser General Public License version 2.1
  */
-package org.jruby.truffle.pack.nodes.type;
+package org.jruby.truffle.format.nodes.type;
 
 import com.oracle.truffle.api.dsl.NodeChild;
 import com.oracle.truffle.api.dsl.NodeChildren;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.frame.VirtualFrame;
-import org.jruby.truffle.pack.nodes.PackNode;
+import org.jruby.truffle.format.nodes.PackNode;
 import org.jruby.truffle.runtime.RubyContext;
 
 /**

diff --git a/.../nodes/type/ToDoubleWithCoercionNode.java → .../nodes/type/ToDoubleWithCoercionNode.java b/.../nodes/type/ToDoubleWithCoercionNode.java → .../nodes/type/ToDoubleWithCoercionNode.java
@@ -8,7 +8,7 @@
  * GNU Lesser General Public License version 2.1
  */
 
-package org.jruby.truffle.pack.nodes.type;
+package org.jruby.truffle.format.nodes.type;
 
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.dsl.NodeChild;
@@ -17,7 +17,7 @@
 import com.oracle.truffle.api.frame.VirtualFrame;
 import org.jruby.truffle.nodes.coerce.ToFNode;
 import org.jruby.truffle.nodes.coerce.ToFNodeGen;
-import org.jruby.truffle.pack.nodes.PackNode;
+import org.jruby.truffle.format.nodes.PackNode;
 import org.jruby.truffle.runtime.RubyContext;
 
 /**

diff --git a/...ruffle/pack/nodes/type/ToIntegerNode.java → ...ffle/format/nodes/type/ToIntegerNode.java b/...ruffle/pack/nodes/type/ToIntegerNode.java → ...ffle/format/nodes/type/ToIntegerNode.java
@@ -7,7 +7,7 @@
  * GNU General Public License version 2
  * GNU Lesser General Public License version 2.1
  */
-package org.jruby.truffle.pack.nodes.type;
+package org.jruby.truffle.format.nodes.type;
 
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.dsl.NodeChild;
@@ -17,7 +17,7 @@
 import com.oracle.truffle.api.object.DynamicObject;
 import org.jruby.truffle.nodes.dispatch.CallDispatchHeadNode;
 import org.jruby.truffle.nodes.dispatch.DispatchHeadNodeFactory;
-import org.jruby.truffle.pack.nodes.PackNode;
+import org.jruby.truffle.format.nodes.PackNode;
 import org.jruby.truffle.runtime.RubyContext;
 
 @NodeChildren({

diff --git a/...y/truffle/pack/nodes/type/ToLongNode.java → ...truffle/format/nodes/type/ToLongNode.java b/...y/truffle/pack/nodes/type/ToLongNode.java → ...truffle/format/nodes/type/ToLongNode.java
@@ -7,7 +7,7 @@
  * GNU General Public License version 2
  * GNU Lesser General Public License version 2.1
  */
-package org.jruby.truffle.pack.nodes.type;
+package org.jruby.truffle.format.nodes.type;
 
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
@@ -20,10 +20,10 @@
 import org.jruby.truffle.nodes.dispatch.DispatchHeadNodeFactory;
 import org.jruby.truffle.nodes.dispatch.DispatchNode;
 import org.jruby.truffle.nodes.dispatch.MissingBehavior;
-import org.jruby.truffle.pack.nodes.PackGuards;
-import org.jruby.truffle.pack.nodes.PackNode;
-import org.jruby.truffle.pack.runtime.exceptions.CantConvertException;
-import org.jruby.truffle.pack.runtime.exceptions.NoImplicitConversionException;
+import org.jruby.truffle.format.nodes.PackGuards;
+import org.jruby.truffle.format.nodes.PackNode;
+import org.jruby.truffle.format.runtime.exceptions.CantConvertException;
+import org.jruby.truffle.format.runtime.exceptions.NoImplicitConversionException;
 import org.jruby.truffle.runtime.RubyContext;
 import org.jruby.truffle.runtime.layouts.Layouts;