--- parser3/src/classes/table.C	2001/05/08 06:42:54	1.73
+++ parser3/src/classes/table.C	2003/09/29 11:03:21	1.185
@@ -1,282 +1,516 @@
 /** @file
 	Parser: @b table parser class.
 
-	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
-
-	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
-
-	$Id: table.C,v 1.73 2001/05/08 06:42:54 paf Exp $
+	Copyright (c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com)
+	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-#include "pa_config_includes.h"
-
-#include "pcre.h"
+static const char* IDENT_TABLE_C="$Date: 2003/09/29 11:03:21 $";
 
 #include "classes.h"
+#include "pa_vmethod_frame.h"
+
 #include "pa_common.h"
 #include "pa_request.h"
 #include "pa_vtable.h"
 #include "pa_vint.h"
 #include "pa_sql_connection.h"
-#include "pa_dir.h"
 #include "pa_vbool.h"
 
-// defines
-
-#define TABLE_CLASS_NAME "table"
-
 // class
 
-class MTable : public Methoded {
+class MTable: public Methoded {
 public: // VStateless_class
-	Value *create_new_value(Pool& pool) { return new(pool) VTable(pool); }
+	Value* create_new_value() { return new VTable(); }
 
 public:
-	MTable(Pool& pool);
+	MTable();
 
 public: // Methoded
 	bool used_directly() { return true; }
 };
 
+// global variable
+
+DECLARE_CLASS_VAR(table, new MTable, 0);
+
+// defines for globals
+
+#define SQL_LIMIT_NAME "limit"
+#define SQL_OFFSET_NAME "offset"
+#define SQL_DEFAULT_NAME "default"
+#define SQL_DISTINCT_NAME "distinct"
+#define TABLE_REVERSE_NAME "reverse"
+
+// globals
+
+String sql_limit_name(SQL_LIMIT_NAME);
+String sql_offset_name(SQL_OFFSET_NAME);
+String sql_default_name(SQL_DEFAULT_NAME);
+String sql_distinct_name(SQL_DISTINCT_NAME);
+String table_reverse_name(TABLE_REVERSE_NAME);
+
 // methods
 
-static void _set(Request& r, const String& method_name, MethodParams *params) {
-	Pool& pool=r.pool();
-	// data is last parameter
-	Value& vdata=params->get_junction(params->size()-1, "body must be code");
+static Table::Action_options get_action_options(Request& r, MethodParams& params, 
+						const Table& source) {
+	Table::Action_options result;
+	if(!params.count())
+		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(maybe_options.is_string()) { // allow empty options
+		result.defined=true;
+		return result;
+	}
+*/
+	HashStringValue* options=maybe_options.get_hash();
+	if(!options)
+		return result;
+
+	result.defined=true;
+	bool defined_offset=false;
+
+	int valid_options=0;
+	if(Value* voffset=options->get(sql_offset_name)) {
+		valid_options++;
+		defined_offset=true;
+		if(voffset->is_string()) {
+			const String&  soffset=*voffset->get_string();
+			if(soffset == "cur")
+				result.offset=source.current();
+			else
+				throw Exception("parser.runtime",
+					&soffset,
+					"must be 'cur' string or expression");
+		} else 
+			result.offset=r.process_to_value(*voffset).as_int();
+	}
+	if(Value* vlimit=options->get(sql_limit_name)) {
+		valid_options++;
+		result.limit=r.process_to_value(*vlimit).as_int();
+	}
+	if(Value *vreverse=(Value *)options->get(table_reverse_name)) { 
+		valid_options++; 
+		result.reverse=r.process_to_value(*vreverse).as_bool(); 
+		if(result.reverse && !defined_offset) 
+			result.offset=source.count()-1; 
+	} 
+
+	if(valid_options!=options->count())
+		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);
+}
+
+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");
+		GET_SELF(r, VTable).set_table(*new Table(*source, o));
+		return;
+	}
 
-	Temp_lang temp_lang(r, String::UL_PASS_APPENDED);
-	const String& data=r.process(vdata).as_string();
+	// data is last parameter
+	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"));
 
-	size_t pos_after=0;
 	// parse columns
-	Array *columns;
-	if(params->size()==2) {
-		columns=0;
+	size_t raw_pos_after=0;
+	Table::columns_type columns;
+	if(params.count()==2) {
+		columns=Table::columns_type(0); // nameless
 	} else {
-		columns=new(pool) Array(pool);
+		columns=Table::columns_type(new ArrayString);
 
-		Array head(pool);
-		data.split(head, &pos_after, "\n", 1, String::UL_CLEAN, 1);
-		if(head.size())
-			head.get_string(0)->split(*columns, 0, "\t", 1, String::UL_CLEAN);
+		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);
+		}
 	}
 
-	Table& table=*new(pool) Table(pool, &method_name, columns);
+	Table& table=*new Table(columns);
 	// parse cells
-	Array rows(pool);
-	data.split(rows, &pos_after, "\n", 1, String::UL_CLEAN);
-	int size=rows.quick_size();
-	for(int i=0; i<size; i++) {
-		Array& row=*new(pool) Array(pool);
-		const String& string=*rows.quick_get_string(i);
-		// remove empty lines
-		if(!string.size())
+
+	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;
 
-		string.split(row, 0, "\t", 1, String::UL_CLEAN);
-		table+=&row;
+		size_t col_pos_after=0;
+		string.split(*row, col_pos_after, "\t", String::L_AS_IS);
+		table+=row;
 	}
 
 	// replace any previous table value
-	static_cast<VTable *>(r.self)->set_table(table);
+	GET_SELF(r, VTable).set_table(table);
 }
 
-static void _load(Request& r, const String& method_name, MethodParams *params) {
-	Pool& pool=r.pool();
-	// filename is last parameter
-	Value& vfilename=params->get_no_junction(params->size()-1, 
-		"file name must not be code");
-
+static void _load(Request& r, MethodParams& params) {
+	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)
+		filename_param_index++;
+	size_t options_param_index=filename_param_index+1;
+	
 	// loading text
-	char *data=file_read_text(pool, r.absolute(vfilename.as_string()));
+	char *data=file_read_text(r.charsets,
+		r.absolute(params.as_string(filename_param_index, "file name must be string")),
+		true,
+		options_param_index<params.count()?params.as_no_junction(options_param_index, "additional params must be hash").get_hash():0
+	);
 
 	// parse columns
-	Array *columns;
-#ifndef NO_STRING_ORIGIN
-	const Origin& origin=method_name.origin();
-	const char *file=origin.file;
-	uint line=origin.line;
-#endif
-	if(params->size()==2) {
-		columns=0;
+	Table::columns_type columns;
+	if(nameless) {
+		columns=Table::columns_type(0); // nameless
 	} else {
-		columns=new(pool) Array(pool);
+		columns=Table::columns_type(new ArrayString);
 
-		if(char *row_chars=getrow(&data)) 
+		while(char *row_chars=getrow(&data)) {
+			// remove empty&comment lines
+			if(!*row_chars || *row_chars == '#')
+				continue;
 			do {
-				String *name=new(pool) String(pool);
-				name->APPEND_TAINTED(lsplit(&row_chars, '\t'), 0, file, line++);
-				*columns+=name;
+				*columns+=new String(lsplit(&row_chars, '\t'), 0, true);
 			} while(row_chars);
+
+			break;
+		}
 	}
 
 	// parse cells
-	Table& table=*new(pool) Table(pool, &method_name, columns);
+	Table& table=*new Table(columns);//что-то очень плохое с realloc'ом: 1000 сильно помогает
 	char *row_chars;
+	int cells=0;
 	while(row_chars=getrow(&data)) {
-		if(!*row_chars) // remove empty lines
+		// remove empty&comment lines
+		if(!*row_chars || *row_chars == '#')
 			continue;
-		Array *row=new(pool) Array(pool);
+		Table::element_type row(new ArrayString);
 		while(char *cell_chars=lsplit(&row_chars, '\t')) {
-			String *cell=new(pool) String(pool);
-			cell->APPEND_TAINTED(cell_chars, 0, file, line);
-			*row+=cell;
+			*row+=new String(cell_chars, 0, true);
+			cells++;
 		}
-		line++;
 		table+=row;
 	};
 
 	// replace any previous table value
-	static_cast<VTable *>(r.self)->set_table(table);
+	GET_SELF(r, VTable).set_table(table);
 }
 
-static void _save(Request& r, const String& method_name, MethodParams *params) {
-	Pool& pool=r.pool();
-	Value& vtable_name=params->get_no_junction(params->size()-1, 
-		"file name must not be code");
+/// @todo "x\nx" "xxx""xx"
+static void _save(Request& r, MethodParams& params) {
+	Value& vfile_name=params.as_no_junction(params.count()-1, "file name must not be code");
 
-	Table& table=static_cast<VTable *>(r.self)->table();
+	Table& table=GET_SELF(r, VTable).table();
 
-	String sdata(pool);
-	if(params->size()==1) { // not nameless=named output
+	bool do_append=false;
+	String sdata;
+	if(params.count()==1) { // named output
 		// write out names line
 		if(table.columns()) { // named table
-			for(int column=0; column<table.columns()->size(); column++) {
-				if(column)
-					sdata.APPEND_CONST("\t");
-				sdata.append(*static_cast<String *>(table.columns()->quick_get(column)), 
-					String::UL_TABLE);
+			for(Array_iterator<const String*> i(*table.columns()); i.has_next(); ) {
+				sdata.append(*i.next(), String::L_TABLE);
+				if(i.has_next())
+					sdata.append_know_length("\t", 1, String::L_CLEAN);
 			}
 		} else { // nameless table
-			int lsize=table.size()?static_cast<Array *>(table.get(0))->size():0;
-			if(lsize)
+			if(int lsize=table.count()?table[0]->count():0)
 				for(int column=0; column<lsize; column++) {
-					char *cindex_tab=(char *)malloc(MAX_NUMBER);
-					snprintf(cindex_tab, MAX_NUMBER, "%d\t", column);
-					sdata.APPEND_CONST(cindex_tab);
+					char *cindex_tab=new(PointerFreeGC) char[MAX_NUMBER];
+					sdata.append_know_length(cindex_tab, 
+						snprintf(cindex_tab, MAX_NUMBER, 
+							column<lsize-1?"%d\t":"%d", column),
+							String::L_CLEAN);
 				}
 			else
-				sdata.APPEND_CONST("empty nameless table");
+				sdata.append_help_length("empty nameless table", 0, String::L_CLEAN);
 		}
-		sdata.APPEND_CONST("\n");
+		sdata.append_know_length("\n", 1, String::L_CLEAN);
+	} else { // mode specified
+		const String&  mode=params.as_string(0, "mode must be string");
+		if(mode=="append")
+			do_append=true;
+		else if(mode=="nameless")
+			/*ok, already skipped names output*/;
+		else
+			throw Exception("parser.runtime",
+				&mode,
+				"unknown mode, must be 'append'");
+
 	}
 	// data lines
-	for(int index=0; index<table.size(); index++) {
-		Array *row=static_cast<Array *>(table.quick_get(index));
-		for(int column=0; column<row->size(); column++) {
-			if(column)
-				sdata.APPEND_CONST("\t");
-			sdata.append(*static_cast<String *>(row->quick_get(column)), 
-				String::UL_TABLE);
+	Array_iterator<ArrayString*> i(table);
+	while(i.has_next()) {
+		for(Array_iterator<const String*> c(*i.next()); c.has_next(); ) {
+			sdata.append(*c.next(), String::L_TABLE);
+			if(c.has_next())
+				sdata.append_know_length("\t", 1, String::L_CLEAN);
 		}
-		sdata.APPEND_CONST("\n");
+		sdata.append_know_length("\n", 1, String::L_CLEAN);
 	}
 
 	// write
-	file_write(pool, r.absolute(vtable_name.as_string()), 
-		sdata.cstr(), sdata.size(), true);
-}
-
-static void _count(Request& r, const String&, MethodParams *) {
-	Pool& pool=r.pool();
-	Value& value=*new(pool) VInt(pool, static_cast<VTable *>(r.self)->table().size());
-	r.write_no_lang(value);
-}
-
-static void _line(Request& r, const String& method_name, MethodParams *) {
-	Pool& pool=r.pool();
-	Value& value=*new(pool) VInt(pool, 1+static_cast<VTable *>(r.self)->table().current());
-	r.write_no_lang(value);
+	file_write(r.absolute(vfile_name.as_string()), 
+		sdata.cstr(), sdata.length(), true, do_append);
 }
 
-static void _offset(Request& r, const String& method_name, MethodParams *params) {
-	Pool& pool=r.pool();
-	Table& table=static_cast<VTable *>(r.self)->table();
-	if(params->size())
-		table.shift((int)r.process(params->get(0)).as_double());
-	else {
-		Value& value=*new(pool) VInt(pool, table.current());
-		r.write_no_lang(value);
-	}
+static void _count(Request& r, MethodParams&) {
+	int result=GET_SELF(r, VTable).table().count();
+	r.write_no_lang(*new VInt(result));
+}
+
+static void _line(Request& r, MethodParams&) {
+	int result=1+GET_SELF(r, VTable).table().current();
+	r.write_no_lang(*new VInt(result));
+}
+
+static void _offset(Request& r, MethodParams& params) {
+	Table& table=GET_SELF(r, VTable).table();
+	if(params.count()) {
+		bool absolute=false;
+		if(params.count()>1) {
+		    const String&  whence=params.as_string(0, "whence must be string");
+		    if(whence=="cur")
+				absolute=false;
+		    else if(whence=="set")
+				absolute=true;
+		    else
+				throw Exception("parser.runtime",
+					&whence,
+					"is invalid whence, valid are 'cur' or 'set'");
+		}
+		
+		Value& offset_expr=params.as_junction(params.count()-1, "offset must be expression");
+		table.offset(absolute, r.process_to_value(offset_expr).as_int());
+	} else
+		r.write_no_lang(*new VInt(table.current()));
 }
 
-static void _menu(Request& r, const String& method_name, MethodParams *params) {
-	Value& body_code=params->get_junction(0, "body must be code");
+static void _menu(Request& r, MethodParams& params) {
+	Value& body_code=params.as_junction(0, "body must be code");
 	
-	Value *delim_code=params->size()==2?&params->get(1):0;
+	Value* delim_maybe_code=params.count()>1?&params[1]:0;
 
-	VTable& vtable=*static_cast<VTable *>(r.self);
-	Table& table=vtable.table();
+	Table& table=GET_SELF(r, VTable).table();
 	bool need_delim=false;
-	vtable.lock(); int saved_current=table.current();
-	for(int row=0; row<table.size(); row++) {
+	int saved_current=table.current();
+	int size=table.count();
+	for(int row=0; row<size; row++) {
 		table.set_current(row);
 
-		Value& processed_body=r.process(body_code);
-		if(delim_code) { // delimiter set?
-			const String *string=processed_body.get_string();
-			if(need_delim && string && string->size()) // need delim & iteration produced string?
-				r.write_pass_lang(r.process(*delim_code));
+		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;
 		}
-		r.write_pass_lang(processed_body);
+		r.write_pass_lang(sv_processed);
 	}
-	table.set_current(saved_current); vtable.unlock();
+	table.set_current(saved_current);
 }
 
-static void _empty(Request& r, const String& method_name, MethodParams *params) {
-	Table& table=static_cast<VTable *>(r.self)->table();
-	if(table.size()==0)
-		r.write_pass_lang(r.process(params->get(0)));
-	else if(params->size()>1)
-		r.write_pass_lang(r.process(params->get(1)));
-}
-
-/// used by table: _record / store_column_item_to_hash
-struct Record_info {
-	Pool *pool;
+#ifndef DOXYGEN
+enum Table2hash_distint { D_ILLEGAL, D_FIRST, D_TABLES };
+struct Row_info {
+	Request *r;
 	Table *table;
-	Hash *hash;
+	Value* key_code;
+	size_t key_field;
+	Array<int>* value_fields;
+	HashStringValue* hash;
+	Table2hash_distint distinct;
+	size_t row;
 };
-static void store_column_item_to_hash(Array::Item *item, void *info) {
-	Record_info& ri=*static_cast<Record_info *>(info);
-	String& column_name=*static_cast<String *>(item);
-	Value *value;
-	if(const String *column_item=ri.table->item(column_name))
-		value=new(*ri.pool) VString(*column_item);
-	else
-		value=new(*ri.pool) VUnknown(*ri.pool);
-	ri.hash->put(column_name, value);
-}
-static void _record(Request& r, const String& method_name, MethodParams *params) {
-	Table& table=static_cast<VTable *>(r.self)->table();
-	if(const Array *columns=table.columns()) {
-		Pool& pool=r.pool();
-		Value& result=*new(pool) VHash(pool);
-		Record_info record_info={&pool, &table, result.get_hash()};
-		columns->for_each(store_column_item_to_hash, &record_info);
-		result.set_name(method_name);
-		r.write_no_lang(result);
-	}
+#endif
+static void table_row_to_hash(Table::element_type row, Row_info *info) {
+	const String* key;
+	if(info->key_code) {
+		info->table->set_current(info->row++); // change context row
+		StringOrValue sv_processed=info->r->process(*info->key_code);
+		key=&sv_processed.as_string();
+	} 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:
+		{
+			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)));
+			}
+
+			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?
+			Table* table;
+			if(vtable) 
+				table=vtable->get_table();
+			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;
+		}
+		break;
+	default:
+		throw Exception(0,
+			0,
+			"invalid distinct code (#%d)", info->distinct);
+	}
+}
+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(columns->count()>0) {
+			Table2hash_distint distinct=D_ILLEGAL;
+			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()) {
+					--param_index;
+					int valid_options=0;
+					if(Value* vdistinct_code=options->get(sql_distinct_name)) {
+						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;
+					}
+					if(valid_options!=options->count())
+						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");
+
+			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);
+					}
+				} else
+					throw Exception("parser.runtime",
+						0,
+						"value field(s) must be string or self_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;
+			}
+
+
+			{
+				Row_info info={0};
+				info.r=&r;
+				info.table=&self_table;
+				Value* key_param=&params[0];
+				info.key_code=key_param->get_junction()?key_param:0;
+				info.key_field=info.key_code?-1
+					:self_table.column_name2index(key_param->as_string(), true);
+				info.value_fields=&value_fields;
+				info.hash=&result.hash();
+				info.distinct=distinct;
+				info.row=0;
+
+				int saved_current=self_table.current();
+				self_table.for_each(table_row_to_hash, &info);
+				self_table.set_current(saved_current);
+			}
+		}
+	r.write_no_lang(result);
 }
 
-struct Seq_item {
-	Array *row;
+#ifndef DOXYGEN
+struct Table_seq_item {
+	ArrayString* row;
 	union {
-		char *c_str;
+		const char *c_str;
 		double d;
 	} value;
 };
+#endif
 static int sort_cmp_string(const void *a, const void *b) {
 	return strcmp(
-		static_cast<const Seq_item *>(a)->value.c_str, 
-		static_cast<const Seq_item *>(b)->value.c_str
+		static_cast<const Table_seq_item *>(a)->value.c_str, 
+		static_cast<const Table_seq_item *>(b)->value.c_str
 	);
 }
 static int sort_cmp_double(const void *a, const void *b) {
-	double va=static_cast<const Seq_item *>(a)->value.d;
-	double vb=static_cast<const Seq_item *>(b)->value.d;
+	double va=static_cast<const Table_seq_item *>(a)->value.d;
+	double vb=static_cast<const Table_seq_item *>(b)->value.d;
 	if(va<vb)
 		return -1;
 	else if(va>vb)
@@ -284,29 +518,27 @@ static int sort_cmp_double(const void *a
 	else 
 		return 0;
 }
-static void _sort(Request& r, const String& method_name, MethodParams *params) {
-	Value& key_maker=params->get_junction(0, "key-maker must be code");
+static void _sort(Request& r, MethodParams& params) {
+	Value& key_maker=params.as_junction(0, "key-maker must be code");
 
-	bool reverse=params->size()==2/*..[asc|desc]*/?
-		reverse=params->get_no_junction(1, "order must not be code").as_string()=="desc":
-		false;
+	bool reverse=params.count()>1/*..[desc|asc|]*/?
+		reverse=params.as_no_junction(1, "order must not be code").as_string()=="desc":
+		false; // default=asc
 
-	Table& table=static_cast<VTable *>(r.self)->table();
+	Table& old_table=GET_SELF(r, VTable).table();
+	Table& new_table=*new Table(old_table.columns());
 
-	// anything to sort?
-	if(!table.size())
-		return;
-
-	Seq_item *seq=(Seq_item *)malloc(sizeof(Seq_item)*table.size());
+	Table_seq_item* seq=new(PointerFreeGC) Table_seq_item[old_table.count()];
 	int i;
 
 	// calculate key values
 	bool key_values_are_strings=true;
-	for(i=0; i<table.size(); i++) {
-		table.set_current(i);
+	int old_count=old_table.count();
+	for(i=0; i<old_count; i++) {
+		old_table.set_current(i);
 		// calculate key value
-		seq[i].row=(MethodParams *)table.get(i);
-		Value& value=*r.process(key_maker).as_expr_result(true/*return string as-is*/);
+		seq[i].row=old_table[i];
+		Value& value=r.process_to_value(key_maker).as_expr_result(true/*return string as-is*/);
 		if(i==0) // determining key values type by first one
 			key_values_are_strings=value.is_string();
 
@@ -316,260 +548,293 @@ static void _sort(Request& r, const Stri
 			seq[i].value.d=value.as_double();
 	}
 	// sort keys
-	_qsort(seq, table.size(), sizeof(Seq_item), 
+	_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<table.size(); i++)
-		table.put(i, seq[reverse?table.size()-1-i:i].row);
+	for(i=0; i<old_count; i++)
+		new_table+=Table::element_type(seq[reverse?old_count-1-i:i].row);
+
+	delete[] seq;
 
-	// reset 'current'
-	table.set_current(0);
+	// replace any previous table value
+	GET_SELF(r, VTable).set_table(new_table);
 }
 
-static void _locate(Request& r, const String& method_name, MethodParams *params) {
-	Pool& pool=r.pool();
-
-	VTable& vtable=*static_cast<VTable *>(r.self);
-	Table& table=vtable.table();
-	Value& result=*new(pool) VBool(pool, table.locate(
-		params->get(0).as_string(),
-		params->get(1).as_string()));
-	result.set_name(method_name);
-	r.write_no_lang(result);
+#ifndef DOXYGEN
+struct Expression_is_true_info {
+	Request* r;
+	Value* expression_code;
+};
+#endif
+static bool expression_is_true(Table& self, void* ainfo) {
+	Expression_is_true_info& info=*static_cast<Expression_is_true_info*>(ainfo);
+	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");
+
+	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& r, MethodParams& params) {
+	check_option_param(o.defined, params, 2,
+		"locate by locate by name has parameters: name, value and, maybe, options");
+	const String& name=params.as_string(0, "column name must be string");
+	const String& value=params.as_string(1, "value must be string");
+	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));
 }
 
-static void _flip(Request& r, const String& method_name, MethodParams *params) {
-	Pool& pool=r.pool();
-	VTable& vtable=*static_cast<VTable *>(r.self);
-
-	Table& old_table=*vtable.get_table();
-	Table& new_table=*new(pool) Table(pool, &method_name, 0/*nameless*/);
-	if(old_table.size())
-		if(int old_cols=old_table.at(0).size()) 
-			for(int column=0; column<old_cols; column++) {
-				Array& new_row=*new(pool) Array(pool, old_table.size());
-				for(int i=0; i<old_table.size(); i++) {
-					const Array& old_row=old_table.at(i);
-					new_row+=column<old_row.size()?old_row.get(column):empty_string;
+
+static void _flip(Request& r, MethodParams& params) {
+	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()) 
+			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++) {
+					Table::element_type old_row=old_table[i];
+					*new_row+=column<old_row->count()?old_row->get(column):new String;
 				}
-				new_table+=&new_row;
+				new_table+=new_row;
 			}
 
-	vtable.set_table(new_table);
+	r.write_no_lang(*new VTable(&new_table));
 }
 
-static void _append(Request& r, const String& method_name, MethodParams *params) {
-	Pool& pool=r.pool();
-	// data is last parameter
-	const String& string=
-		r.process(params->get_junction(0, "body must be code")).as_string();
+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"));
 
 	// parse cells
-	Array& row=*new(pool) Array(pool);
-	string.split(row, 0, "\t", 1, String::UL_CLEAN);
+	Table::element_type row=new ArrayString;
+	size_t pos_after=0;
+	string.split(*row, pos_after, "\t", String::L_AS_IS);
 
-	VTable& vtable=*static_cast<VTable *>(r.self);
-	// disable ^a.menu{^a.append[]}
-	vtable.lock();
-	vtable.table()+=&row;
-	vtable.unlock();
+	GET_SELF(r, VTable).table()+=row;
 }
 
-static void _join(Request& r, const String& method_name, MethodParams *params) {
-	Pool& pool=r.pool();
-
-	Table *maybe_src=params->get_no_junction(0, "table ref must not be code").get_table();
+static void join_named_row(Table& src, Table* dest) {
+	Table::columns_type dest_columns=dest->columns();
+	size_t dest_columns_count=dest_columns->count();
+	Table::element_type dest_row(new ArrayString(dest_columns_count));
+	for(size_t dest_column=0; dest_column<dest_columns_count; dest_column++) {
+		const String* src_item=src.item(*dest_columns->get(dest_column));
+		*dest_row+=src_item?src_item:new String;
+	}
+	*dest+=dest_row;
+}
+static void join_nameless_row(Table& src, Table* dest) {
+	*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)
-		PTHROW(0, 0,
-			&method_name,
+		throw Exception("parser.runtime", 
+			0, 
 			"source is not a table");
-
 	Table& src=*maybe_src;
-	Table& dest=static_cast<VTable *>(r.self)->table();
+
+	Table::Action_options o=get_action_options(r, params, src);
+	check_option_param(o.defined, params, 1,
+		"invalid extra parameter");
+
+	Table& dest=GET_SELF(r, VTable).table();
 	if(&src == &dest)
-		PTHROW(0, 0,
-			&method_name,
+		throw Exception("parser.runtime", 
+			0, 
 			"source and destination are same table");
 
-	if(const Array *dest_columns=dest.columns()) { // dest is named
-		int saved_src_current=src.current();
-		for(int src_row=0; src_row<src.size(); src_row++) {
-			src.set_current(src_row);
-			Array& dest_row=*new(pool) Array(pool);
-			for(int dest_column=0; dest_column<dest_columns->size(); dest_column++) 
-				dest_row+=src.item(*dest_columns->get_string(dest_column));
-			dest+=&dest_row;
-		}
-		src.set_current(saved_src_current);
-	} else { // dest is nameless
-		for(int src_row=0; src_row<src.size(); src_row++)
-			dest+=&src.at(src_row);
-	}
+	if(Table::columns_type dest_columns=dest.columns()) // dest is named
+		src.table_for_each(join_named_row, &dest, o);
+	else // dest is nameless
+		src.table_for_each(join_nameless_row, &dest, o);
 }
 
-static void _sql(Request& r, const String& method_name, MethodParams *params) {
-	Pool& pool=r.pool();
-
-	if(!r.connection)
-		PTHROW(0, 0,
-			&method_name,
-			"without connect");
-
-	Value& statement=params->get_junction(0, "statement must be code");
+#ifndef DOXYGEN
+class Table_sql_event_handlers: public SQL_Driver_query_event_handlers {
+	ArrayString& columns;
+	ArrayString* row;
+public:
+	Table* table;
+public:
+	Table_sql_event_handlers() :
+		columns(*new ArrayString), row(0), table(0) {
+	}
 
-	ulong limit=0;
-	if(params->size()>1) {
-		Value& limit_code=params->get_junction(1, "limit must be expression");
-		limit=(uint)r.process(limit_code).as_double();
+	bool add_column(SQL_Error& error, const char *str, size_t length) {
+		try {
+			columns+=new String(str, length, true);
+			return false;
+		} catch(...) {
+			error=SQL_Error("exception occured in Table_sql_event_handlers::add_column");
+			return true;
+		}
+	}
+	bool before_rows(SQL_Error& error) { 
+		try {
+			table=new Table(&columns);
+			return false;
+		} catch(...) {
+			error=SQL_Error("exception occured in Table_sql_event_handlers::before_rows");
+			return true;
+		}
+	}
+	bool add_row(SQL_Error& error) {
+		try {
+			*table+=row=new ArrayString;
+			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) {
+		try {
+			String& cell=*new String;
+			if(length)
+				cell.append_know_length(str, length, String::L_TAINTED);
+			*row+=&cell;
+			return false;
+		} catch(...) {
+			error=SQL_Error("exception occured in Table_sql_event_handlers::add_row_cell");
+			return true;
+		}
 	}
+};
+#endif
+static void _sql(Request& r, MethodParams& params) {
+	Value& statement=params.as_junction(0, "statement must be code");
 
+	ulong limit=0;
 	ulong offset=0;
-	if(params->size()>2) {
-		Value& offset_code=params->get_junction(2, "offset must be expression");
-		offset=(ulong)r.process(offset_code).as_double();
-	}
-
-	Temp_lang temp_lang(r, String::UL_SQL);
-	const String& statement_string=r.process(statement).as_string();
-	const char *statement_cstr=
-		statement_string.cstr(String::UL_UNSPECIFIED, r.connection);
-	unsigned int sql_column_count; SQL_Driver::Cell *sql_columns;
-	unsigned long sql_row_count; SQL_Driver::Cell **sql_rows;
-	bool need_rethrow=false; Exception rethrow_me;
-	PTRY {
-		r.connection->query(
-			statement_cstr, offset, limit,
-			&sql_column_count, &sql_columns,
-			&sql_row_count, &sql_rows);
-	}
-	PCATCH(e) { // connect/process problem
-		rethrow_me=e;  need_rethrow=true;
-	}
-	PEND_CATCH
-	if(need_rethrow)
-		PTHROW(rethrow_me.type(), rethrow_me.code(),
-			&statement_string, // setting more specific source [were url]
-			rethrow_me.comment());
+	if(params.count()>1) {
+		Value& voptions=params.as_no_junction(1, "options must be hash, not code");
+		if(!voptions.is_string())
+			if(HashStringValue* options=voptions.get_hash()) {
+				int valid_options=0;
+				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");
+	}
+
+	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());
+	Table_sql_event_handlers handlers;
+#ifdef RESOURCES_DEBUG
+	struct timeval mt[2];
+	//measure:before
+	gettimeofday(&mt[0],NULL);
+#endif	
+	r.connection()->query(
+		statement_cstr, offset, limit, 
+		handlers,
+		statement_string);
 	
-	Array& table_columns=*new(pool) Array(pool);
-	for(unsigned int i=0; i<sql_column_count; i++) {
-		String& table_column=*new(pool) String(pool);
-		table_column.APPEND_TAINTED(
-			(const char *)sql_columns[i].ptr, sql_columns[i].size,
-			statement_cstr, 0);
-		table_columns+=&table_column;
-	}
-
-	Table& table=*new(pool) Table(pool, &method_name, &table_columns);
-
-	{
-		for(unsigned long r=0; r<sql_row_count; r++) {
-			SQL_Driver::Cell *sql_cells=sql_rows[r];
-			Array& table_row=*new(pool) Array(pool);
-			
-			for(unsigned int i=0; i<sql_column_count; i++) {
-				String& table_cell=*new(pool) String(pool);
-				table_cell.APPEND_TAINTED(
-					(const char *)sql_cells[i].ptr, sql_cells[i].size,
-					statement_cstr, r);
-				table_row+=&table_cell;
-			}
-			table+=&table_row;
-		}
-	}
+#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	    			
+
+	Table& result=
+		handlers.table?*handlers.table: // query resulted in table? return it
+		*new Table(Table::columns_type(0)); // query returned no table, fake it
 
 	// replace any previous table value
-	static_cast<VTable *>(r.self)->set_table(table);
+	GET_SELF(r, VTable).set_table(result);
 }
 
-static void _dir(Request& r, const String& method_name, MethodParams *params) {
-	Pool& pool=r.pool();
+static void _columns(Request& r, MethodParams&) {
 
-	Value& relative_path=params->get_no_junction(0, "path must not be code");
+	Table::columns_type result_columns(new ArrayString);
+	*result_columns+=new String("column");
+	Table& result_table=*new Table(result_columns);
 
-	const String *regexp;
-	pcre *regexp_code;
-	int ovecsize;
-	int *ovector;
-	if(params->size()>1) {
-		regexp=&params->get_no_junction(1, "regexp must not be code").as_string();
-
-		const char *pattern=regexp->cstr(String::UL_AS_IS);
-		const char *errptr;
-		int erroffset;
-		regexp_code=pcre_compile(pattern, PCRE_EXTRA | PCRE_DOTALL, 
-			&errptr, &erroffset,
-			r.pcre_tables);
-
-		if(!regexp_code)
-			PTHROW(0, 0,
-				&regexp->mid(erroffset, regexp->size()),
-				"regular expression syntax error - %s", errptr);
-
-		ovector=(int *)malloc(sizeof(int)*(ovecsize=(1/*match*/)*3));
-	} else 
-		regexp_code=0;
-
-
-	const char* absolute_path_cstr=r.absolute(relative_path.as_string())
-		.cstr(String::UL_FILE_NAME);
-
-	Array& columns=*new(pool) Array(pool);
-	columns+=new(pool) String(pool, "name");	
-	Table& table=*new(pool) Table(pool, &method_name, &columns);
-
-	LOAD_DIR(absolute_path_cstr, 
-		size_t file_name_size=strlen(ffblk.ff_name);
-		bool suits=true;
-		if(regexp_code) {
-			int exec_result=pcre_exec(regexp_code, 0,
-				ffblk.ff_name, file_name_size, 0,
-				0, ovector, ovecsize);
-			
-			if(exec_result==PCRE_ERROR_NOMATCH)
-				suits=false;
-			else if(exec_result<0) {
-				(*pcre_free)(regexp_code);
-				PTHROW(0, 0,
-					regexp,
-					"regular expression execute (%d)", 
-						exec_result);
-			}
+	Table& source_table=GET_SELF(r, VTable).table();
+	if(Table::columns_type source_columns=source_table.columns()) {
+		for(Array_iterator<const String*> i(*source_columns); i.has_next(); ) {
+			Table::element_type result_row(new ArrayString);
+			*result_row+=i.next();
+			result_table+=result_row;
 		}
+	}
 
-		if(suits) {
-			char *file_name_cstr=(char *)r.malloc(file_name_size);
-			memcpy(file_name_cstr, ffblk.ff_name, file_name_size);
-			String &file_name=*new(pool) String(pool);
-			file_name.APPEND(file_name_cstr, file_name_size, String::UL_FILE_NAME,
-				method_name.origin().file, method_name.origin().line);
-		
-			Array& row=*new(pool) Array(pool);
-			row+=&file_name;
-			table+=&row;
-		}
-	);
+	r.write_no_lang(*new VTable(&result_table));
+}
 
-	if(regexp_code)
-		(*pcre_free)(regexp_code);
+static void _select(Request& r, MethodParams& params) {
+	Value& vcondition=params.as_junction(0, "condition must be expression");
 
-	// replace any previous table value
-	static_cast<VTable *>(r.self)->set_table(table);
+	Table& source_table=GET_SELF(r, VTable).table();
+	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);
+
+		bool condition=r.process_to_value(vcondition, 
+				/*0/*no name* /,*/
+				false/*don't intercept string*/).as_bool();
+
+		if(condition) // ...condition is true=
+			result_table+=source_table[row]; // =green light to go to result
+	}
+	source_table.set_current(saved_current);
+
+	r.write_no_lang(*new VTable(&result_table));
 }
 
 // constructor
 
-MTable::MTable(Pool& apool) : Methoded(apool) {
-	set_name(*NEW String(pool(), TABLE_CLASS_NAME));
-
-	// ^table:set{data}
-	// ^table:set[nameless]{data}
-	add_native_method("set", Method::CT_DYNAMIC, _set, 1, 2);
-
-	// ^table:load[file]  
-	// ^table:load[nameless;file]
-	add_native_method("load", Method::CT_DYNAMIC, _load, 1, 2);
+MTable::MTable(): Methoded("table") {
+	// ^table::create{data}
+	// ^table::create[nameless]{data}
+	// ^table::create[table]
+	add_native_method("create", Method::CT_DYNAMIC, _create, 1, 2);
+	// 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); 
+
+	// ^table::load[file]  
+	// ^table::load[nameless;file]
+	add_native_method("load", Method::CT_DYNAMIC, _load, 1, 3);
 
 	// ^table.save[file]  
 	// ^table.save[nameless;file]
@@ -582,26 +847,24 @@ MTable::MTable(Pool& apool) : Methoded(a
 	add_native_method("line", Method::CT_DYNAMIC, _line, 0, 0);
 
 	// ^table.offset[]  
-	// ^table.offset[offset]
-	add_native_method("offset", Method::CT_DYNAMIC, _offset, 0, 1);
+	// ^table.offset(offset)
+	// ^table.offset[cur|set](offset)
+	add_native_method("offset", Method::CT_DYNAMIC, _offset, 0, 2);
 
 	// ^table.menu{code}  
 	// ^table.menu{code}[delim]
 	add_native_method("menu", Method::CT_DYNAMIC, _menu, 1, 2);
 
-	// ^table.empty{code-when-empty}  
-	// ^table.empty{code-when-empty}{code-when-not}
-	add_native_method("empty", Method::CT_DYNAMIC, _empty, 1, 2);
-
-	// ^table.record[]
-	add_native_method("record", Method::CT_DYNAMIC, _record, 0, 0);
+	// ^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}[asc|desc]
-	// ^table.sort(numeric-key-maker) ^table.sort(numeric-key-maker)[asc|desc]
+	// ^table.sort{string-key-maker} ^table.sort{string-key-maker}[desc|asc]
+	// ^table.sort(numeric-key-maker) ^table.sort(numeric-key-maker)[desc|asc]
 	add_native_method("sort", Method::CT_DYNAMIC, _sort, 1, 2);
 
 	// ^table.locate[field;value]
-	add_native_method("locate", Method::CT_DYNAMIC, _locate, 2, 2);
+	add_native_method("locate", Method::CT_DYNAMIC, _locate, 1, 3);
 
 	// ^table.flip[]
 	add_native_method("flip", Method::CT_DYNAMIC, _flip, 0, 0);
@@ -609,24 +872,17 @@ MTable::MTable(Pool& apool) : Methoded(a
 	// ^table.append{r{tab}e{tab}c{tab}o{tab}r{tab}d}
 	add_native_method("append", Method::CT_DYNAMIC, _append, 1, 1);
 
-	// ^table.join[table]
-	add_native_method("join", Method::CT_DYNAMIC, _join, 1, 1);
-
-
-	// ^table:sql[query][(count[;offset])]
-	add_native_method("sql", Method::CT_DYNAMIC, _sql, 1, 3);
+	// ^table.join[table][$.limit(10) $.offset(1) $.offset[cur] ]
+	add_native_method("join", Method::CT_DYNAMIC, _join, 1, 2);
 
-	// ^table:dir[path]
-	// ^table:dir[path][regexp]
-	add_native_method("dir", Method::CT_DYNAMIC, _dir, 1, 2);
-}
-
-// global variable
 
-Methoded *table_class;
+	// ^table:sql[query]
+	// ^table:sql[query][$.limit(1) $.offset(2)]
+	add_native_method("sql", Method::CT_DYNAMIC, _sql, 1, 2);
 
-// creator
+	// ^table:columns[]
+	add_native_method("columns", Method::CT_DYNAMIC, _columns, 0, 0);
 
-Methoded *MTable_create(Pool& pool) {
-	return table_class=new(pool) MTable(pool);
+	// ^table.select(expression) = table
+	add_native_method("select", Method::CT_DYNAMIC, _select, 1, 1);
 }