--- parser3/src/main/pa_string.C	2001/02/22 08:26:12	1.29
+++ parser3/src/main/pa_string.C	2001/03/07 09:29:54	1.32
@@ -1,5 +1,5 @@
 /*
-  $Id: pa_string.C,v 1.29 2001/02/22 08:26:12 paf Exp $
+  $Id: pa_string.C,v 1.32 2001/03/07 09:29:54 paf Exp $
 */
 
 #include <string.h>
@@ -24,7 +24,7 @@ String::String(Pool& apool) :
 void String::expand() {
 	int new_chunk_count=last_chunk->count+last_chunk->count*CR_GROW_PERCENT/100;
 	last_chunk=static_cast<Chunk *>(
-		pool().malloc(sizeof(int)+sizeof(Chunk::Row)*new_chunk_count+sizeof(Chunk *)));
+		malloc(sizeof(int)+sizeof(Chunk::Row)*new_chunk_count+sizeof(Chunk *)));
 	last_chunk->count=new_chunk_count;
 	link_row->link=last_chunk;
 	append_here=last_chunk->rows;
@@ -58,7 +58,7 @@ String::String(const String& src) :
 		// remaining rows into new_chunk
 		int curr_chunk_rows=src_used_rows-head.count;
 		Chunk *new_chunk=static_cast<Chunk *>(
-			pool().malloc(sizeof(int)+sizeof(Chunk::Row)*curr_chunk_rows+sizeof(Chunk *)));
+			malloc(sizeof(int)+sizeof(Chunk::Row)*curr_chunk_rows+sizeof(Chunk *)));
 		new_chunk->count=curr_chunk_rows;
 		head.preallocated_link=new_chunk;
 		append_here=link_row=&new_chunk->rows[new_chunk->count];
@@ -99,19 +99,19 @@ String& String::operator += (const Strin
 		memcpy(append_here, src.head.rows, sizeof(Chunk::Row)*src_used_rows);
 		append_here+=src_used_rows;
 	} else {
-		// not all new rows don't fit into last chunk: shrinking it to used part,
+		// not all new rows fit into last chunk: shrinking it to used part,
 		int used_rows=last_chunk->count-dst_free_rows;
 		//int *countp=append_here
 		link_row=&last_chunk->rows[last_chunk->count=used_rows];
 		//   allocating only enough mem to fit src string rows
 		//   next append would allocate a new chunk
 		last_chunk=static_cast<Chunk *>(
-			pool().malloc(sizeof(int)+sizeof(Chunk::Row)*src_used_rows+sizeof(Chunk *)));
+			malloc(sizeof(int)+sizeof(Chunk::Row)*src_used_rows+sizeof(Chunk *)));
 		last_chunk->count=src_used_rows;
 		link_row->link=last_chunk;
 		append_here=link_row=&last_chunk->rows[src_used_rows];
 
-		Chunk *old_chunk=src.head.preallocated_link; 
+		const Chunk *old_chunk=&src.head; 
 		Chunk::Row *new_rows=last_chunk->rows;
 		int rows_left_to_copy=src_used_rows;
 		while(true) {
@@ -163,7 +163,7 @@ String& String::real_append(STRING_APPEN
 }
 
 char *String::cstr() const {
-	char *result=static_cast<char *>(pool().malloc(size()+1));
+	char *result=static_cast<char *>(malloc(size()+1));
 
 	char *copy_here=result;
 	const Chunk *chunk=&head; 
@@ -203,10 +203,7 @@ break2:
 	return result;
 }
 
-bool String::operator == (const String& src) const {
-	if(size() != src.size())
-		return false;
-
+int String::cmp(const String& src) const {
 	const Chunk *a_chunk=&head;
 	const Chunk *b_chunk=&src.head;
 	const Chunk::Row *a_row=a_chunk->rows;
@@ -219,24 +216,28 @@ bool String::operator == (const String&
 	int b_countdown=b_chunk->count;
 	bool a_break=false;
 	bool b_break=false;
+	int result;
 	while(true) {
 		int size_diff=
 			(a_row->item.size-a_offset)-
 			(b_row->item.size-b_offset);
 
 		if(size_diff==0) { // a has same size as b
-			if(memcmp(a_row->item.ptr+a_offset, b_row->item.ptr+b_offset, a_row->item.size-a_offset)!=0)
-				return false;
+			result=memcmp(a_row->item.ptr+a_offset, b_row->item.ptr+b_offset, a_row->item.size-a_offset);
+			if(result)
+				return result;
 			a_row++; a_countdown--; a_offset=0;
 			b_row++; b_countdown--; b_offset=0;
 		} else if (size_diff>0) { // a longer
-			if(memcmp(a_row->item.ptr+a_offset, b_row->item.ptr+b_offset, b_row->item.size-b_offset)!=0)
-				return false;
+			result=memcmp(a_row->item.ptr+a_offset, b_row->item.ptr+b_offset, b_row->item.size-b_offset);
+			if(result)
+				return result;
 			a_offset+=b_row->item.size-b_offset;
 			b_row++; b_countdown--; b_offset=0;
 		} else { // b longer
-			if(memcmp(a_row->item.ptr+a_offset, b_row->item.ptr+b_offset, a_row->item.size-a_offset)!=0)
-				return false;
+			result=memcmp(a_row->item.ptr+a_offset, b_row->item.ptr+b_offset, a_row->item.size-a_offset);
+			if(result)
+				return result;
 			b_offset+=a_row->item.size-a_offset;
 			a_row++; a_countdown--; a_offset=0;
 		}
@@ -257,7 +258,13 @@ bool String::operator == (const String&
 			b_countdown=b_chunk->count;
 		}
 	}
-	return a_break==b_break;
+	if(a_break==b_break) // ended simultaneously
+		result=0;
+	else if(a_break) // first bytes equal, but a ended before b
+		result=-1;
+	else
+		result=+1;
+	return result;
 }
 
 bool String::operator == (char* b_ptr) const {