--- parser3/src/classes/table.C	2007/08/28 09:28:18	1.233
+++ parser3/src/classes/table.C	2011/05/15 13:20:07	1.280
@@ -1,46 +1,41 @@
 /** @file
 	Parser: @b table parser class.
 
-	Copyright (c) 2001-2005 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001-2009 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char * const IDENT_TABLE_C="$Date: 2007/08/28 09:28:18 $";
+static const char * const IDENT_TABLE_C="$Date: 2011/05/15 13:20:07 $";
 
+#if (!defined(NO_STRINGSTREAM) && !defined(FREEBSD4))
 #include <sstream>
-using namespace std;
+#endif
 
 #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"
 
 // 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);
 
-// externs
-
-extern String cycle_data_name;
-
 #define TABLE_REVERSE_NAME "reverse"
 
 // globals
@@ -56,12 +51,12 @@ String table_reverse_name(TABLE_REVERSE_
 // methods
 
 static Table::Action_options get_action_options(Request& r, MethodParams& params, 
-						const Table& source) {
+						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();
+	Value& maybe_options=params[options_index];
 /* can not do it: 
 	want to enable ^table::create[$source;
 #		$.option[]
@@ -108,9 +103,7 @@ 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;
 }
@@ -123,30 +116,91 @@ static void check_option_param(bool opti
 			"%s", msg);
 }
 
+struct TableSeparators {
+	char column;  const String* scolumn;
+	char encloser; const String* sencloser;
+
+	TableSeparators():
+		column('\t'), scolumn(new String("\t")),
+		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 _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);
+		Table::Action_options o=get_action_options(r, params, 1, *source);
 		check_option_param(o.defined, params, 1, 
 			"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;
+	TableSeparators separators;
+
+	size_t options_param_index=data_param_index+1;
+	if(
+		options_param_index<params.count()
+		&& (options=params.as_no_junction(options_param_index, "additional params must be hash").get_hash())
+	) {
+		// cloning, so that we could change
+		options=new HashStringValue(*options);
+		separators.load(*options);
+		if(separators.encloser){
+			throw Exception(PARSER_RUNTIME,
+				0,
+				"encloser not supported for table::create yet");
+		}
+	}
+
+	// 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"));
+		r.process_to_string(params.as_junction(data_param_index, "body must be code"));
 
 	// 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'");
+
+	if(nameless){
 		columns=Table::columns_type(0); // nameless
 	} else {
 		columns=Table::columns_type(new ArrayString);
@@ -155,7 +209,7 @@ static void _create(Request& r, MethodPa
 		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);
+			head[0]->split(*columns, col_pos_after, *separators.scolumn, String::L_AS_IS);
 		}
 	}
 
@@ -167,13 +221,13 @@ static void _create(Request& r, MethodPa
 	Array_iterator<const String*> i(rows);
 	while(i.has_next()) {
 		Table::element_type row(new ArrayString);
-		const String&  string=*i.next();
+		const String& string=*i.next();
 		// remove comment lines
-		if(!string.length())
+		if(string.is_empty())
 			continue;
 
 		size_t col_pos_after=0;
-		string.split(*row, col_pos_after, "\t", String::L_AS_IS);
+		string.split(*row, col_pos_after, *separators.scolumn, String::L_AS_IS);
 		table+=row;
 	}
 
@@ -190,7 +244,7 @@ struct lsplit_result {
 
 inline lsplit_result lsplit(char* string, char delim1, char delim2) {
 	lsplit_result result;
-    if(string) {
+	if(string) {
 		char delims[]={delim1, delim2, 0};
 		if(char* v=strpbrk(string, delims)) {
 			result.delim=*v;
@@ -198,27 +252,27 @@ inline lsplit_result lsplit(char* string
 			result.piece=v+1;
 			return result;
 		}
-    }
+	}
 	result.piece=0;
 	result.delim=0;
-    return result;
+	return result;
 }
 
 inline lsplit_result lsplit(char* *string_ref, char delim1, char delim2) {
-    lsplit_result result;
+	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;
+	return result;
 }
 
 static lsplit_result lsplit(char** string_ref, char delim1, char delim2, char encloser) {
 	lsplit_result result;
 
-    if(char* string=*string_ref) {
+	if(char* string=*string_ref) {
 		if(encloser && *string==encloser) {
-            string++;
+			string++;
 			
 			char *read;
 			char *write;
@@ -244,9 +298,9 @@ static lsplit_result lsplit(char** strin
 			return result;
 		} else
 			return lsplit(string_ref, delim1, delim2);
-    }
+	}
 	result.piece=0;
-    return result;
+	return result;
 }
 
 static void skip_empty_and_comment_lines( char** data_ref ) {
@@ -263,37 +317,21 @@ static void skip_empty_and_comment_lines
 	}
 }
 
-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++;
+static void skip_empty_lines( char** data_ref ) {
+	if(char *data=*data_ref) {
+		while( char c=*data ) {
+			if( c== '\n' ) {
+				/*nowhere=*/getrow(&data); // remove empty lines
+				if(!(*data_ref=data))
+					break;
+				continue;
+			}
+			break;
 		}
-		return result;
 	}
-};
+}
+
+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);
@@ -313,12 +351,14 @@ static void _load(Request& r, MethodPara
 	}
 
 	// loading text
-	char *data=file_read_text(r.charsets,
+	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 = (separators.column=='#' || separators.encloser=='#') ? skip_empty_lines : skip_empty_and_comment_lines;
+
 	// parse columns
 	Table::columns_type columns;
 	if(nameless) {
@@ -326,9 +366,9 @@ static void _load(Request& r, MethodPara
 	} else {
 		columns=Table::columns_type(new ArrayString);
 
-		skip_empty_and_comment_lines(&data);
+		skip_lines_action(&data);
 		while( lsplit_result sr=lsplit(&data, separators.column, '\n', separators.encloser) ) {
-			*columns+=new String(sr.piece, 0, true);
+			*columns+=new String(sr.piece, String::L_TAINTED);
 			if(sr.delim=='\n') 
 				break;
 		}
@@ -339,15 +379,15 @@ static void _load(Request& r, MethodPara
 
 	// parse cells
 	Table::element_type row(new ArrayString(columns_count));
-	skip_empty_and_comment_lines(&data);
+	skip_lines_action(&data);
 	while( lsplit_result sr=lsplit(&data, separators.column, '\n', separators.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(columns_count);
-			skip_empty_and_comment_lines(&data);
+			skip_lines_action(&data);
 		}
 	}
 	// last line [if without \n]
@@ -358,49 +398,59 @@ static void _load(Request& r, MethodPara
 	GET_SELF(r, VTable).set_table(table);
 }
 
-void maybe_enclose( String& to, const String& from, char encloser, const String* sencloser ) {
+#if (!defined(NO_STRINGSTREAM) && !defined(FREEBSD4))
+
+#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;
+
+void maybe_enclose( pa_stringstream& to, const String& from, char encloser ) {
 	if(encloser) {
-		to<<*sencloser;
+		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) {
 			pos_before++; // including first encloser (and skipping it for next pos)
-            to<<from.mid(pos_after, pos_before);
-			to<<*sencloser; // doubling encloser
+			to<<from.mid(pos_after, pos_before).cstr();
+			to<<encloser; // doubling encloser
 		}
 		// last piece
 		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<<*sencloser;
+		to<<encloser;
 	} else
-		to<<from;
+		to<<from.cstr();
 }
 
-void maybe_enclose( ostringstream& to, const String& from, char encloser ) {
+#else
+
+void maybe_enclose( String& to, const String& from, char encloser, const String* sencloser ) {
 	if(encloser) {
-		to<<encloser;
+		to<<*sencloser;
 		// 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).cstr();
-			to<<encloser; // doubling encloser
+			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).cstr();
+			to<<from.mid(pos_after, from_length);
 
-		to<<encloser;
+		to<<*sencloser;
 	} else
-		to<<from.cstr();
+		to<<from;
 }
 
+#endif // don't use stringstream
 
-static void _save_old(Request& r, MethodParams& params) {
-	const String& first_arg=params.as_string(0, "first argument must not be code");
+static void _save(Request& r, MethodParams& params) {
+	const String& first_arg=params.as_string(0, FIRST_ARG_MUST_NOT_BE_CODE);
 	size_t param_index=1;
 
 	bool do_append=false;
@@ -415,6 +465,10 @@ static void _save_old(Request& r, Method
 		--param_index;
 
 	const String& file_name=params.as_string(param_index++, FILE_NAME_MUST_NOT_BE_CODE);
+	String file_spec=r.absolute(file_name);
+
+	if(do_append && file_exist(file_spec))
+		output_column_names=false;
 
 	TableSeparators separators;
 	if(param_index<params.count()) {
@@ -423,9 +477,7 @@ static void _save_old(Request& r, Method
 			if(HashStringValue* options=voptions.get_hash()) {
 				int valid_options=separators.load(*options);
 				if(valid_options!=options->count())
-					throw Exception(PARSER_RUNTIME,
-						0,
-						"invalid option passed");
+					throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION);
 			} else {
 				throw Exception(PARSER_RUNTIME,
 					0,
@@ -440,142 +492,119 @@ static void _save_old(Request& r, Method
 
 	Table& table=GET_SELF(r, VTable).table();
 
-	String sdata;
+#if (!defined(NO_STRINGSTREAM) && !defined(FREEBSD4))
+
+	pa_stringstream ost(std::stringstream::out);
+
+	// process header
 	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;
+				maybe_enclose( ost, *i.next(), separators.encloser );
+				if(i.has_next()){
+					ost<<separators.column;
+				}
 			}
 		} 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);
+					if(separators.encloser) {
+						ost<<separators.encloser<<column<<separators.encloser;
+					} else {
+						ost<<column;
+					}
+					if(column<lsize-1){
+						ost<<separators.column;
+					}
 				}
 			else
-				sdata.append_help_length("empty nameless table", 0, String::L_CLEAN);
+				ost<<"empty nameless table";
 		}
-		sdata.append_know_length("\n", 1, String::L_CLEAN);
+		ost<<'\n';
 	}
 
-	// data lines
+	// process 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 );
+			maybe_enclose( ost, *c.next(), separators.encloser );
 			if(c.has_next())
-				sdata<<*separators.scolumn;
+				ost<<separators.column;
 		}
-		sdata.append_know_length("\n", 1, String::L_CLEAN);
+		ost<<'\n';
 	}
 
 	// write
 	{
-		const char* data_cstr=sdata.cstr();
-		file_write(r.absolute(file_name), 
-			data_cstr, sdata.length(), true, do_append);
-		if(*data_cstr) // not empty (when empty it's not heap memory)
-			pa_free((void*)data_cstr); // not needed anymore
-	}
-}
-
-static void _save(Request& r, MethodParams& params) {
-	const String& first_arg=params.as_string(0, "first argument must not be code");
-	size_t param_index=1;
-
-	bool do_append=false;
-	bool output_column_names=true;
-
-	// mode?
-	if(first_arg=="append")
-		do_append=true;
-	else if(first_arg=="nameless")
-		output_column_names=false;
-	else
-		--param_index;
-
-	const String& file_name=params.as_string(param_index++, FILE_NAME_MUST_NOT_BE_CODE);
+		pa_string data=ost.str();
+		const char* data_cstr=data.c_str();
 
-	TableSeparators separators;
-	if(param_index<params.count()) {
-		Value& voptions=params.as_no_junction(param_index++, "additional params must be hash");
-		if( voptions.is_defined() && !voptions.is_string() ) {
-			if(HashStringValue* options=voptions.get_hash()) {
-				int valid_options=separators.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?)");
-			}
-		}
+		file_write(r.charsets, file_spec, data_cstr, data.length(), true /* as text */, do_append);
 	}
-	if(param_index<params.count())
-		throw Exception(PARSER_RUNTIME,
-			0,
-			"bad mode (must be nameless or append)");
-
-	Table& table=GET_SELF(r, VTable).table();
 
-	ostringstream ost(stringstream::out);
+#else
 
-	// process header
+	String sdata;
 	if(output_column_names) {
 		if(table.columns()) { // named table
 			for(Array_iterator<const String*> i(*table.columns()); i.has_next(); ) {
-				maybe_enclose( ost, *i.next(), separators.encloser );
-				if(i.has_next()){
-					ost<<separators.column;
-				}
+				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++) {
-					if(separators.encloser) {
-						ost<<separators.encloser<<column<<separators.encloser;
-					} else {
-					ost<<column;
-					}
-					if(column<lsize-1){
-						ost<<separators.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
-				ost<<"empty nameless table";
+				sdata.append_help_length("empty nameless table", 0, String::L_CLEAN);
 		}
-		ost<<'\n';
+		sdata.append_know_length("\n", 1, String::L_CLEAN);
 	}
 
-	// process data lines
+	// data lines
 	Array_iterator<ArrayString*> i(table);
 	while(i.has_next()) {
 		for(Array_iterator<const String*> c(*i.next()); c.has_next(); ) {
-			maybe_enclose( ost, *c.next(), separators.encloser );
+			maybe_enclose( sdata, *c.next(), separators.encloser, separators.sencloser );
 			if(c.has_next())
-				ost<<separators.column;
+				sdata<<*separators.scolumn;
 		}
-		ost<<'\n';
+		sdata.append_know_length("\n", 1, String::L_CLEAN);
 	}
 
 	// write
 	{
-		string data=ost.str();
-		const char* data_cstr = data.c_str();
-
-		file_write(r.absolute(file_name), data_cstr, data.length(), true /* as text */, do_append);
+		const char* data_cstr=sdata.cstr();
+		file_write(r.charsets, file_spec, data_cstr, sdata.length(), true, do_append);
+		if(*data_cstr) // not empty (when empty it's not heap memory)
+			pa_free((void*)data_cstr); // not needed anymore
 	}
+
+#endif // don't use stringstream
 }
 
-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() : 0;
+		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));
 }
 
@@ -607,32 +636,47 @@ static void _offset(Request& r, MethodPa
 }
 
 static void _menu(Request& r, MethodParams& params) {
-	Temp_hash_value<const String::Body, void*> 
-		cycle_data_setter(r.classes_conf, cycle_data_name, /*any not null flag*/&r);
+	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);
-		Request::Skip lskip=r.get_skip(); r.set_skip(Request::SKIP_NOTHING);
-		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;
-		}
-		r.write_pass_lang(sv_processed);
+	if(delim_maybe_code) { // delimiter set
+		bool need_delim=false;
+		for(int row=0; row<size; 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;
+			}
 
-		if(lskip==Request::SKIP_BREAK)
-			break;
+			r.write_pass_lang(sv_processed);
+
+			if(lskip==Request::SKIP_BREAK)
+				break;
+		}
+	} else {
+		for(int row=0; row<size; 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;
+		}
 	}
 	table.set_current(saved_current);
 }
@@ -663,15 +707,14 @@ static void table_row_to_hash(Table::ele
 	if(!key)
 		return; // ignore rows without key [too-short-record_array if-indexed]
 		
-	bool exist = false;
-	switch (info->value_type) {
-	case C_STRING:
-		{
-			exist=info->hash->put_dont_replace(*key, new VString(*row->get(info->value_fields->get(0))));
-		}
-		break;
-	case C_HASH:
-		{
+	bool exist=false;
+	switch(info->value_type) {
+		case C_STRING: {
+			size_t index=info->value_fields->get(0);
+			exist=info->hash->put_dont_replace(*key, (index < row->count()) ? new VString(*row->get(index)) : new VString());
+			break;
+		}
+		case C_HASH: {
 			VHash* vhash=new VHash;
 			HashStringValue& hash=vhash->hash();
 			for(Array_iterator<int> i(*info->value_fields); i.has_next(); ) {
@@ -683,18 +726,16 @@ static void table_row_to_hash(Table::ele
 			}
 
 			exist=info->hash->put_dont_replace(*key, vhash);
+			break;
 		}
-		break;
-	case C_TABLE:
-		{
-			VTable* vtable=(VTable*)info->hash->get(*key); // put. table existed?
-			if( info->distinct==D_ILLEGAL ){
-				exist=true;
-				break;
-			}
-
+		case C_TABLE: {
+			VTable* vtable=(VTable*)info->hash->get(*key); // table exist?
 			Table* table;
 			if(vtable) {
+				if(info->distinct==D_ILLEGAL) {
+					exist=true;
+					break;
+				}
 				table=vtable->get_table();
 			} else {
 				// no? creating table of same structure as source
@@ -703,8 +744,8 @@ static void table_row_to_hash(Table::ele
 				info->hash->put(*key, new VTable(table));
 			}
 			*table+=row;
+			break;
 		}
-		break;
 	}
 	if(exist && info->distinct==D_ILLEGAL)
 		throw Exception(PARSER_RUNTIME,
@@ -736,18 +777,16 @@ Table2hash_value_type get_value_type(Val
 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(HashStringValue* options=params.as_no_junction(param_index, PARAM_MUST_NOT_BE_CODE).get_hash()){ // options where specified
 					--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++;
 						Value& vdistinct_value=r.process_to_value(*vdistinct_code);
 						if(vdistinct_value.is_string()) {
@@ -755,72 +794,67 @@ static void _hash(Request& r, MethodPara
 							if(sdistinct=="tables") {
 								value_type=C_TABLE;
 								distinct=D_FIRST;
-							} else
+							} else {
 								throw Exception(PARSER_RUNTIME,
 									&sdistinct,
 									"must be 'tables' or true/false");
-						} else
+							}
+						} else {
 							distinct=vdistinct_value.as_bool()?D_FIRST:D_ILLEGAL;
+						}
 					}
-					if(Value* vvalue_type_code=options->get(sql_value_type_name)) {
-						if(value_type==C_TABLE){ // $.distinct[tables] was specified already
+					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.");
-						} else {
-							valid_options++;
-							value_type=get_value_type(r.process_to_value(*vvalue_type_code));
-						}
-					} 
+								"you can't specify $.distinct[tables] and $.type[] together");
+
+						valid_options++;
+						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 was specified but not as hash
+				throw Exception(PARSER_RUNTIME, 0, OPTIONS_MUST_BE_HASH);
 
 			Array<int> value_fields;
-			if(param_index>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 was specified
 				if(value_type==C_TABLE)
 					throw Exception(PARSER_RUNTIME,
 						0,
-						"in distinct[tables] mode you may not specify value field(s)");
+						"you can't specify value field(s) with option $.distinct[tables] or $.type[tables]");
+
 				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);
+				if(value_fields_param.is_string()) { // one column as string was specified
+					value_fields+=self_table.column_name2index(*value_fields_param.get_string(), 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(value_type==C_STRING)
-					throw Exception(PARSER_RUNTIME,
-						0,
-						"with $.type[string] you must specify one value field(s)");
-				// if(!(distinct!=D_ILLEGAL && distinct!=D_FIRST))
-					for(size_t i=0; i<columns->count(); i++)
-						value_fields+=i;
 			}
 
 			if(value_type==C_STRING && value_fields.count()!=1)
 				throw Exception(PARSER_RUNTIME,
 					0,
-					"you can specify one value field with this $.type[].");
+					"you can specify only one value field with option $.type[string]");
 
 			{
 				Value* key_param=&params[0];
@@ -845,6 +879,7 @@ static void _hash(Request& r, MethodPara
 				result.extract_default();
 			}
 		}
+	}
 	r.write_no_lang(result);
 }
 
@@ -902,6 +937,14 @@ static void _sort(Request& r, MethodPara
 		else
 			seq[i].value.d=value.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);
@@ -922,35 +965,38 @@ 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");
+
+static bool _locate_expression(Table& table, Request& r, MethodParams& params) {
 	Value& expression_code=params.as_junction(0, "must be expression");
+	const size_t options_index=1;
+	Table::Action_options o=get_action_options(r, params, options_index, table);
+	check_option_param(o.defined, params, options_index, "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 size_t options_index=2;
+	Table::Action_options o=get_action_options(r, params, options_index, table);
+	check_option_param(o.defined, params, options_index, "locate by name has parameters: name, value and, maybe, options");
+
 	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));
+		_locate_expression(table, r, params) :
+		_locate_name_value(table, r, params);
+	r.write_no_lang(VBool::get(result));
 }
 
 
@@ -958,7 +1004,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[0]->count()) 
 			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++) {
@@ -972,9 +1018,8 @@ static void _flip(Request& r, MethodPara
 }
 
 static void _append(Request& r, MethodParams& params) {
-	// data
 	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(params[0]);
 
 	// parse cells
 	Table::element_type row=new ArrayString;
@@ -1005,7 +1050,7 @@ static void _join(Request& r, MethodPara
 			"source is not a table");
 	Table& src=*maybe_src;
 
-	Table::Action_options o=get_action_options(r, params, src);
+	Table::Action_options o=get_action_options(r, params, 1, src);
 	check_option_param(o.defined, params, 1,
 		"invalid extra parameter");
 
@@ -1033,9 +1078,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");
@@ -1061,12 +1106,9 @@ public:
 			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+=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_row_cell");
@@ -1083,7 +1125,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;
 
@@ -1106,12 +1148,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);
 		}
 }
@@ -1120,7 +1159,7 @@ 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");
@@ -1140,13 +1179,9 @@ static void _sql(Request& r, MethodParam
 					offset=(ulong)r.process_to_value(*voffset).as_double();
 				}
 				if(valid_options!=options->count())
-					throw Exception(PARSER_RUNTIME,
-						0,
-						"called with invalid option");
+					throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION);
 			} else
-				throw Exception(PARSER_RUNTIME,
-					0,
-					"options must be hash");
+				throw Exception(PARSER_RUNTIME, 0, OPTIONS_MUST_BE_HASH);
 	}
 
 	SQL_Driver::Placeholder* placeholders=0;
@@ -1156,8 +1191,8 @@ 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];
@@ -1222,16 +1257,59 @@ static void _select(Request& r, MethodPa
 	Table& source_table=GET_SELF(r, VTable).table();
 	Table& result_table=*new Table(source_table.columns());
 
+	int limit=source_table.count();
+	int offset = 0;
+	bool reverse = false;
+	
+	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* 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");
+			} else
+				throw Exception(PARSER_RUNTIME,
+					0,
+					"options must be hash");
+	}
+
 	int saved_current=source_table.current();
 	int size=source_table.count();
-	for(int row=0; row<size; row++) {
-		source_table.set_current(row);
+	int appended = 0;
+
+	if(reverse){
+		for(int row=size-1; row >=0 && result_table.count() < 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 > offset) // ...condition is true, adding to the result
+				result_table+=source_table[row];
+		}
+	} else {
+		for(int row=0; row < size && result_table.count() < limit; row++) {
+			source_table.set_current(row);
+
+			bool condition=r.process_to_value(vcondition, false/*don't intercept string*/).as_bool();
+
+			if(condition && ++appended > offset) // ...condition is true, adding to the result
+				result_table+=source_table[row];
+		}
 	}
 	source_table.set_current(saved_current);
 
@@ -1244,9 +1322,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]
@@ -1259,7 +1337,10 @@ MTable::MTable(): Methoded("table") {
 	// add_native_method("save_old", Method::CT_DYNAMIC, _save_old, 1, 3);
 
 	// ^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);
@@ -1273,8 +1354,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]
@@ -1294,13 +1375,13 @@ MTable::MTable(): Methoded("table") {
 	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[[column name]]
+	// ^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);
 }