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

Fix for undefined ASSERTIONS variable in html output of emcc #5749

Merged
merged 2 commits into from
Nov 9, 2017
Merged

Fix for undefined ASSERTIONS variable in html output of emcc #5749

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a082480
Fix for undefined `ASSERTIONS` variable in html output of emcc
nazar-pc Nov 8, 2017
1f862d3
Simplify `intArrayToString` even further
nazar-pc Nov 8, 2017
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
2 changes: 2 additions & 0 deletions emcc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2574,6 +2574,8 @@ def generate_html(target, options, js_target, target_basename,
script.inline = f.read() + script.inline
f.close()

script.inline = 'var ASSERTIONS = %s;\n%s' % (shared.Settings.ASSERTIONS, script.inline)

# inline script for SINGLE_FILE output
if shared.Settings.SINGLE_FILE:
js_contents = script.inline or ''
Expand Down
32 changes: 10 additions & 22 deletions src/arrayUtils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,29 +9,17 @@ function intArrayFromString(stringy, dontAddNull, length) {
return u8array;
}

// Temporarily duplicating function pending Python preprocessor support
var intArrayToString = ASSERTIONS ?
function (array) {
var ret = [];
for (var i = 0; i < array.length; i++) {
var chr = array[i];
if (chr > 0xFF) {
function intArrayToString(array) {
var ret = [];
for (var i = 0; i < array.length; i++) {
var chr = array[i];
if (chr > 0xFF) {
if (ASSERTIONS) {
assert(false, 'Character code ' + chr + ' (' + String.fromCharCode(chr) + ') at offset ' + i + ' not in 0x00-0xFF.');
chr &= 0xFF;
}
ret.push(String.fromCharCode(chr));
chr &= 0xFF;
}
return ret.join('');
} :
function (array) {
var ret = [];
for (var i = 0; i < array.length; i++) {
var chr = array[i];
if (chr > 0xFF) {
chr &= 0xFF;
}
ret.push(String.fromCharCode(chr));
}
return ret.join('');
ret.push(String.fromCharCode(chr));
}
;
return ret.join('');
}