--- parser3/src/classes/string.C	2001/04/28 08:43:48	1.41
+++ parser3/src/classes/string.C	2001/05/14 13:18:07	1.49
@@ -5,7 +5,7 @@
 
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 
-	$Id: string.C,v 1.41 2001/04/28 08:43:48 paf Exp $
+	$Id: string.C,v 1.49 2001/05/14 13:18:07 parser Exp $
 */
 
 #include "classes.h"
@@ -25,30 +25,33 @@
 class MString : public Methoded {
 public:
 	MString(Pool& pool);
+public: // Methoded
 	bool used_directly() { return false; }
 };
 
 // methods
 
-static void _length(Request& r, const String&, MethodParams *) {
+static void _length(Request& r, const String& method_name, MethodParams *) {
 	Pool& pool=r.pool();
-	Value& value=*new(pool) VDouble(pool, r.self->get_string()->size());
-	r.write_no_lang(value);
+	Value& result=*new(pool) VDouble(pool, r.self->get_string()->size());
+	result.set_name(method_name);
+	r.write_no_lang(result);
 }
 
-static void _int(Request& r, const String&, MethodParams *) {
+static void _int(Request& r, const String& method_name, MethodParams *) {
 	Pool& pool=r.pool();
-	Value& value=*new(pool) VInt(pool, (int)r.self->as_double());
-	r.write_no_lang(value);
+	Value& result=*new(pool) VInt(pool, r.self->as_int());
+	result.set_name(method_name);
+	r.write_no_lang(result);
 }
 
-static void _double(Request& r, const String&, MethodParams *) {
+static void _double(Request& r, const String& method_name, MethodParams *) {
 	Pool& pool=r.pool();
-	Value& value=*new(pool) VDouble(pool, r.self->as_double());
-	r.write_no_lang(value);
+	Value& result=*new(pool) VDouble(pool, r.self->as_double());
+	result.set_name(method_name);
+	r.write_no_lang(result);
 }
 
-/// ^string.format{format}
 /*not static*/void _string_format(Request& r, const String& method_name, MethodParams *params) {
 	Pool& pool=r.pool();
 
@@ -100,11 +103,9 @@ static void _pos(Request& r, const Strin
 static void split_list(Request& r, const String& method_name, MethodParams *params,
 					   const String& string, 
 					   Array& result) {
-	Pool& pool=r.pool();
-
 	Value& delim_value=params->get_no_junction(0, "delimiter must not be code");
 
-	string.split(result, 0, delim_value.as_string(), String::UL_CLEAN, -1);
+	string.split(result, 0, delim_value.as_string());
 }
 
 static void _lsplit(Request& r, const String& method_name, MethodParams *params) {
@@ -183,10 +184,7 @@ static void replace_action(Table& table,
 		*ai.dest << *ai.post_match;
 }
 
-/** search/replace
-	^string.match[regexp][options]
-	^string.match[regexp][options]{replacement-code}
-*/
+/// @todo use pcre:study!
 static void _match(Request& r, const String& method_name, MethodParams *params) {
 	Pool& pool=r.pool();
 	const String& src=*static_cast<VString *>(r.self)->get_string();
@@ -235,6 +233,21 @@ static void _match(Request& r, const Str
 	r.write_assign_lang(*result);
 }
 
+static void change_case(Request& r, const String& method_name, MethodParams *params, 
+						String::Change_case_kind kind) {
+	Pool& pool=r.pool();
+	const String& src=*static_cast<VString *>(r.self)->get_string();
+
+	r.write_assign_lang(*new(pool) VString(src.change_case(pool, r.pcre_tables,
+		kind)));
+}
+static void _upper(Request& r, const String& method_name, MethodParams *params) {
+	change_case(r, method_name, params, String::CC_UPPER);
+}
+static void _lower(Request& r, const String& method_name, MethodParams *params) {
+	change_case(r, method_name, params, String::CC_LOWER);
+}
+
 // constructor
 
 MString::MString(Pool& apool) : Methoded(apool) {
@@ -271,6 +284,11 @@ MString::MString(Pool& apool) : Methoded
 	// ^string.match[regexp][options]
 	// ^string.match[regexp][options]{replacement-code}
 	add_native_method("match", Method::CT_DYNAMIC, _match, 1, 3);
+
+	// ^string.toupper[]
+	add_native_method("upper", Method::CT_DYNAMIC, _upper, 0, 0);
+	// ^string.tolower[]
+	add_native_method("lower", Method::CT_DYNAMIC, _lower, 0, 0);
 }	
 
 // global variable