sereal 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 334da6fca79a66f53b566b05c919622bf4014270
-  data.tar.gz: 9e409dcd1d974402d32aac4cc60515c9a6dac191
+  metadata.gz: 93b2d3dcf39684fbf9fd094b94b4d78227bc0877
+  data.tar.gz: ce21c8d417fcf323d316e3364fdabb3f4d35def5
 SHA512:
-  metadata.gz: 494b505134654159a0b1167fb2a151c62678f693a5807d90946104e82a384207dfd03cf7feeef6e468c3a1e37ed6f568483bc9a5a9aededceb06f5f7cf2ab72d
-  data.tar.gz: 1f1d986d319675b80b389c14b07d5208d173ffbbb4b5b8ef677a57aedac641c549079fa1ce9864ef8f58b958651ead102e50d6d057582238a5e89dc6e3d4b6e6
+  metadata.gz: fc1d1ff34c241d8d9a31a4e3d9bf97683e0517cac457e97cb385d5656f0f07e436c029d09691736fd8909948ad2e85fcd285b7d27e6b3773e81fbbad783a5787
+  data.tar.gz: c3e9c73be0841b2beb34958b2972701604bbd7d3d014f1fdbcdd56612aef46614d6cf8b9d474a080a78f0b52dbcdb0fb27033bfce0caf9a3c06815fda4fefc85

data/ext/sereal/decode.c

@@ -26,11 +26,7 @@ static u64 s_get_varint_bang(sereal_t *s) {
 static VALUE s_read_zigzag(sereal_t *s, u8 tag) {
     signed long long z = 0;
     u64 v = s_get_varint_bang(s);
-    if (v & 1) {
-        z = ((long) v >> 1);
-    } else {
-        z = (long) v >> 1;
-    }
+    z = (v >> 1) ^ -(v & 0x01);
     return LL2NUM(z);
 }
 

data/ext/sereal/encode.c

@@ -41,7 +41,7 @@ void (*WRITER[W_SIZE])(sereal_t *,VALUE);
 static void rb_object_to_sereal(sereal_t *s, VALUE object);
 static void s_append_varint(sereal_t *s,u64 n);
 static void s_append_hdr_with_varint(sereal_t *s,u8 hdr, u64 n);
-static void s_append_zigzag(sereal_t *s,u64 n);
+static void s_append_zigzag(sereal_t *s,long long n);
 static void s_append_string(sereal_t *s,u8 *string, u32 len,u8 is_utf8);
 static void s_append_rb_string(sereal_t *s, VALUE object);
 static void s_append_array(sereal_t *s, VALUE object);
@@ -49,7 +49,8 @@ static void s_append_hash(sereal_t *s, VALUE object);
 static void s_append_symbol(sereal_t *s, VALUE object);
 static void s_append_object(sereal_t *s, VALUE object);
 static void s_append_regexp(sereal_t *s, VALUE object);
-static void s_append_integer(sereal_t *s, VALUE object);
+static void s_append_bignum(sereal_t *s, VALUE object);
+static void s_append_fixnum(sereal_t *s, VALUE object);
 static void s_append_double(sereal_t *s, VALUE object);
 static void s_append_true(sereal_t *s, VALUE object);
 static void s_append_false(sereal_t *s, VALUE object);
@@ -61,8 +62,8 @@ void s_init_writers(void) {
     for (i = 0; i < sizeof(WRITER)/sizeof(WRITER[0]); i++)
         WRITER[i] = s_default_writer;
 
-    WRITER[T_FIXNUM] = s_append_integer;
-    WRITER[T_BIGNUM] = s_append_integer;
+    WRITER[T_FIXNUM] = s_append_fixnum;
+    WRITER[T_BIGNUM] = s_append_bignum;
     WRITER[T_FLOAT]  = s_append_double;
     WRITER[T_OBJECT] = s_append_object;
     WRITER[T_REGEXP] = s_append_regexp;
@@ -93,9 +94,8 @@ static inline void s_append_hdr_with_varint(sereal_t *s,u8 hdr, u64 n) {
     s_append_varint(s,n);
 }
 
-static inline void s_append_zigzag(sereal_t *s,u64 n) {
-    s_append_hdr_with_varint(s,SRL_HDR_ZIGZAG,
-                             (n << 1) ^ (n >> (sizeof(long) * 8 - 1)));
+static inline void s_append_zigzag(sereal_t *s,long long n) {
+    s_append_hdr_with_varint(s,SRL_HDR_ZIGZAG,(n << 1) ^ (n >> 63));
 }
 
 static inline void s_append_string(sereal_t *s,u8 *string, u32 len,u8 is_utf8) {
@@ -230,25 +230,37 @@ static void s_append_regexp(sereal_t *s, VALUE object) {
     s_append_rb_string(s,f);
 }
 
+#define I_APPEND(_v)                                                    \
+    do {                                                                \
+        if (_v >= 0) {                                                  \
+            if (_v < 16)                                                \
+                s_append_u8(s,SRL_HDR_POS_LOW | (u8) _v);               \
+            else                                                        \
+                s_append_hdr_with_varint(s,SRL_HDR_VARINT,_v);          \
+        } else {                                                        \
+            if (_v > -17)                                               \
+                s_append_u8(s,SRL_HDR_NEG_LOW | ((u8) _v + 32));        \
+            else                                                        \
+                s_append_zigzag(s,_v);                                  \
+        }                                                               \
+    } while(0)
+
+static void s_append_fixnum(sereal_t *s, VALUE object) {
+    long long v = FIXNUM_P(object) ? FIX2LONG(object) : NUM2LL(object);
+    I_APPEND(v);
+}
 
-static void s_append_integer(sereal_t *s, VALUE object) {
-    long long v = FIXNUM_P(object) ? FIX2LONG(object) : rb_num2ll(object);
-    if (v >= 0) {
-        if (v < 16) 
-            s_append_u8(s,SRL_HDR_POS_LOW | (u8) v);
-        else {
-            if (!FIXNUM_P(object))
-                s_append_hdr_with_varint(s,SRL_HDR_VARINT,NUM2ULL(object));
-            else
-                s_append_hdr_with_varint(s,SRL_HDR_VARINT,v);
-        }
+static void s_append_bignum(sereal_t *s, VALUE object) {
+    if (RBIGNUM_POSITIVE_P(object)) {
+        unsigned long long uv = rb_big2ull(object);
+        I_APPEND(uv);
     } else {
-        if (v > -17)
-            s_append_u8(s,SRL_HDR_NEG_LOW | ((u8) v + 32));
-        else
-            s_append_zigzag(s,v);            
+        long long v = rb_big2ll(object);
+        I_APPEND(v);
     }
 }
+#undef I_APPEND
+
 static void s_append_double(sereal_t *s, VALUE object) {
     double d = NUM2DBL(object);
     s_append_u8(s,SRL_HDR_DOUBLE);

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sereal
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors:
 - Borislav Nikolov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-12 00:00:00.000000000 Z
+date: 2014-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler