jruby · Jan 2, 2016 · Jan 2, 2016 · Jan 2, 2016 · Jan 2, 2016 · Jan 2, 2016
diff --git a/spec/truffle/tags/core/string/unpack/a_tags.txt b/spec/truffle/tags/core/string/unpack/a_tags.txt
diff --git a/spec/truffle/tags/core/string/unpack/at_tags.txt b/spec/truffle/tags/core/string/unpack/at_tags.txt
diff --git a/spec/truffle/tags/core/string/unpack/b_tags.txt b/spec/truffle/tags/core/string/unpack/b_tags.txt
diff --git a/spec/truffle/tags/core/string/unpack/c_tags.txt b/spec/truffle/tags/core/string/unpack/c_tags.txt
diff --git a/spec/truffle/tags/core/string/unpack/d_tags.txt b/spec/truffle/tags/core/string/unpack/d_tags.txt
diff --git a/spec/truffle/tags/core/string/unpack/e_tags.txt b/spec/truffle/tags/core/string/unpack/e_tags.txt
diff --git a/spec/truffle/tags/core/string/unpack/f_tags.txt b/spec/truffle/tags/core/string/unpack/f_tags.txt
diff --git a/spec/truffle/tags/core/string/unpack/g_tags.txt b/spec/truffle/tags/core/string/unpack/g_tags.txt
diff --git a/spec/truffle/tags/core/string/unpack/h_tags.txt b/spec/truffle/tags/core/string/unpack/h_tags.txt
diff --git a/spec/truffle/tags/core/string/unpack/i_tags.txt b/spec/truffle/tags/core/string/unpack/i_tags.txt
diff --git a/spec/truffle/tags/core/string/unpack/l_tags.txt b/spec/truffle/tags/core/string/unpack/l_tags.txt
diff --git a/spec/truffle/tags/core/string/unpack/m_tags.txt b/spec/truffle/tags/core/string/unpack/m_tags.txt
diff --git a/spec/truffle/tags/core/string/unpack/n_tags.txt b/spec/truffle/tags/core/string/unpack/n_tags.txt
diff --git a/spec/truffle/tags/core/string/unpack/p_tags.txt b/spec/truffle/tags/core/string/unpack/p_tags.txt
diff --git a/spec/truffle/tags/core/string/unpack/q_tags.txt b/spec/truffle/tags/core/string/unpack/q_tags.txt
diff --git a/spec/truffle/tags/core/string/unpack/s_tags.txt b/spec/truffle/tags/core/string/unpack/s_tags.txt
diff --git a/spec/truffle/tags/core/string/unpack/u_tags.txt b/spec/truffle/tags/core/string/unpack/u_tags.txt
diff --git a/spec/truffle/tags/core/string/unpack/v_tags.txt b/spec/truffle/tags/core/string/unpack/v_tags.txt
diff --git a/spec/truffle/tags/core/string/unpack/w_tags.txt b/spec/truffle/tags/core/string/unpack/w_tags.txt
diff --git a/spec/truffle/tags/core/string/unpack/x_tags.txt b/spec/truffle/tags/core/string/unpack/x_tags.txt
diff --git a/spec/truffle/tags/core/string/unpack/z_tags.txt b/spec/truffle/tags/core/string/unpack/z_tags.txt
diff --git a/truffle/src/main/antlr4/org/jruby/truffle/format/parser/Pack.g4 b/truffle/src/main/antlr4/org/jruby/truffle/format/parser/Pack.g4
@@ -47,7 +47,7 @@ directive : 'c' count?                                          # int8
           | 'H' count?                                          # hexStringHighFirst
           | 'h' count?                                          # hexStringLowFirst
           | 'u' count?                                          # uuString
-          | 'M' INT?                                            # mimeString
+          | 'M' count?                                          # mimeString
           | 'm' count?                                          # base64String
           | ('p' | 'P')                                         # pointer
           | '@' count?                                          # at

diff --git a/truffle/src/main/java/org/jruby/truffle/format/nodes/read/ReadBase64StringNode.java b/truffle/src/main/java/org/jruby/truffle/format/nodes/read/ReadBase64StringNode.java
@@ -46,7 +46,7 @@ public Object read(VirtualFrame frame, byte[] source) {
 
         final ByteBuffer encode = ByteBuffer.wrap(source, getSourcePosition(frame), getSourceLength(frame) - getSourcePosition(frame));
 
-        int occurrences = requestedLength;
+        int occurrences = encode.remaining();
 
         int length = encode.remaining()*3/4;
         byte[] lElem = new byte[length];

diff --git a/truffle/src/main/java/org/jruby/truffle/format/nodes/read/ReadBinaryStringNode.java b/truffle/src/main/java/org/jruby/truffle/format/nodes/read/ReadBinaryStringNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015 Oracle and/or its affiliates. All rights reserved. This
+ * 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:
  *
@@ -34,14 +34,16 @@ public abstract class ReadBinaryStringNode extends PackNode {
     final int count;
     final boolean trimTrailingSpaces;
     final boolean trimTrailingNulls;
+    final boolean trimToFirstNull;
 
-    public ReadBinaryStringNode(RubyContext context, boolean readToEnd, boolean readToNull, int count, boolean trimTrailingSpaces, boolean trimTrailingNulls) {
+    public ReadBinaryStringNode(RubyContext context, boolean readToEnd, boolean readToNull, int count, boolean trimTrailingSpaces, boolean trimTrailingNulls, boolean trimToFirstNull) {
         super(context);
         this.readToEnd = readToEnd;
         this.readToNull = readToNull;
         this.count = count;
         this.trimTrailingSpaces = trimTrailingSpaces;
         this.trimTrailingNulls = trimTrailingNulls;
+        this.trimToFirstNull = trimToFirstNull;
     }
 
     @Specialization(guards = "isNull(source)")
@@ -67,12 +69,20 @@ public Object read(VirtualFrame frame, byte[] source) {
             while (start + length < getSourceLength(frame) && (!readToNull || (start + length < getSourceLength(frame) && source[start + length] != 0))) {
                 length++;
             }
+
+            if (start + length < getSourceLength(frame) && source[start + length] == 0) {
+                length++;
+            }
         } else if (readToNull) {
             length = 0;
 
             while (start + length < getSourceLength(frame) && length < count && (!readToNull || (start + length < getSourceLength(frame) && source[start + length] != 0))) {
                 length++;
             }
+
+            if (start + length < getSourceLength(frame) && source[start + length] == 0) {
+                length++;
+            }
         } else {
             length = count;
 
@@ -89,6 +99,14 @@ public Object read(VirtualFrame frame, byte[] source) {
 
         result = new ByteList(source, start, usedLength, true);
 
+        if (trimToFirstNull) {
+            final int firstNull = result.indexOf(0);
+
+            if (firstNull != -1 && trimTrailingNulls) {
+                result.realSize(firstNull);
+            }
+        }
+
         setSourcePosition(frame, start + length);
 
         return Layouts.STRING.createString(getContext().getCoreLibrary().getStringFactory(), result, StringSupport.CR_UNKNOWN, null);

diff --git a/truffle/src/main/java/org/jruby/truffle/format/parser/PackTreeBuilder.java b/truffle/src/main/java/org/jruby/truffle/format/parser/PackTreeBuilder.java
@@ -294,10 +294,10 @@ public void exitMimeString(PackParser.MimeStringContext ctx) {
 
         int length;
 
-        if (ctx.INT() == null) {
+        if (ctx.count() == null || ctx.count().INT() == null) {
             length = 72;
         } else {
-            length = Integer.parseInt(ctx.INT().getText());
+            length = Integer.parseInt(ctx.count().INT().getText());
 
             if (length <= 1) {
                 length = 72;

diff --git a/truffle/src/main/java/org/jruby/truffle/format/parser/UnpackTreeBuilder.java b/truffle/src/main/java/org/jruby/truffle/format/parser/UnpackTreeBuilder.java
@@ -219,36 +219,36 @@ public void exitF32Big(PackParser.F32BigContext ctx) {
     @Override
     public void exitBinaryStringSpacePadded(PackParser.BinaryStringSpacePaddedContext ctx) {
         if (ctx.count() == null) {
-            appendNode(WriteValueNodeGen.create(context, ReadBinaryStringNodeGen.create(context, false, false, 1, true, true, new SourceNode())));
+            appendNode(WriteValueNodeGen.create(context, ReadBinaryStringNodeGen.create(context, false, false, 1, true, true, false, new SourceNode())));
         } else if (ctx.count().INT() == null) {
-            appendNode(WriteValueNodeGen.create(context, ReadBinaryStringNodeGen.create(context, true, false, -1, true, true, new SourceNode())));
+            appendNode(WriteValueNodeGen.create(context, ReadBinaryStringNodeGen.create(context, true, false, -1, true, true, false, new SourceNode())));
         } else {
             final int count = Integer.parseInt(ctx.count().INT().getSymbol().getText());
-            appendNode(WriteValueNodeGen.create(context, ReadBinaryStringNodeGen.create(context, false, false, count, true, true, new SourceNode())));
+            appendNode(WriteValueNodeGen.create(context, ReadBinaryStringNodeGen.create(context, false, false, count, true, true, false, new SourceNode())));
         }
     }
 
     @Override
     public void exitBinaryStringNullPadded(PackParser.BinaryStringNullPaddedContext ctx) {
         if (ctx.count() == null) {
-            appendNode(WriteValueNodeGen.create(context, ReadBinaryStringNodeGen.create(context, false, false, 1, false, false, new SourceNode())));
+            appendNode(WriteValueNodeGen.create(context, ReadBinaryStringNodeGen.create(context, false, false, 1, false, false, false, new SourceNode())));
         } else if (ctx.count().INT() == null) {
-            appendNode(WriteValueNodeGen.create(context, ReadBinaryStringNodeGen.create(context, true, false, -1, false, false, new SourceNode())));
+            appendNode(WriteValueNodeGen.create(context, ReadBinaryStringNodeGen.create(context, true, false, -1, false, false, false, new SourceNode())));
         } else {
             final int count = Integer.parseInt(ctx.count().INT().getSymbol().getText());
-            appendNode(WriteValueNodeGen.create(context, ReadBinaryStringNodeGen.create(context, false, false, count, false, false, new SourceNode())));
+            appendNode(WriteValueNodeGen.create(context, ReadBinaryStringNodeGen.create(context, false, false, count, false, false, false, new SourceNode())));
         }
     }
 
     @Override
     public void exitBinaryStringNullStar(PackParser.BinaryStringNullStarContext ctx) {
         if (ctx.count() == null) {
-            appendNode(WriteValueNodeGen.create(context, ReadBinaryStringNodeGen.create(context, false, true, 1, false, false, new SourceNode())));
+            appendNode(WriteValueNodeGen.create(context, ReadBinaryStringNodeGen.create(context, false, true, 1, false, true, true, new SourceNode())));
         } else if (ctx.count().INT() == null) {
-            appendNode(WriteValueNodeGen.create(context, ReadBinaryStringNodeGen.create(context, true, true, -1, false, false, new SourceNode())));
+            appendNode(WriteValueNodeGen.create(context, ReadBinaryStringNodeGen.create(context, true, true, -1, false, true, true, new SourceNode())));
         } else {
             final int count = Integer.parseInt(ctx.count().INT().getSymbol().getText());
-            appendNode(WriteValueNodeGen.create(context, ReadBinaryStringNodeGen.create(context, false, true, count, false, false, new SourceNode())));
+            appendNode(WriteValueNodeGen.create(context, ReadBinaryStringNodeGen.create(context, false, false, count, false, true, true, new SourceNode())));
         }
     }
 

diff --git a/truffle/src/main/java/org/jruby/truffle/runtime/RubyContext.java b/truffle/src/main/java/org/jruby/truffle/runtime/RubyContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015 Oracle and/or its affiliates. All rights reserved. This
+ * Copyright (c) 2013, 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:
  *