--- parser3/src/main/pa_string.C	2001/03/18 13:22:07	1.40
+++ parser3/src/main/pa_string.C	2001/03/21 14:06:46	1.47
@@ -1,9 +1,11 @@
-/*
-	Parser
+/** @file
+	Parser: string class. @see untaint.C.
+
 	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
+
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 
-	$Id: pa_string.C,v 1.40 2001/03/18 13:22:07 paf Exp $
+	$Id: pa_string.C,v 1.47 2001/03/21 14:06:46 paf Exp $
 */
 
 #include <string.h>
@@ -15,7 +17,7 @@
 
 // String
 
-String::String(Pool& apool) :
+String::String(Pool& apool, const char *src, bool tainted) :
 	Pooled(apool) {
 	last_chunk=&head;
 	head.count=CR_PREALLOCATED_COUNT;
@@ -23,6 +25,12 @@ String::String(Pool& apool) :
 	head.preallocated_link=0;
 	link_row=&head.rows[head.count];
 	fused_rows=fsize=0;
+
+	if(src)
+		if(tainted)
+			APPEND_TAINTED(src, 0, 0, 0);
+		else
+			APPEND(src, 0, 0, 0);
 }
 
 void String::expand() {
@@ -39,7 +47,7 @@ void String::expand() {
 String::String(const String& src) :	Pooled(src.pool()) {
 	head.count=CR_PREALLOCATED_COUNT;
 	
-	int src_used_rows=src.used_rows();
+	int src_used_rows=src.fused_rows;
 	if(src_used_rows<=head.count) {
 		// all new rows fit into preallocated area
 		int curr_chunk_rows=head.count;
@@ -93,14 +101,14 @@ String::String(const String& src) :	Pool
 	fsize=src.fsize;
 }
 
-String& String::append(const String& src, Untaint_lang lang) {
-	int src_used_rows=src.used_rows();
+String& String::append(const String& src, Untaint_lang lang, bool forced) {
+	int src_used_rows=src.fused_rows;
 	int dst_free_rows=link_row-append_here;
 	
 	if(src_used_rows<=dst_free_rows) {
 		// all new rows fit into last chunk
 		memcpy(append_here, src.head.rows, sizeof(Chunk::Row)*src_used_rows);
-		set_lang(append_here, lang, src_used_rows);
+		set_lang(append_here, lang, forced, src_used_rows);
 		append_here+=src_used_rows;
 	} else {
 		// not all new rows fit into last chunk: shrinking it to used part,
@@ -125,7 +133,7 @@ String& String::append(const String& src
 				// not last source chunk
 				// taking it all
 				memcpy(new_rows, old_chunk->rows, sizeof(Chunk::Row)*old_count);
-				set_lang(new_rows, lang, old_count);
+				set_lang(new_rows, lang, forced, old_count);
 				new_rows+=old_count;
 				rows_left_to_copy-=old_count;
 
@@ -134,7 +142,7 @@ String& String::append(const String& src
 				// the last source chunk
 				// taking only those rows of chunk that _left_to_copy
 				memcpy(new_rows, old_chunk->rows, sizeof(Chunk::Row)*rows_left_to_copy);
-				set_lang(new_rows, lang, rows_left_to_copy);
+				set_lang(new_rows, lang, forced, rows_left_to_copy);
 				break;
 			}
 		}
@@ -145,18 +153,18 @@ String& String::append(const String& src
 
 	return *this;
 }
-void String::set_lang(Chunk::Row *row, Untaint_lang lang, size_t size) {
-	if(lang==PASS_APPEND)
+void String::set_lang(Chunk::Row *row, Untaint_lang lang, bool forced, size_t size) {
+	if(lang==UL_PASS_APPENDED)
 		return;
 
 	while(size--) {
 		Untaint_lang& item_lang=(row++)->item.lang;
-		if(item_lang==YES) // tainted? need untaint language assignment
+		if(item_lang==UL_YES || forced) // tainted? need untaint language assignment
 			item_lang=lang;  // assign untaint language
 	}
 }
 
-void String::change_lang(Untaint_lang lang) {
+/*void String::change_lang(Untaint_lang lang) {
 	Chunk *chunk=&head; 
 	do {
 		Chunk::Row *row=chunk->rows;
@@ -172,7 +180,7 @@ void String::change_lang(Untaint_lang la
 break2:
 	return;
 }
-
+*/
 String& String::real_append(STRING_APPEND_PARAMS) {
 	if(!src)
 		return *this;
@@ -186,7 +194,7 @@ String& String::real_append(STRING_APPEN
 
 	append_here->item.ptr=src;
 	fsize+=append_here->item.size=size;
-	append_here->item.lang=tainted?YES:NO;
+	append_here->item.lang=tainted?UL_YES:UL_NO;
 #ifndef NO_STRING_ORIGIN
 	append_here->item.origin.file=file;
 	append_here->item.origin.line=line;
@@ -326,3 +334,14 @@ bool String::operator == (const char* b_
 	}
 	return a_break==b_break;
 }
+
+#ifndef NO_STRING_ORIGIN
+const Origin& String::origin() const { 
+	if(!fused_rows)
+		THROW(0, 0, 
+		0,
+		"String::origin() of empty string called");
+	
+	return head.rows[0].item.origin; 
+}
+#endif