Skip to content

Fix map handling in .js and .codec.js to match .base.js #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Fix map handling in .js and .codec.js to match .base.js #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 3 additions & 12 deletions msgpack.codec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ function encode(rv, // @param ByteArray: result
// inner - decoder
function decode() { // @return Mix:
var size, i, iz, c, num = 0,
sign, exp, frac, ary, hash,
sign, exp, frac, ary, key, hash,
buf = _buf, type = buf[++_idx];

if (type >= 0xe0) { // Negative FixNum (111x xxxx) (-32 ~ -1)
Expand Down Expand Up @@ -344,17 +344,8 @@ function decode() { // @return Mix:
case 0x80: hash = {};
while (num--) {
// make key/value pair
size = buf[++_idx] - 0xa0;

for (ary = [], i = _idx, iz = i + size; i < iz; ) {
c = buf[++i]; // lead byte
ary.push(c < 0x80 ? c : // ASCII(0x00 ~ 0x7f)
c < 0xe0 ? ((c & 0x1f) << 6 | (buf[++i] & 0x3f)) :
((c & 0x0f) << 12 | (buf[++i] & 0x3f) << 6
| (buf[++i] & 0x3f)));
}
_idx = i;
hash[_toString.apply(null, ary)] = decode();
key = decode();
hash[key] = decode();
}
return hash;
// 0xdd: array32, 0xdc: array16, 0x90: array
Expand Down
15 changes: 3 additions & 12 deletions msgpack.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ function encode(rv, // @param ByteArray: result
// inner - decoder
function decode() { // @return Mix:
var size, i, iz, c, num = 0,
sign, exp, frac, ary, hash,
sign, exp, frac, ary, key, hash,
buf = _buf, type = buf[++_idx];

if (type >= 0xe0) { // Negative FixNum (111x xxxx) (-32 ~ -1)
Expand Down Expand Up @@ -359,17 +359,8 @@ function decode() { // @return Mix:
case 0x80: hash = {};
while (num--) {
// make key/value pair
size = buf[++_idx] - 0xa0;

for (ary = [], i = _idx, iz = i + size; i < iz; ) {
c = buf[++i]; // lead byte
ary.push(c < 0x80 ? c : // ASCII(0x00 ~ 0x7f)
c < 0xe0 ? ((c & 0x1f) << 6 | (buf[++i] & 0x3f)) :
((c & 0x0f) << 12 | (buf[++i] & 0x3f) << 6
| (buf[++i] & 0x3f)));
}
_idx = i;
hash[_toString.apply(null, ary)] = decode();
key = decode();
hash[key] = decode();
}
return hash;
// 0xdd: array32, 0xdc: array16, 0x90: array
Expand Down