Convert more JS lambda functions to arrow syntax. NFC (emscripten-cor…

…e#22516)
sbc100 · Sep 5, 2024 · 189d7a1 · 189d7a1
1 parent b537af8
commit 189d7a1
Show file tree

Hide file tree

Showing 77 changed files with 97 additions and 115 deletions.
diff --git a/src/embind/embind_shared.js b/src/embind/embind_shared.js
@@ -59,9 +59,7 @@ var LibraryEmbindShared = {
     '$awaitingDependencies', '$registeredTypes',
     '$typeDependencies', '$throwInternalError'],
   $whenDependentTypesAreResolved: (myTypes, dependentTypes, getTypeConverters) => {
-    myTypes.forEach(function(type) {
-        typeDependencies[type] = dependentTypes;
-    });
+    myTypes.forEach((type) => typeDependencies[type] = dependentTypes);
 
     function onComplete(typeConverters) {
       var myTypeConverters = getTypeConverters(typeConverters);

diff --git a/src/gl-matrix.js b/src/gl-matrix.js
@@ -1,4 +1,4 @@
-(function() {
+(() => {
 
 /**
  * @fileoverview gl-matrix - High performance matrix and vector operations for WebGL

diff --git a/src/headless.js b/src/headless.js
@@ -229,7 +229,7 @@ var Audio = () => ({
   },
 });
 var Image = () => {
-  window.setTimeout(function() {
+  window.setTimeout(() => {
     this.complete = true;
     this.width = 64;
     this.height = 64;

diff --git a/src/headlessCanvas.js b/src/headlessCanvas.js
@@ -600,9 +600,7 @@ function headlessCanvas() {
     },
     requestPointerLock: function() {
       document.pointerLockElement = document.getElementById('canvas');
-      window.setTimeout(function() {
-        document.callEventListeners('pointerlockchange');
-      });
+      window.setTimeout(() => document.callEventListeners('pointerlockchange'));
     },
     exitPointerLock: function(){},
     style: {
@@ -614,9 +612,7 @@ function headlessCanvas() {
     removeEventListener: function(){},
     requestFullscreen: function() {
       document.fullscreenElement = document.getElementById('canvas');
-      window.setTimeout(function() {
-        document.callEventListeners('fullscreenchange');
-      });
+      window.setTimeout(() => document.callEventListeners('fullscreenchange'));
     },
     offsetTop: 0,
     offsetLeft: 0,

diff --git a/src/library_browser.js b/src/library_browser.js
@@ -866,7 +866,7 @@ var LibraryBrowser = {
             }
           };
           addEventListener("message", Browser_setImmediate_messageHandler, true);
-          Browser.setImmediate = /** @type{function(function(): ?, ...?): number} */(function Browser_emulated_setImmediate(func) {
+          Browser.setImmediate = /** @type{function(function(): ?, ...?): number} */((func) => {
             setImmediates.push(func);
             if (ENVIRONMENT_IS_WORKER) {
               Module['setImmediates'] ??= [];

diff --git a/src/library_c_preprocessor.js b/src/library_c_preprocessor.js
@@ -156,7 +156,7 @@ addToLibrary({
       // Consume tokens array into a function tree until the tokens array is exhausted
       // to a single root node that evaluates it.
       while (tokens.length > 1 || typeof tokens[0] != 'function') {
-        tokens = (function(tokens) {
+        tokens = ((tokens) => {
           // Find the index 'i' of the operator we should evaluate next:
           var i, j, p, operatorAndPriority = -2;
           for (j = 0; j < tokens.length; ++j) {

diff --git a/src/library_dylink.js b/src/library_dylink.js
@@ -1009,9 +1009,7 @@ var LibraryDylink = {
 
       var libFile = locateFile(libName);
       if (flags.loadAsync) {
-        return new Promise(function(resolve, reject) {
-          asyncLoad(libFile, resolve, reject);
-        });
+        return new Promise((resolve, reject) => asyncLoad(libFile, resolve, reject));
       }
 
       // load the binary synchronously

diff --git a/src/library_egl.js b/src/library_egl.js
@@ -366,7 +366,7 @@ var LibraryEGL = {
       // Run callbacks so that GL emulation works
       GL.makeContextCurrent(EGL.context);
       Browser.useWebGL = true;
-      Browser.moduleContextCreatedCallbacks.forEach(function(callback) { callback() });
+      Browser.moduleContextCreatedCallbacks.forEach((callback) => callback());
 
       // Note: This function only creates a context, but it shall not make it active.
       GL.makeContextCurrent(null);

diff --git a/src/library_exceptions_stub.js b/src/library_exceptions_stub.js
@@ -19,7 +19,7 @@ var LibraryExceptions = {};
   '__cxa_rethrow_primary_exception',
   '__cxa_find_matching_catch',
   '__resumeException',
-].forEach(function(name) {
+].forEach((name) => {
   LibraryExceptions[name] = function() { abort(); };
 #if !INCLUDE_FULL_LIBRARY
   // This method of link-time error generation is not compatible with INCLUDE_FULL_LIBRARY

diff --git a/src/library_formatString.js b/src/library_formatString.js
@@ -308,9 +308,7 @@ addToLibrary({
 
             // Insert the result into the buffer.
             argText = prefix + argText;
-            argText.split('').forEach(function(chr) {
-              ret.push(chr.charCodeAt(0));
-            });
+            argText.split('').forEach((chr) => ret.push(chr.charCodeAt(0)));
             break;
           }
           case 'f': case 'F': case 'e': case 'E': case 'g': case 'G': {
@@ -401,9 +399,7 @@ addToLibrary({
             if (next < {{{ charCode('a') }}}) argText = argText.toUpperCase();
 
             // Insert the result into the buffer.
-            argText.split('').forEach(function(chr) {
-              ret.push(chr.charCodeAt(0));
-            });
+            argText.split('').forEach((chr) => ret.push(chr.charCodeAt(0)));
             break;
           }
           case 's': {

diff --git a/src/library_glut.js b/src/library_glut.js
@@ -336,13 +336,13 @@ var LibraryGLUT = {
     // Firefox
     window.addEventListener("DOMMouseScroll", GLUT.onMouseWheel, true);
 
-    Browser.resizeListeners.push(function(width, height) {
+    Browser.resizeListeners.push((width, height) => {
       if (GLUT.reshapeFunc) {
         {{{ makeDynCall('vii', 'GLUT.reshapeFunc') }}}(width, height);
       }
     });
 
-    __ATEXIT__.push(function() {
+    __ATEXIT__.push(() => {
       if (isTouchDevice) {
         window.removeEventListener("touchmove", GLUT.touchHandler, true);
         window.removeEventListener("touchstart", GLUT.touchHandler, true);
@@ -620,11 +620,9 @@ var LibraryGLUT = {
   glutPostRedisplay: () => {
     if (GLUT.displayFunc && !GLUT.requestedAnimationFrame) {
       GLUT.requestedAnimationFrame = true;
-      Browser.requestAnimationFrame(function() {
+      Browser.requestAnimationFrame(() => {
         GLUT.requestedAnimationFrame = false;
-        Browser.mainLoop.runIter(function() {
-          {{{ makeDynCall('v', 'GLUT.displayFunc') }}}();
-        });
+        Browser.mainLoop.runIter(() => {{{ makeDynCall('v', 'GLUT.displayFunc') }}}());
       });
     }
   },

diff --git a/src/library_idbfs.js b/src/library_idbfs.js
@@ -313,7 +313,7 @@ addToLibrary({
       var total = 0;
 
       var create = [];
-      Object.keys(src.entries).forEach(function (key) {
+      Object.keys(src.entries).forEach((key) => {
         var e = src.entries[key];
         var e2 = dst.entries[key];
         if (!e2 || e['timestamp'].getTime() != e2['timestamp'].getTime()) {
@@ -323,7 +323,7 @@ addToLibrary({
       });
 
       var remove = [];
-      Object.keys(dst.entries).forEach(function (key) {
+      Object.keys(dst.entries).forEach((key) => {
         if (!src.entries[key]) {
           remove.push(key);
           total++;

diff --git a/src/library_lz4.js b/src/library_lz4.js
@@ -14,7 +14,7 @@ addToLibrary({
     codec: null,
     init() {
       if (LZ4.codec) return;
-      LZ4.codec = (function() {
+      LZ4.codec = (() => {
         {{{ read('../third_party/mini-lz4.js') }}};
         return MiniLZ4;
       })();

diff --git a/src/library_noderawfs.js b/src/library_noderawfs.js
@@ -104,7 +104,7 @@ addToLibrary({
       if (typeof flags == "string") {
         flags = FS_modeStringToFlags(flags)
       }
-      var pathTruncated = path.split('/').map(function(s) { return s.substr(0, 255); }).join('/');
+      var pathTruncated = path.split('/').map((s) => s.substr(0, 255)).join('/');
       var nfd = fs.openSync(pathTruncated, NODEFS.flagsForNode(flags), mode);
       var st = fs.fstatSync(nfd);
       if (flags & {{{ cDefs.O_DIRECTORY }}} && !st.isDirectory()) {

diff --git a/src/library_workerfs.js b/src/library_workerfs.js
@@ -41,11 +41,11 @@ addToLibrary({
       Array.prototype.forEach.call(mount.opts["files"] || [], function(file) {
         WORKERFS.createNode(ensureParent(file.name), base(file.name), WORKERFS.FILE_MODE, 0, file, file.lastModifiedDate);
       });
-      (mount.opts["blobs"] || []).forEach(function(obj) {
+      (mount.opts["blobs"] || []).forEach((obj) => {
         WORKERFS.createNode(ensureParent(obj["name"]), base(obj["name"]), WORKERFS.FILE_MODE, 0, obj["data"]);
       });
-      (mount.opts["packages"] || []).forEach(function(pack) {
-        pack['metadata'].files.forEach(function(file) {
+      (mount.opts["packages"] || []).forEach((pack) => {
+        pack['metadata'].files.forEach((file) => {
           var name = file.filename.substr(1); // remove initial slash
           WORKERFS.createNode(ensureParent(name), base(name), WORKERFS.FILE_MODE, 0, pack['blob'].slice(file.start, file.end));
         });

diff --git a/src/postamble.js b/src/postamble.js
@@ -241,10 +241,8 @@ function run() {
 #if expectToReceiveOnModule('setStatus')
   if (Module['setStatus']) {
     Module['setStatus']('Running...');
-    setTimeout(function() {
-      setTimeout(function() {
-        Module['setStatus']('');
-      }, 1);
+    setTimeout(() => {
+      setTimeout(() => Module['setStatus'](''), 1);
       doRun();
     }, 1);
   } else
@@ -289,7 +287,7 @@ function checkUnflushedContent() {
 #endif
 #if '$FS' in addedLibraryItems && '$TTY' in addedLibraryItems
     // also flush in the JS FS layer
-    ['stdout', 'stderr'].forEach(function(name) {
+    ['stdout', 'stderr'].forEach((name) => {
       var info = FS.analyzePath('/dev/' + name);
       if (!info) return;
       var stream = info.object;
@@ -342,17 +340,15 @@ run();
 
 var workerResponded = false, workerCallbackId = -1;
 
-(function() {
+(() => {
   var messageBuffer = null, buffer = 0, bufferSize = 0;
 
   function flushMessages() {
     if (!messageBuffer) return;
     if (runtimeInitialized) {
       var temp = messageBuffer;
       messageBuffer = null;
-      temp.forEach(function(message) {
-        onmessage(message);
-      });
+      temp.forEach((message) => onmessage(message));
     }
   }
 

diff --git a/src/proxyClient.js b/src/proxyClient.js
@@ -98,7 +98,7 @@ if (typeof window != 'undefined') {
 }
 
 /*
-(function() {
+(() => {
   var trueRAF = window.requestAnimationFrame;
   var tracker = new FPSTracker('client');
   window.requestAnimationFrame = (func) => {

diff --git a/src/proxyWorker.js b/src/proxyWorker.js
@@ -121,10 +121,10 @@ window.scrollX = window.scrollY = 0; // TODO: proxy these
 
 window.WebGLRenderingContext = WebGLWorker;
 
-window.requestAnimationFrame = (function() {
+window.requestAnimationFrame = (() => {
   // similar to Browser.requestAnimationFrame
   var nextRAF = 0;
-  return function(func) {
+  return (func) => {
     // try to keep 60fps between calls to here
     var now = Date.now();
     if (nextRAF === 0) {

diff --git a/src/runtime_debug.js b/src/runtime_debug.js
@@ -8,7 +8,7 @@
 
 // Endianness check
 #if !SUPPORT_BIG_ENDIAN
-(function() {
+(() => {
   var h16 = new Int16Array(1);
   var h8 = new Int8Array(h16.buffer);
   h16[0] = 0x6373;

diff --git a/src/webGLWorker.js b/src/webGLWorker.js
@@ -723,10 +723,10 @@ function WebGLWorker() {
       source = source.replace(/\n/g, '|\n'); // barrier between lines, to make regexing easier
       var newItems = source.match(new RegExp(type + '\\s+\\w+\\s+[\\w,\\s\[\\]]+;', 'g'));
       if (!newItems) return;
-      newItems.forEach(function(item) {
+      newItems.forEach((item) => {
         var m = new RegExp(type + '\\s+(\\w+)\\s+([\\w,\\s\[\\]]+);').exec(item);
         assert(m);
-        m[2].split(',').map(function(name) { name = name.trim(); return name.search(/\s/) >= 0 ? '' : name }).filter(function(name) { return !!name }).forEach(function(name) {
+        m[2].split(',').map((name) => { name = name.trim(); return name.search(/\s/) >= 0 ? '' : name }).filter((name) => !!name).forEach((name) => {
           var size = 1;
           var open = name.indexOf('[');
           var fullname = name;
@@ -754,7 +754,7 @@ function WebGLWorker() {
 
     var existingAttributes = {};
 
-    program.shaders.forEach(function(shader) {
+    program.shaders.forEach((shader) => {
       parseElementType(shader, 'uniform', program.uniforms, program.uniformVec);
       parseElementType(shader, 'attribute', existingAttributes, null);
     });
@@ -1153,8 +1153,8 @@ function WebGLWorker() {
   Browser.doSwapBuffers = postRAF;
 
   var trueRAF = window.requestAnimationFrame;
-  window.requestAnimationFrame = function(func) {
-    trueRAF(function() {
+  window.requestAnimationFrame = (func) => {
+    trueRAF(() => {
       if (preRAF() === false) {
         window.requestAnimationFrame(func); // skip this frame, do it later
         return;

diff --git a/test/code_size/embind_hello_wasm.json b/test/code_size/embind_hello_wasm.json
@@ -1,10 +1,10 @@
 {
   "a.html": 552,
   "a.html.gz": 380,
-  "a.js": 9920,
-  "a.js.gz": 4354,
+  "a.js": 9910,
+  "a.js.gz": 4352,
   "a.wasm": 7715,
   "a.wasm.gz": 3512,
-  "total": 18187,
-  "total_gz": 8246
+  "total": 18177,
+  "total_gz": 8244
 }
diff --git a/test/other/codesize/test_codesize_cxx_ctors1.jssize b/test/other/codesize/test_codesize_cxx_ctors1.jssize
@@ -1 +1 @@
-20836
+20821
diff --git a/test/other/codesize/test_codesize_cxx_ctors2.gzsize b/test/other/codesize/test_codesize_cxx_ctors2.gzsize
@@ -1 +1 @@
-8510
+8511
diff --git a/test/other/codesize/test_codesize_cxx_ctors2.jssize b/test/other/codesize/test_codesize_cxx_ctors2.jssize
@@ -1 +1 @@
-20804
+20789
diff --git a/test/other/codesize/test_codesize_cxx_except.gzsize b/test/other/codesize/test_codesize_cxx_except.gzsize
@@ -1 +1 @@
-9541
+9542
diff --git a/test/other/codesize/test_codesize_cxx_except.jssize b/test/other/codesize/test_codesize_cxx_except.jssize
@@ -1 +1 @@
-24681
+24666
diff --git a/test/other/codesize/test_codesize_cxx_except_wasm.gzsize b/test/other/codesize/test_codesize_cxx_except_wasm.gzsize
@@ -1 +1 @@
-8483
+8484
diff --git a/test/other/codesize/test_codesize_cxx_except_wasm.jssize b/test/other/codesize/test_codesize_cxx_except_wasm.jssize
@@ -1 +1 @@
-20729
+20715
diff --git a/test/other/codesize/test_codesize_cxx_except_wasm_exnref.gzsize b/test/other/codesize/test_codesize_cxx_except_wasm_exnref.gzsize
@@ -1 +1 @@
-8483
+8484
diff --git a/test/other/codesize/test_codesize_cxx_except_wasm_exnref.jssize b/test/other/codesize/test_codesize_cxx_except_wasm_exnref.jssize
@@ -1 +1 @@
-20729
+20715
diff --git a/test/other/codesize/test_codesize_cxx_lto.gzsize b/test/other/codesize/test_codesize_cxx_lto.gzsize
@@ -1 +1 @@
-8423
+8422
diff --git a/test/other/codesize/test_codesize_cxx_lto.jssize b/test/other/codesize/test_codesize_cxx_lto.jssize
@@ -1 +1 @@
-20434
+20420
diff --git a/test/other/codesize/test_codesize_cxx_mangle.jssize b/test/other/codesize/test_codesize_cxx_mangle.jssize
@@ -1 +1 @@
-24681
+24666
diff --git a/test/other/codesize/test_codesize_cxx_noexcept.jssize b/test/other/codesize/test_codesize_cxx_noexcept.jssize
@@ -1 +1 @@
-20836
+20821
diff --git a/test/other/codesize/test_codesize_cxx_wasmfs.jssize b/test/other/codesize/test_codesize_cxx_wasmfs.jssize
@@ -1 +1 @@
-8678
+8664
diff --git a/test/other/codesize/test_codesize_files_js_fs.gzsize b/test/other/codesize/test_codesize_files_js_fs.gzsize
@@ -1 +1 @@
-7652
+7654
diff --git a/test/other/codesize/test_codesize_files_js_fs.jssize b/test/other/codesize/test_codesize_files_js_fs.jssize
@@ -1 +1 @@
-18737
+18723
diff --git a/test/other/codesize/test_codesize_files_wasmfs.gzsize b/test/other/codesize/test_codesize_files_wasmfs.gzsize
@@ -1 +1 @@
-2967
+2966
diff --git a/test/other/codesize/test_codesize_files_wasmfs.jssize b/test/other/codesize/test_codesize_files_wasmfs.jssize
@@ -1 +1 @@
-6314
+6300
diff --git a/test/other/codesize/test_codesize_hello_O0.gzsize b/test/other/codesize/test_codesize_hello_O0.gzsize
@@ -1 +1 @@
-7987
+7983
diff --git a/test/other/codesize/test_codesize_hello_O0.jssize b/test/other/codesize/test_codesize_hello_O0.jssize
@@ -1 +1 @@
-21387
+21358
diff --git a/test/other/codesize/test_codesize_hello_O1.gzsize b/test/other/codesize/test_codesize_hello_O1.gzsize
@@ -1 +1 @@
-2785
+2780
diff --git a/test/other/codesize/test_codesize_hello_O1.jssize b/test/other/codesize/test_codesize_hello_O1.jssize
@@ -1 +1 @@
-6982
+6953
diff --git a/test/other/codesize/test_codesize_hello_O2.gzsize b/test/other/codesize/test_codesize_hello_O2.gzsize
@@ -1 +1 @@
-2466
+2464
diff --git a/test/other/codesize/test_codesize_hello_O2.jssize b/test/other/codesize/test_codesize_hello_O2.jssize
@@ -1 +1 @@
-5005
+4991
diff --git a/test/other/codesize/test_codesize_hello_O3.gzsize b/test/other/codesize/test_codesize_hello_O3.gzsize
@@ -1 +1 @@
-2381
+2379
diff --git a/test/other/codesize/test_codesize_hello_O3.jssize b/test/other/codesize/test_codesize_hello_O3.jssize
@@ -1 +1 @@
-4851
+4837
diff --git a/test/other/codesize/test_codesize_hello_Os.gzsize b/test/other/codesize/test_codesize_hello_Os.gzsize
@@ -1 +1 @@
-2381
+2379