diff options
Diffstat (limited to 'libjava/java/lang')
22 files changed, 1569 insertions, 894 deletions
diff --git a/libjava/java/lang/AbstractStringBuffer.h b/libjava/java/lang/AbstractStringBuffer.h new file mode 100644 index 00000000000..256004c24ea --- /dev/null +++ b/libjava/java/lang/AbstractStringBuffer.h @@ -0,0 +1,85 @@ + +// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*- + +#ifndef __java_lang_AbstractStringBuffer__ +#define __java_lang_AbstractStringBuffer__ + +#pragma interface + +#include <java/lang/Object.h> +#include <gcj/array.h> + + +class java::lang::AbstractStringBuffer : public ::java::lang::Object +{ + +public: // actually package-private + AbstractStringBuffer(); + AbstractStringBuffer(jint); + AbstractStringBuffer(::java::lang::String *); + AbstractStringBuffer(::java::lang::CharSequence *); +public: + virtual void ensureCapacity(jint); + virtual void setLength(jint); + virtual jchar charAt(jint); + virtual jint codePointAt(jint); + virtual jint codePointBefore(jint); + virtual void getChars(jint, jint, JArray< jchar > *, jint); + virtual void setCharAt(jint, jchar); + virtual ::java::lang::AbstractStringBuffer * append(::java::lang::Object *); + virtual ::java::lang::AbstractStringBuffer * append(::java::lang::String *); + virtual ::java::lang::AbstractStringBuffer * append(::java::lang::StringBuffer *); + virtual ::java::lang::AbstractStringBuffer * append(JArray< jchar > *); + virtual ::java::lang::AbstractStringBuffer * append(JArray< jchar > *, jint, jint); + virtual ::java::lang::AbstractStringBuffer * append(jboolean); + virtual ::java::lang::AbstractStringBuffer * AbstractStringBuffer$append(jchar); + virtual ::java::lang::AbstractStringBuffer * AbstractStringBuffer$append(::java::lang::CharSequence *); + virtual ::java::lang::AbstractStringBuffer * AbstractStringBuffer$append(::java::lang::CharSequence *, jint, jint); + virtual ::java::lang::AbstractStringBuffer * append(jint); + virtual ::java::lang::AbstractStringBuffer * append(jlong); + virtual ::java::lang::AbstractStringBuffer * append(jfloat); + virtual ::java::lang::AbstractStringBuffer * append(jdouble); + virtual ::java::lang::AbstractStringBuffer * appendCodePoint(jint); + virtual ::java::lang::AbstractStringBuffer * delete$(jint, jint); + virtual ::java::lang::AbstractStringBuffer * deleteCharAt(jint); + virtual ::java::lang::AbstractStringBuffer * replace(jint, jint, ::java::lang::String *); + virtual ::java::lang::AbstractStringBuffer * insert(jint, JArray< jchar > *, jint, jint); + virtual ::java::lang::AbstractStringBuffer * insert(jint, ::java::lang::Object *); + virtual ::java::lang::AbstractStringBuffer * insert(jint, ::java::lang::String *); + virtual ::java::lang::AbstractStringBuffer * insert(jint, ::java::lang::CharSequence *); + virtual ::java::lang::AbstractStringBuffer * insert(jint, ::java::lang::CharSequence *, jint, jint); + virtual ::java::lang::AbstractStringBuffer * insert(jint, JArray< jchar > *); + virtual ::java::lang::AbstractStringBuffer * insert(jint, jboolean); + virtual ::java::lang::AbstractStringBuffer * insert(jint, jchar); + virtual ::java::lang::AbstractStringBuffer * insert(jint, jint); + virtual ::java::lang::AbstractStringBuffer * insert(jint, jlong); + virtual ::java::lang::AbstractStringBuffer * insert(jint, jfloat); + virtual ::java::lang::AbstractStringBuffer * insert(jint, jdouble); + virtual jint indexOf(::java::lang::String *); + virtual jint indexOf(::java::lang::String *, jint); + virtual jint lastIndexOf(::java::lang::String *); + virtual jint lastIndexOf(::java::lang::String *, jint); + virtual ::java::lang::AbstractStringBuffer * reverse(); + virtual void trimToSize(); + virtual jint codePointCount(jint, jint); + virtual jint offsetByCodePoints(jint, jint); +public: // actually package-private + virtual void ensureCapacity_unsynchronized(jint); +private: + jboolean regionMatches(jint, ::java::lang::String *); +public: + virtual ::java::lang::Appendable * append(::java::lang::CharSequence *, jint, jint); + virtual ::java::lang::Appendable * append(::java::lang::CharSequence *); + virtual ::java::lang::Appendable * append(jchar); + virtual jint length() = 0; + virtual ::java::lang::CharSequence * subSequence(jint, jint) = 0; +public: // actually package-private + jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) count; + JArray< jchar > * value; +private: + static const jint DEFAULT_CAPACITY = 16; +public: + static ::java::lang::Class class$; +}; + +#endif // __java_lang_AbstractStringBuffer__ diff --git a/libjava/java/lang/AbstractStringBuffer.java b/libjava/java/lang/AbstractStringBuffer.java new file mode 100644 index 00000000000..fe128b8af77 --- /dev/null +++ b/libjava/java/lang/AbstractStringBuffer.java @@ -0,0 +1,1027 @@ +/* AbstractStringBuffer.java -- Growable strings + Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008 + 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., 51 Franklin Street, Fifth Floor, Boston, MA +02110-1301 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ + +package java.lang; + +import java.io.Serializable; + +/** + * This class is based on gnu.classpath.ClasspathStringBuffer but + * is package-private to java.lang so it can be used as the basis + * for StringBuffer and StringBuilder. + * If you modify this, please consider also modifying that code. + */ +abstract class AbstractStringBuffer + implements Serializable, CharSequence, Appendable +{ + + /** + * Index of next available character (and thus the size of the current + * string contents). Note that this has permissions set this way so that + * String can get the value. + * + * @serial the number of characters in the buffer + */ + int count; + + /** + * The buffer. Note that this has permissions set this way so that String + * can get the value. + * + * @serial the buffer + */ + char[] value; + + /** + * The default capacity of a buffer. + */ + private static final int DEFAULT_CAPACITY = 16; + + /** + * Create a new AbstractStringBuffer with default capacity 16. + */ + AbstractStringBuffer() + { + this(DEFAULT_CAPACITY); + } + + /** + * Create an empty <code>StringBuffer</code> with the specified initial + * capacity. + * + * @param capacity the initial capacity + * @throws NegativeArraySizeException if capacity is negative + */ + AbstractStringBuffer(int capacity) + { + value = new char[capacity]; + } + + /** + * Create a new <code>StringBuffer</code> with the characters in the + * specified <code>String</code>. Initial capacity will be the size of the + * String plus 16. + * + * @param str the <code>String</code> to convert + * @throws NullPointerException if str is null + */ + AbstractStringBuffer(String str) + { + count = str.count; + value = new char[count + DEFAULT_CAPACITY]; + str.getChars(0, count, value, 0); + } + + /** + * Create a new <code>StringBuffer</code> with the characters in the + * specified <code>CharSequence</code>. Initial capacity will be the + * length of the sequence plus 16; if the sequence reports a length + * less than or equal to 0, then the initial capacity will be 16. + * + * @param seq the initializing <code>CharSequence</code> + * @throws NullPointerException if str is null + * @since 1.5 + */ + AbstractStringBuffer(CharSequence seq) + { + int len = seq.length(); + count = len <= 0 ? 0 : len; + value = new char[count + DEFAULT_CAPACITY]; + for (int i = 0; i < len; ++i) + value[i] = seq.charAt(i); + } + + /** + * Increase the capacity of this <code>StringBuffer</code>. This will + * ensure that an expensive growing operation will not occur until + * <code>minimumCapacity</code> is reached. The buffer is grown to the + * larger of <code>minimumCapacity</code> and + * <code>capacity() * 2 + 2</code>, if it is not already large enough. + * + * @param minimumCapacity the new capacity + * @see #capacity() + */ + public void ensureCapacity(int minimumCapacity) + { + ensureCapacity_unsynchronized(minimumCapacity); + } + + /** + * Set the length of this StringBuffer. If the new length is greater than + * the current length, all the new characters are set to '\0'. If the new + * length is less than the current length, the first <code>newLength</code> + * characters of the old array will be preserved, and the remaining + * characters are truncated. + * + * @param newLength the new length + * @throws IndexOutOfBoundsException if the new length is negative + * (while unspecified, this is a StringIndexOutOfBoundsException) + * @see #length() + */ + public void setLength(int newLength) + { + if (newLength < 0) + throw new StringIndexOutOfBoundsException(newLength); + + int valueLength = value.length; + + /* Always call ensureCapacity_unsynchronized in order to preserve + copy-on-write semantics. */ + ensureCapacity_unsynchronized(newLength); + + if (newLength < valueLength) + { + /* If the StringBuffer's value just grew, then we know that + value is newly allocated and the region between count and + newLength is filled with '\0'. */ + count = newLength; + } + else + { + /* The StringBuffer's value doesn't need to grow. However, + we should clear out any cruft that may exist. */ + while (count < newLength) + value[count++] = '\0'; + } + } + + /** + * Get the character at the specified index. + * + * @param index the index of the character to get, starting at 0 + * @return the character at the specified index + * @throws IndexOutOfBoundsException if index is negative or >= length() + * (while unspecified, this is a StringIndexOutOfBoundsException) + */ + public char charAt(int index) + { + if (index < 0 || index >= count) + throw new StringIndexOutOfBoundsException(index); + return value[index]; + } + + /** + * Get the code point at the specified index. This is like #charAt(int), + * but if the character is the start of a surrogate pair, and the + * following character completes the pair, then the corresponding + * supplementary code point is returned. + * @param index the index of the codepoint to get, starting at 0 + * @return the codepoint at the specified index + * @throws IndexOutOfBoundsException if index is negative or >= length() + * @since 1.5 + */ + public int codePointAt(int index) + { + return Character.codePointAt(value, index, count); + } + + /** + * Get the code point before the specified index. This is like + * #codePointAt(int), but checks the characters at <code>index-1</code> and + * <code>index-2</code> to see if they form a supplementary code point. + * @param index the index just past the codepoint to get, starting at 0 + * @return the codepoint at the specified index + * @throws IndexOutOfBoundsException if index is negative or >= length() + * @since 1.5 + */ + public int codePointBefore(int index) + { + // Character.codePointBefore() doesn't perform this check. We + // could use the CharSequence overload, but this is just as easy. + if (index >= count) + throw new IndexOutOfBoundsException(); + return Character.codePointBefore(value, index, 1); + } + + /** + * Get the specified array of characters. <code>srcOffset - srcEnd</code> + * characters will be copied into the array you pass in. + * + * @param srcOffset the index to start copying from (inclusive) + * @param srcEnd the index to stop copying from (exclusive) + * @param dst the array to copy into + * @param dstOffset the index to start copying into + * @throws NullPointerException if dst is null + * @throws IndexOutOfBoundsException if any source or target indices are + * out of range (while unspecified, source problems cause a + * StringIndexOutOfBoundsException, and dest problems cause an + * ArrayIndexOutOfBoundsException) + * @see System#arraycopy(Object, int, Object, int, int) + */ + public void getChars(int srcOffset, int srcEnd, + char[] dst, int dstOffset) + { + if (srcOffset < 0 || srcEnd > count || srcEnd < srcOffset) + throw new StringIndexOutOfBoundsException(); + System.arraycopy(value, srcOffset, dst, dstOffset, srcEnd - srcOffset); + } + + /** + * Set the character at the specified index. + * + * @param index the index of the character to set starting at 0 + * @param ch the value to set that character to + * @throws IndexOutOfBoundsException if index is negative or >= length() + * (while unspecified, this is a StringIndexOutOfBoundsException) + */ + public void setCharAt(int index, char ch) + { + if (index < 0 || index >= count) + throw new StringIndexOutOfBoundsException(index); + // Call ensureCapacity to enforce copy-on-write. + ensureCapacity_unsynchronized(count); + value[index] = ch; + } + + /** + * Append the <code>String</code> value of the argument to this + * <code>StringBuffer</code>. Uses <code>String.valueOf()</code> to convert + * to <code>String</code>. + * + * @param obj the <code>Object</code> to convert and append + * @return this <code>StringBuffer</code> + * @see String#valueOf(Object) + * @see #append(String) + */ + public AbstractStringBuffer append(Object obj) + { + return append(String.valueOf(obj)); + } + + /** + * Append the <code>String</code> to this <code>StringBuffer</code>. If + * str is null, the String "null" is appended. + * + * @param str the <code>String</code> to append + * @return this <code>StringBuffer</code> + */ + public AbstractStringBuffer append(String str) + { + if (str == null) + str = "null"; + int len = str.count; + ensureCapacity_unsynchronized(count + len); + str.getChars(0, len, value, count); + count += len; + return this; + } + + /** + * Append the <code>StringBuilder</code> value of the argument to this + * <code>StringBuilder</code>. This behaves the same as + * <code>append((Object) stringBuffer)</code>, except it is more efficient. + * + * @param stringBuffer the <code>StringBuilder</code> to convert and append + * @return this <code>StringBuilder</code> + * @see #append(Object) + */ + public AbstractStringBuffer append(StringBuffer stringBuffer) + { + if (stringBuffer == null) + return append("null"); + synchronized (stringBuffer) + { + int len = stringBuffer.count; + ensureCapacity(count + len); + System.arraycopy(stringBuffer.value, 0, value, count, len); + count += len; + } + return this; + } + + /** + * Append the <code>char</code> array to this <code>StringBuffer</code>. + * This is similar (but more efficient) than + * <code>append(new String(data))</code>, except in the case of null. + * + * @param data the <code>char[]</code> to append + * @return this <code>StringBuffer</code> + * @throws NullPointerException if <code>str</code> is <code>null</code> + * @see #append(char[], int, int) + */ + public AbstractStringBuffer append(char[] data) + { + return append(data, 0, data.length); + } + + /** + * Append part of the <code>char</code> array to this + * <code>StringBuffer</code>. This is similar (but more efficient) than + * <code>append(new String(data, offset, count))</code>, except in the case + * of null. + * + * @param data the <code>char[]</code> to append + * @param offset the start location in <code>str</code> + * @param count the number of characters to get from <code>str</code> + * @return this <code>StringBuffer</code> + * @throws NullPointerException if <code>str</code> is <code>null</code> + * @throws IndexOutOfBoundsException if offset or count is out of range + * (while unspecified, this is a StringIndexOutOfBoundsException) + */ + public AbstractStringBuffer append(char[] data, int offset, int count) + { + if (offset < 0 || count < 0 || offset > data.length - count) + throw new StringIndexOutOfBoundsException(); + ensureCapacity_unsynchronized(this.count + count); + System.arraycopy(data, offset, value, this.count, count); + this.count += count; + return this; + } + + /** + * Append the <code>String</code> value of the argument to this + * <code>StringBuffer</code>. Uses <code>String.valueOf()</code> to convert + * to <code>String</code>. + * + * @param bool the <code>boolean</code> to convert and append + * @return this <code>StringBuffer</code> + * @see String#valueOf(boolean) + */ + public AbstractStringBuffer append(boolean bool) + { + return append(bool ? "true" : "false"); + } + + /** + * Append the <code>char</code> to this <code>StringBuffer</code>. + * + * @param ch the <code>char</code> to append + * @return this <code>StringBuffer</code> + */ + public AbstractStringBuffer append(char ch) + { + ensureCapacity_unsynchronized(count + 1); + value[count++] = ch; + return this; + } + + /** + * Append the characters in the <code>CharSequence</code> to this + * buffer. + * + * @param seq the <code>CharSequence</code> providing the characters + * @return this <code>StringBuffer</code> + * @since 1.5 + */ + public AbstractStringBuffer append(CharSequence seq) + { + return append(seq, 0, seq.length()); + } + + /** + * Append some characters from the <code>CharSequence</code> to this + * buffer. If the argument is null, the <code>seq</code> is assumed + * to be equal to the string <code>"null"</code>. + * + * @param seq the <code>CharSequence</code> providing the characters + * @param start the starting index + * @param end one past the final index + * @return this <code>StringBuffer</code> + * @since 1.5 + */ + public AbstractStringBuffer append(CharSequence seq, int start, int end) + { + if (seq == null) + seq = "null"; + if (end - start > 0) + { + ensureCapacity_unsynchronized(count + end - start); + for (; start < end; ++start) + value[count++] = seq.charAt(start); + } + return this; + } + + /** + * Append the <code>String</code> value of the argument to this + * <code>StringBuffer</code>. Uses <code>String.valueOf()</code> to convert + * to <code>String</code>. + * + * @param inum the <code>int</code> to convert and append + * @return this <code>StringBuffer</code> + * @see String#valueOf(int) + */ + // GCJ LOCAL: this is native for efficiency. + public native AbstractStringBuffer append (int inum); + + /** + * Append the <code>String</code> value of the argument to this + * <code>StringBuffer</code>. Uses <code>String.valueOf()</code> to convert + * to <code>String</code>. + * + * @param lnum the <code>long</code> to convert and append + * @return this <code>StringBuffer</code> + * @see String#valueOf(long) + */ + public AbstractStringBuffer append(long lnum) + { + return append(Long.toString(lnum, 10)); + } + + /** + * Append the <code>String</code> value of the argument to this + * <code>StringBuffer</code>. Uses <code>String.valueOf()</code> to convert + * to <code>String</code>. + * + * @param fnum the <code>float</code> to convert and append + * @return this <code>StringBuffer</code> + * @see String#valueOf(float) + */ + public AbstractStringBuffer append(float fnum) + { + return append(Float.toString(fnum)); + } + + /** + * Append the <code>String</code> value of the argument to this + * <code>StringBuffer</code>. Uses <code>String.valueOf()</code> to convert + * to <code>String</code>. + * + * @param dnum the <code>double</code> to convert and append + * @return this <code>StringBuffer</code> + * @see String#valueOf(double) + */ + public AbstractStringBuffer append(double dnum) + { + return append(Double.toString(dnum)); + } + + /** + * Append the code point to this <code>StringBuffer</code>. + * This is like #append(char), but will append two characters + * if a supplementary code point is given. + * + * @param code the code point to append + * @return this <code>StringBuffer</code> + * @see Character#toChars(int, char[], int) + * @since 1.5 + */ + public AbstractStringBuffer appendCodePoint(int code) + { + int len = Character.charCount(code); + ensureCapacity_unsynchronized(count + len); + Character.toChars(code, value, count); + count += len; + return this; + } + + /** + * Delete characters from this <code>StringBuffer</code>. + * <code>delete(10, 12)</code> will delete 10 and 11, but not 12. It is + * harmless for end to be larger than length(). + * + * @param start the first character to delete + * @param end the index after the last character to delete + * @return this <code>StringBuffer</code> + * @throws StringIndexOutOfBoundsException if start or end are out of bounds + * @since 1.2 + */ + public AbstractStringBuffer delete(int start, int end) + { + if (start < 0 || start > count || start > end) + throw new StringIndexOutOfBoundsException(start); + if (end > count) + end = count; + ensureCapacity_unsynchronized(count); + if (count - end != 0) + System.arraycopy(value, end, value, start, count - end); + count -= end - start; + return this; + } + + /** + * Delete a character from this <code>StringBuffer</code>. + * + * @param index the index of the character to delete + * @return this <code>StringBuffer</code> + * @throws StringIndexOutOfBoundsException if index is out of bounds + * @since 1.2 + */ + public AbstractStringBuffer deleteCharAt(int index) + { + return delete(index, index + 1); + } + + /** + * Replace characters between index <code>start</code> (inclusive) and + * <code>end</code> (exclusive) with <code>str</code>. If <code>end</code> + * is larger than the size of this StringBuffer, all characters after + * <code>start</code> are replaced. + * + * @param start the beginning index of characters to delete (inclusive) + * @param end the ending index of characters to delete (exclusive) + * @param str the new <code>String</code> to insert + * @return this <code>StringBuffer</code> + * @throws StringIndexOutOfBoundsException if start or end are out of bounds + * @throws NullPointerException if str is null + * @since 1.2 + */ + public AbstractStringBuffer replace(int start, int end, String str) + { + if (start < 0 || start > count || start > end) + throw new StringIndexOutOfBoundsException(start); + + int len = str.count; + // Calculate the difference in 'count' after the replace. + int delta = len - (end > count ? count : end) + start; + ensureCapacity_unsynchronized(count + delta); + + if (delta != 0 && end < count) + System.arraycopy(value, end, value, end + delta, count - end); + + str.getChars(0, len, value, start); + count += delta; + return this; + } + + /** + * Insert a subarray of the <code>char[]</code> argument into this + * <code>StringBuffer</code>. + * + * @param offset the place to insert in this buffer + * @param str the <code>char[]</code> to insert + * @param str_offset the index in <code>str</code> to start inserting from + * @param len the number of characters to insert + * @return this <code>StringBuffer</code> + * @throws NullPointerException if <code>str</code> is <code>null</code> + * @throws StringIndexOutOfBoundsException if any index is out of bounds + * @since 1.2 + */ + public AbstractStringBuffer insert(int offset, char[] str, int str_offset, int len) + { + if (offset < 0 || offset > count || len < 0 + || str_offset < 0 || str_offset > str.length - len) + throw new StringIndexOutOfBoundsException(); + ensureCapacity_unsynchronized(count + len); + System.arraycopy(value, offset, value, offset + len, count - offset); + System.arraycopy(str, str_offset, value, offset, len); + count += len; + return this; + } + + /** + * Insert the <code>String</code> value of the argument into this + * <code>StringBuffer</code>. Uses <code>String.valueOf()</code> to convert + * to <code>String</code>. + * + * @param offset the place to insert in this buffer + * @param obj the <code>Object</code> to convert and insert + * @return this <code>StringBuffer</code> + * @exception StringIndexOutOfBoundsException if offset is out of bounds + * @see String#valueOf(Object) + */ + public AbstractStringBuffer insert(int offset, Object obj) + { + return insert(offset, obj == null ? "null" : obj.toString()); + } + + /** + * Insert the <code>String</code> argument into this + * <code>StringBuffer</code>. If str is null, the String "null" is used + * instead. + * + * @param offset the place to insert in this buffer + * @param str the <code>String</code> to insert + * @return this <code>StringBuffer</code> + * @throws StringIndexOutOfBoundsException if offset is out of bounds + */ + public AbstractStringBuffer insert(int offset, String str) + { + if (offset < 0 || offset > count) + throw new StringIndexOutOfBoundsException(offset); + if (str == null) + str = "null"; + int len = str.count; + ensureCapacity_unsynchronized(count + len); + System.arraycopy(value, offset, value, offset + len, count - offset); + str.getChars(0, len, value, offset); + count += len; + return this; + } + + /** + * Insert the <code>CharSequence</code> argument into this + * <code>StringBuffer</code>. If the sequence is null, the String + * "null" is used instead. + * + * @param offset the place to insert in this buffer + * @param sequence the <code>CharSequence</code> to insert + * @return this <code>StringBuffer</code> + * @throws IndexOutOfBoundsException if offset is out of bounds + * @since 1.5 + */ + public AbstractStringBuffer insert(int offset, CharSequence sequence) + { + if (sequence == null) + sequence = "null"; + return insert(offset, sequence, 0, sequence.length()); + } + + /** + * Insert a subsequence of the <code>CharSequence</code> argument into this + * <code>StringBuffer</code>. If the sequence is null, the String + * "null" is used instead. + * + * @param offset the place to insert in this buffer + * @param sequence the <code>CharSequence</code> to insert + * @param start the starting index of the subsequence + * @param end one past the ending index of the subsequence + * @return this <code>StringBuffer</code> + * @throws IndexOutOfBoundsException if offset, start, + * or end are out of bounds + * @since 1.5 + */ + public AbstractStringBuffer insert(int offset, CharSequence sequence, int start, int end) + { + if (sequence == null) + sequence = "null"; + if (start < 0 || end < 0 || start > end || end > sequence.length()) + throw new IndexOutOfBoundsException(); + int len = end - start; + ensureCapacity_unsynchronized(count + len); + System.arraycopy(value, offset, value, offset + len, count - offset); + for (int i = start; i < end; ++i) + value[offset++] = sequence.charAt(i); + count += len; + return this; + } + + /** + * Insert the <code>char[]</code> argument into this + * <code>StringBuffer</code>. + * + * @param offset the place to insert in this buffer + * @param data the <code>char[]</code> to insert + * @return this <code>StringBuffer</code> + * @throws NullPointerException if <code>data</code> is <code>null</code> + * @throws StringIndexOutOfBoundsException if offset is out of bounds + * @see #insert(int, char[], int, int) + */ + public AbstractStringBuffer insert(int offset, char[] data) + { + return insert(offset, data, 0, data.length); + } + + /** + * Insert the <code>String</code> value of the argument into this + * <code>StringBuffer</code>. Uses <code>String.valueOf()</code> to convert + * to <code>String</code>. + * + * @param offset the place to insert in this buffer + * @param bool the <code>boolean</code> to convert and insert + * @return this <code>StringBuffer</code> + * @throws StringIndexOutOfBoundsException if offset is out of bounds + * @see String#valueOf(boolean) + */ + public AbstractStringBuffer insert(int offset, boolean bool) + { + return insert(offset, bool ? "true" : "false"); + } + + /** + * Insert the <code>char</code> argument into this <code>StringBuffer</code>. + * + * @param offset the place to insert in this buffer + * @param ch the <code>char</code> to insert + * @return this <code>StringBuffer</code> + * @throws StringIndexOutOfBoundsException if offset is out of bounds + */ + public AbstractStringBuffer insert(int offset, char ch) + { + if (offset < 0 || offset > count) + throw new StringIndexOutOfBoundsException(offset); + ensureCapacity_unsynchronized(count + 1); + System.arraycopy(value, offset, value, offset + 1, count - offset); + value[offset] = ch; + count++; + return this; + } + + /** + * Insert the <code>String</code> value of the argument into this + * <code>StringBuffer</code>. Uses <code>String.valueOf()</code> to convert + * to <code>String</code>. + * + * @param offset the place to insert in this buffer + * @param inum the <code>int</code> to convert and insert + * @return this <code>StringBuffer</code> + * @throws StringIndexOutOfBoundsException if offset is out of bounds + * @see String#valueOf(int) + */ + public AbstractStringBuffer insert(int offset, int inum) + { + return insert(offset, String.valueOf(inum)); + } + + /** + * Insert the <code>String</code> value of the argument into this + * <code>StringBuffer</code>. Uses <code>String.valueOf()</code> to convert + * to <code>String</code>. + * + * @param offset the place to insert in this buffer + * @param lnum the <code>long</code> to convert and insert + * @return this <code>StringBuffer</code> + * @throws StringIndexOutOfBoundsException if offset is out of bounds + * @see String#valueOf(long) + */ + public AbstractStringBuffer insert(int offset, long lnum) + { + return insert(offset, Long.toString(lnum, 10)); + } + + /** + * Insert the <code>String</code> value of the argument into this + * <code>StringBuffer</code>. Uses <code>String.valueOf()</code> to convert + * to <code>String</code>. + * + * @param offset the place to insert in this buffer + * @param fnum the <code>float</code> to convert and insert + * @return this <code>StringBuffer</code> + * @throws StringIndexOutOfBoundsException if offset is out of bounds + * @see String#valueOf(float) + */ + public AbstractStringBuffer insert(int offset, float fnum) + { + return insert(offset, Float.toString(fnum)); + } + + /** + * Insert the <code>String</code> value of the argument into this + * <code>StringBuffer</code>. Uses <code>String.valueOf()</code> to convert + * to <code>String</code>. + * + * @param offset the place to insert in this buffer + * @param dnum the <code>double</code> to convert and insert + * @return this <code>StringBuffer</code> + * @throws StringIndexOutOfBoundsException if offset is out of bounds + * @see String#valueOf(double) + */ + public AbstractStringBuffer insert(int offset, double dnum) + { + return insert(offset, Double.toString(dnum)); + } + + /** + * Finds the first instance of a substring in this StringBuilder. + * + * @param str String to find + * @return location (base 0) of the String, or -1 if not found + * @throws NullPointerException if str is null + * @see #indexOf(String, int) + */ + public int indexOf(String str) + { + return indexOf(str, 0); + } + + /** + * Finds the first instance of a String in this StringBuffer, starting at + * a given index. If starting index is less than 0, the search starts at + * the beginning of this String. If the starting index is greater than the + * length of this String, or the substring is not found, -1 is returned. + * + * @param str String to find + * @param fromIndex index to start the search + * @return location (base 0) of the String, or -1 if not found + * @throws NullPointerException if str is null + * @since 1.4 + */ + public int indexOf(String str, int fromIndex) + { + if (fromIndex < 0) + fromIndex = 0; + int limit = count - str.count; + for ( ; fromIndex <= limit; fromIndex++) + if (regionMatches(fromIndex, str)) + return fromIndex; + return -1; + } + + /** + * Finds the last instance of a substring in this StringBuffer. + * + * @param str String to find + * @return location (base 0) of the String, or -1 if not found + * @throws NullPointerException if str is null + * @see #lastIndexOf(String, int) + * @since 1.4 + */ + public int lastIndexOf(String str) + { + return lastIndexOf(str, count - str.count); + } + + /** + * Finds the last instance of a String in this StringBuffer, starting at a + * given index. If starting index is greater than the maximum valid index, + * then the search begins at the end of this String. If the starting index + * is less than zero, or the substring is not found, -1 is returned. + * + * @param str String to find + * @param fromIndex index to start the search + * @return location (base 0) of the String, or -1 if not found + * @throws NullPointerException if str is null + * @since 1.4 + */ + public int lastIndexOf(String str, int fromIndex) + { + fromIndex = Math.min(fromIndex, count - str.count); + for ( ; fromIndex >= 0; fromIndex--) + if (regionMatches(fromIndex, str)) + return fromIndex; + return -1; + } + + /** + * Reverse the characters in this StringBuffer. The same sequence of + * characters exists, but in the reverse index ordering. + * + * @return this <code>StringBuffer</code> + */ + public AbstractStringBuffer reverse() + { + // Call ensureCapacity to enforce copy-on-write. + ensureCapacity_unsynchronized(count); + for (int i = count >> 1, j = count - i; --i >= 0; ++j) + { + char c = value[i]; + value[i] = value[j]; + value[j] = c; + } + return this; + } + + /** + * This may reduce the amount of memory used by the StringBuffer, + * by resizing the internal array to remove unused space. However, + * this method is not required to resize, so this behavior cannot + * be relied upon. + * @since 1.5 + */ + public void trimToSize() + { + int wouldSave = value.length - count; + // Some random heuristics: if we save less than 20 characters, who + // cares. + if (wouldSave < 20) + return; + // If we save more than 200 characters, shrink. + // If we save more than 1/4 of the buffer, shrink. + if (wouldSave > 200 || wouldSave * 4 > value.length) + { + char[] newValue = new char[count]; + System.arraycopy(value, 0, newValue, 0, count); + value = newValue; + } + } + + /** + * Return the number of code points between two indices in the + * <code>StringBuffer</code>. An unpaired surrogate counts as a + * code point for this purpose. Characters outside the indicated + * range are not examined, even if the range ends in the middle of a + * surrogate pair. + * + * @param start the starting index + * @param end one past the ending index + * @return the number of code points + * @since 1.5 + */ + public int codePointCount(int start, int end) + { + if (start < 0 || end >= count || start > end) + throw new StringIndexOutOfBoundsException(); + + int count = 0; + while (start < end) + { + char base = value[start]; + if (base < Character.MIN_HIGH_SURROGATE + || base > Character.MAX_HIGH_SURROGATE + || start == end + || start == count + || value[start + 1] < Character.MIN_LOW_SURROGATE + || value[start + 1] > Character.MAX_LOW_SURROGATE) + { + // Nothing. + } + else + { + // Surrogate pair. + ++start; + } + ++start; + ++count; + } + return count; + } + + /** + * Starting at the given index, this counts forward by the indicated + * number of code points, and then returns the resulting index. An + * unpaired surrogate counts as a single code point for this + * purpose. + * + * @param start the starting index + * @param codePoints the number of code points + * @return the resulting index + * @since 1.5 + */ + public int offsetByCodePoints(int start, int codePoints) + { + while (codePoints > 0) + { + char base = value[start]; + if (base < Character.MIN_HIGH_SURROGATE + || base > Character.MAX_HIGH_SURROGATE + || start == count + || value[start + 1] < Character.MIN_LOW_SURROGATE + || value[start + 1] > Character.MAX_LOW_SURROGATE) + { + // Nothing. + } + else + { + // Surrogate pair. + ++start; + } + ++start; + --codePoints; + } + return start; + } + + /** + * Increase the capacity of this <code>StringBuilder</code>. This will + * ensure that an expensive growing operation will not occur until + * <code>minimumCapacity</code> is reached. The buffer is grown to the + * larger of <code>minimumCapacity</code> and + * <code>capacity() * 2 + 2</code>, if it is not already large enough. + * + * @param minimumCapacity the new capacity + * @see #capacity() + */ + void ensureCapacity_unsynchronized(int minimumCapacity) + { + if (minimumCapacity > value.length) + { + int max = value.length * 2 + 2; + minimumCapacity = (minimumCapacity < max ? max : minimumCapacity); + char[] nb = new char[minimumCapacity]; + System.arraycopy(value, 0, nb, 0, count); + value = nb; + } + } + + /** + * Predicate which determines if a substring of this matches another String + * starting at a specified offset for each String and continuing for a + * specified length. This is more efficient than creating a String to call + * indexOf on. + * + * @param toffset index to start comparison at for this String + * @param other non-null String to compare to region of this + * @return true if regions match, false otherwise + * @see #indexOf(String, int) + * @see #lastIndexOf(String, int) + * @see String#regionMatches(boolean, int, String, int, int) + */ + // GCJ LOCAL: native for gcj. + private native boolean regionMatches(int toffset, String other); + +} diff --git a/libjava/java/lang/ClassLoader.java b/libjava/java/lang/ClassLoader.java index e0463ac2af6..d5557309578 100644 --- a/libjava/java/lang/ClassLoader.java +++ b/libjava/java/lang/ClassLoader.java @@ -775,7 +775,7 @@ public abstract class ClassLoader */ protected Enumeration<URL> findResources(String name) throws IOException { - return (Enumeration<URL>) EmptyEnumeration.getInstance(); + return new EmptyEnumeration<URL>(); } /** diff --git a/libjava/java/lang/Double.h b/libjava/java/lang/Double.h index 7808acc4659..54eb42b5028 100644 --- a/libjava/java/lang/Double.h +++ b/libjava/java/lang/Double.h @@ -49,6 +49,8 @@ public: static const jint SIZE = 64; static ::java::lang::Class * TYPE; private: + static ::java::lang::Double * ZERO; + static ::java::lang::Double * ONE; jdouble __attribute__((aligned(__alignof__( ::java::lang::Number)))) value; public: static ::java::lang::Class class$; diff --git a/libjava/java/lang/Float.h b/libjava/java/lang/Float.h index 0069df44bff..603da6dd1a0 100644 --- a/libjava/java/lang/Float.h +++ b/libjava/java/lang/Float.h @@ -50,6 +50,8 @@ public: static ::java::lang::Class * TYPE; static const jint SIZE = 32; private: + static ::java::lang::Float * ZERO; + static ::java::lang::Float * ONE; jfloat __attribute__((aligned(__alignof__( ::java::lang::Number)))) value; public: static ::java::lang::Class class$; diff --git a/libjava/java/lang/Integer.h b/libjava/java/lang/Integer.h index aebcd0a164f..f1bd11bdbd9 100644 --- a/libjava/java/lang/Integer.h +++ b/libjava/java/lang/Integer.h @@ -16,6 +16,9 @@ class java::lang::Integer : public ::java::lang::Number public: Integer(jint); Integer(::java::lang::String *); +private: + static jint stringSize(jint, jint); +public: static ::java::lang::String * toString(jint, jint); static ::java::lang::String * toHexString(jint); static ::java::lang::String * toOctalString(jint); diff --git a/libjava/java/lang/Long.h b/libjava/java/lang/Long.h index b0358e6d729..60c0d24379d 100644 --- a/libjava/java/lang/Long.h +++ b/libjava/java/lang/Long.h @@ -7,6 +7,8 @@ #pragma interface #include <java/lang/Number.h> +#include <gcj/array.h> + class java::lang::Long : public ::java::lang::Number { @@ -14,6 +16,9 @@ class java::lang::Long : public ::java::lang::Number public: Long(jlong); Long(::java::lang::String *); +private: + static jint stringSize(jlong, jint); +public: static ::java::lang::String * toString(jlong, jint); static ::java::lang::String * toHexString(jlong); static ::java::lang::String * toOctalString(jlong); @@ -61,6 +66,9 @@ public: static ::java::lang::Class * TYPE; static const jint SIZE = 64; private: + static const jint MIN_CACHE = -128; + static const jint MAX_CACHE = 127; + static JArray< ::java::lang::Long * > * longCache; jlong __attribute__((aligned(__alignof__( ::java::lang::Number)))) value; public: static ::java::lang::Class class$; diff --git a/libjava/java/lang/String.h b/libjava/java/lang/String.h index 5fa06de982b..32e0ccdfaf3 100644 --- a/libjava/java/lang/String.h +++ b/libjava/java/lang/String.h @@ -118,6 +118,7 @@ public: jint offsetByCodePoints(jint, jint); jboolean isEmpty(); private: + static ::java::lang::String * toString(JArray< jchar > *, jint, jint); void init(JArray< jchar > *, jint, jint, jboolean); void init(JArray< jbyte > *, jint, jint, jint); void init(JArray< jbyte > *, jint, jint, ::java::lang::String *); diff --git a/libjava/java/lang/String.java b/libjava/java/lang/String.java index d5bb4150211..b9ce3c016fc 100644 --- a/libjava/java/lang/String.java +++ b/libjava/java/lang/String.java @@ -1440,6 +1440,14 @@ public final class String return count == 0; } + // Generate a String that shares the value array: subsequent changes + // to this array will affect the String. A private internal method + // that is called from CPStringBuilder by compiler-generated code. + private static String toString(char[] value, int startIndex, int count) + { + return new String(value, startIndex, count, true); + } + private native void init(char[] chars, int offset, int count, boolean dont_copy); private native void init(byte[] chars, int hibyte, int offset, int count); diff --git a/libjava/java/lang/StringBuffer.h b/libjava/java/lang/StringBuffer.h index 983ef98d73c..487e2fcd351 100644 --- a/libjava/java/lang/StringBuffer.h +++ b/libjava/java/lang/StringBuffer.h @@ -6,11 +6,11 @@ #pragma interface -#include <java/lang/Object.h> +#include <java/lang/AbstractStringBuffer.h> #include <gcj/array.h> -class java::lang::StringBuffer : public ::java::lang::Object +class java::lang::StringBuffer : public ::java::lang::AbstractStringBuffer { public: @@ -27,62 +27,87 @@ public: jint codePointBefore(jint); void getChars(jint, jint, JArray< jchar > *, jint); void setCharAt(jint, jchar); - ::java::lang::StringBuffer * append(::java::lang::Object *); - ::java::lang::StringBuffer * append(::java::lang::String *); - ::java::lang::StringBuffer * append(::java::lang::StringBuffer *); - ::java::lang::StringBuffer * append(JArray< jchar > *); - ::java::lang::StringBuffer * append(JArray< jchar > *, jint, jint); - ::java::lang::StringBuffer * appendCodePoint(jint); - ::java::lang::StringBuffer * append(jboolean); + ::java::lang::StringBuffer * StringBuffer$append(::java::lang::Object *); + ::java::lang::StringBuffer * StringBuffer$append(::java::lang::String *); + ::java::lang::StringBuffer * StringBuffer$append(::java::lang::StringBuffer *); + ::java::lang::StringBuffer * StringBuffer$append(JArray< jchar > *); + ::java::lang::StringBuffer * StringBuffer$append(JArray< jchar > *, jint, jint); + ::java::lang::StringBuffer * StringBuffer$append(jboolean); ::java::lang::StringBuffer * StringBuffer$append(jchar); ::java::lang::StringBuffer * StringBuffer$append(::java::lang::CharSequence *); ::java::lang::StringBuffer * StringBuffer$append(::java::lang::CharSequence *, jint, jint); - ::java::lang::StringBuffer * append(jint); - ::java::lang::StringBuffer * append(jlong); - ::java::lang::StringBuffer * append(jfloat); - ::java::lang::StringBuffer * append(jdouble); - ::java::lang::StringBuffer * delete$(jint, jint); - ::java::lang::StringBuffer * deleteCharAt(jint); - ::java::lang::StringBuffer * replace(jint, jint, ::java::lang::String *); + ::java::lang::StringBuffer * StringBuffer$append(jint); + ::java::lang::StringBuffer * StringBuffer$append(jlong); + ::java::lang::StringBuffer * StringBuffer$append(jfloat); + ::java::lang::StringBuffer * StringBuffer$append(jdouble); + ::java::lang::StringBuffer * StringBuffer$appendCodePoint(jint); + ::java::lang::StringBuffer * StringBuffer$delete(jint, jint); + ::java::lang::StringBuffer * StringBuffer$deleteCharAt(jint); + ::java::lang::StringBuffer * StringBuffer$replace(jint, jint, ::java::lang::String *); ::java::lang::String * substring(jint); ::java::lang::CharSequence * subSequence(jint, jint); ::java::lang::String * substring(jint, jint); - ::java::lang::StringBuffer * insert(jint, JArray< jchar > *, jint, jint); - ::java::lang::StringBuffer * insert(jint, ::java::lang::Object *); - ::java::lang::StringBuffer * insert(jint, ::java::lang::String *); - ::java::lang::StringBuffer * insert(jint, ::java::lang::CharSequence *); - ::java::lang::StringBuffer * insert(jint, ::java::lang::CharSequence *, jint, jint); - ::java::lang::StringBuffer * insert(jint, JArray< jchar > *); - ::java::lang::StringBuffer * insert(jint, jboolean); - ::java::lang::StringBuffer * insert(jint, jchar); - ::java::lang::StringBuffer * insert(jint, jint); - ::java::lang::StringBuffer * insert(jint, jlong); - ::java::lang::StringBuffer * insert(jint, jfloat); - ::java::lang::StringBuffer * insert(jint, jdouble); + ::java::lang::StringBuffer * StringBuffer$insert(jint, JArray< jchar > *, jint, jint); + ::java::lang::StringBuffer * StringBuffer$insert(jint, ::java::lang::Object *); + ::java::lang::StringBuffer * StringBuffer$insert(jint, ::java::lang::String *); + ::java::lang::StringBuffer * StringBuffer$insert(jint, ::java::lang::CharSequence *); + ::java::lang::StringBuffer * StringBuffer$insert(jint, ::java::lang::CharSequence *, jint, jint); + ::java::lang::StringBuffer * StringBuffer$insert(jint, JArray< jchar > *); + ::java::lang::StringBuffer * StringBuffer$insert(jint, jboolean); + ::java::lang::StringBuffer * StringBuffer$insert(jint, jchar); + ::java::lang::StringBuffer * StringBuffer$insert(jint, jint); + ::java::lang::StringBuffer * StringBuffer$insert(jint, jlong); + ::java::lang::StringBuffer * StringBuffer$insert(jint, jfloat); + ::java::lang::StringBuffer * StringBuffer$insert(jint, jdouble); jint indexOf(::java::lang::String *); jint indexOf(::java::lang::String *, jint); jint lastIndexOf(::java::lang::String *); jint lastIndexOf(::java::lang::String *, jint); - ::java::lang::StringBuffer * reverse(); + ::java::lang::StringBuffer * StringBuffer$reverse(); ::java::lang::String * toString(); void trimToSize(); jint codePointCount(jint, jint); jint offsetByCodePoints(jint, jint); -private: +public: // actually package-private void ensureCapacity_unsynchronized(jint); - jboolean regionMatches(jint, ::java::lang::String *); public: + ::java::lang::AbstractStringBuffer * reverse(); + ::java::lang::AbstractStringBuffer * deleteCharAt(jint); + ::java::lang::AbstractStringBuffer * replace(jint, jint, ::java::lang::String *); + ::java::lang::AbstractStringBuffer * delete$(jint, jint); + ::java::lang::AbstractStringBuffer * insert(jint, jdouble); + ::java::lang::AbstractStringBuffer * insert(jint, jfloat); + ::java::lang::AbstractStringBuffer * insert(jint, jlong); + ::java::lang::AbstractStringBuffer * insert(jint, jint); + ::java::lang::AbstractStringBuffer * insert(jint, jchar); + ::java::lang::AbstractStringBuffer * insert(jint, jboolean); + ::java::lang::AbstractStringBuffer * insert(jint, JArray< jchar > *); + ::java::lang::AbstractStringBuffer * insert(jint, ::java::lang::CharSequence *, jint, jint); + ::java::lang::AbstractStringBuffer * insert(jint, ::java::lang::CharSequence *); + ::java::lang::AbstractStringBuffer * insert(jint, ::java::lang::String *); + ::java::lang::AbstractStringBuffer * insert(jint, ::java::lang::Object *); + ::java::lang::AbstractStringBuffer * insert(jint, JArray< jchar > *, jint, jint); + ::java::lang::AbstractStringBuffer * append(jdouble); + ::java::lang::AbstractStringBuffer * append(jfloat); + ::java::lang::AbstractStringBuffer * append(jlong); + ::java::lang::AbstractStringBuffer * append(jint); ::java::lang::Appendable * append(::java::lang::CharSequence *, jint, jint); + ::java::lang::AbstractStringBuffer * AbstractStringBuffer$append(::java::lang::CharSequence *, jint, jint); ::java::lang::Appendable * append(::java::lang::CharSequence *); + ::java::lang::AbstractStringBuffer * AbstractStringBuffer$append(::java::lang::CharSequence *); ::java::lang::Appendable * append(jchar); + ::java::lang::AbstractStringBuffer * AbstractStringBuffer$append(jchar); + ::java::lang::AbstractStringBuffer * append(jboolean); + ::java::lang::AbstractStringBuffer * append(JArray< jchar > *, jint, jint); + ::java::lang::AbstractStringBuffer * append(JArray< jchar > *); + ::java::lang::AbstractStringBuffer * append(::java::lang::StringBuffer *); + ::java::lang::AbstractStringBuffer * append(::java::lang::String *); + ::java::lang::AbstractStringBuffer * append(::java::lang::Object *); + ::java::lang::AbstractStringBuffer * appendCodePoint(jint); private: static const jlong serialVersionUID = 3388685877147921107LL; public: // actually package-private - jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) count; - JArray< jchar > * value; - jboolean shared; -private: - static const jint DEFAULT_CAPACITY = 16; + jboolean __attribute__((aligned(__alignof__( ::java::lang::AbstractStringBuffer)))) shared; public: static ::java::lang::Class class$; }; diff --git a/libjava/java/lang/StringBuffer.java b/libjava/java/lang/StringBuffer.java index 57fd2ca8e81..0c61b4d9fb8 100644 --- a/libjava/java/lang/StringBuffer.java +++ b/libjava/java/lang/StringBuffer.java @@ -1,5 +1,5 @@ /* StringBuffer.java -- Growable strings - Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 + Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -73,6 +73,7 @@ import java.io.Serializable; * @status updated to 1.4 */ public final class StringBuffer + extends AbstractStringBuffer implements Serializable, CharSequence, Appendable { // Implementation note: if you change this class, you usually will @@ -84,23 +85,6 @@ public final class StringBuffer private static final long serialVersionUID = 3388685877147921107L; /** - * Index of next available character (and thus the size of the current - * string contents). Note that this has permissions set this way so that - * String can get the value. - * - * @serial the number of characters in the buffer - */ - int count; - - /** - * The buffer. Note that this has permissions set this way so that String - * can get the value. - * - * @serial the buffer - */ - char[] value; - - /** * True if the buffer is shared with another object (StringBuffer or * String); this means the buffer must be copied before writing to it again. * Note that this has permissions set this way so that String can get the @@ -111,16 +95,11 @@ public final class StringBuffer boolean shared; /** - * The default capacity of a buffer. - */ - private static final int DEFAULT_CAPACITY = 16; - - /** * Create a new StringBuffer with default capacity 16. */ public StringBuffer() { - this(DEFAULT_CAPACITY); + super(); } /** @@ -132,7 +111,7 @@ public final class StringBuffer */ public StringBuffer(int capacity) { - value = new char[capacity]; + super(capacity); } /** @@ -146,26 +125,22 @@ public final class StringBuffer public StringBuffer(String str) { // Unfortunately, because the size is 16 larger, we cannot share. - count = str.count; - value = new char[count + DEFAULT_CAPACITY]; - str.getChars(0, count, value, 0); + super(str); } /** - * Create a new <code>StringBuffer</code> with the characters from the + * Create a new <code>StringBuffer</code> with the characters in the * specified <code>CharSequence</code>. Initial capacity will be the - * size of the CharSequence plus 16. + * length of the sequence plus 16; if the sequence reports a length + * less than or equal to 0, then the initial capacity will be 16. * - * @param seq the <code>String</code> to convert + * @param seq the initializing <code>CharSequence</code> * @throws NullPointerException if str is null * @since 1.5 */ public StringBuffer(CharSequence seq) { - count = Math.max(0, seq.length()); - value = new char[count + DEFAULT_CAPACITY]; - for (int i = 0; i < count; ++i) - value[i] = seq.charAt(i); + super(seq); } /** @@ -224,29 +199,7 @@ public final class StringBuffer */ public synchronized void setLength(int newLength) { - if (newLength < 0) - throw new StringIndexOutOfBoundsException(newLength); - - int valueLength = value.length; - - /* Always call ensureCapacity_unsynchronized in order to preserve - copy-on-write semantics. */ - ensureCapacity_unsynchronized(newLength); - - if (newLength < valueLength) - { - /* If the StringBuffer's value just grew, then we know that - value is newly allocated and the region between count and - newLength is filled with '\0'. */ - count = newLength; - } - else - { - /* The StringBuffer's value doesn't need to grow. However, - we should clear out any cruft that may exist. */ - while (count < newLength) - value[count++] = '\0'; - } + super.setLength(newLength); } /** @@ -255,12 +208,11 @@ public final class StringBuffer * @param index the index of the character to get, starting at 0 * @return the character at the specified index * @throws IndexOutOfBoundsException if index is negative or >= length() + * (while unspecified, this is a StringIndexOutOfBoundsException) */ public synchronized char charAt(int index) { - if (index < 0 || index >= count) - throw new StringIndexOutOfBoundsException(index); - return value[index]; + return super.charAt(index); } /** @@ -275,7 +227,7 @@ public final class StringBuffer */ public synchronized int codePointAt(int index) { - return Character.codePointAt(value, index, count); + return super.codePointAt(index); } /** @@ -289,11 +241,7 @@ public final class StringBuffer */ public synchronized int codePointBefore(int index) { - // Character.codePointBefore() doesn't perform this check. We - // could use the CharSequence overload, but this is just as easy. - if (index >= count) - throw new IndexOutOfBoundsException(); - return Character.codePointBefore(value, index, 1); + return super.codePointBefore(index); } /** @@ -314,9 +262,7 @@ public final class StringBuffer public synchronized void getChars(int srcOffset, int srcEnd, char[] dst, int dstOffset) { - if (srcOffset < 0 || srcEnd > count || srcEnd < srcOffset) - throw new StringIndexOutOfBoundsException(); - System.arraycopy(value, srcOffset, dst, dstOffset, srcEnd - srcOffset); + super.getChars(srcOffset, srcEnd, dst, dstOffset); } /** @@ -329,11 +275,7 @@ public final class StringBuffer */ public synchronized void setCharAt(int index, char ch) { - if (index < 0 || index >= count) - throw new StringIndexOutOfBoundsException(index); - // Call ensureCapacity to enforce copy-on-write. - ensureCapacity_unsynchronized(count); - value[index] = ch; + super.setCharAt(index, ch); } /** @@ -346,9 +288,10 @@ public final class StringBuffer * @see String#valueOf(Object) * @see #append(String) */ - public StringBuffer append(Object obj) + public synchronized StringBuffer append(Object obj) { - return append(obj == null ? "null" : obj.toString()); + super.append(obj); + return this; } /** @@ -360,12 +303,7 @@ public final class StringBuffer */ public synchronized StringBuffer append(String str) { - if (str == null) - str = "null"; - int len = str.count; - ensureCapacity_unsynchronized(count + len); - str.getChars(0, len, value, count); - count += len; + super.append(str); return this; } @@ -381,15 +319,7 @@ public final class StringBuffer */ public synchronized StringBuffer append(StringBuffer stringBuffer) { - if (stringBuffer == null) - return append("null"); - synchronized (stringBuffer) - { - int len = stringBuffer.count; - ensureCapacity_unsynchronized(count + len); - System.arraycopy(stringBuffer.value, 0, value, count, len); - count += len; - } + super.append(stringBuffer); return this; } @@ -403,9 +333,10 @@ public final class StringBuffer * @throws NullPointerException if <code>str</code> is <code>null</code> * @see #append(char[], int, int) */ - public StringBuffer append(char[] data) + public synchronized StringBuffer append(char[] data) { - return append(data, 0, data.length); + super.append(data, 0, data.length); + return this; } /** @@ -424,30 +355,7 @@ public final class StringBuffer */ public synchronized StringBuffer append(char[] data, int offset, int count) { - if (offset < 0 || count < 0 || offset > data.length - count) - throw new StringIndexOutOfBoundsException(); - ensureCapacity_unsynchronized(this.count + count); - System.arraycopy(data, offset, value, this.count, count); - this.count += count; - return this; - } - - /** - * Append the code point to this <code>StringBuffer</code>. - * This is like #append(char), but will append two characters - * if a supplementary code point is given. - * - * @param code the code point to append - * @return this <code>StringBuffer</code> - * @see Character#toChars(int, char[], int) - * @since 1.5 - */ - public synchronized StringBuffer appendCodePoint(int code) - { - int len = Character.charCount(code); - ensureCapacity_unsynchronized(count + len); - Character.toChars(code, value, count); - count += len; + super.append(data, offset, count); return this; } @@ -460,9 +368,10 @@ public final class StringBuffer * @return this <code>StringBuffer</code> * @see String#valueOf(boolean) */ - public StringBuffer append(boolean bool) + public synchronized StringBuffer append(boolean bool) { - return append(bool ? "true" : "false"); + super.append(bool); + return this; } /** @@ -473,47 +382,38 @@ public final class StringBuffer */ public synchronized StringBuffer append(char ch) { - ensureCapacity_unsynchronized(count + 1); - value[count++] = ch; + super.append(ch); return this; } /** - * Append the <code>CharSequence</code> value of the argument to this - * <code>StringBuffer</code>. + * Append the characters in the <code>CharSequence</code> to this + * buffer. * - * @param seq the <code>CharSequence</code> to append + * @param seq the <code>CharSequence</code> providing the characters * @return this <code>StringBuffer</code> - * @see #append(Object) * @since 1.5 */ public synchronized StringBuffer append(CharSequence seq) { - if (seq == null) - seq = "null"; - return append(seq, 0, seq.length()); + super.append(seq, 0, seq.length()); + return this; } /** - * Append the specified subsequence of the <code>CharSequence</code> - * argument to this <code>StringBuffer</code>. + * Append some characters from the <code>CharSequence</code> to this + * buffer. If the argument is null, the four characters "null" are + * appended. * - * @param seq the <code>CharSequence</code> to append + * @param seq the <code>CharSequence</code> providing the characters * @param start the starting index - * @param end one past the ending index + * @param end one past the final index * @return this <code>StringBuffer</code> - * @see #append(Object) * @since 1.5 */ public synchronized StringBuffer append(CharSequence seq, int start, int end) { - if (seq == null) - seq = "null"; - if (start < 0 || end < 0 || start > end || end > seq.length()) - throw new IndexOutOfBoundsException(); - ensureCapacity_unsynchronized(this.count + end - start); - for (int i = start; i < end; ++i) - value[count++] = seq.charAt(i); + super.append(seq, start, end); return this; } @@ -526,8 +426,12 @@ public final class StringBuffer * @return this <code>StringBuffer</code> * @see String#valueOf(int) */ - // GCJ LOCAL: this is native for efficiency. - public native StringBuffer append (int inum); + // This is native in libgcj, for efficiency. + public synchronized StringBuffer append(int inum) + { + super.append(inum); + return this; + } /** * Append the <code>String</code> value of the argument to this @@ -538,9 +442,10 @@ public final class StringBuffer * @return this <code>StringBuffer</code> * @see String#valueOf(long) */ - public StringBuffer append(long lnum) + public synchronized StringBuffer append(long lnum) { - return append(Long.toString(lnum, 10)); + super.append(lnum); + return this; } /** @@ -552,9 +457,10 @@ public final class StringBuffer * @return this <code>StringBuffer</code> * @see String#valueOf(float) */ - public StringBuffer append(float fnum) + public synchronized StringBuffer append(float fnum) { - return append(Float.toString(fnum)); + super.append(fnum); + return this; } /** @@ -566,9 +472,26 @@ public final class StringBuffer * @return this <code>StringBuffer</code> * @see String#valueOf(double) */ - public StringBuffer append(double dnum) + public synchronized StringBuffer append(double dnum) + { + super.append(dnum); + return this; + } + + /** + * Append the code point to this <code>StringBuffer</code>. + * This is like #append(char), but will append two characters + * if a supplementary code point is given. + * + * @param code the code point to append + * @return this <code>StringBuffer</code> + * @see Character#toChars(int, char[], int) + * @since 1.5 + */ + public synchronized StringBuffer appendCodePoint(int code) { - return append(Double.toString(dnum)); + super.appendCodePoint(code); + return this; } /** @@ -584,15 +507,8 @@ public final class StringBuffer */ public synchronized StringBuffer delete(int start, int end) { - if (start < 0 || start > count || start > end) - throw new StringIndexOutOfBoundsException(start); - if (end > count) - end = count; // This will unshare if required. - ensureCapacity_unsynchronized(count); - if (count - end != 0) - System.arraycopy(value, end, value, start, count - end); - count -= end - start; + super.delete(start, end); return this; } @@ -604,9 +520,10 @@ public final class StringBuffer * @throws StringIndexOutOfBoundsException if index is out of bounds * @since 1.2 */ - public StringBuffer deleteCharAt(int index) + public synchronized StringBuffer deleteCharAt(int index) { - return delete(index, index + 1); + super.deleteCharAt(index); + return this; } /** @@ -625,19 +542,7 @@ public final class StringBuffer */ public synchronized StringBuffer replace(int start, int end, String str) { - if (start < 0 || start > count || start > end) - throw new StringIndexOutOfBoundsException(start); - - int len = str.count; - // Calculate the difference in 'count' after the replace. - int delta = len - (end > count ? count : end) + start; - ensureCapacity_unsynchronized(count + delta); - - if (delta != 0 && end < count) - System.arraycopy(value, end, value, end + delta, count - end); - - str.getChars(0, len, value, start); - count += delta; + super.replace(start, end, str); return this; } @@ -717,13 +622,7 @@ public final class StringBuffer public synchronized StringBuffer insert(int offset, char[] str, int str_offset, int len) { - if (offset < 0 || offset > count || len < 0 - || str_offset < 0 || str_offset > str.length - len) - throw new StringIndexOutOfBoundsException(); - ensureCapacity_unsynchronized(count + len); - System.arraycopy(value, offset, value, offset + len, count - offset); - System.arraycopy(str, str_offset, value, offset, len); - count += len; + super.insert(offset, str, str_offset, len); return this; } @@ -738,9 +637,10 @@ public final class StringBuffer * @exception StringIndexOutOfBoundsException if offset is out of bounds * @see String#valueOf(Object) */ - public StringBuffer insert(int offset, Object obj) + public synchronized StringBuffer insert(int offset, Object obj) { - return insert(offset, obj == null ? "null" : obj.toString()); + super.insert(offset, obj); + return this; } /** @@ -755,15 +655,7 @@ public final class StringBuffer */ public synchronized StringBuffer insert(int offset, String str) { - if (offset < 0 || offset > count) - throw new StringIndexOutOfBoundsException(offset); - if (str == null) - str = "null"; - int len = str.count; - ensureCapacity_unsynchronized(count + len); - System.arraycopy(value, offset, value, offset + len, count - offset); - str.getChars(0, len, value, offset); - count += len; + super.insert(offset, str); return this; } @@ -780,9 +672,8 @@ public final class StringBuffer */ public synchronized StringBuffer insert(int offset, CharSequence sequence) { - if (sequence == null) - sequence = "null"; - return insert(offset, sequence, 0, sequence.length()); + super.insert(offset, sequence); + return this; } /** @@ -802,16 +693,7 @@ public final class StringBuffer public synchronized StringBuffer insert(int offset, CharSequence sequence, int start, int end) { - if (sequence == null) - sequence = "null"; - if (start < 0 || end < 0 || start > end || end > sequence.length()) - throw new IndexOutOfBoundsException(); - int len = end - start; - ensureCapacity_unsynchronized(count + len); - System.arraycopy(value, offset, value, offset + len, count - offset); - for (int i = start; i < end; ++i) - value[offset++] = sequence.charAt(i); - count += len; + super.insert(offset, sequence, start, end); return this; } @@ -826,9 +708,10 @@ public final class StringBuffer * @throws StringIndexOutOfBoundsException if offset is out of bounds * @see #insert(int, char[], int, int) */ - public StringBuffer insert(int offset, char[] data) + public synchronized StringBuffer insert(int offset, char[] data) { - return insert(offset, data, 0, data.length); + super.insert(offset, data, 0, data.length); + return this; } /** @@ -842,9 +725,10 @@ public final class StringBuffer * @throws StringIndexOutOfBoundsException if offset is out of bounds * @see String#valueOf(boolean) */ - public StringBuffer insert(int offset, boolean bool) + public synchronized StringBuffer insert(int offset, boolean bool) { - return insert(offset, bool ? "true" : "false"); + super.insert(offset, bool); + return this; } /** @@ -857,12 +741,7 @@ public final class StringBuffer */ public synchronized StringBuffer insert(int offset, char ch) { - if (offset < 0 || offset > count) - throw new StringIndexOutOfBoundsException(offset); - ensureCapacity_unsynchronized(count + 1); - System.arraycopy(value, offset, value, offset + 1, count - offset); - value[offset] = ch; - count++; + super.insert(offset, ch); return this; } @@ -877,9 +756,10 @@ public final class StringBuffer * @throws StringIndexOutOfBoundsException if offset is out of bounds * @see String#valueOf(int) */ - public StringBuffer insert(int offset, int inum) + public synchronized StringBuffer insert(int offset, int inum) { - return insert(offset, String.valueOf(inum)); + super.insert(offset, inum); + return this; } /** @@ -893,9 +773,10 @@ public final class StringBuffer * @throws StringIndexOutOfBoundsException if offset is out of bounds * @see String#valueOf(long) */ - public StringBuffer insert(int offset, long lnum) + public synchronized StringBuffer insert(int offset, long lnum) { - return insert(offset, Long.toString(lnum, 10)); + super.insert(offset, lnum); + return this; } /** @@ -909,9 +790,10 @@ public final class StringBuffer * @throws StringIndexOutOfBoundsException if offset is out of bounds * @see String#valueOf(float) */ - public StringBuffer insert(int offset, float fnum) + public synchronized StringBuffer insert(int offset, float fnum) { - return insert(offset, Float.toString(fnum)); + super.insert(offset, fnum); + return this; } /** @@ -925,9 +807,10 @@ public final class StringBuffer * @throws StringIndexOutOfBoundsException if offset is out of bounds * @see String#valueOf(double) */ - public StringBuffer insert(int offset, double dnum) + public synchronized StringBuffer insert(int offset, double dnum) { - return insert(offset, Double.toString(dnum)); + super.insert(offset, dnum); + return this; } /** @@ -939,9 +822,9 @@ public final class StringBuffer * @see #indexOf(String, int) * @since 1.4 */ - public int indexOf(String str) + public synchronized int indexOf(String str) { - return indexOf(str, 0); + return super.indexOf(str, 0); } /** @@ -958,13 +841,7 @@ public final class StringBuffer */ public synchronized int indexOf(String str, int fromIndex) { - if (fromIndex < 0) - fromIndex = 0; - int limit = count - str.count; - for ( ; fromIndex <= limit; fromIndex++) - if (regionMatches(fromIndex, str)) - return fromIndex; - return -1; + return super.indexOf(str, fromIndex); } /** @@ -976,9 +853,9 @@ public final class StringBuffer * @see #lastIndexOf(String, int) * @since 1.4 */ - public int lastIndexOf(String str) + public synchronized int lastIndexOf(String str) { - return lastIndexOf(str, count - str.count); + return super.lastIndexOf(str, count - str.count); } /** @@ -995,11 +872,7 @@ public final class StringBuffer */ public synchronized int lastIndexOf(String str, int fromIndex) { - fromIndex = Math.min(fromIndex, count - str.count); - for ( ; fromIndex >= 0; fromIndex--) - if (regionMatches(fromIndex, str)) - return fromIndex; - return -1; + return super.lastIndexOf(str, fromIndex); } /** @@ -1010,14 +883,7 @@ public final class StringBuffer */ public synchronized StringBuffer reverse() { - // Call ensureCapacity to enforce copy-on-write. - ensureCapacity_unsynchronized(count); - for (int i = count >> 1, j = count - i; --i >= 0; ++j) - { - char c = value[i]; - value[i] = value[j]; - value[j] = c; - } + super.reverse(); return this; } @@ -1044,19 +910,7 @@ public final class StringBuffer */ public synchronized void trimToSize() { - int wouldSave = value.length - count; - // Some random heuristics: if we save less than 20 characters, who - // cares. - if (wouldSave < 20) - return; - // If we save more than 200 characters, shrink. - // If we save more than 1/4 of the buffer, shrink. - if (wouldSave > 200 || wouldSave * 4 > value.length) - { - char[] newValue = new char[count]; - System.arraycopy(value, 0, newValue, 0, count); - value = newValue; - } + super.trimToSize(); } /** @@ -1073,31 +927,7 @@ public final class StringBuffer */ public synchronized int codePointCount(int start, int end) { - if (start < 0 || end >= count || start > end) - throw new StringIndexOutOfBoundsException(); - - int count = 0; - while (start < end) - { - char base = value[start]; - if (base < Character.MIN_HIGH_SURROGATE - || base > Character.MAX_HIGH_SURROGATE - || start == end - || start == count - || value[start + 1] < Character.MIN_LOW_SURROGATE - || value[start + 1] > Character.MAX_LOW_SURROGATE) - { - // Nothing. - } - else - { - // Surrogate pair. - ++start; - } - ++start; - ++count; - } - return count; + return super.codePointCount(start, end); } /** @@ -1113,26 +943,7 @@ public final class StringBuffer */ public synchronized int offsetByCodePoints(int start, int codePoints) { - while (codePoints > 0) - { - char base = value[start]; - if (base < Character.MIN_HIGH_SURROGATE - || base > Character.MAX_HIGH_SURROGATE - || start == count - || value[start + 1] < Character.MIN_LOW_SURROGATE - || value[start + 1] > Character.MAX_LOW_SURROGATE) - { - // Nothing. - } - else - { - // Surrogate pair. - ++start; - } - ++start; - --codePoints; - } - return start; + return super.offsetByCodePoints(start, codePoints); } /** @@ -1144,7 +955,7 @@ public final class StringBuffer * @param minimumCapacity the minimum capacity * @see #ensureCapacity(int) */ - private void ensureCapacity_unsynchronized(int minimumCapacity) + void ensureCapacity_unsynchronized(int minimumCapacity) { if (shared || minimumCapacity > value.length) { @@ -1162,19 +973,4 @@ public final class StringBuffer } } - /** - * Predicate which determines if a substring of this matches another String - * starting at a specified offset for each String and continuing for a - * specified length. This is more efficient than creating a String to call - * indexOf on. - * - * @param toffset index to start comparison at for this String - * @param other non-null String to compare to region of this - * @return true if regions match, false otherwise - * @see #indexOf(String, int) - * @see #lastIndexOf(String, int) - * @see String#regionMatches(boolean, int, String, int, int) - */ - // GCJ LOCAL: native for gcj. - private native boolean regionMatches(int toffset, String other); } diff --git a/libjava/java/lang/StringBuilder.h b/libjava/java/lang/StringBuilder.h index b8b504a995d..c8b952a4155 100644 --- a/libjava/java/lang/StringBuilder.h +++ b/libjava/java/lang/StringBuilder.h @@ -6,11 +6,11 @@ #pragma interface -#include <java/lang/Object.h> +#include <java/lang/AbstractStringBuffer.h> #include <gcj/array.h> -class java::lang::StringBuilder : public ::java::lang::Object +class java::lang::StringBuilder : public ::java::lang::AbstractStringBuffer { public: @@ -20,66 +20,75 @@ public: StringBuilder(::java::lang::CharSequence *); jint length(); jint capacity(); - void ensureCapacity(jint); - void setLength(jint); - jchar charAt(jint); - void getChars(jint, jint, JArray< jchar > *, jint); - void setCharAt(jint, jchar); - ::java::lang::StringBuilder * append(::java::lang::Object *); - ::java::lang::StringBuilder * append(::java::lang::String *); - ::java::lang::StringBuilder * append(::java::lang::StringBuffer *); - ::java::lang::StringBuilder * append(JArray< jchar > *); - ::java::lang::StringBuilder * append(JArray< jchar > *, jint, jint); - ::java::lang::StringBuilder * append(jboolean); + ::java::lang::StringBuilder * StringBuilder$append(::java::lang::Object *); + ::java::lang::StringBuilder * StringBuilder$append(::java::lang::String *); + ::java::lang::StringBuilder * StringBuilder$append(::java::lang::StringBuffer *); + ::java::lang::StringBuilder * StringBuilder$append(JArray< jchar > *); + ::java::lang::StringBuilder * StringBuilder$append(JArray< jchar > *, jint, jint); + ::java::lang::StringBuilder * StringBuilder$append(jboolean); ::java::lang::StringBuilder * StringBuilder$append(jchar); ::java::lang::StringBuilder * StringBuilder$append(::java::lang::CharSequence *); ::java::lang::StringBuilder * StringBuilder$append(::java::lang::CharSequence *, jint, jint); - ::java::lang::StringBuilder * appendCodePoint(jint); - ::java::lang::StringBuilder * append(jint); - ::java::lang::StringBuilder * append(jlong); - ::java::lang::StringBuilder * append(jfloat); - ::java::lang::StringBuilder * append(jdouble); - ::java::lang::StringBuilder * delete$(jint, jint); - ::java::lang::StringBuilder * deleteCharAt(jint); - ::java::lang::StringBuilder * replace(jint, jint, ::java::lang::String *); + ::java::lang::StringBuilder * StringBuilder$append(jint); + ::java::lang::StringBuilder * StringBuilder$append(jlong); + ::java::lang::StringBuilder * StringBuilder$append(jfloat); + ::java::lang::StringBuilder * StringBuilder$append(jdouble); + ::java::lang::StringBuilder * StringBuilder$appendCodePoint(jint); + ::java::lang::StringBuilder * StringBuilder$delete(jint, jint); + ::java::lang::StringBuilder * StringBuilder$deleteCharAt(jint); + ::java::lang::StringBuilder * StringBuilder$replace(jint, jint, ::java::lang::String *); ::java::lang::String * substring(jint); ::java::lang::CharSequence * subSequence(jint, jint); ::java::lang::String * substring(jint, jint); - ::java::lang::StringBuilder * insert(jint, JArray< jchar > *, jint, jint); - ::java::lang::StringBuilder * insert(jint, ::java::lang::Object *); - ::java::lang::StringBuilder * insert(jint, ::java::lang::String *); - ::java::lang::StringBuilder * insert(jint, ::java::lang::CharSequence *); - ::java::lang::StringBuilder * insert(jint, ::java::lang::CharSequence *, jint, jint); - ::java::lang::StringBuilder * insert(jint, JArray< jchar > *); - ::java::lang::StringBuilder * insert(jint, jboolean); - ::java::lang::StringBuilder * insert(jint, jchar); - ::java::lang::StringBuilder * insert(jint, jint); - ::java::lang::StringBuilder * insert(jint, jlong); - ::java::lang::StringBuilder * insert(jint, jfloat); - ::java::lang::StringBuilder * insert(jint, jdouble); - jint indexOf(::java::lang::String *); - jint indexOf(::java::lang::String *, jint); - jint lastIndexOf(::java::lang::String *); - jint lastIndexOf(::java::lang::String *, jint); - ::java::lang::StringBuilder * reverse(); + ::java::lang::StringBuilder * StringBuilder$insert(jint, JArray< jchar > *, jint, jint); + ::java::lang::StringBuilder * StringBuilder$insert(jint, ::java::lang::Object *); + ::java::lang::StringBuilder * StringBuilder$insert(jint, ::java::lang::String *); + ::java::lang::StringBuilder * StringBuilder$insert(jint, ::java::lang::CharSequence *); + ::java::lang::StringBuilder * StringBuilder$insert(jint, ::java::lang::CharSequence *, jint, jint); + ::java::lang::StringBuilder * StringBuilder$insert(jint, JArray< jchar > *); + ::java::lang::StringBuilder * StringBuilder$insert(jint, jboolean); + ::java::lang::StringBuilder * StringBuilder$insert(jint, jchar); + ::java::lang::StringBuilder * StringBuilder$insert(jint, jint); + ::java::lang::StringBuilder * StringBuilder$insert(jint, jlong); + ::java::lang::StringBuilder * StringBuilder$insert(jint, jfloat); + ::java::lang::StringBuilder * StringBuilder$insert(jint, jdouble); + ::java::lang::StringBuilder * StringBuilder$reverse(); ::java::lang::String * toString(); -private: - jboolean regionMatches(jint, ::java::lang::String *); -public: - jint codePointAt(jint); - jint codePointBefore(jint); - jint codePointCount(jint, jint); - void trimToSize(); + ::java::lang::AbstractStringBuffer * reverse(); + ::java::lang::AbstractStringBuffer * deleteCharAt(jint); + ::java::lang::AbstractStringBuffer * replace(jint, jint, ::java::lang::String *); + ::java::lang::AbstractStringBuffer * delete$(jint, jint); + ::java::lang::AbstractStringBuffer * insert(jint, jdouble); + ::java::lang::AbstractStringBuffer * insert(jint, jfloat); + ::java::lang::AbstractStringBuffer * insert(jint, jlong); + ::java::lang::AbstractStringBuffer * insert(jint, jint); + ::java::lang::AbstractStringBuffer * insert(jint, jchar); + ::java::lang::AbstractStringBuffer * insert(jint, jboolean); + ::java::lang::AbstractStringBuffer * insert(jint, JArray< jchar > *); + ::java::lang::AbstractStringBuffer * insert(jint, ::java::lang::CharSequence *, jint, jint); + ::java::lang::AbstractStringBuffer * insert(jint, ::java::lang::CharSequence *); + ::java::lang::AbstractStringBuffer * insert(jint, ::java::lang::String *); + ::java::lang::AbstractStringBuffer * insert(jint, ::java::lang::Object *); + ::java::lang::AbstractStringBuffer * insert(jint, JArray< jchar > *, jint, jint); + ::java::lang::AbstractStringBuffer * append(jdouble); + ::java::lang::AbstractStringBuffer * append(jfloat); + ::java::lang::AbstractStringBuffer * append(jlong); + ::java::lang::AbstractStringBuffer * append(jint); ::java::lang::Appendable * append(::java::lang::CharSequence *, jint, jint); + ::java::lang::AbstractStringBuffer * AbstractStringBuffer$append(::java::lang::CharSequence *, jint, jint); ::java::lang::Appendable * append(::java::lang::CharSequence *); + ::java::lang::AbstractStringBuffer * AbstractStringBuffer$append(::java::lang::CharSequence *); ::java::lang::Appendable * append(jchar); + ::java::lang::AbstractStringBuffer * AbstractStringBuffer$append(jchar); + ::java::lang::AbstractStringBuffer * append(jboolean); + ::java::lang::AbstractStringBuffer * append(JArray< jchar > *, jint, jint); + ::java::lang::AbstractStringBuffer * append(JArray< jchar > *); + ::java::lang::AbstractStringBuffer * append(::java::lang::StringBuffer *); + ::java::lang::AbstractStringBuffer * append(::java::lang::String *); + ::java::lang::AbstractStringBuffer * append(::java::lang::Object *); + ::java::lang::AbstractStringBuffer * appendCodePoint(jint); private: static const jlong serialVersionUID = 4383685877147921099LL; -public: // actually package-private - jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) count; - JArray< jchar > * value; -private: - static const jint DEFAULT_CAPACITY = 16; public: static ::java::lang::Class class$; }; diff --git a/libjava/java/lang/StringBuilder.java b/libjava/java/lang/StringBuilder.java index 55a49e6e15d..aefe9272b6e 100644 --- a/libjava/java/lang/StringBuilder.java +++ b/libjava/java/lang/StringBuilder.java @@ -1,5 +1,5 @@ /* StringBuilder.java -- Unsynchronized growable strings - Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 + Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -75,6 +75,7 @@ import java.io.Serializable; * @since 1.5 */ public final class StringBuilder + extends AbstractStringBuffer implements Serializable, CharSequence, Appendable { // Implementation note: if you change this class, you usually will @@ -86,33 +87,11 @@ public final class StringBuilder private static final long serialVersionUID = 4383685877147921099L; /** - * Index of next available character (and thus the size of the current - * string contents). Note that this has permissions set this way so that - * String can get the value. - * - * @serial the number of characters in the buffer - */ - int count; - - /** - * The buffer. Note that this has permissions set this way so that String - * can get the value. - * - * @serial the buffer - */ - char[] value; - - /** - * The default capacity of a buffer. - */ - private static final int DEFAULT_CAPACITY = 16; - - /** * Create a new StringBuilder with default capacity 16. */ public StringBuilder() { - this(DEFAULT_CAPACITY); + super(); } /** @@ -124,7 +103,7 @@ public final class StringBuilder */ public StringBuilder(int capacity) { - value = new char[capacity]; + super(capacity); } /** @@ -137,10 +116,7 @@ public final class StringBuilder */ public StringBuilder(String str) { - // Unfortunately, because the size is 16 larger, we cannot share. - count = str.count; - value = new char[count + DEFAULT_CAPACITY]; - str.getChars(0, count, value, 0); + super(str); } /** @@ -154,11 +130,7 @@ public final class StringBuilder */ public StringBuilder(CharSequence seq) { - int len = seq.length(); - count = len <= 0 ? 0 : len; - value = new char[count + DEFAULT_CAPACITY]; - for (int i = 0; i < len; ++i) - value[i] = seq.charAt(i); + super(seq); } /** @@ -189,122 +161,6 @@ public final class StringBuilder } /** - * Increase the capacity of this <code>StringBuilder</code>. This will - * ensure that an expensive growing operation will not occur until - * <code>minimumCapacity</code> is reached. The buffer is grown to the - * larger of <code>minimumCapacity</code> and - * <code>capacity() * 2 + 2</code>, if it is not already large enough. - * - * @param minimumCapacity the new capacity - * @see #capacity() - */ - public void ensureCapacity(int minimumCapacity) - { - if (minimumCapacity > value.length) - { - int max = value.length * 2 + 2; - minimumCapacity = (minimumCapacity < max ? max : minimumCapacity); - char[] nb = new char[minimumCapacity]; - System.arraycopy(value, 0, nb, 0, count); - value = nb; - } - } - - /** - * Set the length of this StringBuilder. If the new length is greater than - * the current length, all the new characters are set to '\0'. If the new - * length is less than the current length, the first <code>newLength</code> - * characters of the old array will be preserved, and the remaining - * characters are truncated. - * - * @param newLength the new length - * @throws IndexOutOfBoundsException if the new length is negative - * (while unspecified, this is a StringIndexOutOfBoundsException) - * @see #length() - */ - public void setLength(int newLength) - { - if (newLength < 0) - throw new StringIndexOutOfBoundsException(newLength); - - int valueLength = value.length; - - /* Always call ensureCapacity in order to preserve copy-on-write - semantics. */ - ensureCapacity(newLength); - - if (newLength < valueLength) - { - /* If the StringBuilder's value just grew, then we know that - value is newly allocated and the region between count and - newLength is filled with '\0'. */ - count = newLength; - } - else - { - /* The StringBuilder's value doesn't need to grow. However, - we should clear out any cruft that may exist. */ - while (count < newLength) - value[count++] = '\0'; - } - } - - /** - * Get the character at the specified index. - * - * @param index the index of the character to get, starting at 0 - * @return the character at the specified index - * @throws IndexOutOfBoundsException if index is negative or >= length() - * (while unspecified, this is a StringIndexOutOfBoundsException) - */ - public char charAt(int index) - { - if (index < 0 || index >= count) - throw new StringIndexOutOfBoundsException(index); - return value[index]; - } - - /** - * Get the specified array of characters. <code>srcOffset - srcEnd</code> - * characters will be copied into the array you pass in. - * - * @param srcOffset the index to start copying from (inclusive) - * @param srcEnd the index to stop copying from (exclusive) - * @param dst the array to copy into - * @param dstOffset the index to start copying into - * @throws NullPointerException if dst is null - * @throws IndexOutOfBoundsException if any source or target indices are - * out of range (while unspecified, source problems cause a - * StringIndexOutOfBoundsException, and dest problems cause an - * ArrayIndexOutOfBoundsException) - * @see System#arraycopy(Object, int, Object, int, int) - */ - public void getChars(int srcOffset, int srcEnd, - char[] dst, int dstOffset) - { - if (srcOffset < 0 || srcEnd > count || srcEnd < srcOffset) - throw new StringIndexOutOfBoundsException(); - System.arraycopy(value, srcOffset, dst, dstOffset, srcEnd - srcOffset); - } - - /** - * Set the character at the specified index. - * - * @param index the index of the character to set starting at 0 - * @param ch the value to set that character to - * @throws IndexOutOfBoundsException if index is negative or >= length() - * (while unspecified, this is a StringIndexOutOfBoundsException) - */ - public void setCharAt(int index, char ch) - { - if (index < 0 || index >= count) - throw new StringIndexOutOfBoundsException(index); - // Call ensureCapacity to enforce copy-on-write. - ensureCapacity(count); - value[index] = ch; - } - - /** * Append the <code>String</code> value of the argument to this * <code>StringBuilder</code>. Uses <code>String.valueOf()</code> to convert * to <code>String</code>. @@ -316,7 +172,8 @@ public final class StringBuilder */ public StringBuilder append(Object obj) { - return append(obj == null ? "null" : obj.toString()); + super.append(obj); + return this; } /** @@ -328,12 +185,7 @@ public final class StringBuilder */ public StringBuilder append(String str) { - if (str == null) - str = "null"; - int len = str.count; - ensureCapacity(count + len); - str.getChars(0, len, value, count); - count += len; + super.append(str); return this; } @@ -348,15 +200,7 @@ public final class StringBuilder */ public StringBuilder append(StringBuffer stringBuffer) { - if (stringBuffer == null) - return append("null"); - synchronized (stringBuffer) - { - int len = stringBuffer.count; - ensureCapacity(count + len); - System.arraycopy(stringBuffer.value, 0, value, count, len); - count += len; - } + super.append(stringBuffer); return this; } @@ -372,7 +216,8 @@ public final class StringBuilder */ public StringBuilder append(char[] data) { - return append(data, 0, data.length); + super.append(data, 0, data.length); + return this; } /** @@ -391,11 +236,7 @@ public final class StringBuilder */ public StringBuilder append(char[] data, int offset, int count) { - if (offset < 0 || count < 0 || offset > data.length - count) - throw new StringIndexOutOfBoundsException(); - ensureCapacity(this.count + count); - System.arraycopy(data, offset, value, this.count, count); - this.count += count; + super.append(data, offset, count); return this; } @@ -410,7 +251,8 @@ public final class StringBuilder */ public StringBuilder append(boolean bool) { - return append(bool ? "true" : "false"); + super.append(bool); + return this; } /** @@ -421,8 +263,7 @@ public final class StringBuilder */ public StringBuilder append(char ch) { - ensureCapacity(count + 1); - value[count++] = ch; + super.append(ch); return this; } @@ -435,7 +276,8 @@ public final class StringBuilder */ public StringBuilder append(CharSequence seq) { - return append(seq, 0, seq.length()); + super.append(seq, 0, seq.length()); + return this; } /** @@ -451,33 +293,7 @@ public final class StringBuilder public StringBuilder append(CharSequence seq, int start, int end) { - if (seq == null) - return append("null"); - if (end - start > 0) - { - ensureCapacity(count + end - start); - for (; start < end; ++start) - value[count++] = seq.charAt(start); - } - return this; - } - - /** - * Append the code point to this <code>StringBuilder</code>. - * This is like #append(char), but will append two characters - * if a supplementary code point is given. - * - * @param code the code point to append - * @return this <code>StringBuilder</code> - * @see Character#toChars(int, char[], int) - * @since 1.5 - */ - public synchronized StringBuilder appendCodePoint(int code) - { - int len = Character.charCount(code); - ensureCapacity(count + len); - Character.toChars(code, value, count); - count += len; + super.append(seq, start, end); return this; } @@ -490,10 +306,11 @@ public final class StringBuilder * @return this <code>StringBuilder</code> * @see String#valueOf(int) */ - // FIXME: this is native in libgcj in StringBuffer. + // This is native in libgcj, for efficiency. public StringBuilder append(int inum) { - return append(String.valueOf(inum)); + super.append(inum); + return this; } /** @@ -507,7 +324,8 @@ public final class StringBuilder */ public StringBuilder append(long lnum) { - return append(Long.toString(lnum, 10)); + super.append(lnum); + return this; } /** @@ -521,7 +339,8 @@ public final class StringBuilder */ public StringBuilder append(float fnum) { - return append(Float.toString(fnum)); + super.append(fnum); + return this; } /** @@ -535,7 +354,24 @@ public final class StringBuilder */ public StringBuilder append(double dnum) { - return append(Double.toString(dnum)); + super.append(dnum); + return this; + } + + /** + * Append the code point to this <code>StringBuilder</code>. + * This is like #append(char), but will append two characters + * if a supplementary code point is given. + * + * @param code the code point to append + * @return this <code>StringBuilder</code> + * @see Character#toChars(int, char[], int) + * @since 1.5 + */ + public StringBuilder appendCodePoint(int code) + { + super.appendCodePoint(code); + return this; } /** @@ -550,15 +386,7 @@ public final class StringBuilder */ public StringBuilder delete(int start, int end) { - if (start < 0 || start > count || start > end) - throw new StringIndexOutOfBoundsException(start); - if (end > count) - end = count; - // This will unshare if required. - ensureCapacity(count); - if (count - end != 0) - System.arraycopy(value, end, value, start, count - end); - count -= end - start; + super.delete(start, end); return this; } @@ -571,7 +399,8 @@ public final class StringBuilder */ public StringBuilder deleteCharAt(int index) { - return delete(index, index + 1); + super.deleteCharAt(index); + return this; } /** @@ -589,19 +418,7 @@ public final class StringBuilder */ public StringBuilder replace(int start, int end, String str) { - if (start < 0 || start > count || start > end) - throw new StringIndexOutOfBoundsException(start); - - int len = str.count; - // Calculate the difference in 'count' after the replace. - int delta = len - (end > count ? count : end) + start; - ensureCapacity(count + delta); - - if (delta != 0 && end < count) - System.arraycopy(value, end, value, end + delta, count - end); - - str.getChars(0, len, value, start); - count += delta; + super.replace(start, end, str); return this; } @@ -672,13 +489,7 @@ public final class StringBuilder public StringBuilder insert(int offset, char[] str, int str_offset, int len) { - if (offset < 0 || offset > count || len < 0 - || str_offset < 0 || str_offset > str.length - len) - throw new StringIndexOutOfBoundsException(); - ensureCapacity(count + len); - System.arraycopy(value, offset, value, offset + len, count - offset); - System.arraycopy(str, str_offset, value, offset, len); - count += len; + super.insert(offset, str, str_offset, len); return this; } @@ -695,7 +506,8 @@ public final class StringBuilder */ public StringBuilder insert(int offset, Object obj) { - return insert(offset, obj == null ? "null" : obj.toString()); + super.insert(offset, obj); + return this; } /** @@ -710,15 +522,7 @@ public final class StringBuilder */ public StringBuilder insert(int offset, String str) { - if (offset < 0 || offset > count) - throw new StringIndexOutOfBoundsException(offset); - if (str == null) - str = "null"; - int len = str.count; - ensureCapacity(count + len); - System.arraycopy(value, offset, value, offset + len, count - offset); - str.getChars(0, len, value, offset); - count += len; + super.insert(offset, str); return this; } @@ -732,11 +536,10 @@ public final class StringBuilder * @return this <code>StringBuilder</code> * @throws IndexOutOfBoundsException if offset is out of bounds */ - public synchronized StringBuilder insert(int offset, CharSequence sequence) + public StringBuilder insert(int offset, CharSequence sequence) { - if (sequence == null) - sequence = "null"; - return insert(offset, sequence, 0, sequence.length()); + super.insert(offset, sequence); + return this; } /** @@ -752,19 +555,10 @@ public final class StringBuilder * @throws IndexOutOfBoundsException if offset, start, * or end are out of bounds */ - public synchronized StringBuilder insert(int offset, CharSequence sequence, - int start, int end) + public StringBuilder insert(int offset, CharSequence sequence, + int start, int end) { - if (sequence == null) - sequence = "null"; - if (start < 0 || end < 0 || start > end || end > sequence.length()) - throw new IndexOutOfBoundsException(); - int len = end - start; - ensureCapacity(count + len); - System.arraycopy(value, offset, value, offset + len, count - offset); - for (int i = start; i < end; ++i) - value[offset++] = sequence.charAt(i); - count += len; + super.insert(offset, sequence, start, end); return this; } @@ -781,7 +575,8 @@ public final class StringBuilder */ public StringBuilder insert(int offset, char[] data) { - return insert(offset, data, 0, data.length); + super.insert(offset, data); + return this; } /** @@ -797,7 +592,8 @@ public final class StringBuilder */ public StringBuilder insert(int offset, boolean bool) { - return insert(offset, bool ? "true" : "false"); + super.insert(offset, bool); + return this; } /** @@ -810,12 +606,7 @@ public final class StringBuilder */ public StringBuilder insert(int offset, char ch) { - if (offset < 0 || offset > count) - throw new StringIndexOutOfBoundsException(offset); - ensureCapacity(count + 1); - System.arraycopy(value, offset, value, offset + 1, count - offset); - value[offset] = ch; - count++; + super.insert(offset, ch); return this; } @@ -832,7 +623,8 @@ public final class StringBuilder */ public StringBuilder insert(int offset, int inum) { - return insert(offset, String.valueOf(inum)); + super.insert(offset, inum); + return this; } /** @@ -848,7 +640,8 @@ public final class StringBuilder */ public StringBuilder insert(int offset, long lnum) { - return insert(offset, Long.toString(lnum, 10)); + super.insert(offset, lnum); + return this; } /** @@ -864,7 +657,8 @@ public final class StringBuilder */ public StringBuilder insert(int offset, float fnum) { - return insert(offset, Float.toString(fnum)); + super.insert(offset, fnum); + return this; } /** @@ -880,75 +674,8 @@ public final class StringBuilder */ public StringBuilder insert(int offset, double dnum) { - return insert(offset, Double.toString(dnum)); - } - - /** - * Finds the first instance of a substring in this StringBuilder. - * - * @param str String to find - * @return location (base 0) of the String, or -1 if not found - * @throws NullPointerException if str is null - * @see #indexOf(String, int) - */ - public int indexOf(String str) - { - return indexOf(str, 0); - } - - /** - * Finds the first instance of a String in this StringBuilder, starting at - * a given index. If starting index is less than 0, the search starts at - * the beginning of this String. If the starting index is greater than the - * length of this String, or the substring is not found, -1 is returned. - * - * @param str String to find - * @param fromIndex index to start the search - * @return location (base 0) of the String, or -1 if not found - * @throws NullPointerException if str is null - */ - public int indexOf(String str, int fromIndex) - { - if (fromIndex < 0) - fromIndex = 0; - int limit = count - str.count; - for ( ; fromIndex <= limit; fromIndex++) - if (regionMatches(fromIndex, str)) - return fromIndex; - return -1; - } - - /** - * Finds the last instance of a substring in this StringBuilder. - * - * @param str String to find - * @return location (base 0) of the String, or -1 if not found - * @throws NullPointerException if str is null - * @see #lastIndexOf(String, int) - */ - public int lastIndexOf(String str) - { - return lastIndexOf(str, count - str.count); - } - - /** - * Finds the last instance of a String in this StringBuilder, starting at a - * given index. If starting index is greater than the maximum valid index, - * then the search begins at the end of this String. If the starting index - * is less than zero, or the substring is not found, -1 is returned. - * - * @param str String to find - * @param fromIndex index to start the search - * @return location (base 0) of the String, or -1 if not found - * @throws NullPointerException if str is null - */ - public int lastIndexOf(String str, int fromIndex) - { - fromIndex = Math.min(fromIndex, count - str.count); - for ( ; fromIndex >= 0; fromIndex--) - if (regionMatches(fromIndex, str)) - return fromIndex; - return -1; + super.insert(offset, dnum); + return this; } /** @@ -959,14 +686,7 @@ public final class StringBuilder */ public StringBuilder reverse() { - // Call ensureCapacity to enforce copy-on-write. - ensureCapacity(count); - for (int i = count >> 1, j = count - i; --i >= 0; ++j) - { - char c = value[i]; - value[i] = value[j]; - value[j] = c; - } + super.reverse(); return this; } @@ -983,80 +703,4 @@ public final class StringBuilder return new String(this); } - /** - * Predicate which determines if a substring of this matches another String - * starting at a specified offset for each String and continuing for a - * specified length. This is more efficient than creating a String to call - * indexOf on. - * - * @param toffset index to start comparison at for this String - * @param other non-null String to compare to region of this - * @return true if regions match, false otherwise - * @see #indexOf(String, int) - * @see #lastIndexOf(String, int) - * @see String#regionMatches(boolean, int, String, int, int) - */ - // GCJ LOCAL: Native to access String internals properly. - private native boolean regionMatches(int toffset, String other); - - /** - * Get the code point at the specified index. This is like #charAt(int), - * but if the character is the start of a surrogate pair, and the - * following character completes the pair, then the corresponding - * supplementary code point is returned. - * @param index the index of the codepoint to get, starting at 0 - * @return the codepoint at the specified index - * @throws IndexOutOfBoundsException if index is negative or >= length() - * @since 1.5 - */ - public int codePointAt(int index) - { - return Character.codePointAt(value, index, count); - } - - /** - * Get the code point before the specified index. This is like - * #codePointAt(int), but checks the characters at <code>index-1</code> and - * <code>index-2</code> to see if they form a supplementary code point. - * @param index the index just past the codepoint to get, starting at 0 - * @return the codepoint at the specified index - * @throws IndexOutOfBoundsException if index is negative or >= length() - * @since 1.5 - */ - public int codePointBefore(int index) - { - // Character.codePointBefore() doesn't perform this check. We - // could use the CharSequence overload, but this is just as easy. - if (index >= count) - throw new IndexOutOfBoundsException(); - return Character.codePointBefore(value, index, 1); - } - - /** - * Returns the number of Unicode code points in the specified sub sequence. - * Surrogate pairs count as one code point. - * @param beginIndex the start of the subarray - * @param endIndex the index after the last char in the subarray - * @return the number of code points - * @throws IndexOutOfBoundsException if beginIndex is less than zero or - * greater than endIndex or if endIndex is greater than the length of this - * StringBuilder - */ - public int codePointCount(int beginIndex,int endIndex) - { - if (beginIndex < 0 || beginIndex > endIndex || endIndex > count) - throw new IndexOutOfBoundsException("invalid indices: " + beginIndex - + ", " + endIndex); - return Character.codePointCount(value, beginIndex, endIndex - beginIndex); - } - - public void trimToSize() - { - if (count < value.length) - { - char[] newValue = new char[count]; - System.arraycopy(value, 0, newValue, 0, count); - value = newValue; - } - } } diff --git a/libjava/java/lang/Thread.h b/libjava/java/lang/Thread.h index b9116b1aad2..54764c83c5a 100644 --- a/libjava/java/lang/Thread.h +++ b/libjava/java/lang/Thread.h @@ -18,13 +18,6 @@ extern "Java" class RawData; class RawDataManaged; } - namespace java - { - namespace util - { - class WeakIdentityHashMap; - } - } } } @@ -100,7 +93,7 @@ private: void initialize_native(); static ::java::lang::String * gen_name(); public: // actually package-private - static ::java::util::Map * getThreadLocals(); + static ::java::lang::ThreadLocalMap * getThreadLocals(); public: virtual void setUncaughtExceptionHandler(::java::lang::Thread$UncaughtExceptionHandler *); virtual ::java::lang::Thread$UncaughtExceptionHandler * getUncaughtExceptionHandler(); @@ -135,7 +128,7 @@ private: static jlong totalThreadsCreated; static ::java::lang::Thread$UncaughtExceptionHandler * defaultHandler; public: // actually package-private - ::gnu::java::util::WeakIdentityHashMap * locals; + ::java::lang::ThreadLocalMap * locals; ::java::lang::Thread$UncaughtExceptionHandler * exceptionHandler; private: ::java::lang::Object * parkBlocker; diff --git a/libjava/java/lang/Thread.java b/libjava/java/lang/Thread.java index 1e1e860cea0..8b6d4ba7542 100644 --- a/libjava/java/lang/Thread.java +++ b/libjava/java/lang/Thread.java @@ -160,7 +160,7 @@ public class Thread implements Runnable /** Thread local storage. Package accessible for use by * InheritableThreadLocal. */ - WeakIdentityHashMap locals; + ThreadLocalMap locals; /** The uncaught exception handler. */ UncaughtExceptionHandler exceptionHandler; @@ -431,6 +431,12 @@ public class Thread implements Runnable this.threadId = nextThreadId++; } + // Always create the ThreadLocalMap when creating a thread; the + // previous code did this lazily when getThreadLocals was called, + // but this is a divergence from Classpath's implementation of + // ThreadLocal. + this.locals = new ThreadLocalMap(); + if (current != null) { group.checkAccess(); @@ -1019,14 +1025,11 @@ public class Thread implements Runnable /** * Returns the map used by ThreadLocal to store the thread local values. */ - static Map getThreadLocals() + static ThreadLocalMap getThreadLocals() { Thread thread = currentThread(); - Map locals = thread.locals; - if (locals == null) - { - locals = thread.locals = new WeakIdentityHashMap(); - } + ThreadLocalMap locals = thread.locals; + return locals; } diff --git a/libjava/java/lang/ThreadLocal.h b/libjava/java/lang/ThreadLocal.h index 4bea9318516..13e1f84c6ab 100644 --- a/libjava/java/lang/ThreadLocal.h +++ b/libjava/java/lang/ThreadLocal.h @@ -21,6 +21,7 @@ extern "Java" class java::lang::ThreadLocal : public ::java::lang::Object { + jint computeNextHash(); public: ThreadLocal(); public: // actually protected @@ -44,7 +45,11 @@ private: public: // actually package-private static ::java::lang::Object * sentinel; private: - ::gnu::gcj::RawData * __attribute__((aligned(__alignof__( ::java::lang::Object)))) TLSPointer; + static jint nextHashBase; +public: // actually package-private + jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) fastHash; +private: + ::gnu::gcj::RawData * TLSPointer; public: static ::java::lang::Class class$; }; diff --git a/libjava/java/lang/ThreadLocal.java b/libjava/java/lang/ThreadLocal.java index 6558c94c999..9223dbaae45 100644 --- a/libjava/java/lang/ThreadLocal.java +++ b/libjava/java/lang/ThreadLocal.java @@ -96,11 +96,30 @@ public class ThreadLocal<T> static final Object sentinel = new Object(); /** + * The base for the computation of the next hash for a thread local. + */ + private static int nextHashBase = 1; + + /** + * Allocate a new hash. + */ + private synchronized int computeNextHash() + { + return nextHashBase++ * 6709; + } + + /** + * Hash code computed for ThreadLocalMap + */ + final int fastHash; + + /** * Creates a ThreadLocal object without associating any value to it yet. */ public ThreadLocal() { constructNative(); + fastHash = computeNextHash(); } /** @@ -128,16 +147,16 @@ public class ThreadLocal<T> private final Object internalGet() { - Map<ThreadLocal<T>,T> map = (Map<ThreadLocal<T>,T>) Thread.getThreadLocals(); + ThreadLocalMap map = Thread.getThreadLocals(); // Note that we don't have to synchronize, as only this thread will // ever modify the map. - T value = map.get(this); - if (value == null) + T value = (T) map.get(this); + if (value == sentinel) { value = initialValue(); - map.put(this, (T) (value == null ? sentinel : value)); + map.set(this, value); } - return value == (T) sentinel ? null : value; + return value; } /** @@ -152,10 +171,10 @@ public class ThreadLocal<T> private final void internalSet(Object value) { - Map map = Thread.getThreadLocals(); + ThreadLocalMap map = Thread.getThreadLocals(); // Note that we don't have to synchronize, as only this thread will // ever modify the map. - map.put(this, value == null ? sentinel : value); + map.set(this, value); } /** @@ -167,7 +186,7 @@ public class ThreadLocal<T> private final void internalRemove() { - Map map = Thread.getThreadLocals(); + ThreadLocalMap map = Thread.getThreadLocals(); map.remove(this); } diff --git a/libjava/java/lang/ThreadLocalMap$Entry.h b/libjava/java/lang/ThreadLocalMap$Entry.h new file mode 100644 index 00000000000..51b4db9c27d --- /dev/null +++ b/libjava/java/lang/ThreadLocalMap$Entry.h @@ -0,0 +1,21 @@ + +// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*- + +#ifndef __java_lang_ThreadLocalMap$Entry__ +#define __java_lang_ThreadLocalMap$Entry__ + +#pragma interface + +#include <java/lang/ref/WeakReference.h> + +class java::lang::ThreadLocalMap$Entry : public ::java::lang::ref::WeakReference +{ + +public: // actually package-private + ThreadLocalMap$Entry(::java::lang::ThreadLocal *); + ::java::lang::Object * __attribute__((aligned(__alignof__( ::java::lang::ref::WeakReference)))) value; +public: + static ::java::lang::Class class$; +}; + +#endif // __java_lang_ThreadLocalMap$Entry__ diff --git a/libjava/java/lang/ThreadLocalMap.h b/libjava/java/lang/ThreadLocalMap.h new file mode 100644 index 00000000000..3a1f107cf3b --- /dev/null +++ b/libjava/java/lang/ThreadLocalMap.h @@ -0,0 +1,41 @@ + +// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*- + +#ifndef __java_lang_ThreadLocalMap__ +#define __java_lang_ThreadLocalMap__ + +#pragma interface + +#include <java/lang/Object.h> +#include <gcj/array.h> + + +class java::lang::ThreadLocalMap : public ::java::lang::Object +{ + +public: // actually package-private + ThreadLocalMap(); +private: + void newEntryArray(jint); + void overflow(); +public: + ::java::lang::Object * get(::java::lang::ThreadLocal *); + void set(::java::lang::ThreadLocal *, ::java::lang::Object *); + void remove(::java::lang::ThreadLocal *); +public: // actually package-private + void clear(); +public: + void inherit(::java::lang::ThreadLocalMap *); +private: + static const jint LOG_INITIAL_SIZE = 3; + static jfloat MAX_OCCUPANCY; + static jfloat TARGET_OCCUPANCY; + static ::java::lang::ThreadLocalMap$Entry * deletedEntry; + JArray< ::java::lang::ThreadLocalMap$Entry * > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) entries; + jint hashMask; + jint count; +public: + static ::java::lang::Class class$; +}; + +#endif // __java_lang_ThreadLocalMap__ diff --git a/libjava/java/lang/Throwable.h b/libjava/java/lang/Throwable.h index 097f9d2f2e7..2e7532c3af9 100644 --- a/libjava/java/lang/Throwable.h +++ b/libjava/java/lang/Throwable.h @@ -9,6 +9,19 @@ #include <java/lang/Object.h> #include <gcj/array.h> +extern "Java" +{ + namespace gnu + { + namespace java + { + namespace lang + { + class CPStringBuilder; + } + } + } +} class java::lang::Throwable : public ::java::lang::Object { @@ -28,7 +41,7 @@ public: virtual void printStackTrace(::java::io::PrintWriter *); private: ::java::lang::String * stackTraceString(); - static void stackTraceStringBuffer(::java::lang::StringBuilder *, ::java::lang::String *, JArray< ::java::lang::StackTraceElement * > *, jint); + static void stackTraceStringBuffer(::gnu::java::lang::CPStringBuilder *, ::java::lang::String *, JArray< ::java::lang::StackTraceElement * > *, jint); public: virtual ::java::lang::Throwable * fillInStackTrace(); virtual JArray< ::java::lang::StackTraceElement * > * getStackTrace(); diff --git a/libjava/java/lang/natStringBuffer.cc b/libjava/java/lang/natAbstractStringBuffer.cc index 8fbb8dfbc3c..b2df69cc39e 100644 --- a/libjava/java/lang/natStringBuffer.cc +++ b/libjava/java/lang/natAbstractStringBuffer.cc @@ -10,15 +10,14 @@ details. */ #include <config.h> #include <gcj/cni.h> -#include <java/lang/StringBuffer.h> +#include <java/lang/AbstractStringBuffer.h> -java::lang::StringBuffer* -java::lang::StringBuffer::append (jint num) +java::lang::AbstractStringBuffer* +java::lang::AbstractStringBuffer::append (jint num) { // Use an array large enough for "-2147483648"; i.e. 11 chars. jchar buffer[11]; int i = _Jv_FormatInt (buffer+11, num); - JvSynchronize dummy (this); jint needed = count + i; ensureCapacity_unsynchronized (needed); jchar* dst = elements (value) + count; @@ -30,7 +29,7 @@ java::lang::StringBuffer::append (jint num) } jboolean -java::lang::StringBuffer::regionMatches(jint toffset, jstring other) +java::lang::AbstractStringBuffer::regionMatches(jint toffset, jstring other) { jint len = other->count; jchar *tptr = elements(value) + toffset; diff --git a/libjava/java/lang/natStringBuilder.cc b/libjava/java/lang/natStringBuilder.cc deleted file mode 100644 index e2c8c29f6e3..00000000000 --- a/libjava/java/lang/natStringBuilder.cc +++ /dev/null @@ -1,29 +0,0 @@ -// Native methods for StringBuilder. - -/* Copyright (C) 2005 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 <config.h> -#include <gcj/cni.h> -#include <java/lang/StringBuilder.h> -#include <java/lang/String.h> - -jboolean -java::lang::StringBuilder::regionMatches(jint offset, jstring other) -{ - int len = other->count; - int index = 0; - jchar *sc = elements (value); - jchar *oc = _Jv_GetStringChars (other); - while (--len >= 0) - { - if (sc[offset++] != oc[index++]) - return false; - } - return true; -} |
