--- parser3/src/main/pa_string.C	2001/06/28 07:44:17	1.93
+++ parser3/src/main/pa_string.C	2001/08/01 12:08:40	1.97
@@ -5,7 +5,7 @@
 
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 */
-static const char *RCSId="$Id: pa_string.C,v 1.93 2001/06/28 07:44:17 parser Exp $"; 
+static const char *RCSId="$Id: pa_string.C,v 1.97 2001/08/01 12:08:40 parser Exp $"; 
 
 #include "pa_config_includes.h"
 
@@ -22,7 +22,8 @@ static const char *RCSId="$Id: pa_string
 #include "pa_table.h"
 
 String::String(Pool& apool, const char *src, size_t src_size, bool tainted) :
-	Pooled(apool) {
+	Pooled(apool),
+	forigins_mode(false) {
 	last_chunk=&head;
 	head.count=CR_PREALLOCATED_COUNT;
 	append_here=head.rows;
@@ -37,18 +38,9 @@ String::String(Pool& apool, const char *
 			APPEND_CLEAN(src, src_size, 0, 0);
 }
 
-void String::expand() {
-	size_t new_chunk_count=last_chunk->count+CR_GROW_COUNT;
-	last_chunk=static_cast<Chunk *>(
-		malloc(sizeof(size_t)+sizeof(Chunk::Row)*new_chunk_count+sizeof(Chunk *)));
-	last_chunk->count=new_chunk_count;
-	link_row->link=last_chunk;
-	append_here=last_chunk->rows;
-	link_row=&last_chunk->rows[last_chunk->count];
-	link_row->link=0;
-}
-
-String::String(const String& src) :	Pooled(src.pool()) {
+String::String(const String& src) :	
+	Pooled(src.pool()),
+	forigins_mode(false) {
 	head.count=CR_PREALLOCATED_COUNT;
 	
 	size_t src_used_rows=src.fused_rows;
@@ -105,6 +97,17 @@ String::String(const String& src) :	Pool
 	fsize=src.fsize;
 }
 
+void String::expand() {
+	size_t new_chunk_count=last_chunk->count+CR_GROW_COUNT;
+	last_chunk=static_cast<Chunk *>(
+		malloc(sizeof(size_t)+sizeof(Chunk::Row)*new_chunk_count+sizeof(Chunk *)));
+	last_chunk->count=new_chunk_count;
+	link_row->link=last_chunk;
+	append_here=last_chunk->rows;
+	link_row=&last_chunk->rows[last_chunk->count];
+	link_row->link=0;
+}
+
 String& String::append(const String& src, Untaint_lang lang, bool forced) {
 	const Chunk *chunk=&src.head; 
 	do {
@@ -146,6 +149,15 @@ String& String::real_append(STRING_APPEN
 	return *this;
 }
 
+char String::first_char() const {
+	if(!fused_rows)
+		THROW(0, 0,
+			this,
+			"getting first char of empty string");
+
+	return *head.rows[0].item.ptr;
+}
+
 uint String::hash_code() const {
 	uint result=0;
 
@@ -326,10 +338,10 @@ int String::cmp(int& partial, const char
 
 #ifndef NO_STRING_ORIGIN
 const Origin& String::origin() const { 
-	if(!fused_rows)
-		THROW(0, 0, 
-			0,
-			"String::origin() of empty string called");
+	if(!fused_rows) {
+		static const Origin empty_origin={"empty string"};
+		return empty_origin;
+	}
 	
 	// determining origin by last appended piece
 	// because first one frequently constant. 
@@ -490,7 +502,8 @@ bool String::match(const unsigned char *
 				   const String& regexp, 
 				   const String *options,
 				   Table **table,
-				   Row_action row_action, void *info) const { 
+				   Row_action row_action, void *info,
+				   bool *was_global) const { 
 
 	if(!regexp.size())
 		THROW(0, 0,
@@ -500,6 +513,8 @@ bool String::match(const unsigned char *
 	const char *errptr;
 	int erroffset;
     int option_bits[2];  regex_options(options?options->cstr():0, option_bits);
+	if(was_global)
+		*was_global=option_bits[1]!=0;
 	pcre *code=pcre_compile(pattern, option_bits[0], 
 		&errptr, &erroffset,
 		pcre_tables);