--- parser3/src/main/pa_string.C	2001/03/10 11:03:49	1.34
+++ parser3/src/main/pa_string.C	2001/03/18 13:22:07	1.40
@@ -1,5 +1,9 @@
 /*
-  $Id: pa_string.C,v 1.34 2001/03/10 11:03:49 paf Exp $
+	Parser
+	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 $
 */
 
 #include <string.h>
@@ -32,8 +36,7 @@ void String::expand() {
 	link_row->link=0;
 }
 
-String::String(const String& src) :
-	Pooled(src.pool()) {
+String::String(const String& src) :	Pooled(src.pool()) {
 	head.count=CR_PREALLOCATED_COUNT;
 	
 	int src_used_rows=src.used_rows();
@@ -143,7 +146,7 @@ String& String::append(const String& src
 	return *this;
 }
 void String::set_lang(Chunk::Row *row, Untaint_lang lang, size_t size) {
-	if(lang==APPENDED)
+	if(lang==PASS_APPEND)
 		return;
 
 	while(size--) {
@@ -153,6 +156,23 @@ void String::set_lang(Chunk::Row *row, U
 	}
 }
 
+void String::change_lang(Untaint_lang lang) {
+	Chunk *chunk=&head; 
+	do {
+		Chunk::Row *row=chunk->rows;
+		for(int i=0; i<chunk->count; i++) {
+			if(row==append_here)
+				goto break2;
+
+			row->item.lang=lang;
+			row++;
+		}
+		chunk=row->link;
+	} while(chunk);
+break2:
+	return;
+}
+
 String& String::real_append(STRING_APPEND_PARAMS) {
 	if(!src)
 		return *this;
@@ -166,7 +186,7 @@ String& String::real_append(STRING_APPEN
 
 	append_here->item.ptr=src;
 	fsize+=append_here->item.size=size;
-	append_here->item.lang=tainted?/*Untaint_lang::*/YES:Untaint_lang::NO;
+	append_here->item.lang=tainted?YES:NO;
 #ifndef NO_STRING_ORIGIN
 	append_here->item.origin.file=file;
 	append_here->item.origin.line=line;
@@ -176,28 +196,6 @@ String& String::real_append(STRING_APPEN
 	return *this;
 }
 
-char *String::cstr() const {
-	char *result=static_cast<char *>(malloc(size()+1));
-
-	char *copy_here=result;
-	const Chunk *chunk=&head; 
-	do {
-		const Chunk::Row *row=chunk->rows;
-		for(int i=0; i<chunk->count; i++) {
-			if(row==append_here)
-				goto break2;
-
-			memcpy(copy_here, row->item.ptr, row->item.size);
-			copy_here+=row->item.size;
-			row++;
-		}
-		chunk=row->link;
-	} while(chunk);
-break2:
-	*copy_here=0;
-	return result;
-}
-
 uint String::hash_code() const {
 	uint result=0;
 
@@ -281,7 +279,7 @@ int String::cmp(const String& src) const
 	return result;
 }
 
-bool String::operator == (char* b_ptr) const {
+bool String::operator == (const char* b_ptr) const {
 	size_t b_size=b_ptr?strlen(b_ptr):0;
 	if(size() != b_size)
 		return false;