- Fixed Symbol.isClass to return false if symbo...

- Fixed Symbol.isClass to return false if symbol is a package Fixed
- Symbol.isAnonymousClass to correctly test the class name Fixed
- Symbol.isLocalClass to use methods isClass and isAnonymousClass Fixed
- GenJVM.javaName (only worked because isAnonymousClass was broken)
- Fixed AddInterfacesPhase.needInterface to return false for anonymous
- classes Adapted AddInterfacesPhase.transformInfo to new definition of
- isClass

1 files changed, 4 insertions, 2 deletions

diff --git a/sources/scalac/transformer/AddInterfacesPhase.java b/sources/scalac/transformer/AddInterfacesPhase.java
index 5d85bf317e..3c51efae91 100644
--- a/sources/scalac/transformer/AddInterfacesPhase.java
+++ b/sources/scalac/transformer/AddInterfacesPhase.java
@@ -40,8 +40,9 @@ public class AddInterfacesPhase extends PhaseDescriptor {
     }
 
     public Type transformInfo(Symbol sym, Type tp) {
-        if (sym.isConstructor()
-            && needInterface(sym.primaryConstructorClass())) {
+        if (sym.isConstructor()) {
+            Symbol clazz =sym.primaryConstructorClass();
+            if (clazz.isPackage() || !needInterface(clazz)) return tp;
             // The symbol is a constructor of a class which needs
             // an interface. All its value arguments have to be
             // removed.
@@ -183,6 +184,7 @@ public class AddInterfacesPhase extends PhaseDescriptor {
             : Debug.toString(classSym) + " is not a class (kind " + classSym.kind + ")";
         return !(classSym.isJava()
                  || classSym.isModuleClass()
+                 || classSym.isAnonymousClass()
                  || hasInterfaceSymbol(classSym)
                  || classSym == Global.instance.definitions.ANY_CLASS
                  || classSym == Global.instance.definitions.ANYREF_CLASS