--- parser3/src/classes/string.C	2001/03/30 05:51:12	1.22
+++ parser3/src/classes/string.C	2001/04/03 14:38:58	1.26
@@ -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.22 2001/03/30 05:51:12 paf Exp $
+	$Id: string.C,v 1.26 2001/04/03 14:38:58 paf Exp $
 */
 
 #include "pa_request.h"
@@ -11,6 +13,7 @@
 #include "pa_vdouble.h"
 #include "pa_vint.h"
 #include "pa_vtable.h"
+#include "pa_vbool.h"
 
 // global var
 
@@ -36,14 +39,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));
 }
@@ -88,28 +93,15 @@ static void _pos(Request& r, const Strin
 }
 
 static void split_list(Request& r, const String& method_name, Array *params,
-					   const String& string, Array& list) {
+					   const String& string, 
+					   Array& result) {
 	Pool& pool=r.pool();
 
 	Value& delim_value=*static_cast<Value *>(params->get(0));
 	// forcing [this param type]
 	r.fail_if_junction_(true, delim_value, method_name, "delimiter must not be junction");
-	const String& delim=delim_value.as_string();
-	
-	if(delim.size()) {
-		size_t pos_after=0;
-		int pos_before;
-		// while we have 'delim' in 'string'...
-		while((pos_before=string.pos(delim, pos_after))>=0) {
-			list+=&string.piece(pos_after, pos_before);
-			pos_after=pos_before+delim.size();
-		}
-		// last piece
-		if(pos_after<string.size()) 
-			list+=&string.piece(pos_after, string.size());
-	} else { // empty delim
-		list+=&string;
-	}
+
+	string.split(result, 0, delim_value.as_string(), String::UL_CLEAN, -1);
 }
 
 static void _lsplit(Request& r, const String& method_name, Array *params) {
@@ -144,6 +136,42 @@ static void _rsplit(Request& r, const St
 	r.write_no_lang(*new(pool) VTable(pool, &table));
 }
 
+/// ^string.match{regexp}[options]
+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();
+	}
+
+	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);
+
+	result->set_name(method_name);
+	r.write_no_lang(*result);
+}
+
 // initialize
 
 void initialize_string_class(Pool& pool, VStateless_class& vclass) {
@@ -156,7 +184,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)
@@ -173,5 +201,8 @@ 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]
+	vclass.add_native_method("match", Method::CT_DYNAMIC, _match, 1, 2);
 }