--- parser3/src/classes/string.C	2008/06/26 15:00:42	1.160
+++ parser3/src/classes/string.C	2008/07/18 09:12:17	1.166
@@ -5,7 +5,7 @@
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char * const IDENT_STRING_C="$Date: 2008/06/26 15:00:42 $";
+static const char * const IDENT_STRING_C="$Date: 2008/07/18 09:12:17 $";
 
 #include "classes.h"
 #include "pa_vmethod_frame.h"
@@ -36,9 +36,9 @@ DECLARE_CLASS_VAR(string, new MString, 0
 // defines for statics
 
 #define MATCH_VAR_NAME "match"
-#define TRIM_START_OPTION "start"
+#define TRIM_START_OPTION "left"
+#define TRIM_END_OPTION "right"
 #define TRIM_BOTH_OPTION "both"
-#define TRIM_END_OPTION "end"
 
 // statics
 
@@ -47,7 +47,7 @@ static const String match_var_name(MATCH
 // methods
 
 static void _length(Request& r, MethodParams&) {
-	double result=GET_SELF(r, VString).string().length();
+	double result=GET_SELF(r, VString).string().length(r.charsets.source());
 	r.write_no_lang(*new VDouble(result));
 }
 
@@ -139,7 +139,7 @@ static void _left(Request& r, MethodPara
 	size_t n=(size_t)sn;
 
 	const String& string=GET_SELF(r, VString).string();
-	r.write_assign_lang(string.mid(0, n));
+	r.write_assign_lang(string.mid(r.charsets.source(), 0, n));
 }
 
 static void _right(Request& r, MethodParams& params) {
@@ -151,8 +151,8 @@ static void _right(Request& r, MethodPar
 	size_t n=(size_t)sn;
 
 	const String& string=GET_SELF(r, VString).string();
-	size_t length=string.length();
-	r.write_assign_lang(n<length?string.mid(length-n, string.length()):string);
+	size_t length=string.length(r.charsets.source());
+	r.write_assign_lang(n<length?string.mid(r.charsets.source(), length-n, length, length):string);
 }
 
 static void _mid(Request& r, MethodParams& params) {
@@ -166,6 +166,7 @@ static void _mid(Request& r, MethodParam
 	size_t begin=(size_t)sbegin;
 
 	size_t end;
+	size_t length=0;
 	if(params.count()>1) {
 		ssize_t sn=params.as_int(1, "n must be int", r);
 		if(sn<0)
@@ -173,17 +174,28 @@ static void _mid(Request& r, MethodParam
 				0, 
 				"n(%d) must be >=0", sn);
 		end=begin+(size_t)sn;
-	} else 
-		end=string.length();
-	
-	r.write_assign_lang(string.mid(begin, end));
+	} else {
+		length=string.length(r.charsets.source());
+		end=length;
+	}
+
+	r.write_assign_lang(string.mid(r.charsets.source(), begin, end, length));
 }
 
 static void _pos(Request& r, MethodParams& params) {
 	Value& substr=params.as_no_junction(0, "substr must not be code");
 	
 	const String& string=GET_SELF(r, VString).string();
-	r.write_assign_lang(*new VInt((int)string.pos(substr.as_string())));
+	ssize_t offset=0;
+	if(params.count()>1){
+		offset=params.as_int(1, "n must be int", r);
+		if(offset<0)
+			throw Exception(PARSER_RUNTIME,
+				0, 
+				"n(%d) must be >=0", offset);
+	}
+
+	r.write_no_lang(*new VInt((int)string.pos(r.charsets.source(), substr.as_string(), (size_t)offset)));
 }
 
 static void split_list(MethodParams& params, int paramIndex,
@@ -479,13 +491,8 @@ const String* sql_result_string(Request&
 					bind=vbind->get_hash();
 				}
 				if(Value* vlimit=options->get(sql_limit_name)) {
-					if(vlimit->is_defined()){
-						valid_options++;
-						limit=(ulong)r.process_to_value(*vlimit).as_double();
-					} else
-						throw Exception(PARSER_RUNTIME,
-								0,
-								"limit must be defined");
+					valid_options++;
+					limit=(ulong)r.process_to_value(*vlimit).as_double();
 				}
 				if(Value* voffset=options->get(sql_offset_name)) {
 					valid_options++;
@@ -599,12 +606,12 @@ static void _trim(Request& r, MethodPara
 		const String& skind=params.as_string(0, 
 			"'where' must be string");
 		if(skind.length())
-			if(skind==TRIM_START_OPTION)
+			if(skind==TRIM_BOTH_OPTION)
+				kind=String::TRIM_BOTH;
+			else if(skind==TRIM_START_OPTION || skind=="start")
 				kind=String::TRIM_START;
-			else if(skind==TRIM_END_OPTION)
+			else if(skind==TRIM_END_OPTION || skind=="end")
 				kind=String::TRIM_END;
-			else if(skind==TRIM_BOTH_OPTION)
-				kind=String::TRIM_BOTH;
 			else
 				throw Exception(PARSER_RUNTIME,
 					&skind,
@@ -664,18 +671,20 @@ MString::MString(): Methoded("string") {
 	// ^void.bool(default)
 	add_native_method("bool", Method::CT_DYNAMIC, _bool, 0, 1);
 
-	// ^string.format{format}
+	// ^string.format[format]
 	add_native_method("format", Method::CT_DYNAMIC, _string_format, 1, 1);
 
 	// ^string.left(n)
 	add_native_method("left", Method::CT_DYNAMIC, _left, 1, 1);
 	// ^string.right(n)
 	add_native_method("right", Method::CT_DYNAMIC, _right, 1, 1);
+	// ^string.mid(p)
 	// ^string.mid(p;n)
 	add_native_method("mid", Method::CT_DYNAMIC, _mid, 1, 2);
 
 	// ^string.pos[substr]
-	add_native_method("pos", Method::CT_DYNAMIC, _pos, 1, 1);
+	// ^string.pos[substr](n)
+	add_native_method("pos", Method::CT_DYNAMIC, _pos, 1, 2);
 
 	// ^string.split[delim]
 	// ^string.split[delim][options]
@@ -691,9 +700,9 @@ MString::MString(): Methoded("string") {
 	// ^string.match[regexp][options]{replacement-code}
 	add_native_method("match", Method::CT_DYNAMIC, _match, 1, 3);
 
-	// ^string.toupper[]
+	// ^string.upper[]
 	add_native_method("upper", Method::CT_DYNAMIC, _upper, 0, 0);
-	// ^string.tolower[]
+	// ^string.lower[]
 	add_native_method("lower", Method::CT_DYNAMIC, _lower, 0, 0);
 
 	// ^sql[query]