--- parser3/src/main/pa_string.C	2001/01/27 13:09:45	1.9
+++ parser3/src/main/pa_string.C	2001/02/12 13:26:55	1.18
@@ -1,18 +1,17 @@
 /*
-  $Id: pa_string.C,v 1.9 2001/01/27 13:09:45 paf Exp $
+  $Id: pa_string.C,v 1.18 2001/02/12 13:26:55 paf Exp $
 */
 
 #include <string.h>
 
 #include "pa_pool.h"
+#include "pa_string.h"
 #include "pa_hash.h"
 
-void *String::operator new(size_t size, Pool *apool) {
-	return apool->malloc(size);
-}
+// String
 
-void String::construct(Pool *apool) {
-	pool=apool;
+String::String(Pool& apool) :
+	Pooled(apool) {
 	head.count=curr_chunk_rows=CR_PREALLOCATED_COUNT;
 	append_here=head.rows;
 	head.preallocated_link=0;
@@ -23,7 +22,7 @@ void String::construct(Pool *apool) {
 void String::expand() {
 	curr_chunk_rows+=curr_chunk_rows*CR_GROW_PERCENT/100;
 	Chunk *chunk=static_cast<Chunk *>(
-		pool->malloc(sizeof(Chunk::Row)*curr_chunk_rows+sizeof(Chunk *)));
+		pool.malloc(sizeof(int)+sizeof(Chunk::Row)*curr_chunk_rows+sizeof(Chunk *)));
 	chunk->count=curr_chunk_rows;
 	link_row->link=chunk;
 	append_here=chunk->rows;
@@ -31,21 +30,21 @@ void String::expand() {
 	link_row->link=0;
 }
 
-String::String(String& src) {
-	pool=src.pool;
+String::String(const String& src) :
+	Pooled(src.pool) {
 	head.count=CR_PREALLOCATED_COUNT;
 	
 	int src_used_rows=src.used_rows();
 	if(src_used_rows<=head.count) {
-		// new rows fit into preallocated area
+		// all new rows fit into preallocated area
 		curr_chunk_rows=head.count;
 		memcpy(head.rows, src.head.rows, sizeof(Chunk::Row)*src_used_rows);
 		append_here=&head.rows[src_used_rows];
 		link_row=&head.rows[curr_chunk_rows];
 	} else {
 		// warning: 
-		//   heavy relies on the fact 
-		//   that preallocated area is the same for all strings
+		//   heavily relies on the fact 
+		//   "preallocated area is the same for all strings"
 		//
 		// info:
 		//   allocating only enough mem to fit src string rows
@@ -57,7 +56,7 @@ String::String(String& src) {
 		// remaining rows into new_chunk
 		curr_chunk_rows=src_used_rows-head.count;
 		Chunk *new_chunk=static_cast<Chunk *>(
-			pool->malloc(sizeof(Chunk::Row)*curr_chunk_rows+sizeof(Chunk *)));
+			pool.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[curr_chunk_rows];
@@ -89,7 +88,7 @@ String::String(String& src) {
 	fsize=src.fsize;
 }
 
-String& String::operator += (char *src) {
+String& String::real_append(STRING_APPEND_PARAMS) {
 	if(!src)
 		return *this;
 	int len=strlen(src);
@@ -101,18 +100,22 @@ String& String::operator += (char *src)
 
 	append_here->item.ptr=src;
 	fsize+=append_here->item.size=len;
+#ifndef NO_STRING_ORIGIN
+	append_here->item.origin.file=file;
+	append_here->item.origin.line=line;
+#endif
 	append_here++; fused_rows++;
 
 	return *this;
 }
 
-char *String::c_str() {
-	char *result=static_cast<char *>(pool->malloc(size()+1));
+char *String::cstr() const {
+	char *result=static_cast<char *>(pool.malloc(size()+1));
 
 	char *copy_here=result;
-	Chunk *chunk=&head; 
+	const Chunk *chunk=&head; 
 	do {
-		Chunk::Row *row=chunk->rows;
+		const Chunk::Row *row=chunk->rows;
 		for(int i=0; i<chunk->count; i++) {
 			if(row==append_here)
 				goto break2;
@@ -128,12 +131,12 @@ break2:
 	return result;
 }
 
-uint String::hash_code() {
+uint String::hash_code() const {
 	uint result=0;
 
-	Chunk *chunk=&head; 
+	const Chunk *chunk=&head; 
 	do {
-		Chunk::Row *row=chunk->rows;
+		const Chunk::Row *row=chunk->rows;
 		for(int i=0; i<chunk->count; i++) {
 			if(row==append_here)
 				goto break2;
@@ -147,20 +150,20 @@ break2:
 	return result;
 }
 
-bool String::operator == (String& src) {
+bool String::operator == (const String& src) const {
 	if(size() != src.size())
 		return false;
 
-	Chunk *a_chunk=&head;
-	Chunk *b_chunk=&src.head;
-	Chunk::Row *a_row=a_chunk->rows;
-	Chunk::Row *b_row=b_chunk->rows;
+	const Chunk *a_chunk=&head;
+	const Chunk *b_chunk=&src.head;
+	const Chunk::Row *a_row=a_chunk->rows;
+	const Chunk::Row *b_row=b_chunk->rows;
 	int a_offset=0;
 	int b_offset=0;
 	Chunk::Row *a_end=append_here;
 	Chunk::Row *b_end=src.append_here;
-	int a_count=a_chunk->count;
-	int b_count=b_chunk->count;
+	int a_countdown=a_chunk->count;
+	int b_countdown=b_chunk->count;
 	bool a_break=false;
 	bool b_break=false;
 	while(true) {
@@ -171,18 +174,18 @@ bool String::operator == (String& src) {
 		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;
-			a_row++; a_count--; a_offset=0;
-			b_row++; b_count--; b_offset=0;
+			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;
 			a_offset+=b_row->item.size-b_offset;
-			b_row++; b_count--; b_offset=0;
+			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;
 			b_offset+=a_row->item.size-a_offset;
-			a_row++; a_count--; a_offset=0;
+			a_row++; a_countdown--; a_offset=0;
 		}
 
 		a_break=a_row==a_end;
@@ -190,16 +193,28 @@ bool String::operator == (String& src) {
 		if(a_break || b_break)
 			break;
 
-		if(!a_count) {
+		if(!a_countdown) {
 			a_chunk=a_row->link;
 			a_row=a_chunk->rows;
-			a_count=a_chunk->count;
+			a_countdown=a_chunk->count;
 		}
-		if(!b_count) {
+		if(!b_countdown) {
 			b_chunk=b_row->link;
 			b_row=b_chunk->rows;
-			b_count=b_chunk->count;
+			b_countdown=b_chunk->count;
 		}
 	}
 	return a_break==b_break;
 }
+
+String& String::append(const String_iterator& begin, const String_iterator& end) {
+	return z;
+}
+
+// Char_set
+
+Char_set::Char_set() {
+	memset(bools, 0, sizeof(bools));
+}
+
+// String_iterator