--- parser3/src/include/pa_string.h	2001/01/27 15:21:05	1.7
+++ parser3/src/include/pa_string.h	2001/01/29 15:56:03	1.10
@@ -1,5 +1,5 @@
 /*
-  $Id: pa_string.h,v 1.7 2001/01/27 15:21:05 paf Exp $
+  $Id: pa_string.h,v 1.10 2001/01/29 15:56:03 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 char *src, char *file, uint line
+#	define APPEND(src, file, line) real_append(src, file, line)
+#else
+#	define STRING_APPEND_PARAMS char *src
+#	define APPEND(src, file, line) real_append(src)
+#endif
+
+
 class String {
 public:
 	enum {
@@ -31,12 +44,26 @@ 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 *c_str();
+	String& real_append(STRING_APPEND_PARAMS);
+	bool operator == (String& src);
+
+	uint hash_code();
+
+protected:
 
 	// the pool I'm allocated on
 	Pool *pool;
 
+private:
+
 	struct Chunk {
 		// the number of rows in chunk
 		int count;
@@ -45,6 +72,7 @@ private:
 			struct {
 				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,37 +99,15 @@ 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;
 	}
 	void expand();
 
-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);
-
-	uint hash_code();
-
 private: //disabled
 
-	String& operator = (String& src) { return *this; }
+	String& operator = (String&) { return *this; }
 
 };