--- parser3/src/include/pa_string.h	2001/01/26 18:34:02	1.2
+++ parser3/src/include/pa_string.h	2001/01/29 20:46:22	1.12
@@ -1,5 +1,5 @@
 /*
-  $Id: pa_string.h,v 1.2 2001/01/26 18:34:02 paf Exp $
+  $Id: pa_string.h,v 1.12 2001/01/29 20:46:22 paf Exp $
 */
 
 /*
@@ -18,10 +18,25 @@
 #ifndef PA_STRING_H
 #define PA_STRING_H
 
+#ifdef HAVE_CONFIG_H
+#include "pa_config.h"
+#endif
+
 #include <stddef.h>
 
+#include "pa_types.h"
+
 class Pool;
 
+#ifndef NO_STRING_ORIGIN
+#	define STRING_APPEND_PARAMS const char *src, char *file, uint line
+#	define APPEND(src, file, line) real_append(src, file, line)
+#else
+#	define STRING_APPEND_PARAMS const char *src
+#	define APPEND(src, file, line) real_append(src)
+#endif
+
+
 class String {
 public:
 	enum {
@@ -29,22 +44,35 @@ public:
 		CR_GROW_PERCENT=60
 	};
 
-private:
-	friend Pool;
+public:
+
+	void *operator new(size_t size, Pool& apool);
+	String(Pool& apool);
+	String(String& src);
+	size_t size() { return fsize; }
+	int used_rows() { return fused_rows; }
+	char *cstr();
+	String& real_append(STRING_APPEND_PARAMS);
+	bool operator == (String& src);
+
+	uint hash_code();
+
+protected:
 
 	// the pool I'm allocated on
-	Pool *pool;
+	Pool& pool;
+
+private:
 
-	// last chank allocated count cache
-	int curr_chunk_rows;
 	struct Chunk {
-		// the number of rows per chunk
+		// the number of rows in chunk
 		int count;
 		union Row {
 			// chunk item
 			struct {
-				char *ptr;  // pointer to the start of string fragment
+				const char *ptr;  // pointer to the start of string fragment
 				size_t size;  // length of the fragment
+				Origin origin;  // origin of this fragment
 			} item;
 			Chunk *link;  // link to the next chunk in chain
 		} rows[CR_PREALLOCATED_COUNT];
@@ -60,34 +88,27 @@ private:
 	// of the link to the next chunk to allocate
 	Chunk::Row *link_row;
 
-	// new&constructors made private to enforce factory manufacturing at pool
-	void *operator new(size_t size, Pool *apool);
+private:
+	// last chank allocated count
+	int curr_chunk_rows;
 
-	void construct(Pool *apool);
-	String() { /* never */}
-	String(Pool *apool) { 
-		construct(apool); 
-	}
-	String(Pool *apool, char *src) {
-		construct(apool);
-		*this+=src;
-	}
+	// string size
+	size_t fsize;
+
+	// used rows in all chunks
+	int fused_rows;
+
+private:
 
 	bool chunk_is_full() {
 		return append_here == link_row;
 	}
 	void expand();
-	int used_rows();
 
-public:
+private: //disabled
 
-	String(String& src);
-	size_t size();
-	char *c_str();
-	String& operator += (char *src);
-	bool operator == (String& src);
+	String& operator = (const String&) { return *this; }
 
-	unsigned int hash_code();
 };
 
 #endif