Skip to content

Commit 4e9825b

Browse files
technigetechnige
committed
Integer fixes
1 parent c134c3a commit 4e9825b

File tree

4 files changed

+146
-50
lines changed

4 files changed

+146
-50
lines changed

‎src/v1/internal/buf.js

+19-19
Original file line numberDiff line numberDiff line change
@@ -57,50 +57,50 @@ class BaseBuffer
5757
* @param p
5858
*/
5959
getInt16 (p) {
60-
return this.getInt8(p) << 8
61-
| this.getUInt8(p + 1) & 0xFF;
60+
return this.getInt8(p) << 8
61+
| this.getUInt8(p + 1);
6262
}
6363

6464
/**
6565
* @param p
6666
*/
6767
getUInt16 (p) {
68-
return this.getUInt8(p) << 8
69-
| this.getUInt8(p + 1) & 0xFF;
68+
return this.getUInt8(p) << 8
69+
| this.getUInt8(p + 1);
7070
}
7171

7272
/**
7373
* @param p
7474
*/
7575
getInt32 (p) {
76-
return this.getInt8(p) << 24
77-
| this.getUInt8(p + 1) << 16 & 0xFF
78-
| this.getUInt8(p + 2) << 8 & 0xFF
79-
| this.getUInt8(p + 3) & 0xFF;
76+
return this.getInt8(p) << 24
77+
| this.getUInt8(p + 1) << 16
78+
| this.getUInt8(p + 2) << 8
79+
| this.getUInt8(p + 3);
8080
}
8181

8282
/**
8383
* @param p
8484
*/
8585
getUInt32 (p) {
8686
return this.getUInt8(p) << 24
87-
| this.getUInt8(p + 1) << 16 & 0xFF
88-
| this.getUInt8(p + 2) << 8 & 0xFF
89-
| this.getUInt8(p + 3) & 0xFF;
87+
| this.getUInt8(p + 1) << 16
88+
| this.getUInt8(p + 2) << 8
89+
| this.getUInt8(p + 3);
9090
}
9191

9292
/**
9393
* @param p
9494
*/
9595
getInt64 (p) {
9696
return this.getInt8(p) << 56
97-
| this.getUInt8(p + 1) << 48 & 0xFF
98-
| this.getUInt8(p + 2) << 40 & 0xFF
99-
| this.getUInt8(p + 3) << 32 & 0xFF
100-
| this.getUInt8(p + 4) << 24 & 0xFF
101-
| this.getUInt8(p + 5) << 16 & 0xFF
102-
| this.getUInt8(p + 6) << 8 & 0xFF
103-
| this.getUInt8(p + 7) & 0xFF;
97+
| this.getUInt8(p + 1) << 48
98+
| this.getUInt8(p + 2) << 40
99+
| this.getUInt8(p + 3) << 32
100+
| this.getUInt8(p + 4) << 24
101+
| this.getUInt8(p + 5) << 16
102+
| this.getUInt8(p + 6) << 8
103+
| this.getUInt8(p + 7);
104104
}
105105

106106
/**
@@ -119,7 +119,7 @@ class BaseBuffer
119119
*/
120120
putInt16 ( p, val ) {
121121
this.putInt8( p, val >> 8 );
122-
this.putUInt8( p + 1, val & 0xFF );
122+
this.putUInt8( p + 1, val & 0xFF );
123123
}
124124

125125
/**

‎src/v1/internal/packstream.js

+24-21
Original file line numberDiff line numberDiff line change
@@ -128,25 +128,26 @@ class Packer {
128128
var high = x.high,
129129
low = x.low;
130130

131-
this._ch.writeUInt8(INT_64);
132-
this._ch.writeUInt32( high );
133-
this._ch.writeUInt32( low );
134-
// TODO Use the branches below to sort out most efficient packed format
135-
// if (-0x10 <= x && x < 0x80) {
136-
// this._ch.writeUInt8(x);
137-
// } else if (-0x80 <= x && x < -0x10) {
138-
// this._ch.writeUInt8(INT_8);
139-
// this._ch.writeUInt8(x);
140-
// } else if (-0x8000 <= x && x < 0x8000) {
141-
// this._ch.writeUInt8(INT_16);
142-
// this._ch.writeInt16(x);
143-
// } else if (-0x80000000 <= x && x < 0x80000000) {
144-
// this._ch.writeUInt8(INT_32);
145-
// this._ch.writeInt32(x);
146-
// } else {
147-
//
148-
// }
149-
131+
if (x.greaterThanOrEqual(-0x10) && x.lessThan(0x80)) {
132+
this._ch.writeInt8(low);
133+
}
134+
else if (x.greaterThanOrEqual(-0x80) && x.lessThan(-0x10)) {
135+
this._ch.writeUInt8(INT_8);
136+
this._ch.writeInt8(low);
137+
}
138+
else if (x.greaterThanOrEqual(-0x8000) && x.lessThan(0x8000)) {
139+
this._ch.writeUInt8(INT_16);
140+
this._ch.writeInt16(low);
141+
}
142+
else if (x.greaterThanOrEqual(-0x80000000) && x.lessThan(0x80000000)) {
143+
this._ch.writeUInt8(INT_32);
144+
this._ch.writeInt32(low);
145+
}
146+
else {
147+
this._ch.writeUInt8(INT_64);
148+
this._ch.writeInt32(high);
149+
this._ch.writeInt32(low);
150+
}
150151
}
151152

152153
packFloat(x) {
@@ -303,10 +304,12 @@ class Unpacker {
303304
} else if (marker == INT_16) {
304305
return int(buffer.readInt16());
305306
} else if (marker == INT_32) {
306-
return int(buffer.readInt32());
307+
let b = buffer.readInt32();
308+
console.log(b);
309+
return int(b);
307310
} else if (marker == INT_64) {
308311
let high = buffer.readInt32();
309-
let low = buffer.readUInt32();
312+
let low = buffer.readInt32();
310313
return new Integer( low, high );
311314
} else if (marker == STRING_8) {
312315
return utf8.decode( buffer, buffer.readUInt8());

‎test/internal/buf.test.js

+84-5
Original file line numberDiff line numberDiff line change
@@ -40,15 +40,94 @@ describe('buffers', function() {
4040
expect(hex).toBe("01 08 0f 7f ");
4141
});
4242

43-
it('should read and write integers', function() {
43+
it('should read and write 8-bit unsigned integers', function() {
44+
// Given
45+
var b = alloc(1);
46+
47+
for (var i = 0; i < 7; i++) {
48+
var n = Math.pow(2, i);
49+
50+
// When
51+
b.putUInt8( 0, n );
52+
53+
// Then
54+
expect( b.getUInt8(0) ).toBe( n );
55+
}
56+
});
57+
58+
it('should read and write 16-bit unsigned integers', function() {
4459
// Given
4560
var b = alloc(2);
4661

47-
// When
48-
b.putInt16( 0, -1234 );
62+
for (var i = 0; i < 15; i++) {
63+
var n = Math.pow(2, i);
4964

50-
// Then
51-
expect( b.getInt16(0) ).toBe( -1234 );
65+
// When
66+
b.putUInt16( 0, n );
67+
68+
// Then
69+
expect( b.getUInt16(0) ).toBe( n );
70+
}
71+
});
72+
73+
it('should read and write 32-bit unsigned integers', function() {
74+
// Given
75+
var b = alloc(4);
76+
77+
for (var i = 0; i < 30; i++) {
78+
var n = Math.pow(2, i);
79+
80+
// When
81+
b.putUInt32( 0, n );
82+
83+
// Then
84+
expect( b.getUInt32(0) ).toBe( n );
85+
}
86+
});
87+
88+
it('should read and write 8-bit signed integers', function() {
89+
// Given
90+
var b = alloc(1);
91+
92+
for (var i = 0; i < 6; i++) {
93+
var n = Math.pow(2, i);
94+
95+
// When
96+
b.putInt8( 0, n );
97+
98+
// Then
99+
expect( b.getInt8(0) ).toBe( n );
100+
}
101+
});
102+
103+
it('should read and write 16-bit signed integers', function() {
104+
// Given
105+
var b = alloc(2);
106+
107+
for (var i = 0; i < 14; i++) {
108+
var n = Math.pow(2, i);
109+
110+
// When
111+
b.putInt16( 0, n );
112+
113+
// Then
114+
expect( b.getInt16(0) ).toBe( n );
115+
}
116+
});
117+
118+
it('should read and write 32-bit signed integers', function() {
119+
// Given
120+
var b = alloc(4);
121+
122+
for (var i = 0; i < 30; i++) {
123+
var n = Math.pow(2, i);
124+
125+
// When
126+
b.putInt32( 0, n );
127+
128+
// Then
129+
expect( b.getInt32(0) ).toBe( n );
130+
}
52131
});
53132

54133
it('should encode list correctly', function() {

‎test/internal/packstream.test.js

+19-5
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,30 @@
1919

2020
var alloc = require('../../lib/v1/internal/buf').alloc,
2121
packstream = require("../../lib/v1/internal/packstream.js"),
22+
integer = require("../../lib/v1/integer.js"),
2223
Packer = packstream.Packer,
2324
Unpacker = packstream.Unpacker,
24-
Structure = packstream.Structure;
25+
Structure = packstream.Structure,
26+
Integer = integer.Integer;
2527

2628
describe('packstream', function() {
2729
it('should pack integers', function() {
28-
// TODO: Test extremes - sorting out how to deal with integers > 32bit
29-
expect( packAndUnpack( 1234 ) ).toBe( 1234 );
30-
expect( packAndUnpack( 0 ) ).toBe( 0 );
31-
expect( packAndUnpack( -1234 ) ).toBe( -1234 );
30+
var n, i;
31+
// test small numbers
32+
//for(n = -999; n <= 999; n += 1) {
33+
// i = Integer.fromNumber(n);
34+
// expect( packAndUnpack( i ).toString() ).toBe( i.toString() );
35+
//}
36+
// positive numbers
37+
for(n = 16; n <= 16 ; n += 1) {
38+
i = Integer.fromNumber(Math.pow(2, n));
39+
expect( packAndUnpack( i ).toString() ).toBe( i.toString() );
40+
}
41+
// negative numbers
42+
//for(n = 0; n <= 63 ; n += 1) {
43+
// i = Integer.fromNumber(-Math.pow(2, n));
44+
// expect( packAndUnpack( i ).toString() ).toBe( i.toString() );
45+
//}
3246
});
3347
it('should pack strings', function() {
3448
expect( packAndUnpack( "" ) ).toBe( "" );

0 commit comments

Comments
 (0)