--- parser3/src/include/pa_string.h 2001/02/13 10:30:22 1.18 +++ parser3/src/include/pa_string.h 2001/02/14 13:40:54 1.20 @@ -1,5 +1,5 @@ /* - $Id: pa_string.h,v 1.18 2001/02/13 10:30:22 paf Exp $ + $Id: pa_string.h,v 1.20 2001/02/14 13:40:54 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; @@ -113,6 +114,7 @@ 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(c)]=static_cast(type); } @@ -120,7 +122,7 @@ public: return static_cast(types[static_cast(c)]); } private: - char type[0x100]; + char types[0x100]; }; class String_iterator { @@ -130,23 +132,23 @@ public: void operator ++() { skip(); } void operator ++(int) { skip(); } - int skip_to(Char_type& types); + int skip_to(Char_types& types); bool skip_to(char c); - bool eof() { return position; } + 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; + String::Chunk::Row *read_here; // position in text, eof when 0 - char *position; + const char *position; // when read_here reaches this row, move to the next chunk - Chunk::Row *link_row; + String::Chunk::Row *link_row; protected: