Fix new version of msgpack.

methane · methane · commit 188da01777d8 · 2012-06-26T15:19:59.000+09:00
diff --git a/msgpack/unpack.h b/msgpack/unpack.h
@@ -16,7 +16,7 @@
  *    limitations under the License.
  */
 
-#define MSGPACK_MAX_STACK_SIZE  (1024)
+#define MSGPACK_EMBED_STACK_SIZE  (1024)
 #include "unpack_define.h"
 
 typedef struct unpack_user {
diff --git a/msgpack/unpack_template.h b/msgpack/unpack_template.h
@@ -48,6 +48,7 @@
 
 msgpack_unpack_struct_decl(_stack) {
 	msgpack_unpack_object obj;
+	size_t size;
 	size_t count;
 	unsigned int ct;
 	msgpack_unpack_object map_key;
@@ -140,9 +141,12 @@ msgpack_unpack_func(int, _execute)(msgpack_unpack_struct(_context)* ctx, const c
 #define start_container(func, count_, ct_) \
 	if(top >= MSGPACK_EMBED_STACK_SIZE) { goto _failed; } /* FIXME */ \
 	if(msgpack_unpack_callback(func)(user, count_, &stack[top].obj) < 0) { goto _failed; } \
-	if((count_) == 0) { obj = stack[top].obj; goto _push; } \
+	if((count_) == 0) { obj = stack[top].obj; \
+		msgpack_unpack_callback(func##_end)(user, &obj); \
+		goto _push; } \
 	stack[top].ct = ct_; \
-	stack[top].count = count_; \
+	stack[top].size  = count_; \
+	stack[top].count = 0; \
 	++top; \
 	/*printf("container %d count %d stack %d\n",stack[top].obj,count_,top);*/ \
 	/*printf("stack push %d\n", top);*/ \
@@ -336,9 +340,10 @@ msgpack_unpack_func(int, _execute)(msgpack_unpack_struct(_context)* ctx, const c
 	c = &stack[top-1];
 	switch(c->ct) {
 	case CT_ARRAY_ITEM:
-		if(msgpack_unpack_callback(_array_item)(user, &c->obj, obj) < 0) { goto _failed; }
-		if(--c->count == 0) {
+		if(msgpack_unpack_callback(_array_item)(user, c->count, &c->obj, obj) < 0) { goto _failed; }
+		if(++c->count == c->size) {
 			obj = c->obj;
+			msgpack_unpack_callback(_array_end)(user, &obj);
 			--top;
 			/*printf("stack pop %d\n", top);*/
 			goto _push;
@@ -350,8 +355,9 @@ msgpack_unpack_func(int, _execute)(msgpack_unpack_struct(_context)* ctx, const c
 		goto _header_again;
 	case CT_MAP_VALUE:
 		if(msgpack_unpack_callback(_map_item)(user, &c->obj, c->map_key, obj) < 0) { goto _failed; }
-		if(--c->count == 0) {
+		if(++c->count == c->size) {
 			obj = c->obj;
+			msgpack_unpack_callback(_map_end)(user, &obj);
 			--top;
 			/*printf("stack pop %d\n", top);*/
 			goto _push;
@@ -411,3 +417,4 @@ msgpack_unpack_func(int, _execute)(msgpack_unpack_struct(_context)* ctx, const c
 
 #undef NEXT_CS
 
+/* vim: set ts=4 sw=4 noexpandtab  */
diff --git a/setup.py b/setup.py
@@ -52,6 +52,7 @@ def __init__(self, *args, **kwargs):
 msgpack_mod = Extension('msgpack._msgpack',
                         sources=sources,
                         libraries=libraries,
+                        include_dirs=['.'],
                         )
 del sources, libraries
 

Original file line number	Diff line number	Diff line change
`@@ -52,6 +52,7 @@ def __init__(self, args, *kwargs):`
`52`	`52`	`msgpack_mod = Extension('msgpack._msgpack',`
`53`	`53`	`sources=sources,`
`54`	`54`	`libraries=libraries,`
	`55`	`+ include_dirs=['.'],`
`55`	`56`	`)`
`56`	`57`	`del sources, libraries`
`57`	`58`