--- parser3/src/include/pa_string.h	2001/01/27 15:00:04	1.6
+++ parser3/src/include/pa_string.h	2001/01/29 22:34:57	1.14
@@ -1,5 +1,5 @@
 /*
-  $Id: pa_string.h,v 1.6 2001/01/27 15:00:04 paf Exp $
+  $Id: pa_string.h,v 1.14 2001/01/29 22:34:57 paf Exp $
 */
 
 /*
@@ -18,12 +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 {
@@ -31,11 +44,27 @@ public:
 		CR_GROW_PERCENT=60
 	};
 
-private:
-	friend Pool;
+public:
+
+	void *operator new(size_t size, Pool& apool);
+	String(Pool& apool);
+	String(const String& src);
+	size_t size() const { return fsize; }
+	int used_rows() const { return fused_rows; }
+	char *cstr() const;
+	String& real_append(STRING_APPEND_PARAMS);
+	bool operator == (const String& src) const;
+
+	uint hash_code() const;
+
+	const Origin& origin() const { return head.rows[0].item.origin; }
+
+protected:
 
 	// the pool I'm allocated on
-	Pool *pool;
+	Pool& pool;
+
+private:
 
 	struct Chunk {
 		// the number of rows in chunk
@@ -43,8 +72,9 @@ private:
 		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];
@@ -71,17 +101,6 @@ private:
 	int fused_rows;
 
 private:
-	// new&constructors made private to enforce factory manufacturing at pool
-	void *operator new(size_t size, Pool *apool);
-
-	void construct(Pool *apool);
-	String(Pool *apool) { 
-		construct(apool); 
-	}
-	String(Pool *apool, char *src) {
-		construct(apool);
-		*this+=src;
-	}
 
 	bool chunk_is_full() {
 		return append_here == link_row;
@@ -90,18 +109,8 @@ private:
 
 private: //disabled
 
-	String& operator = (String& src) { return *this; }
-
-public:
-
-	String(String& src);
-	size_t size() { return fsize; }
-	int used_rows() { return fused_rows; }
-	char *c_str();
-	String& operator += (char *src);
-	bool operator == (String& src);
+	String& operator = (const String&) { return *this; }
 
-	uint hash_code();
 };
 
 #endif