Stowage/msgpack-python
2
0
Fork 0
mirror of https://github.com/msgpack/msgpack-python.git synced 2025-10-19 20:03:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix new version of msgpack.

Browse source
This commit is contained in:
INADA Naoki 2012-06-26 15:19:59 +09:00
parent 812c8bcff4
commit 188da01777
3 changed files with 14 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
msgpack/unpack.h
View file

@ -16,7 +16,7 @@
* limitations under the License. * limitations under the License.
*/ */
#define MSGPACK_MAX_STACK_SIZE (1024) #define MSGPACK_EMBED_STACK_SIZE (1024)
#include "unpack_define.h" #include "unpack_define.h"
typedef struct unpack_user { typedef struct unpack_user {

17
msgpack/unpack_template.h
View file

@ -48,6 +48,7 @@
msgpack_unpack_struct_decl(_stack) { msgpack_unpack_struct_decl(_stack) {
msgpack_unpack_object obj; msgpack_unpack_object obj;
size_t size;
size_t count; size_t count;
unsigned int ct; unsigned int ct;
msgpack_unpack_object map_key; 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_) \ #define start_container(func, count_, ct_) \
if(top >= MSGPACK_EMBED_STACK_SIZE) { goto _failed; } /* FIXME */ \ if(top >= MSGPACK_EMBED_STACK_SIZE) { goto _failed; } /* FIXME */ \
if(msgpack_unpack_callback(func)(user, count_, &stack[top].obj) < 0) { goto _failed; } \ 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].ct = ct_; \
stack[top].count = count_; \ stack[top].size = count_; \
stack[top].count = 0; \
++top; \ ++top; \
/*printf("container %d count %d stack %d\n",stack[top].obj,count_,top);*/ \ /*printf("container %d count %d stack %d\n",stack[top].obj,count_,top);*/ \
/*printf("stack push %d\n", top);*/ \ /*printf("stack push %d\n", top);*/ \
@ -336,9 +340,10 @@ _push:
c = &stack[top-1]; c = &stack[top-1];
switch(c->ct) { switch(c->ct) {
case CT_ARRAY_ITEM: case CT_ARRAY_ITEM:
if(msgpack_unpack_callback(_array_item)(user, &c->obj, obj) < 0) { goto _failed; } if(msgpack_unpack_callback(_array_item)(user, c->count, &c->obj, obj) < 0) { goto _failed; }
if(--c->count == 0) { if(++c->count == c->size) {
obj = c->obj; obj = c->obj;
msgpack_unpack_callback(_array_end)(user, &obj);
--top; --top;
/*printf("stack pop %d\n", top);*/ /*printf("stack pop %d\n", top);*/
goto _push; goto _push;
@ -350,8 +355,9 @@ _push:
goto _header_again; goto _header_again;
case CT_MAP_VALUE: case CT_MAP_VALUE:
if(msgpack_unpack_callback(_map_item)(user, &c->obj, c->map_key, obj) < 0) { goto _failed; } 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; obj = c->obj;
msgpack_unpack_callback(_map_end)(user, &obj);
--top; --top;
/*printf("stack pop %d\n", top);*/ /*printf("stack pop %d\n", top);*/
goto _push; goto _push;
@ -411,3 +417,4 @@ _end:
#undef NEXT_CS #undef NEXT_CS
/* vim: set ts=4 sw=4 noexpandtab */

1
setup.py
View file

@ -52,6 +52,7 @@ if sys.platform == 'win32':
msgpack_mod = Extension('msgpack._msgpack', msgpack_mod = Extension('msgpack._msgpack',
sources=sources, sources=sources,
libraries=libraries, libraries=libraries,
include_dirs=['.'],
) )
del sources, libraries del sources, libraries