--- parser3/src/main/pa_string.C	2001/01/29 14:00:39	1.13
+++ parser3/src/main/pa_string.C	2001/01/29 22:34:58	1.16
@@ -1,5 +1,5 @@
 /*
-  $Id: pa_string.C,v 1.13 2001/01/29 14:00:39 paf Exp $
+  $Id: pa_string.C,v 1.16 2001/01/29 22:34:58 paf Exp $
 */
 
 #include <string.h>
@@ -8,11 +8,11 @@
 #include "pa_string.h"
 #include "pa_hash.h"
 
-void *String::operator new(size_t size, Pool *apool) {
-	return apool->malloc(size);
+void *String::operator new(size_t size, Pool& apool) {
+	return apool.malloc(size);
 }
 
-String::String(Pool *apool) :
+String::String(Pool& apool) :
 	pool(apool) {
 	head.count=curr_chunk_rows=CR_PREALLOCATED_COUNT;
 	append_here=head.rows;
@@ -24,7 +24,7 @@ String::String(Pool *apool) :
 void String::expand() {
 	curr_chunk_rows+=curr_chunk_rows*CR_GROW_PERCENT/100;
 	Chunk *chunk=static_cast<Chunk *>(
-		pool->malloc(sizeof(int)+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;
@@ -32,8 +32,8 @@ void String::expand() {
 	link_row->link=0;
 }
 
-String::String(String& src) {
-	pool=src.pool;
+String::String(const String& src) :
+	pool(src.pool) {
 	head.count=CR_PREALLOCATED_COUNT;
 	
 	int src_used_rows=src.used_rows();
@@ -58,7 +58,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(int)+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];
@@ -103,21 +103,21 @@ String& String::real_append(STRING_APPEN
 	append_here->item.ptr=src;
 	fsize+=append_here->item.size=len;
 #ifndef NO_STRING_ORIGIN
-	append_here->item.origin=origin;
-	append_here->item.line=line;
+	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;
@@ -133,12 +133,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;
@@ -152,14 +152,14 @@ 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;