--- parser3/src/classes/string.C	2009/04/22 04:38:36	1.174
+++ parser3/src/classes/string.C	2009/04/28 04:53:52	1.178
@@ -5,7 +5,7 @@
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char * const IDENT_STRING_C="$Date: 2009/04/22 04:38:36 $";
+static const char * const IDENT_STRING_C="$Date: 2009/04/28 04:53:52 $";
 
 #include "classes.h"
 #include "pa_vmethod_frame.h"
@@ -284,13 +284,14 @@ static Table& split_horizontal(ArrayStri
 static void split_with_options(Request& r, MethodParams& params,
 							   int bits) {
 	const String& string=GET_SELF(r, VString).string();
+	size_t params_count=params.count();
 
 	ArrayString pieces;
 	split_list(params, 0, string, pieces);
 
 	if(!bits) {
 		const String* options=0;
-		if(params.count()>1)
+		if(params_count>1)
 			options=&params.as_string(1, "options must not be code");
 		
 		bits=split_options(options);
@@ -300,14 +301,14 @@ static void split_with_options(Request&
 	bool horizontal=(bits & SPLIT_HORIZONTAL) !=0;
 
 	const String* column_name=0;
-	if(params.count()>2){
+	if(params_count>2){
 		column_name=&params.as_string(2, COLUMN_NAME_MUST_BE_STRING);
-		if (horizontal && column_name->length()) 
+		if (horizontal && !column_name->is_empty()) 
 			throw Exception(PARSER_RUNTIME,
 				column_name,
 				"column name can't be specified with horisontal split");
 	} 
-	if(!column_name || !column_name->length())
+	if(!column_name || column_name->is_empty())
 		column_name=new String("piece");
 
 	Table& table=horizontal?split_horizontal(pieces, right):split_vertical(pieces, right, column_name);
@@ -381,6 +382,7 @@ static void _match(Request& r, MethodPar
 		vregex=new VRegex(r.charsets.source(),
 			&regexp.as_string(),
 			(options)?(&options->as_string()):0);
+		vregex->study();
 		vrcleaner.vregex=vregex;
 	}
 
@@ -394,7 +396,7 @@ static void _match(Request& r, MethodPar
 			matches_count);
 
 		if(table){
-			r.write_assign_lang(*new VTable(table));
+			r.write_no_lang(*new VTable(table));
 		} else {
 			r.write_no_lang(*new VInt(matches_count));
 		}
@@ -587,12 +589,13 @@ 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);
+	size_t params_count=params.count();
+	const String& file_name=params.as_string(params_count-1, FILE_NAME_MUST_BE_STRING);
 
 	const String& src=GET_SELF(r, VString).string();
 
 	bool do_append=false;
-	if(params.count()>1) {
+	if(params_count>1) {
 		const String& mode=params.as_string(0, "mode must be string");
 		if(mode=="append")
 			do_append=true;
@@ -618,11 +621,11 @@ static void _trim(Request& r, MethodPara
 	const String& src=GET_SELF(r, VString).string();
 
 	String::Trim_kind kind=String::TRIM_BOTH;
+	size_t params_count=params.count();
 	const char* chars=0;
-	if(params.count()>0) {
-		const String& skind=params.as_string(0, 
-			"'where' must be string");
-		if(skind.length())
+	if(params_count>0) {
+		const String& skind=params.as_string(0, "'where' must be string");
+		if(!skind.is_empty())
 			if(skind==TRIM_BOTH_OPTION)
 				kind=String::TRIM_BOTH;
 			else if(skind==TRIM_START_OPTION || skind=="start")
@@ -634,9 +637,9 @@ static void _trim(Request& r, MethodPara
 					&skind,
 					"'kind' must be one of "TRIM_START_OPTION", "TRIM_BOTH_OPTION", "TRIM_END_OPTION);
 
-		if(params.count()>1) {
+		if(params_count>1) {
 			const String& schars=params.as_string(1, "'chars' must be string");
-			if(schars.length())
+			if(!schars.is_empty())
 				chars=schars.cstr();
 		}
 	}