added a few @serializable annotations, added @S...

added a few @serializable annotations, added @SerialVersionUID to
anonfuns, several cleanups

1 files changed, 11 insertions, 2 deletions

diff --git a/src/compiler/scala/tools/nsc/transform/CleanUp.scala b/src/compiler/scala/tools/nsc/transform/CleanUp.scala
index 348f3cc5a3..6067249eae 100644
--- a/src/compiler/scala/tools/nsc/transform/CleanUp.scala
+++ b/src/compiler/scala/tools/nsc/transform/CleanUp.scala
@@ -47,6 +47,13 @@ abstract class CleanUp extends Transform with ast.TreeDSL {
 
     private var localTyper: analyzer.Typer = null
 
+    private lazy val serializableAnnotation =
+      AnnotationInfo(SerializableAttr.tpe, Nil, Nil)
+    private lazy val serialVersionUIDAnnotation = {
+      val attr = definitions.getClass("scala.SerialVersionUID")
+      AnnotationInfo(attr.tpe, List(Literal(Constant(0))), List())
+    }
+
     private object MethodDispatchType extends scala.Enumeration {
       val NO_CACHE, MONO_CACHE, POLY_CACHE = Value
     }
@@ -598,8 +605,10 @@ abstract class CleanUp extends Transform with ast.TreeDSL {
         if (settings.target.value == "jvm-1.5") {
           val sym = cdef.symbol
           // is this an anonymous function class?
-          if (sym.isAnonymousFunction && !sym.hasAnnotation(SerializableAttr))
-            sym addAnnotation AnnotationInfo(SerializableAttr.tpe, Nil, Nil)
+          if (sym.isAnonymousFunction && !sym.hasAnnotation(SerializableAttr)) {
+            sym addAnnotation serializableAnnotation
+            sym addAnnotation serialVersionUIDAnnotation
+          }
         }
         super.transform(tree)