--- parser3/src/main/pa_string.C	2002/06/26 10:35:16	1.162
+++ parser3/src/main/pa_string.C	2002/08/07 13:44:00	1.166
@@ -3,10 +3,10 @@
 
 	Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
-
-	$Id: pa_string.C,v 1.162 2002/06/26 10:35:16 paf Exp $
 */
 
+static const char* IDENT_STRING_C="$Date: 2002/08/07 13:44:00 $";
+
 #include "pcre.h"
 
 #include "pa_pool.h"
@@ -343,8 +343,8 @@ const Origin& String::origin() const {
 String& String::mid(size_t start, size_t finish) const {
 	String& result=*NEW String(pool());
 
-	start=max(size_t(0), start);
-	finish=min(size(), finish);
+	start=min(start, size());
+	finish=max(finish, start);
 	if(start==finish)
 		return result;
 
@@ -733,7 +733,7 @@ int String::as_int() const {
 	const char *cstr;
 	char buf[MAX_NUMBER];
 	if(head.chunk.rows+1==append_here) {
-		int size=min(head.chunk.rows[0].item.size, MAX_NUMBER-1);
+		size_t size=min(head.chunk.rows[0].item.size, MAX_NUMBER-1);
 		memcpy(buf, head.chunk.rows[0].item.ptr, size);
 		buf[size]=0;
 		cstr=buf;