ChangeLog:
2008-05-05 Andrew John Hughes <[EMAIL PROTECTED]>
PR classpath/21869
* gnu/java/util/Base64.java,
* gnu/java/util/prefs/NodeWriter.java,
* gnu/java/util/regex/RE.java,
* gnu/java/util/regex/REException.java,
* gnu/java/util/regex/REMatch.java,
* gnu/java/util/regex/REMatchEnumeration.java,
* gnu/java/util/regex/REToken.java,
* gnu/java/util/regex/RETokenAny.java,
* gnu/java/util/regex/RETokenBackRef.java,
* gnu/java/util/regex/RETokenChar.java,
* gnu/java/util/regex/RETokenEnd.java,
* gnu/java/util/regex/RETokenEndOfPreviousMatch.java,
* gnu/java/util/regex/RETokenEndSub.java,
* gnu/java/util/regex/RETokenIndependent.java,
* gnu/java/util/regex/RETokenLookAhead.java,
* gnu/java/util/regex/RETokenLookBehind.java,
* gnu/java/util/regex/RETokenNamedProperty.java,
* gnu/java/util/regex/RETokenOneOf.java,
* gnu/java/util/regex/RETokenPOSIX.java,
* gnu/java/util/regex/RETokenRange.java,
* gnu/java/util/regex/RETokenRepeated.java,
* gnu/java/util/regex/RETokenStart.java,
* gnu/java/util/regex/RETokenWordBoundary.java:
Swap use of StringBuffer for CPStringBuilder,
--
Andrew :)
Support Free Java!
Contribute to GNU Classpath and the OpenJDK
http://www.gnu.org/software/classpath
http://openjdk.java.net
PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8
Index: gnu/java/util/Base64.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/java/util/Base64.java,v
retrieving revision 1.1
diff -u -r1.1 Base64.java
--- gnu/java/util/Base64.java 1 Feb 2007 03:44:59 -0000 1.1
+++ gnu/java/util/Base64.java 5 May 2008 20:37:55 -0000
@@ -83,6 +83,8 @@
package gnu.java.util;
+import gnu.java.lang.CPStringBuilder;
+
import java.io.ByteArrayOutputStream;
import java.io.IOException;
@@ -143,7 +145,7 @@
int srcLength = buf.length - offset;
byte[] input = new byte[3];
int[] output = new int[4];
- StringBuffer out = new StringBuffer();
+ CPStringBuilder out = new CPStringBuilder();
int i = offset;
int chars = 0;
Index: gnu/java/util/prefs/NodeWriter.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/java/util/prefs/NodeWriter.java,v
retrieving revision 1.6
diff -u -r1.6 NodeWriter.java
--- gnu/java/util/prefs/NodeWriter.java 18 Aug 2006 17:20:59 -0000 1.6
+++ gnu/java/util/prefs/NodeWriter.java 5 May 2008 20:37:55 -0000
@@ -37,6 +37,8 @@
package gnu.java.util.prefs;
+import gnu.java.lang.CPStringBuilder;
+
import java.io.BufferedWriter;
import java.io.IOException;
import java.io.OutputStream;
@@ -273,7 +275,7 @@
throws BackingStoreException, IOException
{
// construct String used for indentation
- StringBuffer indentBuffer = new StringBuffer(2*indent);
+ CPStringBuilder indentBuffer = new CPStringBuilder(2*indent);
for (int i=0; i < indent; i++)
indentBuffer.append(" ");
String indentString = indentBuffer.toString();
Index: gnu/java/util/regex/RE.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/java/util/regex/RE.java,v
retrieving revision 1.6
diff -u -r1.6 RE.java
--- gnu/java/util/regex/RE.java 18 Sep 2007 21:52:29 -0000 1.6
+++ gnu/java/util/regex/RE.java 5 May 2008 20:37:56 -0000
@@ -36,6 +36,9 @@
exception statement from your version. */
package gnu.java.util.regex;
+
+import gnu.java.lang.CPStringBuilder;
+
import java.io.InputStream;
import java.io.Serializable;
import java.util.Locale;
@@ -348,6 +351,12 @@
} else if (patternObj instanceof StringBuffer) {
pattern = new char [((StringBuffer) patternObj).length()];
((StringBuffer) patternObj).getChars(0,pattern.length,pattern,0);
+ } else if (patternObj instanceof StringBuilder) {
+ pattern = new char [((StringBuilder) patternObj).length()];
+ ((StringBuilder) patternObj).getChars(0,pattern.length,pattern,0);
+ } else if (patternObj instanceof CPStringBuilder) {
+ pattern = new char [((CPStringBuilder) patternObj).length()];
+ ((CPStringBuilder) patternObj).getChars(0,pattern.length,pattern,0);
} else {
pattern = patternObj.toString().toCharArray();
}
@@ -1237,7 +1246,7 @@
}
++index;
} else if ((ch == '[') && (syntax.get(RESyntax.RE_CHAR_CLASSES)) &&
(index < pLength) && (pattern[index] == ':')) {
- StringBuffer posixSet = new StringBuffer();
+ CPStringBuilder posixSet = new CPStringBuilder();
index = getPosixSet(pattern,index+1,posixSet);
int posixId = RETokenPOSIX.intValue(posixSet.toString());
if (posixId != -1) {
@@ -1727,11 +1736,11 @@
* @param eflags The logical OR of any execution flags above.
* @param buffer The StringBuffer to save pre-match text in.
* @return An REMatch instance referencing the match, or null if none. */
- public REMatch getMatch(Object input, int index, int eflags, StringBuffer
buffer) {
+ public REMatch getMatch(Object input, int index, int eflags, CPStringBuilder
buffer) {
return getMatchImpl(makeCharIndexed(input,index),index,eflags,buffer);
}
- REMatch getMatchImpl(CharIndexed input, int anchor, int eflags, StringBuffer
buffer) {
+ REMatch getMatchImpl(CharIndexed input, int anchor, int eflags,
CPStringBuilder buffer) {
boolean tryEntireMatch = ((eflags & REG_TRY_ENTIRE_MATCH) != 0);
boolean doMove = ((eflags & REG_FIX_STARTING_POSITION) == 0);
RE re = (tryEntireMatch ? (RE) this.clone() : this);
@@ -1880,7 +1889,7 @@
}
private String substituteImpl(CharIndexed input,String replace,int index,int
eflags) {
- StringBuffer buffer = new StringBuffer();
+ CPStringBuilder buffer = new CPStringBuilder();
REMatch m = getMatchImpl(input,index,eflags,buffer);
if (m==null) return buffer.toString();
buffer.append(getReplacement(replace, m, eflags));
@@ -1941,7 +1950,7 @@
}
private String substituteAllImpl(CharIndexed input,String replace,int
index,int eflags) {
- StringBuffer buffer = new StringBuffer();
+ CPStringBuilder buffer = new CPStringBuilder();
REMatch m;
while ((m = getMatchImpl(input,index,eflags,buffer)) != null) {
buffer.append(getReplacement(replace, m, eflags));
@@ -1965,7 +1974,7 @@
return replace;
else {
if ((eflags & REG_REPLACE_USE_BACKSLASHESCAPE) > 0) {
- StringBuffer sb = new StringBuffer();
+ CPStringBuilder sb = new CPStringBuilder();
int l = replace.length();
for (int i = 0; i < l; i++) {
char c = replace.charAt(i);
@@ -2019,7 +2028,7 @@
return new RETokenRepeated(current.subIndex,current,min,max);
}
- private static int getPosixSet(char[] pattern,int index,StringBuffer buf) {
+ private static int getPosixSet(char[] pattern,int index,CPStringBuilder buf)
{
// Precondition: pattern[index-1] == ':'
// we will return pos of closing ']'.
int i;
@@ -2045,7 +2054,7 @@
int min,max=0;
CharUnit unit = new CharUnit();
- StringBuffer buf = new StringBuffer();
+ CPStringBuilder buf = new CPStringBuilder();
// Read string of digits
do {
@@ -2072,7 +2081,7 @@
else
return startIndex;
else if ((unit.ch == ',') && !unit.bk) {
- buf = new StringBuffer();
+ buf = new CPStringBuilder();
// Read string of digits
while (((index = getCharUnit(input,index,unit,false)) != input.length)
&& Character.isDigit(unit.ch))
buf.append(unit.ch);
@@ -2106,12 +2115,12 @@
* useful for debugging.
*/
public String toString() {
- StringBuffer sb = new StringBuffer();
+ CPStringBuilder sb = new CPStringBuilder();
dump(sb);
return sb.toString();
}
- void dump(StringBuffer os) {
+ void dump(CPStringBuilder os) {
os.append("(?#startRE subIndex=" + subIndex + ")");
if (subIndex == 0)
os.append("?:");
Index: gnu/java/util/regex/REException.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/java/util/regex/REException.java,v
retrieving revision 1.2
diff -u -r1.2 REException.java
--- gnu/java/util/regex/REException.java 21 Feb 2008 12:55:12 -0000
1.2
+++ gnu/java/util/regex/REException.java 5 May 2008 20:37:57 -0000
@@ -37,6 +37,8 @@
package gnu.java.util.regex;
+import gnu.java.lang.CPStringBuilder;
+
import java.text.MessageFormat;
/**
@@ -178,7 +180,7 @@
*/
public String getMessage() {
Object[] args = {new Integer(pos)};
- StringBuffer sb = new StringBuffer();
+ CPStringBuilder sb = new CPStringBuilder();
String prefix = RE.getLocalizedMessage("error.prefix");
sb.append(MessageFormat.format(prefix, args));
sb.append('\n');
Index: gnu/java/util/regex/REMatch.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/java/util/regex/REMatch.java,v
retrieving revision 1.2
diff -u -r1.2 REMatch.java
--- gnu/java/util/regex/REMatch.java 20 Aug 2006 14:47:32 -0000 1.2
+++ gnu/java/util/regex/REMatch.java 5 May 2008 20:37:57 -0000
@@ -37,6 +37,9 @@
package gnu.java.util.regex;
+
+import gnu.java.lang.CPStringBuilder;
+
import java.io.Serializable;
/**
@@ -114,7 +117,7 @@
void finish(CharIndexed text) {
start[0] = 0;
- StringBuffer sb = new StringBuffer();
+ CPStringBuilder sb = new CPStringBuilder();
int i;
for (i = 0; i < end[0]; i++)
sb.append(text.charAt(i));
@@ -199,7 +202,7 @@
return (matchedText.substring(start[sub],end[sub]));
else {
// This case occurs with RETokenLookAhead or RETokenLookBehind.
- StringBuffer sb = new StringBuffer();
+ CPStringBuilder sb = new CPStringBuilder();
int s = start[sub];
int e = end[sub];
if (s < 0) s += 1;
@@ -282,7 +285,7 @@
*/
public String substituteInto(String input) {
// a la Perl, $0 is whole thing, $1 - $9 are subexpressions
- StringBuffer output = new StringBuffer();
+ CPStringBuilder output = new CPStringBuilder();
int pos;
for (pos = 0; pos < input.length()-1; pos++) {
if ((input.charAt(pos) == '$') &&
(Character.isDigit(input.charAt(pos+1)))) {
Index: gnu/java/util/regex/REMatchEnumeration.java
===================================================================
RCS file:
/sources/classpath/classpath/gnu/java/util/regex/REMatchEnumeration.java,v
retrieving revision 1.1
diff -u -r1.1 REMatchEnumeration.java
--- gnu/java/util/regex/REMatchEnumeration.java 7 Jun 2006 19:30:06 -0000
1.1
+++ gnu/java/util/regex/REMatchEnumeration.java 5 May 2008 20:37:59 -0000
@@ -36,6 +36,9 @@
exception statement from your version. */
package gnu.java.util.regex;
+
+import gnu.java.lang.CPStringBuilder;
+
import java.io.Serializable;
import java.util.Enumeration;
import java.util.NoSuchElementException;
@@ -101,7 +104,7 @@
* Saves the text leading up to the match (or to the end of the input)
* in the specified buffer.
*/
- public boolean hasMoreMatches(StringBuffer buffer) {
+ public boolean hasMoreMatches(CPStringBuilder buffer) {
if (more == MAYBE) {
match = expr.getMatchImpl(input,index,eflags,buffer);
if (match != null) {
Index: gnu/java/util/regex/REToken.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/java/util/regex/REToken.java,v
retrieving revision 1.3
diff -u -r1.3 REToken.java
--- gnu/java/util/regex/REToken.java 7 Jan 2008 21:11:21 -0000 1.3
+++ gnu/java/util/regex/REToken.java 5 May 2008 20:37:59 -0000
@@ -36,6 +36,9 @@
exception statement from your version. */
package gnu.java.util.regex;
+
+import gnu.java.lang.CPStringBuilder;
+
import java.io.Serializable;
abstract class REToken implements Serializable, Cloneable {
@@ -160,15 +163,15 @@
return true; // Token was accepted
}
- abstract void dump(StringBuffer os);
+ abstract void dump(CPStringBuilder os);
- void dumpAll(StringBuffer os) {
+ void dumpAll(CPStringBuilder os) {
dump(os);
if (next != null) next.dumpAll(os);
}
public String toString() {
- StringBuffer os = new StringBuffer();
+ CPStringBuilder os = new CPStringBuilder();
dump(os);
return os.toString();
}
Index: gnu/java/util/regex/RETokenAny.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/java/util/regex/RETokenAny.java,v
retrieving revision 1.1
diff -u -r1.1 RETokenAny.java
--- gnu/java/util/regex/RETokenAny.java 7 Jun 2006 19:30:06 -0000 1.1
+++ gnu/java/util/regex/RETokenAny.java 5 May 2008 20:37:59 -0000
@@ -38,6 +38,8 @@
package gnu.java.util.regex;
+import gnu.java.lang.CPStringBuilder;
+
final class RETokenAny extends REToken {
/** True if '.' can match a newline (RE_DOT_NEWLINE) */
private boolean newline;
@@ -92,7 +94,7 @@
return numRepeats;
}
- void dump(StringBuffer os) {
+ void dump(CPStringBuilder os) {
os.append('.');
}
}
Index: gnu/java/util/regex/RETokenBackRef.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/java/util/regex/RETokenBackRef.java,v
retrieving revision 1.1
diff -u -r1.1 RETokenBackRef.java
--- gnu/java/util/regex/RETokenBackRef.java 7 Jun 2006 19:30:06 -0000
1.1
+++ gnu/java/util/regex/RETokenBackRef.java 5 May 2008 20:37:59 -0000
@@ -38,6 +38,8 @@
package gnu.java.util.regex;
+import gnu.java.lang.CPStringBuilder;
+
final class RETokenBackRef extends REToken {
private int num;
private boolean insens;
@@ -78,7 +80,7 @@
return mymatch;
}
- void dump(StringBuffer os) {
+ void dump(CPStringBuilder os) {
os.append('\\').append(num);
}
}
Index: gnu/java/util/regex/RETokenChar.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/java/util/regex/RETokenChar.java,v
retrieving revision 1.3
diff -u -r1.3 RETokenChar.java
--- gnu/java/util/regex/RETokenChar.java 9 Feb 2007 14:28:04 -0000
1.3
+++ gnu/java/util/regex/RETokenChar.java 5 May 2008 20:37:59 -0000
@@ -38,6 +38,8 @@
package gnu.java.util.regex;
+import gnu.java.lang.CPStringBuilder;
+
final class RETokenChar extends REToken {
private char[] ch;
private boolean insens;
@@ -127,7 +129,7 @@
} else return super.chain(next);
}
- void dump(StringBuffer os) {
+ void dump(CPStringBuilder os) {
os.append(ch);
}
}
Index: gnu/java/util/regex/RETokenEnd.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/java/util/regex/RETokenEnd.java,v
retrieving revision 1.3
diff -u -r1.3 RETokenEnd.java
--- gnu/java/util/regex/RETokenEnd.java 20 Aug 2006 14:47:32 -0000 1.3
+++ gnu/java/util/regex/RETokenEnd.java 5 May 2008 20:37:59 -0000
@@ -38,6 +38,8 @@
package gnu.java.util.regex;
+import gnu.java.lang.CPStringBuilder;
+
final class RETokenEnd extends REToken {
/**
* Indicates whether this token should match on a line break.
@@ -118,7 +120,7 @@
else return 0;
}
- void dump(StringBuffer os) {
+ void dump(CPStringBuilder os) {
os.append('$');
}
}
Index: gnu/java/util/regex/RETokenEndOfPreviousMatch.java
===================================================================
RCS file:
/sources/classpath/classpath/gnu/java/util/regex/RETokenEndOfPreviousMatch.java,v
retrieving revision 1.1
diff -u -r1.1 RETokenEndOfPreviousMatch.java
--- gnu/java/util/regex/RETokenEndOfPreviousMatch.java 7 Jun 2006 19:30:06
-0000 1.1
+++ gnu/java/util/regex/RETokenEndOfPreviousMatch.java 5 May 2008 20:37:59
-0000
@@ -37,6 +37,8 @@
package gnu.java.util.regex;
+import gnu.java.lang.CPStringBuilder;
+
class RETokenEndOfPreviousMatch extends RETokenStart {
RETokenEndOfPreviousMatch(int subIndex) {
@@ -66,7 +68,7 @@
else return 0;
}
- void dump(StringBuffer os) {
+ void dump(CPStringBuilder os) {
os.append("\\G");
}
}
Index: gnu/java/util/regex/RETokenEndSub.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/java/util/regex/RETokenEndSub.java,v
retrieving revision 1.2
diff -u -r1.2 RETokenEndSub.java
--- gnu/java/util/regex/RETokenEndSub.java 20 Aug 2006 14:47:32 -0000
1.2
+++ gnu/java/util/regex/RETokenEndSub.java 5 May 2008 20:37:59 -0000
@@ -37,6 +37,8 @@
package gnu.java.util.regex;
+import gnu.java.lang.CPStringBuilder;
+
final class RETokenEndSub extends REToken {
RETokenEndSub(int subIndex) {
super(subIndex);
@@ -62,7 +64,7 @@
// Do nothing
}
- void dump(StringBuffer os) {
+ void dump(CPStringBuilder os) {
// handled by RE
// But add something for debugging.
os.append("(?#RETokenEndSub subIndex=" + subIndex + ")");
Index: gnu/java/util/regex/RETokenIndependent.java
===================================================================
RCS file:
/sources/classpath/classpath/gnu/java/util/regex/RETokenIndependent.java,v
retrieving revision 1.1
diff -u -r1.1 RETokenIndependent.java
--- gnu/java/util/regex/RETokenIndependent.java 7 Jun 2006 19:30:06 -0000
1.1
+++ gnu/java/util/regex/RETokenIndependent.java 5 May 2008 20:37:59 -0000
@@ -37,6 +37,8 @@
package gnu.java.util.regex;
+import gnu.java.lang.CPStringBuilder;
+
/**
* @author Ito Kazumitsu
*/
@@ -69,7 +71,7 @@
return null;
}
- void dump(StringBuffer os) {
+ void dump(CPStringBuilder os) {
os.append("(?>");
re.dumpAll(os);
os.append(')');
Index: gnu/java/util/regex/RETokenLookAhead.java
===================================================================
RCS file:
/sources/classpath/classpath/gnu/java/util/regex/RETokenLookAhead.java,v
retrieving revision 1.1
diff -u -r1.1 RETokenLookAhead.java
--- gnu/java/util/regex/RETokenLookAhead.java 7 Jun 2006 19:30:06 -0000
1.1
+++ gnu/java/util/regex/RETokenLookAhead.java 5 May 2008 20:37:59 -0000
@@ -37,6 +37,8 @@
package gnu.java.util.regex;
+import gnu.java.lang.CPStringBuilder;
+
/**
* @since gnu.regexp 1.1.3
* @author Shashank Bapat
@@ -70,7 +72,7 @@
}
}
- void dump(StringBuffer os) {
+ void dump(CPStringBuilder os) {
os.append("(?");
os.append(negative ? '!' : '=');
re.dumpAll(os);
Index: gnu/java/util/regex/RETokenLookBehind.java
===================================================================
RCS file:
/sources/classpath/classpath/gnu/java/util/regex/RETokenLookBehind.java,v
retrieving revision 1.1
diff -u -r1.1 RETokenLookBehind.java
--- gnu/java/util/regex/RETokenLookBehind.java 7 Jun 2006 19:30:06 -0000
1.1
+++ gnu/java/util/regex/RETokenLookBehind.java 5 May 2008 20:37:59 -0000
@@ -37,6 +37,8 @@
package gnu.java.util.regex;
+import gnu.java.lang.CPStringBuilder;
+
/**
* @author Ito Kazumitsu
*/
@@ -89,7 +91,7 @@
}
}
- void dump(StringBuffer os) {
+ void dump(CPStringBuilder os) {
os.append("(?<");
os.append(negative ? '!' : '=');
re.dumpAll(os);
@@ -111,7 +113,7 @@
return (index == mymatch.index ? mymatch : null);
}
- void dump(StringBuffer os) {}
+ void dump(CPStringBuilder os) {}
}
}
Index: gnu/java/util/regex/RETokenNamedProperty.java
===================================================================
RCS file:
/sources/classpath/classpath/gnu/java/util/regex/RETokenNamedProperty.java,v
retrieving revision 1.3
diff -u -r1.3 RETokenNamedProperty.java
--- gnu/java/util/regex/RETokenNamedProperty.java 21 Feb 2008 12:55:12
-0000 1.3
+++ gnu/java/util/regex/RETokenNamedProperty.java 5 May 2008 20:37:59
-0000
@@ -38,6 +38,8 @@
package gnu.java.util.regex;
+import gnu.java.lang.CPStringBuilder;
+
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
@@ -147,7 +149,7 @@
return numRepeats;
}
- void dump(StringBuffer os) {
+ void dump(CPStringBuilder os) {
os.append("\\")
.append(negate ? "P" : "p")
.append("{" + name + "}");
Index: gnu/java/util/regex/RETokenOneOf.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/java/util/regex/RETokenOneOf.java,v
retrieving revision 1.2
diff -u -r1.2 RETokenOneOf.java
--- gnu/java/util/regex/RETokenOneOf.java 20 Aug 2006 14:47:32 -0000
1.2
+++ gnu/java/util/regex/RETokenOneOf.java 5 May 2008 20:37:59 -0000
@@ -36,6 +36,9 @@
exception statement from your version. */
package gnu.java.util.regex;
+
+import gnu.java.lang.CPStringBuilder;
+
import java.util.Vector;
import java.util.Stack;
@@ -270,7 +273,7 @@
return numRepeats;
}
- void dump(StringBuffer os) {
+ void dump(CPStringBuilder os) {
os.append(negative ? "[^" : "(?:");
for (int i = 0; i < options.size(); i++) {
if (!negative && (i > 0)) os.append('|');
Index: gnu/java/util/regex/RETokenPOSIX.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/java/util/regex/RETokenPOSIX.java,v
retrieving revision 1.1
diff -u -r1.1 RETokenPOSIX.java
--- gnu/java/util/regex/RETokenPOSIX.java 7 Jun 2006 19:30:06 -0000
1.1
+++ gnu/java/util/regex/RETokenPOSIX.java 5 May 2008 20:37:59 -0000
@@ -38,6 +38,8 @@
package gnu.java.util.regex;
+import gnu.java.lang.CPStringBuilder;
+
final class RETokenPOSIX extends REToken {
int type;
boolean insens;
@@ -160,7 +162,7 @@
return numRepeats;
}
- void dump(StringBuffer os) {
+ void dump(CPStringBuilder os) {
if (negated) os.append('^');
os.append("[:" + s_nameTable[type] + ":]");
}
Index: gnu/java/util/regex/RETokenRange.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/java/util/regex/RETokenRange.java,v
retrieving revision 1.1
diff -u -r1.1 RETokenRange.java
--- gnu/java/util/regex/RETokenRange.java 7 Jun 2006 19:30:06 -0000
1.1
+++ gnu/java/util/regex/RETokenRange.java 5 May 2008 20:37:59 -0000
@@ -37,6 +37,8 @@
package gnu.java.util.regex;
+import gnu.java.lang.CPStringBuilder;
+
final class RETokenRange extends REToken {
private char lo, hi;
private boolean insens;
@@ -93,7 +95,7 @@
return numRepeats;
}
- void dump(StringBuffer os) {
+ void dump(CPStringBuilder os) {
os.append(lo).append('-').append(hi);
}
}
Index: gnu/java/util/regex/RETokenRepeated.java
===================================================================
RCS file:
/sources/classpath/classpath/gnu/java/util/regex/RETokenRepeated.java,v
retrieving revision 1.3
diff -u -r1.3 RETokenRepeated.java
--- gnu/java/util/regex/RETokenRepeated.java 22 Sep 2006 21:36:36 -0000
1.3
+++ gnu/java/util/regex/RETokenRepeated.java 5 May 2008 20:37:59 -0000
@@ -38,6 +38,8 @@
package gnu.java.util.regex;
+import gnu.java.lang.CPStringBuilder;
+
import java.util.ArrayList;
final class RETokenRepeated extends REToken {
@@ -509,7 +511,7 @@
}
}
- void dump(StringBuffer os) {
+ void dump(CPStringBuilder os) {
os.append("(?:");
token.dumpAll(os);
os.append(')');
Index: gnu/java/util/regex/RETokenStart.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/java/util/regex/RETokenStart.java,v
retrieving revision 1.2
diff -u -r1.2 RETokenStart.java
--- gnu/java/util/regex/RETokenStart.java 25 Jul 2006 14:34:51 -0000
1.2
+++ gnu/java/util/regex/RETokenStart.java 5 May 2008 20:37:59 -0000
@@ -37,6 +37,8 @@
package gnu.java.util.regex;
+import gnu.java.lang.CPStringBuilder;
+
class RETokenStart extends REToken {
private String newline; // matches after a newline
private boolean check_java_line_terminators;
@@ -115,7 +117,7 @@
else return 0;
}
- void dump(StringBuffer os) {
+ void dump(CPStringBuilder os) {
os.append('^');
}
}
Index: gnu/java/util/regex/RETokenWordBoundary.java
===================================================================
RCS file:
/sources/classpath/classpath/gnu/java/util/regex/RETokenWordBoundary.java,v
retrieving revision 1.1
diff -u -r1.1 RETokenWordBoundary.java
--- gnu/java/util/regex/RETokenWordBoundary.java 7 Jun 2006 19:30:06
-0000 1.1
+++ gnu/java/util/regex/RETokenWordBoundary.java 5 May 2008 20:37:59
-0000
@@ -38,6 +38,8 @@
package gnu.java.util.regex;
+import gnu.java.lang.CPStringBuilder;
+
/**
* Represents a combination lookahead/lookbehind for POSIX [:alnum:].
*/
@@ -104,7 +106,7 @@
else return 0;
}
- void dump(StringBuffer os) {
+ void dump(CPStringBuilder os) {
if (where == (BEGIN | END)) {
os.append( negated ? "\\B" : "\\b" );
} else if (where == BEGIN) {
