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

Use C++ function templating for skip()/construct()

Browse source
This commit is contained in:
Joel Nothman 2012-09-25 00:30:15 +10:00
parent 96ed236c1d
commit d56e2b2c8a
4 changed files with 27 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

23
msgpack/_msgpack.pyx
View file

@ -208,8 +208,10 @@ cdef extern from "unpack.h":
unsigned int ct
PyObject* key
int template_execute(template_context* ctx, const_char_ptr data,
size_t len, size_t* off, bint construct) except -1
ctypedef int (*execute_fn)(template_context* ctx, const_char_ptr data,
size_t len, size_t* off) except -1
execute_fn template_construct
execute_fn template_skip
void template_init(template_context* ctx)
object template_data(template_context* ctx)
@ -257,7 +259,7 @@ def unpackb(object packed, object object_hook=None, object list_hook=None,
if not PyCallable_Check(list_hook):
raise TypeError("list_hook must be a callable.")
ctx.user.list_hook = <PyObject*>list_hook
ret = template_execute(&ctx, buf, buf_len, &off, 1)
ret = template_construct(&ctx, buf, buf_len, &off)
if ret == 1:
obj = template_data(&ctx)
if off < buf_len:
@ -455,16 +457,13 @@ cdef class Unpacker(object):
else:
self.file_like = None
cdef object _unpack(self, bint construct):
cdef object _unpack(self, execute_fn execute):
cdef int ret
cdef object obj
while 1:
ret = template_execute(&self.ctx, self.buf, self.buf_tail, &self.buf_head, construct)
ret = execute(&self.ctx, self.buf, self.buf_tail, &self.buf_head)
if ret == 1:
if construct:
obj = template_data(&self.ctx)
else:
obj = None
obj = template_data(&self.ctx)
template_init(&self.ctx)
return obj
elif ret == 0:
@ -477,17 +476,17 @@ cdef class Unpacker(object):
def unpack(self):
"""unpack one object"""
return self._unpack(1)
return self._unpack(template_construct)
def skip(self):
"""read and ignore one object, returning None"""
return self._unpack(0)
return self._unpack(template_skip)
def __iter__(self):
return self
def __next__(self):
return self._unpack(1)
return self._unpack(template_construct)
# for debug.
#def _buf(self):