Skip to content

Commit edece35

Browse files
keichikeichi
authored
Merge pull request #181 from keichi/const-let
Use let and const instead of var
2 parents 062c982 + 1d3b30f commit edece35

File tree

11 files changed

+310
-298
lines changed

11 files changed

+310
-298
lines changed

‎benchmark/bench.js‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
var binary = require("binary");
2-
var Benchmark = require("benchmark");
3-
var bp = require("binparse").bp;
4-
var Parser = require("../dist/binary_parser").Parser;
5-
var Destruct = require("destruct-js");
1+
const binary = require("binary");
2+
const Benchmark = require("benchmark");
3+
const bp = require("binparse").bp;
4+
const Parser = require("../dist/binary_parser").Parser;
5+
const Destruct = require("destruct-js");
66
const Struct = require("structron");
77

8-
var suite = new Benchmark.Suite();
8+
const suite = new Benchmark.Suite();
99

1010
// binparse
1111
const PointParser = bp.object("Point", {
@@ -52,11 +52,11 @@ const PointsStruct = new Struct()
5252
);
5353

5454
// Prepare input
55-
var n = 1000;
56-
var buf = Buffer.alloc(4 + n * 2 * 3);
55+
const n = 1000;
56+
const buf = Buffer.alloc(4 + n * 2 * 3);
5757

5858
buf.writeUInt32LE(n, 0);
59-
for (var i = 0; i < n; i++) {
59+
for (let i = 0; i < n; i++) {
6060
buf.writeUInt16LE(123, i * 6 + 0 + 4);
6161
buf.writeUInt16LE(456, i * 6 + 2 + 4);
6262
buf.writeUInt16LE(789, i * 6 + 4 + 4);
@@ -65,9 +65,9 @@ for (var i = 0; i < n; i++) {
6565
// Run benchmarks
6666
suite
6767
.add("hand-written", function () {
68-
n = buf.readUInt32LE(0);
68+
const n = buf.readUInt32LE(0);
6969
const points = [];
70-
for (var i = 0; i < n; i++) {
70+
for (let i = 0; i < n; i++) {
7171
points.push({
7272
x: buf.readUInt16LE(i * 6 + 0 + 4),
7373
y: buf.readUInt16LE(i * 6 + 2 + 4),

‎example/bmp.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
var Parser = require("../dist/binary_parser").Parser;
1+
const Parser = require("../dist/binary_parser").Parser;
22

33
// C structure BITMAPFILEHEADER
44
// typedef struct tagBITMAPFILEHEADER {
@@ -8,7 +8,7 @@ var Parser = require("../dist/binary_parser").Parser;
88
// WORD bfReserved2;
99
// DWORD bfOffBits;
1010
// } BITMAPFILEHEADER, *PBITMAPFILEHEADER;
11-
var bmpFileHeader = new Parser()
11+
const bmpFileHeader = new Parser()
1212
.endianess("little")
1313
.string("type", {
1414
length: 2,
@@ -33,7 +33,7 @@ var bmpFileHeader = new Parser()
3333
// DWORD biClrUsed;
3434
// DWORD biClrImportant;
3535
// } BITMAPINFOHEADER;
36-
var bmpInfoHeader = new Parser()
36+
const bmpInfoHeader = new Parser()
3737
.endianess("little")
3838
.uint32("size")
3939
.int32("width")
@@ -47,7 +47,7 @@ var bmpInfoHeader = new Parser()
4747
.uint32("clrUsed")
4848
.uint32("clrImportant");
4949

50-
var bmpFile = new Parser()
50+
const bmpFile = new Parser()
5151
.nest("fileHeader", {
5252
type: bmpFileHeader,
5353
})

‎example/classfile.js‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,52 @@
1-
var Parser = require("../dist/binary_parser").Parser;
1+
const Parser = require("../dist/binary_parser").Parser;
22

3-
var ConstantClassInfo = Parser.start().uint16be("name_index");
3+
const ConstantClassInfo = Parser.start().uint16be("name_index");
44

5-
var ConstantFieldrefInfo = Parser.start()
5+
const ConstantFieldrefInfo = Parser.start()
66
.uint16be("class_index")
77
.uint16be("name_and_type_index");
88

9-
var ConstantMethodrefInfo = Parser.start()
9+
const ConstantMethodrefInfo = Parser.start()
1010
.uint16be("class_index")
1111
.uint16be("name_and_type_index");
1212

13-
var ConstantInterfaceMethodrefInfo = Parser.start()
13+
const ConstantInterfaceMethodrefInfo = Parser.start()
1414
.uint16be("class_index")
1515
.uint16be("name_and_type_index");
1616

17-
var ConstantStringInfo = Parser.start().uint16be("string_index");
17+
const ConstantStringInfo = Parser.start().uint16be("string_index");
1818

19-
var ConstantIntegerInfo = Parser.start().uint32be("bytes");
19+
const ConstantIntegerInfo = Parser.start().uint32be("bytes");
2020

21-
var ConstantFloatInfo = Parser.start().uint32be("bytes");
21+
const ConstantFloatInfo = Parser.start().uint32be("bytes");
2222

23-
var ConstantLongInfo = Parser.start()
23+
const ConstantLongInfo = Parser.start()
2424
.uint32be("high_bytes")
2525
.uint32be("low_bytes");
2626

27-
var ConstantDoubleInfo = Parser.start()
27+
const ConstantDoubleInfo = Parser.start()
2828
.uint32be("high_bytes")
2929
.uint32be("low_bytes");
3030

31-
var ConstantNameAndTypeInfo = Parser.start()
31+
const ConstantNameAndTypeInfo = Parser.start()
3232
.uint16be("name_index")
3333
.uint16be("descriptor_index");
3434

35-
var ConstantUtf8Info = Parser.start()
35+
const ConstantUtf8Info = Parser.start()
3636
.uint16be("len")
3737
.string("bytes", { length: "len" });
3838

39-
var ConstantMethodHandleInfo = Parser.start()
39+
const ConstantMethodHandleInfo = Parser.start()
4040
.uint8("reference_kind")
4141
.uint16be("reference_index");
4242

43-
var ConstantMethodTypeInfo = Parser.start().uint16be("descriptor_index");
43+
const ConstantMethodTypeInfo = Parser.start().uint16be("descriptor_index");
4444

45-
var ConstantInvokeDynamicInfo = Parser.start()
45+
const ConstantInvokeDynamicInfo = Parser.start()
4646
.uint16be("bootstrap_method_attr_index")
4747
.uint16be("name_and_type_index");
4848

49-
var CpInfo = Parser.start()
49+
const CpInfo = Parser.start()
5050
.uint8("tag")
5151
.choice("info", {
5252
tag: "tag",
@@ -67,7 +67,7 @@ var CpInfo = Parser.start()
6767
},
6868
});
6969

70-
var ClassFile = Parser.start()
70+
const ClassFile = Parser.start()
7171
.endianess("big")
7272
.uint32("magic", { assert: 0xcafebabe })
7373
.uint16("minor_version")

‎example/elf32.js‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
var Parser = require("../dist/binary_parser").Parser;
1+
const Parser = require("../dist/binary_parser").Parser;
22

3-
var ELF32ProgramHeader = new Parser()
3+
const ELF32ProgramHeader = new Parser()
44
.endianess("little")
55
.uint32("type")
66
.uint32("offset")
@@ -11,14 +11,14 @@ var ELF32ProgramHeader = new Parser()
1111
.uint32("flags")
1212
.uint32("align");
1313

14-
var ELF32ProgramHeaderTable = new Parser().array("items", {
14+
const ELF32ProgramHeaderTable = new Parser().array("items", {
1515
type: ELF32ProgramHeader,
1616
length: function (vars) {
1717
return vars.phnum;
1818
},
1919
});
2020

21-
var ELF32SectionHeader = new Parser()
21+
const ELF32SectionHeader = new Parser()
2222
.endianess("little")
2323
.uint32("name")
2424
.uint32("type")
@@ -31,22 +31,22 @@ var ELF32SectionHeader = new Parser()
3131
.uint32("addralign")
3232
.uint32("entsize");
3333

34-
var ELF32SectionHeaderTable = new Parser().array("items", {
34+
const ELF32SectionHeaderTable = new Parser().array("items", {
3535
type: ELF32SectionHeader,
3636
length: function (vars) {
3737
return vars.shnum;
3838
},
3939
});
4040

41-
var ELF32SectionHeaderStringTable = new Parser().seek(1).array("items", {
41+
const ELF32SectionHeaderStringTable = new Parser().seek(1).array("items", {
4242
type: new Parser().string("name", { zeroTerminated: true }),
4343
lengthInBytes: function (vars) {
44-
var shstr = vars.section_headers.items[vars.shstrndx];
44+
const shstr = vars.section_headers.items[vars.shstrndx];
4545
return shstr.size - 1;
4646
},
4747
});
4848

49-
var ELF32Header = new Parser()
49+
const ELF32Header = new Parser()
5050
.endianess("little")
5151
.buffer("ident", { length: 16 })
5252
.uint16("type")
@@ -72,13 +72,13 @@ var ELF32Header = new Parser()
7272
})
7373
.pointer("strings", {
7474
type: ELF32SectionHeaderStringTable,
75-
offset: function () {
76-
var shstr = vars.section_headers.items[vars.shstrndx];
75+
offset: function (vars) {
76+
const shstr = vars.section_headers.items[vars.shstrndx];
7777
return shstr.offset;
7878
},
7979
});
8080

8181
require("fs").readFile("hello", function (err, data) {
82-
var result = ELF32Header.parse(data);
82+
const result = ELF32Header.parse(data);
8383
console.log(require("util").inspect(result, { depth: null }));
8484
});

‎example/ip.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
var Parser = require("../dist/binary_parser").Parser;
1+
const Parser = require("../dist/binary_parser").Parser;
22

3-
var ipHeader = new Parser()
3+
const ipHeader = new Parser()
44
.endianess("big")
55
.bit4("version")
66
.bit4("headerLength")
@@ -21,6 +21,6 @@ var ipHeader = new Parser()
2121
length: 4,
2222
});
2323

24-
var buf = Buffer.from("450002c5939900002c06ef98adc24f6c850186d1", "hex");
24+
const buf = Buffer.from("450002c5939900002c06ef98adc24f6c850186d1", "hex");
2525

2626
console.log(ipHeader.parse(buf));

‎example/jpg.js‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
var Parser = require("../dist/binary_parser").Parser;
1+
const Parser = require("../dist/binary_parser").Parser;
22

3-
var SOI = Parser.start();
3+
const SOI = Parser.start();
44

5-
var EOI = Parser.start();
5+
const EOI = Parser.start();
66

7-
var APP0 = Parser.start()
7+
const APP0 = Parser.start()
88
.endianess("big")
99
.uint16("length")
1010
.string("id", {
@@ -25,7 +25,7 @@ var APP0 = Parser.start()
2525
},
2626
});
2727

28-
var COM = Parser.start()
28+
const COM = Parser.start()
2929
.endianess("big")
3030
.uint16("length")
3131
.string("comment", {
@@ -35,7 +35,7 @@ var COM = Parser.start()
3535
},
3636
});
3737

38-
var SOS = Parser.start()
38+
const SOS = Parser.start()
3939
.endianess("big")
4040
.uint16("length")
4141
.uint8("componentCount")
@@ -47,7 +47,7 @@ var SOS = Parser.start()
4747
.uint8("spectrumEnd")
4848
.uint8("spectrumSelect");
4949

50-
var DQT = Parser.start()
50+
const DQT = Parser.start()
5151
.endianess("big")
5252
.uint16("length")
5353
.array("tables", {
@@ -60,7 +60,7 @@ var DQT = Parser.start()
6060
},
6161
});
6262

63-
var SOF0 = Parser.start()
63+
const SOF0 = Parser.start()
6464
.endianess("big")
6565
.uint16("length")
6666
.uint8("precision")
@@ -75,14 +75,14 @@ var SOF0 = Parser.start()
7575
length: "componentCount",
7676
});
7777

78-
var Ignore = Parser.start()
78+
const Ignore = Parser.start()
7979
.endianess("big")
8080
.uint16("length")
8181
.seek(function () {
8282
return this.length - 2;
8383
});
8484

85-
var Segment = Parser.start()
85+
const Segment = Parser.start()
8686
.endianess("big")
8787
.uint16("marker")
8888
.choice("segment", {
@@ -98,7 +98,7 @@ var Segment = Parser.start()
9898
defaultChoice: Ignore,
9999
});
100100

101-
var JPEG = Parser.start().array("segments", {
101+
const JPEG = Parser.start().array("segments", {
102102
type: Segment,
103103
readUntil: "eof",
104104
});

‎example/mbr.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
var Parser = require("../dist/binary_parser").Parser;
2-
var fs = require("fs");
1+
const Parser = require("../dist/binary_parser").Parser;
2+
const fs = require("fs");
33

4-
var chs = new Parser({
4+
const chs = new Parser({
55
formatter: function (val) {
66
val.cylinder |= val.cylinderHigh << 8;
77
return val;
@@ -12,7 +12,7 @@ var chs = new Parser({
1212
.bit6("sector")
1313
.uint8("cylinder");
1414

15-
var partitionTable = new Parser()
15+
const partitionTable = new Parser()
1616
.uint8("bootFlag")
1717
.nest("startCHS", {
1818
type: chs,
@@ -32,7 +32,7 @@ var partitionTable = new Parser()
3232
.uint32le("startLBA")
3333
.uint32le("endLBA");
3434

35-
var mbrParser = new Parser()
35+
const mbrParser = new Parser()
3636
.seek(446)
3737
.array("partitionTables", {
3838
type: partitionTable,

‎example/tar.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
var Parser = require("../dist/binary_parser").Parser;
2-
var fs = require("fs");
1+
const Parser = require("../dist/binary_parser").Parser;
2+
const fs = require("fs");
33

4-
var oct2int = function (s) {
4+
const oct2int = function (s) {
55
return parseInt(s, 8);
66
};
77

8-
var tarHeader = new Parser()
8+
const tarHeader = new Parser()
99
.string("name", { length: 100, stripNull: true })
1010
.string("mode", { length: 8, stripNull: true, formatter: oct2int })
1111
.string("uid", { length: 8, stripNull: true, formatter: oct2int })
@@ -24,15 +24,15 @@ var tarHeader = new Parser()
2424
.string("prefix", { length: 155, stripNull: true })
2525
.seek(12);
2626

27-
var tarItem = new Parser()
27+
const tarItem = new Parser()
2828
.nest({
2929
type: tarHeader,
3030
})
3131
.seek(function () {
3232
return Math.ceil(this.size / 512) * 512;
3333
});
3434

35-
var tarArchive = new Parser().array("files", {
35+
const tarArchive = new Parser().array("files", {
3636
type: tarItem,
3737
readUntil: "eof",
3838
});

0 commit comments

Comments
 (0)