Merged revisions 8299-8320 via svnmerge from

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

diff --git a/src/vm/stringlocal.h b/src/vm/stringlocal.h
index 702f4ed5c107236c5f6359e4f4422cb99e98db04..64c68cb96469810d87a75ae8b5476449ed225baa 100644 (file)
--- a/src/vm/stringlocal.h
+++ b/src/vm/stringlocal.h
@@ -1,9 +1,9 @@
-/* vm/stringlocal.h - java.lang.String header
+/* src/vm/stringlocal.h - string header
 
-   Copyright (C) 1996-2005 R. Grafl, A. Krall, C. Kruegel, C. Oates,
-   R. Obermaisser, M. Platter, M. Probst, S. Ring, E. Steiner,
-   C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich, J. Wenninger,
-   Institut f. Computersprachen - TU Wien
+   Copyright (C) 1996-2005, 2006, 2007 R. Grafl, A. Krall, C. Kruegel,
+   C. Oates, R. Obermaisser, M. Platter, M. Probst, S. Ring,
+   E. Steiner, C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich,
+   J. Wenninger, Institut f. Computersprachen - TU Wien
 
    This file is part of CACAO.
 
@@ -19,16 +19,10 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-   02111-1307, USA.
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301, USA.
 
-   Contact: cacao@complang.tuwien.ac.at
-
-   Authors: Christian Thalinger
-
-   Changes:
-
-   $Id: stringlocal.h 2299 2005-04-14 05:17:27Z edwin $
+   $Id: stringlocal.h 8318 2007-08-16 10:05:34Z michi $
 
 */
 
@@ -39,51 +33,65 @@
 typedef struct literalstring literalstring;
 
 
-#include "native/include/java_lang_String.h"
+#include "config.h"
+#include "vm/types.h"
+
+#include "toolbox/hashtable.h"
+
 #include "vm/global.h"
-#include "vm/utf8.h"
-#include "vm/tables.h"
+
+#include "vmcore/utf8.h"
 
 
 /* data structure of internal javastrings stored in global hashtable **********/
 
 struct literalstring {
        literalstring     *hashlink;        /* link for external hash chain       */
-       java_objectheader *string;  
+       java_object_t     *string;  
 };
 
+
 /* javastring-hashtable */
-extern hashtable string_hash;
+extern hashtable hashtable_string;
 
 
 /* function prototypes ********************************************************/
 
+/* initialize string subsystem */
+bool string_init(void);
+
 void stringtable_update(void);
 
 /* creates a new object of type java/lang/String from a utf-text */
-java_lang_String *javastring_new(utf *text);
+java_handle_t *javastring_new(utf *text);
 
 /* creates a new object of type java/lang/String from a utf-text, changes slashes to dots */
-java_lang_String *javastring_new_slash_to_dot(utf *text);
+java_handle_t *javastring_new_slash_to_dot(utf *text);
+
+/* creates a new object of type java/lang/String from an ASCII c-string */
+java_handle_t *javastring_new_from_ascii(const char *text);
+
+/* creates a new object of type java/lang/String from UTF-8 */
+java_handle_t *javastring_new_from_utf_string(const char *utfstr);
 
-/* creates a new object of type java/lang/String from a c-string */
-java_lang_String *javastring_new_char(const char *text);
+/* creates a new object of type java/lang/String from (possibly invalid) UTF-8 */
+java_handle_t *javastring_safe_new_from_utf8(const char *text);
 
 /* make c-string from a javastring (debugging) */
-char *javastring_tochar(java_objectheader *s);
+char *javastring_tochar(java_handle_t *string);
 
 /* make utf symbol from javastring */
-utf *javastring_toutf(java_lang_String *string, bool isclassname);
+utf *javastring_toutf(java_handle_t *string, bool isclassname);
 
 /* creates a new javastring with the text of the u2-array */
-java_objectheader *literalstring_u2(java_chararray *a, u4 length, u4 offset,
-                                                                       bool copymode);
+java_object_t *literalstring_u2(java_chararray_t *a, u4 length, u4 offset,
+                                                               bool copymode);
 
 /* creates a new javastring with the text of the utf-symbol */
-java_objectheader *literalstring_new(utf *u);
+java_object_t *literalstring_new(utf *u);
 
 /* dispose a javastring */
-void literalstring_free(java_objectheader*);
+void literalstring_free(java_object_t*);
 
 #endif /* _STRINGLOCAL_H */
 
@@ -99,4 +107,5 @@ void literalstring_free(java_objectheader*);
  * c-basic-offset: 4
  * tab-width: 4
  * End:
+ * vim:noexpandtab:sw=4:ts=4:
  */