fix closure issues with exception handling, and add test coverage

2 files changed, 6 insertions, 2 deletions

diff --git a/src/library.js b/src/library.js
index 3dbf738d..c491f078 100644
--- a/src/library.js
+++ b/src/library.js
@@ -4587,12 +4587,12 @@ LibraryManager.library = {
     // return the type of the catch block which should be called.
     for (var i = 0; i < typeArray.length; i++) {
       if (___cxa_does_inherit(typeArray[i], throwntype, thrown))
-        return { 'f0':thrown, 'f1':typeArray[i]};
+        return { f0:thrown, f1:typeArray[i] };
     }
     // Shouldn't happen unless we have bogus data in typeArray
     // or encounter a type for which emscripten doesn't have suitable
     // typeinfo defined. Best-efforts match just in case.
-    return {'f0':thrown,'f1':throwntype};
+    return { f0:thrown, f1 :throwntype };
   },
 
   // Recursively walks up the base types of 'possibilityType'
diff --git a/src/shell.js b/src/shell.js
index ab54c284..e48be3b0 100644
--- a/src/shell.js
+++ b/src/shell.js
@@ -115,6 +115,10 @@ if (!Module['arguments']) {
 }
 // *** Environment setup code ***
 
+// Closure helpers
+Module.print = Module['print'];
+Module.printErr = Module['printErr'];
+
   {{BODY}}
 
   // {{MODULE_ADDITIONS}}