Stowage/msgpack-python
2
0
Fork 0
mirror of https://github.com/msgpack/msgpack-python.git synced 2025-11-09 05:51:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add use_tuple option that returns tuple for array object to Unpacker.

Browse source
This commit is contained in:
Naoki INADA 2009-12-17 11:13:47 +09:00
parent af7c4d2a60
commit 77e3e59620
2 changed files with 21 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

14
msgpack/unpack.h
View file

@ -20,6 +20,7 @@
#include "unpack_define.h"
typedef struct unpack_user {
int use_tuple;
} unpack_user;
@ -135,7 +136,8 @@ static inline int template_callback_false(unpack_user* u, msgpack_unpack_object*
static inline int template_callback_array(unpack_user* u, unsigned int n, msgpack_unpack_object* o)
{
PyObject *p = PyList_New(n);
PyObject *p = u->use_tuple ? PyTuple_New(n) : PyList_New(n);
if (!p)
return -1;
*o = p;
@ -143,7 +145,15 @@ static inline int template_callback_array(unpack_user* u, unsigned int n, msgpac
}
static inline int template_callback_array_item(unpack_user* u, unsigned int current, msgpack_unpack_object* c, msgpack_unpack_object o)
{ PyList_SET_ITEM(*c, current, o); return 0; }
{
if (u->use_tuple) {
PyTuple_SET_ITEM(*c, current, o);
}
else {
PyList_SET_ITEM(*c, current, o);
}
return 0;
}
static inline int template_callback_map(unpack_user* u, unsigned int n, msgpack_unpack_object* o)
{