--- parser3/src/classes/string.C	2001/04/03 14:38:58	1.26
+++ parser3/src/classes/string.C	2008/07/03 09:17:57	1.161
@@ -1,208 +1,716 @@
 /** @file
 	Parser: @b string parser class.
 
-	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001-2005 ArtLebedev Group (http://www.artlebedev.com)
+	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
+*/
 
-	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
+static const char * const IDENT_STRING_C="$Date: 2008/07/03 09:17:57 $";
 
-	$Id: string.C,v 1.26 2001/04/03 14:38:58 paf Exp $
-*/
+#include "classes.h"
+#include "pa_vmethod_frame.h"
 
 #include "pa_request.h"
-#include "_string.h"
 #include "pa_vdouble.h"
 #include "pa_vint.h"
 #include "pa_vtable.h"
 #include "pa_vbool.h"
+#include "pa_string.h"
+#include "pa_sql_connection.h"
+#include "pa_dictionary.h"
+#include "pa_vmethod_frame.h"
+
+// class
+
+class MString: public Methoded {
+public:
+	MString();
+public: // Methoded
+	bool used_directly() { return true; }
+};
+
+// global variable
+
+DECLARE_CLASS_VAR(string, new MString, 0);
 
-// global var
+// defines for statics
 
-VStateless_class *string_class;
+#define MATCH_VAR_NAME "match"
+#define TRIM_START_OPTION "start"
+#define TRIM_BOTH_OPTION "both"
+#define TRIM_END_OPTION "end"
+
+// statics
+
+static const String match_var_name(MATCH_VAR_NAME);
 
 // methods
 
-static void _length(Request& r, const String&, Array *) {
-	Pool& pool=r.pool();
-	Value& value=*new(pool) VDouble(pool, r.self->get_string()->size());
-	r.write_no_lang(value);
+static void _length(Request& r, MethodParams&) {
+	double result=GET_SELF(r, VString).string().length();
+	r.write_no_lang(*new VDouble(result));
+}
+
+static void _int(Request& r, MethodParams& params) {
+	const String& self_string=GET_SELF(r, VString).string();
+	int converted;
+	try {
+		if(self_string.is_empty())
+			throw Exception(PARSER_RUNTIME,
+				0,
+				"parameter is empty string, error converting");
+		converted=self_string.as_int();
+	} catch(...) { // convert problem
+		if(params.count()>0)
+			converted=params.as_int(0, "default must be int", r); // (default)
+		else
+			rethrow; // we have a problem when no default			
+	}
+	r.write_no_lang(*new VInt(converted));
 }
 
-static void _int(Request& r, const String&, Array *) {
-	Pool& pool=r.pool();
-	Value& value=*new(pool) VInt(pool, (int)r.self->as_double());
-	r.write_no_lang(value);
+static void _double(Request& r, MethodParams& params) {
+	const String& self_string=GET_SELF(r, VString).string();
+	double converted;
+	try {
+		if(self_string.is_empty())
+			throw Exception(PARSER_RUNTIME,
+				0,
+				"parameter is empty string, error converting");
+		converted=self_string.as_double();
+	} catch(...) { // convert problem
+		if(params.count()>0)
+			converted=params.as_double(0, "default must be double", r); // (default)
+		else
+			rethrow; // we have a problem when no default
+	}
+
+	r.write_no_lang(*new VDouble(converted));
 }
 
-static void _double(Request& r, const String&, Array *) {
-	Pool& pool=r.pool();
-	Value& value=*new(pool) VDouble(pool, r.self->as_double());
-	r.write_no_lang(value);
+static void _bool(Request& r, MethodParams& params) {
+	const String& self_string=GET_SELF(r, VString).string();
+	bool converted;
+	try {
+		if(self_string.is_empty())
+			throw Exception(PARSER_RUNTIME,
+				0,
+				"parameter is empty string, error converting");
+		
+		try {
+			converted=self_string.as_bool();
+		} catch(...) {
+			const String& lower_string=self_string.change_case(r.charsets.source(), String::CC_LOWER);
+			if(lower_string == "true"){
+				converted=true;
+			} else if (lower_string == "false"){
+				converted=false;
+			} else {
+				rethrow;
+			}
+		}
+	} catch(...) { // convert problem
+		if(params.count()>0)
+			converted=params.as_bool(0, "default must be bool", r); // (default)
+		else
+			rethrow; // we have a problem when no default
+	}
+
+	r.write_no_lang(*new VBool(converted));
 }
 
-/// ^string.format{format}
-/*not static*/void _string_format(Request& r, const String& method_name, Array *params) {
-	Pool& pool=r.pool();
+/*not static*/void _string_format(Request& r, MethodParams& params) {
 
-	Value& fmt=*static_cast<Value *>(params->get(0));
-	// forcing {this param type}
-	r.fail_if_junction_(false, fmt, method_name, "fmt must be junction");
+	Value& fmt_maybe_code=params[0];
+	// for some time due to stupid {} in original design
+	const String& fmt=r.process_to_string(fmt_maybe_code);
 
-	Temp_lang temp_lang(r, String::UL_PASS_APPENDED);
-	char *buf=format(pool, r.self->as_double(), r.process(fmt).as_string().cstr());
-	
-	r.write_no_lang(String(pool, buf));
+	const char* buf=format(r.get_self().as_double(), fmt.trim().cstrm());
+
+	r.write_no_lang(String(buf));
 }
 
-static void _left(Request& r, const String&, Array *params) {
-	Pool& pool=r.pool();
+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,
+			0, 
+			"n(%d) must be >=0", sn);
+	size_t n=(size_t)sn;
 
-	size_t n=(size_t)r.process(*static_cast<Value *>(params->get(0))).as_double();
-	
-	const String& string=*static_cast<VString *>(r.self)->get_string();
-	r.write_assign_lang(*new(pool) VString(string.piece(0, n)));
+	const String& string=GET_SELF(r, VString).string();
+	r.write_assign_lang(string.mid(0, n));
 }
 
-static void _right(Request& r, const String&, Array *params) {
-	Pool& pool=r.pool();
+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,
+			0, 
+			"n(%d) must be >=0", sn);
+	size_t n=(size_t)sn;
 
-	size_t n=(size_t)r.process(*static_cast<Value *>(params->get(0))).as_double();
-	
-	const String& string=*static_cast<VString *>(r.self)->get_string();
-	r.write_assign_lang(*new(pool) VString(string.piece(string.size()-n, string.size())));
+	const String& string=GET_SELF(r, VString).string();
+	size_t length=string.length();
+	r.write_assign_lang(n<length?string.mid(length-n, string.length()):string);
 }
 
-static void _mid(Request& r, const String&, Array *params) {
-	Pool& pool=r.pool();
+static void _mid(Request& r, MethodParams& params) {
+	const String& string=GET_SELF(r, VString).string();
+
+	ssize_t sbegin=params.as_int(0, "p must be int", r);
+	if(sbegin<0)
+		throw Exception(PARSER_RUNTIME,
+			0, 
+			"p(%d) must be >=0", sbegin);
+	size_t begin=(size_t)sbegin;
 
-	size_t p=(size_t)r.process(*static_cast<Value *>(params->get(0))).as_double();
-	size_t n=(size_t)r.process(*static_cast<Value *>(params->get(1))).as_double();
+	size_t end;
+	if(params.count()>1) {
+		ssize_t sn=params.as_int(1, "n must be int", r);
+		if(sn<0)
+			throw Exception(PARSER_RUNTIME,
+				0, 
+				"n(%d) must be >=0", sn);
+		end=begin+(size_t)sn;
+	} else 
+		end=string.length();
 	
-	const String& string=*static_cast<VString *>(r.self)->get_string();
-	r.write_assign_lang(*new(pool) VString(string.piece(p, p+n)));
+	r.write_assign_lang(string.mid(begin, end));
 }
 
-static void _pos(Request& r, const String& method_name, Array *params) {
-	Pool& pool=r.pool();
-
-	Value& substr=*static_cast<Value *>(params->get(0));
-	// forcing [this param type]
-	r.fail_if_junction_(true, substr, method_name, "substr must not be junction");
+static void _pos(Request& r, MethodParams& params) {
+	Value& substr=params.as_no_junction(0, "substr must not be code");
 	
-	const String& string=*static_cast<VString *>(r.self)->get_string();
-	r.write_assign_lang(*new(pool) VInt(pool, string.pos(substr.as_string())));
+	const String& string=GET_SELF(r, VString).string();
+	r.write_assign_lang(*new VInt((int)string.pos(substr.as_string())));
 }
 
-static void split_list(Request& r, const String& method_name, Array *params,
-					   const String& string, 
-					   Array& result) {
-	Pool& pool=r.pool();
-
-	Value& delim_value=*static_cast<Value *>(params->get(0));
-	// forcing [this param type]
-	r.fail_if_junction_(true, delim_value, method_name, "delimiter must not be junction");
+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");
+
+	size_t pos_after=0;
+	string.split(result, pos_after, delim_value.as_string());
+}
+
+#define SPLIT_LEFT 0x0001
+#define SPLIT_RIGHT 0x0010
+#define SPLIT_HORIZONTAL 0x0100
+#define SPLIT_VERTICAL 0x1000
+
+static int split_options(const String* options) {
+    struct Split_option {
+		const char* keyL;
+		const char* keyU;
+		int setBit;
+		int checkBit;
+    } split_option[]={
+		{"l", "L", SPLIT_LEFT, SPLIT_RIGHT}, // 0xVHRL
+		{"r", "R", SPLIT_RIGHT, SPLIT_LEFT},
+		{"h", "H", SPLIT_HORIZONTAL, SPLIT_VERTICAL},
+		{"v", "V", SPLIT_VERTICAL, SPLIT_HORIZONTAL},
+		{0, 0, 0, 0}
+    };
+
+	int result=0;
+	if(options) {
+		for(Split_option *o=split_option; o->keyL; 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,
+						options,
+						"conflicting split options");
+				result |= o->setBit;
+			}
+	}
 
-	string.split(result, 0, delim_value.as_string(), String::UL_CLEAN, -1);
+	return result;
 }
 
-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();
+static Table& split_vertical(ArrayString& pieces, bool right, const String* column_name) {
+	Table::columns_type columns(new ArrayString);
+	*columns+=column_name;
+
+	Table& table=*new Table(columns, pieces.count());
+	if(right) { // right
+		for(int i=pieces.count(); --i>=0; ) {
+			Table::element_type row(new ArrayString);
+			*row+=pieces[i];
+			table+=row;
+		}
+	} else { // left
+		Array_iterator<const String*> i(pieces);
+		while(i.has_next()) {
+			Table::element_type row(new ArrayString);
+			*row+=i.next();
+			table+=row;
+		}
+	}
 
-	Array& row=*new(pool) Array(pool);
-	split_list(r, method_name, params, string, row);
+	return table;
+}
 
-	Table& table=*new(pool) Table(pool, &string, 
-		0/*nameless*/, 1/*row preallocate(and only)*/);
-	table+=&row;
+static Table& split_horizontal(ArrayString& pieces, bool right) {
+	Table& table=*new Table(Table::columns_type(0) /* nameless */);
+	Table::element_type row(new ArrayString(pieces.count()));
+	if(right) { // right
+		for(int i=pieces.count(); --i>=0; )
+			*row+=pieces[i];
+	} else { // left
+		for(Array_iterator<const String*> i(pieces); i.has_next(); )
+			*row+=i.next();
+	}
+	table+=row;
 
-	r.write_no_lang(*new(pool) VTable(pool, &table));
+	return 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();
+static void split_with_options(Request& r, MethodParams& params,
+							   int bits) {
+	const String& string=GET_SELF(r, VString).string();
 
-	Array list(pool);
-	split_list(r, method_name, params, string, list);
+	ArrayString pieces;
+	split_list(params, 0, string, pieces);
 
-	Array& row=*new(pool) Array(pool);
-	for(int i=list.size(); --i>=0; )
-		row+=list.get(i);
+	if(!bits) {
+		const String* options=0;
+		if(params.count()>1)
+			options=&params.as_string(1, "options must not be code");
+		
+		bits=split_options(options);
+	}
+
+	bool right=(bits & SPLIT_RIGHT) != 0;
+	bool horizontal=(bits & SPLIT_HORIZONTAL) !=0;
+
+	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));
+}
+static void _split(Request& r, MethodParams& params) {
+	split_with_options(r, params, 0 /* maybe-determine from param #2 */);
+}
+static void _lsplit(Request& r, MethodParams& params) {
+	split_with_options(r, params, SPLIT_LEFT);
+}
+static void _rsplit(Request& r, MethodParams& params) {
+	split_with_options(r, params, SPLIT_RIGHT);
+}
+
+static void search_action(Table& table, Table::element_type row, int, int, int, int, void *) {
+	if(row)
+		table+=row;
+}
+
+#ifndef DOXYGEN
+struct Replace_action_info {
+	Request* request;  
+	const String* src;  String* dest;
+	VTable* vtable;
+	Value* replacement_code;
+};
+#endif
+/// @todo they can do $global[$result] there, getting pointer to later-invalid local var, kill this
+static void replace_action(Table& table, ArrayString* row, 
+			   int prestart, int prefinish, 
+			   int poststart, int postfinish,
+			   void *info) {
+	Replace_action_info& ai=*static_cast<Replace_action_info *>(info);
+	if(row) { // begin&middle
+		// piece from last match['prestart'] to beginning of this match['prefinish']
+		if(prestart!=prefinish)
+			*ai.dest << ai.src->mid(prestart, prefinish);//ai.dest->APPEND_CONST("-");
+		// store found parts in one-record VTable
+		if(table.count()) // middle
+			table.put(0, row);
+		else // begin
+			table+=row;
+		{ // execute 'replacement_code' in 'table' context
+			ai.vtable->set_table(table);
+
+			*ai.dest << ai.request->process_to_string(*ai.replacement_code);
+		}
+	} else // end
+		*ai.dest << ai.src->mid(poststart, postfinish);
+}
+
+/// @todo use pcre:study somehow
+static void _match(Request& r, MethodParams& params) {
+	Value& regexp=params.as_no_junction(0, "regexp must not be code");
+
+	const String* options=
+		params.count()>1?
+		&params.as_no_junction(1, "options must not be code").as_string():0;
+
+	Temp_lang temp_lang(r, String::L_PASS_APPENDED);
+	const String& src=GET_SELF(r, VString).string();
+	int matches_count=0;
+	if(params.count()<3) { // search
+		Table* table=src.match(r.charsets.source(),
+			regexp.as_string(), options,
+			search_action, 0,
+			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");
+
+		String result;
+		VTable* vtable=new VTable;
+		Replace_action_info info={
+			&r,
+			&src,
+			&result,
+			vtable,
+			&replacement_code
+		};
+		Temp_value_element temp_match_var(
+			*replacement_code.get_junction()->method_frame, 
+			match_var_name, vtable);
+		src.match(r.charsets.source(),
+			r.process_to_string(regexp), options,
+			replace_action, &info,
+			matches_count);
+		r.write_assign_lang(result);
+	}
+}
+
+static void change_case(Request& r, MethodParams&, 
+						String::Change_case_kind kind) {
+	const String& src=GET_SELF(r, VString).string();
+
+	r.write_assign_lang(src.change_case(r.charsets.source(), kind));
+}
+static void _upper(Request& r, MethodParams& params) {
+	change_case(r, params, String::CC_UPPER);
+}
+static void _lower(Request& r, MethodParams& params) {
+	change_case(r, params, String::CC_LOWER);
+}
+
+#ifndef DOXYGEN
+class String_sql_event_handlers: public SQL_Driver_query_event_handlers {
+	const String& statement_string; const char* statement_cstr;
+	bool got_column;
+public:
+	bool got_cell;
+	String& result;
+public:
+	String_sql_event_handlers(
+		const String& astatement_string, const char* astatement_cstr):
+		statement_string(astatement_string), statement_cstr(astatement_cstr),
+		got_column(false),
+		got_cell(false),
+		result(*new String) {}
+
+	bool add_column(SQL_Error& error, const char* /*str*/, size_t /*length*/) {
+		if(got_column) {
+			error=SQL_Error(PARSER_RUNTIME,
+				//statement_string,
+				"result must contain exactly one column");
+			return true;
+		}
+		got_column=true;
+		return false;
+	}
+	bool before_rows(SQL_Error& /*error*/ ) { /* ignore */ return false; }
+	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,
+				//statement_string,
+				"result must not contain more then one row");
+			return true;
+		}
+
+		try {
+			got_cell=true;
+			result.append_know_length(str, length, String::L_TAINTED);
+			return false;
+		} catch(...) {
+			error=SQL_Error("exception occured in String_sql_event_handlers::add_row_cell");
+			return true;
+		}
+	}
+};
+#endif
+extern String sql_bind_name;
+extern String sql_limit_name;
+extern String sql_offset_name;
+extern String sql_default_name;
+extern String sql_distinct_name;
+extern int marshal_binds(HashStringValue& hash, SQL_Driver::Placeholder*& placeholders);
+extern void unmarshal_bind_updates(HashStringValue& hash, int placeholder_count, SQL_Driver::Placeholder* placeholders);
+
+const String* sql_result_string(Request& r, MethodParams& params,
+				HashStringValue*& options, Value*& default_code) {
+	Value& statement=params.as_junction(0, "statement must be code");
+
+	HashStringValue* bind=0;
+	ulong limit=SQL_NO_LIMIT;
+	ulong offset=0;
+	default_code=0;
+	if(params.count()>1) {
+		Value& voptions=params.as_no_junction(1, "options must be hash, not code");
+		if(voptions.is_defined() && !voptions.is_string())
+			if((options=voptions.get_hash())) {
+				int valid_options=0;
+				if(Value* vbind=options->get(sql_bind_name)) {
+					valid_options++;
+					bind=vbind->get_hash();
+				}
+				if(Value* vlimit=options->get(sql_limit_name)) {
+					valid_options++;
+					limit=(ulong)r.process_to_value(*vlimit).as_double();
+				}
+				if(Value* voffset=options->get(sql_offset_name)) {
+					valid_options++;
+					offset=(ulong)r.process_to_value(*voffset).as_double();
+				}
+				if((default_code=options->get(sql_default_name))) {
+					valid_options++;
+				}
+				if(valid_options!=options->count())
+					throw Exception(PARSER_RUNTIME,
+						0,
+						"called with invalid option");
+			} else
+				throw Exception(PARSER_RUNTIME,
+					0,
+					"options must be hash");
+	} else
+		options=0;
+
+	SQL_Driver::Placeholder* placeholders=0;
+	uint placeholders_count=0;
+	if(bind)
+		placeholders_count=marshal_binds(*bind, placeholders);
+
+	Temp_lang temp_lang(r, String::L_SQL);
+	const String& statement_string=r.process_to_string(statement);
+	const char* statement_cstr=
+		statement_string.cstr(String::L_UNSPECIFIED, r.connection());
+	String_sql_event_handlers handlers(statement_string, statement_cstr);
+
+	r.connection()->query(
+		statement_cstr, 
+		placeholders_count, placeholders,
+		offset, limit, 
+		handlers,
+		statement_string);
+	
+	if(bind)
+		unmarshal_bind_updates(*bind, placeholders_count, placeholders);
 
-	Table& table=*new(pool) Table(pool, &string, 
-		0/*nameless*/, 1/*row preallocate(and only)*/);
-	table+=&row;
+	if(!handlers.got_cell)
+		return 0; // no lines, caller should return second param[default value]
 
-	r.write_no_lang(*new(pool) VTable(pool, &table));
+	return &handlers.result;
 }
 
-/// ^string.match{regexp}[options]
-static void _match(Request& r, const String& method_name, Array *params) {
-	Pool& pool=r.pool();
-	const String& string=*static_cast<VString *>(r.self)->get_string();
+static void _sql(Request& r, MethodParams& params) {
+
+	HashStringValue* options;
+	Value* default_code;
+	const String* string=sql_result_string(r, params, options, default_code);
+	if(!string) {
+		if(default_code) {
+			string=&r.process_to_string(*default_code);
+		} else
+			throw Exception(PARSER_RUNTIME,
+				0,
+				"produced no result, but no default option specified");
+	}
+
+	r.write_assign_lang(*string);
+}
 
-	Value& regexp=*static_cast<Value *>(params->get(0));
-	// forcing {this param type}
-	r.fail_if_junction_(false, regexp, method_name, "regexp must be junction");
+static void _replace(Request& r, MethodParams& params) {
+	const String& src=GET_SELF(r, VString).string();
 
-	const String *options=0;
-	if(params->size()>1) {
-		Value& value=*static_cast<Value *>(params->get(1));
-		// forcing {this param type}
-		r.fail_if_junction_(true, value, method_name, "options must not be junction");
-		options=&value.as_string();
+	Table* table=params.as_no_junction(0, PARAM_MUST_NOT_BE_CODE).get_table();
+	if(!table)
+		throw Exception(PARSER_RUNTIME,
+			0,
+			"parameter must be table");
+
+	Dictionary dict(*table);
+	r.write_assign_lang(src.replace(dict));
+}
+
+static void _save(Request& r, MethodParams& params) {
+	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) {
+		const String& mode=params.as_string(0, "mode must be string");
+		if(mode=="append")
+			do_append=true;
+		else
+			throw Exception(PARSER_RUNTIME,
+				&mode,
+				"unknown mode, must be 'append'");
+	}		
+
+	// write
+	const char* buf=src.cstr(String::L_UNSPECIFIED, r.connection(false/*no error if none*/));
+	file_write(r.absolute(file_name), 
+		buf, strlen(buf), true, do_append);
+}
+
+static void _normalize(Request& r, MethodParams&) {
+	const String& src=GET_SELF(r, VString).string();
+
+	r.write_assign_lang(src);
+}
+
+static void _trim(Request& r, MethodParams& params) {
+	const String& src=GET_SELF(r, VString).string();
+
+	String::Trim_kind kind=String::TRIM_BOTH;
+	const char* chars=0;
+	if(params.count()>0) {
+		const String& skind=params.as_string(0, 
+			"'where' must be string");
+		if(skind.length())
+			if(skind==TRIM_START_OPTION)
+				kind=String::TRIM_START;
+			else if(skind==TRIM_END_OPTION)
+				kind=String::TRIM_END;
+			else if(skind==TRIM_BOTH_OPTION)
+				kind=String::TRIM_BOTH;
+			else
+				throw Exception(PARSER_RUNTIME,
+					&skind,
+					"'kind' must be one of "TRIM_START_OPTION", "TRIM_BOTH_OPTION", "TRIM_END_OPTION);
+
+		if(params.count()>1) {
+			const String& schars=params.as_string(1, "'chars' must be string");
+			if(schars.length())
+				chars=schars.cstr();
+		}
 	}
 
-	Temp_lang temp_lang(r, String::UL_PASS_APPENDED);
-	Table *table;
-	Value *result;
-	if(string.match(&method_name, 
-		r.process(regexp).as_string(), options,
-		&table)) {
-		// matched
-		if(table->columns()->size()==3 && // just matched[3=pre/match/post], no substrings
-			table->size()==1)  // just one row, not Global search
-			result=new(pool) VBool(pool, true);
-		else // table of match column+substring columns
-			result=new(pool) VTable(pool, table);
-	} else // not global & not matched
-		result=new(pool) VBool(pool, false);
+	r.write_assign_lang(src.trim(kind, chars));
+}
 
-	result->set_name(method_name);
-	r.write_no_lang(*result);
+static void _append(Request& r, MethodParams& params) {
+	// 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);
+	String& c=*new String(a);
+	c.append(b, String::L_PASS_APPENDED);
+	va.set_string(c);
+}
+
+static void _base64(Request& r, MethodParams& params) {
+	if(params.count()) {
+		// decode
+		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);
+		if(decoded_cstr && decoded_size)
+			r.write_assign_lang(*new String(decoded_cstr, decoded_size, true));
+	} else {
+		// encode 
+		VString& self=GET_SELF(r, VString);
+		const char* cstr=self.string().cstr();
+		const char* encoded=pa_base64_encode(cstr, strlen(cstr));
+		r.write_assign_lang(*new String(encoded, 0, true/*once ?param=base64(something) was needed*/));
+	}
 }
 
-// initialize
+// constructor
 
-void initialize_string_class(Pool& pool, VStateless_class& vclass) {
+MString::MString(): Methoded("string") {
 	// ^string.length[]
-	vclass.add_native_method("length", Method::CT_DYNAMIC, _length, 0, 0);
+	add_native_method("length", Method::CT_DYNAMIC, _length, 0, 0);
 	
 	// ^string.int[]
-	vclass.add_native_method("int", Method::CT_DYNAMIC, _int, 0, 0);
-	
+	// ^string.int(default)
+	add_native_method("int", Method::CT_DYNAMIC, _int, 0, 1);
 	// ^string.double[]
-	vclass.add_native_method("double", Method::CT_DYNAMIC, _double, 0, 0);
+	// ^string.double(default)
+	add_native_method("double", Method::CT_DYNAMIC, _double, 0, 1);
+	// ^void.bool[]
+	// ^void.bool(default)
+	add_native_method("bool", Method::CT_DYNAMIC, _bool, 0, 1);
 
 	// ^string.format{format}
-	vclass.add_native_method("format", Method::CT_DYNAMIC, _string_format, 1, 1);
+	add_native_method("format", Method::CT_DYNAMIC, _string_format, 1, 1);
 
 	// ^string.left(n)
-	vclass.add_native_method("left", Method::CT_DYNAMIC, _left, 1, 1);
+	add_native_method("left", Method::CT_DYNAMIC, _left, 1, 1);
 	// ^string.right(n)
-	vclass.add_native_method("right", Method::CT_DYNAMIC, _right, 1, 1);
+	add_native_method("right", Method::CT_DYNAMIC, _right, 1, 1);
 	// ^string.mid(p;n)
-	vclass.add_native_method("mid", Method::CT_DYNAMIC, _mid, 2, 2);
+	add_native_method("mid", Method::CT_DYNAMIC, _mid, 1, 2);
 
 	// ^string.pos[substr]
-	vclass.add_native_method("pos", Method::CT_DYNAMIC, _pos, 1, 1);
+	add_native_method("pos", Method::CT_DYNAMIC, _pos, 1, 1);
 
-	// ^string.lsplit[delim]
-	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);
+	// ^string.split[delim]
+	// ^string.split[delim][options]
+	// ^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);
+		// ^string.rsplit[delim]
+		add_native_method("rsplit", Method::CT_DYNAMIC, _rsplit, 1, 1);
+	
+	// ^string.match[regexp][options]
+	// ^string.match[regexp][options]{replacement-code}
+	add_native_method("match", Method::CT_DYNAMIC, _match, 1, 3);
 
-	// ^string.match{regexp}[options]
-	vclass.add_native_method("match", Method::CT_DYNAMIC, _match, 1, 2);
-}	
+	// ^string.toupper[]
+	add_native_method("upper", Method::CT_DYNAMIC, _upper, 0, 0);
+	// ^string.tolower[]
+	add_native_method("lower", Method::CT_DYNAMIC, _lower, 0, 0);
+
+	// ^sql[query]
+	// ^sql[query][options hash]
+	add_native_method("sql", Method::CT_STATIC, _sql, 1, 2);
 
+	// ^string.replace[table]
+	add_native_method("replace", Method::CT_DYNAMIC, _replace, 1, 1);
+
+	// ^string.save[file]  
+	add_native_method("save", Method::CT_DYNAMIC, _save, 1, 2);
+
+	// ^string.normalize[]  
+	add_native_method("normalize", Method::CT_DYNAMIC, _normalize, 0, 0);
+
+	// ^string.trim[[start|both|end][;chars]]
+	add_native_method("trim", Method::CT_DYNAMIC, _trim, 0, 2);
+
+	// ^string.append[string]
+	add_native_method("append", Method::CT_DYNAMIC, _append, 1, 1);
+
+	// ^string.base64[] << encode
+	// ^string:base64[encoded string] << decode	
+	add_native_method("base64", Method::CT_ANY, _base64, 0, 1);
+}