jruby · Mar 28, 2016 · Mar 28, 2016 · Mar 28, 2016 · Mar 28, 2016 · Mar 28, 2016
diff --git a/truffle/src/main/java/org/jruby/truffle/core/format/DescriptionTruncater.java b/truffle/src/main/java/org/jruby/truffle/core/format/DescriptionTruncater.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved. This
+ * code is released under a tri EPL/GPL/LGPL license. You can use it,
+ * redistribute it and/or modify it under the terms of the:
+ *
+ * Eclipse Public License version 1.0
+ * GNU General Public License version 2
+ * GNU Lesser General Public License version 2.1
+ */
+package org.jruby.truffle.core.format;
+
+public abstract class DescriptionTruncater {
+
+    /**
+     * Provide a simple string describing the format expression that is short
+     * enough to be used in Truffle and Graal diagnostics.
+     */
+    public static String trunate(String format) {
+        format = format.replace("\\s+", "");
+
+        if (format.length() > 10) {
+            format = format.substring(0, 10) + "…";
+        }
+
+        return format;
+    }
+
+}
diff --git a/...ruffle/core/format/pack/LoopRecovery.java → ...uby/truffle/core/format/LoopRecovery.java b/...ruffle/core/format/pack/LoopRecovery.java → ...uby/truffle/core/format/LoopRecovery.java
@@ -7,7 +7,7 @@
  * GNU General Public License version 2
  * GNU Lesser General Public License version 2.1
  */
-package org.jruby.truffle.core.format.pack;
+package org.jruby.truffle.core.format;
 
 public abstract class LoopRecovery {
 

diff --git a/...le/core/format/decode/DecodeByteNode.java → ...e/core/format/convert/DecodeByteNode.java b/...le/core/format/decode/DecodeByteNode.java → ...e/core/format/convert/DecodeByteNode.java
@@ -7,7 +7,7 @@
  * GNU General Public License version 2
  * GNU Lesser General Public License version 2.1
  */
-package org.jruby.truffle.core.format.decode;
+package org.jruby.truffle.core.format.convert;
 
 import com.oracle.truffle.api.dsl.NodeChild;
 import com.oracle.truffle.api.dsl.NodeChildren;

diff --git a/...core/format/decode/DecodeFloat32Node.java → ...ore/format/convert/DecodeFloat32Node.java b/...core/format/decode/DecodeFloat32Node.java → ...ore/format/convert/DecodeFloat32Node.java
@@ -7,7 +7,7 @@
  * GNU General Public License version 2
  * GNU Lesser General Public License version 2.1
  */
-package org.jruby.truffle.core.format.decode;
+package org.jruby.truffle.core.format.convert;
 
 import com.oracle.truffle.api.dsl.NodeChild;
 import com.oracle.truffle.api.dsl.NodeChildren;

diff --git a/...core/format/decode/DecodeFloat64Node.java → ...ore/format/convert/DecodeFloat64Node.java b/...core/format/decode/DecodeFloat64Node.java → ...ore/format/convert/DecodeFloat64Node.java
@@ -7,7 +7,7 @@
  * GNU General Public License version 2
  * GNU Lesser General Public License version 2.1
  */
-package org.jruby.truffle.core.format.decode;
+package org.jruby.truffle.core.format.convert;
 
 import com.oracle.truffle.api.dsl.NodeChild;
 import com.oracle.truffle.api.dsl.NodeChildren;

diff --git a/...format/decode/DecodeInteger16BigNode.java → ...ormat/convert/DecodeInteger16BigNode.java b/...format/decode/DecodeInteger16BigNode.java → ...ormat/convert/DecodeInteger16BigNode.java
@@ -7,7 +7,7 @@
  * GNU General Public License version 2
  * GNU Lesser General Public License version 2.1
  */
-package org.jruby.truffle.core.format.decode;
+package org.jruby.truffle.core.format.convert;
 
 import com.oracle.truffle.api.dsl.NodeChild;
 import com.oracle.truffle.api.dsl.NodeChildren;

diff --git a/...mat/decode/DecodeInteger16LittleNode.java → ...at/convert/DecodeInteger16LittleNode.java b/...mat/decode/DecodeInteger16LittleNode.java → ...at/convert/DecodeInteger16LittleNode.java
@@ -7,7 +7,7 @@
  * GNU General Public License version 2
  * GNU Lesser General Public License version 2.1
  */
-package org.jruby.truffle.core.format.decode;
+package org.jruby.truffle.core.format.convert;
 
 import com.oracle.truffle.api.dsl.NodeChild;
 import com.oracle.truffle.api.dsl.NodeChildren;

diff --git a/...format/decode/DecodeInteger32BigNode.java → ...ormat/convert/DecodeInteger32BigNode.java b/...format/decode/DecodeInteger32BigNode.java → ...ormat/convert/DecodeInteger32BigNode.java
@@ -7,7 +7,7 @@
  * GNU General Public License version 2
  * GNU Lesser General Public License version 2.1
  */
-package org.jruby.truffle.core.format.decode;
+package org.jruby.truffle.core.format.convert;
 
 import com.oracle.truffle.api.dsl.NodeChild;
 import com.oracle.truffle.api.dsl.NodeChildren;

diff --git a/...mat/decode/DecodeInteger32LittleNode.java → ...at/convert/DecodeInteger32LittleNode.java b/...mat/decode/DecodeInteger32LittleNode.java → ...at/convert/DecodeInteger32LittleNode.java
@@ -7,7 +7,7 @@
  * GNU General Public License version 2
  * GNU Lesser General Public License version 2.1
  */
-package org.jruby.truffle.core.format.decode;
+package org.jruby.truffle.core.format.convert;
 
 import com.oracle.truffle.api.dsl.NodeChild;
 import com.oracle.truffle.api.dsl.NodeChildren;

diff --git a/...format/decode/DecodeInteger64BigNode.java → ...ormat/convert/DecodeInteger64BigNode.java b/...format/decode/DecodeInteger64BigNode.java → ...ormat/convert/DecodeInteger64BigNode.java
@@ -7,7 +7,7 @@
  * GNU General Public License version 2
  * GNU Lesser General Public License version 2.1
  */
-package org.jruby.truffle.core.format.decode;
+package org.jruby.truffle.core.format.convert;
 
 import com.oracle.truffle.api.dsl.NodeChild;
 import com.oracle.truffle.api.dsl.NodeChildren;

diff --git a/...mat/decode/DecodeInteger64LittleNode.java → ...at/convert/DecodeInteger64LittleNode.java b/...mat/decode/DecodeInteger64LittleNode.java → ...at/convert/DecodeInteger64LittleNode.java
@@ -7,7 +7,7 @@
  * GNU General Public License version 2
  * GNU Lesser General Public License version 2.1
  */
-package org.jruby.truffle.core.format.decode;
+package org.jruby.truffle.core.format.convert;
 
 import com.oracle.truffle.api.dsl.NodeChild;
 import com.oracle.truffle.api.dsl.NodeChildren;

diff --git a/...core/format/type/ReinterpretLongNode.java → ...format/convert/ReinterpretAsLongNode.java b/...core/format/type/ReinterpretLongNode.java → ...format/convert/ReinterpretAsLongNode.java
@@ -7,30 +7,26 @@
  * GNU General Public License version 2
  * GNU Lesser General Public License version 2.1
  */
-package org.jruby.truffle.core.format.type;
+package org.jruby.truffle.core.format.convert;
 
 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.RubyContext;
 import org.jruby.truffle.core.format.FormatNode;
 
-/**
- * Re-interpret a value as a {@code long}. In other words, get the raw bytes
- * as a long.
- */
 @NodeChildren({
         @NodeChild(value = "value", type = FormatNode.class),
 })
-public abstract class ReinterpretLongNode extends FormatNode {
+public abstract class ReinterpretAsLongNode extends FormatNode {
 
-    public ReinterpretLongNode(RubyContext context) {
+    public ReinterpretAsLongNode(RubyContext context) {
         super(context);
     }
 
     @Specialization
     public long asLong(float object) {
-        return (long) Float.floatToIntBits(object);
+        return Float.floatToIntBits(object);
     }
 
     @Specialization

diff --git a/...ffle/core/format/type/AsUnsignedNode.java → ...at/convert/ReinterpretAsUnsignedNode.java b/...ffle/core/format/type/AsUnsignedNode.java → ...at/convert/ReinterpretAsUnsignedNode.java
@@ -7,13 +7,12 @@
  * GNU General Public License version 2
  * GNU Lesser General Public License version 2.1
  */
-package org.jruby.truffle.core.format.type;
+package org.jruby.truffle.core.format.convert;
 
 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.object.DynamicObject;
 import org.jruby.truffle.RubyContext;
 import org.jruby.truffle.core.format.FormatNode;
@@ -25,48 +24,50 @@
 @NodeChildren({
         @NodeChild(value = "value", type = FormatNode.class),
 })
-public abstract class AsUnsignedNode extends FormatNode {
+public abstract class ReinterpretAsUnsignedNode extends FormatNode {
 
     @Child private FixnumOrBignumNode fixnumOrBignumNode;
 
-    public AsUnsignedNode(RubyContext context) {
+    public ReinterpretAsUnsignedNode(RubyContext context) {
         super(context);
     }
 
     @Specialization
-    public MissingValue asUnsigned(VirtualFrame frame, MissingValue missingValue) {
+    public MissingValue asUnsigned(MissingValue missingValue) {
         return missingValue;
     }
 
     @Specialization(guards = "isNil(nil)")
-    public DynamicObject asUnsigned(VirtualFrame frame, DynamicObject nil) {
+    public DynamicObject asUnsigned(DynamicObject nil) {
         return nil;
     }
 
     @Specialization
-    public int asUnsigned(VirtualFrame frame, short value) {
+    public int asUnsigned(short value) {
         return value & 0xffff;
     }
 
     @Specialization
-    public long asUnsigned(VirtualFrame frame, int value) {
+    public long asUnsigned(int value) {
         return value & 0xffffffffL;
     }
 
     @Specialization
-    public Object asUnsigned(VirtualFrame frame, long value) {
+    public Object asUnsigned(long value) {
         if (fixnumOrBignumNode == null) {
             CompilerDirectives.transferToInterpreter();
             fixnumOrBignumNode = insert(FixnumOrBignumNode.create(getContext(), getSourceSection()));
         }
 
-        return fixnumOrBignumNode.fixnumOrBignum(asUnsigned(value));
+        return fixnumOrBignumNode.fixnumOrBignum(asUnsignedBigInteger(value));
     }
 
     private static final long UNSIGNED_LONG_MASK = 0x7fffffffffffffffL;
 
     @CompilerDirectives.TruffleBoundary
-    private BigInteger asUnsigned(long value) {
+    private BigInteger asUnsignedBigInteger(long value) {
+        // TODO CS 28-Mar-16 can't we work out if it would fit into a long, and not create a BigInteger?
+
         BigInteger bigIntegerValue = BigInteger.valueOf(value & UNSIGNED_LONG_MASK);
 
         if (value < 0) {
@@ -76,5 +77,4 @@ private BigInteger asUnsigned(long value) {
         return bigIntegerValue;
     }
 
-
 }
diff --git a/...ruffle/core/format/type/ToDoubleNode.java → ...fle/core/format/convert/ToDoubleNode.java b/...ruffle/core/format/type/ToDoubleNode.java → ...fle/core/format/convert/ToDoubleNode.java
@@ -7,7 +7,7 @@
  * GNU General Public License version 2
  * GNU Lesser General Public License version 2.1
  */
-package org.jruby.truffle.core.format.type;
+package org.jruby.truffle.core.format.convert;
 
 import com.oracle.truffle.api.dsl.NodeChild;
 import com.oracle.truffle.api.dsl.NodeChildren;
@@ -16,9 +16,6 @@
 import org.jruby.truffle.RubyContext;
 import org.jruby.truffle.core.format.FormatNode;
 
-/**
- * Convert a value to a {@code double}.
- */
 @NodeChildren({
         @NodeChild(value = "value", type = FormatNode.class),
 })
@@ -31,17 +28,32 @@ public ToDoubleNode(RubyContext context) {
     public abstract double executeToDouble(VirtualFrame frame, Object object);
 
     @Specialization
-    public double toDouble(VirtualFrame frame, int value) {
+    public double toDouble(byte value) {
+        return value;
+    }
+
+    @Specialization
+    public double toDouble(int value) {
+        return value;
+    }
+
+    @Specialization
+    public double toDouble(short value) {
+        return value;
+    }
+
+    @Specialization
+    public double toDouble(long value) {
         return value;
     }
 
     @Specialization
-    public double toDouble(VirtualFrame frame, long value) {
+    public double toDouble(float value) {
         return value;
     }
 
     @Specialization
-    public double toDouble(VirtualFrame frame, double value) {
+    public double toDouble(double value) {
         return value;
     }
 

diff --git a/...format/type/ToDoubleWithCoercionNode.java → ...mat/convert/ToDoubleWithCoercionNode.java b/...format/type/ToDoubleWithCoercionNode.java → ...mat/convert/ToDoubleWithCoercionNode.java
@@ -8,7 +8,7 @@
  * GNU Lesser General Public License version 2.1
  */
 
-package org.jruby.truffle.core.format.type;
+package org.jruby.truffle.core.format.convert;
 
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.dsl.NodeChild;

diff --git a/...re/format/type/AsSinglePrecisionNode.java → ...ffle/core/format/convert/ToFloatNode.java b/...re/format/type/AsSinglePrecisionNode.java → ...ffle/core/format/convert/ToFloatNode.java
@@ -7,28 +7,25 @@
  * GNU General Public License version 2
  * GNU Lesser General Public License version 2.1
  */
-package org.jruby.truffle.core.format.type;
+package org.jruby.truffle.core.format.convert;
 
 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.RubyContext;
 import org.jruby.truffle.core.format.FormatNode;
 
-/**
- * Convert a {@code double} value to a {@code float}.
- */
 @NodeChildren({
         @NodeChild(value = "value", type = FormatNode.class),
 })
-public abstract class AsSinglePrecisionNode extends FormatNode {
+public abstract class ToFloatNode extends FormatNode {
 
-    public AsSinglePrecisionNode(RubyContext context) {
+    public ToFloatNode(RubyContext context) {
         super(context);
     }
 
     @Specialization
-    public float asFloat(double object) {
+    public float toFloat(double object) {
         return (float) object;
     }
 

diff --git a/...uffle/core/format/type/ToIntegerNode.java → ...le/core/format/convert/ToIntegerNode.java b/...uffle/core/format/type/ToIntegerNode.java → ...le/core/format/convert/ToIntegerNode.java
@@ -7,7 +7,7 @@
  * GNU General Public License version 2
  * GNU Lesser General Public License version 2.1
  */
-package org.jruby.truffle.core.format.type;
+package org.jruby.truffle.core.format.convert;
 
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.dsl.NodeChild;

diff --git a/.../truffle/core/format/type/ToLongNode.java → ...uffle/core/format/convert/ToLongNode.java b/.../truffle/core/format/type/ToLongNode.java → ...uffle/core/format/convert/ToLongNode.java
@@ -7,7 +7,7 @@
  * GNU General Public License version 2
  * GNU Lesser General Public License version 2.1
  */
-package org.jruby.truffle.core.format.type;
+package org.jruby.truffle.core.format.convert;
 
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;

diff --git a/...ruffle/core/format/type/ToStringNode.java → ...fle/core/format/convert/ToStringNode.java b/...ruffle/core/format/type/ToStringNode.java → ...fle/core/format/convert/ToStringNode.java
@@ -7,7 +7,7 @@
  * GNU General Public License version 2
  * GNU Lesser General Public License version 2.1
  */
-package org.jruby.truffle.core.format.type;
+package org.jruby.truffle.core.format.convert;
 
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;

diff --git a/truffle/src/main/java/org/jruby/truffle/core/format/pack/PackCompiler.java b/truffle/src/main/java/org/jruby/truffle/core/format/pack/PackCompiler.java
@@ -5,8 +5,10 @@
 import org.antlr.v4.runtime.ANTLRInputStream;
 import org.antlr.v4.runtime.CommonTokenStream;
 import org.jruby.truffle.RubyContext;
+import org.jruby.truffle.core.format.DescriptionTruncater;
 import org.jruby.truffle.core.format.FormatRootNode;
 import org.jruby.truffle.core.format.FormatErrorListener;
+import org.jruby.truffle.core.format.LoopRecovery;
 import org.jruby.truffle.language.RubyNode;
 
 import org.jruby.truffle.core.format.pack.PackLexer;
@@ -48,22 +50,7 @@ public CallTarget compile(String format) {
         parser.sequence();
 
         return Truffle.getRuntime().createCallTarget(
-                new FormatRootNode(describe(format), builder.getEncoding(), builder.getNode()));
+                new FormatRootNode(DescriptionTruncater.trunate(format), builder.getEncoding(), builder.getNode()));
     }
 
-    /**
-     * Provide a simple string describing the format expression that is short
-     * enough to be used in Truffle and Graal diagnostics.
-     */
-    public static String describe(String format) {
-        format = format.replace("\\s+", "");
-
-        if (format.length() > 10) {
-            format = format.substring(0, 10) + "…";
-        }
-
-        return format;
-    }
-
-
 }