From: bdemsky <bdemsky>
Date: Wed, 25 Oct 2006 00:14:33 +0000 (+0000)
Subject: Adding StringBuffer class and test case.  This gives append functionality.
X-Git-Tag: preEdgeChange~808
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=d8245adc9c3fe22933fd80a1bcda234aeddb4874;p=IRC.git

Adding StringBuffer class and test case.  This gives append functionality.
---

diff --git a/Robust/src/ClassLibrary/String.java b/Robust/src/ClassLibrary/String.java
index 3285f0fe..b771e4da 100644
--- a/Robust/src/ClassLibrary/String.java
+++ b/Robust/src/ClassLibrary/String.java
@@ -1,40 +1,60 @@
 public class String {
-    char string[];
+    char value[];
+    int count;
+    int offset;
 
     public String(char str[]) {
 	char charstr[]=new char[str.length];
 	for(int i=0;i<str.length;i++)
 	    charstr[i]=str[i];
-	this.string=charstr;
+	this.value=charstr;
+	this.count=str.length;
+	this.offset=0;
     }
 
     public String(byte str[]) {
 	char charstr[]=new char[str.length];
 	for(int i=0;i<str.length;i++)
 	    charstr[i]=(char)str[i];
-	this.string=charstr;
+	this.value=charstr;
+	this.count=str.length;
+	this.offset=0;
+    }
+
+    public String(String str) {
+	this.value=str.value;
+	this.count=str.count;
+	this.offset=str.offset;
+    }
+
+    public String(StringBuffer strbuf) {
+	value=new char[strbuf.length()];
+	count=strbuf.length();
+	offset=0;
+	for(int i=0;i<count;i++)
+	    value[i]=strbuf.value[i];
     }
 
     char[] toCharArray() {
-	char str[]=new char[string.length];
-	for(int i=0;i<string.length;i++)
-	    str[i]=string[i];
+	char str[]=new char[count];
+	for(int i=0;i<count;i++)
+	    str[i]=value[i+offset];
 	return str;
     }
 
     byte[] getBytes() {
-	byte str[]=new byte[string.length];
-	for(int i=0;i<string.length;i++)
-	    str[i]=(byte)string[i];
+	byte str[]=new byte[count];
+	for(int i=0;i<value.length;i++)
+	    str[i]=(byte)value[i+offset];
 	return str;
     }
 
     public int length() {
-	return string.length;
+	return count;
     }
 
-    public char charAt(int x) {
-	return string[x];
+    public char charAt(int i) {
+	return value[i+offset];
     }
 
     public static String valueOf(Object o) {
@@ -58,16 +78,16 @@ public class String {
 	    chararray=new char[length+1];
 	else
 	    chararray=new char[length];
-	int offset;
+	int voffset;
 	if (x<0) {
 	    chararray[0]='-';
-	    offset=1;
+	    voffset=1;
 	    x=-x;
 	} else
-	    offset=0;
+	    voffset=0;
        	
 	do {
-	    chararray[--length+offset]=(char)(x%10+'0');
+	    chararray[--length+voffset]=(char)(x%10+'0');
 	    x=x/10;
 	} while (length!=0);
 	return new String(chararray);
diff --git a/Robust/src/ClassLibrary/StringBuffer.java b/Robust/src/ClassLibrary/StringBuffer.java
new file mode 100644
index 00000000..4ac60a2b
--- /dev/null
+++ b/Robust/src/ClassLibrary/StringBuffer.java
@@ -0,0 +1,49 @@
+public class StringBuffer {
+    char value[];
+    int count;
+    int offset;
+    //    private static final int DEFAULTSIZE=16;
+
+    public StringBuffer(String str) {
+	value=new char[str.value+16];//16 is DEFAULTSIZE
+	count=str.count;
+	offset=0;
+	for(int i=0;i<count;i++)
+	    value[i]=str.value[i+str.offset];
+    }
+
+    public int length() {
+	return count;
+    }
+
+    public int capacity() {
+	return value.length;
+    }
+
+    public char charAt(int x) {
+	return value[x+offset];
+    }
+
+    public void append(String s) {
+	if ((s.count+count+offset)>value.length) {
+	    // Need to allocate
+	    char newvalue[]=new char[s.count+count+16]; //16 is DEFAULTSIZE
+	    for(int i=0;i<count;i++)
+		newvalue[i]=value[i+offset];
+	    for(int i=0;i<s.count;i++)
+		newvalue[i+count]=s.value[i+s.offset];
+	    value=newvalue;
+	    count+=s.count;
+	    offset=0;
+	} else {
+	    for(int i=0;i<s.count;i++) {
+		value[i+count+offset]=s.value[i+s.offset];
+	    }
+	    count+=s.count;
+	}
+    }
+
+    public String toString() {
+	return new String(this);
+    }
+}
diff --git a/Robust/src/Main/Main.java b/Robust/src/Main/Main.java
index 7aa8cbef..356c45c6 100644
--- a/Robust/src/Main/Main.java
+++ b/Robust/src/Main/Main.java
@@ -51,6 +51,7 @@ public class Main {
       readSourceFile(state, ClassLibraryPrefix+"Object.java");
       readSourceFile(state, ClassLibraryPrefix+"System.java");
       readSourceFile(state, ClassLibraryPrefix+"String.java");
+      readSourceFile(state, ClassLibraryPrefix+"StringBuffer.java");
       readSourceFile(state, ClassLibraryPrefix+"FileInputStream.java");
       readSourceFile(state, ClassLibraryPrefix+"FileOutputStream.java");
       if (state.TASK) {
diff --git a/Robust/src/Runtime/runtime.c b/Robust/src/Runtime/runtime.c
index ea1bc291..a3563ae7 100644
--- a/Robust/src/Runtime/runtime.c
+++ b/Robust/src/Runtime/runtime.c
@@ -427,10 +427,11 @@ int ___Object______hashcode____(struct ___Object___ * ___this___) {
 }
 
 void ___System______printString____L___String___(struct ___String___ * s) {
-    struct ArrayObject * chararray=s->___string___;
+    struct ArrayObject * chararray=s->___value___;
     int i;
-    for(i=0;i<chararray->___length___;i++) {
-	short s= ((short *)(((char *)& chararray->___length___)+sizeof(int)))[i];
+    int offset=s->___offset___;
+    for(i=0;i<s->___count___;i++) {
+	short s= ((short *)(((char *)& chararray->___length___)+sizeof(int)))[i+offset];
 	putchar(s);
     }
 }
@@ -452,7 +453,10 @@ struct ___String___ * NewString(const char *str,int length) {
   struct ArrayObject * chararray=allocate_newarray(CHARARRAYTYPE, length);
   struct ___String___ * strobj=allocate_new(STRINGTYPE);
   int i;
-  strobj->___string___=chararray;
+  strobj->___value___=chararray;
+  strobj->___count___=length;
+  strobj->___offset___=0;
+
   for(i=0;i<length;i++) {
     ((short *)(((char *)& chararray->___length___)+sizeof(int)))[i]=(short)str[i];  }
   return strobj;
diff --git a/Robust/src/Tests/DoTests b/Robust/src/Tests/DoTests
index e6de08ba..347206db 100755
--- a/Robust/src/Tests/DoTests
+++ b/Robust/src/Tests/DoTests
@@ -7,6 +7,7 @@ dotest BoundsFail2 BoundsFail2.java
 dotest BoundsFail3 BoundsFail3.java
 dotest BoundsFail4 BoundsFail4.java
 dotest StringTest StringTest.java
+dotest StringBufferTest StringBufferTest.java
 dotest Test Test.java
 dotest virtualcalltest virtualcalltest.java
 dotest IncTest IncTest.java
diff --git a/Robust/src/Tests/StringBufferTest.java b/Robust/src/Tests/StringBufferTest.java
new file mode 100644
index 00000000..f68ced0b
--- /dev/null
+++ b/Robust/src/Tests/StringBufferTest.java
@@ -0,0 +1,8 @@
+class StringBufferTest {
+    public static void main(String str[]) {
+	String a="hello world";
+	StringBuffer b=new StringBuffer(a);
+	b.append(a);
+	System.printString(b.toString());
+    }
+}
diff --git a/Robust/src/Tests/output/StringBufferTest.output.goal b/Robust/src/Tests/output/StringBufferTest.output.goal
new file mode 100644
index 00000000..2df7ebc3
--- /dev/null
+++ b/Robust/src/Tests/output/StringBufferTest.output.goal
@@ -0,0 +1 @@
+hello worldhello world
\ No newline at end of file