--- parser3/src/include/pa_string.h	2001/01/27 15:21:05	1.7
+++ parser3/src/include/pa_string.h	2001/02/13 10:30:22	1.18
@@ -1,41 +1,66 @@
 /*
-  $Id: pa_string.h,v 1.7 2001/01/27 15:21:05 paf Exp $
+  $Id: pa_string.h,v 1.18 2001/02/13 10:30:22 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]
 
 */
 
 #ifndef PA_STRING_H
 #define PA_STRING_H
 
+#ifdef HAVE_CONFIG_H
+#include "pa_config.h"
+#endif
+
 #include <stddef.h>
 
+#include "pa_pool.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_iterator;
 
-class String {
+class String : public Pooled {
+	friend String_iterator;
 public:
 	enum {
 		CR_PREALLOCATED_COUNT=5,
 		CR_GROW_PERCENT=60
 	};
 
-private:
-	friend Pool;
+public:
+
+	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;
+	String& append(const String_iterator& begin, const String_iterator& end);
 
-	// the pool I'm allocated on
-	Pool *pool;
+	uint hash_code() const;
+
+	const Origin& origin() const { return head.rows[0].item.origin; }
+
+private:
 
 	struct Chunk {
 		// the number of rows in chunk
@@ -43,8 +68,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,38 +97,61 @@ 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();
 
+private: //disabled
+
+	String& operator = (const String&) { return *this; }
+
+};
+
+
+class Char_types {
 public:
+	Char_types();
+	void set(char c, int type) { 
+		types[static_cast<unsigned int>(c)]=static_cast<char>(type); 
+	}
+	int get(char c) { 
+		return static_cast<int>(types[static_cast<unsigned int>(c)]); 
+	}
+private:	
+	char type[0x100];
+};
+
+class String_iterator {
+public:
+	String_iterator(String& astring);
 
-	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);
+	void operator ++() { skip(); }
+	void operator ++(int) { skip(); }
 
-	uint hash_code();
+	int skip_to(Char_type& types);
+	bool skip_to(char c);
 
-private: //disabled
+	bool eof() { return position; }
+
+	// current char
+	char operator() const;
+
+protected:
+	// home string
+	String& string;
+	// the row in which we are
+	Chunk::Row *read_here;
+	// position in text, eof when 0 
+	char *position;
+	// when read_here reaches this row, move to the next chunk
+	Chunk::Row *link_row;
 
-	String& operator = (String& src) { return *this; }
+protected:
 
+	// advances position by one char
+	void skip();
 };
 
 #endif