re PR libgcj/35020 (Class.getSimpleName() differs from Sun Java)

2008-05-28  Andrew Haley  <aph@redhat.com>

	* java/lang/Class.java (getSimpleName): Use getEnclosingClass().	
	* testsuite/libjava.lang/PR35020.java: New cases.
	* testsuite/libjava.lang/PR35020.out: New cases.

From-SVN: r136103

libjava/ChangeLog

+2008-05-28  Andrew Haley  <aph@redhat.com>
+
+	* java/lang/Class.java (getSimpleName): Use getEnclosingClass().	
+	* testsuite/libjava.lang/PR35020.java: New cases.
+	* testsuite/libjava.lang/PR35020.out: New cases.
+
 2008-05-22  Andrew Haley  <aph@redhat.com>
 
 	PR libgcj/35020

libjava/java/lang/Class.java

@@ -1078,26 +1078,24 @@ public final class Class<T>
     if (isAnonymousClass())
       return "";
     if (isArray())
-      {
       return getComponentType().getSimpleName() + "[]";
-      }
+
     String fullName = getName();
-    int pos = fullName.lastIndexOf("$");
-    if (pos == -1)
-      pos = 0;
-    else
-      {
-	++pos;
+    Class enclosingClass = getEnclosingClass();
+    if (enclosingClass == null)
+      // It's a top level class.
+      return fullName.substring(fullName.lastIndexOf(".") + 1);
+
+    fullName = fullName.substring(enclosingClass.getName().length());
+
+    // We've carved off the enclosing class name; now we must have '$'
+    // followed optionally by digits, followed by the class name.
+    int pos = 1;
     while (Character.isDigit(fullName.charAt(pos)))
       ++pos;
     fullName = fullName.substring(pos);
-      }
 
-    int packagePos = fullName.lastIndexOf(".");
-    if (packagePos == -1)
     return fullName;
-    else
-      return fullName.substring(packagePos + 1);
   }
 
   /**

libjava/testsuite/libjava.lang/PR35020.java

+class outer$inner
+{
+};
+
 public class PR35020
 {
+  class PR35020$Inner
+  {
+  };
   class inner
   {
   }
@@ -16,6 +23,8 @@ public class PR35020
 	  return null;
 	}
       }).getClass().getSimpleName());
+    System.out.println(PR35020$Inner.class.getSimpleName());
+    System.out.println(outer$inner.class.getSimpleName());
+    System.out.println(outer$inner.inner.class.getSimpleName());
   }
 }
-

libjava/testsuite/libjava.lang/PR35020.out

@@ -4,3 +4,6 @@ Class
 int[]
 Object[][][][][][][][]
 
+PR35020$Inner
+outer$inner
+inner