1 files changed, 285 insertions, 285 deletions

diff --git a/test/files/run/inner-obj-auto.scala b/test/files/run/inner-obj-auto.scala
index aa2e29326f..00ea5119cc 100644
--- a/test/files/run/inner-obj-auto.scala
+++ b/test/files/run/inner-obj-auto.scala
@@ -3,15 +3,15 @@
 /* ================================================================================
          Automatically generated on 2011-05-11. Do Not Edit (unless you have to).
          (2-level nesting)
-   ================================================================================ */ 
+   ================================================================================ */
 
 
 
 class Class2_1 {
-  
+
   class Class1_2 {
     var ObjCounter = 0
-    
+
     object Obj  { ObjCounter += 1}
     Obj // one
 
@@ -25,22 +25,22 @@ class Class2_1 {
         assert(ObjCounter == 1, "multiple instances: " + ObjCounter)
         println("ok")
       } catch {
-        case e =>  print("failed "); e.printStackTrace()
+        case e: Throwable =>  print("failed "); e.printStackTrace()
       }
     }
 
     def run { runTest }
   }
-  
+
   def run { (new Class1_2).run }
 }
 
 
 object Object3_1 {
-  
+
   class Class1_2 {
     var ObjCounter = 0
-    
+
     object Obj  { ObjCounter += 1}
     Obj // one
 
@@ -54,22 +54,22 @@ object Object3_1 {
         assert(ObjCounter == 1, "multiple instances: " + ObjCounter)
         println("ok")
       } catch {
-        case e =>  print("failed "); e.printStackTrace()
+        case e: Throwable =>  print("failed "); e.printStackTrace()
       }
     }
 
     def run { runTest }
   }
-  
+
   def run { (new Class1_2).run } // trigger
 }
 
 
 trait Trait4_1 {
-  
+
   class Class1_2 {
     var ObjCounter = 0
-    
+
     object Obj  { ObjCounter += 1}
     Obj // one
 
@@ -83,22 +83,22 @@ trait Trait4_1 {
         assert(ObjCounter == 1, "multiple instances: " + ObjCounter)
         println("ok")
       } catch {
-        case e =>  print("failed "); e.printStackTrace()
+        case e: Throwable =>  print("failed "); e.printStackTrace()
       }
     }
 
     def run { runTest }
   }
-  
+
   def run { (new Class1_2).run }
 }
 
 
 class Class6_1 {
-  
+
   object Object5_2 {
     var ObjCounter = 0
-    
+
     object Obj  { ObjCounter += 1}
     Obj // one
 
@@ -112,22 +112,22 @@ class Class6_1 {
         assert(ObjCounter == 1, "multiple instances: " + ObjCounter)
         println("ok")
       } catch {
-        case e =>  print("failed "); e.printStackTrace()
+        case e: Throwable =>  print("failed "); e.printStackTrace()
       }
     }
 
     def run { runTest } // trigger
   }
-  
+
   def run { Object5_2.run }
 }
 
 
 object Object7_1 {
-  
+
   object Object5_2 {
     var ObjCounter = 0
-    
+
     object Obj  { ObjCounter += 1}
     Obj // one
 
@@ -141,22 +141,22 @@ object Object7_1 {
         assert(ObjCounter == 1, "multiple instances: " + ObjCounter)
         println("ok")
       } catch {
-        case e =>  print("failed "); e.printStackTrace()
+        case e: Throwable =>  print("failed "); e.printStackTrace()
       }
     }
 
     def run { runTest } // trigger
   }
-  
+
   def run { Object5_2.run } // trigger
 }
 
 
 trait Trait8_1 {
-  
+
   object Object5_2 {
     var ObjCounter = 0
-    
+
     object Obj  { ObjCounter += 1}
     Obj // one
 
@@ -170,22 +170,22 @@ trait Trait8_1 {
         assert(ObjCounter == 1, "multiple instances: " + ObjCounter)
         println("ok")
       } catch {
-        case e =>  print("failed "); e.printStackTrace()
+        case e: Throwable =>  print("failed "); e.printStackTrace()
       }
     }
 
     def run { runTest } // trigger
   }
-  
+
   def run { Object5_2.run }
 }
 
 
 class Class10_1 {
-  
+
   trait Trait9_2 {
     var ObjCounter = 0
-    
+
     object Obj  { ObjCounter += 1}
     Obj // one
 
@@ -199,22 +199,22 @@ class Class10_1 {
         assert(ObjCounter == 1, "multiple instances: " + ObjCounter)
         println("ok")
       } catch {
-        case e =>  print("failed "); e.printStackTrace()
+        case e: Throwable =>  print("failed "); e.printStackTrace()
       }
     }
 
     def run { runTest }
   }
-  
+
   def run { (new Trait9_2 {}).run }
 }
 
 
 object Object11_1 {
-  
+
   trait Trait9_2 {
     var ObjCounter = 0
-    
+
     object Obj  { ObjCounter += 1}
     Obj // one
 
@@ -228,22 +228,22 @@ object Object11_1 {
         assert(ObjCounter == 1, "multiple instances: " + ObjCounter)
         println("ok")
       } catch {
-        case e =>  print("failed "); e.printStackTrace()
+        case e: Throwable =>  print("failed "); e.printStackTrace()
       }
     }
 
     def run { runTest }
   }
-  
+
   def run { (new Trait9_2 {}).run } // trigger
 }
 
 
 trait Trait12_1 {
-  
+
   trait Trait9_2 {
     var ObjCounter = 0
-    
+
     object Obj  { ObjCounter += 1}
     Obj // one
 
@@ -257,22 +257,22 @@ trait Trait12_1 {
         assert(ObjCounter == 1, "multiple instances: " + ObjCounter)
         println("ok")
       } catch {
-        case e =>  print("failed "); e.printStackTrace()
+        case e: Throwable =>  print("failed "); e.printStackTrace()
       }
     }
 
     def run { runTest }
   }
-  
+
   def run { (new Trait9_2 {}).run }
 }
 
 
 class Class14_1 {
-  
+
   def method13_2 {
     var ObjCounter = 0
-    
+
     object Obj  { ObjCounter += 1}
     Obj // one
 
@@ -286,22 +286,22 @@ class Class14_1 {
         assert(ObjCounter == 1, "multiple instances: " + ObjCounter)
         println("ok")
       } catch {
-        case e =>  print("failed "); e.printStackTrace()
+        case e: Throwable =>  print("failed "); e.printStackTrace()
       }
     }
 
     runTest // trigger
   }
-  
+
   def run { method13_2 }
 }
 
 
 object Object15_1 {
-  
+
   def method13_2 {
     var ObjCounter = 0
-    
+
     object Obj  { ObjCounter += 1}
     Obj // one
 
@@ -315,22 +315,22 @@ object Object15_1 {
         assert(ObjCounter == 1, "multiple instances: " + ObjCounter)
         println("ok")
       } catch {
-        case e =>  print("failed "); e.printStackTrace()
+        case e: Throwable =>  print("failed "); e.printStackTrace()
       }
     }
 
     runTest // trigger
   }
-  
+
   def run { method13_2 } // trigger
 }
 
 
 trait Trait16_1 {
-  
+
   def method13_2 {
     var ObjCounter = 0
-    
+
     object Obj  { ObjCounter += 1}
     Obj // one
 
@@ -344,22 +344,22 @@ trait Trait16_1 {
         assert(ObjCounter == 1, "multiple instances: " + ObjCounter)
         println("ok")
       } catch {
-        case e =>  print("failed "); e.printStackTrace()
+        case e: Throwable =>  print("failed "); e.printStackTrace()
       }
     }
 
     runTest // trigger
   }
-  
+
   def run { method13_2 }
 }
 
 
 class Class18_1 {
-  
+
   private def method17_2 {
     var ObjCounter = 0
-    
+
     object Obj  { ObjCounter += 1}
     Obj // one
 
@@ -373,22 +373,22 @@ class Class18_1 {
         assert(ObjCounter == 1, "multiple instances: " + ObjCounter)
         println("ok")
       } catch {
-        case e =>  print("failed "); e.printStackTrace()
+        case e: Throwable =>  print("failed "); e.printStackTrace()
       }
     }
 
     runTest // trigger
   }
-  
+
   def run { method17_2 }
 }
 
 
 object Object19_1 {
-  
+
   private def method17_2 {
     var ObjCounter = 0
-    
+
     object Obj  { ObjCounter += 1}
     Obj // one
 
@@ -402,22 +402,22 @@ object Object19_1 {
         assert(ObjCounter == 1, "multiple instances: " + ObjCounter)
         println("ok")
       } catch {
-        case e =>  print("failed "); e.printStackTrace()
+        case e: Throwable =>  print("failed "); e.printStackTrace()
       }
     }
 
     runTest // trigger
   }
-  
+
   def run { method17_2 } // trigger
 }
 
 
 trait Trait20_1 {
-  
+
   private def method17_2 {
     var ObjCounter = 0
-    
+
     object Obj  { ObjCounter += 1}
     Obj // one
 
@@ -431,22 +431,22 @@ trait Trait20_1 {
         assert(ObjCounter == 1, "multiple instances: " + ObjCounter)
         println("ok")
       } catch {
-        case e =>  print("failed "); e.printStackTrace()
+        case e: Throwable =>  print("failed "); e.printStackTrace()
       }
     }
 
     runTest // trigger
   }
-  
+
   def run { method17_2 }
 }
 
 
 class Class22_1 {
-  
+
   val fun21_2 = () => {
     var ObjCounter = 0
-    
+
     object Obj  { ObjCounter += 1}
     Obj // one
 
@@ -460,22 +460,22 @@ class Class22_1 {
         assert(ObjCounter == 1, "multiple instances: " + ObjCounter)
         println("ok")
       } catch {
-        case e =>  print("failed "); e.printStackTrace()
+        case e: Throwable =>  print("failed "); e.printStackTrace()
       }
     }
 
     runTest // trigger
   }
-  
+
   def run { fun21_2() }
 }
 
 
 object Object23_1 {
-  
+
   val fun21_2 = () => {
     var ObjCounter = 0
-    
+
     object Obj  { ObjCounter += 1}
     Obj // one
 
@@ -489,22 +489,22 @@ object Object23_1 {
         assert(ObjCounter == 1, "multiple instances: " + ObjCounter)
         println("ok")
       } catch {
-        case e =>  print("failed "); e.printStackTrace()
+        case e: Throwable =>  print("failed "); e.printStackTrace()
       }
     }
 
     runTest // trigger
   }
-  
+
   def run { fun21_2() } // trigger
 }
 
 
 trait Trait24_1 {
-  
+
   val fun21_2 = () => {
     var ObjCounter = 0
-    
+
     object Obj  { ObjCounter += 1}
     Obj // one
 
@@ -518,23 +518,23 @@ trait Trait24_1 {
         assert(ObjCounter == 1, "multiple instances: " + ObjCounter)
         println("ok")
       } catch {
-        case e =>  print("failed "); e.printStackTrace()
+        case e: Throwable =>  print("failed "); e.printStackTrace()
       }
     }
 
     runTest // trigger
   }
-  
+
   def run { fun21_2() }
 }
 
 
 class Class26_1 {
-  
+
   class Class25_2 {
-    { // in primary constructor 
+    { // in primary constructor
       var ObjCounter = 0
-      
+
       object Obj  { ObjCounter += 1}
       Obj // one
 
@@ -548,24 +548,24 @@ class Class26_1 {
           assert(ObjCounter == 1, "multiple instances: " + ObjCounter)
           println("ok")
         } catch {
-          case e =>  print("failed "); e.printStackTrace()
+          case e: Throwable =>  print("failed "); e.printStackTrace()
         }
       }
 
       runTest // trigger
-    } 
+    }
   }
-  
+
   def run { (new Class25_2) }
 }
 
 
 object Object27_1 {
-  
+
   class Class25_2 {
-    { // in primary constructor 
+    { // in primary constructor
       var ObjCounter = 0
-      
+
       object Obj  { ObjCounter += 1}
       Obj // one
 
@@ -579,24 +579,24 @@ object Object27_1 {
           assert(ObjCounter == 1, "multiple instances: " + ObjCounter)
           println("ok")
         } catch {
-          case e =>  print("failed "); e.printStackTrace()
+          case e: Throwable =>  print("failed "); e.printStackTrace()
         }
       }
 
       runTest // trigger
-    } 
+    }
   }
-  
+
   def run { (new Class25_2) } // trigger
 }
 
 
 trait Trait28_1 {
-  
+
   class Class25_2 {
-    { // in primary constructor 
+    { // in primary constructor
       var ObjCounter = 0
-      
+
       object Obj  { ObjCounter += 1}
       Obj // one
 
@@ -610,24 +610,24 @@ trait Trait28_1 {
           assert(ObjCounter == 1, "multiple instances: " + ObjCounter)
           println("ok")
         } catch {
-          case e =>  print("failed "); e.printStackTrace()
+          case e: Throwable =>  print("failed "); e.printStackTrace()
         }
       }
 
       runTest // trigger
-    } 
+    }
   }
-  
+
   def run { (new Class25_2) }
 }
 
 
 class Class30_1 {
-  
+
   trait Trait29_2 {
-    { // in primary constructor 
+    { // in primary constructor
       var ObjCounter = 0
-      
+
       object Obj  { ObjCounter += 1}
       Obj // one
 
@@ -641,24 +641,24 @@ class Class30_1 {
           assert(ObjCounter == 1, "multiple instances: " + ObjCounter)
           println("ok")
         } catch {
-          case e =>  print("failed "); e.printStackTrace()
+          case e: Throwable =>  print("failed "); e.printStackTrace()
         }
       }
 
       runTest // trigger
-    } 
+    }
   }
-  
+
   def run { (new Trait29_2 {}) }
 }
 
 
 object Object31_1 {
-  
+
   trait Trait29_2 {
-    { // in primary constructor 
+    { // in primary constructor
       var ObjCounter = 0
-      
+
       object Obj  { ObjCounter += 1}
       Obj // one
 
@@ -672,24 +672,24 @@ object Object31_1 {
           assert(ObjCounter == 1, "multiple instances: " + ObjCounter)
           println("ok")
         } catch {
-          case e =>  print("failed "); e.printStackTrace()
+          case e: Throwable =>  print("failed "); e.printStackTrace()
         }
       }
 
       runTest // trigger
-    } 
+    }
   }
-  
+
   def run { (new Trait29_2 {}) } // trigger
 }
 
 
 trait Trait32_1 {
-  
+
   trait Trait29_2 {
-    { // in primary constructor 
+    { // in primary constructor
       var ObjCounter = 0
-      
+
       object Obj  { ObjCounter += 1}
       Obj // one
 
@@ -703,23 +703,23 @@ trait Trait32_1 {
           assert(ObjCounter == 1, "multiple instances: " + ObjCounter)
           println("ok")
         } catch {
-          case e =>  print("failed "); e.printStackTrace()
+          case e: Throwable =>  print("failed "); e.printStackTrace()
         }
       }
 
       runTest // trigger
-    } 
+    }
   }
-  
+
   def run { (new Trait29_2 {}) }
 }
 
 
 class Class34_1 {
-  
+
   lazy val lzvalue33_2 = {
     var ObjCounter = 0
-    
+
     object Obj  { ObjCounter += 1}
     Obj // one
 
@@ -733,22 +733,22 @@ class Class34_1 {
         assert(ObjCounter == 1, "multiple instances: " + ObjCounter)
         println("ok")
       } catch {
-        case e =>  print("failed "); e.printStackTrace()
+        case e: Throwable =>  print("failed "); e.printStackTrace()
       }
     }
 
     runTest // trigger
   }
-  
+
   def run { lzvalue33_2 }
 }
 
 
 object Object35_1 {
-  
+
   lazy val lzvalue33_2 = {
     var ObjCounter = 0
-    
+
     object Obj  { ObjCounter += 1}
     Obj // one
 
@@ -762,22 +762,22 @@ object Object35_1 {
         assert(ObjCounter == 1, "multiple instances: " + ObjCounter)
         println("ok")
       } catch {
-        case e =>  print("failed "); e.printStackTrace()
+        case e: Throwable =>  print("failed "); e.printStackTrace()
       }
     }
 
     runTest // trigger
   }
-  
+
   def run { lzvalue33_2 } // trigger
 }
 
 
 trait Trait36_1 {
-  
+
   lazy val lzvalue33_2 = {
     var ObjCounter = 0
-    
+
     object Obj  { ObjCounter += 1}
     Obj // one
 
@@ -791,22 +791,22 @@ trait Trait36_1 {
         assert(ObjCounter == 1, "multiple instances: " + ObjCounter)
         println("ok")
       } catch {
-        case e =>  print("failed "); e.printStackTrace()
+        case e: Throwable =>  print("failed "); e.printStackTrace()
       }
     }
 
     runTest // trigger
   }
-  
+
   def run { lzvalue33_2 }
 }
 
 
 class Class38_1 {
-  
+
   val value37_2 = {
     var ObjCounter = 0
-    
+
     object Obj  { ObjCounter += 1}
     Obj // one
 
@@ -820,22 +820,22 @@ class Class38_1 {
         assert(ObjCounter == 1, "multiple instances: " + ObjCounter)
         println("ok")
       } catch {
-        case e =>  print("failed "); e.printStackTrace()
+        case e: Throwable =>  print("failed "); e.printStackTrace()
       }
     }
 
     runTest // trigger
   }
-  
+
   def run { value37_2 }
 }
 
 
 object Object39_1 {
-  
+
   val value37_2 = {
     var ObjCounter = 0
-    
+
     object Obj  { ObjCounter += 1}
     Obj // one
 
@@ -849,22 +849,22 @@ object Object39_1 {
         assert(ObjCounter == 1, "multiple instances: " + ObjCounter)
         println("ok")
       } catch {
-        case e =>  print("failed "); e.printStackTrace()
+        case e: Throwable =>  print("failed "); e.printStackTrace()
       }
     }
 
     runTest // trigger
   }
-  
+
   def run { value37_2 } // trigger
 }
 
 
 trait Trait40_1 {
-  
+
   val value37_2 = {
     var ObjCounter = 0
-    
+
     object Obj  { ObjCounter += 1}
     Obj // one
 
@@ -878,22 +878,22 @@ trait Trait40_1 {
         assert(ObjCounter == 1, "multiple instances: " + ObjCounter)
         println("ok")
       } catch {
-        case e =>  print("failed "); e.printStackTrace()
+        case e: Throwable =>  print("failed "); e.printStackTrace()
       }
     }
 
     runTest // trigger
   }
-  
+
   def run { value37_2 }
 }
 
 
 class Class42_1 {
-  
+
   class Class41_2 {
     var ObjCounter = 0
-    
+
     private object Obj  { ObjCounter += 1}
     Obj // one
 
@@ -907,22 +907,22 @@ class Class42_1 {
         assert(ObjCounter == 1, "multiple instances: " + ObjCounter)
         println("ok")
       } catch {
-        case e =>  print("failed "); e.printStackTrace()
+        case e: Throwable =>  print("failed "); e.printStackTrace()
       }
     }
 
     def run { runTest }
   }
-  
+
   def run { (new Class41_2).run }
 }
 
 
 object Object43_1 {
-  
+
   class Class41_2 {
     var ObjCounter = 0
-    
+
     private object Obj  { ObjCounter += 1}
     Obj // one
 
@@ -936,22 +936,22 @@ object Object43_1 {
         assert(ObjCounter == 1, "multiple instances: " + ObjCounter)
         println("ok")
       } catch {
-        case e =>  print("failed "); e.printStackTrace()
+        case e: Throwable =>  print("failed "); e.printStackTrace()
       }
     }
 
     def run { runTest }
   }
-  
+
   def run { (new Class41_2).run } // trigger
 }
 
 
 trait Trait44_1 {
-  
+
   class Class41_2 {
     var ObjCounter = 0
-    
+
     private object Obj  { ObjCounter += 1}
     Obj // one
 
@@ -965,22 +965,22 @@ trait Trait44_1 {
         assert(ObjCounter == 1, "multiple instances: " + ObjCounter)
         println("ok")
       } catch {
-        case e =>  print("failed "); e.printStackTrace()
+        case e: Throwable =>  print("failed "); e.printStackTrace()
       }
     }
 
     def run { runTest }
   }
-  
+
   def run { (new Class41_2).run }
 }
 
 
 class Class46_1 {
-  
+
   object Object45_2 {
     var ObjCounter = 0
-    
+
     private object Obj  { ObjCounter += 1}
     Obj // one
 
@@ -994,22 +994,22 @@ class Class46_1 {
         assert(ObjCounter == 1, "multiple instances: " + ObjCounter)
         println("ok")
       } catch {
-        case e =>  print("failed "); e.printStackTrace()
+        case e: Throwable =>  print("failed "); e.printStackTrace()
       }
     }
 
     def run { runTest } // trigger
   }
-  
+
   def run { Object45_2.run }
 }
 
 
 object Object47_1 {
-  
+
   object Object45_2 {
     var ObjCounter = 0
-    
+
     private object Obj  { ObjCounter += 1}
     Obj // one
 
@@ -1023,22 +1023,22 @@ object Object47_1 {
         assert(ObjCounter == 1, "multiple instances: " + ObjCounter)
         println("ok")
       } catch {
-        case e =>  print("failed "); e.printStackTrace()
+        case e: Throwable =>  print("failed "); e.printStackTrace()
       }
     }
 
     def run { runTest } // trigger
   }
-  
+
   def run { Object45_2.run } // trigger
 }
 
 
 trait Trait48_1 {
-  
+
   object Object45_2 {
     var ObjCounter = 0
-    
+
     private object Obj  { ObjCounter += 1}
     Obj // one
 
@@ -1052,22 +1052,22 @@ trait Trait48_1 {
         assert(ObjCounter == 1, "multiple instances: " + ObjCounter)
         println("ok")
       } catch {
-        case e =>  print("failed "); e.printStackTrace()
+        case e: Throwable =>  print("failed "); e.printStackTrace()
       }
     }
 
     def run { runTest } // trigger
   }
-  
+
   def run { Object45_2.run }
 }
 
 
 class Class50_1 {
-  
+
   trait Trait49_2 {
     var ObjCounter = 0
-    
+
     private object Obj  { ObjCounter += 1}
     Obj // one
 
@@ -1081,22 +1081,22 @@ class Class50_1 {
         assert(ObjCounter == 1, "multiple instances: " + ObjCounter)
         println("ok")
       } catch {
-        case e =>  print("failed "); e.printStackTrace()
+        case e: Throwable =>  print("failed "); e.printStackTrace()
       }
     }
 
     def run { runTest }
   }
-  
+
   def run { (new Trait49_2 {}).run }
 }
 
 
 object Object51_1 {
-  
+
   trait Trait49_2 {
     var ObjCounter = 0
-    
+
     private object Obj  { ObjCounter += 1}
     Obj // one
 
@@ -1110,22 +1110,22 @@ object Object51_1 {
         assert(ObjCounter == 1, "multiple instances: " + ObjCounter)
         println("ok")
       } catch {
-        case e =>  print("failed "); e.printStackTrace()
+        case e: Throwable =>  print("failed "); e.printStackTrace()
       }
     }
 
     def run { runTest }
   }
-  
+
   def run { (new Trait49_2 {}).run } // trigger
 }
 
 
 trait Trait52_1 {
-  
+
   trait Trait49_2 {
     var ObjCounter = 0
-    
+
     private object Obj  { ObjCounter += 1}
     Obj // one
 
@@ -1139,22 +1139,22 @@ trait Trait52_1 {
         assert(ObjCounter == 1, "multiple instances: " + ObjCounter)
         println("ok")
       } catch {
-        case e =>  print("failed "); e.printStackTrace()
+        case e: Throwable =>  print("failed "); e.printStackTrace()
       }
     }
 
     def run { runTest }
   }
-  
+
   def run { (new Trait49_2 {}).run }
 }
 
 
 class Class54_1 {
-  
+
   class Class53_2 {
     @volatile var ObjCounter = 0
-    
+
     object Obj  { ObjCounter += 1}
 
     def multiThreadedAccess() {
@@ -1172,22 +1172,22 @@ class Class54_1 {
         assert(ObjCounter == 1, "multiple instances: " + ObjCounter)
         println("ok")
       } catch {
-        case e =>  print("multi-threaded failed "); e.printStackTrace()
+        case e: Throwable =>  print("multi-threaded failed "); e.printStackTrace()
       }
     }
 
     def run { runTest }
   }
-  
+
   def run { (new Class53_2).run }
 }
 
 
 object Object55_1 {
-  
+
   class Class53_2 {
     @volatile var ObjCounter = 0
-    
+
     object Obj  { ObjCounter += 1}
 
     def multiThreadedAccess() {
@@ -1205,22 +1205,22 @@ object Object55_1 {
         assert(ObjCounter == 1, "multiple instances: " + ObjCounter)
         println("ok")
       } catch {
-        case e =>  print("multi-threaded failed "); e.printStackTrace()
+        case e: Throwable =>  print("multi-threaded failed "); e.printStackTrace()
       }
     }
 
     def run { runTest }
   }
-  
+
   def run { (new Class53_2).run } // trigger
 }
 
 
 trait Trait56_1 {
-  
+
   class Class53_2 {
     @volatile var ObjCounter = 0
-    
+
     object Obj  { ObjCounter += 1}
 
     def multiThreadedAccess() {
@@ -1238,22 +1238,22 @@ trait Trait56_1 {
         assert(ObjCounter == 1, "multiple instances: " + ObjCounter)
         println("ok")
       } catch {
-        case e =>  print("multi-threaded failed "); e.printStackTrace()
+        case e: Throwable =>  print("multi-threaded failed "); e.printStackTrace()
       }
     }
 
     def run { runTest }
   }
-  
+
   def run { (new Class53_2).run }
 }
 
 
 class Class58_1 {
-  
+
   object Object57_2 {
     @volatile var ObjCounter = 0
-    
+
     object Obj  { ObjCounter += 1}
 
     def multiThreadedAccess() {
@@ -1271,22 +1271,22 @@ class Class58_1 {
         assert(ObjCounter == 1, "multiple instances: " + ObjCounter)
         println("ok")
       } catch {
-        case e =>  print("multi-threaded failed "); e.printStackTrace()
+        case e: Throwable =>  print("multi-threaded failed "); e.printStackTrace()
       }
     }
 
     def run { runTest } // trigger
   }
-  
+
   def run { Object57_2.run }
 }
 
 
 object Object59_1 {
-  
+
   object Object57_2 {
     @volatile var ObjCounter = 0
-    
+
     object Obj  { ObjCounter += 1}
 
     def multiThreadedAccess() {
@@ -1304,22 +1304,22 @@ object Object59_1 {
         assert(ObjCounter == 1, "multiple instances: " + ObjCounter)
         println("ok")
       } catch {
-        case e =>  print("multi-threaded failed "); e.printStackTrace()
+        case e: Throwable =>  print("multi-threaded failed "); e.printStackTrace()
       }
     }
 
     def run { runTest } // trigger
   }
-  
+
   def run { Object57_2.run } // trigger
 }
 
 
 trait Trait60_1 {
-  
+
   object Object57_2 {
     @volatile var ObjCounter = 0
-    
+
     object Obj  { ObjCounter += 1}
 
     def multiThreadedAccess() {
@@ -1337,22 +1337,22 @@ trait Trait60_1 {
         assert(ObjCounter == 1, "multiple instances: " + ObjCounter)
         println("ok")
       } catch {
-        case e =>  print("multi-threaded failed "); e.printStackTrace()
+        case e: Throwable =>  print("multi-threaded failed "); e.printStackTrace()
       }
     }
 
     def run { runTest } // trigger
   }
-  
+
   def run { Object57_2.run }
 }
 
 
 class Class62_1 {
-  
+
   trait Trait61_2 {
     @volatile var ObjCounter = 0
-    
+
     object Obj  { ObjCounter += 1}
 
     def multiThreadedAccess() {
@@ -1370,22 +1370,22 @@ class Class62_1 {
         assert(ObjCounter == 1, "multiple instances: " + ObjCounter)
         println("ok")
       } catch {
-        case e =>  print("multi-threaded failed "); e.printStackTrace()
+        case e: Throwable =>  print("multi-threaded failed "); e.printStackTrace()
       }
     }
 
     def run { runTest }
   }
-  
+
   def run { (new Trait61_2 {}).run }
 }
 
 
 object Object63_1 {
-  
+
   trait Trait61_2 {
     @volatile var ObjCounter = 0
-    
+
     object Obj  { ObjCounter += 1}
 
     def multiThreadedAccess() {
@@ -1403,22 +1403,22 @@ object Object63_1 {
         assert(ObjCounter == 1, "multiple instances: " + ObjCounter)
         println("ok")
       } catch {
-        case e =>  print("multi-threaded failed "); e.printStackTrace()
+        case e: Throwable =>  print("multi-threaded failed "); e.printStackTrace()
       }
     }
 
     def run { runTest }
   }
-  
+
   def run { (new Trait61_2 {}).run } // trigger
 }
 
 
 trait Trait64_1 {
-  
+
   trait Trait61_2 {
     @volatile var ObjCounter = 0
-    
+
     object Obj  { ObjCounter += 1}
 
     def multiThreadedAccess() {
@@ -1436,22 +1436,22 @@ trait Trait64_1 {
         assert(ObjCounter == 1, "multiple instances: " + ObjCounter)
         println("ok")
       } catch {
-        case e =>  print("multi-threaded failed "); e.printStackTrace()
+        case e: Throwable =>  print("multi-threaded failed "); e.printStackTrace()
       }
     }
 
     def run { runTest }
   }
-  
+
   def run { (new Trait61_2 {}).run }
 }
 
 
 class Class66_1 {
-  
+
   def method65_2 {
     @volatile var ObjCounter = 0
-    
+
     object Obj  { ObjCounter += 1}
 
     def multiThreadedAccess() {
@@ -1469,22 +1469,22 @@ class Class66_1 {
         assert(ObjCounter == 1, "multiple instances: " + ObjCounter)
         println("ok")
       } catch {
-        case e =>  print("multi-threaded failed "); e.printStackTrace()
+        case e: Throwable =>  print("multi-threaded failed "); e.printStackTrace()
       }
     }
 
     runTest // trigger
   }
-  
+
   def run { method65_2 }
 }
 
 
 object Object67_1 {
-  
+
   def method65_2 {
     @volatile var ObjCounter = 0
-    
+
     object Obj  { ObjCounter += 1}
 
     def multiThreadedAccess() {
@@ -1502,22 +1502,22 @@ object Object67_1 {
         assert(ObjCounter == 1, "multiple instances: " + ObjCounter)
         println("ok")
       } catch {
-        case e =>  print("multi-threaded failed "); e.printStackTrace()
+        case e: Throwable =>  print("multi-threaded failed "); e.printStackTrace()
       }
     }
 
     runTest // trigger
   }
-  
+
   def run { method65_2 } // trigger
 }
 
 
 trait Trait68_1 {
-  
+
   def method65_2 {
     @volatile var ObjCounter = 0
-    
+
     object Obj  { ObjCounter += 1}
 
     def multiThreadedAccess() {
@@ -1535,22 +1535,22 @@ trait Trait68_1 {
         assert(ObjCounter == 1, "multiple instances: " + ObjCounter)
         println("ok")
       } catch {
-        case e =>  print("multi-threaded failed "); e.printStackTrace()
+        case e: Throwable =>  print("multi-threaded failed "); e.printStackTrace()
       }
     }
 
     runTest // trigger
   }
-  
+
   def run { method65_2 }
 }
 
 
 class Class70_1 {
-  
+
   private def method69_2 {
     @volatile var ObjCounter = 0
-    
+
     object Obj  { ObjCounter += 1}
 
     def multiThreadedAccess() {
@@ -1568,22 +1568,22 @@ class Class70_1 {
         assert(ObjCounter == 1, "multiple instances: " + ObjCounter)
         println("ok")
       } catch {
-        case e =>  print("multi-threaded failed "); e.printStackTrace()
+        case e: Throwable =>  print("multi-threaded failed "); e.printStackTrace()
       }
     }
 
     runTest // trigger
   }
-  
+
   def run { method69_2 }
 }
 
 
 object Object71_1 {
-  
+
   private def method69_2 {
     @volatile var ObjCounter = 0
-    
+
     object Obj  { ObjCounter += 1}
 
     def multiThreadedAccess() {
@@ -1601,22 +1601,22 @@ object Object71_1 {
         assert(ObjCounter == 1, "multiple instances: " + ObjCounter)
         println("ok")
       } catch {
-        case e =>  print("multi-threaded failed "); e.printStackTrace()
+        case e: Throwable =>  print("multi-threaded failed "); e.printStackTrace()
       }
     }
 
     runTest // trigger
   }
-  
+
   def run { method69_2 } // trigger
 }
 
 
 trait Trait72_1 {
-  
+
   private def method69_2 {
     @volatile var ObjCounter = 0
-    
+
     object Obj  { ObjCounter += 1}
 
     def multiThreadedAccess() {
@@ -1634,22 +1634,22 @@ trait Trait72_1 {
         assert(ObjCounter == 1, "multiple instances: " + ObjCounter)
         println("ok")
       } catch {
-        case e =>  print("multi-threaded failed "); e.printStackTrace()
+        case e: Throwable =>  print("multi-threaded failed "); e.printStackTrace()
       }
     }
 
     runTest // trigger
   }
-  
+
   def run { method69_2 }
 }
 
 
 class Class74_1 {
-  
+
   val fun73_2 = () => {
     @volatile var ObjCounter = 0
-    
+
     object Obj  { ObjCounter += 1}
 
     def multiThreadedAccess() {
@@ -1667,22 +1667,22 @@ class Class74_1 {
         assert(ObjCounter == 1, "multiple instances: " + ObjCounter)
         println("ok")
       } catch {
-        case e =>  print("multi-threaded failed "); e.printStackTrace()
+        case e: Throwable =>  print("multi-threaded failed "); e.printStackTrace()
       }
     }
 
     runTest // trigger
   }
-  
+
   def run { fun73_2() }
 }
 
 
 object Object75_1 {
-  
+
   val fun73_2 = () => {
     @volatile var ObjCounter = 0
-    
+
     object Obj  { ObjCounter += 1}
 
     def multiThreadedAccess() {
@@ -1700,22 +1700,22 @@ object Object75_1 {
         assert(ObjCounter == 1, "multiple instances: " + ObjCounter)
         println("ok")
       } catch {
-        case e =>  print("multi-threaded failed "); e.printStackTrace()
+        case e: Throwable =>  print("multi-threaded failed "); e.printStackTrace()
       }
     }
 
     runTest // trigger
   }
-  
+
   def run { fun73_2() } // trigger
 }
 
 
 trait Trait76_1 {
-  
+
   val fun73_2 = () => {
     @volatile var ObjCounter = 0
-    
+
     object Obj  { ObjCounter += 1}
 
     def multiThreadedAccess() {
@@ -1733,23 +1733,23 @@ trait Trait76_1 {
         assert(ObjCounter == 1, "multiple instances: " + ObjCounter)
         println("ok")
       } catch {
-        case e =>  print("multi-threaded failed "); e.printStackTrace()
+        case e: Throwable =>  print("multi-threaded failed "); e.printStackTrace()
       }
     }
 
     runTest // trigger
   }
-  
+
   def run { fun73_2() }
 }
 
 
 class Class78_1 {
-  
+
   class Class77_2 {
-    { // in primary constructor 
+    { // in primary constructor
       @volatile var ObjCounter = 0
-      
+
       object Obj  { ObjCounter += 1}
 
       def multiThreadedAccess() {
@@ -1767,24 +1767,24 @@ class Class78_1 {
           assert(ObjCounter == 1, "multiple instances: " + ObjCounter)
           println("ok")
         } catch {
-          case e =>  print("multi-threaded failed "); e.printStackTrace()
+          case e: Throwable =>  print("multi-threaded failed "); e.printStackTrace()
         }
       }
 
       runTest // trigger
-    } 
+    }
   }
-  
+
   def run { (new Class77_2) }
 }
 
 
 object Object79_1 {
-  
+
   class Class77_2 {
-    { // in primary constructor 
+    { // in primary constructor
       @volatile var ObjCounter = 0
-      
+
       object Obj  { ObjCounter += 1}
 
       def multiThreadedAccess() {
@@ -1802,24 +1802,24 @@ object Object79_1 {
           assert(ObjCounter == 1, "multiple instances: " + ObjCounter)
           println("ok")
         } catch {
-          case e =>  print("multi-threaded failed "); e.printStackTrace()
+          case e: Throwable =>  print("multi-threaded failed "); e.printStackTrace()
         }
       }
 
       runTest // trigger
-    } 
+    }
   }
-  
+
   def run { (new Class77_2) } // trigger
 }
 
 
 trait Trait80_1 {
-  
+
   class Class77_2 {
-    { // in primary constructor 
+    { // in primary constructor
       @volatile var ObjCounter = 0
-      
+
       object Obj  { ObjCounter += 1}
 
       def multiThreadedAccess() {
@@ -1837,24 +1837,24 @@ trait Trait80_1 {
           assert(ObjCounter == 1, "multiple instances: " + ObjCounter)
           println("ok")
         } catch {
-          case e =>  print("multi-threaded failed "); e.printStackTrace()
+          case e: Throwable =>  print("multi-threaded failed "); e.printStackTrace()
         }
       }
 
       runTest // trigger
-    } 
+    }
   }
-  
+
   def run { (new Class77_2) }
 }
 
 
 class Class82_1 {
-  
+
   trait Trait81_2 {
-    { // in primary constructor 
+    { // in primary constructor
       @volatile var ObjCounter = 0
-      
+
       object Obj  { ObjCounter += 1}
 
       def multiThreadedAccess() {
@@ -1872,24 +1872,24 @@ class Class82_1 {
           assert(ObjCounter == 1, "multiple instances: " + ObjCounter)
           println("ok")
         } catch {
-          case e =>  print("multi-threaded failed "); e.printStackTrace()
+          case e: Throwable =>  print("multi-threaded failed "); e.printStackTrace()
         }
       }
 
       runTest // trigger
-    } 
+    }
   }
-  
+
   def run { (new Trait81_2 {}) }
 }
 
 
 object Object83_1 {
-  
+
   trait Trait81_2 {
-    { // in primary constructor 
+    { // in primary constructor
       @volatile var ObjCounter = 0
-      
+
       object Obj  { ObjCounter += 1}
 
       def multiThreadedAccess() {
@@ -1907,24 +1907,24 @@ object Object83_1 {
           assert(ObjCounter == 1, "multiple instances: " + ObjCounter)
           println("ok")
         } catch {
-          case e =>  print("multi-threaded failed "); e.printStackTrace()
+          case e: Throwable =>  print("multi-threaded failed "); e.printStackTrace()
         }
       }
 
       runTest // trigger
-    } 
+    }
   }
-  
+
   def run { (new Trait81_2 {}) } // trigger
 }
 
 
 trait Trait84_1 {
-  
+
   trait Trait81_2 {
-    { // in primary constructor 
+    { // in primary constructor
       @volatile var ObjCounter = 0
-      
+
       object Obj  { ObjCounter += 1}
 
       def multiThreadedAccess() {
@@ -1942,23 +1942,23 @@ trait Trait84_1 {
           assert(ObjCounter == 1, "multiple instances: " + ObjCounter)
           println("ok")
         } catch {
-          case e =>  print("multi-threaded failed "); e.printStackTrace()
+          case e: Throwable =>  print("multi-threaded failed "); e.printStackTrace()
         }
       }
 
       runTest // trigger
-    } 
+    }
   }
-  
+
   def run { (new Trait81_2 {}) }
 }
 
 
 class Class90_1 {
-  
+
   val value89_2 = {
     @volatile var ObjCounter = 0
-    
+
     object Obj  { ObjCounter += 1}
 
     def multiThreadedAccess() {
@@ -1976,22 +1976,22 @@ class Class90_1 {
         assert(ObjCounter == 1, "multiple instances: " + ObjCounter)
         println("ok")
       } catch {
-        case e =>  print("multi-threaded failed "); e.printStackTrace()
+        case e: Throwable =>  print("multi-threaded failed "); e.printStackTrace()
       }
     }
 
     runTest // trigger
   }
-  
+
   def run { value89_2 }
 }
 
 
 trait Trait92_1 {
-  
+
   val value89_2 = {
     @volatile var ObjCounter = 0
-    
+
     object Obj  { ObjCounter += 1}
 
     def multiThreadedAccess() {
@@ -2009,13 +2009,13 @@ trait Trait92_1 {
         assert(ObjCounter == 1, "multiple instances: " + ObjCounter)
         println("ok")
       } catch {
-        case e =>  print("multi-threaded failed "); e.printStackTrace()
+        case e: Throwable =>  print("multi-threaded failed "); e.printStackTrace()
       }
     }
 
     runTest // trigger
   }
-  
+
   def run { value89_2 }
 }