--- parser3/src/main/pa_string.C	2001/03/19 16:44:02	1.45
+++ parser3/src/main/pa_string.C	2001/03/21 14:06:46	1.47
@@ -1,9 +1,11 @@
 /** @file
-	Parser
+	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.45 2001/03/19 16:44:02 paf Exp $
+	$Id: pa_string.C,v 1.47 2001/03/21 14:06:46 paf Exp $
 */
 
 #include <string.h>
@@ -152,12 +154,12 @@ String& String::append(const String& src
 	return *this;
 }
 void String::set_lang(Chunk::Row *row, Untaint_lang lang, bool forced, size_t size) {
-	if(lang==PASS_APPENDED)
+	if(lang==UL_PASS_APPENDED)
 		return;
 
 	while(size--) {
 		Untaint_lang& item_lang=(row++)->item.lang;
-		if(item_lang==YES || forced) // tainted? need untaint language assignment
+		if(item_lang==UL_YES || forced) // tainted? need untaint language assignment
 			item_lang=lang;  // assign untaint language
 	}
 }
@@ -192,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;
@@ -332,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