work in progress

This commit is contained in:
Isaikin Roman
2014-09-10 22:11:41 +04:00
parent 27e2bae3de
commit bf1f9977ce
4 changed files with 157 additions and 359 deletions
+114 -80
View File
@@ -19,7 +19,7 @@ MsgPackPrivate::type_parser_f MsgPackPrivate::unpackers[32] = {
QVariant MsgPackPrivate::unpack(quint8 *p, quint8 *end)
{
QVariantList d;
int typesz = 0;
quint32 typesz = 0;
while (p <= end) {
typesz = 0;
@@ -30,12 +30,12 @@ QVariant MsgPackPrivate::unpack(quint8 *p, quint8 *end)
if (p - end > 1)
return QVariant();
if (d.length() == 1)
return d[0];
// if (d.length() == 1)
// return d[0];
return d;
}
QVariant MsgPackPrivate::unpack_type(quint8 *p, int &sz)
QVariant MsgPackPrivate::unpack_type(quint8 *p, quint32 &sz)
{
QVariant d;
@@ -57,34 +57,54 @@ QVariant MsgPackPrivate::unpack_type(quint8 *p, int &sz)
return d;
}
QVariant MsgPackPrivate::unpack_positive_fixint(quint8 *p, int &sz)
QVariant MsgPackPrivate::unpack_positive_fixint(quint8 *p, quint32 &sz)
{
sz += 1;
quint32 val = (quint32)*p;
sz = 1;
return val;
}
QVariant MsgPackPrivate::unpack_negative_fixint(quint8 *p, int &sz)
QVariant MsgPackPrivate::unpack_negative_fixint(quint8 *p, quint32 &sz)
{
sz += 1;
quint8 val8 = (quint8)*p;
val8 &= ~((1 << 7) | (1 << 6) | (1 << 5));
qint32 val = 0xffffffff;
val &= (0xffffffe0 | val8);
sz = 1;
return val;
}
QVariant MsgPackPrivate::unpack_fixmap(quint8 *p, int &sz)
QVariant MsgPackPrivate::unpack_map_len(quint8 *p, quint32 &sz, quint32 len)
{
quint32 elemsz = 0;
QMap<QString, QVariant> map;
for (quint32 i = 0; i < len; ++i) {
elemsz = 0;
QVariant key = unpack_type(p, elemsz);
p += elemsz; sz += elemsz;
elemsz = 0;
QVariant val = unpack_type(p, elemsz);
p += elemsz; sz += elemsz;
map.insert(key.toString(), val);
}
return map;
}
QVariant MsgPackPrivate::unpack_array_len(quint8 *p, int &sz, int len)
QVariant MsgPackPrivate::unpack_fixmap(quint8 *p, quint32 &sz)
{
int elemsz = 0;
sz += 1;
quint32 len = (*p++) & 0x0f; // 0b00001111
return unpack_map_len(p, sz ,len);
}
QVariant MsgPackPrivate::unpack_array_len(quint8 *p, quint32 &sz, quint32 len)
{
quint32 elemsz = 0;
QVariantList arr;
for (int i = 0; i < len; ++i) {
for (quint32 i = 0; i < len; ++i) {
elemsz = 0;
arr.append(unpack_type(p, elemsz));
p += elemsz;
@@ -117,241 +137,255 @@ quint32 MsgPackPrivate::unpack_uint32(quint8 *p)
return val;
}
QVariant MsgPackPrivate::unpack_fixarray(quint8 *p, int &sz)
QVariant MsgPackPrivate::unpack_fixarray(quint8 *p, quint32 &sz)
{
int len = (*p++) & 0x0f; // 0b00001111
sz++;
sz += 1;
quint32 len = (*p++) & 0x0f; // 0b00001111
return unpack_array_len(p, sz, len);
}
QVariant MsgPackPrivate::unpack_fixstr(quint8 *p, int &sz)
QVariant MsgPackPrivate::unpack_fixstr(quint8 *p, quint32 &sz)
{
int len = (*p) & 0x1f; // 0b00011111
sz += 1;
quint32 len = (*p) & 0x1f; // 0b00011111
QString str = QString::fromUtf8((char*)(p + 1), len);
sz = len + 1;
sz += len;
return QVariant(str);
}
QVariant MsgPackPrivate::unpack_nil(quint8 *p, int &sz)
QVariant MsgPackPrivate::unpack_nil(quint8 *p, quint32 &sz)
{
Q_UNUSED(p)
sz = 1;
sz += 1;
return 0;
}
QVariant MsgPackPrivate::unpack_never_used(quint8 *p, int &sz)
QVariant MsgPackPrivate::unpack_never_used(quint8 *p, quint32 &sz)
{
Q_UNUSED(p)
sz = 1;
sz += 1;
return QVariant();
}
QVariant MsgPackPrivate::unpack_false(quint8 *p, int &sz)
QVariant MsgPackPrivate::unpack_false(quint8 *p, quint32 &sz)
{
Q_UNUSED(p)
sz = 1;
sz += 1;
return false;
}
QVariant MsgPackPrivate::unpack_true(quint8 *p, int &sz)
QVariant MsgPackPrivate::unpack_true(quint8 *p, quint32 &sz)
{
Q_UNUSED(p)
sz = 1;
sz += 1;
return true;
}
QVariant MsgPackPrivate::unpack_bin8(quint8 *p, int &sz)
QVariant MsgPackPrivate::unpack_bin8(quint8 *p, quint32 &sz)
{
sz += 2;
quint32 len = unpack_uint8(++p);
QByteArray arr((const char *)(++p), len);
sz = len + 2;
QByteArray arr((const char *)(p + 1), len);
sz += len;
return arr;
}
QVariant MsgPackPrivate::unpack_bin16(quint8 *p, int &sz)
QVariant MsgPackPrivate::unpack_bin16(quint8 *p, quint32 &sz)
{
sz += 3;
quint32 len = unpack_uint16(++p);
QByteArray arr((const char *)(++p), len);
sz = len + 2;
QByteArray arr((const char *)(p + 2), len);
sz += len;
return arr;
}
QVariant MsgPackPrivate::unpack_bin32(quint8 *p, int &sz)
QVariant MsgPackPrivate::unpack_bin32(quint8 *p, quint32 &sz)
{
sz += 5;
quint32 len = unpack_uint32(++p);
QByteArray arr((const char *)(++p), len);
sz = len + 2;
QByteArray arr((const char *)(p + 4), len);
sz = len;
return arr;
}
QVariant MsgPackPrivate::unpack_ext8(quint8 *p, int &sz)
QVariant MsgPackPrivate::unpack_ext8(quint8 *p, quint32 &sz)
{
}
QVariant MsgPackPrivate::unpack_ext16(quint8 *p, int &sz)
QVariant MsgPackPrivate::unpack_ext16(quint8 *p, quint32 &sz)
{
}
QVariant MsgPackPrivate::unpack_ext32(quint8 *p, int &sz)
QVariant MsgPackPrivate::unpack_ext32(quint8 *p, quint32 &sz)
{
}
QVariant MsgPackPrivate::unpack_float32(quint8 *p, int &sz)
QVariant MsgPackPrivate::unpack_float32(quint8 *p, quint32 &sz)
{
sz += 5;
float val = 0;
quint8 *vp = ( (quint8 *)&val ) + 3;
for (int i = 0; i < 4; ++i)
*(vp--) = *(++p);
sz = 5;
return val;
}
QVariant MsgPackPrivate::unpack_float64(quint8 *p, int &sz)
QVariant MsgPackPrivate::unpack_float64(quint8 *p, quint32 &sz)
{
sz += 9;
double val = 0;
quint8 *vp = ( (quint8 *)&val ) + 7;
for (int i = 0; i < 8; ++i)
*(vp--) = *(++p);
sz = 9;
return val;
}
QVariant MsgPackPrivate::unpack_uint8(quint8 *p, int &sz)
QVariant MsgPackPrivate::unpack_uint8(quint8 *p, quint32 &sz)
{
sz = 2;
sz += 2;
return unpack_uint8(++p);
}
QVariant MsgPackPrivate::unpack_uint16(quint8 *p, int &sz)
QVariant MsgPackPrivate::unpack_uint16(quint8 *p, quint32 &sz)
{
sz = 3;
sz += 3;
return unpack_uint16(++p);
}
QVariant MsgPackPrivate::unpack_uint32(quint8 *p, int &sz)
QVariant MsgPackPrivate::unpack_uint32(quint8 *p, quint32 &sz)
{
sz = 5;
sz += 5;
return unpack_uint32(++p);
}
QVariant MsgPackPrivate::unpack_uint64(quint8 *p, int &sz)
QVariant MsgPackPrivate::unpack_uint64(quint8 *p, quint32 &sz)
{
sz += 9;
quint64 val = 0;
for (int i = 56; i >= 0; i -= 8)
val |= (quint64)(*(++p)) << i;
sz = 9;
return val;
}
QVariant MsgPackPrivate::unpack_int8(quint8 *p, int &sz)
QVariant MsgPackPrivate::unpack_int8(quint8 *p, quint32 &sz)
{
sz += 2;
qint32 val = 0xffffff00;
val |= *(++p);
sz = 2;
return val;
}
QVariant MsgPackPrivate::unpack_int16(quint8 *p, int &sz)
QVariant MsgPackPrivate::unpack_int16(quint8 *p, quint32 &sz)
{
sz += 3;
qint32 val = 0xffff0000;
quint8 *pv = (quint8 *)&val;
pv[1] = *(++p); pv[0] = *(++p);
sz = 3;
return val;
}
QVariant MsgPackPrivate::unpack_int32(quint8 *p, int &sz)
QVariant MsgPackPrivate::unpack_int32(quint8 *p, quint32 &sz)
{
sz += 5;
qint32 val = 0;
quint8 *pv = (quint8 *)&val;
pv[3] = *(++p); pv[2] = *(++p);
pv[1] = *(++p); pv[0] = *(++p);
sz = 5;
return val;
}
QVariant MsgPackPrivate::unpack_int64(quint8 *p, int &sz)
QVariant MsgPackPrivate::unpack_int64(quint8 *p, quint32 &sz)
{
sz += 9;
qint64 val = 0;
for (int i = 56; i >= 0; i -= 8)
val |= (quint64)(*(++p)) << i;
sz = 9;
return val;
}
QVariant MsgPackPrivate::unpack_fixext1(quint8 *p, int &sz)
QVariant MsgPackPrivate::unpack_fixext1(quint8 *p, quint32 &sz)
{
}
QVariant MsgPackPrivate::unpack_fixext2(quint8 *p, int &sz)
QVariant MsgPackPrivate::unpack_fixext2(quint8 *p, quint32 &sz)
{
}
QVariant MsgPackPrivate::unpack_fixext4(quint8 *p, int &sz)
QVariant MsgPackPrivate::unpack_fixext4(quint8 *p, quint32 &sz)
{
}
QVariant MsgPackPrivate::unpack_fixext8(quint8 *p, int &sz)
QVariant MsgPackPrivate::unpack_fixext8(quint8 *p, quint32 &sz)
{
}
QVariant MsgPackPrivate::unpack_fixext16(quint8 *p, int &sz)
QVariant MsgPackPrivate::unpack_fixext16(quint8 *p, quint32 &sz)
{
}
QVariant MsgPackPrivate::unpack_str8(quint8 *p, int &sz)
QVariant MsgPackPrivate::unpack_str8(quint8 *p, quint32 &sz)
{
sz += 2;
quint32 len = unpack_uint8(++p);
QString str = QString::fromUtf8((char*)(p + 1), len);
sz = len + 1;
sz += len;
return QVariant(str);
}
QVariant MsgPackPrivate::unpack_str16(quint8 *p, int &sz)
QVariant MsgPackPrivate::unpack_str16(quint8 *p, quint32 &sz)
{
sz += 3;
quint32 len = unpack_uint16(++p);
QString str = QString::fromUtf8((char*)(p + 1), len);
sz = len + 1;
QString str = QString::fromUtf8((char*)(p + 2), len);
sz += len;
return QVariant(str);
}
QVariant MsgPackPrivate::unpack_str32(quint8 *p, int &sz)
QVariant MsgPackPrivate::unpack_str32(quint8 *p, quint32 &sz)
{
sz += 5;
quint32 len = unpack_uint32(++p);
QString str = QString::fromUtf8((char*)(p + 1), len);
sz = len + 1;
QString str = QString::fromUtf8((char*)(p + 4), len);
sz += len;
return QVariant(str);
}
QVariant MsgPackPrivate::unpack_array16(quint8 *p, int &sz)
QVariant MsgPackPrivate::unpack_array16(quint8 *p, quint32 &sz)
{
sz += 3;
quint32 len = unpack_uint16(++p);
return unpack_array_len(p, sz, len);
return unpack_array_len(p + 2, sz, len);
}
QVariant MsgPackPrivate::unpack_array32(quint8 *p, int &sz)
QVariant MsgPackPrivate::unpack_array32(quint8 *p, quint32 &sz)
{
sz += 5;
quint32 len = unpack_uint32(++p);
return unpack_array_len(p, sz, len);
return unpack_array_len(p + 4, sz, len);
}
QVariant MsgPackPrivate::unpack_map16(quint8 *p, int &sz)
QVariant MsgPackPrivate::unpack_map16(quint8 *p, quint32 &sz)
{
sz += 3;
quint32 len = unpack_uint16(p);
return unpack_map_len(p + 2, sz, len);
}
QVariant MsgPackPrivate::unpack_map32(quint8 *p, int &sz)
QVariant MsgPackPrivate::unpack_map32(quint8 *p, quint32 &sz)
{
sz += 5;
quint32 len = unpack_uint32(p);
return unpack_map_len(p + 4, sz, len);
}