--- parser3/src/include/pa_string.h	2001/01/29 14:00:39	1.9
+++ parser3/src/include/pa_string.h	2001/02/22 08:16:09	1.25
@@ -1,17 +1,17 @@
 /*
-  $Id: pa_string.h,v 1.9 2001/01/29 14:00:39 paf Exp $
+  $Id: pa_string.h,v 1.25 2001/02/22 08:16:09 paf Exp $
 */
 
 /*
 
 	String				Chunk0
 	======				========
-	head--------->[ptr, size]
-	append_here-------->[ptr, size]
-	link_row      ........
-			.			.
-			.			[ptr, size]
-			...........>[link to the next chunk]
+	head--------------->[ptr, size, ...]
+	append_here-------->[ptr, size, ...]
+						.
+						.
+						[ptr, size, ...]
+	link_row----------->[link to the next chunk]
 
 */
 
@@ -24,20 +24,19 @@
 
 #include <stddef.h>
 
+#include "pa_pool.h"
 #include "pa_types.h"
 
-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, size_t size, char *file, uint line
+#	define APPEND(src, size, file, line) real_append(src, size, file, line)
 #else
-#	define STRING_APPEND_PARAMS char *src
-#	define APPEND(src, origin, line) real_append(src)
+#	define STRING_APPEND_PARAMS const char *src, size_t size
+#	define APPEND(src, size, file, line) real_append(src, size)
 #endif
+#define	APPEND_CONST(src) APPEND(src, 0, 0, 0)
 
-
-class String {
+class String : public Pooled {
 public:
 	enum {
 		CR_PREALLOCATED_COUNT=5,
@@ -46,20 +45,21 @@ public:
 
 public:
 
-	String(String& src);
-	size_t size() { return fsize; }
-	int used_rows() { return fused_rows; }
-	char *c_str();
+	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 == (String& src);
+	bool operator == (const String& src) const;
+	bool operator == (char* src) const;
+	String& operator += (const String& src);
 
-	uint hash_code();
+	uint hash_code() const;
 
-private:
-	friend Pool;
+	const Origin& origin() const { return head.rows[0].item.origin; }
 
-	// the pool I'm allocated on
-	Pool *pool;
+private:
 
 	struct Chunk {
 		// the number of rows in chunk
@@ -67,12 +67,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];
@@ -89,8 +86,8 @@ private:
 	Chunk::Row *link_row;
 
 private:
-	// last chank allocated count
-	int curr_chunk_rows;
+	// last chunk
+	Chunk *last_chunk;
 
 	// string size
 	size_t fsize;
@@ -99,10 +96,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 +104,7 @@ private:
 
 private: //disabled
 
-	String& operator = (String& src) { return *this; }
+	String& operator = (const String&) { return *this; }
 
 };