diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 227bcc12196..29b5db7fec9 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,13 @@ +2001-12-11 Tom Tromey + + * java/lang/String.java (String): New constructor. + * gnu/gcj/runtime/natStringBuffer.cc: New file. + * gnu/gcj/runtime/StringBuffer.java: New file. + * Makefile.in: Rebuilt. + * Makefile.am (ordinary_java_source_files): Added + gnu/gcj/runtime/StringBuffer.java. + (nat_source_files): Added gnu/gcj/runtime/natStringBuffer.cc. + 2001-12-10 Tom Tromey For PR libgcj/1147: diff --git a/libjava/Makefile.am b/libjava/Makefile.am index eeb44321466..551be461cb1 100644 --- a/libjava/Makefile.am +++ b/libjava/Makefile.am @@ -1257,6 +1257,7 @@ gnu/gcj/runtime/FinalizerThread.java \ gnu/gcj/runtime/FirstThread.java \ gnu/gcj/runtime/JNIWeakRef.java \ gnu/gcj/runtime/SharedLibLoader.java \ +gnu/gcj/runtime/StringBuffer.java \ gnu/gcj/runtime/VMClassLoader.java \ gnu/java/io/ClassLoaderObjectInputStream.java \ gnu/java/io/NullOutputStream.java \ @@ -1617,6 +1618,7 @@ gnu/gcj/protocol/core/natCoreInputStream.cc \ gnu/gcj/runtime/natFinalizerThread.cc \ gnu/gcj/runtime/natFirstThread.cc \ gnu/gcj/runtime/natSharedLibLoader.cc \ +gnu/gcj/runtime/natStringBuffer.cc \ java/io/natFile.cc \ java/io/natFileDescriptor.cc \ java/io/natObjectInputStream.cc \ diff --git a/libjava/Makefile.in b/libjava/Makefile.in index 694dd7fea37..60d003908f2 100644 --- a/libjava/Makefile.in +++ b/libjava/Makefile.in @@ -1002,6 +1002,7 @@ gnu/gcj/runtime/FinalizerThread.java \ gnu/gcj/runtime/FirstThread.java \ gnu/gcj/runtime/JNIWeakRef.java \ gnu/gcj/runtime/SharedLibLoader.java \ +gnu/gcj/runtime/StringBuffer.java \ gnu/gcj/runtime/VMClassLoader.java \ gnu/java/io/ClassLoaderObjectInputStream.java \ gnu/java/io/NullOutputStream.java \ @@ -1361,6 +1362,7 @@ gnu/gcj/protocol/core/natCoreInputStream.cc \ gnu/gcj/runtime/natFinalizerThread.cc \ gnu/gcj/runtime/natFirstThread.cc \ gnu/gcj/runtime/natSharedLibLoader.cc \ +gnu/gcj/runtime/natStringBuffer.cc \ java/io/natFile.cc \ java/io/natFileDescriptor.cc \ java/io/natObjectInputStream.cc \ @@ -1524,7 +1526,8 @@ gnu/gcj/convert/natInput_SJIS.lo gnu/gcj/convert/natOutput_EUCJIS.lo \ gnu/gcj/convert/natOutput_SJIS.lo gnu/gcj/io/natSimpleSHSStream.lo \ gnu/gcj/io/shs.lo gnu/gcj/protocol/core/natCoreInputStream.lo \ gnu/gcj/runtime/natFinalizerThread.lo gnu/gcj/runtime/natFirstThread.lo \ -gnu/gcj/runtime/natSharedLibLoader.lo java/io/natFile.lo \ +gnu/gcj/runtime/natSharedLibLoader.lo \ +gnu/gcj/runtime/natStringBuffer.lo java/io/natFile.lo \ java/io/natFileDescriptor.lo java/io/natObjectInputStream.lo \ java/io/natObjectOutputStream.lo java/lang/natCharacter.lo \ java/lang/natClass.lo java/lang/natClassLoader.lo \ @@ -1643,10 +1646,12 @@ DEP_FILES = .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \ .deps/gnu/gcj/runtime/FinalizerThread.P \ .deps/gnu/gcj/runtime/FirstThread.P .deps/gnu/gcj/runtime/JNIWeakRef.P \ .deps/gnu/gcj/runtime/SharedLibLoader.P \ +.deps/gnu/gcj/runtime/StringBuffer.P \ .deps/gnu/gcj/runtime/VMClassLoader.P \ .deps/gnu/gcj/runtime/natFinalizerThread.P \ .deps/gnu/gcj/runtime/natFirstThread.P \ -.deps/gnu/gcj/runtime/natSharedLibLoader.P .deps/gnu/gcj/xlib/Clip.P \ +.deps/gnu/gcj/runtime/natSharedLibLoader.P \ +.deps/gnu/gcj/runtime/natStringBuffer.P .deps/gnu/gcj/xlib/Clip.P \ .deps/gnu/gcj/xlib/Colormap.P .deps/gnu/gcj/xlib/Display.P \ .deps/gnu/gcj/xlib/Drawable.P .deps/gnu/gcj/xlib/Font.P \ .deps/gnu/gcj/xlib/GC.P .deps/gnu/gcj/xlib/Pixmap.P \ diff --git a/libjava/gnu/gcj/runtime/StringBuffer.java b/libjava/gnu/gcj/runtime/StringBuffer.java new file mode 100644 index 00000000000..403f952c951 --- /dev/null +++ b/libjava/gnu/gcj/runtime/StringBuffer.java @@ -0,0 +1,188 @@ +// This is a simplified copy of java.lang.StringBuffer with +// `synchronized' removed. + +/* StringBuffer.java -- Growable strings + Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc. + +This file is part of GNU Classpath. + +GNU Classpath is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version. + +GNU Classpath is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +General Public License for more details. + +You should have received a copy of the GNU General Public License +along with GNU Classpath; see the file COPYING. If not, write to the +Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +02111-1307 USA. + +As a special exception, if you link this library with other files to +produce an executable, this library does not by itself cause the +resulting executable to be covered by the GNU General Public License. +This exception does not however invalidate any other reasons why the +executable file might be covered by the GNU General Public License. */ + +package gnu.gcj.runtime; + +public final class StringBuffer +{ + /** Append the String value of the argument to this StringBuffer. + * Uses String.valueOf() to convert to + * String. + * @param bool the boolean to convert and append. + * @return this StringBuffer. + * @see java.lang.String#valueOf(boolean) + */ + public StringBuffer append (boolean bool) + { + return append (bool ? "true" : "false"); + } + + /** Append the char to this StringBuffer. + * @param c the char to append. + * @return this StringBuffer. + */ + public StringBuffer append (char ch) + { + ensureCapacity_unsynchronized (count + 1); + value[count++] = ch; + return this; + } + + /** Append the String value of the argument to this StringBuffer. + * Uses String.valueOf() to convert to + * String. + * @param inum the int to convert and append. + * @return this StringBuffer. + * @see java.lang.String#valueOf(int) + */ + public native StringBuffer append (int inum); + + /** Append the String value of the argument to this StringBuffer. + * Uses String.valueOf() to convert to + * String. + * @param lnum the long to convert and append. + * @return this StringBuffer. + * @see java.lang.String#valueOf(long) + */ + public StringBuffer append (long lnum) + { + return append (Long.toString (lnum)); + } + + /** Append the String value of the argument to this StringBuffer. + * Uses String.valueOf() to convert to + * String. + * @param fnum the float to convert and append. + * @return this StringBuffer. + * @see java.lang.String#valueOf(float) + */ + public StringBuffer append (float fnum) + { + return append (Float.toString (fnum)); + } + + /** Append the String value of the argument to this StringBuffer. + * Uses String.valueOf() to convert to + * String. + * @param dnum the double to convert and append. + * @return this StringBuffer. + * @see java.lang.String#valueOf(double) + */ + public StringBuffer append (double dnum) + { + return append (Double.toString (dnum)); + } + + /** Append the String value of the argument to this StringBuffer. + * Uses String.valueOf() to convert to + * String. + * @param obj the Object to convert and append. + * @return this StringBuffer. + * @see java.lang.String#valueOf(java.lang.Object) + */ + public StringBuffer append (Object obj) + { + return append (String.valueOf(obj)); + } + + /** Append the String to this StringBuffer. + * @param str the String to append. + * @return this StringBuffer. + */ + public StringBuffer append (String str) + { + if (str == null) + str = "null"; + int len = str.length(); + ensureCapacity_unsynchronized (count + len); + str.getChars(0, len, value, count); + count += len; + return this; + } + + private void ensureCapacity_unsynchronized (int minimumCapacity) + { + if (minimumCapacity > value.length) + { + minimumCapacity = value.length * 2 + 2; + char[] nb = new char[minimumCapacity]; + System.arraycopy(value, 0, nb, 0, count); + value = nb; + } + } + + /** Create a new StringBuffer with default capacity 16. + * @see JLS 20.13.1 + */ + public StringBuffer () + { + this (DEFAULT_CAPACITY); + } + + /** Create an empty StringBuffer with the specified initial capacity. + * @param capacity the initial capacity. + */ + public StringBuffer (int capacity) + { + count = 0; + value = new char[capacity]; + } + + /** Create a new StringBuffer with the characters in the specified String. + * Initial capacity will be the size of the String plus 16. + * @param str the String to make a StringBuffer out of. + */ + public StringBuffer (String str) + { + if (str == null) + str = "null"; + count = str.length(); + // JLS: The initial capacity of the string buffer is 16 plus the + // length of the argument string. + value = new char[count + DEFAULT_CAPACITY]; + str.getChars(0, count, value, 0); + } + + /** Convert this StringBuffer to a String. + * @return the characters in this StringBuffer + */ + // This is native because efficient implementation requires avoiding + // the Java protection mechanism. + public native String toString (); + + // Index of next available character. Note that this has + // permissions set this way so that String can get the value. + int count; + + // The buffer. Note that this has permissions set this way so that + // String can get the value. + char[] value; + + private final static int DEFAULT_CAPACITY = 16; // JLS 20.13.1 +} diff --git a/libjava/gnu/gcj/runtime/natStringBuffer.cc b/libjava/gnu/gcj/runtime/natStringBuffer.cc new file mode 100644 index 00000000000..2777b9ed8eb --- /dev/null +++ b/libjava/gnu/gcj/runtime/natStringBuffer.cc @@ -0,0 +1,36 @@ +// natStringBuffer.cc - Implementation of java.lang.StringBuffer native methods. + +/* Copyright (C) 2001 Free Software Foundation + + This file is part of libgcj. + +This software is copyrighted work licensed under the terms of the +Libgcj License. Please consult the file "LIBGCJ_LICENSE" for +details. */ + +#include +#include +#include +#include + +gnu::gcj::runtime::StringBuffer * +gnu::gcj::runtime::StringBuffer::append (jint num) +{ + // Use an array large enough for "-2147483648"; i.e. 11 chars. + jchar buffer[11]; + int i = _Jv_FormatInt (buffer+11, num); + jint needed = count + i; + ensureCapacity_unsynchronized (needed); + jchar* dst = elements (value) + count; + jchar* src = buffer+11-i; + while (--i >= 0) + *dst++ = *src++; + count = needed; + return this; +} + +java::lang::String * +gnu::gcj::runtime::StringBuffer::toString () +{ + return new java::lang::String (this); +} diff --git a/libjava/java/lang/String.java b/libjava/java/lang/String.java index 8dadfb59cc0..b485ffecfcf 100644 --- a/libjava/java/lang/String.java +++ b/libjava/java/lang/String.java @@ -92,6 +92,16 @@ public final class String implements Serializable, Comparable, CharSequence } } + // This is used by gnu.gcj.runtime.StringBuffer, so it must have + // package-private protection. It is accessed via CNI and so avoids + // ordinary protection mechanisms. + String (gnu.gcj.runtime.StringBuffer buffer) + { + // No need to synchronize or mark the buffer, since we know it is + // only used once. + init (buffer.value, 0, buffer.count, true); + } + public String (char[] data) { init(data, 0, data.length, false);