--- parser3/src/classes/string.C	2020/11/10 22:42:25	1.246
+++ parser3/src/classes/string.C	2024/09/28 14:37:53	1.255
@@ -1,8 +1,8 @@
 /** @file
 	Parser: @b string parser class.
 
-	Copyright (c) 2001-2017 Art. Lebedev Studio (http://www.artlebedev.com)
-	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
+	Copyright (c) 2001-2023 Art. Lebedev Studio (http://www.artlebedev.com)
+	Authors: Konstantin Morshnev <moko@design.ru>, Alexandr Petrosian <paf@design.ru>
 */
 
 #include "classes.h"
@@ -21,7 +21,7 @@
 #include "pa_vregex.h"
 #include "pa_charsets.h"
 
-volatile const char * IDENT_STRING_C="$Id: string.C,v 1.246 2020/11/10 22:42:25 moko Exp $";
+volatile const char * IDENT_STRING_C="$Id: string.C,v 1.255 2024/09/28 14:37:53 moko Exp $";
 
 // class
 
@@ -205,9 +205,31 @@ static void _pos(Request& r, MethodParam
 	r.write(*new VInt((int)string.pos(r.charsets.source(), substr.as_string(), offset)));
 }
 
-static void split_list(MethodParams& params, int paramIndex, const String& string, ArrayString& result) {
-	Value& delim_value=params.as_no_junction(paramIndex, "delimiter must not be code");
-	string.split(result, 0, delim_value.as_string());
+struct Split_action_info {
+	const String& src;
+	ArrayString &result;
+};
+
+static void split_action(Table& , ArrayString* row, int prestart, int prefinish, int poststart, int postfinish, void *info) {
+	Split_action_info& ai=*static_cast<Split_action_info *>(info);
+	if(row) { // begin&middle
+		// piece from last match['prestart'] to beginning of this match['prefinish']
+		ai.result += &ai.src.mid(prestart, prefinish);
+	} else // end
+		if(poststart != postfinish)
+			ai.result += &ai.src.mid(poststart, postfinish);
+}
+
+static void split_list(Value& delim_value, const String& string, ArrayString& result) {
+	if(VRegex *vregex=dynamic_cast<VRegex*>(&delim_value)){
+		vregex->study();
+
+		int matches_count=0;
+		Split_action_info ai = { string, result };
+
+		string.match(vregex, split_action, &ai, matches_count);
+	} else
+		string.split(result, 0, delim_value.as_string());
 }
 
 #define SPLIT_LEFT 0x0001
@@ -255,8 +277,7 @@ static Table& split_vertical(ArrayString
 			table+=row;
 		}
 	} else { // left
-		Array_iterator<const String*> i(pieces);
-		while(i.has_next()) {
+		for(ArrayString::Iterator i(pieces); i; ) {
 			Table::element_type row(new ArrayString);
 			*row+=i.next();
 			table+=row;
@@ -273,7 +294,7 @@ static Table& split_horizontal(ArrayStri
 		for(int i=pieces.count(); --i>=0; )
 			*row+=pieces[i];
 	} else { // left
-		for(Array_iterator<const String*> i(pieces); i.has_next(); )
+		for(ArrayString::Iterator i(pieces); i; )
 			*row+=i.next();
 	}
 	table+=row;
@@ -286,7 +307,7 @@ static void split_with_options(Request&
 	size_t params_count=params.count();
 
 	ArrayString pieces;
-	split_list(params, 0, string, pieces);
+	split_list(params.as_no_junction(0, "delimiter must not be code"), string, pieces);
 
 	if(!bits) {
 		const String* options=0;
@@ -364,13 +385,12 @@ static void _match(Request& r, MethodPar
 	Value& regexp=params.as_no_junction(0, "regexp must not be code");
 	Value* options=(params_count>1)?&params.as_no_junction(1, OPTIONS_MUST_NOT_BE_CODE):0;
 
-	VRegex* vregex;
+	VRegex* vregex=dynamic_cast<VRegex*>(&regexp);
 	VRegexCleaner vrcleaner;
 
-	if(Value* value=regexp.as(VREGEX_TYPE)){
+	if(vregex){
 		if(options && options->is_defined())
-			throw Exception(PARSER_RUNTIME, 0, "you can not specify regex-object and options together");
-		vregex=static_cast<VRegex*>(value);
+			throw Exception(PARSER_RUNTIME, 0, "you cannot specify regex-object and options together");
 	} else {
 		vregex=new VRegex(r.charsets.source(), &regexp.as_string(), (options) ? (&options->as_string()) : 0);
 		vregex->study();
@@ -466,7 +486,7 @@ public:
 	bool add_row(SQL_Error& /*error*/) { /* ignore */ return false; }
 	bool add_row_cell(SQL_Error& error, const char* str, size_t) {
 		if(got_cell) {
-			error=SQL_Error("result must not contain more then one row");
+			error=SQL_Error("result must contain no more than one row");
 			return true;
 		}
 		try {
@@ -553,9 +573,11 @@ static void _replace(Request& r, MethodP
 
 	if(params.count()==1) {
 		// ^string.replace[table]
-		Table* table=params.as_table(0, "param");
-		Dictionary dict(*table);
-		r.write(src.replace(dict));
+		if(Table* table=params.as_table(0, "param")){
+			Dictionary dict(*table);
+			r.write(src.replace(dict));
+		} else
+			r.write(src);
 	} else {
 		// ^string.replace[from-string;to-string]
 		Dictionary dict(params.as_string(0, "from must be string"), params.as_string(1, "to must be string"));