--- parser3/src/classes/string.C	2001/04/03 05:23:37	1.23
+++ parser3/src/classes/string.C	2001/04/03 15:07:31	1.27
@@ -1,9 +1,11 @@
-/*
-	Parser
+/** @file
+	Parser: @b string parser class.
+
 	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
+
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 
-	$Id: string.C,v 1.23 2001/04/03 05:23:37 paf Exp $
+	$Id: string.C,v 1.27 2001/04/03 15:07:31 paf Exp $
 */
 
 #include "pa_request.h"
@@ -11,6 +13,8 @@
 #include "pa_vdouble.h"
 #include "pa_vint.h"
 #include "pa_vtable.h"
+#include "pa_vbool.h"
+#include "pa_string.h"
 
 // global var
 
@@ -36,14 +40,16 @@ static void _double(Request& r, const St
 	r.write_no_lang(value);
 }
 
+/// ^string.format{format}
 /*not static*/void _string_format(Request& r, const String& method_name, Array *params) {
 	Pool& pool=r.pool();
 
 	Value& fmt=*static_cast<Value *>(params->get(0));
-	// forcing [this param type]
-	r.fail_if_junction_(true, fmt, method_name, "fmt must not be junction");
+	// forcing {this param type}
+	r.fail_if_junction_(false, fmt, method_name, "fmt must be junction");
 
-	char *buf=format(pool, r.self->as_double(), fmt.as_string().cstr());
+	Temp_lang temp_lang(r, String::UL_PASS_APPENDED);
+	char *buf=format(pool, r.self->as_double(), r.process(fmt).as_string().cstr());
 	
 	r.write_no_lang(String(pool, buf));
 }
@@ -131,6 +137,77 @@ static void _rsplit(Request& r, const St
 	r.write_no_lang(*new(pool) VTable(pool, &table));
 }
 
+static void search_row_action(Table& table, Array& row, void *) {
+	table+=&row;
+}
+
+struct Replace_action_info {
+	String *string;
+	Value *replacement_code;
+};
+static void replace_row_action(Table& table, Array& row, void *info) {
+	Replace_action_info& ai=*static_cast<Replace_action_info *>(info);
+	//table+=&row;
+	ai.string->APPEND_CONST("R!");
+}
+
+/** 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();
+
+	Value& regexp=*static_cast<Value *>(params->get(0));
+	// forcing {this param type}
+	r.fail_if_junction_(false, regexp, method_name, "regexp must be junction");
+
+	const String *options=0;
+	if(params->size()>1) {
+		Value& value=*static_cast<Value *>(params->get(1));
+		// forcing {this param type}
+		r.fail_if_junction_(true, value, method_name, "options must not be junction");
+		options=&value.as_string();
+	}
+
+	Value *result;
+	Temp_lang temp_lang(r, String::UL_PASS_APPENDED);
+	Table *table;
+	if(params->size()<3) { // search
+		if(string.match(&method_name, 
+			r.process(regexp).as_string(), options,
+			&table,
+			search_row_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& string=*new(pool) String(pool);
+		Replace_action_info replace_action_info={
+			&string,
+			&replacement_code
+		};
+		string.match(&method_name, 
+			r.process(regexp).as_string(), options,
+			&table,
+			replace_row_action, &replace_action_info);
+		result=new(pool) VString(string);
+	}
+	result->set_name(method_name);
+	r.write_no_lang(*result);
+}
+
 // initialize
 
 void initialize_string_class(Pool& pool, VStateless_class& vclass) {
@@ -143,7 +220,7 @@ void initialize_string_class(Pool& pool,
 	// ^string.double[]
 	vclass.add_native_method("double", Method::CT_DYNAMIC, _double, 0, 0);
 
-	// ^string.format[]
+	// ^string.format{format}
 	vclass.add_native_method("format", Method::CT_DYNAMIC, _string_format, 1, 1);
 
 	// ^string.left(n)
@@ -160,5 +237,9 @@ void initialize_string_class(Pool& pool,
 	vclass.add_native_method("lsplit", Method::CT_DYNAMIC, _lsplit, 1, 1);
 	// ^string.rsplit[delim]
 	vclass.add_native_method("rsplit", Method::CT_DYNAMIC, _rsplit, 1, 1);
+
+	// ^string.match{regexp}[options]
+	// ^string.match{regexp}[options]{replacement-code}
+	vclass.add_native_method("match", Method::CT_DYNAMIC, _match, 1, 2);
 }