--- parser3/src/classes/string.C	2020/12/17 19:51:21	1.248
+++ parser3/src/classes/string.C	2024/09/07 15:01:38	1.252
@@ -1,8 +1,8 @@
 /** @file
 	Parser: @b string parser class.
 
-	Copyright (c) 2001-2020 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.248 2020/12/17 19:51:21 moko Exp $";
+volatile const char * IDENT_STRING_C="$Id: string.C,v 1.252 2024/09/07 15:01:38 moko Exp $";
 
 // class
 
@@ -205,9 +205,32 @@ 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(Value* value=delim_value.as(VREGEX_TYPE)){
+		VRegex *vregex=static_cast<VRegex*>(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,7 +278,7 @@ static Table& split_vertical(ArrayString
 			table+=row;
 		}
 	} else { // left
-		Array_iterator<const String*> i(pieces);
+		ArrayString::Iterator i(pieces);
 		while(i.has_next()) {
 			Table::element_type row(new ArrayString);
 			*row+=i.next();
@@ -273,7 +296,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.has_next(); )
 			*row+=i.next();
 	}
 	table+=row;
@@ -286,7 +309,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;