--- parser3/src/include/pa_string.h	2001/01/29 22:34:57	1.14
+++ parser3/src/include/pa_string.h	2001/02/20 18:45:51	1.22
@@ -1,17 +1,17 @@
 /*
-  $Id: pa_string.h,v 1.14 2001/01/29 22:34:57 paf Exp $
+  $Id: pa_string.h,v 1.22 2001/02/20 18:45:51 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,21 @@
 
 #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)
+#	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 const char *src
-#	define APPEND(src, file, 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
 
+//class String_iterator;
 
-class String {
+class String : public Pooled {
+//	friend String_iterator;
 public:
 	enum {
 		CR_PREALLOCATED_COUNT=5,
@@ -46,24 +47,20 @@ public:
 
 public:
 
-	void *operator new(size_t size, Pool& apool);
 	String(Pool& apool);
 	String(const String& src);
+	//String(const String_iterator& begin, const String_iterator& end);
 	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);
 
 	uint hash_code() const;
 
 	const Origin& origin() const { return head.rows[0].item.origin; }
 
-protected:
-
-	// the pool I'm allocated on
-	Pool& pool;
-
 private:
 
 	struct Chunk {
@@ -113,4 +110,52 @@ private: //disabled
 
 };
 
+/*
+class Char_types {
+public:
+	Char_types();
+	void set(char from, char to, int type);
+	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 types[0x100];
+};
+
+class String_iterator {
+public:
+	String_iterator(String& astring);
+	String_iterator(String_iterator& asi);
+
+	void operator ++() { skip(); }
+	void operator ++(int) { skip(); }
+
+	int skip_to(Char_types& types);
+	bool skip_to(char c);
+
+	bool eof() { return position==0; }
+
+	// current char
+	char operator() () const;
+
+protected:
+	// home string
+	String& string;
+	// the row in which we are
+	String::Chunk::Row *read_here;
+	// position in text, eof when 0 
+	const char *position;
+	// when read_here reaches this row, move to the next chunk
+	String::Chunk::Row *link_row;
+
+protected:
+
+	// advances position by one char
+	void skip();
+};
+*/
+
 #endif