defineclass.cc (character): Removed.

	* defineclass.cc (character): Removed.
	(prepare_character): Removed.
	(is_identifier_start): Use Character, not character.
	(is_identifier_part): Likewise.

From-SVN: r47684

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index e2b46288c578ce1282a8b1d1f11881ae68755615..4dfb96ea0eedaa9968fe7cc63ab95bf4c6128d34 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,10 @@
+2001-12-05  Tom Tromey  <tromey@redhat.com>
+
+       * defineclass.cc (character): Removed.
+       (prepare_character): Removed.
+       (is_identifier_start): Use Character, not character.
+       (is_identifier_part): Likewise.
+
 2001-12-04  Tom Tromey  <tromey@redhat.com>
 
        * verify.cc (_Jv_BytecodeVerifier::linked_utf8): New structure.

diff --git a/libjava/defineclass.cc b/libjava/defineclass.cc
index 5fb8de3b0f37b237df800c21f2afa241e724cf97..290152713e2fd447e2cfec828009424916004bf9 100644 (file)
--- a/libjava/defineclass.cc
+++ b/libjava/defineclass.cc
@@ -268,30 +268,15 @@ struct _Jv_ClassReader {
    */
 };
 
-/* This is used for the isJavaIdentifierStart & isJavaIdentifierPart
-   methods, so we avoid doing _Jv_InitClass all the time */
-
-static const java::lang::Character *character = 0;
-static void prepare_character ();
-
 void
 _Jv_DefineClass (jclass klass, jbyteArray data, jint offset, jint length)
 {
-  if (character == 0)
-    prepare_character ();
-
   _Jv_ClassReader reader (klass, data, offset, length);
   reader.parse();
 
   /* that's it! */
 }
 
-/** put it after _Jv_DefineClass, so it doesn't get inlined */
-static void prepare_character ()
-{
-  character = new java::lang::Character ('!');
-}
-
 \f
 /** This section defines the parsing/scanning of the class data */
 
@@ -1523,7 +1508,7 @@ is_identifier_start (int c)
   if (ch == 0x5FU)                     /* _ */
     return 1;
 
-  return character->isJavaIdentifierStart ((jchar) ch);
+  return java::lang::Character::isJavaIdentifierStart ((jchar) ch);
 }
 
 static __inline__ int 
@@ -1540,7 +1525,7 @@ is_identifier_part (int c)
   if (ch == 0x5FU || ch == 0x24U)       /* _ $ */
     return 1;
 
-  return character->isJavaIdentifierStart ((jchar) ch);
+  return java::lang::Character::isJavaIdentifierStart ((jchar) ch);
 }
 
 bool