mangle.c (mangle_member_name): Don't special-case for NO_DOLLAR_IN_LABEL.

	* mangle.c (mangle_member_name): Don't special-case for
	NO_DOLLAR_IN_LABEL.
	* mangle_name.c (unicode_mangling_length): Likewise.
	(append_unicode_mangled_name): Likewise.
	* parse.y (make_nested_class_name): Remove dead NO_DOLLAR_IN_LABEL
	code.

From-SVN: r48220

gcc/java/ChangeLog

 2001-12-20  Bryce McKinlay  <bryce@waitaki.otago.ac.nz>
 
+	* mangle.c (mangle_member_name): Don't special-case for 
+	NO_DOLLAR_IN_LABEL.
+	* mangle_name.c (unicode_mangling_length): Likewise.
+	(append_unicode_mangled_name): Likewise.
+	* parse.y (make_nested_class_name): Remove dead NO_DOLLAR_IN_LABEL
+	code.
+
+2001-12-20  Bryce McKinlay  <bryce@waitaki.otago.ac.nz>
+
 	* expr.c (build_java_array_length_access): Don't force null pointer
 	check unless flag_check_references is set.
 

gcc/java/mangle.c

@@ -180,19 +180,9 @@ mangle_member_name (name)
   append_gpp_mangled_name (IDENTIFIER_POINTER (name),
 			   IDENTIFIER_LENGTH (name));
 
-  /* If NAME happens to be a C++ keyword, add `$' or `.' or `_'. */
+  /* If NAME happens to be a C++ keyword, add `$'. */
   if (cxx_keyword_p (IDENTIFIER_POINTER (name), IDENTIFIER_LENGTH (name)))
-    {
-#ifndef NO_DOLLAR_IN_LABEL
-      obstack_1grow (mangle_obstack, '$');
-#else  /* NO_DOLLAR_IN_LABEL */
-#ifndef NO_DOT_IN_LABEL
-      obstack_1grow (mangle_obstack, '.');
-#else  /* NO_DOT_IN_LABEL */
-      obstack_1grow (mangle_obstack, '_');
-#endif /* NO_DOT_IN_LABEL */
-#endif /* NO_DOLLAR_IN_LABEL */
-    }
+    obstack_1grow (mangle_obstack, '$');
 }
 
 /* Append the mangled name of TYPE onto OBSTACK.  */

gcc/java/mangle_name.c

@@ -72,8 +72,7 @@ append_gpp_mangled_name (name, len)
 /* Assuming (NAME, LEN) is a Utf8-encoded string, emit the string
    appropriately mangled (with Unicode escapes) to MANGLE_OBSTACK.
    Characters needing an escape are encoded `__UNN_' to `__UNNNN_', in
-   which case `__U' will be mangled `__U_'. `$' is mangled `$' or
-   __U24_ according to NO_DOLLAR_IN_LABEL.  */
+   which case `__U' will be mangled `__U_'.  */
 
 static void
 append_unicode_mangled_name (name, len)
@@ -87,11 +86,7 @@ append_unicode_mangled_name (name, len)
     {
       int ch = UTF8_GET(ptr, limit);
 
-      if ((ISALNUM (ch) && ch != 'U')
-#ifndef NO_DOLLAR_IN_LABEL
-	  || ch == '$'
-#endif
-	  )
+      if ((ISALNUM (ch) && ch != 'U') || ch == '$')
 	obstack_1grow (mangle_obstack, ch);
       /* Everything else needs encoding */
       else
@@ -148,11 +143,7 @@ unicode_mangling_length (name, len)
 
       if (ch < 0)
 	error ("internal error - invalid Utf8 name");
-      if ((ISALNUM (ch) && ch != 'U')
-#ifndef NO_DOLLAR_IN_LABEL
-	  || ch == '$'
-#endif
-	  )
+      if ((ISALNUM (ch) && ch != 'U') || ch == '$')
 	num_chars++;
       /* Everything else needs encoding */
       else

gcc/java/parse.y

@@ -3511,12 +3511,6 @@ make_nested_class_name (cpc_list)
 	  TREE_PURPOSE (cpc_list) : DECL_NAME (TREE_VALUE (cpc_list)));
   obstack_grow (&temporary_obstack,
 		IDENTIFIER_POINTER (name), IDENTIFIER_LENGTH (name));
-  /* Why is NO_DOLLAR_IN_LABEL defined? */
-#if 0
-#ifdef NO_DOLLAR_IN_LABEL
-  internal_error ("Can't use '$' as a separator for inner classes");
-#endif
-#endif
   obstack_1grow (&temporary_obstack, '$');
 }