Regenerated Rapa

vm/builtin/pack18.cpp

@@ -2,7 +2,7 @@
 /* This file was generated by Ragel. Your edits will be lost.
  *
  * This is a state machine implementation of Array#pack.
- * See http://github.com/brixen/rapa.
+ * See http://github.com/rubinius/rapa.
  *
  * vim: filetype=cpp
  */

vm/builtin/pack19.cpp

@@ -2,7 +2,7 @@
 /* This file was generated by Ragel. Your edits will be lost.
  *
  * This is a state machine implementation of Array#pack.
- * See http://github.com/brixen/rapa.
+ * See http://github.com/rubinius/rapa.
  *
  * vim: filetype=cpp
  */

vm/builtin/unpack18.cpp

@@ -2,7 +2,7 @@
 /* This file was generated by Ragel. Your edits will be lost.
  *
  * This is a state machine implementation of String#unpack.
- * See http://github.com/brixen/rapa.
+ * See http://github.com/rubinius/rapa.
  *
  * vim: filetype=cpp
  */
@@ -274,7 +274,7 @@ namespace rubinius {
       return str;
     }
 
-    static const int32_t utf8_limits[] = {
+    static const uint32_t utf8_limits[] = {
       0x0,        /* 1 */
       0x80,       /* 2 */
       0x800,      /* 3 */
@@ -294,7 +294,7 @@ namespace rubinius {
 
       for(; count > 0 && bytes < bytes_end; count--) {
         native_int remainder = bytes_end - bytes;
-        int32_t c = *bytes++ & 0xff, value = c;
+        uint32_t c = *bytes++ & 0xff, value = c;
         int n = 0;
         length = 1;
 

vm/builtin/unpack19.cpp

@@ -2,7 +2,7 @@
 /* This file was generated by Ragel. Your edits will be lost.
  *
  * This is a state machine implementation of String#unpack.
- * See http://github.com/brixen/rapa.
+ * See http://github.com/rubinius/rapa.
  *
  * vim: filetype=cpp
  */
@@ -18,6 +18,7 @@
 
 #include "builtin/array.hpp"
 #include "builtin/bytearray.hpp"
+#include "builtin/encoding.hpp"
 #include "builtin/exception.hpp"
 #include "builtin/fixnum.hpp"
 #include "builtin/float.hpp"
@@ -139,7 +140,11 @@ namespace rubinius {
                           const char* bytes_end, native_int remainder)
     {
       if(remainder == 0) {
-        return String::create(state, 0, 0);
+        String* str = String::create(state, 0, 0);
+
+        str->encoding(state, Encoding::ascii8bit_encoding(state));
+
+        return str;
       }
 
       static bool initialized = false;
@@ -212,6 +217,7 @@ namespace rubinius {
       }
 
       *buf = 0;
+      str->encoding(state, Encoding::ascii8bit_encoding(state));
       str->num_bytes(state, Fixnum::from(buf - str->byte_address()));
       return str;
     }
@@ -274,7 +280,7 @@ namespace rubinius {
       return str;
     }
 
-    static const int32_t utf8_limits[] = {
+    static const uint32_t utf8_limits[] = {
       0x0,        /* 1 */
       0x80,       /* 2 */
       0x800,      /* 3 */
@@ -294,7 +300,7 @@ namespace rubinius {
 
       for(; count > 0 && bytes < bytes_end; count--) {
         native_int remainder = bytes_end - bytes;
-        int32_t c = *bytes++ & 0xff, value = c;
+        uint32_t c = *bytes++ & 0xff, value = c;
         int n = 0;
         length = 1;