* Removed some defines (line numbers)

[cacao.git] / src / vm / utf8.h

diff --git a/src/vm/utf8.h b/src/vm/utf8.h
index c0f2772c26cae17da019190510430e991590316d..f0c0a54cd893b423925e40d50f0ee813b9aea407 100644 (file)
--- a/src/vm/utf8.h
+++ b/src/vm/utf8.h
@@ -1,4 +1,4 @@
-/* vm/utf.h - utf string header
+/* src/vm/utf.h - utf string header
 
    Copyright (C) 1996-2005 R. Grafl, A. Krall, C. Kruegel, C. Oates,
    R. Obermaisser, M. Platter, M. Probst, S. Ring, E. Steiner,
@@ -28,7 +28,7 @@
 
    Changes:
 
-   $Id: utf8.h 1926 2005-02-10 10:47:29Z twisti $
+   $Id: utf8.h 2741 2005-06-20 09:57:14Z twisti $
 
 */
 
@@ -36,13 +36,30 @@
 #ifndef _UTF_H
 #define _UTF_H
 
+#include <stdio.h>
+
+
+/* forward typedefs ***********************************************************/
+
 typedef struct utf utf;
 
-#include <stdio.h>
 
 #include "vm/global.h"
 
 
+/* data structure for utf8 symbols ********************************************/
+
+struct utf {
+       utf  *hashlink;                     /* link for external hash chain       */
+       int   blength;                      /* text length in bytes               */
+       char *text;                         /* pointer to text                    */
+};
+
+/* to determine the end of utf strings */
+
+#define UTF_END(u)    ((char *) u->text + u->blength)
+
+
 /* utf-symbols for pointer comparison of frequently used strings **************/
 
 extern utf *utf_java_lang_Object;
@@ -53,13 +70,16 @@ extern utf *utf_java_lang_Cloneable;
 extern utf *utf_java_lang_SecurityManager;
 extern utf *utf_java_lang_String;
 extern utf *utf_java_lang_System;
+extern utf *utf_java_lang_ThreadGroup;
 extern utf *utf_java_io_Serializable;
 
 extern utf *utf_java_lang_Throwable;
 extern utf *utf_java_lang_VMThrowable;
-extern utf *utf_java_lang_Exception;
 extern utf *utf_java_lang_Error;
+extern utf *utf_java_lang_Exception;
+extern utf *utf_java_lang_NoClassDefFoundError;
 extern utf *utf_java_lang_OutOfMemoryError;
+extern utf *utf_java_lang_ClassNotFoundException;
 
 extern utf* utf_java_lang_Void;
 extern utf* utf_java_lang_Boolean;
@@ -71,6 +91,13 @@ extern utf* utf_java_lang_Long;
 extern utf* utf_java_lang_Float;
 extern utf* utf_java_lang_Double;
 
+extern utf *utf_java_lang_StackTraceElement;
+extern utf *utf_java_lang_reflect_Constructor;
+extern utf *utf_java_lang_reflect_Field;
+extern utf *utf_java_lang_reflect_Method;
+extern utf *utf_java_util_Vector;
+
+
 extern utf *utf_InnerClasses;
 extern utf *utf_ConstantValue;
 extern utf *utf_Code;
@@ -80,10 +107,14 @@ extern utf *utf_SourceFile;
 
 extern utf *utf_init;
 extern utf *utf_clinit;
+extern utf *utf_clone;
 extern utf *utf_finalize;
+extern utf *utf_run;
 
-extern utf *utf_printStackTrace;
 extern utf *utf_fillInStackTrace;
+extern utf *utf_getSystemClassLoader;
+extern utf *utf_loadClass;
+extern utf *utf_printStackTrace;
 
 extern utf *utf_void__void;
 extern utf *utf_boolean__void;
@@ -94,27 +125,18 @@ extern utf *utf_int__void;
 extern utf *utf_long__void;
 extern utf *utf_float__void;
 extern utf *utf_double__void;
+
+extern utf *utf_void__java_lang_ClassLoader;
+extern utf *utf_void__java_lang_Object;
 extern utf *utf_void__java_lang_Throwable;
 extern utf *utf_java_lang_String__void;
+extern utf *utf_java_lang_String__java_lang_Class;
 extern utf *utf_java_lang_Throwable__void;
 
-extern utf* utf_java_lang_Character;
-extern utf* utf_java_lang_Boolean;
-extern utf* utf_java_lang_Byte;
-extern utf* utf_java_lang_Short;
-extern utf* utf_java_lang_Integer;
-extern utf* utf_java_lang_Long;
-extern utf* utf_java_lang_Float;
-extern utf* utf_java_lang_Double;
-
+extern utf *utf_not_named_yet;
 
-/* data structure for utf8 symbols ********************************************/
+extern utf *array_packagename;
 
-struct utf {
-       utf  *hashlink;                     /* link for external hash chain       */
-       int   blength;                      /* text length in bytes               */
-       char *text;                         /* pointer to text                    */
-};
 
 /* function prototypes ********************************************************/
 
@@ -149,8 +171,13 @@ u4 u2_utflength(u2 *text, u4 u2_length);
 /* write utf symbol to file/buffer */
 void utf_display(utf *u);
 void utf_display_classname(utf *u);
+
 void utf_sprint(char *buffer, utf *u);
 void utf_sprint_classname(char *buffer, utf *u);
+
+void utf_strcat(char *buffer, utf *u);
+void utf_strcat_classname(char *buffer, utf *u);
+
 void utf_fprint(FILE *file, utf *u);
 void utf_fprint_classname(FILE *file, utf *u);