Skip to content

Commit

Permalink
Incorporate endianness into buffer.read* function names instead of pa…
Browse files Browse the repository at this point in the history 
…ssing in a boolean flag
  • Loading branch information
@mscdex @bnoordhuis
mscdex authored and bnoordhuis committed Aug 12, 2011
1 parent a002f4f commit b7c23ac
Show file tree
Hide file tree
Showing 11 changed files with 595 additions and 499 deletions.
256 changes: 147 additions & 109 deletions doc/api/buffers.markdown
View file

Large diffs are not rendered by default.

466 changes: 263 additions & 203 deletions lib/buffer.js
View file

Large diffs are not rendered by default.

14 changes: 6 additions & 8 deletions lib/buffer_ieee754.js
View file
Expand Up @@ -30,15 +30,14 @@
//
// Modifications to writeIEEE754 to support negative zeroes made by Brian White

exports.readIEEE754 = function(buffer, offset, endian, mLen, nBytes) {
exports.readIEEE754 = function(buffer, offset, isBE, mLen, nBytes) {
var e, m,
bBE = endian,
eLen = nBytes * 8 - mLen - 1,
eMax = (1 << eLen) - 1,
eBias = eMax >> 1,
nBits = -7,
i = bBE ? 0 : (nBytes - 1),
d = bBE ? 1 : -1,
i = isBE ? 0 : (nBytes - 1),
d = isBE ? 1 : -1,
s = buffer[offset + i];

i += d;
Expand All @@ -64,15 +63,14 @@ exports.readIEEE754 = function(buffer, offset, endian, mLen, nBytes) {
return (s ? -1 : 1) * m * Math.pow(2, e - mLen);
};

exports.writeIEEE754 = function(buffer, value, offset, endian, mLen, nBytes) {
exports.writeIEEE754 = function(buffer, value, offset, isBE, mLen, nBytes) {
var e, m, c,
bBE = endian,
eLen = nBytes * 8 - mLen - 1,
eMax = (1 << eLen) - 1,
eBias = eMax >> 1,
rt = (mLen === 23 ? Math.pow(2, -24) - Math.pow(2, -77) : 0),
i = bBE ? (nBytes-1) : 0,
d = bBE ? -1 : 1,
i = isBE ? (nBytes-1) : 0,
d = isBE ? -1 : 1,
s = value < 0 || (value === 0 && 1 / value < 0) ? 1 : 0;

value = Math.abs(value);
Expand Down
61 changes: 31 additions & 30 deletions test/simple/test-readdouble.js
View file
Expand Up @@ -8,6 +8,7 @@ var ASSERT = require('assert');
*/
function test() {
var buffer = new Buffer(8);

buffer[0] = 0x55;
buffer[1] = 0x55;
buffer[2] = 0x55;
Expand All @@ -16,8 +17,8 @@ function test() {
buffer[5] = 0x55;
buffer[6] = 0xd5;
buffer[7] = 0x3f;
ASSERT.equal(1.1945305291680097e+103, buffer.readDouble(0, true));
ASSERT.equal(0.3333333333333333, buffer.readDouble(0, false));
ASSERT.equal(1.1945305291680097e+103, buffer.readDoubleBE(0));
ASSERT.equal(0.3333333333333333, buffer.readDoubleLE(0));

buffer[0] = 1;
buffer[1] = 0;
Expand All @@ -27,18 +28,18 @@ function test() {
buffer[5] = 0;
buffer[6] = 0xf0;
buffer[7] = 0x3f;
ASSERT.equal(7.291122019655968e-304, buffer.readDouble(0, true));
ASSERT.equal(1.0000000000000002, buffer.readDouble(0, false));
ASSERT.equal(7.291122019655968e-304, buffer.readDoubleBE(0));
ASSERT.equal(1.0000000000000002, buffer.readDoubleLE(0));

buffer[0] = 2;
ASSERT.equal(4.778309726801735e-299, buffer.readDouble(0, true));
ASSERT.equal(1.0000000000000004, buffer.readDouble(0, false));
ASSERT.equal(4.778309726801735e-299, buffer.readDoubleBE(0));
ASSERT.equal(1.0000000000000004, buffer.readDoubleLE(0));

buffer[0] = 1;
buffer[6] = 0;
buffer[7] = 0;
ASSERT.equal(7.291122019556398e-304, buffer.readDouble(0, true));
ASSERT.equal(5e-324, buffer.readDouble(0, false));
ASSERT.equal(7.291122019556398e-304, buffer.readDoubleBE(0));
ASSERT.equal(5e-324, buffer.readDoubleLE(0));

buffer[0] = 0xff;
buffer[1] = 0xff;
Expand All @@ -48,13 +49,13 @@ function test() {
buffer[5] = 0xff;
buffer[6] = 0x0f;
buffer[7] = 0x00;
ASSERT.ok(isNaN(buffer.readDouble(0, true)));
ASSERT.equal(2.225073858507201e-308, buffer.readDouble(0, false));
ASSERT.ok(isNaN(buffer.readDoubleBE(0)));
ASSERT.equal(2.225073858507201e-308, buffer.readDoubleLE(0));

buffer[6] = 0xef;
buffer[7] = 0x7f;
ASSERT.ok(isNaN(buffer.readDouble(0, true)));
ASSERT.equal(1.7976931348623157e+308, buffer.readDouble(0, false));
ASSERT.ok(isNaN(buffer.readDoubleBE(0)));
ASSERT.equal(1.7976931348623157e+308, buffer.readDoubleLE(0));

buffer[0] = 0;
buffer[1] = 0;
Expand All @@ -64,42 +65,42 @@ function test() {
buffer[5] = 0;
buffer[6] = 0xf0;
buffer[7] = 0x3f;
ASSERT.equal(3.03865e-319, buffer.readDouble(0, true));
ASSERT.equal(1, buffer.readDouble(0, false));
ASSERT.equal(3.03865e-319, buffer.readDoubleBE(0));
ASSERT.equal(1, buffer.readDoubleLE(0));

buffer[6] = 0;
buffer[7] = 0x40;
ASSERT.equal(3.16e-322, buffer.readDouble(0, true));
ASSERT.equal(2, buffer.readDouble(0, false));
ASSERT.equal(3.16e-322, buffer.readDoubleBE(0));
ASSERT.equal(2, buffer.readDoubleLE(0));

buffer[7] = 0xc0;
ASSERT.equal(9.5e-322, buffer.readDouble(0, true));
ASSERT.equal(-2, buffer.readDouble(0, false));
ASSERT.equal(9.5e-322, buffer.readDoubleBE(0));
ASSERT.equal(-2, buffer.readDoubleLE(0));

buffer[6] = 0x10;
buffer[7] = 0;
ASSERT.equal(2.0237e-320, buffer.readDouble(0, true));
ASSERT.equal(2.2250738585072014e-308, buffer.readDouble(0, false));
ASSERT.equal(2.0237e-320, buffer.readDoubleBE(0));
ASSERT.equal(2.2250738585072014e-308, buffer.readDoubleLE(0));

buffer[6] = 0;
ASSERT.equal(0, buffer.readDouble(0, true));
ASSERT.equal(0, buffer.readDouble(0, false));
ASSERT.equal(false, 1/buffer.readDouble(0, false)<0);
ASSERT.equal(0, buffer.readDoubleBE(0));
ASSERT.equal(0, buffer.readDoubleLE(0));
ASSERT.equal(false, 1/buffer.readDoubleLE(0)<0);

buffer[7] = 0x80;
ASSERT.equal(6.3e-322, buffer.readDouble(0, true));
ASSERT.equal(0, buffer.readDouble(0, false));
ASSERT.equal(true, 1/buffer.readDouble(0, false)<0);
ASSERT.equal(6.3e-322, buffer.readDoubleBE(0));
ASSERT.equal(0, buffer.readDoubleLE(0));
ASSERT.equal(true, 1/buffer.readDoubleLE(0)<0);

buffer[6] = 0xf0;
buffer[7] = 0x7f;
ASSERT.equal(3.0418e-319, buffer.readDouble(0, true));
ASSERT.equal(Infinity, buffer.readDouble(0, false));
ASSERT.equal(3.0418e-319, buffer.readDoubleBE(0));
ASSERT.equal(Infinity, buffer.readDoubleLE(0));

buffer[6] = 0xf0;
buffer[7] = 0xff;
ASSERT.equal(3.04814e-319, buffer.readDouble(0, true));
ASSERT.equal(-Infinity, buffer.readDouble(0, false));
ASSERT.equal(3.04814e-319, buffer.readDoubleBE(0));
ASSERT.equal(-Infinity, buffer.readDoubleLE(0));
}


Expand Down
37 changes: 19 additions & 18 deletions test/simple/test-readfloat.js
View file
Expand Up @@ -8,60 +8,61 @@ var ASSERT = require('assert');
*/
function test() {
var buffer = new Buffer(4);

buffer[0] = 0;
buffer[1] = 0;
buffer[2] = 0x80;
buffer[3] = 0x3f;
ASSERT.equal(4.600602988224807e-41, buffer.readFloat(0, true));
ASSERT.equal(1, buffer.readFloat(0, false));
ASSERT.equal(4.600602988224807e-41, buffer.readFloatBE(0));
ASSERT.equal(1, buffer.readFloatLE(0));

buffer[0] = 0;
buffer[1] = 0;
buffer[2] = 0;
buffer[3] = 0xc0;
ASSERT.equal(2.6904930515036488e-43, buffer.readFloat(0, true));
ASSERT.equal(-2, buffer.readFloat(0, false));
ASSERT.equal(2.6904930515036488e-43, buffer.readFloatBE(0));
ASSERT.equal(-2, buffer.readFloatLE(0));

buffer[0] = 0xff;
buffer[1] = 0xff;
buffer[2] = 0x7f;
buffer[3] = 0x7f;
ASSERT.ok(isNaN(buffer.readFloat(0, true)));
ASSERT.equal(3.4028234663852886e+38, buffer.readFloat(0, false));
ASSERT.ok(isNaN(buffer.readFloatBE(0)));
ASSERT.equal(3.4028234663852886e+38, buffer.readFloatLE(0));

buffer[0] = 0xab;
buffer[1] = 0xaa;
buffer[2] = 0xaa;
buffer[3] = 0x3e;
ASSERT.equal(-1.2126478207002966e-12, buffer.readFloat(0, true));
ASSERT.equal(0.3333333432674408, buffer.readFloat(0, false));
ASSERT.equal(-1.2126478207002966e-12, buffer.readFloatBE(0));
ASSERT.equal(0.3333333432674408, buffer.readFloatLE(0));

buffer[0] = 0;
buffer[1] = 0;
buffer[2] = 0;
buffer[3] = 0;
ASSERT.equal(0, buffer.readFloat(0, true));
ASSERT.equal(0, buffer.readFloat(0, false));
ASSERT.equal(false, 1/buffer.readFloat(0, false)<0);
ASSERT.equal(0, buffer.readFloatBE(0));
ASSERT.equal(0, buffer.readFloatLE(0));
ASSERT.equal(false, 1/buffer.readFloatLE(0)<0);

buffer[3] = 0x80;
ASSERT.equal(1.793662034335766e-43, buffer.readFloat(0, true));
ASSERT.equal(0, buffer.readFloat(0, false));
ASSERT.equal(true, 1/buffer.readFloat(0, false)<0);
ASSERT.equal(1.793662034335766e-43, buffer.readFloatBE(0));
ASSERT.equal(0, buffer.readFloatLE(0));
ASSERT.equal(true, 1/buffer.readFloatLE(0)<0);

buffer[0] = 0;
buffer[1] = 0;
buffer[2] = 0x80;
buffer[3] = 0x7f;
ASSERT.equal(4.609571298396486e-41, buffer.readFloat(0, true));
ASSERT.equal(Infinity, buffer.readFloat(0, false));
ASSERT.equal(4.609571298396486e-41, buffer.readFloatBE(0));
ASSERT.equal(Infinity, buffer.readFloatLE(0));

buffer[0] = 0;
buffer[1] = 0;
buffer[2] = 0x80;
buffer[3] = 0xff;
ASSERT.equal(4.627507918739843e-41, buffer.readFloat(0, true));
ASSERT.equal(-Infinity, buffer.readFloat(0, false));
ASSERT.equal(4.627507918739843e-41, buffer.readFloatBE(0));
ASSERT.equal(-Infinity, buffer.readFloatLE(0));
}


Expand Down
68 changes: 32 additions & 36 deletions test/simple/test-readint.js
View file
Expand Up @@ -10,39 +10,34 @@ function test8() {
var data = new Buffer(4);

data[0] = 0x23;
ASSERT.equal(0x23, data.readInt8(0, true));
ASSERT.equal(0x23, data.readInt8(0, false));
ASSERT.equal(0x23, data.readInt8(0));

data[0] = 0xff;
ASSERT.equal(-1, data.readInt8(0, true));
ASSERT.equal(-1, data.readInt8(0, false));
ASSERT.equal(-1, data.readInt8(0));

data[0] = 0x87;
data[1] = 0xab;
data[2] = 0x7c;
data[3] = 0xef;
ASSERT.equal(-121, data.readInt8(0, true));
ASSERT.equal(-85, data.readInt8(1, true));
ASSERT.equal(124, data.readInt8(2, true));
ASSERT.equal(-17, data.readInt8(3, true));
ASSERT.equal(-121, data.readInt8(0, false));
ASSERT.equal(-85, data.readInt8(1, false));
ASSERT.equal(124, data.readInt8(2, false));
ASSERT.equal(-17, data.readInt8(3, false));
ASSERT.equal(-121, data.readInt8(0));
ASSERT.equal(-85, data.readInt8(1));
ASSERT.equal(124, data.readInt8(2));
ASSERT.equal(-17, data.readInt8(3));
}


function test16() {
var buffer = new Buffer(6);

buffer[0] = 0x16;
buffer[1] = 0x79;
ASSERT.equal(0x1679, buffer.readInt16(0, true));
ASSERT.equal(0x7916, buffer.readInt16(0, false));
ASSERT.equal(0x1679, buffer.readInt16BE(0));
ASSERT.equal(0x7916, buffer.readInt16LE(0));

buffer[0] = 0xff;
buffer[1] = 0x80;
ASSERT.equal(-128, buffer.readInt16(0, true));
ASSERT.equal(-32513, buffer.readInt16(0, false));
ASSERT.equal(-128, buffer.readInt16BE(0));
ASSERT.equal(-32513, buffer.readInt16LE(0));

/* test offset with weenix */
buffer[0] = 0x77;
Expand All @@ -51,47 +46,48 @@ function test16() {
buffer[3] = 0x6e;
buffer[4] = 0x69;
buffer[5] = 0x78;
ASSERT.equal(0x7765, buffer.readInt16(0, true));
ASSERT.equal(0x6565, buffer.readInt16(1, true));
ASSERT.equal(0x656e, buffer.readInt16(2, true));
ASSERT.equal(0x6e69, buffer.readInt16(3, true));
ASSERT.equal(0x6978, buffer.readInt16(4, true));
ASSERT.equal(0x6577, buffer.readInt16(0, false));
ASSERT.equal(0x6565, buffer.readInt16(1, false));
ASSERT.equal(0x6e65, buffer.readInt16(2, false));
ASSERT.equal(0x696e, buffer.readInt16(3, false));
ASSERT.equal(0x7869, buffer.readInt16(4, false));
ASSERT.equal(0x7765, buffer.readInt16BE(0));
ASSERT.equal(0x6565, buffer.readInt16BE(1));
ASSERT.equal(0x656e, buffer.readInt16BE(2));
ASSERT.equal(0x6e69, buffer.readInt16BE(3));
ASSERT.equal(0x6978, buffer.readInt16BE(4));
ASSERT.equal(0x6577, buffer.readInt16LE(0));
ASSERT.equal(0x6565, buffer.readInt16LE(1));
ASSERT.equal(0x6e65, buffer.readInt16LE(2));
ASSERT.equal(0x696e, buffer.readInt16LE(3));
ASSERT.equal(0x7869, buffer.readInt16LE(4));
}


function test32() {
var buffer = new Buffer(6);

buffer[0] = 0x43;
buffer[1] = 0x53;
buffer[2] = 0x16;
buffer[3] = 0x79;
ASSERT.equal(0x43531679, buffer.readInt32(0, true));
ASSERT.equal(0x79165343, buffer.readInt32(0, false));
ASSERT.equal(0x43531679, buffer.readInt32BE(0));
ASSERT.equal(0x79165343, buffer.readInt32LE(0));

buffer[0] = 0xff;
buffer[1] = 0xfe;
buffer[2] = 0xef;
buffer[3] = 0xfa;
ASSERT.equal(-69638, buffer.readInt32(0, true));
ASSERT.equal(-84934913, buffer.readInt32(0, false));
ASSERT.equal(-69638, buffer.readInt32BE(0));
ASSERT.equal(-84934913, buffer.readInt32LE(0));

buffer[0] = 0x42;
buffer[1] = 0xc3;
buffer[2] = 0x95;
buffer[3] = 0xa9;
buffer[4] = 0x36;
buffer[5] = 0x17;
ASSERT.equal(0x42c395a9, buffer.readInt32(0, true));
ASSERT.equal(-1013601994, buffer.readInt32(1, true));
ASSERT.equal(-1784072681, buffer.readInt32(2, true));
ASSERT.equal(-1449802942, buffer.readInt32(0, false));
ASSERT.equal(917083587, buffer.readInt32(1, false));
ASSERT.equal(389458325, buffer.readInt32(2, false));
ASSERT.equal(0x42c395a9, buffer.readInt32BE(0));
ASSERT.equal(-1013601994, buffer.readInt32BE(1));
ASSERT.equal(-1784072681, buffer.readInt32BE(2));
ASSERT.equal(-1449802942, buffer.readInt32LE(0));
ASSERT.equal(917083587, buffer.readInt32LE(1));
ASSERT.equal(389458325, buffer.readInt32LE(2));
}


Expand Down

0 comments on commit b7c23ac

Please sign in to comment.