Skip to content

Commit a3d8979

Browse files
sbc100sbc100
authored
Remove most of the use of else after return from JS library code. NFC (#17450)
This is small code size win but it looks like it only effects the unoptimized (non-closure) build. Still good coding style anyway. I noticed this while working on #17449 and wrong a little command line to try to find all these: ``` $ pcregrep -n -M 'return[^\n]*;\n\s*}\s*else\s*{' src/*.js ```
1 parent d2e80a6 commit a3d8979

22 files changed

+108
-164
lines changed

‎src/IDBStore.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,8 @@
7070
var result = event.target.result;
7171
if (!result) {
7272
return callback('file ' + id + ' not found');
73-
} else {
74-
return callback(null, result);
7573
}
74+
return callback(null, result);
7675
};
7776
req.onerror = function(error) {
7877
callback(error);

‎src/jsifier.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,8 @@ function stringifyWithFunctions(obj) {
4747
if (obj === null || typeof obj != 'object') return JSON.stringify(obj);
4848
if (Array.isArray(obj)) {
4949
return '[' + obj.map(stringifyWithFunctions).join(',') + ']';
50-
} else {
51-
return '{' + Object.keys(obj).map((key) => escapeJSONKey(key) + ':' + stringifyWithFunctions(obj[key])).join(',') + '}';
5250
}
51+
return '{' + Object.keys(obj).map((key) => escapeJSONKey(key) + ':' + stringifyWithFunctions(obj[key])).join(',') + '}';
5352
}
5453

5554
function isDefined(symName) {

‎src/library.js

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -827,12 +827,10 @@ mergeInto(LibraryManager.library, {
827827
// this date is after the start of the first week of this year
828828
if (compareByDay(firstWeekStartNextYear, thisDate) <= 0) {
829829
return thisDate.getFullYear()+1;
830-
} else {
831-
return thisDate.getFullYear();
832830
}
833-
} else {
834-
return thisDate.getFullYear()-1;
831+
return thisDate.getFullYear();
835832
}
833+
return thisDate.getFullYear()-1;
836834
}
837835

838836
var EXPANSION_RULES_2 = {
@@ -899,9 +897,8 @@ mergeInto(LibraryManager.library, {
899897
'%p': function(date) {
900898
if (date.tm_hour >= 0 && date.tm_hour < 12) {
901899
return 'AM';
902-
} else {
903-
return 'PM';
904900
}
901+
return 'PM';
905902
},
906903
'%S': function(date) {
907904
return leadingNulls(date.tm_sec, 2);
@@ -2181,10 +2178,9 @@ mergeInto(LibraryManager.library, {
21812178
// reads the next entry from the protocols 'database' or return NULL if 'eof'
21822179
if (_setprotoent.index === Protocols.list.length) {
21832180
return 0;
2184-
} else {
2185-
var result = Protocols.list[_setprotoent.index++];
2186-
return result;
21872181
}
2182+
var result = Protocols.list[_setprotoent.index++];
2183+
return result;
21882184
},
21892185

21902186
getprotobyname__deps: ['setprotoent', '$Protocols'],

‎src/library_c_preprocessor.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -132,11 +132,10 @@ mergeInto(LibraryManager.library, {
132132
expanded += pp() + str.substring(j, lineEnd);
133133
}
134134
return expandMacros(expanded, 0);
135-
} else {
136-
out += symbol;
137-
i = j-1;
138-
break;
139135
}
136+
out += symbol;
137+
i = j-1;
138+
break;
140139
}
141140
}
142141
} else {

‎src/library_egl.js

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -112,21 +112,19 @@ var LibraryEGL = {
112112
eglInitialize__proxy: 'sync',
113113
eglInitialize__sig: 'iiii',
114114
eglInitialize: function(display, majorVersion, minorVersion) {
115-
if (display == 62000 /* Magic ID for Emscripten 'default display' */) {
116-
if (majorVersion) {
117-
{{{ makeSetValue('majorVersion', '0', '1', 'i32') }}}; // Advertise EGL Major version: '1'
118-
}
119-
if (minorVersion) {
120-
{{{ makeSetValue('minorVersion', '0', '4', 'i32') }}}; // Advertise EGL Minor version: '4'
121-
}
122-
EGL.defaultDisplayInitialized = true;
123-
EGL.setErrorCode(0x3000 /* EGL_SUCCESS */);
124-
return 1;
125-
}
126-
else {
115+
if (display != 62000 /* Magic ID for Emscripten 'default display' */) {
127116
EGL.setErrorCode(0x3008 /* EGL_BAD_DISPLAY */);
128117
return 0;
129118
}
119+
if (majorVersion) {
120+
{{{ makeSetValue('majorVersion', '0', '1', 'i32') }}}; // Advertise EGL Major version: '1'
121+
}
122+
if (minorVersion) {
123+
{{{ makeSetValue('minorVersion', '0', '4', 'i32') }}}; // Advertise EGL Minor version: '4'
124+
}
125+
EGL.defaultDisplayInitialized = true;
126+
EGL.setErrorCode(0x3000 /* EGL_SUCCESS */);
127+
return 1;
130128
},
131129

132130
// EGLAPI EGLBoolean EGLAPIENTRY eglTerminate(EGLDisplay dpy);
@@ -554,10 +552,10 @@ var LibraryEGL = {
554552
if (api == 0x30A0 /* EGL_OPENGL_ES_API */) {
555553
EGL.setErrorCode(0x3000 /* EGL_SUCCESS */);
556554
return 1;
557-
} else { // if (api == 0x30A1 /* EGL_OPENVG_API */ || api == 0x30A2 /* EGL_OPENGL_API */) {
558-
EGL.setErrorCode(0x300C /* EGL_BAD_PARAMETER */);
559-
return 0;
560555
}
556+
// if (api == 0x30A1 /* EGL_OPENVG_API */ || api == 0x30A2 /* EGL_OPENGL_API */) {
557+
EGL.setErrorCode(0x300C /* EGL_BAD_PARAMETER */);
558+
return 0;
561559
},
562560

563561
// EGLAPI EGLenum EGLAPIENTRY eglQueryAPI(void);

‎src/library_fs.js

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1524,11 +1524,10 @@ FS.staticInit();` +
15241524
},
15251525
findObject: (path, dontResolveLastLink) => {
15261526
var ret = FS.analyzePath(path, dontResolveLastLink);
1527-
if (ret.exists) {
1528-
return ret.object;
1529-
} else {
1527+
if (!ret.exists) {
15301528
return null;
15311529
}
1530+
return ret.object;
15321531
},
15331532
analyzePath: (path, dontResolveLastLink) => {
15341533
// operate from within the context of the symlink's target
@@ -1736,9 +1735,8 @@ FS.staticInit();` +
17361735
if (!(xhr.status >= 200 && xhr.status < 300 || xhr.status === 304)) throw new Error("Couldn't load " + url + ". Status: " + xhr.status);
17371736
if (xhr.response !== undefined) {
17381737
return new Uint8Array(/** @type{Array<number>} */(xhr.response || []));
1739-
} else {
1740-
return intArrayFromString(xhr.responseText || '', true);
17411738
}
1739+
return intArrayFromString(xhr.responseText || '', true);
17421740
};
17431741
var lazyArray = this;
17441742
lazyArray.setDataGetter((chunkNum) => {

‎src/library_glfw.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1674,9 +1674,8 @@ var LibraryGLFW = {
16741674
glfwGetJoystickName: function(joy) {
16751675
if (GLFW.joys[joy]) {
16761676
return GLFW.joys[joy].id;
1677-
} else {
1678-
return 0;
16791677
}
1678+
return 0;
16801679
},
16811680

16821681
glfwSetJoystickCallback__sig: 'ii',

‎src/library_html5.js

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1093,11 +1093,10 @@ var LibraryHTML5 = {
10931093
}
10941094
if (succeeded) {
10951095
return {{{ cDefine('EMSCRIPTEN_RESULT_SUCCESS') }}};
1096-
} else {
1097-
return {{{ cDefine('EMSCRIPTEN_RESULT_FAILED') }}};
10981096
}
1097+
return {{{ cDefine('EMSCRIPTEN_RESULT_FAILED') }}};
10991098
},
1100-
1099+
11011100
emscripten_unlock_orientation__proxy: 'sync',
11021101
emscripten_unlock_orientation__sig: 'i',
11031102
emscripten_unlock_orientation: function() {
@@ -1565,9 +1564,8 @@ var LibraryHTML5 = {
15651564
if (strategy.deferUntilInEventHandler) {
15661565
JSEvents.deferCall(JSEvents_requestFullscreen, 1 /* priority over pointer lock */, [target, strategy]);
15671566
return {{{ cDefine('EMSCRIPTEN_RESULT_DEFERRED') }}};
1568-
} else {
1569-
return {{{ cDefine('EMSCRIPTEN_RESULT_FAILED_NOT_DEFERRED') }}};
15701567
}
1568+
return {{{ cDefine('EMSCRIPTEN_RESULT_FAILED_NOT_DEFERRED') }}};
15711569
}
15721570
#endif
15731571

@@ -1878,9 +1876,8 @@ var LibraryHTML5 = {
18781876
#endif
18791877
) {
18801878
return {{{ cDefine('EMSCRIPTEN_RESULT_INVALID_TARGET') }}};
1881-
} else {
1882-
return {{{ cDefine('EMSCRIPTEN_RESULT_NOT_SUPPORTED') }}};
18831879
}
1880+
return {{{ cDefine('EMSCRIPTEN_RESULT_NOT_SUPPORTED') }}};
18841881
}
18851882
return {{{ cDefine('EMSCRIPTEN_RESULT_SUCCESS') }}};
18861883
},
@@ -1916,9 +1913,8 @@ var LibraryHTML5 = {
19161913
if (deferUntilInEventHandler) {
19171914
JSEvents.deferCall(requestPointerLock, 2 /* priority below fullscreen */, [target]);
19181915
return {{{ cDefine('EMSCRIPTEN_RESULT_DEFERRED') }}};
1919-
} else {
1920-
return {{{ cDefine('EMSCRIPTEN_RESULT_FAILED_NOT_DEFERRED') }}};
19211916
}
1917+
return {{{ cDefine('EMSCRIPTEN_RESULT_FAILED_NOT_DEFERRED') }}};
19221918
}
19231919
#endif
19241920

@@ -2531,10 +2527,9 @@ var LibraryHTML5 = {
25312527
var canvas = findCanvasEventTarget(target);
25322528
if (canvas) {
25332529
return _emscripten_set_canvas_element_size_calling_thread(target, width, height);
2534-
} else {
2535-
return _emscripten_set_canvas_element_size_main_thread(target, width, height);
25362530
}
2537-
},
2531+
return _emscripten_set_canvas_element_size_main_thread(target, width, height);
2532+
},
25382533
#else
25392534
emscripten_set_canvas_element_size__deps: ['$JSEvents', '$findCanvasEventTarget'],
25402535
emscripten_set_canvas_element_size__sig: 'iiii',
@@ -2614,10 +2609,9 @@ var LibraryHTML5 = {
26142609
var canvas = findCanvasEventTarget(target);
26152610
if (canvas) {
26162611
return _emscripten_get_canvas_element_size_calling_thread(target, width, height);
2617-
} else {
2618-
return _emscripten_get_canvas_element_size_main_thread(target, width, height);
26192612
}
2620-
},
2613+
return _emscripten_get_canvas_element_size_main_thread(target, width, height);
2614+
},
26212615
#else
26222616
emscripten_get_canvas_element_size__deps: ['$JSEvents', '$findCanvasEventTarget'],
26232617
emscripten_get_canvas_element_size__sig: 'ippp',

‎src/library_nodefs.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,11 +96,10 @@ mergeInto(LibraryManager.library, {
9696
flags ^= k;
9797
}
9898
}
99-
if (!flags) {
100-
return newFlags;
101-
} else {
99+
if (flags) {
102100
throw new FS.ErrnoError({{{ cDefine('EINVAL') }}});
103101
}
102+
return newFlags;
104103
},
105104
node_ops: {
106105
getattr: (node) => {

‎src/library_openal.js

Lines changed: 20 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -968,12 +968,11 @@ var LibraryOpenAL = {
968968
case 0x2015 /* AL_LOOP_POINTS_SOFT */:
969969
if (buf.length === 0) {
970970
return [0, 0];
971-
} else {
972-
return [
973-
(buf.audioBuf._loopStart || 0.0) * buf.frequency,
974-
(buf.audioBuf._loopEnd || buf.length) * buf.frequency
975-
];
976971
}
972+
return [
973+
(buf.audioBuf._loopStart || 0.0) * buf.frequency,
974+
(buf.audioBuf._loopEnd || buf.length) * buf.frequency
975+
];
977976
default:
978977
#if OPENAL_DEBUG
979978
err(funcname + '() param 0x' + param.toString(16) + ' is unknown or not implemented');
@@ -1084,9 +1083,8 @@ var LibraryOpenAL = {
10841083
case 0x1009 /* AL_BUFFER */:
10851084
if (src.type === 0x1028 /* AL_STATIC */) {
10861085
return src.bufQueue[0].id;
1087-
} else {
1088-
return 0;
10891086
}
1087+
return 0;
10901088
case 0x100A /* AL_GAIN */:
10911089
return src.gain.gain.value;
10921090
case 0x100D /* AL_MIN_GAIN */:
@@ -1098,15 +1096,13 @@ var LibraryOpenAL = {
10981096
case 0x1015 /* AL_BUFFERS_QUEUED */:
10991097
if (src.bufQueue.length === 1 && src.bufQueue[0].id === 0) {
11001098
return 0;
1101-
} else {
1102-
return src.bufQueue.length;
11031099
}
1100+
return src.bufQueue.length;
11041101
case 0x1016 /* AL_BUFFERS_PROCESSED */:
11051102
if ((src.bufQueue.length === 1 && src.bufQueue[0].id === 0) || src.looping) {
11061103
return 0;
1107-
} else {
1108-
return src.bufsProcessed;
11091104
}
1105+
return src.bufsProcessed;
11101106
case 0x1020 /* AL_REFERENCE_DISTANCE */:
11111107
return src.refDistance;
11121108
case 0x1021 /* AL_ROLLOFF_FACTOR */:
@@ -2083,9 +2079,8 @@ var LibraryOpenAL = {
20832079
var deviceId = AL.newId();
20842080
AL.deviceRefCounts[deviceId] = 0;
20852081
return deviceId;
2086-
} else {
2087-
return 0;
20882082
}
2083+
return 0;
20892084
},
20902085

20912086
alcCloseDevice__proxy: 'sync',
@@ -2294,9 +2289,8 @@ var LibraryOpenAL = {
22942289
alcGetCurrentContext: function() {
22952290
if (AL.currentCtx !== null) {
22962291
return AL.currentCtx.id;
2297-
} else {
2298-
return 0;
22992292
}
2293+
return 0;
23002294
},
23012295

23022296
alcMakeContextCurrent__proxy: 'sync',
@@ -2305,20 +2299,18 @@ var LibraryOpenAL = {
23052299
if (contextId === 0) {
23062300
AL.currentCtx = null;
23072301
return 0;
2308-
} else {
2309-
AL.currentCtx = AL.contexts[contextId];
2310-
return 1;
23112302
}
2303+
AL.currentCtx = AL.contexts[contextId];
2304+
return 1;
23122305
},
23132306

23142307
alcGetContextsDevice__proxy: 'sync',
23152308
alcGetContextsDevice__sig: 'ii',
23162309
alcGetContextsDevice: function(contextId) {
23172310
if (contextId in AL.contexts) {
23182311
return AL.contexts[contextId].deviceId;
2319-
} else {
2320-
return 0;
23212312
}
2313+
return 0;
23222314
},
23232315

23242316
// The spec is vague about what these are actually supposed to do, and NOP is a reasonable implementation
@@ -2686,15 +2678,14 @@ var LibraryOpenAL = {
26862678
}
26872679
break;
26882680
default:
2689-
if (index === 0) {
2690-
return _alcGetString(deviceId, param);
2691-
} else {
2681+
if (index !== 0) {
26922682
#if OPENAL_DEBUG
26932683
out('alcGetStringiSOFT() with param 0x' + param.toString(16) + ' not implemented yet');
26942684
#endif
26952685
AL.alcErr = 0xA003 /* ALC_INVALID_ENUM */;
26962686
return 0;
26972687
}
2688+
return _alcGetString(deviceId, param);
26982689
}
26992690

27002691
ret = allocateUTF8(ret);
@@ -2925,12 +2916,11 @@ var LibraryOpenAL = {
29252916
alGetError: function() {
29262917
if (!AL.currentCtx) {
29272918
return 0xA004 /* AL_INVALID_OPERATION */;
2928-
} else {
2929-
// Reset error on get.
2930-
var err = AL.currentCtx.err;
2931-
AL.currentCtx.err = 0 /* AL_NO_ERROR */;
2932-
return err;
29332919
}
2920+
// Reset error on get.
2921+
var err = AL.currentCtx.err;
2922+
AL.currentCtx.err = 0 /* AL_NO_ERROR */;
2923+
return err;
29342924
},
29352925

29362926
alIsExtensionPresent__proxy: 'sync',
@@ -3744,9 +3734,8 @@ var LibraryOpenAL = {
37443734

37453735
if (!AL.buffers[bufferId]) {
37463736
return false;
3747-
} else {
3748-
return true;
37493737
}
3738+
return true;
37503739
},
37513740

37523741
alBufferData__proxy: 'sync',
@@ -4117,9 +4106,8 @@ var LibraryOpenAL = {
41174106

41184107
if (!AL.currentCtx.sources[sourceId]) {
41194108
return false;
4120-
} else {
4121-
return true;
41224109
}
4110+
return true;
41234111
},
41244112

41254113
alSourceQueueBuffers__proxy: 'sync',

0 commit comments

Comments
 (0)