generic-library/msgpack
1
0
Fork 0
mirror of https://github.com/msgpack/msgpack-c.git synced 2025-10-24 17:30:46 +02:00
Code Issues Projects Releases Wiki Activity

perl: tiny tweaks

Browse Source
This commit is contained in:
Fuji, Goro
2010-09-28 20:35:05 +09:00
parent cda1ca35a4
commit 01f944e6bd
1 changed files with 22 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
perl/xs-src/unpack.c
View File

@@ -242,14 +242,17 @@ STATIC_INLINE int template_callback_raw(unpack_user* u PERL_UNUSED_DECL, const c
#include "msgpack/unpack_template.h" #include "msgpack/unpack_template.h"
#define UNPACKER(from, name) \ #define UNPACKER(from, name) \
msgpack_unpack_t *name; \ msgpack_unpack_t *name; \
if(!(SvROK(from) && SvIOK(SvRV(from)))) { \ { \
Perl_croak(aTHX_ "Invalid unpacker instance for " #name); \ SV* const obj = from; \
} \ if(!(SvROK(obj) && SvIOK(SvRV(obj)))) { \
name = INT2PTR(msgpack_unpack_t*, SvIVX(SvRV((from)))); \ Perl_croak(aTHX_ "Invalid unpacker instance for " #name); \
if(name == NULL) { \ } \
Perl_croak(aTHX_ "NULL found for " # name " when shouldn't be."); \ name = INT2PTR(msgpack_unpack_t*, SvIVX(SvRV((obj)))); \
if(name == NULL) { \
Perl_croak(aTHX_ "NULL found for " # name " when shouldn't be"); \
} \
} }
XS(xs_unpack) { XS(xs_unpack) {
@@ -325,7 +328,7 @@ XS(xs_unpacker_new) {
XSRETURN(1); XSRETURN(1);
} }
STATIC_INLINE SV* STATIC_INLINE size_t
_execute_impl(SV* const self, SV* const data, UV const offset, UV const limit) { _execute_impl(SV* const self, SV* const data, UV const offset, UV const limit) {
dTHX; dTHX;
@@ -343,10 +346,9 @@ _execute_impl(SV* const self, SV* const data, UV const offset, UV const limit) {
if(ret < 0) { if(ret < 0) {
Perl_croak(aTHX_ "Data::MessagePack::Unpacker: parse error while executing"); Perl_croak(aTHX_ "Data::MessagePack::Unpacker: parse error while executing");
} else {
mp->user.finished = (ret > 0) ? true : false;
return sv_2mortal(newSVuv(from));
} }
mp->user.finished = (ret > 0) ? true : false;
return from;
} }
XS(xs_unpacker_execute) { XS(xs_unpacker_execute) {
@@ -365,9 +367,9 @@ XS(xs_unpacker_execute) {
Perl_croak(aTHX_ "Usage: $unpacker->execute(data, offset = 0)"); Perl_croak(aTHX_ "Usage: $unpacker->execute(data, offset = 0)");
} }
UNPACKER(self, mp); dXSTARG;
sv_setuv(TARG, _execute_impl(self, data, offset, sv_len(data)));
ST(0) = _execute_impl(self, data, offset, sv_len(data)); ST(0) = TARG;
XSRETURN(1); XSRETURN(1);
} }
@@ -382,7 +384,9 @@ XS(xs_unpacker_execute_limit) {
UV const offset = SvUVx(ST(2)); UV const offset = SvUVx(ST(2));
UV const limit = SvUVx(ST(3)); UV const limit = SvUVx(ST(3));
ST(0) = _execute_impl(self, data, offset, limit); dXSTARG;
sv_setuv(TARG, _execute_impl(self, data, offset, limit));
ST(0) = TARG;
XSRETURN(1); XSRETURN(1);
} }
@@ -417,7 +421,7 @@ XS(xs_unpacker_reset) {
UNPACKER(ST(0), mp); UNPACKER(ST(0), mp);
SV* const data = template_data(mp); SV* const data = template_data(mp);
sv_2mortal(data); SvREFCNT_dec(data);
_reset(ST(0)); _reset(ST(0));
XSRETURN(0); XSRETURN(0);
@@ -432,7 +436,7 @@ XS(xs_unpacker_destroy) {
UNPACKER(ST(0), mp); UNPACKER(ST(0), mp);
SV* const data = template_data(mp); SV* const data = template_data(mp);
sv_2mortal(data); SvREFCNT_dec(data);
Safefree(mp); Safefree(mp);
XSRETURN(0); XSRETURN(0);