jruby · Mar 30, 2016 · Mar 30, 2016 · Mar 30, 2016 · Mar 30, 2016 · Mar 30, 2016
diff --git a/truffle/src/main/java/org/jruby/truffle/core/CoreLibrary.java b/truffle/src/main/java/org/jruby/truffle/core/CoreLibrary.java
@@ -947,6 +947,11 @@ public DynamicObject frozenError(String className, Node currentNode) {
         return runtimeError(String.format("can't modify frozen %s", className), currentNode);
     }
 
+    @TruffleBoundary
+    public DynamicObject argumentErrorOneHashRequired(Node currentNode) {
+        return argumentError("one hash required", currentNode, null);
+    }
+
     public DynamicObject argumentError(String message, Node currentNode) {
         return argumentError(message, currentNode, null);
     }

diff --git a/truffle/src/main/java/org/jruby/truffle/core/format/FormatEncoding.java b/truffle/src/main/java/org/jruby/truffle/core/format/FormatEncoding.java
@@ -9,13 +9,8 @@
  */
 package org.jruby.truffle.core.format;
 
-/**
- * The encoding to be used for the string resulting from pack.
- * <p>
- * We use this enum as the range of encodings possible are very limited and
- * we want to abstracted between JRuby's pack and Truffle's pack.
- */
 public enum FormatEncoding {
+
     DEFAULT,
     ASCII_8BIT,
     US_ASCII,
@@ -35,20 +30,12 @@ public FormatEncoding unifyWith(FormatEncoding other) {
             return this;
         }
 
-        switch (this) {
+        switch (other) {
             case ASCII_8BIT:
             case US_ASCII:
-                switch (other) {
-                    case ASCII_8BIT:
-                    case US_ASCII:
-                        return ASCII_8BIT;
-                    case UTF_8:
-                        return ASCII_8BIT;
-                    default:
-                        throw new UnsupportedOperationException();
-                }
+                return ASCII_8BIT;
             case UTF_8:
-                switch (other) {
+                switch (this) {
                     case ASCII_8BIT:
                     case US_ASCII:
                         return ASCII_8BIT;
@@ -61,4 +48,5 @@ public FormatEncoding unifyWith(FormatEncoding other) {
                 throw new UnsupportedOperationException();
         }
     }
+
 }
diff --git a/truffle/src/main/java/org/jruby/truffle/core/format/FormatErrorListener.java b/truffle/src/main/java/org/jruby/truffle/core/format/FormatErrorListener.java
@@ -27,7 +27,8 @@ public FormatErrorListener(RubyContext context, RubyNode currentNode) {
     }
 
     @Override
-    public void syntaxError(Recognizer<?, ?> recognizer, Object offendingSymbol, int line, int charPositionInLine, String msg, RecognitionException e) {
+    public void syntaxError(Recognizer<?, ?> recognizer, Object offendingSymbol, int line, int charPositionInLine,
+                            String msg, RecognitionException e) {
         throw new RaiseException(context.getCoreLibrary().argumentError(msg, currentNode));
     }
 

diff --git a/truffle/src/main/java/org/jruby/truffle/core/format/LiteralBytesNode.java b/truffle/src/main/java/org/jruby/truffle/core/format/LiteralBytesNode.java
diff --git a/...uffle/core/format/LiteralIntegerNode.java → ...ruffle/core/format/LiteralFormatNode.java b/...uffle/core/format/LiteralIntegerNode.java → ...ruffle/core/format/LiteralFormatNode.java
@@ -12,12 +12,13 @@
 import com.oracle.truffle.api.frame.VirtualFrame;
 import org.jruby.truffle.RubyContext;
 import org.jruby.truffle.core.format.FormatNode;
+import org.jruby.util.ByteList;
 
-public class LiteralIntegerNode extends FormatNode {
+public class LiteralFormatNode extends FormatNode {
 
-    private final int value;
+    private final Object value;
 
-    public LiteralIntegerNode(RubyContext context, int value) {
+    public LiteralFormatNode(RubyContext context, Object value) {
         super(context);
         this.value = value;
     }

diff --git a/truffle/src/main/java/org/jruby/truffle/core/format/convert/ToStringNode.java b/truffle/src/main/java/org/jruby/truffle/core/format/convert/ToStringNode.java
@@ -27,17 +27,13 @@
 import org.jruby.truffle.language.RubyNode;
 import org.jruby.truffle.language.dispatch.CallDispatchHeadNode;
 import org.jruby.truffle.language.dispatch.DispatchHeadNodeFactory;
-import org.jruby.truffle.language.dispatch.DispatchNode;
 import org.jruby.truffle.language.dispatch.MissingBehavior;
 import org.jruby.truffle.language.objects.IsTaintedNode;
 import org.jruby.truffle.language.objects.IsTaintedNodeGen;
 import org.jruby.util.ByteList;
 
 import java.nio.charset.StandardCharsets;
 
-/**
- * Convert a value to a string.
- */
 @NodeChildren({
         @NodeChild(value = "value", type = FormatNode.class),
 })
@@ -63,18 +59,16 @@ public ToStringNode(RubyContext context, boolean convertNumbersToStrings,
         this.conversionMethod = conversionMethod;
         this.inspectOnConversionFailure = inspectOnConversionFailure;
         this.valueOnNil = valueOnNil;
-        isTaintedNode = IsTaintedNodeGen.create(context, getEncapsulatingSourceSection(), null);
+        isTaintedNode = IsTaintedNodeGen.create(context, null, null);
     }
 
     public abstract Object executeToString(VirtualFrame frame, Object object);
 
     @Specialization(guards = "isNil(nil)")
-    public Object toStringNil(VirtualFrame frame, Object nil) {
+    public Object toStringNil(Object nil) {
         return valueOnNil;
     }
 
-    // TODO CS 31-Mar-15 these boundaries and slow versions are not ideal
-
     @TruffleBoundary
     @Specialization(guards = "convertNumbersToStrings")
     public ByteList toString(int value) {
@@ -106,7 +100,8 @@ public ByteList toStringString(VirtualFrame frame, DynamicObject string) {
     public ByteList toString(VirtualFrame frame, DynamicObject array) {
         if (toSNode == null) {
             CompilerDirectives.transferToInterpreter();
-            toSNode = insert(DispatchHeadNodeFactory.createMethodCall(getContext(), true, MissingBehavior.RETURN_MISSING));
+            toSNode = insert(DispatchHeadNodeFactory.createMethodCall(getContext(), true,
+                    MissingBehavior.RETURN_MISSING));
         }
 
         final Object value = toSNode.call(frame, array, "to_s", null);
@@ -117,22 +112,17 @@ public ByteList toString(VirtualFrame frame, DynamicObject array) {
             }
 
             return StringOperations.getByteListReadOnly((DynamicObject) value);
-        }
-
-        CompilerDirectives.transferToInterpreter();
-
-        if (value == DispatchNode.MISSING) {
+        } else {
             throw new NoImplicitConversionException(array, "String");
         }
-
-        throw new NoImplicitConversionException(array, "String");
     }
 
     @Specialization(guards = {"!isRubyString(object)", "!isRubyArray(object)"})
     public ByteList toString(VirtualFrame frame, Object object) {
         if (toStrNode == null) {
             CompilerDirectives.transferToInterpreter();
-            toStrNode = insert(DispatchHeadNodeFactory.createMethodCall(getContext(), true, MissingBehavior.RETURN_MISSING));
+            toStrNode = insert(DispatchHeadNodeFactory.createMethodCall(getContext(), true,
+                    MissingBehavior.RETURN_MISSING));
         }
 
         final Object value = toStrNode.call(frame, object, conversionMethod, null);
@@ -153,15 +143,9 @@ public ByteList toString(VirtualFrame frame, Object object) {
             }
 
             return StringOperations.getByteListReadOnly(inspectNode.toS(frame, object));
-        }
-
-        CompilerDirectives.transferToInterpreter();
-
-        if (value == DispatchNode.MISSING) {
+        } else {
             throw new NoImplicitConversionException(object, "String");
         }
-
-        throw new NoImplicitConversionException(object, "String");
     }
 
 }
diff --git a/truffle/src/main/java/org/jruby/truffle/core/format/pack/PackTreeBuilder.java b/truffle/src/main/java/org/jruby/truffle/core/format/pack/PackTreeBuilder.java
@@ -12,7 +12,9 @@
 import com.oracle.truffle.api.nodes.Node;
 import org.jruby.truffle.RubyContext;
 import org.jruby.truffle.core.format.FormatNode;
+import org.jruby.truffle.core.format.LiteralFormatNode;
 import org.jruby.truffle.core.format.SharedTreeBuilder;
+import org.jruby.truffle.core.format.control.AdvanceSourcePositionNode;
 import org.jruby.truffle.core.format.convert.ReinterpretAsLongNodeGen;
 import org.jruby.truffle.core.format.convert.ToFloatNodeGen;
 import org.jruby.truffle.core.format.read.SourceNode;
@@ -24,7 +26,6 @@
 import org.jruby.truffle.core.format.read.array.ReadStringNodeGen;
 import org.jruby.truffle.core.format.read.array.ReadValueNodeGen;
 import org.jruby.truffle.core.format.convert.ToLongNodeGen;
-import org.jruby.truffle.core.format.read.array.PNode;
 import org.jruby.truffle.core.format.write.bytes.Write16BigNodeGen;
 import org.jruby.truffle.core.format.write.bytes.Write16LittleNodeGen;
 import org.jruby.truffle.core.format.write.bytes.Write32BigNodeGen;
@@ -313,8 +314,17 @@ public void exitBase64String(PackParser.Base64StringContext ctx) {
 
     @Override
     public void exitPointer(PackParser.PointerContext ctx) {
-        appendNode(writeInteger(64, ByteOrder.nativeOrder(),
-                new PNode(context)));
+        /*
+         * P and p print the address of a string. Obviously that doesn't work
+         * well in Java. We'll print 0x0000000000000000 with the hope that at
+         * least it should page fault if anyone tries to read it.
+         */
+
+        appendNode(new SequenceNode(context, new FormatNode[]{
+                new AdvanceSourcePositionNode(context, false),
+                writeInteger(64, ByteOrder.nativeOrder(),
+                    new LiteralFormatNode(context, (long) 0))
+        }));
 
     }
 

diff --git a/truffle/src/main/java/org/jruby/truffle/core/format/printf/PrintfTreeBuilder.java b/truffle/src/main/java/org/jruby/truffle/core/format/printf/PrintfTreeBuilder.java
@@ -17,8 +17,7 @@
 import org.jruby.truffle.core.format.control.SequenceNode;
 import org.jruby.truffle.core.format.format.FormatFloatNodeGen;
 import org.jruby.truffle.core.format.format.FormatIntegerNodeGen;
-import org.jruby.truffle.core.format.LiteralBytesNode;
-import org.jruby.truffle.core.format.LiteralIntegerNode;
+import org.jruby.truffle.core.format.LiteralFormatNode;
 import org.jruby.truffle.core.format.read.array.ReadHashValueNodeGen;
 import org.jruby.truffle.core.format.read.array.ReadIntegerNodeGen;
 import org.jruby.truffle.core.format.read.array.ReadStringNodeGen;
@@ -167,7 +166,7 @@ public void exitFormat(PrintfParser.FormatContext ctx) {
                 if (spacePadding == PADDING_FROM_ARGUMENT) {
                     spacePaddingNode = ReadIntegerNodeGen.create(context, new SourceNode());
                 } else {
-                    spacePaddingNode = new LiteralIntegerNode(context, spacePadding);
+                    spacePaddingNode = new LiteralFormatNode(context, spacePadding);
                 }
 
                 final FormatNode zeroPaddingNode;
@@ -181,9 +180,9 @@ public void exitFormat(PrintfParser.FormatContext ctx) {
                 if (zeroPadding == PADDING_FROM_ARGUMENT) {
                     zeroPaddingNode = ReadIntegerNodeGen.create(context, new SourceNode());
                 } else if (ctx.precision != null) {
-                    zeroPaddingNode = new LiteralIntegerNode(context, Integer.parseInt(ctx.precision.getText()));
+                    zeroPaddingNode = new LiteralFormatNode(context, Integer.parseInt(ctx.precision.getText()));
                 } else {
-                    zeroPaddingNode = new LiteralIntegerNode(context, zeroPadding);
+                    zeroPaddingNode = new LiteralFormatNode(context, zeroPadding);
                 }
 
                 final char format;
@@ -239,7 +238,7 @@ public void exitLiteral(PrintfParser.LiteralContext ctx) {
         if (text.length() == 1) {
             node = new WriteByteNode(context, (byte) text.get(0));
         } else {
-            node = WriteBytesNodeGen.create(context, new LiteralBytesNode(context, text));
+            node = WriteBytesNodeGen.create(context, new LiteralFormatNode(context, text));
         }
 
         sequence.add(node);

diff --git a/truffle/src/main/java/org/jruby/truffle/core/format/read/array/PNode.java b/truffle/src/main/java/org/jruby/truffle/core/format/read/array/PNode.java
diff --git a/truffle/src/main/java/org/jruby/truffle/core/format/read/array/ReadDoubleNode.java b/truffle/src/main/java/org/jruby/truffle/core/format/read/array/ReadDoubleNode.java
@@ -20,9 +20,6 @@
 import org.jruby.truffle.core.format.convert.ToDoubleNode;
 import org.jruby.truffle.core.format.convert.ToDoubleNodeGen;
 
-/**
- * Read a {@code double} value from the source.
- */
 @NodeChildren({
         @NodeChild(value = "source", type = SourceNode.class),
 })
@@ -36,11 +33,7 @@ public ReadDoubleNode(RubyContext context) {
 
     @Specialization(guards = "isNull(source)")
     public double read(VirtualFrame frame, Object source) {
-        CompilerDirectives.transferToInterpreter();
-
-        // Advance will handle the error
         advanceSourcePosition(frame);
-
         throw new IllegalStateException();
     }