--- parser3/src/classes/string.C	2003/11/20 17:46:01	1.131
+++ parser3/src/classes/string.C	2004/06/18 15:55:47	1.140
@@ -1,11 +1,11 @@
 /** @file
 	Parser: @b string parser class.
 
-	Copyright (c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001-2004 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char * const IDENT_STRING_C="$Date: 2003/11/20 17:46:01 $";
+static const char * const IDENT_STRING_C="$Date: 2004/06/18 15:55:47 $";
 
 #include "classes.h"
 #include "pa_vmethod_frame.h"
@@ -36,6 +36,9 @@ DECLARE_CLASS_VAR(string, new MString, 0
 // defines for statics
 
 #define MATCH_VAR_NAME "match"
+#define TRIM_START_OPTION "start"
+#define TRIM_BOTH_OPTION "both"
+#define TRIM_END_OPTION "end"
 
 // statics
 
@@ -101,14 +104,25 @@ static void _double(Request& r, MethodPa
 }
 
 static void _left(Request& r, MethodParams& params) {
-	size_t n=(size_t)params.as_int(0, "n must be int", r);
-	
+	ssize_t sn=params.as_int(0, "n must be int", r);
+	if(sn<0)
+		throw Exception("parser.runtime",
+			0, 
+			"n(%d) must be >=0", sn);
+	size_t n=(size_t)sn;
+
 	const String& string=GET_SELF(r, VString).string();
 	r.write_assign_lang(string.mid(0, n));
 }
 
 static void _right(Request& r, MethodParams& params) {
-	size_t n=(size_t)params.as_int(0, "n must be int", r);
+	ssize_t sn=(size_t)params.as_int(0, "n must be int", r);
+	if(sn<0)
+		throw Exception("parser.runtime",
+			0, 
+			"n(%d) must be >=0", sn);
+	size_t n=(size_t)sn;
+	
 	
 	const String& string=GET_SELF(r, VString).string();
 	size_t length=string.length();
@@ -118,11 +132,25 @@ static void _right(Request& r, MethodPar
 static void _mid(Request& r, MethodParams& params) {
 	const String& string=GET_SELF(r, VString).string();
 
-	size_t p=(size_t)max(0, params.as_int(0, "p must be int", r));
-	size_t n=params.count()>1?
-		(size_t)max(0, params.as_int(1, "n must be int", r)):string.length();
+	ssize_t sbegin=params.as_int(0, "p must be int", r);
+	if(sbegin<0)
+		throw Exception("parser.runtime",
+			0, 
+			"p(%d) must be >=0", sbegin);
+	size_t begin=(size_t)sbegin;
+
+	size_t end;
+	if(params.count()>1) {
+		ssize_t sn=params.as_int(1, "n must be int", r);
+		if(sn<0)
+			throw Exception("parser.runtime",
+				0, 
+				"n(%d) must be >=0", sn);
+		end=begin+(size_t)sn;
+	} else 
+		end=string.length();
 	
-	r.write_assign_lang(string.mid(p, p+n));
+	r.write_assign_lang(string.mid(begin, end));
 }
 
 static void _pos(Request& r, MethodParams& params) {
@@ -425,7 +453,9 @@ const String* sql_result_string(Request&
 		statement_string.cstr(String::L_UNSPECIFIED, r.connection());
 	String_sql_event_handlers handlers(statement_string, statement_cstr);
 	r.connection()->query(
-		statement_cstr, offset, limit, 
+		statement_cstr, 
+		0, 0,
+		offset, limit, 
 		handlers,
 		statement_string);
 	
@@ -494,6 +524,46 @@ static void _normalize(Request& r, Metho
 	r.write_assign_lang(src);
 }
 
+static void _trim(Request& r, MethodParams& params) {
+	const String& src=GET_SELF(r, VString).string();
+
+	String::Trim_kind kind=String::TRIM_BOTH;
+	const char* chars=0;
+	if(params.count()>0) {
+		const String& skind=params.as_string(0, 
+			"'where' must be string");
+		if(skind.length())
+			if(skind==TRIM_START_OPTION)
+				kind=String::TRIM_START;
+			else if(skind==TRIM_END_OPTION)
+				kind=String::TRIM_END;
+			else if(skind==TRIM_BOTH_OPTION)
+				kind=String::TRIM_BOTH;
+			else
+				throw Exception("parser.runtime",
+					&skind,
+					"'kind' must be one of "TRIM_START_OPTION", "TRIM_BOTH_OPTION", "TRIM_END_OPTION);
+
+		if(params.count()>1) {
+			const String& schars=params.as_string(1, "'chars' must be string");
+			if(schars.length())
+				chars=schars.cstr();
+		}
+	}
+
+	r.write_assign_lang(src.trim(kind, chars));
+}
+
+static void _append(Request& r, MethodParams& params) {
+	// c=a+b
+	VString& va=GET_SELF(r, VString);
+	const String& a=va.string();
+	const String& b=params.as_string(0, "parameter must be string");
+	String& c=*new String(a);
+	c.append(b, String::L_PASS_APPENDED);
+	va.set_string(c);
+}
+
 // constructor
 
 MString::MString(): Methoded("string") {
@@ -550,4 +620,10 @@ MString::MString(): Methoded("string") {
 
 	// ^string.normalize[]  
 	add_native_method("normalize", Method::CT_DYNAMIC, _normalize, 0, 0);
+
+	// ^string.trim[[start|both|end][;chars]]
+	add_native_method("trim", Method::CT_DYNAMIC, _trim, 0, 2);
+
+	// ^string.append[string]
+	add_native_method("append", Method::CT_DYNAMIC, _append, 1, 1);
 }