--- parser3/src/classes/string.C	2007/02/03 18:08:38	1.151
+++ parser3/src/classes/string.C	2007/08/28 09:28:00	1.156
@@ -5,7 +5,7 @@
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char * const IDENT_STRING_C="$Date: 2007/02/03 18:08:38 $";
+static const char * const IDENT_STRING_C="$Date: 2007/08/28 09:28:00 $";
 
 #include "classes.h"
 #include "pa_vmethod_frame.h"
@@ -56,7 +56,7 @@ static void _int(Request& r, MethodParam
 	int converted;
 	try {
 		if(self_string.is_empty())
-			throw Exception("parser.runtime",
+			throw Exception(PARSER_RUNTIME,
 				0,
 				"parameter is empty string, error converting");
 		converted=self_string.as_int();
@@ -74,7 +74,7 @@ static void _double(Request& r, MethodPa
 	double converted;
 	try {
 		if(self_string.is_empty())
-			throw Exception("parser.runtime",
+			throw Exception(PARSER_RUNTIME,
 				0,
 				"parameter is empty string, error converting");
 		converted=self_string.as_double();
@@ -93,7 +93,7 @@ static void _bool(Request& r, MethodPara
 	bool converted;
 	try {
 		if(self_string.is_empty())
-			throw Exception("parser.runtime",
+			throw Exception(PARSER_RUNTIME,
 				0,
 				"parameter is empty string, error converting");
 		converted=self_string.as_bool();
@@ -121,7 +121,7 @@ static void _bool(Request& r, MethodPara
 static void _left(Request& r, MethodParams& params) {
 	ssize_t sn=params.as_int(0, "n must be int", r);
 	if(sn<0)
-		throw Exception("parser.runtime",
+		throw Exception(PARSER_RUNTIME,
 			0, 
 			"n(%d) must be >=0", sn);
 	size_t n=(size_t)sn;
@@ -133,7 +133,7 @@ static void _left(Request& r, MethodPara
 static void _right(Request& r, MethodParams& params) {
 	ssize_t sn=(size_t)params.as_int(0, "n must be int", r);
 	if(sn<0)
-		throw Exception("parser.runtime",
+		throw Exception(PARSER_RUNTIME,
 			0, 
 			"n(%d) must be >=0", sn);
 	size_t n=(size_t)sn;
@@ -149,7 +149,7 @@ static void _mid(Request& r, MethodParam
 
 	ssize_t sbegin=params.as_int(0, "p must be int", r);
 	if(sbegin<0)
-		throw Exception("parser.runtime",
+		throw Exception(PARSER_RUNTIME,
 			0, 
 			"p(%d) must be >=0", sbegin);
 	size_t begin=(size_t)sbegin;
@@ -158,7 +158,7 @@ static void _mid(Request& r, MethodParam
 	if(params.count()>1) {
 		ssize_t sn=params.as_int(1, "n must be int", r);
 		if(sn<0)
-			throw Exception("parser.runtime",
+			throw Exception(PARSER_RUNTIME,
 				0, 
 				"n(%d) must be >=0", sn);
 		end=begin+(size_t)sn;
@@ -209,7 +209,7 @@ static int split_options(const String* o
 			if(options->pos(o->keyL)!=STRING_NOT_FOUND 
 				|| (o->keyU && options->pos(o->keyU)!=STRING_NOT_FOUND)) {
 				if(result & o->checkBit)
-					throw Exception("parser.runtime",
+					throw Exception(PARSER_RUNTIME,
 						options,
 						"conflicting split options");
 				result |= o->setBit;
@@ -219,9 +219,9 @@ static int split_options(const String* o
 	return result;
 }
 
-static Table& split_vertical(ArrayString& pieces, bool right) {
+static Table& split_vertical(ArrayString& pieces, bool right, const String* column_name) {
 	Table::columns_type columns(new ArrayString);
-	*columns+=new String("piece");
+	*columns+=column_name;
 
 	Table& table=*new Table(columns, pieces.count());
 	if(right) { // right
@@ -274,8 +274,19 @@ static void split_with_options(Request&
 
 	bool right=(bits & SPLIT_RIGHT) != 0;
 	bool horizontal=(bits & SPLIT_HORIZONTAL) !=0;
-	Table& table=horizontal?split_horizontal(pieces, right)
-		:split_vertical(pieces, right);
+
+	const String* column_name=0;
+	if(params.count()>2){
+		column_name=&params.as_string(2, COLUMN_NAME_MUST_BE_STRING);
+		if (horizontal && column_name->length()) 
+			throw Exception(PARSER_RUNTIME,
+				column_name,
+				"column name can't be specified with horisontal split");
+	} 
+	if(!column_name || !column_name->length())
+		column_name=new String("piece");
+
+	Table& table=horizontal?split_horizontal(pieces, right):split_vertical(pieces, right, column_name);
 
 	r.write_no_lang(*new VTable(&table));
 }
@@ -336,19 +347,19 @@ static void _match(Request& r, MethodPar
 
 	Temp_lang temp_lang(r, String::L_PASS_APPENDED);
 	const String& src=GET_SELF(r, VString).string();
-	bool just_matched;
+	int matches_count=0;
 	if(params.count()<3) { // search
 		Table* table=src.match(r.charsets.source(),
 			regexp.as_string(), options,
 			search_action, 0,
-			just_matched);
-		// Value* result;
-		// if(table) 
-		// 	result=new VTable(table); // table of pre/match/post+substrings
-		// else 
-		// 	result=new VBool(just_matched);
-		// r.write_assign_lang(*result);
+			matches_count);
+		// r.write_assign_lang(*new VTable(table));
+		if(table){
 		r.write_assign_lang(*new VTable(table));
+		} else {
+			r.write_assign_lang(*new VInt(matches_count));
+		}
+
 	} else { // replace
 		Value& replacement_code=params.as_junction(2, "replacement param must be code");
 
@@ -367,7 +378,7 @@ static void _match(Request& r, MethodPar
 		src.match(r.charsets.source(),
 			r.process_to_string(regexp), options,
 			replace_action, &info,
-			just_matched);
+			matches_count);
 		r.write_assign_lang(result);
 	}
 }
@@ -402,7 +413,7 @@ public:
 
 	bool add_column(SQL_Error& error, const char* /*str*/, size_t /*length*/) {
 		if(got_column) {
-			error=SQL_Error("parser.runtime",
+			error=SQL_Error(PARSER_RUNTIME,
 				//statement_string,
 				"result must contain exactly one column");
 			return true;
@@ -414,7 +425,7 @@ public:
 	bool add_row(SQL_Error& /*error*/) { /* ignore */ return false; }
 	bool add_row_cell(SQL_Error& error, const char* str, size_t length) {
 		if(got_cell) {
-			error=SQL_Error("parser.runtime",
+			error=SQL_Error(PARSER_RUNTIME,
 				//statement_string,
 				"result must not contain more then one row");
 			return true;
@@ -468,11 +479,11 @@ const String* sql_result_string(Request&
 					valid_options++;
 				}
 				if(valid_options!=options->count())
-					throw Exception("parser.runtime",
+					throw Exception(PARSER_RUNTIME,
 						0,
 						"called with invalid option");
 			} else
-				throw Exception("parser.runtime",
+				throw Exception(PARSER_RUNTIME,
 					0,
 					"options must be hash");
 	} else
@@ -513,7 +524,7 @@ static void _sql(Request& r, MethodParam
 		if(default_code) {
 			string=&r.process_to_string(*default_code);
 		} else
-			throw Exception("parser.runtime",
+			throw Exception(PARSER_RUNTIME,
 				0,
 				"produced no result, but no default option specified");
 	}
@@ -526,7 +537,7 @@ static void _replace(Request& r, MethodP
 
 	Table* table=params.as_no_junction(0, "parameter must not be code").get_table();
 	if(!table)
-		throw Exception("parser.runtime",
+		throw Exception(PARSER_RUNTIME,
 			0,
 			"parameter must be table");
 
@@ -535,8 +546,7 @@ static void _replace(Request& r, MethodP
 }
 
 static void _save(Request& r, MethodParams& params) {
-	const String& file_name=params.as_string(params.count()-1, 
-		"file name must be string");
+	const String& file_name=params.as_string(params.count()-1, FILE_NAME_MUST_BE_STRING);
 
 	const String& src=GET_SELF(r, VString).string();
 
@@ -546,7 +556,7 @@ static void _save(Request& r, MethodPara
 		if(mode=="append")
 			do_append=true;
 		else
-			throw Exception("parser.runtime",
+			throw Exception(PARSER_RUNTIME,
 				&mode,
 				"unknown mode, must be 'append'");
 	}		
@@ -579,7 +589,7 @@ static void _trim(Request& r, MethodPara
 			else if(skind==TRIM_BOTH_OPTION)
 				kind=String::TRIM_BOTH;
 			else
-				throw Exception("parser.runtime",
+				throw Exception(PARSER_RUNTIME,
 					&skind,
 					"'kind' must be one of "TRIM_START_OPTION", "TRIM_BOTH_OPTION", "TRIM_END_OPTION);
 
@@ -597,7 +607,7 @@ static void _append(Request& r, MethodPa
 	// c=a+b
 	VString& va=GET_SELF(r, VString);
 	const String& a=va.string();
-	const String& b=params.as_string(0, "parameter must be string");
+	const String& b=params.as_string(0, PARAMETER_MUST_BE_STRING);
 	String& c=*new String(a);
 	c.append(b, String::L_PASS_APPENDED);
 	va.set_string(c);
@@ -606,7 +616,7 @@ static void _append(Request& r, MethodPa
 static void _base64(Request& r, MethodParams& params) {
 	if(params.count()) {
 		// decode
-		const char* cstr=params.as_string(0, "parameter must be string").cstr();
+		const char* cstr=params.as_string(0, PARAMETER_MUST_BE_STRING).cstr();
 		char* decoded_cstr=0;
 		size_t decoded_size=0;
 		pa_base64_decode(cstr, strlen(cstr), decoded_cstr, decoded_size);
@@ -652,7 +662,8 @@ MString::MString(): Methoded("string") {
 
 	// ^string.split[delim]
 	// ^string.split[delim][options]
-	add_native_method("split", Method::CT_DYNAMIC, _split, 1, 2);
+	// ^string.split[delim][options][column name]
+	add_native_method("split", Method::CT_DYNAMIC, _split, 1, 3);
 		// old names for backward compatibility
 		// ^string.lsplit[delim]
 		add_native_method("lsplit", Method::CT_DYNAMIC, _lsplit, 1, 1);