Skip to content

Commit 2396a06

Browse files
committed
msgpack: sort code constants and use typed code
1 parent 3b7d3b9 commit 2396a06

File tree

2 files changed

+15
-15
lines changed

2 files changed

+15
-15
lines changed

msgpack/msgpack.go

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,15 @@ const (
1111
fixStringCodeMin = 0xa0
1212
fixStringCodeMax = 0xbf
1313
nilCode = 0xc0
14-
unusedCode = 0xc1
14+
unusedCode = 0xc1 // never used
1515
falseCode = 0xc2
1616
trueCode = 0xc3
17+
binary8Code = 0xc4
18+
binary16Code = 0xc5
19+
binary32Code = 0xc6
20+
ext8Code = 0xc7
21+
ext16Code = 0xc8
22+
ext32Code = 0xc9
1723
float32Code = 0xca
1824
float64Code = 0xcb
1925
uint8Code = 0xcc
@@ -24,24 +30,18 @@ const (
2430
int16Code = 0xd1
2531
int32Code = 0xd2
2632
int64Code = 0xd3
33+
fixext1Code = 0xd4
34+
fixext2Code = 0xd5
35+
fixext4Code = 0xd6
36+
fixext8Code = 0xd7
37+
fixext16Code = 0xd8
2738
string8Code = 0xd9
2839
string16Code = 0xda
2940
string32Code = 0xdb
30-
binary8Code = 0xc4
31-
binary16Code = 0xc5
32-
binary32Code = 0xc6
3341
array16Code = 0xdc
3442
array32Code = 0xdd
3543
map16Code = 0xde
3644
map32Code = 0xdf
37-
fixext1Code = 0xd4
38-
fixext2Code = 0xd5
39-
fixext4Code = 0xd6
40-
fixext8Code = 0xd7
41-
fixext16Code = 0xd8
42-
ext8Code = 0xc7
43-
ext16Code = 0xc8
44-
ext32Code = 0xc9
4545
negFixIntCodeMin = 0xe0
4646
negFixIntCodeMax = 0xff
4747
)

msgpack/unpack.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -252,15 +252,15 @@ var formats = [256]*struct {
252252
},
253253
fixMapCodeMin: {
254254
t: MapLen,
255-
n: func(d *Decoder, code byte) (uint64, error) { return uint64(code) - fixMapCodeMin, nil },
255+
n: func(d *Decoder, code byte) (uint64, error) { return uint64(code) - uint64(fixMapCodeMin), nil },
256256
},
257257
fixArrayCodeMin: {
258258
t: ArrayLen,
259-
n: func(d *Decoder, code byte) (uint64, error) { return uint64(code) - fixArrayCodeMin, nil },
259+
n: func(d *Decoder, code byte) (uint64, error) { return uint64(code) - uint64(fixArrayCodeMin), nil },
260260
},
261261
fixStringCodeMin: {
262262
t: String,
263-
n: func(d *Decoder, code byte) (uint64, error) { return uint64(code) - fixStringCodeMin, nil },
263+
n: func(d *Decoder, code byte) (uint64, error) { return uint64(code) - uint64(fixStringCodeMin), nil },
264264
more: true,
265265
},
266266
negFixIntCodeMin: {

0 commit comments

Comments
 (0)