--- parser3/src/classes/string.C	2001/03/29 17:11:39	1.17
+++ parser3/src/classes/string.C	2001/03/30 05:51:12	1.22
@@ -3,7 +3,7 @@
 	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 
-	$Id: string.C,v 1.17 2001/03/29 17:11:39 paf Exp $
+	$Id: string.C,v 1.22 2001/03/30 05:51:12 paf Exp $
 */
 
 #include "pa_request.h"
@@ -36,7 +36,7 @@ static void _double(Request& r, const St
 	r.write_no_lang(value);
 }
 
-void _string_format(Request& r, const String& method_name, Array *params) {
+/*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));
@@ -48,7 +48,7 @@ void _string_format(Request& r, const St
 	r.write_no_lang(String(pool, buf));
 }
 
-void _left(Request& r, const String&, Array *params) {
+static void _left(Request& r, const String&, Array *params) {
 	Pool& pool=r.pool();
 
 	size_t n=(size_t)r.process(*static_cast<Value *>(params->get(0))).as_double();
@@ -57,7 +57,7 @@ void _left(Request& r, const String&, Ar
 	r.write_assign_lang(*new(pool) VString(string.piece(0, n)));
 }
 
-void _right(Request& r, const String&, Array *params) {
+static void _right(Request& r, const String&, Array *params) {
 	Pool& pool=r.pool();
 
 	size_t n=(size_t)r.process(*static_cast<Value *>(params->get(0))).as_double();
@@ -66,7 +66,7 @@ void _right(Request& r, const String&, A
 	r.write_assign_lang(*new(pool) VString(string.piece(string.size()-n, string.size())));
 }
 
-void _mid(Request& r, const String&, Array *params) {
+static void _mid(Request& r, const String&, Array *params) {
 	Pool& pool=r.pool();
 
 	size_t p=(size_t)r.process(*static_cast<Value *>(params->get(0))).as_double();
@@ -76,7 +76,7 @@ void _mid(Request& r, const String&, Arr
 	r.write_assign_lang(*new(pool) VString(string.piece(p, p+n)));
 }
 
-void _pos(Request& r, const String& method_name, Array *params) {
+static void _pos(Request& r, const String& method_name, Array *params) {
 	Pool& pool=r.pool();
 
 	Value& substr=*static_cast<Value *>(params->get(0));
@@ -87,7 +87,8 @@ void _pos(Request& r, const String& meth
 	r.write_assign_lang(*new(pool) VInt(pool, string.pos(substr.as_string())));
 }
 
-void _lsplit(Request& r, const String& method_name, Array *params) {
+static void split_list(Request& r, const String& method_name, Array *params,
+					   const String& string, Array& list) {
 	Pool& pool=r.pool();
 
 	Value& delim_value=*static_cast<Value *>(params->get(0));
@@ -95,55 +96,82 @@ void _lsplit(Request& r, const String& m
 	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;
+	}
+}
+
+static void _lsplit(Request& r, const String& method_name, Array *params) {
+	Pool& pool=r.pool();
 	const String& string=*static_cast<VString *>(r.self)->get_string();
 
-	Table& result=*new(pool) Table(pool, &string, 0);
+	Array& row=*new(pool) Array(pool);
+	split_list(r, method_name, params, string, row);
 
-	int pos_before=string.pos(delim);
-	if(pos_before>=0) {
-		{
-			Array& row=*new(pool) Array(pool, 1);
-			result+=&(row+=&string.piece(0, pos_before));
-		}
-		size_t pos_after=pos_before+delim.size();
-		if(pos_after<string.size()) {
-			Array& row=*new(pool) Array(pool, 1);
-			result+=&(row+=&string.piece(pos_after, string.size()));
-		}
-	} else {
-		Array& row=*new(pool) Array(pool, 1);
-		result+=&(row+=&string);
-	}
+	Table& table=*new(pool) Table(pool, &string, 
+		0/*nameless*/, 1/*row preallocate(and only)*/);
+	table+=&row;
+
+	r.write_no_lang(*new(pool) VTable(pool, &table));
+}
+
+static void _rsplit(Request& r, const String& method_name, Array *params) {
+	Pool& pool=r.pool();
+	const String& string=*static_cast<VString *>(r.self)->get_string();
+
+	Array list(pool);
+	split_list(r, method_name, params, string, list);
+
+	Array& row=*new(pool) Array(pool);
+	for(int i=list.size(); --i>=0; )
+		row+=list.get(i);
+
+	Table& table=*new(pool) Table(pool, &string, 
+		0/*nameless*/, 1/*row preallocate(and only)*/);
+	table+=&row;
 
-	r.write_no_lang(*new(pool) VTable(pool, &result));
+	r.write_no_lang(*new(pool) VTable(pool, &table));
 }
 
 // initialize
 
 void initialize_string_class(Pool& pool, VStateless_class& vclass) {
 	// ^string.length[]
-	vclass.add_native_method("length", _length, 0, 0);
+	vclass.add_native_method("length", Method::CT_DYNAMIC, _length, 0, 0);
 	
 	// ^string.int[]
-	vclass.add_native_method("int", _int, 0, 0);
+	vclass.add_native_method("int", Method::CT_DYNAMIC, _int, 0, 0);
 	
 	// ^string.double[]
-	vclass.add_native_method("double", _double, 0, 0);
+	vclass.add_native_method("double", Method::CT_DYNAMIC, _double, 0, 0);
 
 	// ^string.format[]
-	vclass.add_native_method("format", _string_format, 1, 1);
+	vclass.add_native_method("format", Method::CT_DYNAMIC, _string_format, 1, 1);
 
 	// ^string.left(n)
-	vclass.add_native_method("left", _left, 1, 1);
+	vclass.add_native_method("left", Method::CT_DYNAMIC, _left, 1, 1);
 	// ^string.right(n)
-	vclass.add_native_method("right", _right, 1, 1);
+	vclass.add_native_method("right", Method::CT_DYNAMIC, _right, 1, 1);
 	// ^string.mid(p;n)
-	vclass.add_native_method("mid", _mid, 2, 2);
+	vclass.add_native_method("mid", Method::CT_DYNAMIC, _mid, 2, 2);
 
 	// ^string.pos[substr]
-	vclass.add_native_method("pos", _pos, 1, 1);
+	vclass.add_native_method("pos", Method::CT_DYNAMIC, _pos, 1, 1);
 
 	// ^string.lsplit[delim]
-	vclass.add_native_method("lsplit", _lsplit, 1, 1);
+	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);
 }