--- parser3/src/include/pa_string.h	2001/01/29 14:00:39	1.9
+++ parser3/src/include/pa_string.h	2001/01/29 21:51:51	1.13
@@ -1,5 +1,5 @@
 /*
-  $Id: pa_string.h,v 1.9 2001/01/29 14:00:39 paf Exp $
+  $Id: pa_string.h,v 1.13 2001/01/29 21:51:51 paf Exp $
 */
 
 /*
@@ -29,11 +29,11 @@
 class Pool;
 
 #ifndef NO_STRING_ORIGIN
-#	define STRING_APPEND_PARAMS char *src, char *origin, uint line
-#	define APPEND(src, origin, line) real_append(src, origin, line)
+#	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 char *src
-#	define APPEND(src, origin, line) real_append(src)
+#	define STRING_APPEND_PARAMS const char *src
+#	define APPEND(src, file, line) real_append(src)
 #endif
 
 
@@ -46,20 +46,25 @@ public:
 
 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();
+	char *cstr();
 	String& real_append(STRING_APPEND_PARAMS);
 	bool operator == (String& src);
 
 	uint hash_code();
 
-private:
-	friend Pool;
+	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
@@ -67,12 +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
-#ifndef NO_STRING_ORIGIN
-				char *origin;  // macros file name | load file name | sql query text
-				uint line; // file line no | record no
-#endif
+				Origin origin;  // origin of this fragment
 			} item;
 			Chunk *link;  // link to the next chunk in chain
 		} rows[CR_PREALLOCATED_COUNT];
@@ -99,10 +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);
-
-	String(Pool *apool);
 
 	bool chunk_is_full() {
 		return append_here == link_row;
@@ -111,7 +109,7 @@ private:
 
 private: //disabled
 
-	String& operator = (String& src) { return *this; }
+	String& operator = (const String&) { return *this; }
 
 };