lang/c/msgpack: added C++ binding

git-svn-id: file:///Users/frsyuki/project/msgpack-git/svn/x@50 5a5092ae-2292-43ba-b2d5-dcab9c1a2731

4 files changed, 76 insertions, 41 deletions

diff --git a/msgpack/pack/inline_context.h b/msgpack/pack/inline_context.h
deleted file mode 100644
index 139597f..0000000
--- a/msgpack/pack/inline_context.h
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
diff --git a/msgpack/pack/inline_impl.h b/msgpack/pack/inline_impl.h
index 5c4bfed..08a5bc1 100644
--- a/msgpack/pack/inline_impl.h
+++ b/msgpack/pack/inline_impl.h
@@ -23,25 +23,25 @@
 
 #ifdef __LITTLE_ENDIAN__
 
-#define STORE_16(d) \
+#define STORE_BE16(d) \
 	((char*)&d)[1], ((char*)&d)[0]
 
-#define STORE_32(d) \
+#define STORE_BE32(d) \
 	((char*)&d)[3], ((char*)&d)[2], ((char*)&d)[1], ((char*)&d)[0]
 
-#define STORE_64(d) \
+#define STORE_BE64(d) \
 	((char*)&d)[7], ((char*)&d)[6], ((char*)&d)[5], ((char*)&d)[4], \
 	((char*)&d)[3], ((char*)&d)[2], ((char*)&d)[1], ((char*)&d)[0]
 
 #elif __BIG_ENDIAN__
 
-#define STORE_16(d) \
-	((char*)&d)[2], ((char*)&d)[3]
+#define STORE_BE16(d) \
+	((char*)&d)[0], ((char*)&d)[1]
 
-#define STORE_32(d) \
+#define STORE_BE32(d) \
 	((char*)&d)[0], ((char*)&d)[1], ((char*)&d)[2], ((char*)&d)[3]
 
-#define STORE_32(d) \
+#define STORE_BE64(d) \
 	((char*)&d)[0], ((char*)&d)[1], ((char*)&d)[2], ((char*)&d)[3], \
 	((char*)&d)[4], ((char*)&d)[5], ((char*)&d)[6], ((char*)&d)[7]
 
@@ -57,10 +57,10 @@ inline void msgpack_pack_int(msgpack_pack_context x, int d)
 {
 	if(d < -32) {
 		if(d < -32768) { // signed 32
-			const unsigned char buf[5] = {0xd2, STORE_32(d)};
+			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_16(d)};
+			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};
@@ -75,11 +75,11 @@ inline void msgpack_pack_int(msgpack_pack_context x, int d)
 			msgpack_pack_append_buffer(x, buf, 2);
 		} else if(d < 65536) {
 			// unsigned 16
-			const unsigned char buf[3] = {0xcd, STORE_16(d)};
+			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_32(d)};
+			const unsigned char buf[5] = {0xce, STORE_BE32(d)};
 			msgpack_pack_append_buffer(x, buf, 5);
 		}
 	}
@@ -97,11 +97,11 @@ inline void msgpack_pack_unsigned_int(msgpack_pack_context x, unsigned int d)
 		msgpack_pack_append_buffer(x, buf, 2);
 	} else if(d < 65536) {
 		// unsigned 16
-		const unsigned char buf[3] = {0xcd, STORE_16(d)};
+		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_32(d)};
+		const unsigned char buf[5] = {0xce, STORE_BE32(d)};
 		msgpack_pack_append_buffer(x, buf, 5);
 	}
 }
@@ -118,20 +118,20 @@ inline void msgpack_pack_unsigned_int_8(msgpack_pack_context x, uint8_t d)
 
 inline void msgpack_pack_unsigned_int_16(msgpack_pack_context x, uint16_t d)
 {
-	const unsigned char buf[3] = {0xcd, STORE_16(d)};
+	const unsigned char buf[3] = {0xcd, STORE_BE16(d)};
 	msgpack_pack_append_buffer(x, buf, 3);
 }
 
 inline void msgpack_pack_unsigned_int_32(msgpack_pack_context x, uint32_t d)
 {
-	const unsigned char buf[5] = {0xce, STORE_32(d)};
+	const unsigned char buf[5] = {0xce, STORE_BE32(d)};
 	msgpack_pack_append_buffer(x, buf, 5);
 }
 
 inline void msgpack_pack_unsigned_int_64(msgpack_pack_context x, uint64_t d)
 {
-	// FIXME
-	const unsigned char buf[9] = {0xcf, STORE_64(d)};
+	// FIXME optimization
+	const unsigned char buf[9] = {0xcf, STORE_BE64(d)};
 	msgpack_pack_append_buffer(x, buf, 9);
 }
 
@@ -149,20 +149,20 @@ inline void msgpack_pack_signed_int_8(msgpack_pack_context x, int8_t d)
 
 inline void msgpack_pack_signed_int_16(msgpack_pack_context x, int16_t d)
 {
-	const unsigned char buf[3] = {0xd1, STORE_16(d)};
+	const unsigned char buf[3] = {0xd1, STORE_BE16(d)};
 	msgpack_pack_append_buffer(x, buf, 3);
 }
 
 inline void msgpack_pack_signed_int_32(msgpack_pack_context x, int32_t d)
 {
-	const unsigned char buf[5] = {0xd2, STORE_32(d)};
+	const unsigned char buf[5] = {0xd2, STORE_BE32(d)};
 	msgpack_pack_append_buffer(x, buf, 5);
 }
 
 inline void msgpack_pack_signed_int_64(msgpack_pack_context x, int64_t d)
 {
-	// FIXME
-	const unsigned char buf[9] = {0xd3, STORE_64(d)};
+	// FIXME optimization
+	const unsigned char buf[9] = {0xd3, STORE_BE64(d)};
 	msgpack_pack_append_buffer(x, buf, 9);
 }
 
@@ -174,14 +174,14 @@ inline void msgpack_pack_signed_int_64(msgpack_pack_context x, int64_t d)
 inline void msgpack_pack_float(msgpack_pack_context x, float d)
 {
 	uint32_t n = *((uint32_t*)&d);  // FIXME
-	const unsigned char buf[5] = {0xca, STORE_32(n)};
+	const unsigned char buf[5] = {0xca, STORE_BE32(n)};
 	msgpack_pack_append_buffer(x, buf, 5);
 }
 
 inline void msgpack_pack_double(msgpack_pack_context x, double d)
 {
 	uint64_t n = *((uint64_t*)&d);  // FIXME
-	const unsigned char buf[9] = {0xcb, STORE_64(n)};
+	const unsigned char buf[9] = {0xcb, STORE_BE64(n)};
 	msgpack_pack_append_buffer(x, buf, 9);
 }
 
@@ -200,6 +200,7 @@ inline void msgpack_pack_nil(msgpack_pack_context x)
 /*
  * Boolean
  */
+
 inline void msgpack_pack_true(msgpack_pack_context x)
 {
 	static const unsigned char d = 0xc3;
@@ -224,11 +225,11 @@ inline void msgpack_pack_array(msgpack_pack_context x, unsigned int n)
 		msgpack_pack_append_buffer(x, &d, 1);
 	} else if(n < 65536) {
 		uint16_t d = (uint16_t)n;
-		unsigned char buf[3] = {0xdc, STORE_16(d)};
+		unsigned char buf[3] = {0xdc, STORE_BE16(d)};
 		msgpack_pack_append_buffer(x, buf, 3);
 	} else {
 		uint32_t d = (uint32_t)n;
-		unsigned char buf[5] = {0xdd, STORE_32(d)};
+		unsigned char buf[5] = {0xdd, STORE_BE32(d)};
 		msgpack_pack_append_buffer(x, buf, 5);
 	}
 }
@@ -245,18 +246,18 @@ inline void msgpack_pack_map(msgpack_pack_context x, unsigned int n)
 		msgpack_pack_append_buffer(x, &d, 1);
 	} else if(n < 65536) {
 		uint16_t d = (uint16_t)n;
-		unsigned char buf[3] = {0xde, STORE_16(d)};
+		unsigned char buf[3] = {0xde, STORE_BE16(d)};
 		msgpack_pack_append_buffer(x, buf, 3);
 	} else {
 		uint32_t d = (uint32_t)n;
-		unsigned char buf[5] = {0xdf, STORE_32(d)};
+		unsigned char buf[5] = {0xdf, STORE_BE32(d)};
 		msgpack_pack_append_buffer(x, buf, 5);
 	}
 }
 
 
 /*
- * String
+ * Raw
  */
 
 inline void msgpack_pack_string(msgpack_pack_context x, const char* b)
@@ -272,16 +273,21 @@ inline void msgpack_pack_raw(msgpack_pack_context x, const void* b, size_t l)
 		msgpack_pack_append_buffer(x, &d, 1);
 	} else if(l < 65536) {
 		uint16_t d = (uint16_t)l;
-		unsigned char buf[3] = {0xda, STORE_16(d)};
+		unsigned char buf[3] = {0xda, STORE_BE16(d)};
 		msgpack_pack_append_buffer(x, buf, 3);
 	} else {
 		uint32_t d = (uint32_t)l;
-		unsigned char buf[5] = {0xdb, STORE_32(d)};
+		unsigned char buf[5] = {0xdb, STORE_BE32(d)};
 		msgpack_pack_append_buffer(x, buf, 5);
 	}
 	msgpack_pack_append_buffer(x, b, l);
 }
 
 
+#undef STORE_BE16(d)
+#undef STORE_BE32(d)
+#undef STORE_BE64(d)
+
+
 #endif /* msgpack/pack/inline_impl.h */
 
diff --git a/msgpack/unpack/inline_context.h b/msgpack/unpack/inline_context.h
index aecd566..d6558a3 100644
--- a/msgpack/unpack/inline_context.h
+++ b/msgpack/unpack/inline_context.h
@@ -25,6 +25,10 @@
 #define MSG_STACK_SIZE 16
 #endif
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 typedef struct {
 	msgpack_object obj;
 	size_t count;
@@ -47,6 +51,9 @@ void msgpack_unpacker_init(msgpack_unpacker* ctx);
 int msgpack_unpacker_execute(msgpack_unpacker* ctx, const char* data, size_t len, size_t* off);
 #define msgpack_unpacker_data(unpacker) (unpacker)->stack[0].obj
 
+#ifdef __cplusplus
+}
+#endif
 
 #endif /* msgpack/unpack/inline_context.h */
 
diff --git a/msgpack/unpack/inline_impl.h b/msgpack/unpack/inline_impl.h
index ec7f0fc..f610dd7 100644
--- a/msgpack/unpack/inline_impl.h
+++ b/msgpack/unpack/inline_impl.h
@@ -23,6 +23,10 @@
 #include <arpa/inet.h>
 /*#include <stdio.h>*/
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 // Positive FixNum  0xxxxxxx  0x00 - 0x7f
 // Negative FixNum  111xxxxx  0xe0 - 0xff
 // Variable         110xxxxx  0xc0 - 0xdf
@@ -71,13 +75,16 @@
 #endif
 #endif
 
-static inline uint64_t ntohll(uint64_t x) {
-#ifdef __LITTLE_ENDIAN__  // FIXME
+#define betoh16(x) ntohs(x)
+#define betoh32(x) ntohl(x)
+
+#ifdef __LITTLE_ENDIAN__
 #if defined(__bswap_64)
-	return __bswap_64(x);
+#  define betoh64(x) __bswap_64(x)
 #elif defined(__DARWIN_OSSwapInt64)
-	return __DARWIN_OSSwapInt64(x);
+#  define betoh64(x) __DARWIN_OSSwapInt64(x)
 #else
+static inline uint64_t betoh64(uint64_t x) {
 	return	((x << 56) & 0xff00000000000000ULL ) |
 			((x << 40) & 0x00ff000000000000ULL ) |
 			((x << 24) & 0x0000ff0000000000ULL ) |
@@ -86,11 +93,12 @@ static inline uint64_t ntohll(uint64_t x) {
 			((x >> 24) & 0x0000000000ff0000ULL ) |
 			((x >> 40) & 0x000000000000ff00ULL ) |
 			((x >> 56) & 0x00000000000000ffULL ) ;
+}
 #endif
 #else
-	return x;
+#define betoh64(x) (x)
 #endif
-}
+
 
 typedef enum {
 	CS_HEADER            = 0x00,  // nil
@@ -212,9 +220,9 @@ int msgpack_unpacker_execute(msgpack_unpacker* ctx, const char* data, size_t len
 	((unsigned int)*p & 0x1f)
 
 #define PTR_CAST_8(ptr)   (*(uint8_t*)ptr)
-#define PTR_CAST_16(ptr)  ntohs(*(uint16_t*)ptr)
-#define PTR_CAST_32(ptr)  ntohl(*(uint32_t*)ptr)
-#define PTR_CAST_64(ptr)  ntohll(*(uint64_t*)ptr)
+#define PTR_CAST_16(ptr)  betoh16(*(uint16_t*)ptr)
+#define PTR_CAST_32(ptr)  betoh32(*(uint32_t*)ptr)
+#define PTR_CAST_64(ptr)  betoh64(*(uint64_t*)ptr)
 
 	if(p == pe) { goto _out; }
 	do {
@@ -434,5 +442,21 @@ _end:
 }
 
 
+#ifdef betoh16(x)
+#undef betoh16(x)
+#endif
+
+#ifdef betoh32(x)
+#undef betoh32(x)
+#endif
+
+#ifdef betoh64(x)
+#undef betoh64(x)
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* msgpack/unpack/inline_impl.h */