--- parser3/src/include/pa_string.h	2001/02/13 10:00:27	1.17
+++ parser3/src/include/pa_string.h	2001/03/07 09:29:53	1.26
@@ -1,5 +1,5 @@
 /*
-  $Id: pa_string.h,v 1.17 2001/02/13 10:00:27 paf Exp $
+  $Id: pa_string.h,v 1.26 2001/03/07 09:29:53 paf Exp $
 */
 
 /*
@@ -28,17 +28,15 @@
 #include "pa_types.h"
 
 #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;
+#define	APPEND_CONST(src) APPEND(src, 0, 0, 0)
 
 class String : public Pooled {
-	friend String_iterator;
 public:
 	enum {
 		CR_PREALLOCATED_COUNT=5,
@@ -53,8 +51,20 @@ public:
 	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);
+	int cmp (const String& src) const;
+	bool operator < (const String& src) const {	return cmp(src)<0; }
+	bool operator > (const String& src) const {	return cmp(src)>0; }
+	bool operator <= (const String& src) const { return cmp(src)<=0; }
+	bool operator >= (const String& src) const { return cmp(src)>=0; }
+	bool operator == (const String& src) const {
+		if(size()!=src.size()) // can speed up in trivial case
+			return false;
+		return cmp(src)==0;
+	}
+	bool operator != (const String& src) const { return cmp(src)!=0; }
+
+	bool operator == (char* src) const;
+	String& operator += (const String& src);
 
 	uint hash_code() const;
 
@@ -87,8 +97,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;
@@ -109,51 +119,4 @@ private: //disabled
 
 };
 
-
-class Char_type {
-public:
-	Char_type();
-	void set(char c, int value) { 
-		values[static_cast<unsigned int>(c)]=static_cast<char>(value); 
-	}
-	int get(char c) { 
-		return static_cast<int>(values[static_cast<unsigned int>(c)]); 
-	}
-private:	
-	char values[0x100];
-};
-
-class String_iterator {
-public:
-	String_iterator(String& astring);
-
-	void operator ++() { skip(); }
-	void operator ++(int) { skip(); }
-
-	int skip_to(Char_type& types);
-	bool skip_to(char c);
-
-	bool eof() { return feof; }
-
-	// current char
-	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;
-	// when read_here reaches this row, move to the next chunk
-	Chunk::Row *link_row;
-
-	bool feof;
-
-protected:
-
-	// advances position by one char
-	void skip();
-};
-
 #endif