--- parser3/src/classes/table.C	2003/02/14 16:52:20	1.172.2.7
+++ parser3/src/classes/table.C	2003/04/25 12:32:31	1.181
@@ -1,15 +1,13 @@
 /** @file
 	Parser: @b table parser class.
 
-	Copyright (c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001, 2003 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char* IDENT_TABLE_C="$Date: 2003/02/14 16:52:20 $";
+static const char* IDENT_TABLE_C="$Date: 2003/04/25 12:32:31 $";
 
 #include "classes.h"
-#include "pa_vmethod_frame.h"
-
 #include "pa_common.h"
 #include "pa_request.h"
 #include "pa_vtable.h"
@@ -21,165 +19,159 @@ static const char* IDENT_TABLE_C="$Date:
 
 class MTable : public Methoded {
 public: // VStateless_class
-	ValuePtr create_new_value() { return ValuePtr(new VTable()); }
+	Value *create_new_value(Pool& pool) { return new(pool) VTable(pool); }
 
 public:
-	MTable();
+	MTable(Pool& pool);
 
 public: // Methoded
 	bool used_directly() { return true; }
 };
 
-// global variable
-
-MethodedPtr table_class(new MTable);
-
-// defines for globals
-
-#define SQL_LIMIT_NAME "limit"
-#define SQL_OFFSET_NAME "offset"
-#define SQL_DEFAULT_NAME "default"
-#define SQL_DISTINCT_NAME "distinct"
-
-// globals
-
-StringPtr sql_limit_name(new String(SQL_LIMIT_NAME));
-StringPtr sql_offset_name(new String(SQL_OFFSET_NAME));
-StringPtr sql_default_name(new String(SQL_DEFAULT_NAME));
-StringPtr sql_distinct_name(new String(SQL_DISTINCT_NAME));
-
 // methods
 
-static void get_copy_options(Request& r, StringPtr method_name, MethodParams& params, int param_index,
-							 const Table& source,
-							 int& offset,
-							 int& limit) {
-	Pool& pool=r.pool();
-
-	offset=0;
-	limit=0;
-	if(params.count()<=param_index)
-		return;
-
-	ValuePtr voptions=params.as_no_junction(param_index, "options must be hash, not code");
-	if(!voptions->is_string()) {
-		if(HashStringValue* options=voptions->get_hash(method_name)) {
-			int valid_options=0;
-			if(ValuePtr voffset=options->get(sql_offset_name)) {
-				valid_options++;
-				if(voffset->is_string()) {
-					StringPtr  soffset=voffset->get_string(&pool);
-					if(*soffset == "cur")
-						offset=source.current();
-					else
-						throw Exception("parser.runtime",
-							soffset,
-							"must be 'cur' string or expression");
-				} else 
-					offset=r.process_to_value(voffset)->as_int();
-			}
-			if(ValuePtr vlimit=options->get(sql_limit_name)) {
-				valid_options++;
-				limit=r.process_to_value(vlimit)->as_int();
-			}
-			if(valid_options!=options->count())
+static Table::Action_options get_action_options(Request& r, 
+				     const String& method_name, MethodParams *params, 
+				     const Table& source) {
+	Table::Action_options result;
+
+	if(!params->size())
+		return result;
+
+	Hash* options=params->get(params->size()-1).get_hash(&method_name);
+	if(!options)
+		return result;
+
+	result.defined=true;
+	bool defined_offset=false;
+
+	int valid_options=0;
+	if(Value *voffset=(Value *)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",
-					method_name,
-					"called with invalid option");
-		} else
-			throw Exception("parser.runtime",
-				method_name,
-				"options must be hash");
-	}
-	if(!limit) // zero limit = sould be 'nothing to copy', for methods zero means 'all'
-		limit=-1; // thus fixing
+					&soffset,
+					"must be 'cur' string or expression");
+		} else 
+			result.offset=r.process_to_value(*voffset).as_int();
+	}
+	if(Value *vlimit=(Value *)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.size()-1;
+	}
+	if(valid_options!=options->size())
+		throw Exception("parser.runtime",
+			&method_name,
+			"called with invalid option");
+
+	return result;
+}
+static void check_option_param(bool options_defined, 
+			  const String& method_name, MethodParams *params, 
+			  int next_param_index,
+			  const char *msg) {
+	if(next_param_index+(options_defined?1:0) != params->size())
+		throw Exception("parser.runtime",
+			&method_name,
+			"%s", msg);
 }
 
-static void _create(Request& r, StringPtr method_name, MethodParams& params) {
+static void _create(Request& r, const String& method_name, MethodParams *params) {
 	Pool& pool=r.pool();
 	// clone/copy part?
-	if(const Table *source=params[0]->get_table()) {
-		int offset, limit;
-		get_copy_options(r, method_name, params, 1, *source, 
-			offset, limit);
-		GET_SELF(r, VTable).set_table(TablePtr(new Table(*source, offset, limit)));
+	if(const Table *source=params->get(0).get_table()) {
+		Table::Action_options o=get_action_options(r, method_name, params, *source);
+		check_option_param(o.defined, method_name, params, 1, 
+			"too many parameters");
+		static_cast<VTable *>(r.get_self())->
+			set_table(*new(pool) Table(pool, *source, o));
 		return;
 	}
 
 	// data is last parameter
 	Temp_lang temp_lang(r, String::UL_PASS_APPENDED);
-	StringPtr  data=
-		r.process_to_string(params.as_junction(params.count()-1, "body must be code"));
+	const String& data=
+		r.process_to_string(params->as_junction(params->size()-1, "body must be code"));
 
 	size_t pos_after=0;
 	// parse columns
-	Table::columns_type columns;
-	if(params.count()==2) {
-		columns=Table::columns_type(0); // nameless
+	Array *columns;
+	if(params->size()==2) {
+		columns=0;
 	} else {
-		columns=Table::columns_type(new ArrayString);
+		columns=new(pool) Array(pool);
 
-		ArrayString head;
-		data->split(head, &pos_after, "\n", 1, String::UL_AS_IS, 1);
-		if(head.count())
-			head[0]->split(*columns, 0, "\t", 1, String::UL_AS_IS);
+		Array head(pool);
+		data.split(head, &pos_after, "\n", 1, String::UL_AS_IS, 1);
+		if(head.size())
+			head.get_string(0)->split(*columns, 0, "\t", 1, String::UL_AS_IS);
 	}
 
-	TablePtr table(new Table(method_name, columns));
+	Table& table=*new(pool) Table(pool, &method_name, columns);
 	// parse cells
-
-	ArrayString rows;
-	data->split(rows, &pos_after, "\n", 1, String::UL_AS_IS);
-	Array_iterator<StringPtr> i(rows);
+	Array rows(pool);
+	data.split(rows, &pos_after, "\n", 1, String::UL_AS_IS);
+	Array_iter i(rows);
 	while(i.has_next()) {
-		Table::element_type row(new ArrayString);
-		StringPtr  string=i.next();
+		Array& row=*new(pool) Array(pool);
+		const String& string=*i.next_string();
 		// remove comment lines
-		if(!string->size())
+		if(!string.size())
 			continue;
 
-		string->split(*row, 0, "\t", 1, String::UL_AS_IS);
-		*table+=row;
+		string.split(row, 0, "\t", 1, String::UL_AS_IS);
+		table+=&row;
 	}
 
 	// replace any previous table value
-	GET_SELF(r, VTable).set_table(table);
+	static_cast<VTable *>(r.get_self())->set_table(table);
 }
 
-static void _load(Request& r, StringPtr method_name, MethodParams& params) {
+static void _load(Request& r, const String& method_name, MethodParams *params) {
 	Pool& pool=r.pool();
-	StringPtr  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";
+	bool nameless=first_param=="nameless";
 	if(nameless)
 		filename_param_index++;
 	int options_param_index=filename_param_index+1;
 	
 	// loading text
-	char *data=file_read_text(pool, r.charsets.source(),
-		r.absolute(params.as_string(filename_param_index, "file name must be string")),
+	char *data=file_read_text(pool, 
+		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(method_name):0
+		options_param_index<params->size()?params->as_no_junction(options_param_index, "additional params must be hash").get_hash(&method_name):0
 	);
 
 	// parse columns
-	Table::columns_type columns;
+	Array *columns;
 #ifndef NO_STRING_ORIGIN
-	const String_fragment::Origin& origin=method_name->origin();
-	const char* file=origin.file;
+	const Origin& origin=method_name.origin();
+	const char *file=origin.file;
 	uint line=origin.line;
 #endif
 	if(nameless) {
-		columns=Table::columns_type(0); // nameless
+		columns=0; // nameless
 	} else {
-		columns=Table::columns_type(new ArrayString);
+		columns=new(pool) Array(pool);
 
 		while(char *row_chars=getrow(&data)) {
 			// remove empty&comment lines
 			if(!*row_chars || *row_chars == '#')
 				continue;
 			do {
-				StringPtr name(new String);
+				String *name=new(pool) String(pool);
 				name->APPEND_TAINTED(lsplit(&row_chars, '\t'), 0, file, line++);
 				*columns+=name;
 			} while(row_chars);
@@ -189,49 +181,50 @@ static void _load(Request& r, StringPtr
 	}
 
 	// parse cells
-	TablePtr table(new Table(method_name, columns));
+	Table& table=*new(pool) Table(pool, &method_name, columns);
 	char *row_chars;
 	while(row_chars=getrow(&data)) {
 		// remove empty&comment lines
 		if(!*row_chars || *row_chars == '#')
 			continue;
-		Table::element_type row(new ArrayString);
+		Array *row=new(pool) Array(pool);
 		while(char *cell_chars=lsplit(&row_chars, '\t')) {
-			StringPtr cell(new String);
+			String *cell=new(pool) String(pool);
 			cell->APPEND_TAINTED(cell_chars, 0, file, line);
 			*row+=cell;
 		}
 #ifndef NO_STRING_ORIGIN
 		line++;
 #endif
-		*table+=row;
+		table+=row;
 	};
 
 	// replace any previous table value
-	GET_SELF(r, VTable).set_table(table);
+	static_cast<VTable *>(r.get_self())->set_table(table);
 }
 
 /// @todo "x\nx" "xxx""xx"
-static void _save(Request& r, StringPtr method_name, MethodParams& params) {
+static void _save(Request& r, const String& method_name, MethodParams *params) {
 	Pool& pool=r.pool();
-	ValuePtr vfile_name=params.as_no_junction(params.count()-1, 
+	Value& vfile_name=params->as_no_junction(params->size()-1, 
 		"file name must not be code");
 
-	Table& table=GET_SELF(r, VTable).table(method_name);
+	Table& table=static_cast<VTable *>(r.get_self())->table(&method_name);
 
 	bool do_append=false;
-	String sdata;
-	if(params.count()==1) { // named output
+	String sdata(pool);
+	if(params->size()==1) { // named output
 		// write out names line
 		if(table.columns()) { // named table
-			Array_iterator<StringPtr> i(*table.columns());
+			Array_iter i(*table.columns());
 			while(i.has_next()) {
-				sdata.append(*i.next(), String::UL_TABLE);
+				sdata.append(*i.next_string(), //*static_cast<String *>(table.columns()->quick_get(column)), 
+					String::UL_TABLE);
 				if(i.has_next())
 					sdata.APPEND_CONST("\t");
 			}
 		} else { // nameless table
-			if(int lsize=table.count()?table[0]->count():0)
+			if(int lsize=table.size()?static_cast<Array *>(table.get(0))->size():0)
 				for(int column=0; column<lsize; column++) {
 					char *cindex_tab=(char *)pool.malloc(MAX_NUMBER);
 					snprintf(cindex_tab, MAX_NUMBER, "%d\t", column);
@@ -242,24 +235,25 @@ static void _save(Request& r, StringPtr
 		}
 		sdata.APPEND_CONST("\n");
 	} else { // mode specified
-		StringPtr  mode=params.as_string(0, "mode must be string");
-		if(*mode=="append")
+		const String& mode=params->as_string(0, "mode must be string");
+		if(mode=="append")
 			do_append=true;
-		else if(*mode=="nameless")
+		else if(mode=="nameless")
 			/*ok, already skipped names output*/;
 		else
 			throw Exception("parser.runtime",
-				mode,
+				&mode,
 				"unknown mode, must be 'append'");
 
 	}
 	// data lines
-	Array_iterator<ArrayStringPtr> i(table);
+	Array_iter i(table);
 	while(i.has_next()) {
-		Array_iterator<StringPtr> c(*i.next());
+		Array_iter c(*static_cast<Array *>(i.next()));
 		while(c.has_next()) {
-			if(StringPtr s=c.next())
-				sdata.append(*s, String::UL_TABLE);
+			if(const String *s=c.next_string())
+				sdata.append(*s,
+					String::UL_TABLE);
 			if(c.has_next())
 				sdata.APPEND_CONST("\t");
 		}
@@ -267,60 +261,62 @@ static void _save(Request& r, StringPtr
 	}
 
 	// write
-	file_write(r.absolute(vfile_name->as_string(&pool)), 
+	file_write(r.absolute(vfile_name.as_string()), 
 		sdata.cstr(), sdata.size(), true, do_append);
 }
 
-static void _count(Request& r, StringPtr method_name, MethodParams& ) {
-	int result=GET_SELF(r, VTable).table(method_name).count();
-	r.write_no_lang(ValuePtr(new VInt(result)));
+static void _count(Request& r, const String& method_name, MethodParams *) {
+	Pool& pool=r.pool();
+	int result=static_cast<VTable *>(r.get_self())->table(&method_name).size();
+	r.write_no_lang(*new(pool) VInt(pool, result));
 }
 
-static void _line(Request& r, StringPtr method_name, MethodParams& ) {
-	int result=1+GET_SELF(r, VTable).table(method_name).current();
-	r.write_no_lang(ValuePtr(new VInt(result)));
+static void _line(Request& r, const String& method_name, MethodParams *) {
+	Pool& pool=r.pool();
+	int result=1+static_cast<VTable *>(r.get_self())->table(&method_name).current();
+	r.write_no_lang(*new(pool) VInt(pool, result));
 }
 
-static void _offset(Request& r, StringPtr method_name, MethodParams& params) {
+static void _offset(Request& r, const String& method_name, MethodParams *params) {
 	Pool& pool=r.pool();
-	Table& table=GET_SELF(r, VTable).table(method_name);
-	if(params.count()) {
+	Table& table=static_cast<VTable *>(r.get_self())->table(&method_name);
+	if(params->size()) {
 		bool absolute=false;
-		if(params.count()>1) {
-		    StringPtr  whence=params.as_string(0, "whence must be string");
-		    if(*whence=="cur")
+		if(params->size()>1) {
+		    const String& whence=params->as_string(0, "whence must be string");
+		    if(whence=="cur")
 				absolute=false;
-		    else if(*whence=="set")
+		    else if(whence=="set")
 				absolute=true;
 		    else
 				throw Exception("parser.runtime",
-					whence,
+					&whence,
 					"is invalid whence, valid are 'cur' or 'set'");
 		}
 		
-		ValuePtr offset_expr=params.as_junction(params.count()-1, "offset must be expression");
-		table.offset(absolute, r.process_to_value(offset_expr)->as_int());
+		Value& offset_expr=params->as_junction(params->size()-1, "offset must be expression");
+		table.offset(absolute, r.process_to_value(offset_expr).as_int());
 	} else
-		r.write_no_lang(ValuePtr(new VInt(table.current())));
+		r.write_no_lang(*new(pool) VInt(pool, table.current()));
 }
 
-static void _menu(Request& r, StringPtr method_name, MethodParams& params) {
-	ValuePtr body_code=params.as_junction(0, "body must be code");
+static void _menu(Request& r, const String& method_name, MethodParams *params) {
+	Value& body_code=params->as_junction(0, "body must be code");
 	
-	ValuePtr delim_maybe_code=params.count()>1?params[1]:ValuePtr(0);
+	Value *delim_maybe_code=params->size()>1?&params->get(1):0;
 
-	Table& table=GET_SELF(r, VTable).table(method_name);
+	Table& table=static_cast<VTable *>(r.get_self())->table(&method_name);
 	bool need_delim=false;
 	int saved_current=table.current();
-	int size=table.count();
+	int size=table.size();
 	for(int row=0; row<size; row++) {
 		table.set_current(row);
 
 		StringOrValue sv_processed=r.process(body_code);
-		StringPtr s_processed=sv_processed.get_string();
+		const String *s_processed=sv_processed.get_string();
 		if(delim_maybe_code && s_processed && s_processed->size()) { // delimiter set and we have body
 			if(need_delim) // need delim & iteration produced string?
-				r.write_pass_lang(r.process(delim_maybe_code));
+				r.write_pass_lang(r.process(*delim_maybe_code));
 			need_delim=true;
 		}
 		r.write_pass_lang(sv_processed);
@@ -329,121 +325,159 @@ static void _menu(Request& r, StringPtr
 }
 
 #ifndef DOXYGEN
+enum Table2hash_distint { D_ILLEGAL, D_FIRST, D_TABLES };
 struct Row_info {
 	Request *r;
 	Table *table;
-	ValuePtr key_code;
+	Value *key_code;
 	int key_field;
-	Array<int>* value_fields;
-	HashStringValue* hash;
-	bool distinct;
+	Array *value_fields;
+	Hash *hash;
+	Table2hash_distint distinct;
 	int row;
 };
 #endif
-static void table_row_to_hash(Table::element_type row, Row_info *info) {
-	Pool& pool=info->r->pool();
-
-	StringPtr 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(&pool);
+static void table_row_to_hash(Array::Item *value, void *info) {
+	Array& row=*static_cast<Array *>(value);
+	Row_info& ri=*static_cast<Row_info *>(info);
+	Pool& pool=ri.table->pool();
+
+	const String *key;
+	if(ri.key_code) {
+		ri.table->set_current(ri.row++); // change context row
+		StringOrValue sv_processed=ri.r->process(*ri.key_code);
+		key=&sv_processed.as_string();
 	} else
-		key=info->key_field<row->count()?row->get(info->key_field):StringPtr(0);
+		key=ri.key_field<row.size()?row.get_string(ri.key_field):0;
 
 	if(!key)
 		return; // ignore rows without key [too-short-record_array if-indexed]
 		
-	VHashPtr vhash(new VHash);
-	HashStringValue& hash=vhash->hash();
-	for(int i=0; i<info->value_fields->count(); i++) {
-		int value_field=info->value_fields->get(i);
-		if(value_field<row->count())
-			hash.put(
-				info->table->columns()->get(value_field), 
-				ValuePtr(new VString(row->get(value_field))));
+	switch(ri.distinct) {
+	case D_ILLEGAL: case D_FIRST:
+		{
+			VHash& result=*new(pool) VHash(pool);
+			Hash& hash=*result.get_hash(0);
+			for(int i=0; i<ri.value_fields->size(); i++) {
+				int value_field=ri.value_fields->get_int(i);
+				if(value_field<row.size())
+					hash.put(
+						*ri.table->columns()->get_string(value_field), 
+						new(pool) VString(*row.get_string(value_field)));
+			}
+
+			if(ri.hash->put_dont_replace(*key, &result)) // put. existed?
+				if(ri.distinct==D_ILLEGAL)
+					throw Exception("parser.runtime",
+						key,
+						"duplicate key");
+		}
+		break;
+	case D_TABLES:
+		{
+			VTable* vtable=(VTable*)ri.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(pool) Table(pool, *ri.table, table_options/*no rows, just structure*/);
+				ri.hash->put(*key, new(pool) VTable(pool, table));
+			}
+			*table+=&row;
+		}
+		break;
+	default:
+		throw Exception(0,
+			0,
+			"invalid distinct code (#%d)", ri.distinct);
 	}
 
-	if(info->hash->put_dont_replace(key, vhash)) // put. existed?
-		if(!info->distinct)
-			throw Exception("parser.runtime",
-				key,
-				"duplicate key");
 }
-static void _hash(Request& r, StringPtr method_name, MethodParams& params) {
+static void _hash(Request& r, const String& method_name, MethodParams *params) {
 	Pool& pool=r.pool();
-	Table& self_table=GET_SELF(r, VTable).table(method_name);
-	VHashPtr result(new VHash);
-	if(Table::columns_type columns=self_table.columns())
-		if(columns->count()>0) {
-			bool distinct=false;
-			int param_index=params.count()-1;
+	Table& self_table=static_cast<VTable *>(r.get_self())->table(&method_name);
+	Value& result=*new(pool) VHash(pool);
+	if(const Array *columns=self_table.columns())
+		if(columns->size()>0) {
+			Table2hash_distint distinct=D_ILLEGAL;
+			int param_index=params->size()-1;
 			if(param_index>0) {
-				if(HashStringValue* options=
-					params.as_no_junction(param_index, "param must not be code")->get_hash(method_name)) {
+				if(Hash *options=
+					params->as_no_junction(param_index, "param must not be code").get_hash(0)) {
 					--param_index;
 					int valid_options=0;
-					if(ValuePtr vdistinct=options->get(sql_distinct_name)) {
+					if(Value *vdistinct_code=(Value *)options->get(*sql_distinct_name)) {
 						valid_options++;
-						distinct=r.process_to_value(vdistinct)->as_bool();
+						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())
+					if(valid_options!=options->size())
 						throw Exception("parser.runtime",
-							method_name,
+							&method_name,
 							"called with invalid option");
 				}
 			}
 			if(param_index==2) // bad options param type
 				throw Exception("parser.runtime",
-					method_name,
+					&method_name,
 					"options must be hash");
 
-			Array<int> value_fields;
+			Array value_fields(pool);
 			if(param_index>0) {
-				ValuePtr 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->as_string(&pool), true);
-				} else if(Table* value_fields_table=value_fields_param->get_table()) {
-					for(int i=0; i<value_fields_table->count(); i++) {
-						StringPtr  value_field_name=
-							value_fields_table->get(i)->get(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.as_string(), true);
+				} else if(Table *value_fields_table=value_fields_param.get_table()) {
+					for(int i=0; i<value_fields_table->size(); i++) {
+						const String& value_field_name=
+							*static_cast<Array *>(value_fields_table->get(i))->get_string(0);
 						value_fields+=self_table.column_name2index(value_field_name, true);
 					}
 				} else
 					throw Exception("parser.runtime",
-						method_name,
+						&method_name,
 						"value field(s) must be string or self_table"
 					);
 			} else { // by all columns, including key
-				for(int i=0; i<columns->count(); i++)
-					value_fields+=i;
+				if(!(distinct!=D_ILLEGAL && distinct!=D_FIRST))
+					for(int i=0; i<columns->size(); i++)
+						value_fields+=i;
 			}
 
-
-			{
-				Row_info info;
-				info.r=&r;
-				info.table=&self_table;
-				ValuePtr key_param=params[0];
-				info.key_code=key_param->get_junction()?key_param:ValuePtr(0);
-				info.key_field=info.key_code?-1
-					:self_table.column_name2index(key_param->as_string(&pool), true);
-				info.value_fields=&value_fields;
-				info.hash=&result->hash();
-				info.distinct=distinct;
-
-				int saved_current=self_table.current();
-				self_table.for_each(table_row_to_hash, &info);
-				self_table.set_current(saved_current);
-			}
+			Value& key_param=params->get(0);
+			Value *key_code=key_param.get_junction()?&key_param:0;
+			int key_field=key_code?-1
+				:self_table.column_name2index(key_param.as_string(), true);
+
+			Row_info row_info={&r, &self_table, 
+				key_code, key_field, &value_fields, 
+				result.get_hash(0), distinct};
+
+			int saved_current=self_table.current();
+			self_table.for_each(table_row_to_hash, &row_info);
+			self_table.set_current(saved_current);
 		}
 	r.write_no_lang(result);
 }
 
 #ifndef DOXYGEN
 struct Table_seq_item {
-	Table::element_type row;
+	Array *row;
 	union {
 		char *c_str;
 		double d;
@@ -466,186 +500,190 @@ static int sort_cmp_double(const void *a
 	else 
 		return 0;
 }
-static void _sort(Request& r, StringPtr method_name, MethodParams& params) {
-	Pool local_pool;
-	ValuePtr key_maker=params.as_junction(0, "key-maker must be code");
+static void _sort(Request& r, const String& method_name, MethodParams *params) {
+	Pool& pool=r.pool();
+	Value& key_maker=params->as_junction(0, "key-maker must be code");
 
-	bool reverse=params.count()>1/*..[desc|asc|]*/?
-		reverse=*params.as_no_junction(1, "order must not be code")->as_string(&local_pool)=="desc":
+	bool reverse=params->size()>1/*..[desc|asc|]*/?
+		reverse=params->as_no_junction(1, "order must not be code").as_string()=="desc":
 		false; // default=asc
 
-	Table& old_table=GET_SELF(r, VTable).table(method_name);
-	TablePtr new_table(new Table(method_name, old_table.columns()));
+	Table& old_table=static_cast<VTable *>(r.get_self())->table(&method_name);
+	if(old_table.size()==0)
+		return;
+
+	Table& new_table=*new(pool) Table(pool, &method_name, old_table.columns());
 
-	smart_ptr<Table_seq_item> seq(new Table_seq_item[old_table.count()]);
+	Table_seq_item *seq=(Table_seq_item *)pool.malloc(sizeof(Table_seq_item)*old_table.size());
 	int i;
 
 	// calculate key values
 	bool key_values_are_strings=true;
-	for(i=0; i<old_table.count(); i++) {
+	for(i=0; i<old_table.size(); i++) {
 		old_table.set_current(i);
 		// calculate key value
-		seq[i].row=old_table[i];
-		ValuePtr value=r.process_to_value(key_maker)->as_expr_result(true/*return string as-is*/);
+		seq[i].row=(MethodParams *)old_table.get(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();
+			key_values_are_strings=value.is_string();
 
 		if(key_values_are_strings)
-			seq[i].value.c_str=value->as_string(&local_pool)->cstr(local_pool);
+			seq[i].value.c_str=value.as_string().cstr();
 		else
-			seq[i].value.d=value->as_double();
+			seq[i].value.d=value.as_double();
 	}
 	// sort keys
-	_qsort(seq, old_table.count(), sizeof(Table_seq_item), 
+	_qsort(seq, old_table.size(), 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_table.count(); i++)
-		*new_table+=seq[reverse?old_table.count()-1-i:i].row;
+	for(i=0; i<old_table.size(); i++)
+		new_table+=seq[reverse?old_table.size()-1-i:i].row;
 
 	// replace any previous table value
-	GET_SELF(r, VTable).set_table(new_table);
+	static_cast<VTable *>(r.get_self())->set_table(new_table);
 }
 
-static bool _locate_expression(Request& r, StringPtr method_name, MethodParams& params) {
-	if(params.count()>1)
-		throw Exception("parser.runtime", 
-			method_name,
-			"locate by expression has only one parameter - expression");
-
-	ValuePtr expression_code=params.as_junction(0, "must be expression");
-
-	Table& table=GET_SELF(r, VTable).table(method_name);
-	int saved_current=table.current();
-	int size=table.count();
-	for(int row=0; row<size; row++) {
-		table.set_current(row);
+#ifndef DOXYGEN
+struct Locate_expression_func_info {
+	Request* r;
+	Value* expression_code;
+};
+#endif
+bool locate_expression_func(Table& self, void* ainfo) {
+	Locate_expression_func_info& info=*static_cast<Locate_expression_func_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, const String& method_name, MethodParams *params) {
+	check_option_param(o.defined, method_name, params, 1,
+		"locate by expression only has parameters: expression and, maybe, options");
+	Value& expression_code=params->as_junction(0, "must be expression");
 
-		if(r.process_to_value(expression_code)->as_bool())
-			return true;
-	}
-	table.set_current(saved_current);
-	return false;
+	Locate_expression_func_info info={&r, &expression_code};
+	return table.locate(locate_expression_func, &info, o);
 }
-static bool _locate_name_value(Request& r, StringPtr method_name, MethodParams& params) {
-	if(params.count()>2)
-		throw Exception("parser.runtime", 
-			method_name,
-			"locate by name and value has only two parameters - name and value");
+static bool _locate_name_value(Table& table, Table::Action_options o,
+			       Request& r, const String& method_name, MethodParams *params) {
+	check_option_param(o.defined, method_name, 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");
 
-	Table& table=GET_SELF(r, VTable).table(method_name);
-	return table.locate(
-		params.as_string(0, "column name must be string"),
-		params.as_string(1, "value must be string")
-	);
+	return table.locate(name, value, o);
 }
-static void _locate(Request& r, StringPtr method_name, MethodParams& params) {
+static void _locate(Request& r, const String& method_name, MethodParams *params) {
 	Pool& pool=r.pool();
-	bool result=params[0]->get_junction()?
-		_locate_expression(r, method_name, params) :
-		_locate_name_value(r, method_name, params);
-	r.write_no_lang(ValuePtr(new VBool(result)));
+	Table& table=static_cast<VTable *>(r.get_self())->table(&method_name);
+
+	Table::Action_options o=get_action_options(r, method_name, params, table);
+
+	bool result=params->get(0).get_junction()?
+		_locate_expression(table, o, r, method_name, params) :
+		_locate_name_value(table, o, r, method_name, params);
+	r.write_no_lang(*new(pool) VBool(pool, result));
 }
 
-static void _flip(Request& r, StringPtr method_name, MethodParams& params) {
+static void _flip(Request& r, const String& method_name, MethodParams *params) {
 	Pool& pool=r.pool();
-	Table& old_table=GET_SELF(r, VTable).table(method_name);
-	TablePtr new_table(new Table(method_name, old_table.columns()));
-	if(old_table.count())
-		if(int old_cols=old_table[0]->count()) 
+	Table& old_table=static_cast<VTable *>(r.get_self())->table(&method_name);
+	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++) {
-				Table::element_type new_row(new ArrayString(old_table.count()));
-				for(int i=0; i<old_table.count(); i++) {
-					Table::element_type old_row=old_table[i];
-					*new_row+=column<old_row->count()?old_row->get(column):StringPtr(new String);
+				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):new(pool) String(pool);
 				}
-				*new_table+=new_row;
+				new_table+=&new_row;
 			}
 
-	r.write_no_lang(ValuePtr(new VTable(new_table)));
+	r.write_no_lang(*new(pool) VTable(pool, &new_table));
 }
 
-static void _append(Request& r, StringPtr method_name, MethodParams& params) {
+static void _append(Request& r, const String& method_name, MethodParams *params) {
 	Pool& pool=r.pool();
 	// data
 	Temp_lang temp_lang(r, String::UL_PASS_APPENDED);
-	StringPtr string=r.process_to_string(params.as_junction(0, "body must be code"));
+	const String& string=
+		r.process_to_string(params->as_junction(0, "body must be code"));
 
 	// parse cells
-	ArrayStringPtr row(new ArrayString);
-	string->split(*row, 0, "\t", 1, String::UL_AS_IS);
+	Array& row=*new(pool) Array(pool);
+	string.split(row, 0, "\t", 1, String::UL_AS_IS);
 
-	GET_SELF(r, VTable).table(method_name)+=row;
+	static_cast<VTable *>(r.get_self())->table(&method_name)+=&row;
 }
 
-static void _join(Request& r, StringPtr method_name, MethodParams& params) {
+static void _join(Request& r, const String& method_name, MethodParams *params) {
 	Pool& pool=r.pool();
 
-	Table* maybe_src=params.as_no_junction(0, "table ref must not be code")->get_table();
+	Table* maybe_src=params->as_no_junction(0, "table ref must not be code").get_table();
 	if(!maybe_src)
 		throw Exception("parser.runtime", 
-			method_name, 
+			&method_name, 
 			"source is not a table");
-
 	Table& src=*maybe_src;
-	Table& dest=GET_SELF(r, VTable).table(method_name);
+
+	Table::Action_options o=get_action_options(r, method_name, params, src);
+	check_option_param(o.defined, method_name, params, 1,
+		"invalid extra parameter");
+
+	Table& dest=static_cast<VTable *>(r.get_self())->table(&method_name);
 	if(&src == &dest)
 		throw Exception("parser.runtime", 
-			method_name, 
+			&method_name, 
 			"source and destination are same table");
 
-	int offset, limit;
-	get_copy_options(r, method_name, params, 1, src, 
-		offset, limit);
-
-	if(Table::columns_type dest_columns=dest.columns()) { // dest is named
+	if(o.reverse)
+		throw Exception(0,
+			&method_name,
+			"not implemented in this version, please upgrade");
+	if(const Array *dest_columns=dest.columns()) { // dest is named
 		int saved_src_current=src.current();
-		int m=src.count()-offset;
-		if(!limit || limit>m)
-			limit=m;
-		int end=offset+limit;
-		for(int src_row=offset; src_row<end; src_row++) {
+		int m=src.size()-o.offset;
+		if(o.limit<0 || o.limit>m)
+			o.limit=m;
+		int end=o.offset+o.limit;
+		for(int src_row=o.offset; src_row<end; src_row++) {
 			src.set_current(src_row);
-			Table::element_type dest_row(new ArrayString(src.count()));
-			for(int dest_column=0; dest_column<dest_columns->count(); dest_column++) {
-				StringPtr src_item=src.item(dest_columns->get(dest_column));
-				*dest_row+=src_item?src_item:StringPtr(new String);
+			Array& dest_row=*new(pool) Array(pool);
+			for(int dest_column=0; dest_column<dest_columns->size(); dest_column++) {
+				const String *src_item=src.item(*dest_columns->get_string(dest_column));
+				dest_row+=src_item?src_item:new(pool) String(pool);
 			}
-			dest+=dest_row;
+			dest+=&dest_row;
 		}
 		src.set_current(saved_src_current);
 	} else { // dest is nameless
-		for(int src_row=0; src_row<src.count(); src_row++)
-			dest+=src[src_row];
+		for(int src_row=0; src_row<src.size(); src_row++)
+			dest+=&src.at(src_row);
 	}
 }
 
 #ifndef DOXYGEN
 class Table_sql_event_handlers: public SQL_Driver_query_event_handlers {
-	Pool& pool;
-	StringPtr  method_name;
-	StringPtr  statement_string; const char* statement_cstr;
-	ArrayStringPtr columns;
-	ArrayString* row;
 public:
-	TablePtr table;
-public:
-	Table_sql_event_handlers(Pool& apool, StringPtr amethod_name,
-		StringPtr astatement_string, const char* astatement_cstr) :
+	Table_sql_event_handlers(Pool& apool, const String& amethod_name,
+		const String& astatement_string, const char *astatement_cstr) :
 		pool(apool), 
 		method_name(amethod_name),
 		statement_string(astatement_string),
 		statement_cstr(astatement_cstr),
-		columns(new ArrayString)
-	{}
+		columns(*new(pool) Array(pool)),
+		row(0), 
+		table(0)
+	{
+	}
 
 	bool add_column(SQL_Error& error, void *ptr, size_t size) {
 		try {
-			StringPtr column(new String);
+			String *column=new(pool) String(pool);
 			column->APPEND_TAINTED(
-				(const char* )ptr, size, 
+				(const char *)ptr, size, 
 				statement_cstr, 0);
-			*columns+=column;
+			columns+=column;
 			return false;
 		} catch(...) {
 			error=SQL_Error("exception occured in Table_sql_event_handlers::add_column");
@@ -654,7 +692,7 @@ public:
 	}
 	bool before_rows(SQL_Error& error) { 
 		try {
-			table=TablePtr(new Table( method_name, columns));
+			table=new(pool) Table(pool, &method_name, &columns);
 			return false;
 		} catch(...) {
 			error=SQL_Error("exception occured in Table_sql_event_handlers::before_rows");
@@ -663,7 +701,7 @@ public:
 	}
 	bool add_row(SQL_Error& error) {
 		try {
-			*table+=(ArrayStringPtr(row=new ArrayString));
+			(*table)+=(row=new(pool) Array(pool));
 			return false;
 		} catch(...) {
 			error=SQL_Error("exception occured in Table_sql_event_handlers::add_row");
@@ -672,54 +710,63 @@ public:
 	}
 	bool add_row_cell(SQL_Error& error, void *ptr, size_t size) {
 		try {
-			StringPtr cell(new String);
+			String *cell=new(pool) String(pool);
 			if(size)
 				cell->APPEND_TAINTED(
-					(const char* )ptr, size, 
-					statement_cstr, table->count()-1);
-			*row+=cell;
+					(const char *)ptr, size, 
+					statement_cstr, table->size()-1);
+			(*row)+=cell;
 			return false;
 		} catch(...) {
 			error=SQL_Error("exception occured in Table_sql_event_handlers::add_row_cell");
 			return true;
 		}
 	}
+
+private:
+	Pool& pool;
+	const String& method_name;
+	const String& statement_string; const char *statement_cstr;
+	Array& columns;
+	Array *row;
+public:
+	Table *table;
 };
 #endif
-static void _sql(Request& r, StringPtr method_name, MethodParams& params) {
+static void _sql(Request& r, const String& method_name, MethodParams *params) {
 	Pool& pool=r.pool();
 
-	ValuePtr statement=params.as_junction(0, "statement must be code");
+	Value& statement=params->as_junction(0, "statement must be code");
 
 	ulong limit=0;
 	ulong offset=0;
-	if(params.count()>1) {
-		ValuePtr voptions=params.as_no_junction(1, "options must be hash, not code");
-		if(!voptions->is_string())
-			if(HashStringValue* options=voptions->get_hash(method_name)) {
+	if(params->size()>1) {
+		Value& voptions=params->as_no_junction(1, "options must be hash, not code");
+		if(!voptions.is_string())
+			if(Hash *options=voptions.get_hash(&method_name)) {
 				int valid_options=0;
-				if(ValuePtr vlimit=options->get(sql_limit_name)) {
+				if(Value *vlimit=(Value *)options->get(*sql_limit_name)) {
 					valid_options++;
-					limit=(ulong)r.process_to_value(vlimit)->as_double();
+					limit=(ulong)r.process_to_value(*vlimit).as_double();
 				}
-				if(ValuePtr voffset=options->get(sql_offset_name)) {
+				if(Value *voffset=(Value *)options->get(*sql_offset_name)) {
 					valid_options++;
-					offset=(ulong)r.process_to_value(voffset)->as_double();
+					offset=(ulong)r.process_to_value(*voffset).as_double();
 				}
-				if(valid_options!=options->count())
+				if(valid_options!=options->size())
 					throw Exception("parser.runtime",
-						method_name,
+						&method_name,
 						"called with invalid option");
 			} else
 				throw Exception("parser.runtime",
-					method_name,
+					&method_name,
 					"options must be hash");
 	}
 
 	Temp_lang temp_lang(r, String::UL_SQL);
-	StringPtr  statement_string=r.process_to_string(statement);
-	const char* statement_cstr=
-		statement_string->cstr(pool, String::UL_UNSPECIFIED, r.connection(method_name));
+	const String& statement_string=r.process_to_string(statement);
+	const char *statement_cstr=
+		statement_string.cstr(String::UL_UNSPECIFIED, r.connection(&method_name));
 	Table_sql_event_handlers handlers(pool, method_name,
 		statement_string, statement_cstr);
 #ifdef RESOURCES_DEBUG
@@ -727,7 +774,7 @@ static void _sql(Request& r, StringPtr m
 	//measure:before
 	gettimeofday(&mt[0],NULL);
 #endif	
-	r.connection(method_name)->query(
+	r.connection(&method_name)->query(
 		statement_cstr, offset, limit, 
 		handlers,
 		statement_string);
@@ -743,65 +790,65 @@ static void _sql(Request& r, StringPtr m
 	r.sql_request_time+=t[1]-t[0];
 #endif	    			
 
-	TablePtr result=
+	Table *result=
 		handlers.table?handlers.table: // query resulted in table? return it
-		TablePtr(new Table(method_name, Table::columns_type(0))); // query returned no table, fake it
+		new(pool) Table(pool, &method_name, 0); // query returned no table, fake it
 
 	// replace any previous table value
-	GET_SELF(r, VTable).set_table(result);
+	static_cast<VTable *>(r.get_self())->set_table(*result);
 }
 
-static void _columns(Request& r, StringPtr method_name, MethodParams& ) {
+static void _columns(Request& r, const String& method_name, MethodParams *) {
 	Pool& pool=r.pool();
 
-	Table::columns_type result_columns(new ArrayString);
-	*result_columns+=StringPtr(new String("column"));
-	TablePtr result_table(new Table(method_name, result_columns));
+	Array& result_columns=*new(pool) Array(pool);
+	result_columns+=new(pool) String(pool, "column");
+	Table& result_table=*new(pool) Table(pool, &method_name, &result_columns);
 
-	Table& source_table=GET_SELF(r, VTable).table(method_name);
-	if(Table::columns_type source_columns=source_table.columns()) {
-		Array_iterator<StringPtr> i(*source_columns);
+	Table& source_table=static_cast<VTable *>(r.get_self())->table(&method_name);
+	if(const Array *source_columns=source_table.columns()) {
+		Array_iter i(*source_columns);
 		while(i.has_next()) {
-			Table::element_type result_row(new ArrayString);
-			*result_row+=i.next();
-			*result_table+=result_row;
+			Array& result_row=*new(pool) Array(pool);
+			result_row+=i.next();
+			result_table+=&result_row;
 		}
 	}
 
-	r.write_no_lang(ValuePtr(new VTable(result_table)));
+	r.write_no_lang(*new(pool) VTable(pool, &result_table));
 }
 
-static void _select(Request& r, StringPtr method_name, MethodParams& params) {
+static void _select(Request& r, const String& method_name, MethodParams *params) {
 	Pool& pool=r.pool();
 
-	ValuePtr vcondition=params.as_junction(0, "condition must be expression");
+	Value& vcondition=params->as_junction(0, "condition must be expression");
 
-	Table& source_table=GET_SELF(r, VTable).table(method_name);
-	TablePtr result_table(new Table(
+	Table& source_table=static_cast<VTable *>(r.get_self())->table(&method_name);
+	Table& result_table=*new(pool) Table(pool, 
 		source_table.origin_string(), 
 		source_table.columns()
-	));
+	);
 
 	int saved_current=source_table.current();
-	int size=source_table.count();
+	int size=source_table.size();
 	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();
+				false/*don't intercept string*/).as_bool();
 
 		if(condition) // ...condition is true=
-			*result_table+=source_table[row]; // =green light to go to result
+			result_table+=&source_table.at(row); // =green light to go to result
 	}
 	source_table.set_current(saved_current);
 
-	r.write_no_lang(ValuePtr(new VTable(result_table)));
+	r.write_no_lang(*new(pool) VTable(pool, &result_table));
 }
 
 // constructor
 
-MTable::MTable(): Methoded("table") {
+MTable::MTable(Pool& apool) : Methoded(apool, "table") {
 	// ^table::create{data}
 	// ^table::create[nameless]{data}
 	// ^table::create[table]
@@ -841,7 +888,7 @@ MTable::MTable(): Methoded("table") {
 	add_native_method("sort", Method::CT_DYNAMIC, _sort, 1, 2);
 
 	// ^table.locate[field;value]
-	add_native_method("locate", Method::CT_DYNAMIC, _locate, 1, 2);
+	add_native_method("locate", Method::CT_DYNAMIC, _locate, 1, 3);
 
 	// ^table.flip[]
 	add_native_method("flip", Method::CT_DYNAMIC, _flip, 0, 0);
@@ -863,3 +910,13 @@ MTable::MTable(): Methoded("table") {
 	// ^table.select(expression) = table
 	add_native_method("select", Method::CT_DYNAMIC, _select, 1, 1);
 }
+
+// global variable
+
+Methoded *table_class;
+
+// creator
+
+Methoded *MTable_create(Pool& pool) {
+	return table_class=new(pool) MTable(pool);
+}