yetangitu/bitjs
1
0
Fork 0
mirror of https://github.com/codedread/bitjs synced 2025-10-03 09:39:16 +02:00
Code Issues Releases Wiki Activity

Fix whitespace and style

Browse source
This commit is contained in:
codedread 2018-01-19 07:47:49 -08:00
parent ccf755e3db
commit e7ef46fb78
3 changed files with 77 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

26
archive/unrar.js
View file

@ -187,12 +187,13 @@ class RarVolumeHeader {
if ((rmode & 8) == 0) { if ((rmode & 8) == 0) {
continue; continue;
} }
if (I != 0) if (I != 0) {
bstream.readBits(16); bstream.readBits(16);
const count = (rmode & 3); }
for (let J = 0; J < count; ++J) { const count = (rmode & 3);
bstream.readBits(8); for (let J = 0; J < count; ++J) {
} bstream.readBits(8);
}
} }
} }
@ -330,15 +331,14 @@ function RarReadTables(bstream) {
let ZeroCount = bstream.readBits(4); let ZeroCount = bstream.readBits(4);
if (ZeroCount == 0) { if (ZeroCount == 0) {
BitLength[I] = 15; BitLength[I] = 15;
} } else {
else {
ZeroCount += 2; ZeroCount += 2;
while (ZeroCount-- > 0 && I < rBC) while (ZeroCount-- > 0 && I < rBC) {
BitLength[I++] = 0; BitLength[I++] = 0;
}
--I; --I;
} }
} } else {
else {
BitLength[I] = Length; BitLength[I] = Length;
} }
} }
@ -1303,9 +1303,9 @@ const unrar = function(arrayBuffer) {
const header = new RarVolumeHeader(bstream); const header = new RarVolumeHeader(bstream);
if (header.crc == 0x6152 && if (header.crc == 0x6152 &&
header.headType == 0x72 && header.headType == 0x72 &&
header.flags.value == 0x1A21 && header.flags.value == 0x1A21 &&
header.headSize == 7) { header.headSize == 7) {
info("Found RAR signature"); info("Found RAR signature");
const mhead = new RarVolumeHeader(bstream); const mhead = new RarVolumeHeader(bstream);

12
io/bitstream.js
View file

@ -25,8 +25,8 @@ bitjs.io.BitStream = class {
* @param {Number} opt_length The length of this BitStream * @param {Number} opt_length The length of this BitStream
*/ */
constructor(ab, rtl, opt_offset, opt_length) { constructor(ab, rtl, opt_offset, opt_length) {
if (!ab || !ab.toString || ab.toString() !== "[object ArrayBuffer]") { if (!ab || !ab.toString || ab.toString() !== '[object ArrayBuffer]') {
throw "Error! BitArray constructed with an invalid ArrayBuffer object"; throw 'Error! BitArray constructed with an invalid ArrayBuffer object';
} }
const offset = opt_offset || 0; const offset = opt_offset || 0;
@ -65,8 +65,8 @@ bitjs.io.BitStream = class {
// This could be considerably faster when reading more than 3 or 4 bits at a time. // This could be considerably faster when reading more than 3 or 4 bits at a time.
while (n > 0) { while (n > 0) {
if (bytePtr >= bytes.length) { if (bytePtr >= bytes.length) {
throw "Error! Overflowed the bit stream! n=" + n + ", bytePtr=" + bytePtr + ", bytes.length=" + throw 'Error! Overflowed the bit stream! n=' + n + ', bytePtr=' + bytePtr + ', bytes.length=' +
bytes.length + ", bitPtr=" + bitPtr; bytes.length + ', bitPtr=' + bitPtr;
return -1; return -1;
} }
@ -125,8 +125,8 @@ bitjs.io.BitStream = class {
// This could be considerably faster when reading more than 3 or 4 bits at a time. // This could be considerably faster when reading more than 3 or 4 bits at a time.
while (n > 0) { while (n > 0) {
if (bytePtr >= bytes.length) { if (bytePtr >= bytes.length) {
throw "Error! Overflowed the bit stream! n=" + n + ", bytePtr=" + bytePtr + ", bytes.length=" + throw 'Error! Overflowed the bit stream! n=' + n + ', bytePtr=' + bytePtr + ', bytes.length=' +
bytes.length + ", bitPtr=" + bitPtr; bytes.length + ', bitPtr=' + bitPtr;
return -1; return -1;
} }

116
tests/io-test.html
View file

@ -9,66 +9,66 @@
</head> </head>
<body> <body>
<script> <script>
var buffer; var buffer;
muther.go({ muther.go({
setUp: function() { setUp: function() {
buffer = new bitjs.io.ByteBuffer(10); buffer = new bitjs.io.ByteBuffer(10);
},
tests: {
testWriteNumberThenRead: function() {
buffer.writeNumber(1234, 4);
var stream = new bitjs.io.ByteStream(buffer.data);
muther.assertEquals(1234, stream.peekNumber(4));
}, },
tests: { testWriteUnsignedByteThenRead: function() {
testWriteNumberThenRead: function() { buffer.writeNumber(192, 1);
buffer.writeNumber(1234, 4); var stream = new bitjs.io.ByteStream(buffer.data);
var stream = new bitjs.io.ByteStream(buffer.data); muther.assertEquals(192, stream.readNumber(1));
muther.assertEquals(1234, stream.peekNumber(4));
},
testWriteUnsignedByteThenRead: function() {
buffer.writeNumber(192, 1);
var stream = new bitjs.io.ByteStream(buffer.data);
muther.assertEquals(192, stream.readNumber(1));
},
testWriteSignedByteThenRead: function() {
buffer.writeSignedNumber(-120, 1);
var stream = new bitjs.io.ByteStream(buffer.data);
muther.assertEquals(-120, stream.readSignedNumber(1));
},
testWriteSignedPositiveNumberThenRead: function() {
buffer.writeSignedNumber(1234, 4);
var stream = new bitjs.io.ByteStream(buffer.data);
muther.assertEquals(1234, stream.readSignedNumber(4));
},
testWriteSignedNegativeNumberThenRead: function() {
buffer.writeSignedNumber(-128, 1);
var stream = new bitjs.io.ByteStream(buffer.data);
muther.assertEquals(-128, stream.readSignedNumber(1));
},
testWriteOverflowUnsigned: function() {
var passed = false;
try {
buffer.writeNumber(256, 1);
} catch(e) {
passed = true;
}
muther.assert(passed);
},
testWriteOverflowSignedPositive: function() {
var passed = false;
try {
buffer.writeSignedNumber(128, 1);
} catch(e) {
passed = true;
}
muther.assert(passed);
},
testWriteOverflowSignedNegative: function() {
var passed = false;
try {
buffer.writeSignedNumber(-129, 1);
} catch(e) {
passed = true;
}
muther.assert(passed);
},
}, },
}); testWriteSignedByteThenRead: function() {
buffer.writeSignedNumber(-120, 1);
var stream = new bitjs.io.ByteStream(buffer.data);
muther.assertEquals(-120, stream.readSignedNumber(1));
},
testWriteSignedPositiveNumberThenRead: function() {
buffer.writeSignedNumber(1234, 4);
var stream = new bitjs.io.ByteStream(buffer.data);
muther.assertEquals(1234, stream.readSignedNumber(4));
},
testWriteSignedNegativeNumberThenRead: function() {
buffer.writeSignedNumber(-128, 1);
var stream = new bitjs.io.ByteStream(buffer.data);
muther.assertEquals(-128, stream.readSignedNumber(1));
},
testWriteOverflowUnsigned: function() {
var passed = false;
try {
buffer.writeNumber(256, 1);
} catch(e) {
passed = true;
}
muther.assert(passed);
},
testWriteOverflowSignedPositive: function() {
var passed = false;
try {
buffer.writeSignedNumber(128, 1);
} catch(e) {
passed = true;
}
muther.assert(passed);
},
testWriteOverflowSignedNegative: function() {
var passed = false;
try {
buffer.writeSignedNumber(-129, 1);
} catch(e) {
passed = true;
}
muther.assert(passed);
},
},
});
</script> </script>
</body> </body>
</html> </html>