Changed Throwable.toString to only print the current exception, not the entire chain. Also added support for Error.bypassedException in the uncaught exception display code.

Author: complexmath

src/object_.d

@@ -1253,24 +1253,23 @@ class Throwable : Object
         char[20] tmp = void;
         char[]   buf;
 
-        for (Throwable e = this; e !is null; e = e.next)
+        if (file)
         {
-            if (e.file)
-            {
-               buf ~= e.classinfo.name ~ "@" ~ e.file ~ "(" ~ tmp.intToString(e.line) ~ "): " ~ e.msg;
-            }
-            else
-            {
-               buf ~= e.classinfo.name ~ ": " ~ e.msg;
-            }
-            if (e.info)
-            {
-                buf ~= "\n----------------";
-                foreach (t; e.info)
-                    buf ~= "\n" ~ t;
-            }
-            if (e.next)
-                buf ~= "\n";
+           buf ~= this.classinfo.name ~ "@" ~ file ~ "(" ~ tmp.intToString(line) ~ ")";
+        }
+        else
+        {
+            buf ~= this.classinfo.name;
+        }
+        if (msg)
+        {
+            buf ~= ": " ~ msg;
+        }
+        if (info)
+        {
+            buf ~= "\n----------------";
+            foreach (t; info)
+                buf ~= "\n" ~ t;
         }
         return cast(string) buf;
     }

src/rt/dmain2.d

@@ -395,40 +395,84 @@ extern (C) int main(int argc, char** argv)
 
     void tryExec(scope void delegate() dg)
     {
+        void printLocLine(Throwable t)
+        {
+            if (t.file)
+            {
+               console(t.classinfo.name)("@")(t.file)("(")(t.line)(")");
+            }
+            else
+            {
+                console(t.classinfo.name);
+            }
+            console("\n");
+        }
+
+        void printMsgLine(Throwable t)
+        {
+            if (t.file)
+            {
+               console(t.classinfo.name)("@")(t.file)("(")(t.line)(")");
+            }
+            else
+            {
+                console(t.classinfo.name);
+            }
+            if (t.msg)
+            {
+                console(": ")(t.msg);
+            }
+            console("\n");
+        }
+
+        void printInfoBlock(Throwable t)
+        {
+            if (t.info)
+            {
+                console("----------------\n");
+                foreach (i; t.info)
+                    console(i)("\n");
+                console("----------------\n");
+            }
+        }
+
+        void print(Throwable t)
+        {
+            Throwable firstWithBypass = null;
+
+            for (; t; t = t.next)
+            {
+                printMsgLine(t);
+                printInfoBlock(t);
+                auto e = cast(Error) t;
+                if (e && e.bypassedException)
+                {
+                    console("Bypasses ");
+                    printLocLine(e.bypassedException);
+                    if (firstWithBypass is null)
+                        firstWithBypass = t;
+                }
+            }
+            if (firstWithBypass is null)
+                return;
+            console("=== Bypassed ===\n");
+            for (t = firstWithBypass; t; t = t.next)
+            {
+                auto e = cast(Error) t;
+                if (e && e.bypassedException)
+                    print(e.bypassedException);
+            }
+        }
 
         if (trapExceptions)
         {
             try
             {
                 dg();
             }
-            catch (Throwable e)
+            catch (Throwable t)
             {
-                /+
-                while (e)
-                {
-                    if (e.file)
-                    {
-                        // fprintf(stderr, "%.*s(%u): %.*s\n", e.file, e.line, e.msg);
-                        console (e.classinfo.name)("@")(e.file)("(")(e.line)("): ")(e.msg)("\n");
-                    }
-                    else
-                    {
-                        // fprintf(stderr, "%.*s\n", e.toString());
-                        console (e.toString)("\n");
-                    }
-                    if (e.info)
-                    {
-                        console ("----------------\n");
-                        foreach (t; e.info)
-                            console (t)("\n");
-                    }
-                    if (e.next)
-                        console ("\n");
-                    e = e.next;
-                }
-                +/
-                console (e.toString)("\n");
+                print(t);
                 result = EXIT_FAILURE;
             }
         }