Merge branch 'master' into powerpc

Conflicts:

	makefile
	src/assembler.h
	src/compile.cpp
	src/compiler.cpp
	src/compiler.h
	src/finder.cpp
This commit is contained in:
Joel Dice
2008-11-11 08:20:49 -07:00
parent 2304a656cf
commit c80eb51c17
47 changed files with 1508 additions and 282 deletions

View File

@ -74,7 +74,15 @@ public class StringBuffer implements CharSequence {
sb.append(b, 0, b.length);
return this;
}
public synchronized int indexOf(String s) {
return sb.indexOf(s);
}
public synchronized int indexOf(String s, int fromIndex) {
return sb.indexOf(s, fromIndex);
}
public synchronized StringBuffer insert(int i, String s) {
sb.insert(i, s);
return this;
@ -85,6 +93,11 @@ public class StringBuffer implements CharSequence {
return this;
}
public synchronized StringBuffer insert(int i, int v) {
sb.insert(i, v);
return this;
}
public synchronized StringBuffer delete(int start, int end) {
sb.delete(start, end);
return this;
@ -112,6 +125,10 @@ public class StringBuffer implements CharSequence {
sb.setLength(v);
}
public synchronized void setCharAt(int index, char ch) {
sb.setCharAt(index, ch);
}
public synchronized void getChars(int srcOffset, int srcLength, char[] dst,
int dstOffset)
{