rroonga 4.0.3-x86-mingw32 → 4.0.4-x86-mingw32

data/vendor/local/include/msgpack/unpack_define.h

@@ -41,13 +41,14 @@ typedef enum {
 	//CS_                = 0x02,  // false
 	//CS_                = 0x03,  // true
 
-	//CS_                = 0x04,
-	//CS_                = 0x05,
-	//CS_                = 0x06,
-	//CS_                = 0x07,
+	CS_BIN_8             = 0x04,
+	CS_BIN_16            = 0x05,
+	CS_BIN_32            = 0x06,
+
+	//CS_EXT_8           = 0x07,
+	//CS_EXT_16          = 0x08,
+	//CS_EXT_32          = 0x09,
 
-	//CS_                = 0x08,
-	//CS_                = 0x09,
 	CS_FLOAT             = 0x0a,
 	CS_DOUBLE            = 0x0b,
 	CS_UINT_8            = 0x0c,
@@ -59,14 +60,15 @@ typedef enum {
 	CS_INT_32            = 0x12,
 	CS_INT_64            = 0x13,
 
-	//CS_                = 0x14,
-	//CS_                = 0x15,
-	//CS_BIG_INT_16        = 0x16,
-	//CS_BIG_INT_32        = 0x17,
-	//CS_BIG_FLOAT_16      = 0x18,
-	//CS_BIG_FLOAT_32      = 0x19,
-	CS_RAW_16            = 0x1a,
-	CS_RAW_32            = 0x1b,
+	//CS_FIXEXT_1        = 0x14,
+	//CS_FIXEXT_2        = 0x15,
+	//CS_FIXEXT_4        = 0x16,
+	//CS_FIXEXT_8        = 0x17,
+	//CS_FIXEXT_16       = 0x18,
+
+	CS_RAW_8             = 0x19, // str8
+	CS_RAW_16            = 0x1a, // str16
+	CS_RAW_32            = 0x1b, // str32
 	CS_ARRAY_16          = 0x1c,
 	CS_ARRAY_32          = 0x1d,
 	CS_MAP_16            = 0x1e,

data/vendor/local/include/msgpack/unpack_template.h

@@ -201,9 +201,10 @@ msgpack_unpack_func(int, _execute)(msgpack_unpack_struct(_context)* ctx, const c
 					push_simple_value(_false);
 				case 0xc3:  // true
 					push_simple_value(_true);
-				//case 0xc4:
-				//case 0xc5:
-				//case 0xc6:
+				case 0xc4: // bin 8
+				case 0xc5: // bin 16
+				case 0xc6: // bin 32
+					again_fixed_trail(NEXT_CS(p), 1 << (((unsigned int)*p) & 0x03));
 				//case 0xc7:
 				//case 0xc8:
 				//case 0xc9:
@@ -223,14 +224,15 @@ msgpack_unpack_func(int, _execute)(msgpack_unpack_struct(_context)* ctx, const c
 				//case 0xd6:  // big integer 16
 				//case 0xd7:  // big integer 32
 				//case 0xd8:  // big float 16
-				//case 0xd9:  // big float 32
-				case 0xda:  // raw 16
-				case 0xdb:  // raw 32
+				case 0xd9:  // raw 8 (str 8)
+				case 0xda:  // raw 16 (str 16)
+				case 0xdb:  // raw 32 (str 32)
+					again_fixed_trail(NEXT_CS(p), 1 << ((((unsigned int)*p) & 0x03) - 1));
 				case 0xdc:  // array 16
 				case 0xdd:  // array 32
 				case 0xde:  // map 16
 				case 0xdf:  // map 32
-					again_fixed_trail(NEXT_CS(p), 2 << (((unsigned int)*p) & 0x01));
+					again_fixed_trail(NEXT_CS(p), 2u << (((unsigned int)*p) & 0x01));
 				default:
 					goto _failed;
 				}
@@ -263,6 +265,10 @@ msgpack_unpack_func(int, _execute)(msgpack_unpack_struct(_context)* ctx, const c
 			case CS_DOUBLE: {
 					union { uint64_t i; double f; } mem;
 					mem.i = _msgpack_load64(uint64_t,n);
+#if defined(__arm__) && !(__ARM_EABI__) // arm-oabi
+                    // https://github.com/msgpack/msgpack-perl/pull/1
+                    mem.i = (mem.i & 0xFFFFFFFFUL) << 32UL | (mem.i >> 32UL);
+#endif
 					push_fixed_value(_double, mem.f); }
 			case CS_UINT_8:
 				push_fixed_value(_uint8, *(uint8_t*)n);
@@ -302,8 +308,13 @@ msgpack_unpack_func(int, _execute)(msgpack_unpack_struct(_context)* ctx, const c
 			//	// FIXME
 			//	push_variable_value(_big_float, data, n, trail);
 
+			case CS_BIN_8:
+			case CS_RAW_8:
+				again_fixed_trail_if_zero(ACS_RAW_VALUE, *(uint8_t*)n, _raw_zero);
+			case CS_BIN_16:
 			case CS_RAW_16:
 				again_fixed_trail_if_zero(ACS_RAW_VALUE, _msgpack_load16(uint16_t,n), _raw_zero);
+			case CS_BIN_32:
 			case CS_RAW_32:
 				again_fixed_trail_if_zero(ACS_RAW_VALUE, _msgpack_load32(uint32_t,n), _raw_zero);
 			case ACS_RAW_VALUE:
@@ -386,7 +397,7 @@ _end:
 	ctx->cs = cs;
 	ctx->trail = trail;
 	ctx->top = top;
-	*off = p - (const unsigned char*)data;
+	*off = (size_t)(p - (const unsigned char*)data);
 
 	return ret;
 }

data/vendor/local/include/msgpack/version.h

@@ -27,7 +27,7 @@ const char* msgpack_version(void);
 int msgpack_version_major(void);
 int msgpack_version_minor(void);
 
-#define MSGPACK_VERSION "0.5.7"
+#define MSGPACK_VERSION "0.5.9"
 #define MSGPACK_VERSION_MAJOR 0
 #define MSGPACK_VERSION_MINOR 5
 

data/vendor/local/include/msgpack/vrefbuffer.h

@@ -77,16 +77,16 @@ void msgpack_vrefbuffer_destroy(msgpack_vrefbuffer* vbuf);
 static inline msgpack_vrefbuffer* msgpack_vrefbuffer_new(size_t ref_size, size_t chunk_size);
 static inline void msgpack_vrefbuffer_free(msgpack_vrefbuffer* vbuf);
 
-static inline int msgpack_vrefbuffer_write(void* data, const char* buf, unsigned int len);
+static inline int msgpack_vrefbuffer_write(void* data, const char* buf, size_t len);
 
 static inline const struct iovec* msgpack_vrefbuffer_vec(const msgpack_vrefbuffer* vref);
 static inline size_t msgpack_vrefbuffer_veclen(const msgpack_vrefbuffer* vref);
 
 int msgpack_vrefbuffer_append_copy(msgpack_vrefbuffer* vbuf,
-		const char* buf, unsigned int len);
+		const char* buf, size_t len);
 
 int msgpack_vrefbuffer_append_ref(msgpack_vrefbuffer* vbuf,
-		const char* buf, unsigned int len);
+		const char* buf, size_t len);
 
 int msgpack_vrefbuffer_migrate(msgpack_vrefbuffer* vbuf, msgpack_vrefbuffer* to);
 
@@ -95,9 +95,10 @@ void msgpack_vrefbuffer_clear(msgpack_vrefbuffer* vref);
 /** @} */
 
 
-msgpack_vrefbuffer* msgpack_vrefbuffer_new(size_t ref_size, size_t chunk_size)
+static inline msgpack_vrefbuffer* msgpack_vrefbuffer_new(size_t ref_size, size_t chunk_size)
 {
 	msgpack_vrefbuffer* vbuf = (msgpack_vrefbuffer*)malloc(sizeof(msgpack_vrefbuffer));
+	if (vbuf == NULL) return NULL;
 	if(!msgpack_vrefbuffer_init(vbuf, ref_size, chunk_size)) {
 		free(vbuf);
 		return NULL;
@@ -105,14 +106,14 @@ msgpack_vrefbuffer* msgpack_vrefbuffer_new(size_t ref_size, size_t chunk_size)
 	return vbuf;
 }
 
-void msgpack_vrefbuffer_free(msgpack_vrefbuffer* vbuf)
+static inline void msgpack_vrefbuffer_free(msgpack_vrefbuffer* vbuf)
 {
 	if(vbuf == NULL) { return; }
 	msgpack_vrefbuffer_destroy(vbuf);
 	free(vbuf);
 }
 
-int msgpack_vrefbuffer_write(void* data, const char* buf, unsigned int len)
+static inline int msgpack_vrefbuffer_write(void* data, const char* buf, size_t len)
 {
 	msgpack_vrefbuffer* vbuf = (msgpack_vrefbuffer*)data;
 
@@ -123,14 +124,14 @@ int msgpack_vrefbuffer_write(void* data, const char* buf, unsigned int len)
 	}
 }
 
-const struct iovec* msgpack_vrefbuffer_vec(const msgpack_vrefbuffer* vref)
+static inline const struct iovec* msgpack_vrefbuffer_vec(const msgpack_vrefbuffer* vref)
 {
 	return vref->array;
 }
 
-size_t msgpack_vrefbuffer_veclen(const msgpack_vrefbuffer* vref)
+static inline size_t msgpack_vrefbuffer_veclen(const msgpack_vrefbuffer* vref)
 {
-	return vref->tail - vref->array;
+	return (size_t)(vref->tail - vref->array);
 }
 
 

data/vendor/local/include/msgpack/vrefbuffer.hpp

@@ -29,7 +29,9 @@ public:
 	vrefbuffer(size_t ref_size = MSGPACK_VREFBUFFER_REF_SIZE,
 			size_t chunk_size = MSGPACK_VREFBUFFER_CHUNK_SIZE)
 	{
-		msgpack_vrefbuffer_init(this, ref_size, chunk_size);
+		if (!msgpack_vrefbuffer_init(this, ref_size, chunk_size)) {
+			throw std::bad_alloc();
+		}
 	}
 
 	~vrefbuffer()
@@ -38,7 +40,7 @@ public:
 	}
 
 public:
-	void write(const char* buf, unsigned int len)
+	void write(const char* buf, size_t len)
 	{
 		if(len < base::ref_size) {
 			append_copy(buf, len);

data/vendor/local/include/msgpack/zbuffer.h

@@ -65,7 +65,7 @@ static inline char* msgpack_zbuffer_release_buffer(msgpack_zbuffer* zbuf);
 #define MSGPACK_ZBUFFER_RESERVE_SIZE 512
 #endif
 
-static inline int msgpack_zbuffer_write(void* data, const char* buf, unsigned int len);
+static inline int msgpack_zbuffer_write(void* data, const char* buf, size_t len);
 
 static inline bool msgpack_zbuffer_expand(msgpack_zbuffer* zbuf);
 
@@ -91,6 +91,7 @@ void msgpack_zbuffer_destroy(msgpack_zbuffer* zbuf)
 msgpack_zbuffer* msgpack_zbuffer_new(int level, size_t init_size)
 {
 	msgpack_zbuffer* zbuf = (msgpack_zbuffer*)malloc(sizeof(msgpack_zbuffer));
+	if (zbuf == NULL) return NULL;
 	if(!msgpack_zbuffer_init(zbuf, level, init_size)) {
 		free(zbuf);
 		return NULL;
@@ -123,7 +124,7 @@ bool msgpack_zbuffer_expand(msgpack_zbuffer* zbuf)
 	return true;
 }
 
-int msgpack_zbuffer_write(void* data, const char* buf, unsigned int len)
+int msgpack_zbuffer_write(void* data, const char* buf, size_t len)
 {
 	msgpack_zbuffer* zbuf = (msgpack_zbuffer*)data;
 

data/vendor/local/include/msgpack/zbuffer.hpp

@@ -29,7 +29,9 @@ public:
 	zbuffer(int level = Z_DEFAULT_COMPRESSION,
 			size_t init_size = MSGPACK_ZBUFFER_INIT_SIZE)
 	{
-		msgpack_zbuffer_init(this, level, init_size);
+		if (!msgpack_zbuffer_init(this, level, init_size)) {
+			throw std::bad_alloc();
+		}
 	}
 
 	~zbuffer()
@@ -38,7 +40,7 @@ public:
 	}
 
 public:
-	void write(const char* buf, unsigned int len)
+	void write(const char* buf, size_t len)
 	{
 		if(msgpack_zbuffer_write(this, buf, len) < 0) {
 			throw std::bad_alloc();

data/vendor/local/include/msgpack/zone.h

@@ -90,20 +90,21 @@ void* msgpack_zone_malloc_expand(msgpack_zone* zone, size_t size);
 
 void* msgpack_zone_malloc_no_align(msgpack_zone* zone, size_t size)
 {
+	char* ptr;
 	msgpack_zone_chunk_list* cl = &zone->chunk_list;
 
 	if(zone->chunk_list.free < size) {
 		return msgpack_zone_malloc_expand(zone, size);
 	}
 
-	char* ptr = cl->ptr;
+	ptr = cl->ptr;
 	cl->free -= size;
 	cl->ptr  += size;
 
 	return ptr;
 }
 
-void* msgpack_zone_malloc(msgpack_zone* zone, size_t size)
+static inline void* msgpack_zone_malloc(msgpack_zone* zone, size_t size)
 {
 	return msgpack_zone_malloc_no_align(zone,
 			((size)+((MSGPACK_ZONE_ALIGN)-1)) & ~((MSGPACK_ZONE_ALIGN)-1));
@@ -113,7 +114,7 @@ void* msgpack_zone_malloc(msgpack_zone* zone, size_t size)
 bool msgpack_zone_push_finalizer_expand(msgpack_zone* zone,
 		void (*func)(void* data), void* data);
 
-bool msgpack_zone_push_finalizer(msgpack_zone* zone,
+static inline bool msgpack_zone_push_finalizer(msgpack_zone* zone,
 		void (*func)(void* data), void* data)
 {
 	msgpack_zone_finalizer_array* const fa = &zone->finalizer_array;
@@ -131,7 +132,7 @@ bool msgpack_zone_push_finalizer(msgpack_zone* zone,
 	return true;
 }
 
-void msgpack_zone_swap(msgpack_zone* a, msgpack_zone* b)
+static inline void msgpack_zone_swap(msgpack_zone* a, msgpack_zone* b)
 {
 	msgpack_zone tmp = *a;
 	*a = *b;

data/vendor/local/include/msgpack/zone.hpp

@@ -44,7 +44,16 @@ public:
 	void clear();
 
 	void swap(zone& o);
-
+	static void* operator new(std::size_t size) throw(std::bad_alloc)
+	{
+		void* p = ::malloc(size);
+		if (!p) throw std::bad_alloc();
+		return p;
+	}
+	static void operator delete(void *p) throw()
+	{
+		::free(p);
+	}
 	
 	template <typename T>
 	T* allocate();

data/vendor/local/lib/groonga/plugins/query_expanders/tsv.la

@@ -1,5 +1,5 @@
 # tsv.la - a libtool library file
-# Generated by libtool (GNU libtool) 2.4.2 Debian-2.4.2-1.2
+# Generated by libtool (GNU libtool) 2.4.2 Debian-2.4.2-1.10
 #
 # Please DO NOT delete this file!
 # It is necessary for linking the library.

data/vendor/local/lib/groonga/plugins/suggest/suggest.la

@@ -1,5 +1,5 @@
 # suggest.la - a libtool library file
-# Generated by libtool (GNU libtool) 2.4.2 Debian-2.4.2-1.2
+# Generated by libtool (GNU libtool) 2.4.2 Debian-2.4.2-1.10
 #
 # Please DO NOT delete this file!
 # It is necessary for linking the library.

data/vendor/local/lib/groonga/plugins/table/table.la

@@ -1,5 +1,5 @@
 # table.la - a libtool library file
-# Generated by libtool (GNU libtool) 2.4.2 Debian-2.4.2-1.2
+# Generated by libtool (GNU libtool) 2.4.2 Debian-2.4.2-1.10
 #
 # Please DO NOT delete this file!
 # It is necessary for linking the library.

data/vendor/local/lib/groonga/plugins/tokenizers/mecab.la

@@ -1,5 +1,5 @@
 # mecab.la - a libtool library file
-# Generated by libtool (GNU libtool) 2.4.2 Debian-2.4.2-1.2
+# Generated by libtool (GNU libtool) 2.4.2 Debian-2.4.2-1.10
 #
 # Please DO NOT delete this file!
 # It is necessary for linking the library.
@@ -17,7 +17,7 @@ old_library='mecab.a'
 inherited_linker_flags=''
 
 # Libraries that this one depends upon.
-dependency_libs=' -L/home/kou/work/c/groonga.clean/packages/windows/dist-x86/lib /home/kou/work/c/groonga.clean/packages/windows/dist-x86/lib/libmecab.la /home/kou/work/c/groonga.clean/packages/windows/dist-x86/lib/libgroonga.la /home/kou/work/c/groonga.clean/packages/windows/dist-x86/lib/libmsgpack.la -lws2_32'
+dependency_libs=' -L/home/kou/work/c/groonga.clean/packages/windows/dist-x86/lib /home/kou/work/c/groonga.clean/packages/windows/dist-x86/lib/libmecab.la -lpthread /home/kou/work/c/groonga.clean/packages/windows/dist-x86/lib/libgroonga.la /home/kou/work/c/groonga.clean/packages/windows/dist-x86/lib/libmsgpack.la -lws2_32'
 
 # Names of additional weak libraries provided by this library
 weak_library_names=''

data/vendor/local/lib/libgroonga.la

@@ -1,5 +1,5 @@
 # libgroonga.la - a libtool library file
-# Generated by libtool (GNU libtool) 2.4.2 Debian-2.4.2-1.2
+# Generated by libtool (GNU libtool) 2.4.2 Debian-2.4.2-1.10
 #
 # Please DO NOT delete this file!
 # It is necessary for linking the library.

data/vendor/local/lib/libmecab.la

@@ -1,5 +1,5 @@
 # libmecab.la - a libtool library file
-# Generated by ltmain.sh (GNU libtool) 2.2.6 Debian-2.2.6a-1ubuntu1
+# Generated by libtool (GNU libtool) 2.4.2 Debian-2.4.2-1.10
 #
 # Please DO NOT delete this file!
 # It is necessary for linking the library.
@@ -17,7 +17,7 @@ old_library='libmecab.a'
 inherited_linker_flags=''
 
 # Libraries that this one depends upon.
-dependency_libs=''
+dependency_libs=' -lpthread'
 
 # Names of additional weak libraries provided by this library
 weak_library_names=''

data/vendor/local/lib/libmsgpack.la

@@ -1,5 +1,5 @@
 # libmsgpack.la - a libtool library file
-# Generated by libtool (GNU libtool) 2.4.2 Debian-2.4.2-1.7
+# Generated by libtool (GNU libtool) 2.4.2 Debian-2.4.2-1.10
 #
 # Please DO NOT delete this file!
 # It is necessary for linking the library.

data/vendor/local/lib/libmsgpackc.la

@@ -1,5 +1,5 @@
 # libmsgpackc.la - a libtool library file
-# Generated by libtool (GNU libtool) 2.4.2 Debian-2.4.2-1.7
+# Generated by libtool (GNU libtool) 2.4.2 Debian-2.4.2-1.10
 #
 # Please DO NOT delete this file!
 # It is necessary for linking the library.