Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Format NAMED_GLOBALS in generated JS. NFC. #8432

Merged
merged 1 commit into from
Apr 11, 2019
Merged

Format NAMED_GLOBALS in generated JS. NFC. #8432

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions emscripten.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1746,12 +1746,14 @@ def create_named_globals(metadata):
return ''

named_globals = '''
var NAMED_GLOBALS = { %s };
var NAMED_GLOBALS = {
%s
};
for (var named in NAMED_GLOBALS) {
Module['_' + named] = gb + NAMED_GLOBALS[named];
}
Module['NAMED_GLOBALS'] = NAMED_GLOBALS;
''' % ', '.join('"' + k + '": ' + str(v) for k, v in metadata['namedGlobals'].items())
''' % ',\n '.join('"' + k + '": ' + str(v) for k, v in metadata['namedGlobals'].items())

if shared.Settings.WASM:
# wasm side modules are pure wasm, and cannot create their g$..() methods, so we help them out
Expand All @@ -1761,8 +1763,8 @@ def create_named_globals(metadata):
named_globals += '''
for (var named in NAMED_GLOBALS) {
(function(named) {
var func = Module['_' + named];
Module['g$_' + named] = function() { return func };
var addr = Module['_' + named];
Module['g$_' + named] = function() { return addr };
})(named);
}
'''
Expand Down