Skip to content

Commit 191bc70

Browse files
committed
Avoid excessive variable reuse in modularize function. NFC
I think this makes it a little easier to follow.
1 parent f66b5d7 commit 191bc70

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

tools/link.py

+12-12
Original file line numberDiff line numberDiff line change
@@ -2377,7 +2377,7 @@ def node_pthread_detection():
23772377
def modularize():
23782378
global final_js
23792379
logger.debug(f'Modularizing, assigning to var {settings.EXPORT_NAME}')
2380-
src = read_file(final_js)
2380+
generated_js = read_file(final_js)
23812381

23822382
# When targetting node and ES6 we use `await import ..` in the generated code
23832383
# so the outer function needs to be marked as async.
@@ -2386,35 +2386,35 @@ def modularize():
23862386
async_emit = 'async '
23872387

23882388
if settings.MODULARIZE == 'instance':
2389-
src = '''
2389+
wrapper_function = '''
23902390
export default async function init(moduleArg = {}) {
23912391
var moduleRtn;
23922392
2393-
%(src)s
2393+
%(generated_js)s
23942394
23952395
return await moduleRtn;
23962396
}
23972397
''' % {
2398-
'src': src,
2398+
'generated_js': generated_js
23992399
}
24002400
else:
2401-
src = '''
2401+
wrapper_function = '''
24022402
%(maybe_async)sfunction(moduleArg = {}) {
24032403
var moduleRtn;
24042404
2405-
%(src)s
2405+
%(generated_js)s
24062406
24072407
return moduleRtn;
24082408
}
24092409
''' % {
24102410
'maybe_async': async_emit,
2411-
'src': src,
2411+
'generated_js': generated_js
24122412
}
24132413

24142414
if settings.MINIMAL_RUNTIME and not settings.PTHREADS:
24152415
# Single threaded MINIMAL_RUNTIME programs do not need access to
24162416
# document.currentScript, so a simple export declaration is enough.
2417-
src = '/** @nocollapse */ var %s = %s' % (settings.EXPORT_NAME, src)
2417+
src = f'/** @nocollapse */ var {settings.EXPORT_NAME} = {wrapper_function};'
24182418
else:
24192419
script_url_node = ''
24202420
# When MODULARIZE this JS may be executed later,
@@ -2432,24 +2432,24 @@ def modularize():
24322432
src = '''\
24332433
var _scriptName = %(script_url)s;
24342434
%(script_url_node)s
2435-
%(src)s
2435+
%(wrapper_function)s
24362436
''' % {
24372437
'script_url': script_url,
24382438
'script_url_node': script_url_node,
2439-
'src': src,
2439+
'wrapper_function': wrapper_function,
24402440
}
24412441
else:
24422442
src = '''\
24432443
var %(EXPORT_NAME)s = (() => {
24442444
var _scriptName = %(script_url)s;
24452445
%(script_url_node)s
2446-
return (%(src)s);
2446+
return (%(wrapper_function)s);
24472447
})();
24482448
''' % {
24492449
'EXPORT_NAME': settings.EXPORT_NAME,
24502450
'script_url': script_url,
24512451
'script_url_node': script_url_node,
2452-
'src': src,
2452+
'wrapper_function': wrapper_function,
24532453
}
24542454

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

0 commit comments

Comments
 (0)