Skip to content

Commit 49c52d8

Browse files
sbc100hedwigz
authored andcommitted
Avoid excessive variable reuse in modularize function. NFC (emscripten-core#23208)
I think this makes it a little easier to follow.
1 parent ef51061 commit 49c52d8

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

tools/link.py

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2383,7 +2383,7 @@ def node_pthread_detection():
23832383
def modularize():
23842384
global final_js
23852385
logger.debug(f'Modularizing, assigning to var {settings.EXPORT_NAME}')
2386-
src = read_file(final_js)
2386+
generated_js = read_file(final_js)
23872387

23882388
# When targetting node and ES6 we use `await import ..` in the generated code
23892389
# so the outer function needs to be marked as async.
@@ -2392,35 +2392,35 @@ def modularize():
23922392
async_emit = 'async '
23932393

23942394
if settings.MODULARIZE == 'instance':
2395-
src = '''
2395+
wrapper_function = '''
23962396
export default async function init(moduleArg = {}) {
23972397
var moduleRtn;
23982398
2399-
%(src)s
2399+
%(generated_js)s
24002400
24012401
return await moduleRtn;
24022402
}
24032403
''' % {
2404-
'src': src,
2404+
'generated_js': generated_js
24052405
}
24062406
else:
2407-
src = '''
2407+
wrapper_function = '''
24082408
%(maybe_async)sfunction(moduleArg = {}) {
24092409
var moduleRtn;
24102410
2411-
%(src)s
2411+
%(generated_js)s
24122412
24132413
return moduleRtn;
24142414
}
24152415
''' % {
24162416
'maybe_async': async_emit,
2417-
'src': src,
2417+
'generated_js': generated_js
24182418
}
24192419

24202420
if settings.MINIMAL_RUNTIME and not settings.PTHREADS:
24212421
# Single threaded MINIMAL_RUNTIME programs do not need access to
24222422
# document.currentScript, so a simple export declaration is enough.
2423-
src = '/** @nocollapse */ var %s = %s' % (settings.EXPORT_NAME, src)
2423+
src = f'/** @nocollapse */ var {settings.EXPORT_NAME} = {wrapper_function};'
24242424
else:
24252425
script_url_node = ''
24262426
# When MODULARIZE this JS may be executed later,
@@ -2438,24 +2438,24 @@ def modularize():
24382438
src = '''\
24392439
var _scriptName = %(script_url)s;
24402440
%(script_url_node)s
2441-
%(src)s
2441+
%(wrapper_function)s
24422442
''' % {
24432443
'script_url': script_url,
24442444
'script_url_node': script_url_node,
2445-
'src': src,
2445+
'wrapper_function': wrapper_function,
24462446
}
24472447
else:
24482448
src = '''\
24492449
var %(EXPORT_NAME)s = (() => {
24502450
var _scriptName = %(script_url)s;
24512451
%(script_url_node)s
2452-
return (%(src)s);
2452+
return (%(wrapper_function)s);
24532453
})();
24542454
''' % {
24552455
'EXPORT_NAME': settings.EXPORT_NAME,
24562456
'script_url': script_url,
24572457
'script_url_node': script_url_node,
2458-
'src': src,
2458+
'wrapper_function': wrapper_function,
24592459
}
24602460

24612461
# Given the async nature of how the Module function and Module object

0 commit comments

Comments
 (0)