diff --git a/emcc.py b/emcc.py index 1386d857a3cad..be33657e9ddeb 100755 --- a/emcc.py +++ b/emcc.py @@ -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 '' diff --git a/src/arrayUtils.js b/src/arrayUtils.js index b4c1d02518e2b..4568c4228b34d 100644 --- a/src/arrayUtils.js +++ b/src/arrayUtils.js @@ -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(''); +}