--- parser3/src/include/pa_string.h	2001/02/12 13:26:54	1.16
+++ parser3/src/include/pa_string.h	2001/02/14 15:19:02	1.21
@@ -1,5 +1,5 @@
 /*
-  $Id: pa_string.h,v 1.16 2001/02/12 13:26:54 paf Exp $
+  $Id: pa_string.h,v 1.21 2001/02/14 15:19:02 paf Exp $
 */
 
 /*
@@ -49,6 +49,7 @@ public:
 
 	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;
@@ -110,48 +111,50 @@ private: //disabled
 };
 
 
-class Char_set {
+class Char_types {
 public:
-	Char_set();
-	void include(char c) { bools[static_cast<unsigned int>(c)]=true; }
-	bool in(char c) { return bools[static_cast<unsigned int>(c)]; }
+	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:	
-	bool bools[0x100];
+	char types[0x100];
 };
 
 class String_iterator {
 public:
 	String_iterator(String& astring);
+	String_iterator(String_iterator& asi);
 
 	void operator ++() { skip(); }
 	void operator ++(int) { skip(); }
 
-	void skip_to(Char_set& set);
-	void skip_to(char c);
+	int skip_to(Char_types& types);
+	bool skip_to(char c);
 
-	bool eof() { return feof; }
+	bool eof() { return position==0; }
 
 	// current char
-	char operator() const;
+	char operator() () const;
 
 protected:
 	// home string
 	String& string;
 	// the row in which we are
-	Chunk::Row *read_here;
-	// position in that row's string fragment
-	int offset;
+	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
-	Chunk::Row *link_row;
-
-	bool feof;
+	String::Chunk::Row *link_row;
 
 protected:
 
-	// advances position on one char
-	void skip() {
-
-	}
+	// advances position by one char
+	void skip();
 };
 
 #endif