--- parser3/src/classes/string.C	2003/03/21 13:42:27	1.125.2.15.2.7
+++ parser3/src/classes/string.C	2003/03/24 11:05:27	1.125.2.15.2.12
@@ -5,7 +5,7 @@
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char* IDENT_STRING_C="$Date: 2003/03/21 13:42:27 $";
+static const char* IDENT_STRING_C="$Date: 2003/03/24 11:05:27 $";
 
 #include "classes.h"
 #include "pa_vmethod_frame.h"
@@ -39,16 +39,16 @@ DECLARE_CLASS_VAR(string, new MString, 0
 
 // statics
 
-static const String& match_var_name(new String(MATCH_VAR_NAME));
+static const String match_var_name(MATCH_VAR_NAME);
 
 // methods
 
-static void _length(Request& r, const String& method_name, MethodParams* ) {
+static void _length(Request& r, MethodParams* ) {
 	double result=GET_SELF(r, VString).string()->length();
 	r.write_no_lang(Value*(new VDouble(result)));
 }
 
-static void _int(Request& r, const String& method_name, MethodParams* params) {
+static void _int(Request& r, MethodParams* params) {
 	const String& self_string=r.get_self()->get_string();
 	int converted;
 	Value* default_code=params->count()>0?params->as_junction(0, "default must be int")
@@ -68,7 +68,7 @@ static void _int(Request& r, const Strin
 	r.write_no_lang(Value*(new VInt(converted)));
 }
 
-static void _double(Request& r, const String& method_name, MethodParams* params) {
+static void _double(Request& r, MethodParams* params) {
 	const String& self_string=GET_SELF(r, VString).string();
 	double converted;
 	Value* default_code=params->count()>0?params->as_junction(0, "default must be double")
@@ -89,7 +89,7 @@ static void _double(Request& r, const St
 	r.write_no_lang(Value*(new VDouble(converted)));
 }
 
-/*not static*/void _string_format(Request& r, const String& method_name, MethodParams* params) {
+/*not static*/void _string_format(Request& r, MethodParams* params) {
 
 	Value* fmt_maybe_code=(*params)[0];
 	// for some time due to stupid {} in original design
@@ -104,21 +104,21 @@ static void _double(Request& r, const St
 	r.write_no_lang(result);
 }
 
-static void _left(Request& r, const String& /*method_name*/, MethodParams* params) {
+static void _left(Request& r, MethodParams* params) {
 	size_t n=(size_t)params->as_int(0, "n must be int", r);
 	
 	const String& string=GET_SELF(r, VString).string();
 	r.write_assign_lang(*string->mid(0, n));
 }
 
-static void _right(Request& r, const String& /*method_name*/, MethodParams* params) {
+static void _right(Request& r, MethodParams* params) {
 	size_t n=(size_t)params->as_int(0, "n must be int", r);
 	
 	const String& string=GET_SELF(r, VString).string();
 	r.write_assign_lang(*string->mid(string->length()-n, string->length()));
 }
 
-static void _mid(Request& r, const String& /*method_name*/, MethodParams* params) {
+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));
@@ -128,14 +128,14 @@ static void _mid(Request& r, const Strin
 	r.write_assign_lang(*string->mid(p, p+n));
 }
 
-static void _pos(Request& r, const String& method_name, MethodParams* params) {
+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(Value*(new VInt(string->pos(*substr->as_string()))));
 }
 
-static void split_list(Request& r, const String& method_name, 
+static void split_list(Request& r, 
 					   MethodParams* params, int paramIndex,
 					   String& string, 
 					   ArrayString& result) {
@@ -222,7 +222,7 @@ static Table* split_horizontal(Request&
 	return table;
 }
 
-static void split_with_options(Request& r, const String& method_name, MethodParams* params,
+static void split_with_options(Request& r, MethodParams* params,
 							   int bits) {
 	const String& string=GET_SELF(r, VString).string();
 
@@ -242,15 +242,15 @@ static void split_with_options(Request&
 	Table* table=horizontal?split_horizontal(r, string, pieces, right)
 		:split_vertical(r, string, pieces, right);
 
-	r.write_no_lang(Value*(new VTable(table)));
+	r.write_no_lang(*new VTable(table));
 }
-static void _split(Request& r, const String& method_name, MethodParams* params) {
+static void _split(Request& r, MethodParams* params) {
 	split_with_options(r, method_name, params, 0 /* maybe-determine from param #2 */);
 }
-static void _lsplit(Request& r, const String& method_name, MethodParams* params) {
+static void _lsplit(Request& r, MethodParams* params) {
 	split_with_options(r, method_name, params, SPLIT_LEFT);
 }
-static void _rsplit(Request& r, const String& method_name, MethodParams* params) {
+static void _rsplit(Request& r, MethodParams* params) {
 	split_with_options(r, method_name, params, SPLIT_RIGHT);
 }
 
@@ -261,18 +261,17 @@ static void search_action(Table* table,
 
 #ifndef DOXYGEN
 struct Replace_action_info {
-	Request *request;  
-	const String& origin;
-	const String& src;  String* dest;
+	Request* request;  
+	const String* src;  String* dest;
 	VTable* vtable;
 	Value* replacement_code;
 };
 #endif
 /// @todo they can do $global[$result] there, getting pointer to later-invalid local var, kill this
-static void replace_action(Table* table, ArrayString& row, 
-						   int prestart, int prefinish, 
-						   int poststart, int postfinish,
-						   void *info) {
+static void replace_action(Table* table, ArrayString* row, 
+			   int prestart, int prefinish, 
+			   int poststart, int postfinish,
+			   void *info) {
 	Replace_action_info& ai=*static_cast<Replace_action_info *>(info);
 	if(row) { // begin&middle
 		// piece from last match['prestart'] to beginning of this match['prefinish']
@@ -289,12 +288,12 @@ static void replace_action(Table* table,
 			*ai.dest << ai.request->process_to_string(ai.replacement_code);
 		}
 	} else // end
-		*ai.dest << ai.src->mid(poststart, postfinish);
+		*ai.dest << ai.src.mid(poststart, postfinish);
 }
 
 /// @todo use pcre:study somehow
-static void _match(Request& r, const String& method_name, MethodParams* params) {
-	Value* regexp=params->as_no_junction(0, "regexp must not be code");
+static void _match(Request& r, MethodParams* params) {
+	Value& regexp=params->as_no_junction(0, "regexp must not be code");
 
 	const String& options=
 		params->count()>1?
@@ -304,7 +303,7 @@ static void _match(Request& r, const Str
 	const String& src=GET_SELF(r, VString).string();
 	bool just_matched;
 	if(params->count()<3) { // search
-		Table* table=src->match(r.charsets.source(),
+		Table* table=src.match(r.charsets.source(),
 			method_name, 
 			*regexp->as_string(), options,
 			search_action, 0,
@@ -339,16 +338,16 @@ static void _match(Request& r, const Str
 	}
 }
 
-static void change_case(Request& r, const String& method_name, MethodParams* params, 
+static void change_case(Request& r, MethodParams* params, 
 						String::Change_case_kind kind) {
 	const String& src=GET_SELF(r, VString).string();
 
-	r.write_assign_lang(*src->change_case(r.charsets.source(), kind));
+	r.write_assign_lang(src.change_case(r.charsets.source(), kind));
 }
-static void _upper(Request& r, const String& method_name, MethodParams* params) {
+static void _upper(Request& r, MethodParams* params) {
 	change_case(r, method_name, params, String::CC_UPPER);
 }
-static void _lower(Request& r, const String& method_name, MethodParams* params) {
+static void _lower(Request& r, MethodParams* params) {
 	change_case(r, method_name, params, String::CC_LOWER);
 }
 
@@ -402,7 +401,7 @@ extern const String& sql_limit_name;
 extern const String& sql_offset_name;
 extern const String& sql_default_name;
 extern const String& sql_distinct_name;
-const String& sql_result_string(Request& r, const String& method_name, MethodParams* params,
+const String& sql_result_string(Request& r, MethodParams* params,
 							HashStringValue*& options, Value*& default_code) {
 
 	Value* statement=params->as_junction(0, "statement must be code");
@@ -413,7 +412,7 @@ const String& sql_result_string(Request&
 	if(params->count()>1) {
 		Value* voptions=params->as_no_junction(1, "options must be hash, not code");
 		if(!voptions->is_string())
-			if(options=voptions->get_hash(method_name)) {
+			if(options=voptions->get_hash()) {
 				if(Value* vlimit=options->get(sql_limit_name))
 					limit=(ulong)r.process_to_value(vlimit)->as_double();
 				if(Value* voffset=options->get(sql_offset_name))
@@ -436,9 +435,9 @@ const String& sql_result_string(Request&
 	Temp_lang temp_lang(r, String::L_SQL);
 	const String& statement_string=r.process_to_string(statement);
 	const char* statement_cstr=
-		statement_string->cstr(String::L_UNSPECIFIED, r.connection(method_name));
+		statement_string->cstr(String::L_UNSPECIFIED, r.connection());
 	String_sql_event_handlers handlers(statement_string, statement_cstr);
-	r.connection(method_name)->query(
+	r.connection()->query(
 		statement_cstr, offset, limit, 
 		handlers,
 		statement_string);
@@ -449,7 +448,7 @@ const String& sql_result_string(Request&
 	return handlers.result;
 }
 
-static void _sql(Request& r, const String& method_name, MethodParams* params) {
+static void _sql(Request& r, MethodParams* params) {
 
 	HashStringValue* options;
 	Value* default_code;
@@ -468,7 +467,7 @@ static void _sql(Request& r, const Strin
 	r.write_assign_lang(*string);
 }
 
-static void _replace(Request& r, const String& method_name, MethodParams* params) {
+static void _replace(Request& r, MethodParams* params) {
 	const String& src=GET_SELF(r, VString).string();
 
 	Table* table=params->as_no_junction(0, "parameter must not be code")->get_table();
@@ -482,7 +481,7 @@ static void _replace(Request& r, const S
 	r.write_assign_lang(*src->replace(dict2));
 }
 
-static void _save(Request& r, const String& method_name, MethodParams* params) {
+static void _save(Request& r, MethodParams* params) {
 	const String& file_name=params->as_string(params->count()-1, 
 		"file name must be string");
 
@@ -505,7 +504,7 @@ static void _save(Request& r, const Stri
 		buf, strlen(buf), true, do_append);
 }
 
-static void _normalize(Request& r, const String& method_name, MethodParams*  /*params*/) {
+static void _normalize(Request& r, MethodParams*  /*params*/) {
 	const String& src=GET_SELF(r, VString).string();
 
 	r.write_assign_lang(*src->join_chains(r.pool()));