aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2011-10-22 13:30:59 -0700
committerAlon Zakai <alonzakai@gmail.com>2011-10-22 13:30:59 -0700
commit0e0ad51a8dc8d692b7c7b08da91b95c357cbfcb4 (patch)
treefe0ccbab312dd11c0f0417f1b5a339c05f631d20 /src
parentdc2c294d3a35479574536c7895a183e68505a95a (diff)
fix EMSCRIPTEN_COMMENT
Diffstat (limited to 'src')
-rw-r--r--src/library.js4
-rw-r--r--src/parseTools.js14
2 files changed, 15 insertions, 3 deletions
diff --git a/src/library.js b/src/library.js
index a9476b73..faa86c68 100644
--- a/src/library.js
+++ b/src/library.js
@@ -5415,9 +5415,7 @@ LibraryManager.library = {
},
EMSCRIPTEN_COMMENT__inline: function(param) {
- if (param.indexOf('CHECK_OVERFLOW') >= 0) {
- param = param.split('(')[1].split(',')[0];
- }
+ param = stripCorrections(param);
return '// ' + Variables.globals[param].value.text.replace('\\00', '') + ' ';
}
};
diff --git a/src/parseTools.js b/src/parseTools.js
index f50092c7..2e7e1970 100644
--- a/src/parseTools.js
+++ b/src/parseTools.js
@@ -1382,3 +1382,17 @@ function finalizeBlockAddress(param) {
return Functions.currFunctions[param.func].labelIds[param.label]; // XXX We rely on currFunctions here...?
}
+function stripCorrections(param) {
+ var m;
+ if (m = /^\((.*)\)$/.exec(param)) {
+ param = m[1];
+ }
+ if (m = /^\((\w+)\)&\d+$/.exec(param)) {
+ param = m[1];
+ }
+ if (m = /CHECK_OVERFLOW\(([^,)]*),.*/.exec(param)) {
+ param = m[1];
+ }
+ return param;
+}
+