--- parser3/src/classes/table.C	2005/11/18 11:04:37	1.216
+++ parser3/src/classes/table.C	2016/09/21 15:14:39	1.331
@@ -1,43 +1,42 @@
 /** @file
 	Parser: @b table parser class.
 
-	Copyright (c) 2001-2005 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001-2015 Art. Lebedev Studio (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
-static const char * const IDENT_TABLE_C="$Date: 2005/11/18 11:04:37 $";
 
 #include "classes.h"
 #include "pa_vmethod_frame.h"
 
 #include "pa_common.h"
 #include "pa_request.h"
+#include "pa_charsets.h"
 #include "pa_vtable.h"
 #include "pa_vint.h"
 #include "pa_sql_connection.h"
 #include "pa_vbool.h"
+#include "pa_array.h"
+
+#if (!defined(NO_STRINGSTREAM) && !defined(FREEBSD4))
+#include <sstream>
+#define USE_STRINGSTREAM
+#endif
+
+volatile const char * IDENT_TABLE_C="$Id: table.C,v 1.331 2016/09/21 15:14:39 moko Exp $";
 
 // class
 
 class MTable: public Methoded {
 public: // VStateless_class
-	Value* create_new_value(Pool&, HashStringValue&) { return new VTable(); }
-
+	Value* create_new_value(Pool&) { return new VTable(); }
 public:
 	MTable();
-
-public: // Methoded
-	bool used_directly() { return true; }
 };
 
 // global variable
 
-DECLARE_CLASS_VAR(table, new MTable, 0);
-
-// defines for globals
+DECLARE_CLASS_VAR(table, new MTable);
 
-#define SQL_BIND_NAME "bind"
-#define SQL_DEFAULT_NAME "default"
-#define SQL_DISTINCT_NAME "distinct"
 #define TABLE_REVERSE_NAME "reverse"
 
 // globals
@@ -47,30 +46,17 @@ String sql_limit_name(PA_SQL_LIMIT_NAME)
 String sql_offset_name(PA_SQL_OFFSET_NAME);
 String sql_default_name(SQL_DEFAULT_NAME);
 String sql_distinct_name(SQL_DISTINCT_NAME);
+String sql_value_type_name(SQL_VALUE_TYPE_NAME);
 String table_reverse_name(TABLE_REVERSE_NAME);
 
 // methods
 
-static Table::Action_options get_action_options(Request& r, MethodParams& params, 
-						const Table& source) {
+static Table::Action_options get_action_options(Request& r, MethodParams& params, size_t options_index, const Table& source) {
 	Table::Action_options result;
-	if(!params.count())
+	if(params.count() <= options_index)
 		return result;
 
-	Value& maybe_options=params.last();
-/* can not do it: 
-	want to enable ^table::create[$source;
-#		$.option[]
-	]
-	but there is ^table.locate[name;value]
-
-	...if(voptions.is_defined() && !voptions.is_string()))
-	if(maybe_options.is_string()) { // allow empty options
-		result.defined=true;
-		return result;
-	}
-*/
-	HashStringValue* options=maybe_options.get_hash();
+	HashStringValue* options=params.as_hash(options_index);
 	if(!options)
 		return result;
 
@@ -86,9 +72,7 @@ static Table::Action_options get_action_
 			if(soffset == "cur")
 				result.offset=source.current();
 			else
-				throw Exception("parser.runtime",
-					&soffset,
-					"must be 'cur' string or expression");
+				throw Exception(PARSER_RUNTIME, &soffset, "must be 'cur' string or expression");
 		} else 
 			result.offset=r.process_to_value(*voffset).as_int();
 	}
@@ -104,75 +88,232 @@ static Table::Action_options get_action_
 	} 
 
 	if(valid_options!=options->count())
-		throw Exception("parser.runtime",
-			0,
-			"called with invalid option");
+		throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION);
 
 	return result;
 }
-static void check_option_param(bool options_defined, 
-			  MethodParams& params, size_t next_param_index,
-			  const char *msg) {
-	if(next_param_index+(options_defined?1:0) != params.count())
-		throw Exception("parser.runtime",
-			0,
-			"%s", msg);
+
+struct TableControlChars {
+	char separator;  const String* sseparator;
+	char encloser; const String* sencloser;
+
+	char separators[3];
+
+	TableControlChars():
+		separator('\t'), sseparator(new String("\t")),
+		encloser(0), sencloser(0)
+	{
+		strcpy(separators,"\t\n");
+	}
+
+	int load( HashStringValue& options ) {
+		int result=0;
+		if(Value* vseparator=options.get(PA_COLUMN_SEPARATOR_NAME)) {
+			sseparator=&vseparator->as_string();
+			if(sseparator->length()!=1)
+				throw Exception(PARSER_RUNTIME, sseparator, "separator must be one byte character");
+			separator=sseparator->first_char();
+			separators[0]=separator;
+			result++;
+		}
+		if(Value* vencloser=options.get(PA_COLUMN_ENCLOSER_NAME)) {
+			sencloser=&vencloser->as_string();
+			if(sencloser->is_empty()){
+				encloser=0;
+			} else {
+				if(sencloser->length()!=1)
+					throw Exception(PARSER_RUNTIME, sencloser, "encloser must be empty or one byte character");
+				encloser=sencloser->first_char();
+			}
+			result++;
+		}
+		return result;
+	}
+};
+
+
+struct lsplit_sresult {
+	String* piece;
+	char delim;
+
+	lsplit_sresult() : piece(0), delim(0){}
+
+	operator bool() { return piece!=0; }
+
+	void append(String *str){
+		if(piece)
+			*piece << *str;
+		else
+			piece = str;
+	}
+};
+
+class StringSplitHelper : public String {
+public:
+	char* base;
+
+	StringSplitHelper(String astring) : String(astring), base(cstrm()) {}
+
+	bool check_lang(const char *pos){
+		return langs.check_lang(L_AS_IS, pos-base, 1);
+	}
+
+	String *extract(char *pos){
+		String *result=new String;
+		if(size_t len=strlen(pos)){
+			// first: their langs
+			result->langs.append(result->body, langs, pos-base, len);
+			// next: letters themselves
+			result->body=Body(pos);
+		}
+		return result;
+	}
+};
+
+inline lsplit_sresult lsplit(char* *string_ref, const char* delims, StringSplitHelper& helper) {
+	lsplit_sresult result;
+	if(char *pos=*string_ref) {
+		while(pos=strpbrk(pos, delims)) {
+			if(helper.check_lang(pos)){
+				result.delim=*pos;
+				*pos=0;
+				result.piece=helper.extract(*string_ref);
+				*string_ref=pos+1;
+				return result;
+			}
+			pos++;
+		}
+		result.piece=helper.extract(*string_ref);
+		*string_ref=0;
+	}
+	return result;
+}
+
+static lsplit_sresult lsplit(char** string_ref, const char* delims, char encloser, StringSplitHelper& helper) {
+	lsplit_sresult result;
+
+	if(char *pos=*string_ref) {
+		if(encloser && *pos==encloser && helper.check_lang(pos)) {
+			*string_ref=++pos;
+
+			// we are enclosed, searching for second encloser
+			while(1) {
+				if(pos=strchr(pos, encloser)){
+					if(helper.check_lang(pos)){
+						*(pos++)=0;
+						result.append(helper.extract(*string_ref));
+						if(*pos==encloser && helper.check_lang(pos)){ // double-encloser stands for encloser
+							*string_ref=pos++;
+						} else {
+							*string_ref=pos;
+							break;
+						}
+					}
+				} else {
+					result.append(helper.extract(*string_ref));
+					*string_ref=0;
+					return result;
+				}
+			}
+
+			// we are no longer enclosed, searching for delimiter
+			while(pos=strpbrk(pos, delims)) {
+				if(helper.check_lang(pos)){
+					result.delim=*pos;
+					if(pos>*string_ref){
+						*pos=0;
+						result.append(helper.extract(*string_ref));
+					}
+					*string_ref=pos+1;
+					return result;
+				}
+				pos++;
+			}
+			result.append(helper.extract(*string_ref));
+			*string_ref=0;
+		} else
+			return lsplit(string_ref, delims, helper);
+	}
+	return result;
+}
+
+static void skip_clean_empty_lines(char** data_ref, StringSplitHelper& helper) {
+	if(*data_ref) {
+		while(**data_ref == '\n' && helper.check_lang(*data_ref))
+			(*data_ref)++;
+	}
 }
 
 static void _create(Request& r, MethodParams& params) {
 	// clone/copy part?
 	if(Table *source=params[0].get_table()) {
-		Table::Action_options o=get_action_options(r, params, *source);
-		check_option_param(o.defined, params, 1, 
-			"too many parameters");
+		Table::Action_options o=get_action_options(r, params, 1, *source);
+		if(params.count()>2)
+			throw Exception(PARSER_RUNTIME, 0, "too many parameters");
 		GET_SELF(r, VTable).set_table(*new Table(*source, o));
 		return;
 	}
 
-	// data is last parameter
+	size_t data_param_index=0;
+	bool nameless=false;
+
+	if(params.count()>1) {
+		if(params[0].is_string()){ // can be nameless only
+			const String& snameless=params.as_string(0, "called with more then 1 param, first param may be only string 'nameless' or junction");
+			if(snameless!="nameless")
+				throw Exception(PARSER_RUNTIME, &snameless, "table::create called with more then 1 param, first param may be only 'nameless'");
+			nameless=true;
+			data_param_index++;
+		}
+	}
+
+	HashStringValue *options=0;
+	TableControlChars control_chars;
+
+	size_t options_param_index=data_param_index+1;
+	if( options_param_index<params.count() && (options=params.as_hash(options_param_index)) ) {
+		if(control_chars.load(*options)!=options->count())
+			throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION);
+	}
+
+	// data
 	Temp_lang temp_lang(r, String::L_PASS_APPENDED);
-	const String&  data=
-		r.process_to_string(params.as_junction(params.count()-1, "body must be code"));
+	StringSplitHelper sdata(r.process_to_string(params.as_junction(data_param_index, "body must be table or code")));
+	char *data=sdata.base;
 
 	// parse columns
-	size_t raw_pos_after=0;
 	Table::columns_type columns;
-	if(params.count()==2) {
-		const String& snameless=params.as_string(0, "called with two params, first param may only be string 'nameless'");
-		if(snameless!="nameless")
-			throw Exception("parser.runtime",
-				&snameless,
-				"table::create called with two params, first param may only be 'nameless'");
-		columns=Table::columns_type(0); // nameless
+	if(nameless) {
+		columns=0; // nameless
 	} else {
-		columns=Table::columns_type(new ArrayString);
-
-		ArrayString head;
-		data.split(head, raw_pos_after, "\n", String::L_AS_IS, 1);
-		if(head.count()) {
-			size_t col_pos_after=0;
-			head[0]->split(*columns, col_pos_after, "\t", String::L_AS_IS);
+		columns=new ArrayString;
+		while( lsplit_sresult sr=lsplit(&data, control_chars.separators, control_chars.encloser, sdata) ) {
+			*columns+=sr.piece;
+			if(sr.delim=='\n') 
+				break;
 		}
 	}
-
+	
 	Table& table=*new Table(columns);
-	// parse cells
-
-	ArrayString rows;
-	data.split(rows, raw_pos_after, "\n", String::L_AS_IS);
-	Array_iterator<const String*> i(rows);
-	while(i.has_next()) {
-		Table::element_type row(new ArrayString);
-		const String&  string=*i.next();
-		// remove comment lines
-		if(!string.length())
-			continue;
+	int columns_count=columns ? columns->count(): 0;
 
-		size_t col_pos_after=0;
-		string.split(*row, col_pos_after, "\t", String::L_AS_IS);
-		table+=row;
+	// parse cells
+	Table::element_type row(new ArrayString(columns_count));
+	skip_clean_empty_lines(&data, sdata);
+	while( lsplit_sresult sr=lsplit(&data, control_chars.separators, control_chars.encloser, sdata) ) {
+		if(sr.piece->is_empty() && !sr.delim && !row->count()) // append last empty column [if without \n]
+			break;
+		*row+=sr.piece;
+		if(sr.delim=='\n') {
+			table+=row;
+			row=new ArrayString(columns_count);
+			skip_clean_empty_lines(&data, sdata);
+		}
 	}
-
+	// last line [if without \n]
+	if(row->count())
+		table+=row;
+	
 	// replace any previous table value
 	GET_SELF(r, VTable).set_table(table);
 }
@@ -181,118 +322,89 @@ struct lsplit_result {
 	char* piece;
 	char delim;
 
+	lsplit_result(char *apiece=0) : piece(apiece), delim(0){}
 	operator bool() { return piece!=0; }
 };
 
-inline lsplit_result lsplit(char* string, char delim1, char delim2) {
-	lsplit_result result;
-    if(string) {
-		char delims[]={delim1, delim2, 0};
-		if(char* v=strpbrk(string, delims)) {
+inline lsplit_result lsplit(char* *string_ref, const char* delims) {
+	lsplit_result result(*string_ref);
+	if(result.piece) {
+		if(char* v=strpbrk(result.piece, delims)) {
 			result.delim=*v;
 			*v=0;
-			result.piece=v+1;
+			*string_ref=v+1;
 			return result;
 		}
-    }
-	result.piece=0;
-	result.delim=0;
-    return result;
-}
-
-inline lsplit_result lsplit(char* *string_ref, char delim1, char delim2) {
-    lsplit_result result;
-	result.piece=*string_ref;
-	lsplit_result next=lsplit(*string_ref, delim1, delim2);
-	result.delim=next.delim;
-	*string_ref=next.piece;
-    return result;
-}
-
-static lsplit_result lsplit(char** string_ref, char delim1, char delim2, char encloser) {
-	lsplit_result result;
-
-    if(char* string=*string_ref) {
-		if(encloser && *string==encloser) {
-            string++;
+		*string_ref=0;
+	}
+	return result;
+}
+
+static lsplit_result lsplit(char** string_ref, const char* delims, char encloser) {
+	lsplit_result result(*string_ref);
+
+	if(result.piece) {
+		if(encloser && *result.piece==encloser) {
+			result.piece++;
 			
+			char c;
 			char *read;
 			char *write;
-			write=read=string;
-			char c;
-			while((c=*read++)) {
+			write=read=result.piece;
+
+			// we are enclosed, searching for second encloser
+			while(c=*read++) {
 				if(c==encloser) {
-					char n=*read;
-					if(n==encloser) // double-encloser stands for encloser
-						read++;
-					else if(n==delim1 || n==delim2) {
-						result.delim=n;
+					if(*read==encloser) // double-encloser stands for encloser
 						read++;
-						break;
-					}
+					else
+						break; // note: skipping encloser
 				}
-
 				*write++=c;
 			}
+
+			// we are no longer enclosed, searching for delimiter
+			while(c=*read++) {
+				if(c==delims[0] || c==delims[1]) {
+					result.delim=c;
+					break;
+				} else 
+					*write++=c;
+			}
+
 			*write=0; // terminate
-			*string_ref=c? read: 0;
-			result.piece=string;
+			*string_ref=c ? read : 0;
 			return result;
 		} else
-			return lsplit(string_ref, delim1, delim2);
-    }
-	result.piece=0;
-    return result;
+			return lsplit(string_ref, delims);
+	}
+	return result;
 }
 
 static void skip_empty_and_comment_lines( char** data_ref ) {
-	if(char *data=*data_ref) {
-		while( char c=*data ) {
-			if( c== '\n' || c == '#' ) {
-				/*nowhere=*/getrow(&data); // remove empty&comment lines
-				if(!(*data_ref=data))
-					break;
-				continue;
-			}
-			break;
+	while(*data_ref) {
+		if(**data_ref == '\n'){
+			(*data_ref)++;
+		} else {
+			if(**data_ref == '#' )
+				/*nowhere=*/getrow(data_ref);
+			else
+				break;
 		}
 	}
 }
 
-struct TableSeparators {
-	char column;  const String* scolumn;
-	char encloser; const String* sencloser;
-
-	TableSeparators():
-		column('\t'), scolumn(new String("\t", false)),
-		encloser(0), sencloser(0)
-	{}
-	int load( HashStringValue& options ) {
-		int result=0;
-		if(Value* vseparator=options.get(PA_COLUMN_SEPARATOR_NAME)) {
-			scolumn=&vseparator->as_string();
-			if(scolumn->length()!=1)
-				throw Exception("parser.runtime",
-					scolumn,
-					"separator must be one character long");
-			column=scolumn->first_char();
-			result++;
-		}
-		if(Value* vencloser=options.get(PA_COLUMN_ENCLOSER_NAME)) {
-			sencloser=&vencloser->as_string();
-			if(sencloser->length()!=1)
-				throw Exception("parser.runtime",
-					sencloser,
-					"encloser must be one character long");
-			encloser=sencloser->first_char();
-			result++;
-		}
-		return result;
+static void skip_empty_lines( char** data_ref ) {
+	if(*data_ref) {
+		while(**data_ref == '\n')
+			(*data_ref)++;
 	}
-};
+}
+
+typedef void (*Skip_lines_action)(char** data_ref);
 
 static void _load(Request& r, MethodParams& params) {
-	const String&  first_param=params.as_string(0, "file name must be string");
+	const String&  first_param=params.as_string(0, FILE_NAME_MUST_BE_STRING);
 	int filename_param_index=0;
 	bool nameless=first_param=="nameless";
 	if(nameless)
@@ -300,49 +412,48 @@ static void _load(Request& r, MethodPara
 	size_t options_param_index=filename_param_index+1;
 
 	HashStringValue *options=0;
-	TableSeparators separators;
+	TableControlChars control_chars;
 	if(options_param_index<params.count()
-		&& (options=params.as_no_junction(options_param_index, "additional params must be hash").get_hash())) {
+		&& (options=params.as_hash(options_param_index))) {
 		// cloning, so that we could change [to simplify checks on params inside file_read_text
 		options=new HashStringValue(*options);
-		separators.load(*options);
+		control_chars.load(*options);
 	}
 
 	// loading text
-	char *data=file_read_text(r.charsets,
-		r.absolute(params.as_string(filename_param_index, "file name must be string")),
-		true,
-		options
-	);
+	char *data=file_load_text(r, r.absolute(params.as_string(filename_param_index, FILE_NAME_MUST_BE_STRING)), true, options);
+
+	Skip_lines_action skip_lines_action = (control_chars.separator=='#' || control_chars.encloser=='#') ? skip_empty_lines : skip_empty_and_comment_lines;
 
 	// parse columns
 	Table::columns_type columns;
 	if(nameless) {
-		columns=Table::columns_type(0); // nameless
+		columns=0; // nameless
 	} else {
-		columns=Table::columns_type(new ArrayString);
+		columns=new ArrayString;
 
-		skip_empty_and_comment_lines(&data);
-		while( lsplit_result sr=lsplit(&data, separators.column, '\n', separators.encloser) ) {
-			*columns+=new String(sr.piece, 0, true);
+		skip_lines_action(&data);
+		while( lsplit_result sr=lsplit(&data, control_chars.separators, control_chars.encloser) ) {
+			*columns+=new String(sr.piece, String::L_TAINTED);
 			if(sr.delim=='\n') 
 				break;
 		}
 	}
 	
 	Table& table=*new Table(columns);
+	int columns_count=columns ? columns->count(): 0;
 
 	// parse cells
-	Table::element_type row(new ArrayString);
-	skip_empty_and_comment_lines(&data);
-	while( lsplit_result sr=lsplit(&data, separators.column, '\n', separators.encloser) ) {
+	Table::element_type row(new ArrayString(columns_count));
+	skip_lines_action(&data);
+	while( lsplit_result sr=lsplit(&data, control_chars.separators, control_chars.encloser) ) {
 		if(!*sr.piece && !sr.delim && !row->count()) // append last empty column [if without \n]
 			break;
-		*row+=new String(sr.piece, 0, true);
+		*row+=new String(sr.piece, String::L_TAINTED);
 		if(sr.delim=='\n') {
 			table+=row;
-			row=new ArrayString;
-			skip_empty_and_comment_lines(&data);
+			row=new ArrayString(columns_count);
+			skip_lines_action(&data);
 		}
 	}
 	// last line [if without \n]
@@ -353,28 +464,172 @@ static void _load(Request& r, MethodPara
 	GET_SELF(r, VTable).set_table(table);
 }
 
-static void maybe_enclose( String& to, const String& from, char encloser, const String* sencloser ) {
-	if(encloser) {
-		to<<*sencloser;
+#ifdef USE_STRINGSTREAM
+#include "gc_allocator.h"
+
+typedef std::basic_stringstream<char, std::char_traits<char>, gc_allocator<char> > pa_stringstream;
+typedef std::basic_string<char, std::char_traits<char>, gc_allocator<char> > pa_string;
+
+static void enclose( pa_stringstream& to, const String* from, char encloser ) {
+	if(from){
+		to<<encloser;
 		// while we have 'encloser'...
 		size_t pos_after=0;
-		for( size_t pos_before; (pos_before=from.pos( encloser, pos_after ))!=STRING_NOT_FOUND; pos_after=pos_before+1) {
-            to<<from.mid(pos_before+1/*+found encloser*/, pos_after-pos_before);
-			to<<*sencloser;  to<<*sencloser; // doubling encloser
+		for( size_t pos_before; (pos_before=from->pos( encloser, pos_after ))!=STRING_NOT_FOUND; pos_after=pos_before) {
+			pos_before++; // including first encloser (and skipping it for next pos)
+			to<<from->mid(pos_after, pos_before).cstr();
+			to<<encloser; // doubling encloser
 		}
 		// last piece
-		size_t from_length=from.length();
+		size_t from_length=from->length();
 		if(pos_after<from_length)
-			to<<from.mid(pos_after, from_length);
+			to<<from->mid(pos_after, from_length).cstr();
+		to<<encloser;
+	} else {
+		to<<encloser<<encloser;
+	}
+}
+
+static void table_to_csv(pa_stringstream& result, Table& table, TableControlChars& control_chars, bool output_column_names) {
+	if(output_column_names) {
+		if(table.columns()) { // named table
+			if(control_chars.encloser){
+				for(Array_iterator<const String*> i(*table.columns()); i.has_next(); ) {
+					enclose( result, i.next(), control_chars.encloser );
+					if(i.has_next())
+						result<<control_chars.separator;
+				}
+			} else {
+				for(Array_iterator<const String*> i(*table.columns()); i.has_next(); ) {
+					result<<i.next()->cstr();
+					if(i.has_next())
+						result<<control_chars.separator;
+				}
+			}
+		} else { // nameless table [we were asked to output column names]
+			if(int lsize=table.count()?table[0]->count():0)
+				for(int column=0; column<lsize; column++) {
+					if(control_chars.encloser) {
+						result<<control_chars.encloser<<column<<control_chars.encloser;
+					} else {
+						result<<column;
+					}
+					if(column<lsize-1){
+						result<<control_chars.separator;
+					}
+				}
+			else
+				result<<"empty nameless table";
+		}
+		result<<'\n';
+	}
+
+	// process data lines
+	Array_iterator<ArrayString*> i(table);
+	if(control_chars.encloser){
+		while(i.has_next()) {
+			for(Array_iterator<const String*> c(*i.next()); c.has_next(); ) {
+				enclose( result, c.next(), control_chars.encloser );
+				if(c.has_next())
+					result<<control_chars.separator;
+			}
+			result<<'\n';
+		}
+	} else {
+		while(i.has_next()) {
+			for(Array_iterator<const String*> c(*i.next()); c.has_next(); ) {
+				result<<c.next()->cstr();
+				if(c.has_next())
+					result<<control_chars.separator;
+			}
+			result<<'\n';
+		}
+	}
+}
 
+#else
+
+void enclose( String& to, const String* from, char encloser, const String* sencloser ) {
+	if(from){
 		to<<*sencloser;
-	} else
-		to<<from;
+		// while we have 'encloser'...
+		size_t pos_after=0;
+		for( size_t pos_before; (pos_before=from->pos( encloser, pos_after ))!=STRING_NOT_FOUND; pos_after=pos_before) {
+			pos_before++; // including first encloser (and skipping it for next pos)
+			to<<from->mid(pos_after, pos_before);
+			to<<*sencloser; // doubling encloser
+		}
+		// last piece
+		size_t from_length=from->length();
+		if(pos_after<from_length)
+			to<<from->mid(pos_after, from_length);
+		to<<*sencloser;
+	} else {
+		to<<*sencloser<<*sencloser;
+	}
 }
 
+static void table_to_csv(String& result, Table& table, TableControlChars& control_chars, bool output_column_names) {
+	if(output_column_names) {
+		if(table.columns()) { // named table
+			if(control_chars.encloser) {
+				for(Array_iterator<const String*> i(*table.columns()); i.has_next(); ) {
+					enclose( result, i.next(), control_chars.encloser, control_chars.sencloser );
+					if(i.has_next())
+						result<<*control_chars.sseparator;
+				}
+			} else {
+				for(Array_iterator<const String*> i(*table.columns()); i.has_next(); ) {
+					result<<*i.next();
+					if(i.has_next())
+						result<<*control_chars.sseparator;
+				}
+			}
+		} else { // nameless table [we were asked to output column names]
+			if(int lsize=table.count()?table[0]->count():0)
+				for(int column=0; column<lsize; column++) {
+					if(control_chars.encloser) {
+						result<<*control_chars.sencloser<<String::Body::Format(column)<<*control_chars.sencloser;
+					} else {
+						result<<String::Body::Format(column);
+					}
+					if(column<lsize-1){
+						result<<*control_chars.sseparator;
+					}
+				}
+			else
+				result.append_help_length("empty nameless table", 0, String::L_CLEAN);
+		}
+		result.append_know_length("\n", 1, String::L_CLEAN);
+	}
+
+	// data lines
+	Array_iterator<ArrayString*> i(table);
+	if(control_chars.encloser){
+		while(i.has_next()) {
+			for(Array_iterator<const String*> c(*i.next()); c.has_next(); ) {
+				enclose( result, c.next(), control_chars.encloser, control_chars.sencloser );
+				if(c.has_next())
+					result<<*control_chars.sseparator;
+			}
+			result.append_know_length("\n", 1, String::L_CLEAN);
+		}
+	} else {
+		while(i.has_next()) {
+			for(Array_iterator<const String*> c(*i.next()); c.has_next(); ) {
+				result<<*c.next();
+				if(c.has_next())
+					result<<*control_chars.sseparator;
+			}
+			result.append_know_length("\n", 1, String::L_CLEAN);
+		}
+	}
+}
+#endif // don't use stringstream
+
 
 static void _save(Request& r, MethodParams& params) {
-	const String& first_arg=params.as_string(0, "first argument must not be code");
+	const String& first_arg=params.as_string(0, FIRST_ARG_MUST_NOT_BE_CODE);
 	size_t param_index=1;
 
 	bool do_append=false;
@@ -388,70 +643,100 @@ static void _save(Request& r, MethodPara
 	else
 		--param_index;
 
-	const String& file_name=params.as_string(param_index++, "file name must not be code");
+	const String& file_name=params.as_string(param_index++, FILE_NAME_MUST_NOT_BE_CODE);
+	String file_spec=r.absolute(file_name);
 
-	TableSeparators separators;
-	if(param_index<params.count()) {
-		if(HashStringValue *options=params.as_no_junction(param_index++, "additional params must be hash").get_hash()) {
-			int valid_options=separators.load(*options);
+	if(do_append && file_exist(file_spec))
+		output_column_names=false;
+
+	TableControlChars control_chars;
+	if(param_index<params.count())
+		if(HashStringValue* options=params.as_hash(param_index++)) {
+			int valid_options=control_chars.load(*options);
 			if(valid_options!=options->count())
-				throw Exception("parser.runtime",
-					0,
-					"invalid option passed");
-		} else
-			throw Exception("parser.runtime",
-				0,
-				"additional params must be hash (did you spell mode parameter correctly?)");
-		
-	}
+				throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION);
+		}
+
 	if(param_index<params.count())
-		throw Exception("parser.runtime",
-			0,
-			"bad mode (must be nameless or append)");
+		throw Exception(PARSER_RUNTIME, 0, "bad mode (must be nameless or append)");
 
 	Table& table=GET_SELF(r, VTable).table();
 
+#ifdef USE_STRINGSTREAM
+	pa_stringstream ost(std::stringstream::out);
+
+	table_to_csv(ost, table, control_chars, output_column_names);
+
+	// write
+		pa_string data=ost.str();
+		const char* data_cstr=data.c_str();
+		file_write(r.charsets, file_spec, data_cstr, data.length(), true /* as text */, do_append);
+#else
 	String sdata;
-	if(output_column_names) {
-		if(table.columns()) { // named table
-			for(Array_iterator<const String*> i(*table.columns()); i.has_next(); ) {
-				maybe_enclose( sdata, *i.next(), separators.encloser, separators.sencloser );
-				if(i.has_next())
-					sdata<<*separators.scolumn;
-			}
-		} else { // nameless table [we were asked to output column names]
-			if(int lsize=table.count()?table[0]->count():0)
-				for(int column=0; column<lsize; column++) {
-					char *cindex_tab=new(PointerFreeGC) char[MAX_NUMBER];
-					sdata.append_know_length(cindex_tab, 
-						snprintf(cindex_tab, MAX_NUMBER, 
-							column<lsize-1?"%d%c":"%d", column, separators.column),
-							String::L_CLEAN);
-				}
-			else
-				sdata.append_help_length("empty nameless table", 0, String::L_CLEAN);
+
+	table_to_csv(sdata, table, control_chars, output_column_names);
+
+	// write
+		const char* data_cstr=sdata.cstr();
+	file_write(r.charsets, file_spec, data_cstr, sdata.length(), true /* as text */, do_append);
+		if(*data_cstr) // not empty (when empty it's not heap memory)
+			pa_free((void*)data_cstr); // not needed anymore
+#endif
+}
+
+static void _csv_string(Request& r, MethodParams& params) {
+	bool output_column_names=true;
+	size_t param_index=0;
+	if(params.count()>0 && params[0].is_string()) {
+		if(params.as_string(0, FIRST_ARG_MUST_NOT_BE_CODE)=="nameless") {
+			output_column_names=false;
+			param_index++;
+		} else {
+			throw Exception(PARSER_RUNTIME, 0, "bad mode (must be nameless)");
 		}
-		sdata.append_know_length("\n", 1, String::L_CLEAN);
 	}
 
-	// data lines
-	Array_iterator<ArrayString*> i(table);
-	while(i.has_next()) {
-		for(Array_iterator<const String*> c(*i.next()); c.has_next(); ) {
-			maybe_enclose( sdata, *c.next(), separators.encloser, separators.sencloser );
-			if(c.has_next())
-				sdata<<*separators.scolumn;
+	TableControlChars control_chars;
+	if(param_index<params.count())
+		if(HashStringValue* options=params.as_hash(param_index++)) {
+			int valid_options=control_chars.load(*options);
+			if(valid_options!=options->count())
+				throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION);
 		}
-		sdata.append_know_length("\n", 1, String::L_CLEAN);
-	}
 
-	// write
-	file_write(r.absolute(file_name), 
-		sdata.cstr(), sdata.length(), true, do_append);
+	Table& table=GET_SELF(r, VTable).table();
+
+#ifdef USE_STRINGSTREAM
+	pa_stringstream ost(std::stringstream::out);
+
+	table_to_csv(ost, table, control_chars, output_column_names);
+
+	r.write_no_lang(*new VString(*new String(pa_strdup(ost.str().c_str()), String::L_CLEAN)));
+#else
+	String sdata;
+
+	table_to_csv(sdata, table, control_chars, output_column_names);
+
+	r.write_no_lang(*new VString(*new String(sdata.cstr(), String::L_CLEAN)));
+#endif
 }
 
-static void _count(Request& r, MethodParams&) {
-	int result=GET_SELF(r, VTable).table().count();
+static void _count(Request& r, MethodParams& params) {
+	Table& table=GET_SELF(r, VTable).table();
+	size_t result=0;
+	if(params.count()) {
+		const String& param=params.as_string(0, PARAMETER_MUST_BE_STRING);
+		if(param == "columns")
+			result = table.columns() ? table.columns()->count() : table.max_cells();
+		else if(param == "cells")
+			result = table.count() ? table[table.current()]->count() : 0;
+		else if(param == "rows") // synonim for ^table.count[]
+			result = table.count();
+		else
+			throw Exception(PARSER_RUNTIME, &param, "parameter must be 'columns', 'cells' and 'rows' only");
+	} else
+		result = table.count();
+
 	r.write_no_lang(*new VInt(result));
 }
 
@@ -471,9 +756,7 @@ static void _offset(Request& r, MethodPa
 		    else if(whence=="set")
 				absolute=true;
 		    else
-				throw Exception("parser.runtime",
-					&whence,
-					"is invalid whence, valid are 'cur' or 'set'");
+				throw Exception(PARSER_RUNTIME, &whence, "is invalid whence, valid are 'cur' or 'set'");
 		}
 		
 		int offset=params.as_int(params.count()-1, "offset must be expression", r);
@@ -483,40 +766,62 @@ static void _offset(Request& r, MethodPa
 }
 
 static void _menu(Request& r, MethodParams& params) {
+	InCycle temp(r);
+
 	Value& body_code=params.as_junction(0, "body must be code");
 	
 	Value* delim_maybe_code=params.count()>1?&params[1]:0;
 
 	Table& table=GET_SELF(r, VTable).table();
-	bool need_delim=false;
-	int saved_current=table.current();
-	int size=table.count();
-	for(int row=0; row<size; row++) {
-		table.set_current(row);
-
-		StringOrValue sv_processed=r.process(body_code);
-		const String* s_processed=sv_processed.get_string();
-		if(delim_maybe_code && s_processed && s_processed->length()) { // delimiter set and we have body
-			if(need_delim) // need delim & iteration produced string?
-				r.write_pass_lang(r.process(*delim_maybe_code));
-			need_delim=true;
+	size_t saved_current=table.current();
+
+	if(delim_maybe_code) { // delimiter set
+		bool need_delim=false;
+		for(size_t row=0; row<table.count(); row++) {
+			table.set_current(row);
+
+			StringOrValue sv_processed=r.process(body_code);
+			Request::Skip lskip=r.get_skip(); r.set_skip(Request::SKIP_NOTHING);
+
+			const String* s_processed=sv_processed.get_string();
+			if(s_processed && !s_processed->is_empty()) { // we have body
+				if(need_delim) // need delim & iteration produced string?
+					r.write_pass_lang(r.process(*delim_maybe_code));
+				else
+					need_delim=true;
+			}
+
+			r.write_pass_lang(sv_processed);
+
+			if(lskip==Request::SKIP_BREAK)
+				break;
+		}
+	} else {
+		for(size_t row=0; row<table.count(); row++) {
+			table.set_current(row);
+ 
+			r.process_write(body_code);
+			Request::Skip lskip=r.get_skip(); r.set_skip(Request::SKIP_NOTHING);
+ 
+			if(lskip==Request::SKIP_BREAK)
+				break;
 		}
-		r.write_pass_lang(sv_processed);
 	}
 	table.set_current(saved_current);
 }
 
 #ifndef DOXYGEN
-enum Table2hash_distint { D_ILLEGAL, D_FIRST, D_TABLES };
 struct Row_info {
 	Request *r;
 	Table *table;
 	Value* key_code;
 	size_t key_field;
 	Array<int>* value_fields;
+	Value* value_code;
 	HashStringValue* hash;
 	Table2hash_distint distinct;
 	size_t row;
+	Table2hash_value_type value_type;
 };
 #endif
 static void table_row_to_hash(Table::element_type row, Row_info *info) {
@@ -525,134 +830,180 @@ static void table_row_to_hash(Table::ele
 		info->table->set_current(info->row++); // change context row
 		StringOrValue sv_processed=info->r->process(*info->key_code);
 		key=&sv_processed.as_string();
-	} else
+	} else {
 		key=info->key_field<row->count()?row->get(info->key_field):0;
+	}
 
 	if(!key)
 		return; // ignore rows without key [too-short-record_array if-indexed]
 		
-	switch(info->distinct) {
-	case D_ILLEGAL: case D_FIRST:
-		{
+	bool exist=false;
+	switch(info->value_type) {
+		case C_STRING: {
+			if(info->value_fields->count()){
+				size_t index=info->value_fields->get(0);
+				exist=info->hash->put_dont_replace(*key, (index < row->count()) ? new VString(*row->get(index)) : VString::empty());
+			} else {
+				exist=info->hash->put_dont_replace(*key, VString::empty());
+			}
+			break;
+		}
+		case C_HASH: {
 			VHash* vhash=new VHash;
 			HashStringValue& hash=vhash->hash();
 			for(Array_iterator<int> i(*info->value_fields); i.has_next(); ) {
 				size_t value_field=i.next();
 				if(value_field<row->count())
-					hash.put(
-						*info->table->columns()->get(value_field), 
-						new VString(*row->get(value_field)));
+					hash.put(*info->table->columns()->get(value_field), new VString(*row->get(value_field)));
 			}
 
-			if(info->hash->put_dont_replace(*key, vhash)) // put. existed?
-				if(info->distinct==D_ILLEGAL)
-					throw Exception("parser.runtime",
-						key,
-						"duplicate key");
-		}
-		break;
-	case D_TABLES:
-		{
-			VTable* vtable=(VTable*)info->hash->get(*key); // put. table existed?
+			exist=info->hash->put_dont_replace(*key, vhash);
+			break;
+		}
+		case C_TABLE: {
+			VTable* vtable=(VTable*)info->hash->get(*key); // table exist?
 			Table* table;
-			if(vtable) 
+			if(vtable) {
+				if(info->distinct==D_ILLEGAL) {
+					exist=true;
+					break;
+				}
 				table=vtable->get_table();
-			else {
+			} else {
 				// no? creating table of same structure as source
 				Table::Action_options table_options(0, 0);
 				table=new Table(*info->table, table_options/*no rows, just structure*/);
 				info->hash->put(*key, new VTable(table));
 			}
-			*table+=row;
+			Table::element_type row_copy(new ArrayString(row->count()));
+			row_copy->append(*row);
+			*table+=row_copy;
+			break;
+		}
+		case C_CODE: {
+			if(!info->key_code)
+				info->table->set_current(info->row++); // change context row
+			exist=info->hash->put_dont_replace(*key, &info->r->process(*info->value_code).as_value());
+			break;
 		}
-		break;
-	default:
-		throw Exception(0,
-			0,
-			"invalid distinct code (#%d)", info->distinct);
 	}
+	if(exist && info->distinct==D_ILLEGAL)
+		throw Exception(PARSER_RUNTIME, key, "duplicate key");
 }
+
+Table2hash_value_type get_value_type(Value& vvalue_type){
+	if(vvalue_type.is_string()) {
+		const String& svalue_type=*vvalue_type.get_string();
+		if(svalue_type == "table"){
+			return C_TABLE;
+		} else if (svalue_type == "string") {
+			return C_STRING;
+		} else if (svalue_type == "hash") {
+			return C_HASH;
+		} else {
+			throw Exception(PARSER_RUNTIME, &svalue_type, "must be 'hash', 'table' or 'string'");
+		}
+	} else {
+		throw Exception(PARSER_RUNTIME, 0, "'type' must be string");
+	}
+}
+
+static Table2hash_distint get_distinct(Value& vdistinct, Table2hash_value_type& value_type){
+	if(vdistinct.is_string()) {
+		const String& sdistinct=*vdistinct.get_string();
+		if(sdistinct!="tables")
+			throw Exception(PARSER_RUNTIME, &sdistinct, "must be 'tables' or true/false");
+		value_type=C_TABLE;
+		return D_FIRST;
+	}
+	return vdistinct.as_bool() ? D_FIRST : D_ILLEGAL;
+}
+
 static void _hash(Request& r, MethodParams& params) {
 	Table& self_table=GET_SELF(r, VTable).table();
 	VHash& result=*new VHash;
-	if(Table::columns_type columns=self_table.columns())
+	if(Table::columns_type columns=self_table.columns()){
 		if(columns->count()>0) {
 			Table2hash_distint distinct=D_ILLEGAL;
+			Table2hash_value_type value_type=C_HASH;
 			int param_index=params.count()-1;
 			if(param_index>0) {
-				if(HashStringValue* options=
-					params.as_no_junction(param_index, "param must not be code").get_hash()) {
+
+				if(params[1].get_junction())
+					value_type=C_CODE;
+
+				if(HashStringValue* options=params[param_index].get_hash()){ // can't use .as_hash because the 2nd param could be table so .as_hash throws an error
 					--param_index;
 					int valid_options=0;
-					if(Value* vdistinct_code=options->get(sql_distinct_name)) {
+					if(Value* vdistinct_code=options->get(sql_distinct_name)) { // $.distinct ?
+						valid_options++;
+						distinct=get_distinct(r.process_to_value(*vdistinct_code), value_type);
+					}
+					if(Value* vvalue_type_code=options->get(sql_value_type_name)) { // $.type ?
+						if(value_type==C_TABLE) // $.distinct[tables] already was specified
+							throw Exception(PARSER_RUNTIME, 0, "you can't specify $.distinct[tables] and $.type[] together");
+						if(value_type==C_CODE)
+							throw Exception(PARSER_RUNTIME, 0, "you can't specify $.type[] if value is code");
 						valid_options++;
-						Value& vdistinct_value=r.process_to_value(*vdistinct_code);
-						if(vdistinct_value.is_string()) {
-							const String& sdistinct=*vdistinct_value.get_string();
-							if(sdistinct=="tables")
-								distinct=D_TABLES;
-							else
-								throw Exception("parser.runtime",
-									&sdistinct,
-									"must be 'tables' or true/false");
-						} else
-							distinct=vdistinct_value.as_bool()?D_FIRST:D_ILLEGAL;
+						value_type=get_value_type(r.process_to_value(*vvalue_type_code));
 					}
+
 					if(valid_options!=options->count())
-						throw Exception("parser.runtime",
-							0,
-							"called with invalid option");
+						throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION);
 				}
 			}
-			if(param_index==2) // bad options param type
-				throw Exception("parser.runtime",
-					0,
-					"options must be hash");
+
+			if(param_index==2) // options were specified but not as hash
+				throw Exception(PARSER_RUNTIME, 0, "options must be hash");
 
 			Array<int> value_fields;
-			if(param_index>0) {
-				if(distinct!=D_ILLEGAL && distinct!=D_FIRST)
-					throw Exception("parser.runtime",
-						0,
-						"in distinct[tables] mode you may not specify value field(s)");
-				Value& value_fields_param=params.as_no_junction(param_index, "value field(s) must not be code");
-				if(value_fields_param.is_string()) {
-					value_fields+=self_table.column_name2index(
-						*value_fields_param.get_string(), true);
-				} else if(Table* value_fields_table=value_fields_param.get_table()) {
-					for(Array_iterator<Table::element_type> i(*value_fields_table); 
-						i.has_next(); ) {
-						const String& value_field_name
-							=*i.next()->get(0);
-						value_fields
-							+=self_table.column_name2index(value_field_name, true);
+			Value* value_code=0;
+
+			if(param_index==0){ // list of columns wasn't specified
+				if(value_type==C_STRING) // $.type[string]
+					throw Exception(PARSER_RUNTIME, 0, "you must specify one value field with option $.type[string]");
+				
+				for(size_t i=0; i<columns->count(); i++) // by all columns, including key
+					value_fields+=i;
+
+			} else { // list of columns or code was specified
+				if(value_type==C_TABLE)
+					throw Exception(PARSER_RUNTIME, 0, "you can't specify value field(s) with option $.distinct[tables] or $.type[tables]");
+
+				Value& value_fields_param=params[1];
+				if(value_fields_param.get_junction()){ // code specified
+					value_code=&value_fields_param;
+				} else if(value_fields_param.is_string()) { // one column as string was specified
+					const String &field_name=*value_fields_param.get_string();
+					if(!field_name.is_empty())
+						value_fields+=self_table.column_name2index(field_name, true);
+				} else if(Table* value_fields_table=value_fields_param.get_table()) { // list of columns were specified in table
+					for(Array_iterator<Table::element_type> i(*value_fields_table); i.has_next(); ) {
+						const String& value_field_name =*i.next()->get(0);
+						value_fields +=self_table.column_name2index(value_field_name, true);
 					}
 				} else
-					throw Exception("parser.runtime",
-						0,
-						"value field(s) must be string or table"
-					);
-			} else { // by all columns, including key
-				if(!(distinct!=D_ILLEGAL && distinct!=D_FIRST))
-					for(size_t i=0; i<columns->count(); i++)
-						value_fields+=i;
+					throw Exception(PARSER_RUNTIME, 0, "value field(s) must be string or table or code");
 			}
 
+			if(value_type==C_STRING && value_fields.count()!=1)
+				throw Exception(PARSER_RUNTIME, 0, "you can specify only one value field with option $.type[string]");
 
 			{
 				Value* key_param=&params[0];
 				Row_info info={
 					&r,
 					&self_table,
-					/*key_code=*/key_param->get_junction()?key_param:0,
+					/*key_code=*/key_param->get_junction() ? key_param : 0,
 					/*key_field=*/0/*filled below*/,
 					&value_fields,
+					value_code,
 					&result.hash(),
 					distinct,
-					/*row=*/0
+					/*row=*/0,
+					value_type
 				};
-				info.key_field=(info.key_code?-1
-						:self_table.column_name2index(key_param->as_string(), true));
+				info.key_field=(info.key_code ? -1 : self_table.column_name2index(key_param->as_string(), true));
 
 				int saved_current=self_table.current();
 				self_table.for_each(table_row_to_hash, &info);
@@ -661,6 +1012,7 @@ static void _hash(Request& r, MethodPara
 				result.extract_default();
 			}
 		}
+	}
 	r.write_no_lang(result);
 }
 
@@ -709,18 +1061,25 @@ static void _sort(Request& r, MethodPara
 		old_table.set_current(i);
 		// calculate key value
 		seq[i].row=old_table[i];
-		Value& value=r.process_to_value(key_maker).as_expr_result(true/*return string as-is*/);
+		Value& value=r.process_to_value(key_maker);
 		if(i==0) // determining key values type by first one
 			key_values_are_strings=value.is_string();
 
 		if(key_values_are_strings)
 			seq[i].value.c_str=value.as_string().cstr();
 		else
-			seq[i].value.d=value.as_double();
+			seq[i].value.d=value.as_expr_result().as_double();
 	}
+
+	// @todo: handle this elsewhere
+	if(r.charsets.source().NAME()=="KOI8-R" && key_values_are_strings) {
+		for(i=0; i<old_count; i++)
+			if(*seq[i].value.c_str)
+				seq[i].value.c_str=Charset::transcode(seq[i].value.c_str, r.charsets.source(), UTF8_charset).cstr();
+	}
+
 	// sort keys
-	_qsort(seq, old_count, sizeof(Table_seq_item), 
-		key_values_are_strings?sort_cmp_string:sort_cmp_double);
+	qsort(seq, old_count, sizeof(Table_seq_item), key_values_are_strings?sort_cmp_string:sort_cmp_double);
 
 	// reorder table as they require in 'seq'
 	for(i=0; i<old_count; i++)
@@ -738,35 +1097,34 @@ struct Expression_is_true_info {
 	Value* expression_code;
 };
 #endif
+
 static bool expression_is_true(Table&, Expression_is_true_info* info) {
 	return info->r->process_to_value(*info->expression_code).as_bool();
 }
-static bool _locate_expression(Table& table, Table::Action_options o,
-			       Request& r, MethodParams& params) {
-	check_option_param(o.defined, params, 1,
-		"locate by expression only has parameters: expression and, maybe, options");
-	Value& expression_code=params.as_junction(0, "must be expression");
 
+static bool _locate_expression(Table& table, Request& r, MethodParams& params) {
+	Value& expression_code=params.as_junction(0, "must be expression");
+	Table::Action_options o=get_action_options(r, params, 1, table);
+	if(params.count()>2)
+		throw Exception(PARSER_RUNTIME, 0, "locate by expression only has parameters: expression and, maybe, options");
 	Expression_is_true_info info={&r, &expression_code};
 	return table.table_first_that(expression_is_true, &info, o);
 }
-static bool _locate_name_value(Table& table, Table::Action_options o,
-			       Request&, MethodParams& params) {
-	check_option_param(o.defined, params, 2,
-		"locate by locate by name has parameters: name, value and, maybe, options");
+
+static bool _locate_name_value(Table& table, Request& r, MethodParams& params) {
 	const String& name=params.as_string(0, "column name must be string");
-	const String& value=params.as_string(1, "value must be string");
+	const String& value=params.as_string(1, VALUE_MUST_BE_STRING);
+	Table::Action_options o=get_action_options(r, params, 2, table);
 	return table.locate(name, value, o);
 }
+
 static void _locate(Request& r, MethodParams& params) {
 	Table& table=GET_SELF(r, VTable).table();
 
-	Table::Action_options o=get_action_options(r, params, table);
-
-	bool result=params[0].get_junction()?
-		_locate_expression(table, o, r, params) :
-		_locate_name_value(table, o, r, params);
-	r.write_no_lang(*new VBool(result));
+	bool result=params[0].get_junction() || (params.count() == 1) ?
+		_locate_expression(table, r, params) :
+		_locate_name_value(table, r, params);
+	r.write_no_lang(VBool::get(result));
 }
 
 
@@ -774,7 +1132,7 @@ static void _flip(Request& r, MethodPara
 	Table& old_table=GET_SELF(r, VTable).table();
 	Table& new_table=*new Table(0);
 	if(size_t old_count=old_table.count())
-		if(size_t old_cols=old_table[0]->count()) 
+		if(size_t old_cols=old_table.columns()?old_table.columns()->count():old_table.max_cells())
 			for(size_t column=0; column<old_cols; column++) {
 				Table::element_type new_row(new ArrayString(old_count));
 				for(size_t i=0; i<old_count; i++) {
@@ -787,17 +1145,118 @@ static void _flip(Request& r, MethodPara
 	r.write_no_lang(*new VTable(&new_table));
 }
 
-static void _append(Request& r, MethodParams& params) {
-	// data
+static void _foreach(Request& r, MethodParams& params) {
+	InCycle temp(r);
+
+	const String* rownum_var_name=&params.as_string(0, "rownum-var name must be string");
+	const String* value_var_name=&params.as_string(1, "value-var name must be string");
+
+	Value& body_code=params.as_junction(2, "body must be code");
+	
+	Value* delim_maybe_code=params.count()>3?&params[3]:0;
+
+	Table& table=GET_SELF(r, VTable).table();
+	size_t saved_current=table.current();
+
+	rownum_var_name=rownum_var_name->is_empty()? 0 : rownum_var_name;
+	value_var_name=value_var_name->is_empty()? 0 : value_var_name;
+
+	Value* var_context=r.get_method_frame()->caller();
+
+	if(delim_maybe_code) { // delimiter set
+		bool need_delim=false;
+		for(size_t row=0; row<table.count(); row++) {
+			table.set_current(row);
+
+			if(rownum_var_name)
+				r.put_element(*var_context, *rownum_var_name, new VString(*new String(String::Body::Format(row), String::L_CLEAN)));
+			if(value_var_name)
+				r.put_element(*var_context, *value_var_name, new VTable(&table));
+
+			StringOrValue sv_processed=r.process(body_code);
+			Request::Skip lskip=r.get_skip(); r.set_skip(Request::SKIP_NOTHING);
+
+			const String* s_processed=sv_processed.get_string();
+			if(s_processed && !s_processed->is_empty()) { // we have body
+				if(need_delim) // need delim & iteration produced string?
+					r.write_pass_lang(r.process(*delim_maybe_code));
+				else
+					need_delim=true;
+			}
+
+			r.write_pass_lang(sv_processed);
+
+			if(lskip==Request::SKIP_BREAK)
+				break;
+		}
+	} else {
+		for(size_t row=0; row<table.count(); row++) {
+			table.set_current(row);
+ 
+			if(rownum_var_name)
+				r.put_element(*var_context, *rownum_var_name, new VString(*new String(String::Body::Format(row), String::L_CLEAN)));
+			if(value_var_name)
+				r.put_element(*var_context, *value_var_name, new VTable(&table));
+
+			r.process_write(body_code);
+			Request::Skip lskip=r.get_skip(); r.set_skip(Request::SKIP_NOTHING);
+ 
+			if(lskip==Request::SKIP_BREAK)
+				break;
+		}
+	}
+	table.set_current(saved_current);
+}
+
+static void update_cell(HashStringValue::key_type aname, HashStringValue::value_type avalue, VTable *dest) {
+	dest->put_element(String(aname, String::L_CLEAN), avalue); // new not required
+}
+
+inline Table::element_type row_from_string(Request& r, Value &param){
+	if(!param.is_string() && !param.get_junction())
+		throw Exception(PARSER_RUNTIME, 0, "row must be string, code or hash");
+
 	Temp_lang temp_lang(r, String::L_PASS_APPENDED);
-	const String& string=r.process_to_string(params.as_junction(0, "body must be code"));
+	const String& string=r.process_to_string(param);
 
 	// parse cells
 	Table::element_type row=new ArrayString;
-	size_t pos_after=0;
-	string.split(*row, pos_after, "\t", String::L_AS_IS);
+	string.split(*row, 0, "\t", String::L_AS_IS);
 
-	GET_SELF(r, VTable).table()+=row;
+	return row;
+}
+
+static void _append(Request& r, MethodParams& params) {
+	VTable vtable=GET_SELF(r, VTable);
+	Table& table=vtable.table();
+
+	HashStringValue* hash=params[0].get_hash();
+	if(hash){
+		table+=new ArrayString();
+		size_t saved_current=table.current();
+		table.set_current(table.count()-1);
+		hash->for_each<VTable*>(update_cell, &vtable);
+		table.set_current(saved_current);
+	} else {
+		table+=row_from_string(r, params[0]);
+	}
+}
+
+static void _insert(Request& r, MethodParams& params) {
+	VTable vtable=GET_SELF(r, VTable);
+	Table& table=vtable.table();
+	HashStringValue* hash=params[0].get_hash();
+	if(hash){
+		table.insert(table.current(), new ArrayString());
+		hash->for_each<VTable*>(update_cell, &vtable);
+	} else {
+		table.insert(table.current(), row_from_string(r, params[0]));
+	}
+}
+
+static void _delete(Request& r, MethodParams&) {
+	Table& table=GET_SELF(r, VTable).table();
+	table.remove_current();
 }
 
 static void join_named_row(Table& src, Table* dest) {
@@ -814,22 +1273,13 @@ static void join_nameless_row(Table& src
 	*dest+=src[src.current()];
 }
 static void _join(Request& r, MethodParams& params) {
-	Table* maybe_src=params.as_no_junction(0, "table ref must not be code").get_table();
-	if(!maybe_src)
-		throw Exception("parser.runtime", 
-			0, 
-			"source is not a table");
-	Table& src=*maybe_src;
-
-	Table::Action_options o=get_action_options(r, params, src);
-	check_option_param(o.defined, params, 1,
-		"invalid extra parameter");
+	Table& src=*params.as_table(0, "source");
+
+	Table::Action_options o=get_action_options(r, params, 1, src);
 
 	Table& dest=GET_SELF(r, VTable).table();
 	if(&src == &dest)
-		throw Exception("parser.runtime", 
-			0, 
-			"source and destination are same table");
+		throw Exception(PARSER_RUNTIME, 0, "source and destination are same table");
 
 	if(dest.columns()) // dest is named
 		src.table_for_each(join_named_row, &dest, o);
@@ -840,6 +1290,7 @@ static void _join(Request& r, MethodPara
 #ifndef DOXYGEN
 class Table_sql_event_handlers: public SQL_Driver_query_event_handlers {
 	ArrayString& columns;
+	int columns_count;
 	ArrayString* row;
 public:
 	Table* table;
@@ -848,9 +1299,9 @@ public:
 		columns(*new ArrayString), row(0), table(0) {
 	}
 
-	bool add_column(SQL_Error& error, const char *str, size_t length) {
+	bool add_column(SQL_Error& error, const char *str, size_t ) {
 		try {
-			columns+=new String(str, length, true);
+			columns+=new String(str, String::L_TAINTED /* no length as 0x00 can be inside */);
 			return false;
 		} catch(...) {
 			error=SQL_Error("exception occured in Table_sql_event_handlers::add_column");
@@ -860,6 +1311,7 @@ public:
 	bool before_rows(SQL_Error& error) { 
 		try {
 			table=new Table(&columns);
+			columns_count=columns.count();
 			return false;
 		} catch(...) {
 			error=SQL_Error("exception occured in Table_sql_event_handlers::before_rows");
@@ -868,19 +1320,16 @@ public:
 	}
 	bool add_row(SQL_Error& error) {
 		try {
-			*table+=row=new ArrayString;
+			*table+=row=new ArrayString(columns_count);
 			return false;
 		} catch(...) {
 			error=SQL_Error("exception occured in Table_sql_event_handlers::add_row");
 			return true;
 		}
 	}
-	bool add_row_cell(SQL_Error& error, const char* str, size_t length) {
+	bool add_row_cell(SQL_Error& error, const char* str, size_t ) {
 		try {
-			String& cell=*new String;
-			if(length)
-				cell.append_know_length(str, length, String::L_TAINTED);
-			*row+=&cell;
+			*row+=str?new String(str, String::L_TAINTED /* no length as 0x00 can be inside */):&String::Empty;
 			return false;
 		} catch(...) {
 			error=SQL_Error("exception occured in Table_sql_event_handlers::add_row_cell");
@@ -897,7 +1346,7 @@ static void marshal_bind(
 {
 	SQL_Driver::Placeholder& ph=**pptr;
 	ph.name=aname.cstr();
-	ph.value=avalue->as_string().cstr(String::L_UNSPECIFIED);
+	ph.value=avalue->as_string().untaint_cstr(String::L_AS_IS);
 	ph.is_null=avalue->get_class()==void_class;
 	ph.were_updated=false;
 
@@ -907,9 +1356,9 @@ static void marshal_bind(
 // not static, used elsewhere
 int marshal_binds(HashStringValue& hash, SQL_Driver::Placeholder*& placeholders) {
 	int hash_count=hash.count();
-	placeholders=new(UseGC) SQL_Driver::Placeholder[hash_count];
+	placeholders=new SQL_Driver::Placeholder[hash_count];
 	SQL_Driver::Placeholder* ptr=placeholders;
-	hash.for_each(marshal_bind, &ptr);
+	hash.for_each<SQL_Driver::Placeholder**>(marshal_bind, &ptr);
 	return hash_count;
 }
 
@@ -920,12 +1369,9 @@ void unmarshal_bind_updates(HashStringVa
 		if(ph->were_updated) {
 			Value* value;
 			if(ph->is_null)
-				value=new VVoid();
+				value=VVoid::get();
 			else
-				if(ph->value)
-					value=new VString(*new String(ph->value, 0, true/*tainted*/));
-				else
-					value=new VString(*new String());					
+				value=new VString(*new String(ph->value, String::L_TAINTED));
 			hash.put(ph->name, value);
 		}
 }
@@ -934,34 +1380,26 @@ static void _sql(Request& r, MethodParam
 	Value& statement=params.as_junction(0, "statement must be code");
 
 	HashStringValue* bind=0;
-	ulong limit=0;
+	ulong limit=SQL_NO_LIMIT;
 	ulong offset=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(HashStringValue* 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(valid_options!=options->count())
-					throw Exception("parser.runtime",
-						0,
-						"called with invalid option");
-			} else
-				throw Exception("parser.runtime",
-					0,
-					"options must be hash");
-	}
+	if(params.count()>1)
+		if(HashStringValue* options=params.as_hash(1, "sql options")) {
+			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(valid_options!=options->count())
+				throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION);
+		}
 
 	SQL_Driver::Placeholder* placeholders=0;
 	uint placeholders_count=0;
@@ -970,14 +1408,10 @@ static void _sql(Request& r, MethodParam
 
 	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());
+	const char* statement_cstr=statement_string.untaint_cstr(r.flang, r.connection());
+
 	Table_sql_event_handlers handlers;
-#ifdef RESOURCES_DEBUG
-	struct timeval mt[2];
-	//measure:before
-	gettimeofday(&mt[0],NULL);
-#endif	
+
 	r.connection()->query(
 		statement_cstr, 
 		placeholders_count, placeholders,
@@ -985,17 +1419,6 @@ static void _sql(Request& r, MethodParam
 		handlers,
 		statement_string);
 	
-#ifdef RESOURCES_DEBUG
-		//measure:after connect
-	gettimeofday(&mt[1],NULL);
-	
-	double t[2];
-	for(int i=0;i<2;i++)
-	    t[i]=mt[i].tv_sec+mt[i].tv_usec/1000000.0;
-	    
-	r.sql_request_time+=t[1]-t[0];
-#endif	    			
-
 	if(bind)
 		unmarshal_bind_updates(*bind, placeholders_count, placeholders);
 
@@ -1007,10 +1430,15 @@ static void _sql(Request& r, MethodParam
 	GET_SELF(r, VTable).set_table(result);
 }
 
-static void _columns(Request& r, MethodParams&) {
+static void _columns(Request& r, MethodParams& params) {
+	const String* column_column_name;
+	if(params.count()>0)
+		column_column_name=&params.as_string(0, COLUMN_NAME_MUST_BE_STRING);
+	else 
+		column_column_name=new String("column");
 
 	Table::columns_type result_columns(new ArrayString);
-	*result_columns+=new String("column");
+	*result_columns+=column_column_name;
 	Table& result_table=*new Table(result_columns);
 
 	Table& source_table=GET_SELF(r, VTable).table();
@@ -1026,23 +1454,64 @@ static void _columns(Request& r, MethodP
 }
 
 static void _select(Request& r, MethodParams& params) {
-	Value& vcondition=params.as_junction(0, "condition must be expression");
+	Value& vcondition=params.as_expression(0, "condition must be number, bool or expression");
 
 	Table& source_table=GET_SELF(r, VTable).table();
+
+	int limit=source_table.count();
+	int offset=0;
+	bool reverse=false;
+	
+	if(params.count()>1)
+		if(HashStringValue* options=params.as_hash(1)) {
+			int valid_options=0;
+			if(Value* vlimit=options->get(sql_limit_name)) {
+				valid_options++;
+				limit=r.process_to_value(*vlimit).as_int();
+			}
+			if(Value* voffset=options->get(sql_offset_name)) {
+				valid_options++;
+				offset=r.process_to_value(*voffset).as_int();
+			}
+			if(Value* vreverse=options->get(table_reverse_name)) {
+				valid_options++;
+				reverse=r.process_to_value(*vreverse).as_bool();
+			}
+			if(valid_options!=options->count())
+				throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION);
+		}
+
 	Table& result_table=*new Table(source_table.columns());
 
-	int saved_current=source_table.current();
-	int size=source_table.count();
-	for(int row=0; row<size; row++) {
-		source_table.set_current(row);
+	size_t size=source_table.count();
+	if(offset<0)
+		offset+=size;
+	if(size && limit>0 && offset>=0 && (size_t)offset<size){
+		size_t saved_current=source_table.current();
+		size_t appended=0;
+
+		if(reverse){
+			for(size_t row=size-1; result_table.count() < (size_t)limit; row--) {
+				source_table.set_current(row);
+
+				bool condition=r.process_to_value(vcondition, false/*don't intercept string*/).as_bool();
+
+				if(condition && ++appended > (size_t)offset) // ...condition is true, adding to the result
+					result_table+=source_table[row];
+				if(row==0) break;
+			}
+		} else {
+			for(size_t row=0; row < size && result_table.count() < (size_t)limit; row++) {
+				source_table.set_current(row);
 
-		bool condition=r.process_to_value(vcondition, 
-				false/*don't intercept string*/).as_bool();
+				bool condition=r.process_to_value(vcondition, false/*don't intercept string*/).as_bool();
 
-		if(condition) // ...condition is true=
-			result_table+=source_table[row]; // =green light to go to result
+				if(condition && ++appended > (size_t)offset) // ...condition is true, adding to the result
+					result_table+=source_table[row];
+			}
+		}
+		source_table.set_current(saved_current);
 	}
-	source_table.set_current(saved_current);
 
 	r.write_no_lang(*new VTable(&result_table));
 }
@@ -1053,9 +1522,9 @@ MTable::MTable(): Methoded("table") {
 	// ^table::create{data}
 	// ^table::create[nameless]{data}
 	// ^table::create[table]
-	add_native_method("create", Method::CT_DYNAMIC, _create, 1, 2);
+	add_native_method("create", Method::CT_DYNAMIC, _create, 1, 3);
 	// old name for compatibility with <= v 1.141 2002/01/25 11:33:45 paf
-	add_native_method("set", Method::CT_DYNAMIC, _create, 1, 2); 
+	add_native_method("set", Method::CT_DYNAMIC, _create, 1, 3); 
 
 	// ^table::load[file]  
 	// ^table::load[nameless;file]
@@ -1065,8 +1534,18 @@ MTable::MTable(): Methoded("table") {
 	// ^table.save[nameless;file]
 	add_native_method("save", Method::CT_DYNAMIC, _save, 1, 3);
 
+	// add_native_method("save_old", Method::CT_DYNAMIC, _save_old, 1, 3);
+
+	// ^table.csv-string[]
+	// ^table.csv-string[nameless]
+	// ^table.csv-string[nameless;$.encloser["] $.separator[,]]
+	add_native_method("csv-string", Method::CT_DYNAMIC, _csv_string, 0, 2);
+
 	// ^table.count[]
-	add_native_method("count", Method::CT_DYNAMIC, _count, 0, 0);
+	// ^table.count[rows]
+	// ^table.count[columns]
+	// ^table.count[cells]
+	add_native_method("count", Method::CT_DYNAMIC, _count, 0, 1);
 
 	// ^table.line[]
 	add_native_method("line", Method::CT_DYNAMIC, _line, 0, 0);
@@ -1080,8 +1559,8 @@ MTable::MTable(): Methoded("table") {
 	// ^table.menu{code}[delim]
 	add_native_method("menu", Method::CT_DYNAMIC, _menu, 1, 2);
 
-	// ^table:hash[key field name]
-	// ^table:hash[key field name][value field name(s) string/table]
+	// ^table.hash[key field name]
+	// ^table.hash[key field name][value field name(s) string/table]
 	add_native_method("hash", Method::CT_DYNAMIC, _hash, 1, 3);
 
 	// ^table.sort{string-key-maker} ^table.sort{string-key-maker}[desc|asc]
@@ -1094,20 +1573,30 @@ MTable::MTable(): Methoded("table") {
 	// ^table.flip[]
 	add_native_method("flip", Method::CT_DYNAMIC, _flip, 0, 0);
 
-	// ^table.append{r{tab}e{tab}c{tab}o{tab}r{tab}d}
+	// ^table.foreach[row-num;value]{code}
+	// ^table.foreach[row-num;value]{code}[delim]
+	add_native_method("foreach", Method::CT_DYNAMIC, _foreach, 3, 4);
+
+	// ^table.append{row{tab}data}
 	add_native_method("append", Method::CT_DYNAMIC, _append, 1, 1);
 
+	// ^table.insert{row{tab}data} before current row
+	add_native_method("insert", Method::CT_DYNAMIC, _insert, 1, 1);
+
+	// ^table.delete[] current row
+	add_native_method("delete", Method::CT_DYNAMIC, _delete, 0, 0);
+
 	// ^table.join[table][$.limit(10) $.offset(1) $.offset[cur] ]
 	add_native_method("join", Method::CT_DYNAMIC, _join, 1, 2);
 
 
-	// ^table:sql[query]
-	// ^table:sql[query][$.limit(1) $.offset(2)]
+	// ^table::sql[query]
+	// ^table::sql[query][$.limit(1) $.offset(2)]
 	add_native_method("sql", Method::CT_DYNAMIC, _sql, 1, 2);
 
-	// ^table:columns[]
-	add_native_method("columns", Method::CT_DYNAMIC, _columns, 0, 0);
+	// ^table.columns[[column name]]
+	add_native_method("columns", Method::CT_DYNAMIC, _columns, 0, 1);
 
 	// ^table.select(expression) = table
-	add_native_method("select", Method::CT_DYNAMIC, _select, 1, 1);
+	add_native_method("select", Method::CT_DYNAMIC, _select, 1, 2);
 }