--- parser3/src/main/pa_string.C	2001/03/19 16:44:02	1.45
+++ parser3/src/main/pa_string.C	2001/03/24 19:12:20	1.50
@@ -1,12 +1,14 @@
 /** @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.50 2001/03/24 19:12:20 paf Exp $
 */
 
-#include <string.h>
+#include "pa_config_includes.h"
 
 #include "pa_pool.h"
 #include "pa_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;
@@ -285,11 +287,10 @@ int String::cmp(const String& src) const
 	return result;
 }
 
-bool String::operator == (const char* b_ptr) const {
-	size_t b_size=b_ptr?strlen(b_ptr):0;
-	if(size() != b_size)
-		return false;
+int String::cmp(const char* b_ptr, int& partial, size_t src_size) const {
+	size_t b_size=src_size?src_size:b_ptr?strlen(b_ptr):0;
 
+	partial=0;
 	const Chunk *a_chunk=&head;
 	const Chunk::Row *a_row=a_chunk->rows;
 	int a_offset=0;
@@ -304,18 +305,18 @@ bool String::operator == (const char* b_
 			(b_size-b_offset);
 
 		if(size_diff==0) { // a has same size as b
-			if(memcmp(a_row->item.ptr+a_offset, b_ptr+b_offset, a_row->item.size-a_offset)!=0)
-				return false;
+			if(int result=memcmp(a_row->item.ptr+a_offset, b_ptr+b_offset, a_row->item.size-a_offset)!=0)
+				return result;
 			a_row++; a_countdown--; a_offset=0;
 			b_break=true;
 		} else if (size_diff>0) { // a longer
-			if(memcmp(a_row->item.ptr+a_offset, b_ptr+b_offset, b_size-b_offset)!=0)
-				return false;
+			if(int result=memcmp(a_row->item.ptr+a_offset, b_ptr+b_offset, b_size-b_offset)!=0)
+				return result;
 			a_offset+=b_size-b_offset;
 			b_break=true;
 		} else { // b longer
-			if(memcmp(a_row->item.ptr+a_offset, b_ptr+b_offset, a_row->item.size-a_offset)!=0)
-				return false;
+			if(int result=memcmp(a_row->item.ptr+a_offset, b_ptr+b_offset, a_row->item.size-a_offset)!=0)
+				return result;
 			b_offset+=a_row->item.size-a_offset;
 			a_row++; a_countdown--; a_offset=0;
 		}
@@ -330,5 +331,24 @@ bool String::operator == (const char* b_
 			a_countdown=a_chunk->count;
 		}
 	}
-	return a_break==b_break;
+	if(a_break==b_break) // ended simultaneously
+		return 0;
+	else if(a_break) // first bytes equal, but a ended before b
+		return partial=-1;
+	else
+		return partial=+1;
+}
+
+#ifndef NO_STRING_ORIGIN
+const Origin& String::origin() const { 
+	if(!fused_rows)
+		THROW(0, 0, 
+			0,
+			"String::origin() of empty string called");
+	
+	// determining origin by last appended piece
+	// because first one frequently constant. 
+	// ex: ^load[/file] "document_root" + "/file"
+	return append_here[-1].item.origin; 
 }
+#endif