Skip to content

Commit 0de7eee

Browse files
sbc100sbc100
authored
Use for .. of in more places in JS library. NFC (#23867)
1 parent ac6e3d2 commit 0de7eee

14 files changed

+62
-78
lines changed

‎src/lib/libaddfunction.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,11 +68,11 @@ addToLibrary({
6868
// Parameters, length + signatures
6969
target.push(0x60 /* form: func */);
7070
uleb128Encode(sigParam.length, target);
71-
for (var i = 0; i < sigParam.length; ++i) {
71+
for (var paramType of sigParam) {
7272
#if ASSERTIONS
73-
assert(sigParam[i] in typeCodes, 'invalid signature char: ' + sigParam[i]);
73+
assert(paramType in typeCodes, `invalid signature char: ${paramType}`);
7474
#endif
75-
target.push(typeCodes[sigParam[i]]);
75+
target.push(typeCodes[paramType]);
7676
}
7777

7878
// Return values, length + signatures

‎src/lib/libfs.js

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -746,9 +746,9 @@ FS.staticInit();
746746
mkdirTree(path, mode) {
747747
var dirs = path.split('/');
748748
var d = '';
749-
for (var i = 0; i < dirs.length; ++i) {
750-
if (!dirs[i]) continue;
751-
d += '/' + dirs[i];
749+
for (var dir of dirs) {
750+
if (!dir) continue;
751+
d += '/' + dir;
752752
try {
753753
FS.mkdir(d, mode);
754754
} catch(e) {
@@ -1550,12 +1550,10 @@ FS.staticInit();
15501550
_fflush(0);
15511551
#endif
15521552
// close all of our streams
1553-
for (var i = 0; i < FS.streams.length; i++) {
1554-
var stream = FS.streams[i];
1555-
if (!stream) {
1556-
continue;
1553+
for (var stream of FS.streams) {
1554+
if (stream) {
1555+
FS.close(stream);
15571556
}
1558-
FS.close(stream);
15591557
}
15601558
},
15611559

‎src/lib/libglemu.js

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1620,8 +1620,8 @@ var LibraryGLEmulation = {
16201620
getActiveTexture: () => s_activeTexture,
16211621

16221622
traverseState: (keyView) => {
1623-
for (var i = 0; i < s_texUnits.length; i++) {
1624-
s_texUnits[i].traverseState(keyView);
1623+
for (var texUnit of s_texUnits) {
1624+
texUnit.traverseState(keyView);
16251625
}
16261626
},
16271627

@@ -2087,8 +2087,8 @@ var LibraryGLEmulation = {
20872087

20882088
// By attrib state:
20892089
var enabledAttributesKey = 0;
2090-
for (var i = 0; i < attributes.length; i++) {
2091-
enabledAttributesKey |= 1 << attributes[i].name;
2090+
for (var attr of attributes) {
2091+
enabledAttributesKey |= 1 << attr.name;
20922092
}
20932093

20942094
// To prevent using more than 31 bits add another level to the maptree
@@ -2226,8 +2226,7 @@ var LibraryGLEmulation = {
22262226
var texUnitUniformList = '';
22272227
var vsTexCoordInits = '';
22282228
this.usedTexUnitList = GLImmediate.TexEnvJIT.getUsedTexUnitList();
2229-
for (var i = 0; i < this.usedTexUnitList.length; i++) {
2230-
var texUnit = this.usedTexUnitList[i];
2229+
for (var texUnit of this.usedTexUnitList) {
22312230
texUnitAttribList += 'attribute vec4 ' + aTexCoordPrefix + texUnit + ';\n';
22322231
texUnitVaryingList += 'varying vec4 ' + vTexCoordPrefix + texUnit + ';\n';
22332232
texUnitUniformList += 'uniform sampler2D ' + uTexUnitPrefix + texUnit + ';\n';
@@ -2972,16 +2971,14 @@ var LibraryGLEmulation = {
29722971
var start = GLImmediate.restrideBuffer;
29732972
bytes = 0;
29742973
// calculate restrided offsets and total size
2975-
for (var i = 0; i < attributes.length; i++) {
2976-
var attr = attributes[i];
2974+
for (var attr of attributes) {
29772975
var size = attr.sizeBytes;
29782976
if (size % 4 != 0) size += 4 - (size % 4); // align everything
29792977
attr.offset = bytes;
29802978
bytes += size;
29812979
}
29822980
// copy out the data (we need to know the stride for that, and define attr.pointer)
2983-
for (var i = 0; i < attributes.length; i++) {
2984-
var attr = attributes[i];
2981+
for (var attr of attributes) {
29852982
var srcStride = Math.max(attr.sizeBytes, attr.stride);
29862983
if ((srcStride & 3) == 0 && (attr.sizeBytes & 3) == 0) {
29872984
for (var j = 0; j < count; j++) {
@@ -3008,8 +3005,7 @@ var LibraryGLEmulation = {
30083005
} else {
30093006
GLImmediate.vertexPointer = clientStartPointer;
30103007
}
3011-
for (var i = 0; i < attributes.length; i++) {
3012-
var attr = attributes[i];
3008+
for (var attr of attributes) {
30133009
attr.offset = attr.pointer - GLImmediate.vertexPointer; // Compute what will be the offset of this attribute in the VBO after we upload.
30143010
}
30153011
GLImmediate.stride = Math.max(maxStride, bytes);

‎src/lib/libglew.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,9 +114,8 @@ var LibraryGLEW = {
114114

115115
glewIsSupported: (name) => {
116116
var exts = UTF8ToString(name).split(' ');
117-
for (var i = 0; i < exts.length; ++i) {
118-
if (!GLEW.extensionIsSupported(exts[i]))
119-
return 0;
117+
for (var ext of exts) {
118+
if (!GLEW.extensionIsSupported(ext)) return 0;
120119
}
121120
return 1;
122121
},

‎src/lib/libglfw.js

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1141,12 +1141,14 @@ var LibraryGLFW = {
11411141
#endif
11421142

11431143
GLFW.windows[win.id - 1] = null;
1144-
if (GLFW.active.id == win.id)
1144+
if (GLFW.active.id == win.id) {
11451145
GLFW.active = null;
1146+
}
11461147

11471148
// Destroy context when no alive windows
1148-
for (var i = 0; i < GLFW.windows.length; i++)
1149-
if (GLFW.windows[i] !== null) return;
1149+
for (win of GLFW.windows) {
1150+
if (win !== null) return;
1151+
}
11501152

11511153
delete Module['ctx'];
11521154
},

‎src/lib/libhtml5.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1275,10 +1275,10 @@ var LibraryHTML5 = {
12751275
var hiddenElements = [];
12761276
while (child != document.body) {
12771277
var children = parent.children;
1278-
for (var i = 0; i < children.length; ++i) {
1279-
if (children[i] != child) {
1280-
hiddenElements.push({ node: children[i], displayState: children[i].style.display });
1281-
children[i].style.display = 'none';
1278+
for (var currChild of children) {
1279+
if (currChild != child) {
1280+
hiddenElements.push({ node: currChild, displayState: currChild.style.display });
1281+
currChild.style.display = 'none';
12821282
}
12831283
}
12841284
child = parent;

‎src/lib/libopenal.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4056,9 +4056,9 @@ var LibraryOpenAL = {
40564056
40574057
// Find the first non-zero buffer in the queue to determine the proper format
40584058
var templateBuf = AL.buffers[0];
4059-
for (var i = 0; i < src.bufQueue.length; i++) {
4060-
if (src.bufQueue[i].id !== 0) {
4061-
templateBuf = src.bufQueue[i];
4059+
for (var buf of src.bufQueue.length) {
4060+
if (buf.id !== 0) {
4061+
templateBuf = buf;
40624062
break;
40634063
}
40644064
}

‎src/lib/libpipefs.js

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -86,12 +86,9 @@ addToLibrary({
8686
if ((stream.flags & {{{ cDefs.O_ACCMODE }}}) === {{{ cDefs.O_WRONLY }}}) {
8787
return ({{{ cDefs.POLLWRNORM }}} | {{{ cDefs.POLLOUT }}});
8888
}
89-
if (pipe.buckets.length > 0) {
90-
for (var i = 0; i < pipe.buckets.length; i++) {
91-
var bucket = pipe.buckets[i];
92-
if (bucket.offset - bucket.roffset > 0) {
93-
return ({{{ cDefs.POLLRDNORM }}} | {{{ cDefs.POLLIN }}});
94-
}
89+
for (var bucket of pipe.buckets) {
90+
if (bucket.offset - bucket.roffset > 0) {
91+
return ({{{ cDefs.POLLRDNORM }}} | {{{ cDefs.POLLIN }}});
9592
}
9693
}
9794

@@ -110,8 +107,7 @@ addToLibrary({
110107
var pipe = stream.node.pipe;
111108
var currentLength = 0;
112109

113-
for (var i = 0; i < pipe.buckets.length; i++) {
114-
var bucket = pipe.buckets[i];
110+
for (var bucket of pipe.buckets) {
115111
currentLength += bucket.offset - bucket.roffset;
116112
}
117113

@@ -136,22 +132,21 @@ addToLibrary({
136132
var totalRead = toRead;
137133
var toRemove = 0;
138134

139-
for (var i = 0; i < pipe.buckets.length; i++) {
140-
var currBucket = pipe.buckets[i];
141-
var bucketSize = currBucket.offset - currBucket.roffset;
135+
for (var bucket of pipe.buckets) {
136+
var bucketSize = bucket.offset - bucket.roffset;
142137

143138
if (toRead <= bucketSize) {
144-
var tmpSlice = currBucket.buffer.subarray(currBucket.roffset, currBucket.offset);
139+
var tmpSlice = bucket.buffer.subarray(bucket.roffset, bucket.offset);
145140
if (toRead < bucketSize) {
146141
tmpSlice = tmpSlice.subarray(0, toRead);
147-
currBucket.roffset += toRead;
142+
bucket.roffset += toRead;
148143
} else {
149144
toRemove++;
150145
}
151146
data.set(tmpSlice);
152147
break;
153148
} else {
154-
var tmpSlice = currBucket.buffer.subarray(currBucket.roffset, currBucket.offset);
149+
var tmpSlice = bucket.buffer.subarray(bucket.roffset, bucket.offset);
155150
data.set(tmpSlice);
156151
data = data.subarray(tmpSlice.byteLength);
157152
toRead -= tmpSlice.byteLength;

‎src/lib/libsdl.js

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -570,8 +570,7 @@ var LibrarySDL = {
570570

571571
// Clear out any touchstart events that we've already processed
572572
if (event.type === 'touchstart') {
573-
for (var i = 0; i < event.touches.length; i++) {
574-
var touch = event.touches[i];
573+
for (var touch of event.touches) {
575574
if (SDL.downFingers[touch.identifier] != true) {
576575
SDL.downFingers[touch.identifier] = true;
577576
touches.push(touch);
@@ -600,8 +599,7 @@ var LibrarySDL = {
600599
SDL.events.push(mouseEvent);
601600
}
602601

603-
for (var i = 0; i < touches.length; i++) {
604-
var touch = touches[i];
602+
for (var touch of touches) {
605603
SDL.events.push({
606604
type: event.type,
607605
touch
@@ -614,8 +612,7 @@ var LibrarySDL = {
614612

615613
// Remove the entry in the SDL.downFingers hash
616614
// because the finger is no longer down.
617-
for (var i = 0; i < event.changedTouches.length; i++) {
618-
var touch = event.changedTouches[i];
615+
for (var touch of event.changedTouches) {
619616
if (SDL.downFingers[touch.identifier] === true) {
620617
delete SDL.downFingers[touch.identifier];
621618
}
@@ -630,8 +627,7 @@ var LibrarySDL = {
630627
SDL.DOMButtons[0] = 0;
631628
SDL.events.push(mouseEvent);
632629

633-
for (var i = 0; i < event.changedTouches.length; i++) {
634-
var touch = event.changedTouches[i];
630+
for (var touch of event.changedTouches) {
635631
SDL.events.push({
636632
type: 'touchend',
637633
touch
@@ -1274,9 +1270,9 @@ var LibrarySDL = {
12741270
joystickNamePool: {},
12751271
recordJoystickState(joystick, state) {
12761272
// Standardize button state.
1277-
var buttons = new Array(state.buttons.length);
1278-
for (var i = 0; i < state.buttons.length; i++) {
1279-
buttons[i] = SDL.getJoystickButtonState(state.buttons[i]);
1273+
var buttons = [];
1274+
for (var button of state.buttons) {
1275+
buttons.push(SDL.getJoystickButtonState(button));
12801276
}
12811277

12821278
SDL.lastJoystickState[joystick] = {
@@ -3053,7 +3049,7 @@ var LibrarySDL = {
30533049
Mix_Pause__proxy: 'sync',
30543050
Mix_Pause: (channel) => {
30553051
if (channel === -1) {
3056-
for (var i = 0; i<SDL.channels.length;i++) {
3052+
for (var i = 0; i < SDL.channels.length; i++) {
30573053
_Mix_Pause(i);
30583054
}
30593055
return;
@@ -3072,7 +3068,7 @@ var LibrarySDL = {
30723068
Mix_Paused: (channel) => {
30733069
if (channel === -1) {
30743070
var pausedCount = 0;
3075-
for (var i = 0; i<SDL.channels.length;i++) {
3071+
for (var i = 0; i < SDL.channels.length; i++) {
30763072
pausedCount += _Mix_Paused(i);
30773073
}
30783074
return pausedCount;
@@ -3088,7 +3084,7 @@ var LibrarySDL = {
30883084
Mix_Resume__proxy: 'sync',
30893085
Mix_Resume: (channel) => {
30903086
if (channel === -1) {
3091-
for (var i = 0; i<SDL.channels.length;i++) {
3087+
for (var i = 0; i < SDL.channels.length; i++) {
30923088
_Mix_Resume(i);
30933089
}
30943090
return;
@@ -3430,8 +3426,8 @@ var LibrarySDL = {
34303426
var count = 0;
34313427
var gamepads = SDL.getGamepads();
34323428
// The length is not the number of gamepads; check which ones are defined.
3433-
for (var i = 0; i < gamepads.length; i++) {
3434-
if (gamepads[i] !== undefined) count++;
3429+
for (var gamepad of gamepads) {
3430+
if (gamepad !== undefined) count++;
34353431
}
34363432
return count;
34373433
},

‎src/lib/libsockfs.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -427,9 +427,7 @@ addToLibrary({
427427
sock.server = null;
428428
}
429429
// close any peer connections
430-
var peers = Object.keys(sock.peers);
431-
for (var i = 0; i < peers.length; i++) {
432-
var peer = sock.peers[peers[i]];
430+
for (var peer of Object.values(sock.peers)) {
433431
try {
434432
peer.socket.close();
435433
} catch (e) {

0 commit comments

Comments
 (0)