--- parser3/src/classes/string.C	2001/05/11 17:45:10	1.48
+++ parser3/src/classes/string.C	2001/05/19 18:35:40	1.52
@@ -5,7 +5,7 @@
 
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 
-	$Id: string.C,v 1.48 2001/05/11 17:45:10 parser Exp $
+	$Id: string.C,v 1.52 2001/05/19 18:35:40 parser Exp $
 */
 
 #include "classes.h"
@@ -159,7 +159,7 @@ static void replace_action(Table& table,
 		// piece from last match['start'] to beginning of this match['finish']
 		if(start!=finish)
 			*ai.dest << ai.src->mid(start, finish);//ai.dest->APPEND_CONST("-");
-		// store found parts in one-record Vtable
+		// store found parts in one-record VTable
 		if(table.size()) // middle
 			table.put(0, row);
 		else // begin
@@ -169,7 +169,8 @@ static void replace_action(Table& table,
 			vtable.set_name(*ai.origin);
 
 			Junction *junction=ai.replacement_code->get_junction();
-			junction->rcontext=junction->root=&vtable;
+			junction->rcontext=/*must be some way to get to 
+							   outside world junction->root=*/&vtable;
 			Value& replaced=ai.request->process(*ai.replacement_code, ai.origin, false);
 
 			/*
@@ -184,6 +185,7 @@ static void replace_action(Table& table,
 		*ai.dest << *ai.post_match;
 }
 
+/// @todo use pcre:study somehow
 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();
@@ -232,6 +234,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) {
@@ -268,6 +285,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