--- parser3/src/classes/string.C	2001/04/03 14:38:58	1.26
+++ parser3/src/classes/string.C	2001/04/03 17:43:49	1.34
@@ -5,7 +5,7 @@
 
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 
-	$Id: string.C,v 1.26 2001/04/03 14:38:58 paf Exp $
+	$Id: string.C,v 1.34 2001/04/03 17:43:49 paf Exp $
 */
 
 #include "pa_request.h"
@@ -14,6 +14,7 @@
 #include "pa_vint.h"
 #include "pa_vtable.h"
 #include "pa_vbool.h"
+#include "pa_string.h"
 
 // global var
 
@@ -136,14 +137,60 @@ static void _rsplit(Request& r, const St
 	r.write_no_lang(*new(pool) VTable(pool, &table));
 }
 
-/// ^string.match{regexp}[options]
+static void search_action(Table& table, Array *row, int, int, void *) {
+	if(row)
+		table+=row;
+}
+
+struct Replace_action_info {
+	Request *request;  const String *origin;
+	const String *src;  String *dest;
+	Value *replacement_code;
+	const String *post_match;
+};
+static void replace_action(Table& table, Array *row, int start, int finish, 
+							   void *info) {
+	Replace_action_info& ai=*static_cast<Replace_action_info *>(info);
+	if(row) { // begin&middle
+		// piece from last match['start'] to beginning of this match['finish']
+		if(start!=finish)
+			ai.dest->append(ai.src->piece(start, finish), String::UL_PASS_APPENDED);//ai.dest->APPEND_CONST("-");
+		// store found parts in one-record Vtable
+		if(table.size()) // middle
+			table.put(0, row);
+		else // begin
+			table+=row;
+		{ // execute 'replacement_code' in 'table' context
+			VTable& vtable=*new(table.pool()) VTable(table.pool(), &table);
+			vtable.set_name(*ai.origin);
+
+			Junction *junction=ai.replacement_code->get_junction();
+			junction->rcontext=junction->root=&vtable;
+			Value& replaced=ai.request->process(*ai.replacement_code, ai.origin, false);
+
+			/*
+			ai.dest->APPEND_CONST("(");
+				ai.dest->append(*(String *)row->get(1/*match* /), String::UL_PASS_APPENDED);
+			ai.dest->APPEND_CONST(")");
+			*/
+			ai.dest->append(replaced.as_string(), String::UL_PASS_APPENDED);
+		}
+		ai.post_match=(String *)row->get(2/*post_match*/);
+	} else // end
+		ai.dest->append(*ai.post_match, String::UL_PASS_APPENDED);
+}
+
+/** search/replace
+	^string.match[regexp][options]
+	^string.match[regexp][options]{replacement-code}
+*/
 static void _match(Request& r, const String& method_name, Array *params) {
 	Pool& pool=r.pool();
-	const String& string=*static_cast<VString *>(r.self)->get_string();
+	const String& src=*static_cast<VString *>(r.self)->get_string();
 
 	Value& regexp=*static_cast<Value *>(params->get(0));
-	// forcing {this param type}
-	r.fail_if_junction_(false, regexp, method_name, "regexp must be junction");
+	// forcing [this param type]
+	r.fail_if_junction_(true, regexp, method_name, "regexp must not be junction");
 
 	const String *options=0;
 	if(params->size()>1) {
@@ -153,23 +200,43 @@ static void _match(Request& r, const Str
 		options=&value.as_string();
 	}
 
+	Value *result;
 	Temp_lang temp_lang(r, String::UL_PASS_APPENDED);
 	Table *table;
-	Value *result;
-	if(string.match(&method_name, 
-		r.process(regexp).as_string(), options,
-		&table)) {
-		// matched
-		if(table->columns()->size()==3 && // just matched[3=pre/match/post], no substrings
-			table->size()==1)  // just one row, not Global search
-			result=new(pool) VBool(pool, true);
-		else // table of match column+substring columns
-			result=new(pool) VTable(pool, table);
-	} else // not global & not matched
-		result=new(pool) VBool(pool, false);
+	if(params->size()<3) { // search
+		if(src.match(&method_name, 
+			regexp.as_string(), options,
+			&table,
+			search_action, 0)) {
+			// matched
+			if(table->columns()->size()==3 && // just matched[3=pre/match/post], no substrings
+				table->size()==1)  // just one row, not /g_lobal search
+				result=new(pool) VBool(pool, true);
+			else // table of pre/match/post+substrings
+				result=new(pool) VTable(pool, table);
+		} else // not matched [not global]
+			result=new(pool) VBool(pool, false);
+	} else { // replace
+		Value& replacement_code=*static_cast<Value *>(params->get(2));
+		// forcing {this param type}
+		r.fail_if_junction_(false, replacement_code, 
+			method_name, "replacement code must be junction");
 
+		String& dest=*new(pool) String(pool);
+		Replace_action_info replace_action_info={
+			&r, &method_name,
+			&src, &dest,
+			&replacement_code,
+			&src
+		};
+		src.match(&method_name, 
+			r.process(regexp).as_string(), options,
+			&table,
+			replace_action, &replace_action_info);
+		result=new(pool) VString(dest);
+	}
 	result->set_name(method_name);
-	r.write_no_lang(*result);
+	r.write_assign_lang(*result);
 }
 
 // initialize
@@ -202,7 +269,8 @@ void initialize_string_class(Pool& pool,
 	// ^string.rsplit[delim]
 	vclass.add_native_method("rsplit", Method::CT_DYNAMIC, _rsplit, 1, 1);
 
-	// ^string.match{regexp}[options]
-	vclass.add_native_method("match", Method::CT_DYNAMIC, _match, 1, 2);
+	// ^string.match[regexp][options]
+	// ^string.match[regexp][options]{replacement-code}
+	vclass.add_native_method("match", Method::CT_DYNAMIC, _match, 1, 3);
 }