Formatting fixes from sbc100

src/library_exceptions.js

@@ -431,8 +431,8 @@ var LibraryExceptions = {
 
 #if !DISABLE_EXCEPTION_CATCHING
   $formatException__deps: ["emscripten_format_exception", "$withStackSave", "free"],
-  $formatException: function(excPtr){
-      return withStackSave(function(){
+  $formatException: function(excPtr) {
+    return withStackSave(function(){
       var result_ptr = stackAlloc({{{ POINTER_SIZE }}});
       _emscripten_format_exception(result_ptr, excPtr);
       var utf8_addr = {{{ makeGetValue('result_ptr', '0', '*') }}};

system/lib/libcxxabi/src/format_exception.cpp

@@ -6,7 +6,6 @@
 #ifdef __USING_EMSCRIPTEN_EXCEPTIONS__
 
 extern "C" {
-#define DEMANGLED_BUF_SIZE 100
 
 int __cxa_can_catch(const std::type_info* catchType,
                     const std::type_info* excpType,

tests/test_core.py

@@ -1550,21 +1550,17 @@ def test_format_exception(self):
     self.set_setting('FORMAT_EXCEPTION_SUPPORT')
     self.set_setting('DISABLE_EXCEPTION_CATCHING', 0)
     self.maybe_closure()
-    self.do_run(
-      """
+    self.do_run('''
       #include <emscripten.h>
       #include <exception>
       #include <stdexcept>
       using namespace std;
 
-      class myexception : public exception
-      {
+      class myexception : public exception {
         virtual const char* what() const throw() { return "My exception happened"; }
       } myex;
 
-      extern "C" void
-      throw_exc(int x)
-      {
+      extern "C" void throw_exc(int x) {
         if (x == 1) {
           throw 1000;
         }
@@ -1582,25 +1578,24 @@ class myexception : public exception
         }
       }
 
-      int
-      main(){
+      int main() {
           EM_ASM({
-            for(let i = 1; i < 6; i++){
+            for (let i = 1; i < 6; i++){
               try {
                   Module["_throw_exc"](i);
-              } catch(p){
+              } catch(p) {
                   console.log(Module["formatException"](p).replace(/0x[0-9a-f]*/, "xxx"));
               }
             }
           });
       }
-      """,
-      "Cpp Exception: The exception is an object of type 'int' at address xxx which does not inherit from std::exception\n"
-      "Cpp Exception: The exception is an object of type 'char' at address xxx which does not inherit from std::exception\n"
-      "Cpp Exception std::runtime_error: abc\n"
-      "Cpp Exception myexception: My exception happened\n"
-      "Cpp Exception: The exception is an object of type 'char const*' at address xxx which does not inherit from std::exception\n"
-    )
+      ''', '''
+      Cpp Exception: The exception is an object of type 'int' at address xxx which does not inherit from std::exception
+      Cpp Exception: The exception is an object of type 'char' at address xxx which does not inherit from std::exception
+      Cpp Exception std::runtime_error: abc
+      Cpp Exception myexception: My exception happened
+      Cpp Exception: The exception is an object of type 'char const*' at address xxx which does not inherit from std::exception
+    ''')
 
   @with_both_eh_sjlj
   def test_bad_typeid(self):

tools/system_libs.py

@@ -1128,7 +1128,7 @@ def get_files(self):
       'stdlib_stdexcept.cpp',
       'stdlib_typeinfo.cpp',
       'private_typeinfo.cpp',
-      'format_exception.cpp'
+      'format_exception.cpp',
     ]
     if self.eh_mode == Exceptions.NONE:
       filenames += ['cxa_noexception.cpp']