msgpack 0.2.0 → 0.2.1

data/Manifest.txt

@@ -10,6 +10,7 @@ ext/pack.h
 ext/rbinit.c
 ext/unpack.c
 ext/unpack.h
+msgpack/pack_define.h
 msgpack/pack_template.h
 msgpack/unpack_define.h
 msgpack/unpack_template.h

data/ext/pack.c

@@ -16,39 +16,19 @@
  *    limitations under the License.
  */
 #include "ruby.h"
-#include <stddef.h>
-#include <stdint.h>
+#include "msgpack/pack_define.h"
 
 #define msgpack_pack_inline_func(name) \
-	static void msgpack_pack_##name
+	static inline void msgpack_pack_##name
+
+#define msgpack_pack_inline_func_cint(name) \
+	static inline void msgpack_pack_##name
 
 #define msgpack_pack_user VALUE
 
 #define msgpack_pack_append_buffer(user, buf, len) \
 	rb_str_buf_cat(user, (const void*)buf, len)
 
-/*
-static void msgpack_pack_int(VALUE x, int d);
-static void msgpack_pack_unsigned_int(VALUE x, unsigned int d);
-static void msgpack_pack_uint8(VALUE x, uint8_t d);
-static void msgpack_pack_uint16(VALUE x, uint16_t d);
-static void msgpack_pack_uint32(VALUE x, uint32_t d);
-static void msgpack_pack_uint64(VALUE x, uint64_t d);
-static void msgpack_pack_int8(VALUE x, int8_t d);
-static void msgpack_pack_int16(VALUE x, int16_t d);
-static void msgpack_pack_int32(VALUE x, int32_t d);
-static void msgpack_pack_int64(VALUE x, int64_t d);
-static void msgpack_pack_float(VALUE x, float d);
-static void msgpack_pack_double(VALUE x, double d);
-static void msgpack_pack_nil(VALUE x);
-static void msgpack_pack_true(VALUE x);
-static void msgpack_pack_false(VALUE x);
-static void msgpack_pack_array(VALUE x, unsigned int n);
-static void msgpack_pack_map(VALUE x, unsigned int n);
-static void msgpack_pack_raw(VALUE x, size_t l);
-static void msgpack_pack_raw_body(VALUE x, const void* b, size_t l);
-*/
-
 #include "msgpack/pack_template.h"
 
 
@@ -93,7 +73,7 @@ static VALUE MessagePack_FalseClass_to_msgpack(int argc, VALUE *argv, VALUE self
 static VALUE MessagePack_Fixnum_to_msgpack(int argc, VALUE *argv, VALUE self)
 {
 	ARG_BUFFER(out, argc, argv);
-	msgpack_pack_int(out, FIX2INT(self));
+	msgpack_pack_long(out, FIX2LONG(self));
 	return out;
 }
 

data/lib/msgpack/version.rb

@@ -2,7 +2,7 @@ module MessagePack
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 2
-    TINY  = 0
+    TINY  = 1
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/msgpack/pack_define.h

@@ -0,0 +1,26 @@
+/*
+ * MessagePack unpacking routine template
+ *
+ * Copyright (C) 2008 FURUHASHI Sadayuki
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+#ifndef MSGPACK_PACK_DEFINE_H__
+#define MSGPACK_PACK_DEFINE_H__
+
+#include <stddef.h>
+#include <stdint.h>
+#include <limits.h>
+
+#endif /* msgpack/pack_define.h */
+

data/msgpack/pack_template.h

@@ -50,7 +50,6 @@
 
 #endif
 
-
 #ifndef msgpack_pack_inline_func
 #error msgpack_pack_inline_func template is not defined
 #endif
@@ -68,126 +67,484 @@
  * Integer
  */
 
-// wrapper
-msgpack_pack_inline_func(int)(msgpack_pack_user x, int d)
-{
-	if(d < -32) {
-		if(d < -32768) {
-			// signed 32
-			const unsigned char buf[5] = {0xd2, STORE_BE32(d)};
-			msgpack_pack_append_buffer(x, buf, 5);
-		} else if(d < -128) {
-			// signed 16
-			const unsigned char buf[3] = {0xd1, STORE_BE16(d)};
-			msgpack_pack_append_buffer(x, buf, 3);
-		} else {
-			// signed 8
-			const unsigned char buf[2] = {0xd0, (uint8_t)d};
-			msgpack_pack_append_buffer(x, buf, 2);
-		}
-	} else if(d < 128) {
-		// fixnum
-		msgpack_pack_append_buffer(x, (uint8_t*)&d, 1);
-	} else {
-		if(d < 256) {
-			// unsigned 8
-			const unsigned char buf[2] = {0xcc, (uint8_t)d};
-			msgpack_pack_append_buffer(x, buf, 2);
-		} else if(d < 65536) {
-			// unsigned 16
-			const unsigned char buf[3] = {0xcd, STORE_BE16(d)};
-			msgpack_pack_append_buffer(x, buf, 3);
-		} else {
-			// unsigned 32
-			const unsigned char buf[5] = {0xce, STORE_BE32(d)};
-			msgpack_pack_append_buffer(x, buf, 5);
-		}
-	}
+#define msgpack_pack_real_uint8(x, d) \
+do { \
+	if(d < (1<<7)) { \
+		/* fixnum */ \
+		msgpack_pack_append_buffer(x, (uint8_t*)&d, 1); \
+	} else { \
+		/* unsigned 8 */ \
+		const unsigned char buf[2] = {0xcc, (uint8_t)d}; \
+		msgpack_pack_append_buffer(x, buf, 2); \
+	} \
+} while(0)
+
+#define msgpack_pack_real_uint16(x, d) \
+do { \
+	if(d < (1<<7)) { \
+		/* fixnum */ \
+		msgpack_pack_append_buffer(x, (uint8_t*)&d, 1); \
+	} else if(d < (1<<8)) { \
+		/* unsigned 8 */ \
+		const unsigned char buf[2] = {0xcc, (uint8_t)d}; \
+		msgpack_pack_append_buffer(x, buf, 2); \
+	} else { \
+		/* unsigned 16 */ \
+		const unsigned char buf[3] = {0xcd, STORE_BE16(d)}; \
+		msgpack_pack_append_buffer(x, buf, 3); \
+	} \
+} while(0)
+
+#define msgpack_pack_real_uint32(x, d) \
+do { \
+	if(d < (1<<8)) { \
+		if(d < (1<<7)) { \
+			/* fixnum */ \
+			msgpack_pack_append_buffer(x, (uint8_t*)&d, 1); \
+		} else { \
+			/* unsigned 8 */ \
+			const unsigned char buf[2] = {0xcc, (uint8_t)d}; \
+			msgpack_pack_append_buffer(x, buf, 2); \
+		} \
+	} else { \
+		if(d < (1<<16)) { \
+			/* unsigned 16 */ \
+			const unsigned char buf[3] = {0xcd, STORE_BE16(d)}; \
+			msgpack_pack_append_buffer(x, buf, 3); \
+		} else { \
+			/* unsigned 32 */ \
+			const unsigned char buf[5] = {0xce, STORE_BE32(d)}; \
+			msgpack_pack_append_buffer(x, buf, 5); \
+		} \
+	} \
+} while(0)
+
+#define msgpack_pack_real_uint64(x, d) \
+do { \
+	if(d < (1ULL<<8)) { \
+		if(d < (1<<7)) { \
+			/* fixnum */ \
+			msgpack_pack_append_buffer(x, (uint8_t*)&d, 1); \
+		} else { \
+			/* unsigned 8 */ \
+			const unsigned char buf[2] = {0xcc, (uint8_t)d}; \
+			msgpack_pack_append_buffer(x, buf, 2); \
+		} \
+	} else { \
+		if(d < (1ULL<<16)) { \
+			/* signed 16 */ \
+			const unsigned char buf[3] = {0xcd, STORE_BE16(d)}; \
+			msgpack_pack_append_buffer(x, buf, 3); \
+		} else if(d < (1ULL<<32)) { \
+			/* signed 32 */ \
+			const unsigned char buf[5] = {0xce, STORE_BE32(d)}; \
+			msgpack_pack_append_buffer(x, buf, 5); \
+		} else { \
+			/* signed 64 */ \
+			const unsigned char buf[9] = {0xcf, STORE_BE64(d)}; \
+			msgpack_pack_append_buffer(x, buf, 9); \
+		} \
+	} \
+} while(0)
+
+#define msgpack_pack_real_int8(x, d) \
+do { \
+	if(d < -(1<<5)) { \
+		/* signed 8 */ \
+		const unsigned char buf[2] = {0xd0, d}; \
+		msgpack_pack_append_buffer(x, buf, 2); \
+	} else { \
+		/* fixnum */ \
+		msgpack_pack_append_buffer(x, (uint8_t*)&d, 1); \
+	} \
+} while(0)
+
+#define msgpack_pack_real_int16(x, d) \
+do { \
+	if(d < -(1<<5)) { \
+		if(d < -(1<<7)) { \
+			/* signed 16 */ \
+			const unsigned char buf[3] = {0xd1, STORE_BE16(d)}; \
+			msgpack_pack_append_buffer(x, buf, 3); \
+		} else { \
+			/* signed 8 */ \
+			const unsigned char buf[2] = {0xd0, (uint8_t)d}; \
+			msgpack_pack_append_buffer(x, buf, 2); \
+		} \
+	} else if(d < (1<<7)) { \
+		/* fixnum */ \
+		msgpack_pack_append_buffer(x, (uint8_t*)&d, 1); \
+	} else { \
+		if(d < (1<<8)) { \
+			/* unsigned 8 */ \
+			const unsigned char buf[2] = {0xcc, (uint8_t)d}; \
+			msgpack_pack_append_buffer(x, buf, 2); \
+		} else { \
+			/* unsigned 16 */ \
+			const unsigned char buf[3] = {0xcd, STORE_BE16(d)}; \
+			msgpack_pack_append_buffer(x, buf, 3); \
+		} \
+	} \
+} while(0)
+
+#define msgpack_pack_real_int32(x, d) \
+do { \
+	if(d < -(1<<5)) { \
+		if(d < -(1<<15)) { \
+			/* signed 32 */ \
+			const unsigned char buf[5] = {0xd2, STORE_BE32(d)}; \
+			msgpack_pack_append_buffer(x, buf, 5); \
+		} else if(d < -(1<<7)) { \
+			/* signed 16 */ \
+			const unsigned char buf[3] = {0xd1, STORE_BE16(d)}; \
+			msgpack_pack_append_buffer(x, buf, 3); \
+		} else { \
+			/* signed 8 */ \
+			const unsigned char buf[2] = {0xd0, (uint8_t)d}; \
+			msgpack_pack_append_buffer(x, buf, 2); \
+		} \
+	} else if(d < (1<<7)) { \
+		/* fixnum */ \
+		msgpack_pack_append_buffer(x, (uint8_t*)&d, 1); \
+	} else { \
+		if(d < (1<<8)) { \
+			/* unsigned 8 */ \
+			const unsigned char buf[2] = {0xcc, (uint8_t)d}; \
+			msgpack_pack_append_buffer(x, buf, 2); \
+		} else if(d < (1<<16)) { \
+			/* unsigned 16 */ \
+			const unsigned char buf[3] = {0xcd, STORE_BE16(d)}; \
+			msgpack_pack_append_buffer(x, buf, 3); \
+		} else { \
+			/* unsigned 32 */ \
+			const unsigned char buf[5] = {0xce, STORE_BE32(d)}; \
+			msgpack_pack_append_buffer(x, buf, 5); \
+		} \
+	} \
+} while(0)
+
+#define msgpack_pack_real_int64(x, d) \
+do { \
+	if(d < -(1LL<<5)) { \
+		if(d < -(1LL<<15)) { \
+			if(d < -(1LL<<31)) { \
+				/* signed 64 */ \
+				const unsigned char buf[9] = {0xd3, STORE_BE64(d)}; \
+				msgpack_pack_append_buffer(x, buf, 9); \
+			} else { \
+				/* signed 32 */ \
+				const unsigned char buf[5] = {0xd2, STORE_BE32(d)}; \
+				msgpack_pack_append_buffer(x, buf, 5); \
+			} \
+		} else { \
+			if(d < -(1<<7)) { \
+				/* signed 16 */ \
+				const unsigned char buf[3] = {0xd1, STORE_BE16(d)}; \
+				msgpack_pack_append_buffer(x, buf, 3); \
+			} else { \
+				/* signed 8 */ \
+				const unsigned char buf[2] = {0xd0, (uint8_t)d}; \
+				msgpack_pack_append_buffer(x, buf, 2); \
+			} \
+		} \
+	} else if(d < (1<<7)) { \
+		/* fixnum */ \
+		msgpack_pack_append_buffer(x, (uint8_t*)&d, 1); \
+	} else { \
+		if(d < (1LL<<16)) { \
+			if(d < (1<<8)) { \
+				/* unsigned 8 */ \
+				const unsigned char buf[2] = {0xcc, (uint8_t)d}; \
+				msgpack_pack_append_buffer(x, buf, 2); \
+			} else { \
+				/* unsigned 16 */ \
+				const unsigned char buf[3] = {0xcd, STORE_BE16(d)}; \
+				msgpack_pack_append_buffer(x, buf, 3); \
+			} \
+		} else { \
+			if(d < (1LL<<32)) { \
+				/* unsigned 32 */ \
+				const unsigned char buf[5] = {0xce, STORE_BE32(d)}; \
+				msgpack_pack_append_buffer(x, buf, 5); \
+			} else { \
+				/* unsigned 64 */ \
+				const unsigned char buf[9] = {0xcf, STORE_BE64(d)}; \
+				msgpack_pack_append_buffer(x, buf, 9); \
+			} \
+		} \
+	} \
+} while(0)
+
+
+#ifdef msgpack_pack_inline_func_fastint
+
+msgpack_pack_inline_func_fastint(uint8)(msgpack_pack_user x, uint8_t d)
+{
+	const unsigned char buf[2] = {0xcc, d};
+	msgpack_pack_append_buffer(x, buf, 2);
 }
 
-// wrapper
-msgpack_pack_inline_func(unsigned_int)(msgpack_pack_user x, unsigned int d)
+msgpack_pack_inline_func_fastint(uint16)(msgpack_pack_user x, uint16_t d)
 {
-	if(d < 256) {
-		if(d < 128) {
-			// fixnum
-			msgpack_pack_append_buffer(x, (unsigned char*)&d, 1);
-		} else {
-			// unsigned 8
-			const unsigned char buf[2] = {0xcc, (uint8_t)d};
-			msgpack_pack_append_buffer(x, buf, 2);
-		}
-	} else {
-		if(d < 65536) {
-			// unsigned 16
-			const unsigned char buf[3] = {0xcd, STORE_BE16(d)};
-			msgpack_pack_append_buffer(x, buf, 3);
-		} else {
-			// unsigned 32
-			const unsigned char buf[5] = {0xce, STORE_BE32(d)};
-			msgpack_pack_append_buffer(x, buf, 5);
-		}
-	}
+	const unsigned char buf[3] = {0xcd, STORE_BE16(d)};
+	msgpack_pack_append_buffer(x, buf, 3);
+}
+
+msgpack_pack_inline_func_fastint(uint32)(msgpack_pack_user x, uint32_t d)
+{
+	const unsigned char buf[5] = {0xce, STORE_BE32(d)};
+	msgpack_pack_append_buffer(x, buf, 5);
+}
+
+msgpack_pack_inline_func_fastint(uint64)(msgpack_pack_user x, uint64_t d)
+{
+	const unsigned char buf[9] = {0xcf, STORE_BE64(d)};
+	msgpack_pack_append_buffer(x, buf, 9);
+}
+
+msgpack_pack_inline_func_fastint(int8)(msgpack_pack_user x, int8_t d)
+{
+	const unsigned char buf[2] = {0xd0, d};
+	msgpack_pack_append_buffer(x, buf, 2);
 }
 
+msgpack_pack_inline_func_fastint(int16)(msgpack_pack_user x, int16_t d)
+{
+	const unsigned char buf[3] = {0xd1, STORE_BE16(d)};
+	msgpack_pack_append_buffer(x, buf, 3);
+}
+
+msgpack_pack_inline_func_fastint(int32)(msgpack_pack_user x, int32_t d)
+{
+	const unsigned char buf[5] = {0xd2, STORE_BE32(d)};
+	msgpack_pack_append_buffer(x, buf, 5);
+}
+
+msgpack_pack_inline_func_fastint(int64)(msgpack_pack_user x, int64_t d)
+{
+	const unsigned char buf[9] = {0xd3, STORE_BE64(d)};
+	msgpack_pack_append_buffer(x, buf, 9);
+}
+
+#undef msgpack_pack_inline_func_fastint
+#endif
+
+
 msgpack_pack_inline_func(uint8)(msgpack_pack_user x, uint8_t d)
 {
-	if(d < 128) {
-		msgpack_pack_append_buffer(x, &d, 1);
-	} else {
-		const unsigned char buf[2] = {0xcc, d};
-		msgpack_pack_append_buffer(x, buf, 2);
-	}
+	msgpack_pack_real_uint8(x, d);
 }
 
 msgpack_pack_inline_func(uint16)(msgpack_pack_user x, uint16_t d)
 {
-	const unsigned char buf[3] = {0xcd, STORE_BE16(d)};
-	msgpack_pack_append_buffer(x, buf, 3);
+	msgpack_pack_real_uint16(x, d);
 }
 
 msgpack_pack_inline_func(uint32)(msgpack_pack_user x, uint32_t d)
 {
-	const unsigned char buf[5] = {0xce, STORE_BE32(d)};
-	msgpack_pack_append_buffer(x, buf, 5);
+	msgpack_pack_real_uint32(x, d);
 }
 
 msgpack_pack_inline_func(uint64)(msgpack_pack_user x, uint64_t d)
 {
-	const unsigned char buf[9] = {0xcf, STORE_BE64(d)};
-	msgpack_pack_append_buffer(x, buf, 9);
+	msgpack_pack_real_uint64(x, d);
 }
 
 msgpack_pack_inline_func(int8)(msgpack_pack_user x, int8_t d)
 {
-	if(d > 0) {
-		msgpack_pack_append_buffer(x, (uint8_t*)&d, 1);
-	} else if(d >= -32) {
-		msgpack_pack_append_buffer(x, (uint8_t*)&d, 1);
-	} else {
-		const unsigned char buf[2] = {0xd0, d};
-		msgpack_pack_append_buffer(x, buf, 2);
-	}
+	msgpack_pack_real_int8(x, d);
 }
 
 msgpack_pack_inline_func(int16)(msgpack_pack_user x, int16_t d)
 {
-	const unsigned char buf[3] = {0xd1, STORE_BE16(d)};
-	msgpack_pack_append_buffer(x, buf, 3);
+	msgpack_pack_real_int16(x, d);
 }
 
 msgpack_pack_inline_func(int32)(msgpack_pack_user x, int32_t d)
 {
-	const unsigned char buf[5] = {0xd2, STORE_BE32(d)};
-	msgpack_pack_append_buffer(x, buf, 5);
+	msgpack_pack_real_int32(x, d);
 }
 
 msgpack_pack_inline_func(int64)(msgpack_pack_user x, int64_t d)
 {
-	const unsigned char buf[9] = {0xd3, STORE_BE64(d)};
-	msgpack_pack_append_buffer(x, buf, 9);
+	msgpack_pack_real_int64(x, d);
+}
+
+
+#ifdef msgpack_pack_inline_func_cint
+
+msgpack_pack_inline_func_cint(short)(msgpack_pack_user x, short d)
+{
+#if defined(SIZEOF_SHORT) || defined(SHRT_MAX)
+#if SIZEOF_SHORT == 2 || SHRT_MAX == 0x7fff
+	msgpack_pack_real_int16(x, d);
+#elif SIZEOF_SHORT == 4 || SHRT_MAX == 0x7fffffff
+	msgpack_pack_real_int32(x, d);
+#else
+	msgpack_pack_real_int64(x, d);
+#endif
+#else
+if(sizeof(short) == 2) {
+	msgpack_pack_real_int16(x, d);
+} else if(sizeof(short) == 4) {
+	msgpack_pack_real_int32(x, d);
+} else {
+	msgpack_pack_real_int64(x, d);
+}
+#endif
+}
+
+msgpack_pack_inline_func_cint(int)(msgpack_pack_user x, int d)
+{
+#if defined(SIZEOF_INT) || defined(INT_MAX)
+#if SIZEOF_INT == 2 || INT_MAX == 0x7fff
+	msgpack_pack_real_int16(x, d);
+#elif SIZEOF_INT == 4 || INT_MAX == 0x7fffffff
+	msgpack_pack_real_int32(x, d);
+#else
+	msgpack_pack_real_int64(x, d);
+#endif
+#else
+if(sizeof(int) == 2) {
+	msgpack_pack_real_int16(x, d);
+} else if(sizeof(int) == 4) {
+	msgpack_pack_real_int32(x, d);
+} else {
+	msgpack_pack_real_int64(x, d);
+}
+#endif
+}
+
+msgpack_pack_inline_func_cint(long)(msgpack_pack_user x, long d)
+{
+#if defined(SIZEOF_LONG) || defined(LONG_MAX)
+#if SIZEOF_LONG == 2 || LONG_MAX == 0x7fffL
+	msgpack_pack_real_int16(x, d);
+#elif SIZEOF_LONG == 4 || LONG_MAX == 0x7fffffffL
+	msgpack_pack_real_int32(x, d);
+#else
+	msgpack_pack_real_int64(x, d);
+#endif
+#else
+if(sizeof(long) == 2) {
+	msgpack_pack_real_int16(x, d);
+} else if(sizeof(long) == 4) {
+	msgpack_pack_real_int32(x, d);
+} else {
+	msgpack_pack_real_int64(x, d);
+}
+#endif
 }
 
+msgpack_pack_inline_func_cint(long_long)(msgpack_pack_user x, long long d)
+{
+#if defined(SIZEOF_LONG_LONG) || defined(LLONG_MAX)
+#if SIZEOF_LONG_LONG == 2 || LLONG_MAX == 0x7fffL
+	msgpack_pack_real_int16(x, d);
+#elif SIZEOF_LONG_LONG == 4 || LLONG_MAX == 0x7fffffffL
+	msgpack_pack_real_int32(x, d);
+#else
+	msgpack_pack_real_int64(x, d);
+#endif
+#else
+if(sizeof(long long) == 2) {
+	msgpack_pack_real_int16(x, d);
+} else if(sizeof(long long) == 4) {
+	msgpack_pack_real_int32(x, d);
+} else {
+	msgpack_pack_real_int64(x, d);
+}
+#endif
+}
+
+msgpack_pack_inline_func_cint(unsigned_short)(msgpack_pack_user x, unsigned short d)
+{
+#if defined(SIZEOF_SHORT) || defined(USHRT_MAX)
+#if SIZEOF_SHORT == 2 || USHRT_MAX == 0xffffU
+	msgpack_pack_real_uint16(x, d);
+#elif SIZEOF_SHORT == 4 || USHRT_MAX == 0xffffffffU
+	msgpack_pack_real_uint32(x, d);
+#else
+	msgpack_pack_real_uint64(x, d);
+#endif
+#else
+if(sizeof(unsigned short) == 2) {
+	msgpack_pack_real_uint16(x, d);
+} else if(sizeof(unsigned short) == 4) {
+	msgpack_pack_real_uint32(x, d);
+} else {
+	msgpack_pack_real_uint64(x, d);
+}
+#endif
+}
+
+msgpack_pack_inline_func_cint(unsigned_int)(msgpack_pack_user x, unsigned int d)
+{
+#if defined(SIZEOF_INT) || defined(UINT_MAX)
+#if SIZEOF_INT == 2 || UINT_MAX == 0xffffU
+	msgpack_pack_real_uint16(x, d);
+#elif SIZEOF_INT == 4 || UINT_MAX == 0xffffffffU
+	msgpack_pack_real_uint32(x, d);
+#else
+	msgpack_pack_real_uint64(x, d);
+#endif
+#else
+if(sizeof(unsigned int) == 2) {
+	msgpack_pack_real_uint16(x, d);
+} else if(sizeof(unsigned int) == 4) {
+	msgpack_pack_real_uint32(x, d);
+} else {
+	msgpack_pack_real_uint64(x, d);
+}
+#endif
+}
+
+msgpack_pack_inline_func_cint(unsigned_long)(msgpack_pack_user x, unsigned long d)
+{
+#if defined(SIZEOF_LONG) || defined(ULONG_MAX)
+#if SIZEOF_LONG == 2 || ULONG_MAX == 0xffffUL
+	msgpack_pack_real_uint16(x, d);
+#elif SIZEOF_LONG == 4 || ULONG_MAX == 0xffffffffUL
+	msgpack_pack_real_uint32(x, d);
+#else
+	msgpack_pack_real_uint64(x, d);
+#endif
+#else
+if(sizeof(unsigned int) == 2) {
+	msgpack_pack_real_uint16(x, d);
+} else if(sizeof(unsigned int) == 4) {
+	msgpack_pack_real_uint32(x, d);
+} else {
+	msgpack_pack_real_uint64(x, d);
+}
+#endif
+}
+
+msgpack_pack_inline_func_cint(unsigned_long_long)(msgpack_pack_user x, unsigned long long d)
+{
+#if defined(SIZEOF_LONG_LONG) || defined(ULLONG_MAX)
+#if SIZEOF_LONG_LONG == 2 || ULLONG_MAX == 0xffffUL
+	msgpack_pack_real_uint16(x, d);
+#elif SIZEOF_LONG_LONG == 4 || ULLONG_MAX == 0xffffffffUL
+	msgpack_pack_real_uint32(x, d);
+#else
+	msgpack_pack_real_uint64(x, d);
+#endif
+#else
+if(sizeof(unsigned long long) == 2) {
+	msgpack_pack_real_uint16(x, d);
+} else if(sizeof(unsigned long long) == 4) {
+	msgpack_pack_real_uint32(x, d);
+} else {
+	msgpack_pack_real_uint64(x, d);
+}
+#endif
+}
+
+#undef msgpack_pack_inline_func_cint
+#endif
+
+
 
 /*
  * Float
@@ -311,3 +668,12 @@ msgpack_pack_inline_func(raw_body)(msgpack_pack_user x, const void* b, size_t l)
 #undef STORE_BE32
 #undef STORE_BE64
 
+#undef msgpack_pack_real_uint8
+#undef msgpack_pack_real_uint16
+#undef msgpack_pack_real_uint32
+#undef msgpack_pack_real_uint64
+#undef msgpack_pack_real_int8
+#undef msgpack_pack_real_int16
+#undef msgpack_pack_real_int32
+#undef msgpack_pack_real_int64
+

data/test/test_format.rb

@@ -0,0 +1,142 @@
+require 'test/unit'
+require 'msgpack'
+
+class MessagePackTestFormat < Test::Unit::TestCase
+	def self.it(name, &block)
+		define_method("test_#{name}", &block)
+	end
+
+	it "nil" do
+		check 1, nil
+	end
+
+	it "true" do
+		check 1, true
+	end
+
+	it "false" do
+		check 1, false
+	end
+
+	it "zero" do
+		check 1, 0
+	end
+
+	it "positive fixnum" do
+		check 1, 1
+		check 1, (1<<6)
+		check 1, (1<<7)-1
+	end
+
+	it "positive int 8" do
+		check 1, -1
+		check 2, (1<<7)
+		check 2, (1<<8)-1
+	end
+
+	it "positive int 16" do
+		check 3, (1<<8)
+		check 3, (1<<16)-1
+	end
+
+	it "positive int 32" do
+		check 5, (1<<16)
+		check 5, (1<<32)-1
+	end
+
+	it "positive int 64" do
+		check 9, (1<<32)
+		check 9, (1<<64)-1
+	end
+
+	it "negative fixnum" do
+		check 1, -1
+		check 1, -((1<<5)-1)
+		check 1, -(1<<5)
+	end
+
+	it "negative int 8" do
+		check 2, -((1<<5)+1)
+		check 2, -(1<<7)
+	end
+
+	it "negative int 16" do
+		check 3, -((1<<7)+1)
+		check 3, -(1<<15)
+	end
+
+	it "negative int 32" do
+		check 5, -((1<<15)+1)
+		check 5, -(1<<31)
+	end
+
+	it "negative int 64" do
+		check 9, -((1<<31)+1)
+		check 9, -(1<<63)
+	end
+
+	it "fixraw" do
+		check_raw 1, 0
+		check_raw 1, (1<<5)-1
+	end
+
+	it "raw 16" do
+		check_raw 3, (1<<5)
+		check_raw 3, (1<<16)-1
+	end
+
+	it "raw 32" do
+		check_raw 5, (1<<16)
+		#check_raw 5, (1<<32)-1  # memory error
+	end
+
+	it "fixarray" do
+		check_array 1, 0
+		check_array 1, (1<<4)-1
+	end
+
+	it "array 16" do
+		check_array 3, (1<<4)
+		check_array 3, (1<<16)-1
+	end
+
+	it "array 32" do
+		check_array 5, (1<<16)
+		#check_array 5, (1<<32)-1  # memory error
+	end
+
+#	it "fixmap" do
+#		check_map 1, 0
+#		check_map 1, (1<<4)-1
+#	end
+#
+#	it "map 16" do
+#		check_map 3, (1<<4)
+#		check_map 3, (1<<16)-1
+#	end
+#
+#	it "map 32" do
+#		check_map 5, (1<<16)
+#		#check_map 5, (1<<32)-1  # memory error
+#	end
+
+	private
+	def check(len, obj)
+		v = obj.to_msgpack
+		assert_equal(v.length, len)
+		assert_equal(MessagePack.unpack(v), obj)
+	end
+
+	def check_raw(overhead, num)
+		check num+overhead, " "*num
+	end
+
+	def check_array(overhead, num)
+		check num+overhead, Array.new(num)
+	end
+
+	def check_map(overhead, num)
+		# FIXME
+	end
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: msgpack
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - FURUHASHI Sadayuki
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-10 00:00:00 +09:00
+date: 2008-12-07 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.7.0
+        version: 1.8.0
     version: 
 description: An object-oriented parser generator based on Parser Expression Grammar
 email: 
@@ -46,6 +46,7 @@ files:
 - ext/rbinit.c
 - ext/unpack.c
 - ext/unpack.h
+- msgpack/pack_define.h
 - msgpack/pack_template.h
 - msgpack/unpack_define.h
 - msgpack/unpack_template.h
@@ -82,9 +83,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: msgpack
-rubygems_version: 1.2.0
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 summary: An object-oriented parser generator based on Parser Expression Grammar
-test_files: []
-
+test_files: 
+- test/test_format.rb