generic-library/msgpack
1
0
Fork 0
mirror of https://github.com/msgpack/msgpack-c.git synced 2025-04-16 06:56:39 +02:00
Code Issues Projects Releases Wiki Activity

Remove unneccessary value.

Browse Source
This commit is contained in:
Naoki INADA 2009-06-24 01:13:39 +09:00
parent 99d0a41ec6
commit dd53b141ef
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
python/msgpack/unpack.h
View File

@ -25,14 +25,8 @@
using namespace std; using namespace std;
struct array_context {
unsigned int size;
unsigned int last;
array_context(unsigned int size) : size(size), last(0)
{}
};
struct unpack_user { struct unpack_user {
stack<array_context> array_stack; stack<unsigned int> array_stack;
map<string, PyObject*> str_cache; map<string, PyObject*> str_cache;
~unpack_user() { ~unpack_user() {
@ -116,7 +110,7 @@ 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) static inline int template_callback_array(unpack_user* u, unsigned int n, msgpack_unpack_object* o)
{ {
if (n > 0) { if (n > 0) {
u->array_stack.push(array_context(n)); u->array_stack.push(0);
*o = PyList_New(n); *o = PyList_New(n);
} }
else { else {
@ -127,12 +121,12 @@ static inline int template_callback_array(unpack_user* u, unsigned int n, msgpac
static inline int template_callback_array_item(unpack_user* u, msgpack_unpack_object* c, msgpack_unpack_object o) static inline int template_callback_array_item(unpack_user* u, msgpack_unpack_object* c, msgpack_unpack_object o)
{ {
unsigned int n = u->array_stack.top().size; unsigned int &last = u->array_stack.top();
unsigned int &last = u->array_stack.top().last; PyList_SET_ITEM(*c, last, o);
PyList_SetItem(*c, last, o);
last++; last++;
if (last >= n) {
Py_ssize_t len = PyList_GET_SIZE(*c);
if (last >= len) {
u->array_stack.pop(); u->array_stack.pop();
} }
return 0; return 0;