--- parser3/src/include/pa_string.h	2003/03/21 14:27:51	1.144.2.28.2.18
+++ parser3/src/include/pa_string.h	2003/03/24 17:00:49	1.144.2.28.2.31
@@ -8,7 +8,7 @@
 #ifndef PA_STRING_H
 #define PA_STRING_H
 
-static const char* IDENT_STRING_H="$Date: 2003/03/21 14:27:51 $";
+static const char* IDENT_STRING_H="$Date: 2003/03/24 17:00:49 $";
 
 // includes
 
@@ -51,33 +51,55 @@ public:
 
 	StringBody(): body(CORD_EMPTY) {}
 	StringBody(CORD abody): body(abody) {}
+	explicit StringBody(const char* str, size_t length): body(CORD_EMPTY) {
+		append(str, length);
+	}
 
 	void clear() { body=CORD_EMPTY; }
 
+	bool operator! () const { return is_empty(); }
+
 	uint hash_code() const;
 
+	const char* cstr() const { return CORD_to_const_char_star(body); }
+	char* cstrm() const { return CORD_to_char_star(body); }
+
 	size_t length() const { return CORD_len(body); }
 
 	bool is_empty() const { return body==CORD_EMPTY; }
 
 	void append(const char *str, size_t length) {
-		CORD_cat_char_star(body, str, length);
+		body=CORD_cat_char_star(body, str, length);
 	}
-	void append(char c) { CORD_cat_char(body, c); }
+	void append(char c) { body=CORD_cat_char(body, c); }
+	void append(StringBody src) { body=CORD_cat(body, src.body); }
 
 	// could not figure out why this operator is needed [should do this chain: string->simple->==]
-	bool operator < (const StringBody& src) const { return CORD_cmp(body, src.body)<0; }
-	bool operator > (const StringBody& src) const { return CORD_cmp(body, src.body)>0; }
-	bool operator <= (const StringBody& src) const { return CORD_cmp(body, src.body)<=0; }
-	bool operator >= (const StringBody& src) const { return CORD_cmp(body, src.body)>=0; }
-	bool operator != (const StringBody& src) const { return CORD_cmp(body, src.body)!=0; }
-	bool operator == (const StringBody& src) const { return CORD_cmp(body, src.body)==0; }
+	bool operator < (const StringBody src) const { return CORD_cmp(body, src.body)<0; }
+	bool operator > (const StringBody src) const { return CORD_cmp(body, src.body)>0; }
+	bool operator <= (const StringBody src) const { return CORD_cmp(body, src.body)<=0; }
+	bool operator >= (const StringBody src) const { return CORD_cmp(body, src.body)>=0; }
+	bool operator != (const StringBody src) const { return CORD_cmp(body, src.body)!=0; }
+	bool operator == (const StringBody src) const { return CORD_cmp(body, src.body)==0; }
 
 	int ncmp(size_t x_begin, const StringBody y, size_t y_begin, size_t size) const {
 		return CORD_ncmp(body, x_begin, y.body, y_begin, size);
 	}
 
 	char fetch(size_t index) const { return CORD_fetch(body, index); }
+	StringBody mid(size_t index, size_t length) const { return CORD_substr(body, index, length); }
+	size_t pos(const char* substr, size_t offset=0) const { return CORD_str(body, offset, substr); }
+	size_t pos(const StringBody substr, size_t offset=0) const { 
+		if(!substr.length())
+			return STRING_NOT_FOUND; // in this case CORD_str returns 0 [parser users got used to -1]
+		return CORD_str(body, offset, substr.body); 
+	}
+
+	template<typename I> void for_each(int (*callback)(const char* s, I), I info) const {
+		CORD_iter5(body, 0, 0, (CORD_batched_iter_fn)callback, info);
+	}
+
+	void set_pos(CORD_pos& pos, size_t index) const { CORD_set_pos(pos, body, index); }
 
 };
 
@@ -90,7 +112,7 @@ public:
 */
 class String: public PA_Object {
 
-	friend class StringBody;
+//	friend class StringBody;
 
 public:
 
@@ -125,7 +147,14 @@ public:
 	struct Fragment { 
 		Language lang; ///< untaint flag, later untaint language
 		size_t length;  ///< length
-		Fragment(Language alang, size_t asize): lang(alang), length(asize) {}
+		Fragment(Language alang, size_t asize): lang(alang), length(asize) {
+#ifdef _DEBUG
+			if(alang==L_UNSPECIFIED)
+				_asm int 3; // MUST NOT
+			if(asize==(size_t)-1)
+				_asm int 3; // MUST NOT
+#endif
+		}
 	};
 
 	class ArrayFragment: public Array<Fragment> {
@@ -175,13 +204,13 @@ public:
 	}
 
 	/// for convinient hash lookup
-	operator StringBody() const { return body; }
+	operator const StringBody() const { return body; }
 
 	bool is_empty() const { return body.is_empty(); }
 	size_t length() const { return body.length(); }
 
 	/// convert to CORD. if 'lang' known, forcing 'lang' to it
-	CORD cstr_to_cord(Language lang=L_AS_IS, 
+	StringBody cstr_to_string_body(Language lang=L_AS_IS, 
 		SQL_Connection* connection=0,
 		const Request_charsets *charsets=0) const;
 
@@ -189,33 +218,34 @@ public:
 	const char* cstr(Language lang=L_AS_IS, 
 		SQL_Connection* connection=0,
 		const Request_charsets *charsets=0) const {
-		return CORD_to_const_char_star(cstr_to_cord(lang, connection, charsets));
+		return cstr_to_string_body(lang, connection, charsets).cstr();
 	}
 	/// convert to Modifiable C string. if 'lang' known, forcing 'lang' to it
 	char *cstrm(Language lang=L_AS_IS, 
 		SQL_Connection* connection=0,
 		const Request_charsets *charsets=0) const {
-		return CORD_to_char_star(cstr_to_cord(lang, connection, charsets));
+		return cstr_to_string_body(lang, connection, charsets).cstrm();
 	}
 	/// puts pieces to buf
 	C serialize(size_t prolog_size) const;
 	/// appends pieces from buf to self
-	bool deserialize(size_t prolog_size, void *buf, size_t buf_size, const char* file);
+	bool deserialize(size_t prolog_size, void *buf, size_t buf_size);
 	/** append fragment, 
-		@c helper_length can be zero, it will be autocalced
+		@c length can be zero, it will be autocalced
 		when length<strlen(str) makes heap copy of @c str piece
 	*/
-	String& append(const char* str, size_t helper_length, Language lang);
+	String& append(const char* str, size_t length, Language lang);
 
 	bool operator == (const char* y) const { return body==StringBody(y); }
+	bool operator != (const char* y) const { return body!=StringBody(y); }
 
 	/// this starts with y
 	bool starts_with(const char* y) const {
 		return body.ncmp(0/*x_begin*/, StringBody(y), 0/*y_begin*/, strlen(y))==0;
 	}
-	/// y starts with this
-	bool this_starts(const char* y) const {
-		return body.ncmp(0/*x_begin*/, StringBody(y), 0/*y_begin*/, strlen(y))==0;
+	/// x starts with this
+	bool this_starts(const char* x) const {
+		return StringBody(x).ncmp(0/*x_begin*/, body, 0/*y_begin*/, length())==0;
 	}
 
 	String& append_to(String& dest, Language lang, bool forced) const;
@@ -224,6 +254,11 @@ public:
 	}
 	String& operator << (const String& src) { return append(src, L_PASS_APPENDED); }
 	String& operator << (const char* src) { return append(src, 0, L_AS_IS); }
+	String& operator << (const StringBody src) { 
+		body.append(src);
+		fragments+=Fragment(L_AS_IS, src.length());
+		return *this;
+	}
 
 	/// extracts first char of a string, if any
 	char first_char() const {
@@ -238,29 +273,29 @@ public:
 	bool operator == (const String& src) const { return body==src.body; }
 
 	/// extracts [start, finish) piece of string
-	const String& mid(size_t substr_begin, size_t substr_end) const;
+	String& mid(size_t substr_begin, size_t substr_end) const;
 
 	/** 
 		ignore lang if it's L_UNSPECIFIED
 		but when specified: look for substring that lies in ONE fragment in THAT lang
 		@return position of substr in string, -1 means "not found" [const char* version]
 	*/
-	size_t pos(CORD substr, 
+	size_t pos(const StringBody substr, 
 		size_t this_offset=0, Language lang=L_UNSPECIFIED) const;
 	/// String version of @see pos(const char*, int, Language)
 	size_t pos(const String& substr, 
 		size_t this_offset=0, Language lang=L_UNSPECIFIED) const;
 
 	void split(ArrayString& result, 
-		size_t& pos_after, 
+		size_t& pos_after,
 		const char* delim, 
-		Language lang=L_UNSPECIFIED, int limit=-1);
+		Language lang=L_UNSPECIFIED, int limit=-1) const;
 	void split(ArrayString& result, 
 		size_t& pos_after, 
 		const String& delim, 
 		Language lang=L_UNSPECIFIED, int limit=-1) const;
 
-	typedef void (*Row_action)(Table* table, ArrayString* row, 
+	typedef void (*Row_action)(Table& table, ArrayString* row, 
 		int prestart, int prefinish, 
 		int poststart, int postfinish,
 		void *info);
@@ -273,7 +308,7 @@ public:
 	*/
 	Table* match(Charset& source_charset,
 		const String& regexp, 
-		const String& options,
+		const String* options,
 		Row_action row_action, void *info,
 		bool& just_matched) const;
 	enum Change_case_kind {
@@ -281,7 +316,7 @@ public:
 		CC_LOWER
 	};
 	String& change_case(Charset& source_charset,
-		Change_case_kind kind);
+		Change_case_kind kind) const;
 	const String& replace(const Dictionary& dict) const;
 	double as_double() const;
 	int as_int() const;
@@ -293,7 +328,7 @@ private: //disabled
 };
 
 /// simple hash code of string. used by Hash
-inline uint hash_code(const StringBody& self) {
+inline uint hash_code(const StringBody self) {
 	return self.hash_code();
 }